生产报工bug

pages/mes/prodReport/index.vue

@@ -86,7 +86,7 @@
     </view>
 
     <u-modal
-      :title="title"
+      title="生产报工"
       @confirm="feedback()"
       show-cancel-button
       :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
@@ -538,7 +538,6 @@
     </u-modal>
     <u-modal
       title="显示图片"
-      @confirm="materialReturnSave()"
       show-cancel-button
       :show-confirm-button="false"
       cancel-text="返回"
@@ -1081,10 +1080,12 @@ export default {
     },
     workorderSelect(id, row) {
       console.log(id, row);
+	  row.workorderId = id
       const items = row.workorderList.find((item) => item.value === id);
       console.log(items, 'items');
       row.workorderCode = items.text;
       row.printName = items.text;
+	  console.log(row, 'rows')
     },
 
     stopReas(abnormalType) {
@@ -1309,7 +1310,9 @@ export default {
             itemName: item.itemName,
             workstationId: item.workstationId,
             workstationCode: item.workstationCode,
-            workstationName: item.workstationName,
+            workorderId: item.workorderId,
+			workorderCode: item.workorderCode,
+			workstationName: item.workstationName,
             startTime: item.startTime
           })
           .then((res) => {
@@ -1515,7 +1518,7 @@ export default {
             batchNo: s.batchCode,
             packNo: s.packNo,
             isQualified: s.isQualified,
-            workorderCode: t.materialReturnFormData.workorderCode
+            workorderCode: t.materialReturnFormData.workorderCode,
           });
         }
       });