修改所有与订单相关的色号接口及相关逻辑

zkqy-ui/src/api/tablelist/commonTable.js

@@ -401,6 +401,14 @@ export function queryMaterielList(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+// 订单管理  新  获取色号选项数据接口
+export function productColourList(data) {
+  return request({
+    url: '/system/ProductColour/list',
+    method: 'get',
+    //baseURL: process.env.VUE_APP_BASE_API1
+  })
+}
 
 // 订单管理  新的获取产品数据
 

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

@@ -462,28 +462,28 @@
               </el-table-column>
               <el-table-column prop="productType" label="类型">
               </el-table-column>
-              <el-table-column prop="colourNumber" width="130" label="色号">
+              <el-table-column prop="colours" width="130" label="色号">
                 <template slot-scope="scope">
                   <el-form-item
-                    :prop="'colourNumber-' + scope.$index"
-                    :name="'colourNumber-' + scope.$index"
+                    :prop="'colours-' + scope.$index"
+                    :name="'colours-' + scope.$index"
                     style="margin: 0px; padding: 0px"
                   >
                     <el-select
-                      v-model="scope.row.colourNumber"
+                      v-model="scope.row.colours"
                       placeholder=""
                       filterable
                       @change="colourNumberChangeHandler(scope.row)"
                     >
                       <el-option
                         v-for="item in colourNumberOptions"
-                        :key="item.materielCode"
-                        :label="item.materieEncoding + item.materieColorNumber"
-                        :value="item.materielCode"
+                        :key="item.colour"
+                        :label="item.colour"
+                        :value="item.colour"
                       >
-                        <span class="discribe" style="float: left">{{
+                        <!-- <span class="discribe" style="float: left">{{
                           item.materieEncoding + item.materieColorNumber
-                        }}</span>
+                        }}</span> -->
                         <!-- <span
                         style="float: right; color: #8492a6; font-size: 13px"
                         >{{ item.materielCode }}</span
@@ -829,6 +829,7 @@ import {
   getSaleOrderProductionListDistinct,
   getProductSpecificationsByProductName,
   printOutsourceOrder,
+  productColourList,
 } from "@/api/tablelist/commonTable";
 import { updateOrder } from "@/api/system/retailMange.js";
 import { listData } from "@/api/system/tenant/data";
@@ -913,7 +914,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         craftGrid: "", //网络
@@ -1355,7 +1356,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         craftGrid: "", //网络
@@ -1429,7 +1430,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         specificationsList: [],
         productSpecifications: "", //型号
@@ -1494,7 +1495,7 @@ export default {
             validator: this.validateTableField,
           },
         ];
-        this.rules["colourNumber-" + i] = [
+        this.rules["colours-" + i] = [
           {
             // required: true,
             message: "请选择色号",
@@ -1589,11 +1590,12 @@ export default {
           },
         ];
         // let res = await queryDropDownBoxData(payLoad);
-        let res = await queryMaterielList();
+        // let res = await queryMaterielList();
+        let res = await productColourList({ isEnablePaging: false });
         if (res.code == 200) {
           console.log(res.data);
           // let { materiel } = res.data;
-          this.colourNumberOptions = res.data || [];
+          this.colourNumberOptions = res.rows || [];
         } else {
           throw Error("获取下拉框数据失败");
         }
@@ -1858,7 +1860,7 @@ export default {
           item.productUnitPrice &&
           item.productAmounts &&
           item.sliceType &&
-          item.colourNumber
+          item.colours
         );
       });
       if (!res) {
@@ -1998,20 +2000,19 @@ export default {
             delete item.status;
             delete item.specificationsList;
             delete item.productSpecifications;
+            delete item.productType;
             const matchedOption = this.colourNumberOptions.find(
-              (option) => option.materielCode === item.colourNumber
+              (option) => option.colour === item.colours
             );
-            let taskName =
-              item.productName +
-              "-" +
-              matchedOption.materieColorNumber +
-              "-" +
-              matchedOption.materieEncoding;
+            let taskName = item.productName + "-" + matchedOption.colour;
+            // +
+            // "-" +
+            // matchedOption.materieEncoding;
             item.taskName = taskName;
           });
-          this.productionTableData.forEach((item) => {
-            delete item.productType; //删除产品类型
-          });
+          // this.productionTableData.forEach((item) => {
+          //   delete item.productType; //删除产品类型
+          // });
           console.log(this.productionTableData);
           // return;
           let productData = {
@@ -3100,17 +3101,17 @@ export default {
     },
     // 色号改变回调
     colourNumberChangeHandler(row) {
-      let { colourNumber } = row;
-      if (colourNumber) {
+      let { colours } = row;
+      if (colours) {
         let target = this.colourNumberOptions.find(
-          (item) => item.materielCode == colourNumber
+          (item) => item.colour == colours
         );
         if (target) {
           row.colourNumberLabel =
             target.materieEncoding + target.materieColorNumber;
         }
         // row.colourNumberLabel = this.colourNumberOptions.find(
-        //   (item) => item.materielCode == colourNumber
+        //   (item) => item.materielCode == colours
         // )?.materieColorNumber;
       }
     },
@@ -3278,12 +3279,12 @@ export default {
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
               ?.materielName || "";
           item.colourNumberLabel = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieColorNumber;
+            (k) => k.colour == item.colours
+          )?.colour;
           // item.materieEncoding + item.materieColorNumber
-          let materieEncoding = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieEncoding;
+          // let materieEncoding = this.colourNumberOptions.find(
+          //   (k) => k.colour == item.colours
+          // )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           let productSpecifications = productData
@@ -3293,7 +3294,7 @@ export default {
                     <td>${productName}</td>
                     <td>${productSpecifications}</td>
                     <td>${productType}</td>
-                    <td>${materieEncoding + item.colourNumberLabel}</td>
+                    <td>${item.colourNumberLabel}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

zkqy-ui/src/views/orderMange/order/oldStockOrder.vue

@@ -536,15 +536,15 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="colourNumber" width="150" label="色号">
+              <el-table-column prop="colours" width="150" label="色号">
                 <template slot-scope="scope">
                   <el-form-item
-                    :prop="'colourNumber-' + scope.$index"
-                    :name="'colourNumber-' + scope.$index"
+                    :prop="'colours-' + scope.$index"
+                    :name="'colours-' + scope.$index"
                     style="margin: 0px; padding: 0px"
                   >
                     <el-select
-                      v-model="scope.row.colourNumber"
+                      v-model="scope.row.colours"
                       placeholder=""
                       clearable
                       filterable
@@ -552,13 +552,13 @@
                     >
                       <el-option
                         v-for="item in colourNumberOptions"
-                        :key="item.materielCode"
-                        :label="item.materieEncoding + item.materieColorNumber"
-                        :value="item.materielCode"
+                        :key="item.colour"
+                        :label="item.colour"
+                        :value="item.colour"
                       >
-                        <span class="discribe" style="float: left">{{
+                        <!-- <span class="discribe" style="float: left">{{
                           item.materieEncoding + item.materieColorNumber
-                        }}</span>
+                        }}</span> -->
                         <!-- <span
                         style="float: right; color: #8492a6; font-size: 13px"
                         >{{ item.materielCode }}</span
@@ -782,6 +782,7 @@ import {
   queryMaterielList,
   getSaleOrderProductionListDistinct,
   getProductSpecificationsByProductName,
+  productColourList,
 } from "@/api/tablelist/commonTable";
 import {
   saleOrderList,
@@ -915,7 +916,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         orderRemark: "",
@@ -1168,13 +1169,13 @@ export default {
         lotNumber,
         productName,
         productSpecifications,
-        colourNumber,
+        colours,
         specificationsList,
       } = row;
 
       let productColour = "";
       let targetColor = this.colourNumberOptions.find((item) => {
-        return item.materielCode == colourNumber;
+        return item.colour == colours;
       });
       let productId = "";
       if (specificationsList && specificationsList.length > 0) {
@@ -1185,7 +1186,7 @@ export default {
       }
       if (targetColor) {
         productColour =
-          targetColor.materieEncoding + "" + targetColor.materieColorNumber;
+          targetColor.colour;
       }
       let payload = {
         productId,
@@ -1399,7 +1400,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         craftGrid: "", //网络
@@ -1478,7 +1479,7 @@ export default {
         sliceType: "022", //切片类型  初始为  切片
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         specificationsList: [],
         productSpecifications: "", //型号
@@ -1546,7 +1547,7 @@ export default {
             validator: this.validateTableField,
           },
         ];
-        this.rules["colourNumber-" + i] = [
+        this.rules["colours-" + i] = [
           {
             // required: true,
             message: "请选择色号",
@@ -1665,10 +1666,11 @@ export default {
           },
         ];
         // let res = await queryDropDownBoxData(payLoad);
-        let res = await queryMaterielList();
+        // let res = await queryMaterielList();
+        let res = await productColourList({ isEnablePaging: false });
         if (res.code == 200) {
           // let { materiel } = res.data;
-          this.colourNumberOptions = res.data || [];
+          this.colourNumberOptions = res.rows || [];
         } else {
           throw Error("获取下拉框数据失败");
         }
@@ -1780,7 +1782,7 @@ export default {
           item.productUnitPrice &&
           item.productAmounts &&
           item.sliceType &&
-          item.colourNumber
+          item.colours
         );
       });
       if (!res) {
@@ -2284,7 +2286,7 @@ export default {
           sliceType, //切片类型  初始为  切片
           sliceTypeLabel,
           colourNumberLabel,
-          colourNumber, //色号
+          colours, //色号
           remark, //备注
           lotNumber, //批号
         } = item;
@@ -2318,7 +2320,7 @@ export default {
           sliceType, //切片类型  初始为  切片
           sliceTypeLabel,
           colourNumberLabel,
-          colourNumber, //色号
+          colours, //色号
           remark,
           lotNumber,
           inventoryBoxNum: 0,
@@ -2525,8 +2527,8 @@ export default {
           this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
             ?.materielName || "";
         item.colourNumberLabel = this.colourNumberOptions.find(
-          (k) => k.materielCode == item.colourNumber
-        )?.materieColorNumber;
+          (k) => k.colour == item.colours
+        )?.colour;
         let productName = productData ? productData.productName : "";
         let productType = productData ? productData.productType : "";
         printStr += `<tr align="center">
@@ -3135,17 +3137,17 @@ export default {
     },
     // 色号改变回调
     colourNumberChangeHandler(row) {
-      let { colourNumber } = row;
-      if (colourNumber) {
+      let { colours } = row;
+      if (colours) {
         let target = this.colourNumberOptions.find(
-          (item) => item.materielCode == colourNumber
+          (item) => item.colour == colours
         );
         if (target) {
           row.colourNumberLabel =
             target.materieEncoding + target.materieColorNumber;
         }
         // row.colourNumberLabel = this.colourNumberOptions.find(
-        //   (item) => item.materielCode == colourNumber
+        //   (item) => item.materielCode == colours
         // )?.materieColorNumber;
         this.updateStorage(row);
       }
@@ -3313,8 +3315,8 @@ export default {
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
               ?.materielName || "";
           item.colourNumberLabel = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieColorNumber;
+            (k) => k.colour == item.colours
+          )?.colour;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">

zkqy-ui/src/views/orderMange/order/processingOrder.vue

@@ -462,28 +462,28 @@
               </el-table-column>
               <el-table-column prop="productType" label="类型">
               </el-table-column>
-              <el-table-column prop="colourNumber" width="130" label="色号">
+              <el-table-column prop="colours" width="130" label="色号">
                 <template slot-scope="scope">
                   <el-form-item
-                    :prop="'colourNumber-' + scope.$index"
-                    :name="'colourNumber-' + scope.$index"
+                    :prop="'colours-' + scope.$index"
+                    :name="'colours-' + scope.$index"
                     style="margin: 0px; padding: 0px"
                   >
                     <el-select
-                      v-model="scope.row.colourNumber"
+                      v-model="scope.row.colours"
                       placeholder=""
                       filterable
                       @change="colourNumberChangeHandler(scope.row)"
                     >
                       <el-option
                         v-for="item in colourNumberOptions"
-                        :key="item.materielCode"
-                        :label="item.materieEncoding + item.materieColorNumber"
-                        :value="item.materielCode"
+                        :key="item.colour"
+                        :label="item.colour"
+                        :value="item.colour"
                       >
-                        <span class="discribe" style="float: left">{{
+                        <!-- <span class="discribe" style="float: left">{{
                           item.materieEncoding + item.materieColorNumber
-                        }}</span>
+                        }}</span> -->
                         <!-- <span
                         style="float: right; color: #8492a6; font-size: 13px"
                         >{{ item.materielCode }}</span
@@ -828,6 +828,7 @@ import {
   queryMaterielList,
   getSaleOrderProductionListDistinct,
   getProductSpecificationsByProductName,
+  productColourList,
 } from "@/api/tablelist/commonTable";
 import { updateOrder } from "@/api/system/retailMange.js";
 import { listData } from "@/api/system/tenant/data";
@@ -912,7 +913,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         craftGrid: "", //网络
@@ -1315,7 +1316,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         craftGrid: "", //网络
@@ -1389,7 +1390,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         specificationsList: [],
         productSpecifications: "", //型号
@@ -1454,7 +1455,7 @@ export default {
             validator: this.validateTableField,
           },
         ];
-        this.rules["colourNumber-" + i] = [
+        this.rules["colours-" + i] = [
           {
             // required: true,
             message: "请选择色号",
@@ -1549,11 +1550,12 @@ export default {
           },
         ];
         // let res = await queryDropDownBoxData(payLoad);
-        let res = await queryMaterielList();
+        // let res = await queryMaterielList();
+        let res = await productColourList({ isEnablePaging: false });
         if (res.code == 200) {
           console.log(res.data);
           // let { materiel } = res.data;
-          this.colourNumberOptions = res.data || [];
+          this.colourNumberOptions = res.rows || [];
         } else {
           throw Error("获取下拉框数据失败");
         }
@@ -1669,7 +1671,7 @@ export default {
                 '[{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"},{"fieldName":"sale_order.status","mark":"3","refValue":"4"},{"fieldName":"sale_order.status","mark":"3","refValue":"5"},{"fieldName":"sale_order.status","mark":"3","refValue":"6"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"9"}]',
               children: [],
               btnHasPermi: "huaxian:xsglddgl:INSERT",
-            },
+            }
             // {
             //   btnName: "完成",
             //   btnType: "myComplate",
@@ -1824,7 +1826,7 @@ export default {
           item.productUnitPrice &&
           item.productAmounts &&
           item.sliceType &&
-          item.colourNumber
+          item.colours
         );
       });
       if (!res) {
@@ -1965,7 +1967,7 @@ export default {
             delete item.specificationsList;
             delete item.productSpecifications;
             const matchedOption = this.colourNumberOptions.find(
-              (option) => option.materielCode === item.colourNumber
+              (option) => option.colour === item.colours
             );
             let taskName =
               item.productName +
@@ -3066,17 +3068,17 @@ export default {
     },
     // 色号改变回调
     colourNumberChangeHandler(row) {
-      let { colourNumber } = row;
-      if (colourNumber) {
+      let { colours } = row;
+      if (colours) {
         let target = this.colourNumberOptions.find(
-          (item) => item.materielCode == colourNumber
+          (item) => item.colour == colours
         );
         if (target) {
           row.colourNumberLabel =
             target.materieEncoding + target.materieColorNumber;
         }
         // row.colourNumberLabel = this.colourNumberOptions.find(
-        //   (item) => item.materielCode == colourNumber
+        //   (item) => item.materielCode == colours
         // )?.materieColorNumber;
       }
     },
@@ -3244,12 +3246,12 @@ export default {
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
               ?.materielName || "";
           item.colourNumberLabel = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieColorNumber;
+            (k) => k.colour == item.colours
+          )?.colour;
           // item.materieEncoding + item.materieColorNumber
-          let materieEncoding = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieEncoding;
+          // let materieEncoding = this.colourNumberOptions.find(
+          //   (k) => k.materielCode == item.colours
+          // )?.materieEncoding;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           let productSpecifications = productData
@@ -3259,7 +3261,7 @@ export default {
                     <td>${productName}</td>
                     <td>${productSpecifications}</td>
                     <td>${productType}</td>
-                    <td>${materieEncoding + item.colourNumberLabel}</td>
+                    <td>${item.colourNumberLabel}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

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

@@ -536,15 +536,15 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="colourNumber" width="150" label="色号">
+              <el-table-column prop="colours" width="150" label="色号">
                 <template slot-scope="scope">
                   <el-form-item
-                    :prop="'colourNumber-' + scope.$index"
-                    :name="'colourNumber-' + scope.$index"
+                    :prop="'colours-' + scope.$index"
+                    :name="'colours-' + scope.$index"
                     style="margin: 0px; padding: 0px"
                   >
                     <el-select
-                      v-model="scope.row.colourNumber"
+                      v-model="scope.row.colours"
                       placeholder=""
                       clearable
                       filterable
@@ -552,13 +552,13 @@
                     >
                       <el-option
                         v-for="item in colourNumberOptions"
-                        :key="item.materielCode"
-                        :label="item.materieEncoding + item.materieColorNumber"
-                        :value="item.materielCode"
+                        :key="item.colour"
+                        :label="item.colour"
+                        :value="item.colour"
                       >
-                        <span class="discribe" style="float: left">{{
+                        <!-- <span class="discribe" style="float: left">{{
                           item.materieEncoding + item.materieColorNumber
-                        }}</span>
+                        }}</span> -->
                         <!-- <span
                         style="float: right; color: #8492a6; font-size: 13px"
                         >{{ item.materielCode }}</span
@@ -643,11 +643,11 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-<!--              <el-table-column prop="productAmounts" label="金额">-->
-<!--                <template slot-scope="scope">-->
-<!--                  {{ scope.row.productAmounts }}-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <!--              <el-table-column prop="productAmounts" label="金额">-->
+              <!--                <template slot-scope="scope">-->
+              <!--                  {{ scope.row.productAmounts }}-->
+              <!--                </template>-->
+              <!--              </el-table-column>-->
               <el-table-column prop="inventoryBoxNum" label="库存箱数">
                 <template slot-scope="scope">
                   {{ scope.row.inventoryBoxNum }}
@@ -795,6 +795,7 @@ import {
   queryMaterielList,
   getSaleOrderProductionListDistinct,
   getProductSpecificationsByProductName,
+  productColourList,
 } from "@/api/tablelist/commonTable";
 import {
   saleOrderList,
@@ -928,7 +929,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         orderRemark: "",
@@ -1181,13 +1182,13 @@ export default {
         lotNumber,
         productName,
         productSpecifications,
-        colourNumber,
+        colours,
         specificationsList,
       } = row;
 
       let productColour = "";
       let targetColor = this.colourNumberOptions.find((item) => {
-        return item.materielCode == colourNumber;
+        return item.colour == colours;
       });
       let productId = "";
       if (specificationsList && specificationsList.length > 0) {
@@ -1411,7 +1412,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         // 工艺表
         craftGrid: "", //网络
@@ -1491,7 +1492,7 @@ export default {
         sliceType: "022", //切片类型  初始为  切片
         sliceTypeLabel: "",
         colourNumberLabel: "",
-        colourNumber: "", //色号
+        colours: "", //色号
         remark: "", //备注
         specificationsList: [],
         productSpecifications: "", //型号
@@ -1559,7 +1560,7 @@ export default {
             validator: this.validateTableField,
           },
         ];
-        this.rules["colourNumber-" + i] = [
+        this.rules["colours-" + i] = [
           {
             // required: true,
             message: "请选择色号",
@@ -1678,10 +1679,11 @@ export default {
           },
         ];
         // let res = await queryDropDownBoxData(payLoad);
-        let res = await queryMaterielList();
+        // let res = await queryMaterielList();
+        let res = await productColourList({ isEnablePaging: false });
         if (res.code == 200) {
           // let { materiel } = res.data;
-          this.colourNumberOptions = res.data || [];
+          this.colourNumberOptions = res.rows || [];
         } else {
           throw Error("获取下拉框数据失败");
         }
@@ -1793,7 +1795,7 @@ export default {
           item.productUnitPrice &&
           item.productAmounts &&
           item.sliceType &&
-          item.colourNumber
+          item.colours
         );
       });
       if (!res) {
@@ -2297,7 +2299,7 @@ export default {
           sliceType, //切片类型  初始为  切片
           sliceTypeLabel,
           colourNumberLabel,
-          colourNumber, //色号
+          colours, //色号
           remark, //备注
           lotNumber, //批号
         } = item;
@@ -2331,7 +2333,7 @@ export default {
           sliceType, //切片类型  初始为  切片
           sliceTypeLabel,
           colourNumberLabel,
-          colourNumber, //色号
+          colours, //色号
           remark,
           lotNumber,
           inventoryBoxNum: 0,
@@ -2538,8 +2540,8 @@ export default {
           this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
             ?.materielName || "";
         item.colourNumberLabel = this.colourNumberOptions.find(
-          (k) => k.materielCode == item.colourNumber
-        )?.materieColorNumber;
+          (k) => k.colour == item.colours
+        )?.colour;
         let productName = productData ? productData.productName : "";
         let productType = productData ? productData.productType : "";
         printStr += `<tr align="center">
@@ -3148,17 +3150,17 @@ export default {
     },
     // 色号改变回调
     colourNumberChangeHandler(row) {
-      let { colourNumber } = row;
-      if (colourNumber) {
+      let { colours } = row;
+      if (colours) {
         let target = this.colourNumberOptions.find(
-          (item) => item.materielCode == colourNumber
+          (item) => item.colour == colours
         );
         if (target) {
           row.colourNumberLabel =
             target.materieEncoding + target.materieColorNumber;
         }
         // row.colourNumberLabel = this.colourNumberOptions.find(
-        //   (item) => item.materielCode == colourNumber
+        //   (item) => item.materielCode == colours
         // )?.materieColorNumber;
         this.updateStorage(row);
       }
@@ -3326,8 +3328,8 @@ export default {
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
               ?.materielName || "";
           item.colourNumberLabel = this.colourNumberOptions.find(
-            (k) => k.materielCode == item.colourNumber
-          )?.materieColorNumber;
+            (k) => k.colour == item.colours
+          )?.colour;
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">