Commit 0fd59619 authored by 李驰骋's avatar 李驰骋

报工限制改为报工数不超过排产数

parent e472ed5b
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="编排单号" prop="quantity"> <u-form-item label="编排单号" prop="quantity">
...@@ -893,7 +893,7 @@ export default { ...@@ -893,7 +893,7 @@ export default {
applyNum: null, applyNum: null,
workorderCode: null workorderCode: null
}, },
userTempVisible: false, userTempVisible: false,
materialReturnFormVisible: false, materialReturnFormVisible: false,
materialReturnSelected: {}, materialReturnSelected: {},
...@@ -1163,7 +1163,7 @@ userTempVisible: false, ...@@ -1163,7 +1163,7 @@ userTempVisible: false,
}, },
userDetermine(){ userDetermine(){
console.log(this.$refs.userPersonnelRef.tableSelectData, 'this.$refs.userPersonnelRef.tableSelectData') console.log(this.$refs.userPersonnelRef.tableSelectData, 'this.$refs.userPersonnelRef.tableSelectData')
this.usePersonData.nickName=this.$refs.userPersonnelRef.tableSelectData[0].nickName this.usePersonData.nickName=this.$refs.userPersonnelRef.tableSelectData[0].nickName
this.usePersonData.userName = this.$refs.userPersonnelRef.tableSelectData[0]?.userName this.usePersonData.userName = this.$refs.userPersonnelRef.tableSelectData[0]?.userName
}, },
stopReasonSubmit() { stopReasonSubmit() {
...@@ -1371,8 +1371,9 @@ userTempVisible: false, ...@@ -1371,8 +1371,9 @@ userTempVisible: false,
// this.reset(); // this.reset();
this.feedbackForms = []; this.feedbackForms = [];
this.tableSelectData.forEach((item) => { this.tableSelectData.forEach((item) => {
let tempQualify = item.quantity-item.quantityQualify<0?0:item.quantity-item.quantityQualify; let defQualify = item.quantity-item.quantityQualify-item.quantityUnqualify;
tempQualify = tempQualify>item.quantityWait?item.quantityWait:tempQualify; defQualify = defQualify<0?0:defQualify;
defQualify = defQualify>item.quantityWait?item.quantityWait:defQualify;
const feedback = { const feedback = {
...item, ...item,
workstationId: item.workstationId, workstationId: item.workstationId,
...@@ -1381,7 +1382,7 @@ userTempVisible: false, ...@@ -1381,7 +1382,7 @@ userTempVisible: false,
taskWorkunitId: item.taskWorkunitId, taskWorkunitId: item.taskWorkunitId,
feedbackChannel: 'PAD', feedbackChannel: 'PAD',
quantity: item.quantity, quantity: item.quantity,
quantityQualify: tempQualify,//默认为排产数量-合格数 quantityQualify: defQualify,//默认为排产数量-合格数-不合格数
quantityUnqualify: 0, quantityUnqualify: 0,
printName: '', printName: '',
nickName: this.vuex_user.nickName, nickName: this.vuex_user.nickName,
...@@ -1421,7 +1422,7 @@ userTempVisible: false, ...@@ -1421,7 +1422,7 @@ userTempVisible: false,
const res = await this.$u.api.abnormal.newlyAdd(this.ExceptionForms); const res = await this.$u.api.abnormal.newlyAdd(this.ExceptionForms);
this.$u.toast('上报成功'); this.$u.toast('上报成功');
this.getTaskList(); this.getTaskList();
}, },
cancel() { cancel() {
this.open = false; this.open = false;
......
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