From c14b3ff5e137ceb2b227233bbc52c187edb5375f Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 16 Dec 2021 13:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B7=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=A1=E6=81=AF=20=20sxm=202021-12-16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/finishedProductWarehouse/boxingPrint.vue  | 5 ++++-
 .../finishedProductWarehouse/expirationTimeModification.vue | 2 +-
 .../finishedProductWarehouse/sluggishMaterialWarning.vue    | 6 +++---
 .../modules/rawMaterials/expirationTimeModification.vue     | 2 +-
 src/views/modules/rawMaterials/sluggishMaterialWarning.vue  | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/finishedProductWarehouse/boxingPrint.vue b/src/views/modules/finishedProductWarehouse/boxingPrint.vue
index b663f09..27c7c6e 100644
--- a/src/views/modules/finishedProductWarehouse/boxingPrint.vue
+++ b/src/views/modules/finishedProductWarehouse/boxingPrint.vue
@@ -146,6 +146,7 @@ export default {
       boxNumber: 0,
       itemCode: '',
       orderNo: '',
+      boxNo:'',
       // 打印模板列表
       printTemplates: [],
       // 语言词典集合
@@ -488,6 +489,7 @@ export default {
       this.boxNumber = val.rollsQty
       this.itemCode = val.itemCode
       this.orderNo = val.orderNo
+      this.boxNo = val.boxNo
       this.printVisible = true
       this.getReportFileListByCustomerId(val.itemCode)
     },
@@ -502,7 +504,8 @@ export default {
         isCustomer: reportFile[0],
         pickingNumber: this.boxNumber,
         partNo: this.itemCode,
-        orderNo: this.orderNo
+        orderNo: this.orderNo,
+        boxNo: this.boxNo,
       }
       printPacking(reportFileVo).then(({data}) => {
         if (data.code == 0) {
diff --git a/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue b/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue
index 852e7b1..67aa5de 100644
--- a/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue
+++ b/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue
@@ -144,7 +144,7 @@ export default {
     })
   },
   activated() {
-    this.getDataList()
+   // this.getDataList()
   },
   methods: {
     // 修改有效期
diff --git a/src/views/modules/finishedProductWarehouse/sluggishMaterialWarning.vue b/src/views/modules/finishedProductWarehouse/sluggishMaterialWarning.vue
index 99436b4..b0a6797 100644
--- a/src/views/modules/finishedProductWarehouse/sluggishMaterialWarning.vue
+++ b/src/views/modules/finishedProductWarehouse/sluggishMaterialWarning.vue
@@ -14,11 +14,11 @@
         <el-input oninput="value=value.replace(/[^\d]/g,'')" v-model="queryData.day" clearable>
         </el-input>
       </el-form-item>
-      <el-form-item label="rollno">
+      <el-form-item label="卷号">
         <el-input v-model="queryData.rollno" clearable>
         </el-input>
       </el-form-item>
-      <el-form-item label="partno">
+      <el-form-item label="物料编码">
         <el-input v-model="queryData.partno" clearable>
         </el-input>
       </el-form-item>
@@ -125,7 +125,7 @@
       })
     },
     activated () {
-      this.getDataList()
+    //  this.getDataList()
     },
     methods: {
       childByValue(childValue) {
diff --git a/src/views/modules/rawMaterials/expirationTimeModification.vue b/src/views/modules/rawMaterials/expirationTimeModification.vue
index b41c533..25afb51 100644
--- a/src/views/modules/rawMaterials/expirationTimeModification.vue
+++ b/src/views/modules/rawMaterials/expirationTimeModification.vue
@@ -146,7 +146,7 @@ export default {
     })
   },
   activated () {
-    this.getDataList()
+   // this.getDataList()
   },
   methods: {
     // 修改有效期
diff --git a/src/views/modules/rawMaterials/sluggishMaterialWarning.vue b/src/views/modules/rawMaterials/sluggishMaterialWarning.vue
index 060f578..a3c2497 100644
--- a/src/views/modules/rawMaterials/sluggishMaterialWarning.vue
+++ b/src/views/modules/rawMaterials/sluggishMaterialWarning.vue
@@ -127,7 +127,7 @@ export default {
     })
   },
   activated() {
-    this.getDataList()
+   // this.getDataList()
   },
   methods: {