From a0c7ea7097534e96cd8157db8e285f06caffc1f1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 22 Apr 2026 12:19:09 +0800 Subject: [PATCH 1/5] Add material filter to qct page --- src/views/qm/qct.vue | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/views/qm/qct.vue b/src/views/qm/qct.vue index a79bf6f8..fbf72c47 100644 --- a/src/views/qm/qct.vue +++ b/src/views/qm/qct.vue @@ -5,6 +5,17 @@
+ + +
@@ -91,7 +102,16 @@ import recordDialog from "./qctDetail.vue"; data() { return { apiObj:this.$API.qm.qct.list, - query: {search:''}, + query: { + search:'', + qctmat__material:'', + }, + materialQuery: { + page: 0, + is_hidden: false, + is_assemb: false, + }, + selectMaterialObj: {}, isSaving: false, showDrawer: false, limitedVisible: false, @@ -196,6 +216,10 @@ import recordDialog from "./qctDetail.vue"; handleQuery(){ this.$refs.table.queryData(this.query) }, + selectMaterialChange(row){ + this.query.qctmat__material = row ? row.id : ''; + this.handleQuery(); + }, dialogClose(){ this.isSaving = false; this.limitedVisible = false; From 79c579c55e4972cd8976e9ee8f66edbde5160a6b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 22 Apr 2026 12:48:33 +0800 Subject: [PATCH 2/5] Fix qct lookup type for mlogb input material --- src/views/wpm_gx/mlogb_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue index 62fb3959..2cc25c4a 100644 --- a/src/views/wpm_gx/mlogb_form.vue +++ b/src/views/wpm_gx/mlogb_form.vue @@ -400,7 +400,7 @@ export default { getdefects(material){ let that = this; // let material = that.is_fix?that.materialFix:that.materialIn; - that.$API.qm.qct.getQct.req({material: material,tag:'process'}).then((res) => { + that.$API.qm.qct.getQct.req({material: material,tag:'process',type:'in'}).then((res) => { res.qct_defects.forEach((item) => { that.defectform[item.defect_name] = 0; }) From 1b613f0d7f58d1b6fd9e4049d3be230ca19d6ab6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 23 Apr 2026 08:46:41 +0800 Subject: [PATCH 3/5] Refine defect labels in material selectors --- src/views/wpm_bx/handover_form.vue | 2 +- src/views/wpm_bx/mlogb_form.vue | 2 +- src/views/wpm_gx/handover_form.vue | 14 ++++++++++++-- src/views/wpm_gx/mlogb_form.vue | 15 ++++++++++++++- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 019c5980..749d4a44 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -55,7 +55,7 @@ {{ item.batch }} ({{ item.material_.process_name }}) (原料棒) - {{ item.defect_name }} + {{ item.defect_name }}
{{ item.count_canhandover }} diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue index cc0a7d42..0f3be5d4 100644 --- a/src/views/wpm_bx/mlogb_form.vue +++ b/src/views/wpm_bx/mlogb_form.vue @@ -75,7 +75,7 @@ :value="item.id" > {{ item.batch }} - ({{ item.defect_name }}) + {{ item.defect_name }} {{ item.count_cando }} diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index 57e52dd1..79dfe34f 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -36,6 +36,7 @@ :apiObj="apiObjM" v-model="selectObjIds" v-model:obj="selectObjs" + v-model:label="selectMaterialLabel" :labelField="'batch'" style="width: 100%;" :params = "paramsM" @@ -47,7 +48,7 @@ 不合格 返工 {{ scope.row.batch }}({{ scope.row.material_name }}) - {{ scope.row.defect_name }} + {{ scope.row.defect_name }} @@ -200,6 +201,7 @@ :apiObj="apiObjM" v-model="selectObjIds" v-model:obj="selectObjs" + v-model:label="selectMaterialLabel" :labelField="'batch'" style="width: 100%;" :params = "paramsM" @@ -211,7 +213,7 @@ 不合格 返工 {{ scope.row.batch }}({{ scope.row.material_name }}) - {{ scope.row.defect_name }} + {{ scope.row.defect_name }} @@ -343,6 +345,7 @@ export default { }, initForm:{}, selectObjIds:[], + selectMaterialLabel:"", apiObj:this.$API.mtm.material.list, apiObjM:null, params:{}, @@ -662,6 +665,7 @@ export default { //选中物料批次后，放入handoverb materialChange0(){ let that = this; + that.selectMaterialLabel = that.selectObjs.map(item => that.formatWmaterialLabel(item)).join(";"); that.totalCount = 0; that.selectObjs.forEach(item=>{ if(that.handoverbIds.indexOf(item.id)==-1){ @@ -692,6 +696,12 @@ export default { that.countChange(); },500) }, + formatWmaterialLabel(row){ + if(!row || !row.batch){ + return ""; + } + return row.defect_name ? `${row.batch} [${row.defect_name}]` : row.batch; + }, countChange(){ let that = this; let totalCount = 0; diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue index 2cc25c4a..d3bf8cba 100644 --- a/src/views/wpm_gx/mlogb_form.vue +++ b/src/views/wpm_gx/mlogb_form.vue @@ -44,6 +44,7 @@ :apiObj="apiObjM" v-model="form.wm_in" v-model:obj="selectObj" + v-model:label="wmInLabel" :labelField="'batch'" style="width: 100%;" :params = "paramsM" @@ -55,7 +56,7 @@ 不合格 返工 {{ scope.row.batch }}({{ scope.row.material_name }}) - {{ scope.row.defect_name }} + {{ scope.row.defect_name }} @@ -271,6 +272,7 @@ export default { ], }, selectObj:{count:0}, + wmInLabel:"", batch_count:null, codeBatch:"", materialFix:"", @@ -420,6 +422,11 @@ export default { }, materialBatchChange(){ let that = this; + if(!that.selectObj || !that.selectObj.id){ + that.wmInLabel = ""; + return; + } + that.wmInLabel = that.formatWmaterialLabel(that.selectObj); that.getRoute(that.selectObj.material); that.form.batch = that.selectObj.batch; that.form.count_use = that.selectObj.count_cando; @@ -483,6 +490,12 @@ export default { }) that.countCellChanges(); }, + formatWmaterialLabel(row){ + if(!row || !row.batch){ + return ""; + } + return row.defect_name ? `${row.batch} [${row.defect_name}]` : row.batch; + }, //表单提交方法 submit() { let that = this; From 373a39b09636d4fff34aefaa81efe91e95ef62b2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 27 Apr 2026 10:17:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=8E=9F=E6=96=99=E5=BA=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0do=5Fin=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mainso_mio.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue index 243f4aa3..b3e0f662 100644 --- a/src/views/inm/mainso_mio.vue +++ b/src/views/inm/mainso_mio.vue @@ -211,7 +211,7 @@ export default { }, query: {}, params: { - type__in: "pur_in,do_out", + type__in: "pur_in,do_out,do_in", materials__type: 30, }, form: {}, From f48458b7ba8d790f9973ed149f6886cfebc903f0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 27 Apr 2026 12:05:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=8E=9F=E6=96=99=E5=BA=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0do=5Fin=E6=9F=A5=E8=AF=A22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mainso_mio.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue index b3e0f662..3a0dc66b 100644 --- a/src/views/inm/mainso_mio.vue +++ b/src/views/inm/mainso_mio.vue @@ -204,6 +204,7 @@ export default { cateOptions: [ { id: "do_out", name: "生产领料" }, { id: "pur_in", name: "采购入库" }, + { id: "do_in", name: "生产入库" }, ], dialog: { save: false,