@@ -281,6 +285,7 @@ export default class PurchaseWHSRM extends BasePage {
detailsinfo: any = [];
nodelist: any = '';
detaillistceshi: any = [];
+ detaillistdefects: any = [];
clickitem: any = '';
formdata: any = {
sampleQuality: null,
@@ -290,6 +295,7 @@ export default class PurchaseWHSRM extends BasePage {
cNoOkquality: null,
};
isvalue = false;
+ isquality = false;
isfocus = false;
isshow1 = false;
isshow2 = false;
@@ -339,22 +345,15 @@ export default class PurchaseWHSRM extends BasePage {
async onPass(item) {
console.log('1234567', item);
this.clickitem = item;
- let labelname = null;
- this.nodelist.forEach((item) => {
- if (item.orderCode == this.selectList.value) {
- labelname = item.checkName;
- }
- });
- if (labelname == '来料检验') {
- this.isshow1 = true;
- } else if (labelname == '成品入库检验') {
- this.isshow1 = true;
- } else if (labelname == '过程检验') {
- this.isshow3 = true;
- }
let belongTo = item.recordId;
- await this.model.getCheckTaskList(belongTo);
- this.detaillistceshi = this.model.CheckTaskList;
+ let query = {
+ factoryCode: session.PoolName,
+ belongTo: belongTo,
+ checkType: this.selectList.value,
+ };
+ await this.model.getCheckTaskList(query);
+ this.detaillistceshi = this.model.CheckTaskList.qcCheckTaskDetails;
+ this.detaillistdefects = this.model.CheckTaskList.defects;
this.detaillistceshi.forEach((item) => {
item.factoryCode = session.PoolName;
item.checkType = this.selectList.value;
@@ -435,24 +434,21 @@ export default class PurchaseWHSRM extends BasePage {
//点击收货按钮，录入批次（或系统自动生成）、数量、托盘码进行收货。
async onOk() {
this.isvalue = false;
+ this.isquality = 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 == '') {
- console.log(item);
this.isvalue = true;
}
}
});
- console.log(this.detaillistceshi, this.isvalue);
+ this.detaillistdefects.forEach((item) => {
+ if (item.noOkQuality == null || item.noOkQuality == '') {
+ this.isquality = true;
+ }
+ });
+ console.log(this.detaillistceshi, this.isvalue, this.isquality);
if (this.isvalue) {
(this.$refs.uToast as any).show({
title: '检查标准不能为空',
@@ -467,75 +463,25 @@ export default class PurchaseWHSRM extends BasePage {
});
return;
}
- if (this.isshow1) {
- if (this.formdata.noOkQuality == null || this.formdata.noOkQuality == '') {
- (this.$refs.uToast as any).show({
- title: '不合格数量不能为空',
- type: 'default',
- });
- return;
- }
- }
- if (this.isshow3) {
- if (this.formdata.aNoOkquality == null || this.formdata.aNoOkquality == '') {
- (this.$refs.uToast as any).show({
- title: 'A类不良不能为空',
- type: 'default',
- });
- return;
- }
- if (this.formdata.bNoOkquality == null || this.formdata.bNoOkquality == '') {
- (this.$refs.uToast as any).show({
- title: 'B类不良不能为空',
- type: 'default',
- });
- return;
- }
- if (this.formdata.cNoOkquality == null || this.formdata.cNoOkquality == '') {
- (this.$refs.uToast as any).show({
- title: 'C类不良不能为空',
- type: 'default',
- });
- return;
- }
- }
- let query = {};
- if (labelname == '来料检验') {
- query = {
- sampleQuality: this.formdata.sampleQuality,
- noOkQuality: this.formdata.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.formdata.sampleQuality,
- noOkQuality: this.formdata.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.formdata.sampleQuality,
- aNoOkquality: this.formdata.aNoOkquality,
- bNoOkquality: this.formdata.bNoOkquality,
- cNoOkquality: this.formdata.cNoOkquality,
- updateBy: session.userName,
- factoryCode: session.PoolName,
- typeCode: this.selectList.value,
- checkType: this.selectList.value,
- orderCode: this.clickitem.orderNo,
- qcCheckTaskDetails: this.detaillistceshi,
- };
+ if (this.isquality) {
+ (this.$refs.uToast as any).show({
+ title: '数量不能为空',
+ type: 'default',
+ });
+ return;
}
+
+ let query = {
+ sampleQuality: this.formdata.sampleQuality,
+ updateBy: session.userName,
+ factoryCode: session.PoolName,
+ typeCode: this.selectList.value,
+ checkType: this.selectList.value,
+ orderCode: this.clickitem.orderNo,
+ qcCheckTaskDetails: this.detaillistceshi,
+ defects: this.detaillistdefects,
+ };
+ console.log(query);
await this.model.commitCheckTaskList(query);
if (this.model.SubmitCode.code == '200') {
(this.$refs.uToast as any).show({
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index 37a5f36..a190f23 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -40,13 +40,10 @@ export class Materialinspection extends VuexModule {
}
CheckTaskList: any = [];
@MutationAction
- async getCheckTaskList(belongTo: any) {
+ async getCheckTaskList(query: any) {
const result: any = await http.get(url.lanjuquality.Materialinspection.getCheckTaskList, {
//loginName: session.loginName,
- params: {
- factoryCode: session.PoolName,
- belongTo: belongTo,
- },
+ params: query,
});
const CheckTaskList = result.data;
return { CheckTaskList };
diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue
index f016aca..3ba79d7 100644
--- a/src/pages/quality/Records/index.vue
+++ b/src/pages/quality/Records/index.vue
@@ -109,7 +109,10 @@
-
+
+
+
+
确认
@@ -248,6 +251,7 @@ export default class PurchaseWHSRM extends BasePage {
detailsinfo: any = [];
nodelist: any = '';
detaillistceshi: any = [];
+ detaillistdefects: any = [];
clickitem: any = '';
formdata: any = {
sampleQuality: null,
@@ -320,8 +324,15 @@ export default class PurchaseWHSRM extends BasePage {
this.isshow3 = true;
}
let belongTo = item.recordId;
- await this.model.getCheckTaskList(belongTo);
- this.detaillistceshi = this.model.CheckTaskList;
+ let query = {
+ factoryCode: session.PoolName,
+ belongTo: belongTo,
+ checkType: this.selectList.value,
+ };
+ console.log(query, this.detailsinfo);
+ await this.model.getCheckTaskList(query);
+ this.detaillistceshi = this.model.CheckTaskList.qcCheckTaskDetails;
+ this.detaillistdefects = this.model.CheckTaskList.defects;
this.show = true;
}
radioGroupChange(item, value, index) {
diff --git a/src/pages/quality/Records/model.ts b/src/pages/quality/Records/model.ts
index fef958b..1f3edba 100644
--- a/src/pages/quality/Records/model.ts
+++ b/src/pages/quality/Records/model.ts
@@ -40,13 +40,10 @@ export class Records extends VuexModule {
}
CheckTaskList: any = [];
@MutationAction
- async getCheckTaskList(belongTo: any) {
+ async getCheckTaskList(query: any) {
const result: any = await http.get(url.lanjuquality.Records.getCheckTaskList, {
//loginName: session.loginName,
- params: {
- factoryCode: session.PoolName,
- belongTo: belongTo,
- },
+ params: query,
});
const CheckTaskList = result.data;
return { CheckTaskList };