优化

src/api/produce/feeding.js

@@ -14,7 +14,7 @@ export async function batchSave(data) {
  
 // pda投料保存缓存
   export async function feedSaveCache(data) {
-    const res = await request.post(`/pda/mes/feed/saveCache`, data);
+    const res = await request.post(`/mes/feed/saveCache`, data);
     if (res.data.code == 0) {
         return res.data.data;
       }
@@ -24,7 +24,7 @@ export async function batchSave(data) {
 
   // pda投料查缓存
   export async function feedGetCache(data) {
-    const res = await request.post(`/pda/mes/feed/getCache`, data);
+    const res = await request.post(`/mes/feed/getCache`, data);
     if (res.data.code == 0) {
         return res.data.data;
       }
@@ -33,7 +33,7 @@ export async function batchSave(data) {
   
   // 清空缓存
   export async function removeCache(data) {
-    const res = await request.post(`/pda/mes/workreport/removeCache`, data);
+    const res = await request.post(`/mes/workreport/removeCache`, data);
     if (res.data.code == 0) {
         return res.data.data;
       }

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

@@ -7,7 +7,7 @@
     </div>
 
     <el-table
-      :ref="`tableRef${idx}`"
+      :ref="`tableRef`"
       class="table_content"
       :max-height="600"
       :data="list"
@@ -101,7 +101,7 @@
            class="content_num"
             v-model="row.deviceId"
             placeholder="请选择"
-            @change="(e) => selectVal(e, row, index)"
+            @change="(e) => selectVal(e, row, $index)"
             size="mini"
           >
             <el-option
@@ -116,7 +116,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="singleReport == 1"
+        v-if="singleReport == 1 && deviceList.length > 0"
         label="炉次号"
         width="90"
         type="heatNumber"
@@ -209,6 +209,7 @@
       },
 
       selectVal(e, item, idx) {
+        console.log(e, item, idx);
         let obj = this.deviceList.find((f) => f.id == e);
 
         this.$set(

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

@@ -8,7 +8,7 @@
 
 
       <el-table
-      :ref="`semiProductBom${idx}`"
+      :ref="`semiProductBom`"
       class="table_content"
       :max-height="600"
       :data="list"
@@ -96,7 +96,7 @@
           <el-select
                 v-model="row.deviceId"
                 placeholder="请选择"
-                @change="(e) => selectVal(e, row, index)"
+                @change="(e) => selectVal(e, row, $index)"
                    size="mini"
               >
                 <el-option
@@ -111,7 +111,7 @@
       </el-table-column>
 
 
-      <el-table-column  v-if="singleReport == 1" label="炉次号" width="90" type="heatNumber" >
+      <el-table-column  v-if="singleReport == 1  && deviceList.length > 0" label="炉次号" width="90" type="heatNumber" >
         <template slot-scope="{ row, $index }">
           <el-input
                 size="mini"

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

@@ -269,7 +269,7 @@ export default {
         let objList = res[0].extInfo.objList;
         this.List.forEach((f) => {
           objList.forEach((o) => {
-            if (f.workOrderId == o.workOrderId && f.taskId == o.taskId) {
+            if (f.workOrderId == o.workOrderId && f.currentTaskDiagram.taskId == o.taskId) {
               f['instanceList'] = o.instanceList || [];
               f['equipmentList'] = o.equipmentList || [];
               f['modelList'] = o.modelList || [];

src/views/produce/components/jobBooking/index.vue

@@ -92,7 +92,7 @@
 
         <aridRegion  v-if='item.aridRegionList.length != 0' :list='item.aridRegionList' :isType='true'></aridRegion>
 
-        <packingBom :workOrderId='id' :objData='item' ref="packRef" 	></packingBom>
+        <packingBom :workOrderId='item.id' :objData='item' ref="packRef" 	></packingBom>
       </div>
     </div>
 

src/views/produceOrder/index.vue

@@ -167,7 +167,7 @@
   import printSr from './components/printSr';
   import printTg from './components/printTg';
   import { debounce } from 'lodash';
-import { List } from 'echarts/core';
+
 
   export default {
     components: {