lph 1 жил өмнө
parent
commit
5d20dad0bb

+ 4 - 1
zkqy-ui/src/views/orderMange/approve.vue

@@ -1208,6 +1208,9 @@ export default {
           item.colourNumberLabel = this.colourNumberOptions.find(
             (k) => k.materielCode == item.colourNumber
           )?.materieColorNumber;
+          let materieEncoding = this.colourNumberOptions.find(
+            (k) => k.materielCode == item.colourNumber
+          )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">
@@ -1217,7 +1220,7 @@ export default {
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>
                     <td>${item.sliceTypeLabel}</td>
-                    <td>${item.colourNumberLabel}</td>
+                    <td>${materieEncoding + item.colourNumberLabel}</td>
                     <td>${item.remark}</td>
                 </tr>`;
         }

+ 4 - 1
zkqy-ui/src/views/orderMange/financeApprove.vue

@@ -735,6 +735,9 @@ export default {
           item.colourNumberLabel = this.colourNumberOptions.find(
             (k) => k.materielCode == item.colourNumber
           )?.materieColorNumber;
+          let materieEncoding = this.colourNumberOptions.find(
+            (k) => k.materielCode == item.colourNumber
+          )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">
@@ -744,7 +747,7 @@ export default {
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>
                     <td>${item.sliceTypeLabel}</td>
-                    <td>${item.colourNumberLabel}</td>
+                    <td>${materieEncoding + item.colourNumberLabel}</td>
                     <td>${item.remark}</td>
                 </tr>`;
         }