Commit 6e7b09cb authored by 张海景's avatar 张海景

update:修改判断是否显示自动切换指令和size和生产工单判断是否开工

parent 541446be
...@@ -1318,6 +1318,10 @@ export default { ...@@ -1318,6 +1318,10 @@ export default {
}); });
break; break;
case 'Prod': case 'Prod':
if (this.tableSelectData[0].status === 'PREPARE') {
this.$u.toast('工序未开工');
return
}
this.doFeedback(); this.doFeedback();
break; break;
case 'MaterialUsageRecord': case 'MaterialUsageRecord':
...@@ -1499,6 +1503,7 @@ export default { ...@@ -1499,6 +1503,7 @@ export default {
row.packType = '' row.packType = ''
row.packUnitOfMeasure = '' row.packUnitOfMeasure = ''
row.lossIndividuallyWrap = undefined row.lossIndividuallyWrap = undefined
row.currentTabPro = 0
return; return;
} else { } else {
if (row.isLastProcess) { if (row.isLastProcess) {
...@@ -1508,6 +1513,7 @@ export default { ...@@ -1508,6 +1513,7 @@ export default {
row.packType = items.packType row.packType = items.packType
row.packUnitOfMeasure = items.packUnitOfMeasure row.packUnitOfMeasure = items.packUnitOfMeasure
row.lossIndividuallyWrap = items.lossIndividuallyWrap row.lossIndividuallyWrap = items.lossIndividuallyWrap
row.currentTabPro = items.packType === '1'? 1 : 0
} }
} }
row.workorderId = id; row.workorderId = id;
...@@ -1801,11 +1807,10 @@ export default { ...@@ -1801,11 +1807,10 @@ export default {
whether: '', whether: '',
printTemplate: '', printTemplate: '',
tableDirectiveColumn: [ tableDirectiveColumn: [
{ {
name: 'clientCmd', name: 'clientCmd',
label: '指令号', label: '指令号',
width: 130 width: 170
}, },
{ {
name: 'lossNum', name: 'lossNum',
...@@ -1815,12 +1820,12 @@ export default { ...@@ -1815,12 +1820,12 @@ export default {
{ {
name: 'sizeGroup', name: 'sizeGroup',
label: '尺码组', label: '尺码组',
width: 130 width: 100
}, },
{ {
name: 'quantity', name: 'quantity',
label: '数量', label: '数量',
width: 130 width: 100
}, },
{ {
name: 'quantityQualify', name: 'quantityQualify',
......
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