详情页面修改同步/后端打印数据不一致问题处理

zkqy-ui/src/views/orderMange/approve.vue

@@ -1085,7 +1085,6 @@ export default {
         },
       ];
       let res = await queryDropDownBoxData(payLoad);
-      await this.getDropDownData();
       if (res.code == 200) {
         console.log(res);
         let { sale_craft, sale_order, sale_products } = res.data.resultMap;
@@ -1146,7 +1145,7 @@ export default {
             <tbody>
                 <tr>
                     <td width="600px" colspan="4">合同号：${saleNo}</td>
-                    <td width="600px" colspan="4">日期：${saleDate.replace(
+                    <td width="600px" colspan="5">日期：${saleDate.replace(
                       "T",
                       " "
                     )}</td>
@@ -1155,11 +1154,11 @@ export default {
                     <td width="300px" colspan="2">客户名称：</td>
                     <td width="300px" colspan="2">${customerName}</td>
                     <td width="300px" colspan="2">联系人：</td>
-                    <td width="150px" colspan="1">${contactPerson}</td>
+                    <td width="150px" colspan="3">${contactPerson}</td>
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">客户地址：</td>
-                    <td width="300px" colspan="2">${customAddress}</td>
+                    <td width="300px" colspan="3">${customAddress}</td>
                     <td width="300px" colspan="2">客户国别：</td>
                     <td width="300px" colspan="2">${customCountryType}</td>
                 </tr>
@@ -1169,22 +1168,23 @@ export default {
                       "T",
                       " "
                     )}</td>
-                    <td  colspan="1">交货周期：</td>
+                    <td  colspan="2">交货周期：</td>
                     <td >${saleLeadTime}</td>
                     <td  colspan="2">交货日期：</td>
                     <td >${deliveryDate.replace("T", " ")}</td>
                 </tr>
                 <tr align="center">
-                    <td colspan="8">货品明细</td>
+                    <td colspan="9">货品明细</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">品名</td>
-                    <td width="150px">类型</td>
+                    <td width="100px">规格</td>
+                    <td width="100px">类型</td>
+                    <td width="100px">色号</td>
                     <td width="150px">数量/kg</td>
                     <td width="150px">单价</td>
                     <td width="150px">金额</td>
                     <td width="150px">切片型号</td>
-                    <td width="150px">色号</td>
                     <td width="150px">备注</td>
                 </tr>`;
         let amountTotal = 0,
@@ -1198,27 +1198,31 @@ export default {
           let productData = this.allProductionOptions.find(
             (pro) => pro.productNo == item.productNo
           );
-          console.log(this.allProductionOptions);
-          console.log("productData", productData);
+          console.log(item.productNo, productData, this.allProductionOptions);
           item.sliceTypeLabel =
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
               ?.materielName || "";
           item.colourNumberLabel = this.colourNumberOptions.find(
             (k) => k.materielCode == item.colourNumber
           )?.materieColorNumber;
+          // item.materieEncoding + item.materieColorNumber
           let materieEncoding = this.colourNumberOptions.find(
             (k) => k.materielCode == item.colourNumber
           )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
+          let productSpecifications = productData
+            ? productData.productSpecifications
+            : ""; //规格
           printStr += `<tr align="center">
-                    <td>${productName}</td>    
-                    <td>${productType}</td>    
+                    <td>${productName}</td>
+                    <td>${productSpecifications}</td>
+                    <td>${productType}</td>
+                    <td>${materieEncoding + item.colourNumberLabel}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>
                     <td>${item.sliceTypeLabel}</td>
-                    <td>${materieEncoding + item.colourNumberLabel}</td>
                     <td>${item.remark}</td>
                 </tr>`;
         }
@@ -1227,15 +1231,16 @@ export default {
         <tr align="center">
           <td>小计：</td>
            <td></td>
+           <td></td>
+          <td></td>
           <td>${amountTotal.toFixed(2)}</td>
           <td>${singlTotal.toFixed(2)}</td>
           <td>${moneyTotal.toFixed(2)}</td>
           <td></td>
           <td></td>
-          <td></td>
         </tr>
                 <tr>
-                    <td colspan="8">合计金额（大写）：${saleAmountInWords}</td>
+                    <td colspan="9">合计金额（大写）：${saleAmountInWords}</td>
                 </tr>
                 `;
 
@@ -1244,16 +1249,16 @@ export default {
           printStr += `
           <tr>
             <td colspan="4">付款方式：${payType}</td>
-            <td colspan="4">定金：${earnestMoney}</td>
+            <td colspan="5">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="8">付款方式：${payType}</td>
+              <td colspan="9">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">
-                    <td colspan="8">工艺要求</td>
+                    <td colspan="9">工艺要求</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">网络</td>
@@ -1264,6 +1269,7 @@ export default {
                     <td width="150px">其他</td>
                     <td width="150px"></td>
                     <td width="150px"></td>
+                    <td width="150px"></td>
                 </tr>
                 <tr align="center">
                     <td >${craftGrid}</td>
@@ -1274,20 +1280,22 @@ export default {
                     <td>${craftOther}</td>
                     <td width="150px"></td>
                     <td width="150px"></td>
+                    <td width="150px"></td>
                 </tr>
                 <tr>
-                    <td colspan="8">包装/贴唛：${craftMark}</td>
+                    <td colspan="9">包装/贴唛：${craftMark}</td>
                 </tr>
                 <tr>
-                    <td colspan="8">装运方式：${shippingMethod}</td>
+                    <td colspan="9">装运方式：${shippingMethod}</td>
                 </tr>
                 <tr align="center">
                     <td colspan="2">业务员：</td>
                     <td colspan="2">${salesman}</td>
                     <td colspan="2">财务部：</td>
-                    <td colspan="2">${finance}</td>
-                    
+                    <td colspan="3">${finance}</td>
+
                 </tr>
+
                 <tr align="center">
                     <td colspan="2">业务主管：</td>
                     <td colspan="2">${saleApprover}</td>
@@ -1295,11 +1303,33 @@ export default {
                     <td></td>
                     <td></td>
                     <td></td>
+                    <td></td>
                 </tr>
             </tbody>
         </table>
         `;
         return printStr;
+        // <td colspan="2">业务主管：</td>
+        // <td colspan="2">${saleLeader}</td>
+        // <tr align="center">
+
+        //     // <td colspan="2">生产部：</td>
+        //     // <td colspan="2">${production}</td>
+        // </tr>
+        //         <tr align="center">
+        //             <td colspan="2"> 2</td>
+        //             <td> </td>
+        //             <td> </td>
+        //             <td> </td>
+        //             <td> </td>
+        //         </tr>
+        //         <tr>
+        //             <td colspan="2">小计：</td>
+        //             <td></td>
+        //             <td></td>
+        //             <td></td>
+        //             <td></td>
+        //         </tr>
       }
     },
     // 审批状态改变回调
@@ -2885,6 +2915,9 @@ export default {
       // console.log(value, label);
     },
   },
+  mounted() {
+    this.getDropDownData();
+  },
 };
 </script>
 

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -987,12 +987,13 @@ export default {
         suttle, //净重
         remark, //备注
         printFormat,
+        qrCodeId,
       } = printRow;
       let uuid = uuidv4();
       let temp =
         id +
         "@" +
-        uuid +
+        qrCodeId +
         "@" +
         canisterNum +
         "@" +
@@ -1149,12 +1150,12 @@ export default {
             // 先打印
             this.changeGrossWeight(this.printTableData[0]);
             // 后端打印
-            // await this.newPrintHandler();
+            await this.newPrintHandler();
             // 前端打印
-            codeListPrint(this.printTableData, "printDom");
-            if (this.excuteType == 1) {
-              this.tableData.push(this.printTableData[0]);
-            }
+            // codeListPrint(this.printTableData, "printDom");
+            // if (this.excuteType == 1) {
+            //   this.tableData.push(this.printTableData[0]);
+            // }
             // 后保存数据
             let payLoad = {
               ...this.form,

zkqy-ui/src/views/orderMange/financeApprove.vue

@@ -615,7 +615,6 @@ export default {
         },
       ];
       let res = await queryDropDownBoxData(payLoad);
-      await this.getDropDownData();
       if (res.code == 200) {
         console.log(res);
         let { sale_craft, sale_order, sale_products } = res.data.resultMap;
@@ -676,7 +675,7 @@ export default {
             <tbody>
                 <tr>
                     <td width="600px" colspan="4">合同号：${saleNo}</td>
-                    <td width="600px" colspan="4">日期：${saleDate.replace(
+                    <td width="600px" colspan="5">日期：${saleDate.replace(
                       "T",
                       " "
                     )}</td>
@@ -685,11 +684,11 @@ export default {
                     <td width="300px" colspan="2">客户名称：</td>
                     <td width="300px" colspan="2">${customerName}</td>
                     <td width="300px" colspan="2">联系人：</td>
-                    <td width="150px" colspan="1">${contactPerson}</td>
+                    <td width="150px" colspan="3">${contactPerson}</td>
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">客户地址：</td>
-                    <td width="300px" colspan="2">${customAddress}</td>
+                    <td width="300px" colspan="3">${customAddress}</td>
                     <td width="300px" colspan="2">客户国别：</td>
                     <td width="300px" colspan="2">${customCountryType}</td>
                 </tr>
@@ -699,22 +698,23 @@ export default {
                       "T",
                       " "
                     )}</td>
-                    <td  colspan="1">交货周期：</td>
+                    <td  colspan="2">交货周期：</td>
                     <td >${saleLeadTime}</td>
                     <td  colspan="2">交货日期：</td>
                     <td >${deliveryDate.replace("T", " ")}</td>
                 </tr>
                 <tr align="center">
-                    <td colspan="8">货品明细</td>
+                    <td colspan="9">货品明细</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">品名</td>
-                    <td width="150px">类型</td>
+                    <td width="100px">规格</td>
+                    <td width="100px">类型</td>
+                    <td width="100px">色号</td>
                     <td width="150px">数量/kg</td>
                     <td width="150px">单价</td>
                     <td width="150px">金额</td>
                     <td width="150px">切片型号</td>
-                    <td width="150px">色号</td>
                     <td width="150px">备注</td>
                 </tr>`;
         let amountTotal = 0,
@@ -728,26 +728,31 @@ export default {
           let productData = this.allProductionOptions.find(
             (pro) => pro.productNo == item.productNo
           );
-          console.log("item", item);
+          console.log(item.productNo, productData, this.allProductionOptions);
           item.sliceTypeLabel =
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
               ?.materielName || "";
           item.colourNumberLabel = this.colourNumberOptions.find(
             (k) => k.materielCode == item.colourNumber
           )?.materieColorNumber;
+          // item.materieEncoding + item.materieColorNumber
           let materieEncoding = this.colourNumberOptions.find(
             (k) => k.materielCode == item.colourNumber
           )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
+          let productSpecifications = productData
+            ? productData.productSpecifications
+            : ""; //规格
           printStr += `<tr align="center">
                     <td>${productName}</td>
+                    <td>${productSpecifications}</td>
                     <td>${productType}</td>
+                    <td>${materieEncoding + item.colourNumberLabel}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>
                     <td>${item.sliceTypeLabel}</td>
-                    <td>${materieEncoding + item.colourNumberLabel}</td>
                     <td>${item.remark}</td>
                 </tr>`;
         }
@@ -756,15 +761,16 @@ export default {
         <tr align="center">
           <td>小计：</td>
            <td></td>
+           <td></td>
+          <td></td>
           <td>${amountTotal.toFixed(2)}</td>
           <td>${singlTotal.toFixed(2)}</td>
           <td>${moneyTotal.toFixed(2)}</td>
           <td></td>
           <td></td>
-          <td></td>
         </tr>
                 <tr>
-                    <td colspan="8">合计金额（大写）：${saleAmountInWords}</td>
+                    <td colspan="9">合计金额（大写）：${saleAmountInWords}</td>
                 </tr>
                 `;
 
@@ -773,16 +779,16 @@ export default {
           printStr += `
           <tr>
             <td colspan="4">付款方式：${payType}</td>
-            <td colspan="4">定金：${earnestMoney}</td>
+            <td colspan="5">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="8">付款方式：${payType}</td>
+              <td colspan="9">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">
-                    <td colspan="8">工艺要求</td>
+                    <td colspan="9">工艺要求</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">网络</td>
@@ -793,6 +799,7 @@ export default {
                     <td width="150px">其他</td>
                     <td width="150px"></td>
                     <td width="150px"></td>
+                    <td width="150px"></td>
                 </tr>
                 <tr align="center">
                     <td >${craftGrid}</td>
@@ -803,20 +810,22 @@ export default {
                     <td>${craftOther}</td>
                     <td width="150px"></td>
                     <td width="150px"></td>
+                    <td width="150px"></td>
                 </tr>
                 <tr>
-                    <td colspan="8">包装/贴唛：${craftMark}</td>
+                    <td colspan="9">包装/贴唛：${craftMark}</td>
                 </tr>
                 <tr>
-                    <td colspan="8">装运方式：${shippingMethod}</td>
+                    <td colspan="9">装运方式：${shippingMethod}</td>
                 </tr>
                 <tr align="center">
                     <td colspan="2">业务员：</td>
                     <td colspan="2">${salesman}</td>
                     <td colspan="2">财务部：</td>
-                    <td colspan="2">${finance}</td>
+                    <td colspan="3">${finance}</td>
+
                 </tr>
-                
+
                 <tr align="center">
                     <td colspan="2">业务主管：</td>
                     <td colspan="2">${saleApprover}</td>
@@ -824,11 +833,19 @@ export default {
                     <td></td>
                     <td></td>
                     <td></td>
+                    <td></td>
                 </tr>
             </tbody>
         </table>
         `;
         return printStr;
+        // <td colspan="2">业务主管：</td>
+        // <td colspan="2">${saleLeader}</td>
+        // <tr align="center">
+
+        //     // <td colspan="2">生产部：</td>
+        //     // <td colspan="2">${production}</td>
+        // </tr>
         //         <tr align="center">
         //             <td colspan="2"> 2</td>
         //             <td> </td>
@@ -2372,6 +2389,9 @@ export default {
       // console.log(value, label);
     },
   },
+  mounted() {
+    this.getDropDownData();
+  },
 };
 </script>