Commit 6e1852a9 authored by 李驰骋's avatar 李驰骋

合格/不合格数量字段名调整

parent 8d489203
...@@ -768,7 +768,7 @@ export default { ...@@ -768,7 +768,7 @@ export default {
width: 60 width: 60
}, },
{ {
name: 'quantityQuanlify', name: 'quantityQualify',
label: '合格数量', label: '合格数量',
width: 80, width: 80,
align: 'center' align: 'center'
...@@ -1290,6 +1290,8 @@ export default { ...@@ -1290,6 +1290,8 @@ export default {
// 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;
tempQualify = tempQualify>item.quantityWait?item.quantityWait:tempQualify;
const feedback = { const feedback = {
...item, ...item,
workstationId: item.workstationId, workstationId: item.workstationId,
...@@ -1298,7 +1300,7 @@ export default { ...@@ -1298,7 +1300,7 @@ export default {
taskWorkunitId: item.taskWorkunitId, taskWorkunitId: item.taskWorkunitId,
feedbackChannel: 'PAD', feedbackChannel: 'PAD',
quantity: item.quantity, quantity: item.quantity,
quantityQualify: item.quantity-item.quantityQuanlify-item.quantityUnquanlify,//默认为排产数量-合格数-不合格数 quantityQualify: tempQualify,//默认为排产数量-合格数
quantityUnqualify: 0, quantityUnqualify: 0,
printName: false, printName: false,
nickName: this.vuex_user.nicfeedbackkName, nickName: this.vuex_user.nicfeedbackkName,
...@@ -1354,8 +1356,8 @@ export default { ...@@ -1354,8 +1356,8 @@ export default {
taskId: item.taskId, taskId: item.taskId,
taskCode: item.taskCode, taskCode: item.taskCode,
quantityFeedback: item.quantityQualify+item.quantityUnqualify, quantityFeedback: item.quantityQualify+item.quantityUnqualify,
quantityQualified: item.quantityQualify, quantityQualify: item.quantityQualify,
quantityUnquanlified: item.quantityUnqualify, quantityUnqualify: item.quantityUnqualify,
userName: this.vuex_user.userName, userName: this.vuex_user.userName,
feedbackType: item.feedbackType, feedbackType: item.feedbackType,
routeId: item.routeId, routeId: item.routeId,
......
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