订单管理色号添加编码

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

@@ -425,7 +425,7 @@
                     <el-option
                       v-for="item in colourNumberOptions"
                       :key="item.materielCode"
-                      :label="item.materieColorNumber"
+                      :label="item.materieEncoding + item.materieColorNumber"
                       :value="item.materielCode"
                     >
                     </el-option>

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

@@ -497,9 +497,16 @@
                     <el-option
                       v-for="item in colourNumberOptions"
                       :key="item.materielCode"
-                      :label="item.materieColorNumber"
+                      :label="item.materieEncoding + item.materieColorNumber"
                       :value="item.materielCode"
                     >
+                      <span class="discribe" style="float: left">{{
+                        item.materieEncoding + item.materieColorNumber
+                      }}</span>
+                      <!-- <span
+                        style="float: right; color: #8492a6; font-size: 13px"
+                        >{{ item.materielCode }}</span
+                      > -->
                     </el-option>
                   </el-select>
                 </template>
@@ -2686,9 +2693,16 @@ export default {
     colourNumberChangeHandler(row) {
       let { colourNumber } = row;
       if (colourNumber) {
-        row.colourNumberLabel = this.colourNumberOptions.find(
+        let target = this.colourNumberOptions.find(
           (item) => item.materielCode == colourNumber
-        )?.materieColorNumber;
+        );
+        if (target) {
+          row.colourNumberLabel =
+            target.materieEncoding + target.materieColorNumber;
+        }
+        // row.colourNumberLabel = this.colourNumberOptions.find(
+        //   (item) => item.materielCode == colourNumber
+        // )?.materieColorNumber;
       }
     },
     // 打印回调