diff --git a/src/pages/quality/Belowstandard/index.vue b/src/pages/quality/Belowstandard/index.vue index 83261bb..c8d0daa 100644 --- a/src/pages/quality/Belowstandard/index.vue +++ b/src/pages/quality/Belowstandard/index.vue @@ -605,6 +605,7 @@ export default class PurchaseWHSRM extends BasePage { checkType: this.detailsinfo.checkType, }; await this.model.getCheckTaskListall(query); + console.log(model.CheckTaskListall); this.list = this.model.CheckTaskListall; } } @@ -636,11 +637,7 @@ export default class PurchaseWHSRM extends BasePage { checkType: this.selectList.value, }; await this.model.getCheckTaskListall(query); - // this.productCodelocList = e.pickerName; - // let params = { - // productionState: this.productCodelocList.value.toString(), - // }; - // await this.model.getpalletLocation(params); //参数:成型区2,烘房3 + this.list = this.model.CheckTaskListall; } focus(item, value, index) { console.log(item, value, index); diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index 1b6cae7..34127f7 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -380,6 +380,13 @@ export default class PurchaseWHSRM extends BasePage { //点击收货按钮,录入批次(或系统自动生成)、数量、托盘码进行收货。 async onOk() { this.isvalue = false; + console.log(this.selectList, this.detaillistceshi); + let labelname = null; + this.nodelist.forEach((item) => { + if (item.orderCode == this.selectList.value) { + labelname = item.checkName; + } + }); this.detaillistceshi.forEach((item) => { if (item.propertyCode == 1) { if (item.actualValue == null || item.actualValue == '') { @@ -396,7 +403,54 @@ export default class PurchaseWHSRM extends BasePage { }); return; } - let query = this.detaillistceshi; + let query = {}; + if (labelname == '来料检验') { + query = { + sampleQuality: this.clickitem.sampleQuality, + noOkQuality: this.clickitem.noOkQuality, + updateBy: session.userName, + factoryCode: session.PoolName, + typeCode: this.selectList.value, + checkType: this.selectList.value, + orderCode: this.clickitem.orderNo, + qcCheckTaskDetails: this.detaillistceshi, + }; + } else if (labelname == '成品入库检验') { + query = { + sampleQuality: this.clickitem.sampleQuality, + noOkQuality: this.clickitem.noOkQuality, + updateBy: session.userName, + factoryCode: session.PoolName, + typeCode: this.selectList.value, + checkType: this.selectList.value, + orderCode: this.clickitem.orderNo, + qcCheckTaskDetails: this.detaillistceshi, + }; + } else if (labelname == '过程检验') { + query = { + sampleQuality: this.clickitem.sampleQuality, + aNoOkquality: 'A类不良', + bNoOkquality: 'B类不良', + cNoOkquality: 'C类不良', + updateBy: session.userName, + factoryCode: session.PoolName, + typeCode: this.selectList.value, + checkType: this.selectList.value, + orderCode: this.clickitem.orderNo, + qcCheckTaskDetails: this.detaillistceshi, + }; + } + // sampleQuality:抽样数量 + // noOkQuality:不合格数量(只来料、入库有) + // aNoOkquality:A类不良(只过程有) + // bNoOkquality:B类不良(只过程有) + // cNoOkquality:C类不良(只过程有) + + // factoryCode:工厂编码 + // typeCode:大检验节点编码 + // updateBy:当前登陆人 + // checkType:检验节点编码 + // orderCode:订单编码 await this.model.commitCheckTaskList(query); if (this.model.SubmitCode.code == '200') {