From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/quality/Packaging_ledger/index.vue |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 4852053..d37995d 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -71,23 +71,34 @@
               <el-table-column
                 label="浜у搧"
                 prop="product"
+                show-overflow-tooltip
                 align="center"
               />
               <el-table-column
                 label="浜у搧缂栧彿"
                 prop="productNo"
+                show-overflow-tooltip
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                label="鎵规鍙�"
+                prop="outBatchNo"
+                show-overflow-tooltip
                 align="center"
               >
               </el-table-column>
               <el-table-column
                 label="瑙勬牸鍨嬪彿"
                 prop="specs"
+                show-overflow-tooltip
                 align="center"
               >
               </el-table-column>
               <el-table-column
                 label="鍗曚綅"
                 prop="unit"
+                show-overflow-tooltip
                 align="center"
               >
               </el-table-column>
@@ -95,19 +106,16 @@
                 label="鏁伴噺"
                 prop="number"
                 align="center"
+                show-overflow-tooltip
                 width="80"
-              >
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.number"></el-input>
-                </template>
-              </el-table-column>
+              ></el-table-column>
               <el-table-column
                 fixed="right"
                 label="鎿嶄綔"
                 align="center"
                 width="80">
                 <template slot-scope="scope">
-                  <el-button @click="deleteadd(scope.row)"  size="small">鍒犻櫎</el-button>
+                  <el-button type="text" @click="deleteadd(scope.row)" icon="el-icon-delete"  size="small">鍒犻櫎</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -140,7 +148,7 @@
                 <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
               </el-row>
               <el-row>
-                <el-col :span="10" :offset="3">浜岀淮鐮侊細</el-col>
+                <el-col :span="10" :offset="3">鍖呰鍙拌处浜岀淮鐮侊細</el-col>
                 <el-col :span="10">
                   <vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
                 </el-col>
@@ -349,24 +357,12 @@
           return
         }
         this.diaPrintTab = true
-        console.log(this.multipleSelection);
         this.multipleSelection.forEach(item=>{
           let obj = {
             packageNo: item.packageNo,
             contractNo: item.contractNo,
-            boxInfo: []
+            packageBoxId:item.id
           }
-          list({packageBoxId:item.id}).then((res) =>{
-            res.data.data.forEach(ele=>{
-              obj.boxInfo.push({
-                product: ele.product,
-                productNo: ele.productNo,
-                specs: ele.specs,
-                unit: ele.unit,
-                number: ele.number
-              })
-            })
-          })
           this.qrData.push(obj)
         })
       },
@@ -420,9 +416,15 @@
          this.testStandardParams.forEach(el => {
               el.packageBoxId =this.goid
          });
+         console.log(this.testStandardParams);
+  //       return
         saveList(this.testStandardParams).then((res) =>{
-          this.$message.success('淇濆瓨鎴愬姛')
-          this.rightquery()
+          if(res.status===200){
+            this.$message.success('淇濆瓨鎴愬姛')
+            this.rightquery()
+          }
+        }).catch(error=>{
+          console.error(error);
         })
       },
       //鍒犻櫎

--
Gitblit v1.9.3