嘉实需求

src/BIZComponents/inventoryTable.vue

@@ -190,7 +190,7 @@
               :prop="'datasource.' + scope.$index + '.guaranteePeriod'"
               :rules="{
                 pattern: numberReg,
-                message: '请输入质保期',
+                message: '请输入有效期',
                 trigger: 'blur'
               }"
             >
@@ -909,7 +909,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             // headerSlot: 'headerCustomerExpectDeliveryDeadline',
             align: 'center'
@@ -917,7 +917,7 @@
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

src/BIZComponents/inventoryTableDetails.vue

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

src/views/bpm/handleTask/components/businessOpportunity/inventoryTable.vue

@@ -769,14 +769,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"

src/views/bpm/handleTask/components/businessOpportunity/opportunityDetailDialog.vue

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

src/views/bpm/handleTask/components/businessOpportunity/saleGeneralityInventoryTable.vue

@@ -167,7 +167,7 @@
               :rules="{
                 required: true,
                 pattern: numberReg,
-                message: '请输入质保期',
+                message: '请输入有效期',
                 trigger: 'blur'
               }"
             >
@@ -715,7 +715,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             headerSlot: 'headerCustomerExpectDeliveryDeadline',
             align: 'center'
@@ -723,7 +723,7 @@
           {
             width: 200,
             prop: 'guaranteePeriodDeadline',
-            label: '质保期截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline',
             show: this.isGuaranteePeriod,
             align: 'center'

src/views/bpm/handleTask/components/contractBook/detailDialog.vue

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

src/views/bpm/handleTask/components/contractBook/inventoryTable.vue

@@ -782,14 +782,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"

src/views/bpm/handleTask/components/contractBook/inventoryTabledetail.vue

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

src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -567,14 +567,14 @@
     {
       minWidth: 100,
       prop: 'guaranteePeriod',
-      label: '质保期',
+      label: '有效期',
       slot: 'guaranteePeriod',
       align: 'center'
     },
     {
       minWidth: 120,
       prop: 'guaranteePeriodUnitCode',
-      label: '质保期单位',
+      label: '有效期单位',
       slot: 'guaranteePeriodUnitCode',
       align: 'center'
     },

src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/detailDialog.vue

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

src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

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

src/views/bpm/handleTask/components/purchaseOrder/inventoryTable.vue

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

src/views/bpm/handleTask/components/purchaseOrder/invoice/inventoryTable.vue

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

src/views/bpm/handleTask/components/purchaseOrder/invoice/receiptInfo.vue

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

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/detailDialog.vue

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

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/inventoryTable.vue

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

src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/inventoryTable.vue

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

src/views/bpm/handleTask/components/quotation/detailDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/detailDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/inventoryTable.vue

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

src/views/bpm/handleTask/components/saleOrder/inventoryTable.vue

@@ -481,7 +481,7 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
               return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
@@ -490,7 +490,7 @@
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline'
           },
           // {
@@ -620,13 +620,13 @@
           {
             width: 200,
             prop: 'guaranteePeriod',
-            label: '质保期',
+            label: '有效期',
             slot: 'guaranteePeriod'
           },
           {
             width: 160,
             prop: 'guaranteePeriodDeadline',
-            label: '质保截止日期',
+            label: '有效期截止日期',
             slot: 'guaranteePeriodDeadline'
           },
           // {

src/views/bpm/handleTask/components/saleOrder/invoice/addInvoiceDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/invoice/inventoryTable.vue

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

src/views/bpm/handleTask/components/saleOrder/returnGoods/addReturnGoodsDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTableReturn.vue

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

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTabledetail.vue

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

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/inventoryTabledetail.vue

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

src/views/bpm/outgoingManagement/components/AssetsDialog.vue

@@ -318,9 +318,13 @@ export default {
 
           if (matchedProduct) {
             this.$set(item, 'outboundNum', matchedProduct.measureQuantity);
-          } else {
-            console.warn('No match for item.id:', item.id);
-          }
+          } 
+          const isSelection = this.selectionList.find(
+              (product) => product.categoryId === item.categoryId
+            );
+            if(isSelection){
+              this.$set(item, 'outboundNum', isSelection.outboundNum);
+            }
         }
 
       } else {
@@ -333,9 +337,13 @@ export default {
 
           if (matchedProduct) {
             this.$set(item, 'outboundNum', matchedProduct.measureQuantity);
-          } else {
-            console.warn('No match for item.id:', item.id);
           }
+          const isSelection = this.selectionList.find(
+              (product) => product.id === item.id
+            );
+            if(isSelection){
+              this.$set(item, 'outboundNum', isSelection.outboundNum);
+            }
         }
       }
 

src/views/bpm/outgoingManagement/components/eomEdit.vue

@@ -134,7 +134,7 @@
           </el-table-column>
           <el-table-column
             prop="guaranteePeriod"
-            label="质保期"
+            label="有效期"
             width="120"
             align="center"
           >

src/views/bpm/stockManagement/components/pickerDetails.vue

@@ -145,14 +145,14 @@
           </el-table-column>
           <el-table-column
             prop="guaranteePeriod"
-            label="质保期"
+            label="有效期"
             width="120"
             align="center"
           >
           </el-table-column>
           <el-table-column
             prop="guaranteePeriodDeadline"
-            label="质保截止日期"
+            label="有效期截止日期"
             width="120"
             align="center"
           >

src/views/bpm/stockManagement/storage.vue

@@ -73,9 +73,9 @@
         </header-title>
         <div class="form_table">
           <el-form ref="productListRef" :model="{ productList: productList }" :show-message="false">
-            <!-- <el-button v-if="productList.length != 0" type="success" plain
+            <el-button v-if="productList.length != 0" type="success" plain
               style="margin-bottom: 20px; float: right; margin-right: 20px" size="mini"
-              @click="listSaveArrs">批量保存</el-button> -->
+              @click="listSaveArrs">批量保存</el-button>
             <el-button v-if="productList.length != 0 && this.packingList.length == 0" type="success" plain
               style="margin-bottom: 20px; float: right; margin-right: 20px" size="mini"
               @click="handleWareHouse(productList, '', 'batch')">批量选择仓库</el-button>