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;