Commit 29e320af authored by chenzj's avatar chenzj

生产报工bug

parent a12c9159
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</view> </view>
<u-modal <u-modal
:title="title" title="生产报工"
@confirm="feedback()" @confirm="feedback()"
show-cancel-button show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
...@@ -538,7 +538,6 @@ ...@@ -538,7 +538,6 @@
</u-modal> </u-modal>
<u-modal <u-modal
title="显示图片" title="显示图片"
@confirm="materialReturnSave()"
show-cancel-button show-cancel-button
:show-confirm-button="false" :show-confirm-button="false"
cancel-text="返回" cancel-text="返回"
...@@ -1081,10 +1080,12 @@ export default { ...@@ -1081,10 +1080,12 @@ export default {
}, },
workorderSelect(id, row) { workorderSelect(id, row) {
console.log(id, row); console.log(id, row);
row.workorderId = id
const items = row.workorderList.find((item) => item.value === id); const items = row.workorderList.find((item) => item.value === id);
console.log(items, 'items'); console.log(items, 'items');
row.workorderCode = items.text; row.workorderCode = items.text;
row.printName = items.text; row.printName = items.text;
console.log(row, 'rows')
}, },
stopReas(abnormalType) { stopReas(abnormalType) {
...@@ -1309,7 +1310,9 @@ export default { ...@@ -1309,7 +1310,9 @@ export default {
itemName: item.itemName, itemName: item.itemName,
workstationId: item.workstationId, workstationId: item.workstationId,
workstationCode: item.workstationCode, workstationCode: item.workstationCode,
workstationName: item.workstationName, workorderId: item.workorderId,
workorderCode: item.workorderCode,
workstationName: item.workstationName,
startTime: item.startTime startTime: item.startTime
}) })
.then((res) => { .then((res) => {
...@@ -1515,7 +1518,7 @@ export default { ...@@ -1515,7 +1518,7 @@ export default {
batchNo: s.batchCode, batchNo: s.batchCode,
packNo: s.packNo, packNo: s.packNo,
isQualified: s.isQualified, isQualified: s.isQualified,
workorderCode: t.materialReturnFormData.workorderCode workorderCode: t.materialReturnFormData.workorderCode,
}); });
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment