From ff2544dc6e6e2fcb88f59ace5896758ced6bf5d1 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Jun 2022 10:23:27 +0800 Subject: [PATCH 1/3] zidingyibianhao --- hb_client/src/components/customForm/index.vue | 22 +++++++++++- hb_client/src/views/inm/fifo.vue | 18 +++++++++- hb_client/src/views/pm/plan.vue | 13 +++++-- hb_client/src/views/sam/order.vue | 7 ++-- hb_client/src/views/wpm/need.vue | 34 +++++++------------ 5 files changed, 66 insertions(+), 28 deletions(-) diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue index cfe31f0..1f0e232 100644 --- a/hb_client/src/components/customForm/index.vue +++ b/hb_client/src/components/customForm/index.vue @@ -158,6 +158,16 @@ 检查合格 检查不合格 + + + + + + + + + +
取 消 保存 @@ -200,7 +210,15 @@ isDisabled: { type: Boolean, default: false - } + }, + number: { + type: String, + default: '' + }, + remark:{ + type: String, + default: '' + }, }, mounted() { let that = this; @@ -719,6 +737,8 @@ that.testrecord.record_data = that.field;//检查项列表 that.testrecord.is_testok = that.is_testok;//检查表检查结果 that.testrecord.id = that.recordId;//记录id + that.testrecord.number = that.number;//编号 + that.testrecord.remark = that.remark;//备注 if (that.index === '2') {//提交 this.$emit('recordSubmit', that.testrecord); } else {//保存 diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue index 8331f0c..e448e0f 100644 --- a/hb_client/src/views/inm/fifo.vue +++ b/hb_client/src/views/inm/fifo.vue @@ -465,6 +465,7 @@ material: "", // 物料 count: "", //数量 batch: "", //批次 + expiration_date: "", // details:[], }, ], @@ -638,6 +639,7 @@ material: "", // 物料 count: "", //数量 batch: "", //批次 + expiration_date: "", // details:[], }, ]; @@ -710,7 +712,21 @@ async confirm(form) { console.log(this.inventory); - + let details = []; + this.inventory.details.forEach(item=>{ + let obj = new Object(); + if(item.details.length>0){ + obj = item; + }else{ + obj.warehouse = item.warehouse; + obj.material = item.material; + obj.count = item.count; + obj.batch = item.batch; + obj.expiration_date = item.expiration_date; + } + details.push(obj); + }); + this.inventory.details = details; createInother(this.inventory).then((res) => { if (res.code >= 200) { this.getList(); diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue index ebf88e4..460f75e 100644 --- a/hb_client/src/views/pm/plan.vue +++ b/hb_client/src/views/pm/plan.vue @@ -237,6 +237,9 @@ > + + +
- + @@ -224,8 +224,9 @@ dialogVisible: false, dialogType: "new", rule1: { - product: [{required: true, message: "请输入", trigger: "blur"}], - delivery_date: [{required: true, message: "请输入", trigger: "blur"}], + number: [{required: true, message: "请输入订单编号", trigger: "blur"}], + product: [{required: true, message: "请选择所需产品", trigger: "blur"}], + delivery_date: [{required: true, message: "请选择交货日期", trigger: "blur"}], }, }; }, diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue index 80a6f78..e408d52 100644 --- a/hb_client/src/views/wpm/need.vue +++ b/hb_client/src/views/wpm/need.vue @@ -520,6 +520,8 @@ :hasPicture="hasPicture" :formID="recordform" :wproduct="wproduct" + :remark="remark" + :number="number" :recordId="recordId" :isDisabled="isDisabled" :isMidTesting="is_midtesting" @@ -935,7 +937,9 @@ filtersList: [{text: '切割', value: '切割'}, {text: '磨边', value: '磨边'}, {text: '清洗', value: '清洗'}, {text: '热弯成型', value: '热弯成型'}, {text: '化学钢化', value: '化学钢化'}, {text: '镀膜', value: '镀膜'}, {text: '断膜', value: '断膜'}, {text: '汇流条制备', value: '汇流条制备'}, - {text: '夹层', value: '夹层'}, {text: '包边', value: '包边'}] + {text: '夹层', value: '夹层'}, {text: '包边', value: '包边'}], + remark:'', + number:'', }; }, computed: {}, @@ -1281,6 +1285,8 @@ that.recordVisible = false; that.recordId = scope.row.id; that.recordform = scope.row.form; + that.number = scope.row.number; + that.remark = scope.row.remark; that.formName = scope.row.form_.name; if (that.innerIndex !== '2') {//非复检 getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => { @@ -1364,6 +1370,8 @@ that.recordFinishedVisible = true; that.formName = res.data.form_.name; that.fieldList = res.data.record_data; + that.number = res.data.number; + that.remark = res.data.remark; } }) }, @@ -1499,6 +1507,8 @@ let params = {}; params.record_data = value.record_data; params.is_testok = value.is_testok; + params.number = value.number; + params.remark = value.remark; putTestRecordItem(id, params).then((res) => { if (res.code >= 200) { that.recordVisible = false; @@ -1523,28 +1533,10 @@ params.id = value.id; params.is_testok = value.is_testok; params.record_data = value.record_data; + params.number = value.number; + params.remark = value.remark; that.params = params; that.limitedPhoto = true; - /*putTestRecordItem(id, params).then((res) => { - if (res.code >= 200) { - subTestRecordItem(id, params).then((res) => { - if (res.code >= 200) { - that.recordVisible = false; - that.limitedReview = false; - that.limitedCheckRecord = false; - that.getList(); - that.getList2(); - that.getList1(); - that.getList3(); - that.refreshRecord(); - } - }); - } else { - this.$message.error(res.msg) - } - }).catch((err) => { - this.$message.error(err); - });*/ }, checkSubmit(data) { debugger; From 966930ba5b9486e146d6ebd5b3aa1cbbc84745ee Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Jun 2022 11:08:17 +0800 Subject: [PATCH 2/3] zhuangxiangquanxiangaidong --- hb_client/src/views/mtm/materialDetail.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hb_client/src/views/mtm/materialDetail.vue b/hb_client/src/views/mtm/materialDetail.vue index 503f909..f334ac7 100644 --- a/hb_client/src/views/mtm/materialDetail.vue +++ b/hb_client/src/views/mtm/materialDetail.vue @@ -218,7 +218,12 @@ - + 新增装箱单