yusheng 1 жил өмнө
parent
commit
7adf6d2789
25 өөрчлөгдсөн 46 нэмэгдсэн , 43 устгасан
  1. 2 2
      src/BIZComponents/inventoryTable.vue
  2. 2 2
      src/BIZComponents/inventoryTableDetails.vue
  3. 2 2
      src/BIZComponents/saleGeneralityInventoryTable.vue
  4. 1 1
      src/BIZComponents/selectEquipmentList.vue
  5. 2 2
      src/views/contractManage/contractBook/components/inventoryTable.vue
  6. 2 2
      src/views/contractManage/contractBook/components/inventoryTabledetail.vue
  7. 2 2
      src/views/purchasingManage/inquiryManage/components/inquiryTable.vue
  8. 4 4
      src/views/purchasingManage/purchaseOrder/components/detailDialog.vue
  9. 2 2
      src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue
  10. 2 2
      src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue
  11. 2 2
      src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue
  12. 2 2
      src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue
  13. 1 1
      src/views/saleManage/businessOpportunity/components/opportunityDetailDialog.vue
  14. 3 1
      src/views/saleManage/businessOpportunity/index.vue
  15. 1 1
      src/views/saleManage/quotation/components/detailDialog.vue
  16. 1 0
      src/views/saleManage/quotation/index.vue
  17. 2 2
      src/views/saleManage/saleOrder/customerReturnOrder/inventoryTable.vue
  18. 1 1
      src/views/saleManage/saleOrder/entrustedReceive/components/detailDialog.vue
  19. 2 2
      src/views/saleManage/saleOrder/entrustedReceive/components/inventoryTable.vue
  20. 1 1
      src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue
  21. 1 1
      src/views/saleManage/saleOrder/invoice/components/inventoryTableDetails.vue
  22. 2 2
      src/views/saleManage/saleOrder/invoice/components/replaceTable.vue
  23. 2 2
      src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturn.vue
  24. 2 2
      src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturnDetail.vue
  25. 2 2
      src/views/salesServiceManagement/components/info.vue

+ 2 - 2
src/BIZComponents/inventoryTable.vue

@@ -1103,7 +1103,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             // headerSlot: 'headerGuaranteePeriod',
             align: 'center'
@@ -1111,7 +1111,7 @@
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

+ 2 - 2
src/BIZComponents/inventoryTableDetails.vue

@@ -442,7 +442,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
 
             align: 'center',
@@ -455,7 +455,7 @@
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },

+ 2 - 2
src/BIZComponents/saleGeneralityInventoryTable.vue

@@ -903,14 +903,14 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             align: 'center'
           },
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

+ 1 - 1
src/BIZComponents/selectEquipmentList.vue

@@ -182,7 +182,7 @@
           },
           {
             prop: 'endTime',
-            label: '有效结束时间',
+            label: '有效结束时间',
             showOverflowTooltip: true,
             minWidth: 150,
             align: 'center'

+ 2 - 2
src/views/contractManage/contractBook/components/inventoryTable.vue

@@ -862,14 +862,14 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             align: 'center'
           },
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

+ 2 - 2
src/views/contractManage/contractBook/components/inventoryTabledetail.vue

@@ -292,7 +292,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (
@@ -304,7 +304,7 @@
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

+ 2 - 2
src/views/purchasingManage/inquiryManage/components/inquiryTable.vue

@@ -621,7 +621,7 @@
           {
             minWidth: 100,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             showOverflowTooltip: true,
             align: 'center'
@@ -629,7 +629,7 @@
           {
             minWidth: 120,
             prop: 'guaranteePeriodUnitCode',
-            label: '质保期单位',
+            label: '有效期单位',
             slot: 'guaranteePeriodUnitCode',
             showOverflowTooltip: true,
             align: 'center'

+ 4 - 4
src/views/purchasingManage/purchaseOrder/components/detailDialog.vue

@@ -781,7 +781,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (
@@ -793,7 +793,7 @@
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },
@@ -1011,7 +1011,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (
@@ -1023,7 +1023,7 @@
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },

+ 2 - 2
src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -833,14 +833,14 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             align: 'center'
           },
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '	质保截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },

+ 2 - 2
src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue

@@ -460,7 +460,7 @@
             {
               width: 200,
               prop: 'guaranteePeriod',
-              label: '质保期',
+              label: '有效期',
               slot: 'guaranteePeriod',
               align: 'center',
               show: v != 2,
@@ -473,7 +473,7 @@
             {
               width: 160,
               prop: 'guaranteePeriodDeadline',
-              label: '质保截止日期',
+              label: '有效期截止日期',
               slot: 'guaranteePeriodDeadline',
               align: 'center',
               show: v != 2

+ 2 - 2
src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -611,7 +611,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               let name = '';
@@ -628,7 +628,7 @@
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },

+ 2 - 2
src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue

@@ -523,7 +523,7 @@
           {
             width: 100,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               let val = '';
@@ -539,7 +539,7 @@
           {
             minWidth: 120,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             align: 'center'
           },
           {

+ 1 - 1
src/views/saleManage/businessOpportunity/components/opportunityDetailDialog.vue

@@ -327,7 +327,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;

+ 3 - 1
src/views/saleManage/businessOpportunity/index.vue

@@ -26,6 +26,7 @@
               icon="el-icon-plus"
               class="ele-btn-icon"
               @click="openEdit('add', {})"
+              v-if="contactStatus==1"
             >
               新建
             </el-button>
@@ -209,7 +210,8 @@
     },
     props: {
       contactId: '',
-      contactName: ''
+      contactName: '',
+      contactStatus:''
     },
     data() {
       return {

+ 1 - 1
src/views/saleManage/quotation/components/detailDialog.vue

@@ -275,7 +275,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (

+ 1 - 0
src/views/saleManage/quotation/index.vue

@@ -25,6 +25,7 @@
               icon="el-icon-plus"
               class="ele-btn-icon"
               @click="openEdit('add', {})"
+              v-if="contactData?.contactStatus==1"
             >
               新建
             </el-button>

+ 2 - 2
src/views/saleManage/saleOrder/customerReturnOrder/inventoryTable.vue

@@ -476,7 +476,7 @@ export default {
         {
           width: 200,
           prop: 'guaranteePeriod',
-          label: '质保期',
+          label: '有效期',
           slot: 'guaranteePeriod',
           formatter: (_row, _column, cellValue) => {
             return (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName;
@@ -486,7 +486,7 @@ export default {
         {
           width: 160,
           prop: 'guaranteePeriodDeadline',
-          label: '质保截止日期',
+          label: '有效期截止日期',
           slot: 'guaranteePeriodDeadline',
           align: 'center'
         },

+ 1 - 1
src/views/saleManage/saleOrder/entrustedReceive/components/detailDialog.vue

@@ -345,7 +345,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (

+ 2 - 2
src/views/saleManage/saleOrder/entrustedReceive/components/inventoryTable.vue

@@ -414,7 +414,7 @@
           {
             width: 100,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (
@@ -426,7 +426,7 @@
           {
             minWidth: 120,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             align: 'center'
           },
           {

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -733,7 +733,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               let val = '';

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/inventoryTableDetails.vue

@@ -298,7 +298,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (

+ 2 - 2
src/views/saleManage/saleOrder/invoice/components/replaceTable.vue

@@ -673,7 +673,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (
@@ -685,7 +685,7 @@
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效截止日期',
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },

+ 2 - 2
src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturn.vue

@@ -891,14 +891,14 @@ export default {
         {
           width: 200,
           prop: 'guaranteePeriod',
-          label: '质保期',
+          label: '有效期',
           slot: 'guaranteePeriod',
           align: 'center'
         },
         {
           width: 200,
           prop: 'guaranteePeriodDeadline',
-          label: '质保期截止日期',
+          label: '有效截止日期',
           slot: 'guaranteePeriodDeadline',
           show: this.isGuaranteePeriod,
           align: 'center'

+ 2 - 2
src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturnDetail.vue

@@ -280,14 +280,14 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             align: 'center'
           },
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

+ 2 - 2
src/views/salesServiceManagement/components/info.vue

@@ -532,7 +532,7 @@ export default {
         },
         {
           prop: 'guaranteePeriodDeadline',
-          label: '质保有效期',
+          label: '有效期',
           align: 'center',
           showOverflowTooltip: true
         },
@@ -542,7 +542,7 @@ export default {
           align: 'center',
           showOverflowTooltip: true,
           formatter: (_row, _column, cellValue) => {
-            return _row.warrantyStatus == 1 ? '质保期外' : '质保期内';
+            return _row.warrantyStatus == 1 ? '有效期外' : '有效期内';
           }
         },
         {