diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue index a523a449..a0f26bfd 100644 --- a/src/views/qm/behavior.vue +++ b/src/views/qm/behavior.vue @@ -228,7 +228,7 @@ export default { }, state_xj: { S: "析晶", - K: "不析晶", + R: "不析晶", θ: "未化", }, form: { diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue index e1e06d22..15891082 100644 --- a/src/views/qm/behavior_form.vue +++ b/src/views/qm/behavior_form.vue @@ -262,6 +262,13 @@ export default { trigger: "blur", }, ], + sample_number:[ + { + required: true, + message: "请输入样品编号", + trigger: "blur" + }, + ], test_user: [ { required: true, @@ -297,7 +304,7 @@ export default { ], xjOptios: [ { id: "S", name: "析晶" }, - { id: "K", name: "不析晶" }, + { id: "R", name: "不析晶" }, { id: "θ", name: "未化" }, ], visible: false, diff --git a/src/views/qm/product_form.vue b/src/views/qm/product_form.vue index af85cf43..e91d91e4 100644 --- a/src/views/qm/product_form.vue +++ b/src/views/qm/product_form.vue @@ -17,23 +17,18 @@ - - - - + + + + @@ -104,6 +99,7 @@ export default { emits: ["success", "closed"], data() { return { + apiObjBatch:this.$API.inm.warehouse.batch, apiUserObj: this.$API.system.user.list, loading: false, form: { @@ -126,6 +122,7 @@ export default { }, ], }, + selectBatch:null, visible: false, isSaveing: false, options: [], @@ -170,17 +167,12 @@ export default { that.options = res; }); }, - handleChange(val) { + handleBatchChange() { let that = this; - console.log(val); - that.options.forEach((item) => { - if (item.id == val) { - that.form.count = item.count; - that.form.batch = item.batch; - that.form.material = item.material; - that.form.mb = item.id; - } - }); + that.form.count = that.selectBatch.count; + that.form.batch = that.selectBatch.batch; + that.form.material = that.selectBatch.material; + that.form.mb = that.selectBatch.id; }, //提交 submit() {