diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index 44bd346..0e45092 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -344,12 +344,13 @@ export default class PurchaseWHSRM extends BasePage { } async onLoad(options) { this.getselectlist(); - this.getDefectListPDA(); + if (options.listitem) { let str = decodeURIComponent(options.listitem); if (str) { this.detailsinfo = JSON.parse(str); this.selectList.value = this.detailsinfo.checkType; + this.getDefectListPDA(); console.log(this.detailsinfo); let query = { factoryCode: session.PoolName, @@ -431,6 +432,7 @@ export default class PurchaseWHSRM extends BasePage { checkStatus: 0, checkType: this.selectList.value, }; + this.getDefectListPDA(); await this.model.getCheckTaskListall(query); console.log(this.model.CheckTaskListall); this.list = this.model.CheckTaskListall; diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts index e1d460b..f602c5a 100644 --- a/src/pages/quality/Materialinspection/model.ts +++ b/src/pages/quality/Materialinspection/model.ts @@ -77,7 +77,7 @@ export class Materialinspection extends VuexModule { console.log(result); const getDefectList: [] = result; const locList1 = getDefectList.map((item: any) => ({ - label: item.defectsubclass, + label: item.defectSubclass, value: item.defectCode, })); return { locList1 }; diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue index aceddad..e5e40e2 100644 --- a/src/pages/quality/Records/index.vue +++ b/src/pages/quality/Records/index.vue @@ -110,6 +110,10 @@ +
不良分类:
+ +
不合格数量:
+
不合格描述:
@@ -341,6 +345,7 @@ export default class PurchaseWHSRM extends BasePage { console.log(query, this.detailsinfo); await this.model.getCheckTaskList(query); this.detaillistceshi = this.model.CheckTaskList.qcCheckTaskDetails; + this.detaillistceshi.forEach((item) => { item.fileList = []; if (item.files == null) { @@ -350,6 +355,15 @@ export default class PurchaseWHSRM extends BasePage { item.fileList.push(n.fileAddress); }); } + if (item.defectCode != null) { + let isdefectCode = item.defectCode; + const matchedItem = model.locList1.find((item) => item.value === isdefectCode); + if (matchedItem) { + item.defectSubclass = matchedItem.label; + } + } else { + item.defectSubclass = null; + } }); this.detaillistdefects = this.model.CheckTaskList.defects; this.show = true; @@ -368,6 +382,7 @@ export default class PurchaseWHSRM extends BasePage { checkStatus: '1,2', checkType: this.selectList.value, }; + this.getDefectListPDA(); await this.model.getCheckTaskListall(query); this.list = this.model.CheckTaskListall; // let params = { @@ -375,6 +390,15 @@ export default class PurchaseWHSRM extends BasePage { // }; // await this.model.getpalletLocation(params); //参数:成型区2,烘房3 } + ///获取不良分类 + async getDefectListPDA() { + let query1 = { + factoryCode: session.PoolName, + checkType: this.selectList.value, + }; + await this.model.getDefectListPDA(query1); + // this.nodelist = this.model.orderNoItemList; + } focus(item, value, index) { console.log(item, value, index); this.tagslist = []; diff --git a/src/pages/quality/Records/model.ts b/src/pages/quality/Records/model.ts index 08dce12..3593836 100644 --- a/src/pages/quality/Records/model.ts +++ b/src/pages/quality/Records/model.ts @@ -48,6 +48,19 @@ export class Records extends VuexModule { const CheckTaskList = result.data; return { CheckTaskList }; } + locList1: any = []; + getDefectList: any = ''; + @MutationAction + async getDefectListPDA(params: any) { + const result: any = await http.post(url.lanjuquality.Materialinspection.getDefectListPDA, params); + console.log(result); + const getDefectList: [] = result; + const locList1 = getDefectList.map((item: any) => ({ + label: item.defectSubclass, + value: item.defectCode, + })); + return { locList1 }; + } } export default getModule(Records);