优化

src/views/produce/components/feeding/components/instanceBom.vue

@@ -50,20 +50,8 @@
           </div>
         </div>
 
-        <div class="item rx-sc">
-          <div class="rx ww33" v-if="item.isConsumable == 1">
-            <div class="lable rx-cc">数量</div>
-            <div class="content content_num rx-sc">
-              <el-input
-                size="mini"
-                v-model="item.feedQuantity"
-                placeholder="数量"
-              >
-              </el-input>
-            </div>
-          </div>
-
-          <div class="rx ww33" v-if="item.isConsumable == 0">
+        <div class="item rx-sc" v-if="item.isConsumable == 0">
+          <div class="rx ww33">
             <div class="lable rx-cc">{{
               currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'
             }}</div>
@@ -72,21 +60,71 @@
             >
             <div class="content" v-if="currentTaskDiagram.isFirstTask == 0">
               {{ item.extInfo.newWeight || 0 }}
-              {{ item.extInfo.weightUnit   }}</div
+              {{ item.extInfo.weightUnit }}</div
             >
           </div>
 
-          <div class="rx ww33" v-if="item.isConsumable == 0">
+          <div class="rx ww33">
             <div class="lable rx-cc">刻码</div>
             <div class="content">{{ item.extInfo.engrave }}</div>
           </div>
 
-          <div class="rx ww33" v-if="item.isConsumable == 0">
+          <div class="rx ww33">
             <div class="lable rx-cc">物料代号</div>
             <div class="content">{{ item.extInfo.materielCode }}</div>
           </div>
         </div>
 
+        <div
+          class="item rx-sc"
+          v-if="item.isConsumable == 0 && deviceList.length > 0"
+        >
+          <div class="rx ww33">
+            <div class="lable rx-cc">设备</div>
+            <div class="content content_num">
+              <el-select v-model="item.deviceId" placeholder="请选择">
+                <el-option
+                  v-for="item in deviceList"
+                  :label="item.name + '-' + item.codeNumber"
+                  :value="item.id"
+                  :key="item.id"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+
+          <div class="rx ww33">
+            <div class="lable rx-cc">炉次号</div>
+            <div class="content content_num rx-sc">
+              <el-input
+                size="mini"
+                v-model="item.extInfo.heatNumber"
+                placeholder="请输入炉次号"
+              />
+            </div>
+          </div>
+        </div>
+
+        <div class="item rx-sc">
+          <div class="rx ww33">
+            <div class="lable rx-cc">数量</div>
+            <div class="content content_num rx-sc">
+              <el-input
+                size="mini"
+                v-model="item.feedQuantity"
+                placeholder="数量"
+              >
+              </el-input>
+            </div>
+          </div>
+
+          <div class="rx ww33" v-if="item.isConsumable == 0">
+            <div class="lable rx-cc">位置</div>
+            <div class="content">{{ item.extInfo.position }}</div>
+          </div>
+        </div>
+
         <div class="del_box">
           <el-link
             type="danger"
@@ -119,9 +157,51 @@
         default: false
       }
     },
+
+    watch: {
+      equipmentList: {
+        immediate: true,
+        deep: true,
+        handler(newVal) {
+          this.deviceList = newVal;
+          this.changeHeatNumber();
+        }
+      }
+    },
+
+    data() {
+      return {
+        deviceList: []
+      };
+    },
+
     methods: {
       getDelete(index) {
         this.list.splice(index, 1);
+      },
+
+      changeHeatNumber() {
+        console.log(this.deviceList);
+
+        this.deviceList.forEach((f) => {
+          this.list.forEach((o) => {
+            if (
+              o.deviceId &&
+              f.id == o.deviceId &&
+              this.deviceList.length > 1
+            ) {
+              o.extInfo.heatNumber = f.extInfo.heatNumber;
+              o['workstationName'] = f.workstationName;
+            } else if (this.deviceList.length == 1) {
+              o['deviceName'] = this.deviceList[0].name;
+              o['deviceId'] = this.deviceList[0].id;
+              o['workstationName'] = this.deviceList[0].workstationName;
+              o.extInfo.heatNumber = this.deviceList[0].extInfo.heatNumber;
+
+              this.$forceUpdate();
+            }
+          });
+        });
       }
     }
   };

src/views/produce/components/picking/pickingList.vue

@@ -461,13 +461,35 @@
       },
       open(id, item) {
         this.id = id;
-        this.allSelection = item.pickList || [];
-        this.visible = true;
-        this.$nextTick(() => {
-          this.allSelection.forEach((item) => {
-            this.$refs.table.toggleRowSelection(item, true);
+
+        if (this.isType == 'pick') {
+          this.allSelection = item.pickList || [];
+          this.visible = true;
+          this.$nextTick(() => {
+            this.allSelection.forEach((item) => {
+              this.$refs.table.toggleRowSelection(item, true);
+            });
           });
-        });
+        } else if (this.isType == 'feed') {
+          let feedList = [];
+          feedList = [
+            ...item.modelList,
+            ...item.equipmentList,
+            ...item.instanceList,
+            ...item.aridRegionList,
+            ...item.turnover,
+            ...item.palletList,
+            ...item.revolvingDiskList,
+            ...item.semiProductList
+          ];
+
+          this.visible = true;
+          this.$nextTick(() => {
+            feedList.forEach((item) => {
+              this.$refs.table.toggleRowSelection(item, true);
+            });
+          });
+        }
       },
 
       handleClose() {