同步色号接口修改后的渲染逻辑

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

@@ -433,10 +433,10 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="colourNumber" label="色号">
+              <el-table-column prop="colours" label="色号">
                 <template slot-scope="scope">
                   <el-select
-                    v-model="scope.row.colourNumber"
+                    v-model="scope.row.colours"
                     placeholder=""
                     clearable
                     filterable

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

@@ -737,9 +737,9 @@ export default {
             (k) => k.materielCode == item.colourNumber
           )?.materieColorNumber;
           // item.materieEncoding + item.materieColorNumber
-          let materieEncoding = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieEncoding;
+          // let materieEncoding = this.colourNumberOptions.find(
+          //   (k) => k.materielCode == item.colourNumber
+          // )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           let productSpecifications = productData
@@ -749,7 +749,7 @@ export default {
                     <td>${productName}</td>
                     <td>${productSpecifications}</td>
                     <td>${productType}</td>
-                    <td>${materieEncoding + item.colourNumberLabel}</td>
+                    <td>${item.colours}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

zkqy-ui/src/views/orderMange/financialReconciliation/index.vue

@@ -624,6 +624,7 @@ export default {
         singlTotal = 0,
         moneyTotal = 0;
       for (let i = 0; i < this.productionTableData.length; i++) {
+        console.log(item);
         let item = this.productionTableData[i];
         amountTotal += Number(item.productNumber);
         singlTotal += Number(item.productUnitPrice);
@@ -642,7 +643,7 @@ export default {
         printStr += `<tr align="center">
                     <td>${item.productName}</td>
                     <td>${item.productSpecifications}</td>
-                    <td>${item.colourNumberLabel}</td>
+                    <td>${item.colours}</td>
                     <td>${item.productType}</td>
                     <td>${item.lotNumber}</td>
                     <td>${item.productNumber}</td>

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -2539,9 +2539,10 @@ export default {
         item.sliceTypeLabel =
           this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
             ?.materielName || "";
-        item.colourNumberLabel = this.colourNumberOptions.find(
-          (k) => k.colour == item.colours
-        )?.colour;
+        // item.colourNumberLabel = this.colourNumberOptions.find(
+        //   (k) => k.colour == item.colours
+        // )?.colour;
+        item.colourNumberLabel = item.colours;
         let productName = productData ? productData.productName : "";
         let productType = productData ? productData.productType : "";
         printStr += `<tr align="center">