Commit 8d489203 authored by 李驰骋's avatar 李驰骋

状态改变添加taskWorkunitId字段

parent cb026df5
...@@ -714,9 +714,15 @@ export default { ...@@ -714,9 +714,15 @@ export default {
label: '计划结束时间', label: '计划结束时间',
width: 140 width: 140
}, },
{
name: 'quantity',
label: '排产数量',
width: 80,
align: 'center'
},
{ {
name: 'quantityWait', name: 'quantityWait',
label: '加工数量', label: '加工数量',
width: 80 width: 80
}, },
{ {
...@@ -761,12 +767,6 @@ export default { ...@@ -761,12 +767,6 @@ export default {
label: '工序', label: '工序',
width: 60 width: 60
}, },
{
name: 'quantity',
label: '排产数量',
width: 80,
align: 'center'
},
{ {
name: 'quantityQuanlify', name: 'quantityQuanlify',
label: '合格数量', label: '合格数量',
...@@ -969,7 +969,7 @@ export default { ...@@ -969,7 +969,7 @@ export default {
if (item.status === 'BEGINNING') { if (item.status === 'BEGINNING') {
status = true; status = true;
} else { } else {
this.changeStatus(item.taskId, 'BEGINNING'); this.changeStatus(item.taskId, item.taskWorkunitId,'BEGINNING');
} }
}); });
if (status) { if (status) {
...@@ -984,7 +984,7 @@ export default { ...@@ -984,7 +984,7 @@ export default {
break; break;
case 'FinshTask': case 'FinshTask':
this.tableSelectData.forEach((item) => { this.tableSelectData.forEach((item) => {
this.changeStatus(item.taskId, 'FINISHED'); this.changeStatus(item.taskId, item.taskWorkunitId,'FINISHED');
}); });
this.getTaskList(); this.getTaskList();
break; break;
...@@ -1109,7 +1109,7 @@ export default { ...@@ -1109,7 +1109,7 @@ export default {
}, },
stopReasonSubmit() { stopReasonSubmit() {
this.tableSelectData.forEach((item) => { this.tableSelectData.forEach((item) => {
this.changeStop(item.taskId, 'PAUSE'); this.changeStop(item.taskId, item.taskWorkunitId,'PAUSE');
}); });
this.getTaskList(); this.getTaskList();
}, },
...@@ -1236,12 +1236,13 @@ export default { ...@@ -1236,12 +1236,13 @@ export default {
} }
}); });
}, },
changeStatus(taskId, status) { changeStatus(taskId, taskWorkunitId, status) {
// this.form.status = status; // this.form.status = status;
this.$u.api this.$u.api
.changeStatus({ .changeStatus({
taskId: taskId, taskId: taskId,
status: status, status: status,
taskWorkunitId: taskWorkunitId,
attr1: this.stopReason attr1: this.stopReason
}) })
.then((res) => { .then((res) => {
...@@ -1253,12 +1254,13 @@ export default { ...@@ -1253,12 +1254,13 @@ export default {
}); });
}, },
//暂停作业 //暂停作业
changeStop(taskId, status) { changeStop(taskId, taskWorkunitId, status) {
// this.form.status = status; // this.form.status = status;
this.$u.api this.$u.api
.changeStatus({ .changeStatus({
taskId: taskId, taskId: taskId,
status: status, status: status,
taskWorkunitId: taskWorkunitId,
attr1: this.stopReasonForm.reason, attr1: this.stopReasonForm.reason,
attr2: this.stopReasonForm.desc attr2: this.stopReasonForm.desc
}) })
...@@ -1293,9 +1295,10 @@ export default { ...@@ -1293,9 +1295,10 @@ export default {
workstationId: item.workstationId, workstationId: item.workstationId,
userName: this.vuex_user.userName, userName: this.vuex_user.userName,
taskId: item.taskId, taskId: item.taskId,
taskWorkunitId: item.taskWorkunitId,
feedbackChannel: 'PAD', feedbackChannel: 'PAD',
quantity: item.quantity, quantity: item.quantity,
quantityQualify: item.quantityWait,//默认为待加工 quantityQualify: item.quantity-item.quantityQuanlify-item.quantityUnquanlify,//默认为排产数量-合格数-不合格
quantityUnqualify: 0, quantityUnqualify: 0,
printName: false, printName: false,
nickName: this.vuex_user.nicfeedbackkName, nickName: this.vuex_user.nicfeedbackkName,
...@@ -1347,6 +1350,7 @@ export default { ...@@ -1347,6 +1350,7 @@ export default {
} }
this.$u.api this.$u.api
.feedback({ .feedback({
taskWorkunitId: item.taskWorkunitId,
taskId: item.taskId, taskId: item.taskId,
taskCode: item.taskCode, taskCode: item.taskCode,
quantityFeedback: item.quantityQualify+item.quantityUnqualify, quantityFeedback: item.quantityQualify+item.quantityUnqualify,
......
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