From a637ab19bf30b7499f640263f9d4038dc971a5b8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 22 Aug 2025 11:18:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BF=AB=E9=80=9F=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E5=B1=95=E7=A4=BA=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_form2.vue | 75 +++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/src/views/wpm_bx/mlog_form2.vue b/src/views/wpm_bx/mlog_form2.vue
index 49c6a111..44f99509 100644
--- a/src/views/wpm_bx/mlog_form2.vue
+++ b/src/views/wpm_bx/mlog_form2.vue
@@ -80,6 +80,61 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
+							<el-form-item :label="item.name">
+								<el-input-number
+									v-if="item.field_type=='input-number'"
+									v-model="item.value"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+								>
+								</el-input-number>
+								<el-input-number
+									v-if="item.field_type=='input-int'"
+									v-model="item.value"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+								>
+								</el-input-number>
+								<el-input
+									v-if="item.field_type=='input-text'"
+									v-model="item.value"
+									class="width-100"
+								>
+								</el-input>
+								<el-select
+									v-if="item.field_type=='select-text'"
+									v-model="item.value"
+									clearable
+									class="width-100"
+								>
+									<el-option
+										v-for="item0 in item.choices"
+										:key="item0"
+										:label="item0"
+										:value="item0"
+									>
+									</el-option>
+								</el-select>
+								<el-select
+									v-if="item.field_type=='selects-text'"
+									v-model="item.value"
+									clearable
+									multiple
+									class="width-100"
+								>
+									<el-option
+										v-for="item1 in item.choices"
+										:key="item1"
+										:label="item1"
+										:value="item1"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="工艺路线：">
 								<el-select
@@ -175,6 +230,7 @@ export default {
 			isSaveing: false,
 			batchCountCando:0,
 			materialTracking:10,
+			testitems:[],
 			options: [],
 			bwItemForms: [],
 			routeOptions: [],
@@ -190,6 +246,7 @@ export default {
 		this.getMaterial();
 		this.getRoute();
 		this.getEquipment();
+		this.gettestitem();
 	},
 	methods: {
 		//获取工艺步骤
@@ -211,6 +268,17 @@ export default {
 				});
 			});
 		},
+		gettestitem(){
+			let that = this;
+			that.$API.qm.testitem.list.req({ process: that.process,type:20 }).then((res) => {
+				res.results.forEach((item) => {
+					let obj = {};
+					Object.assign(obj, item);
+					obj.value = '';
+				    that.testitems.push(obj);
+				})
+			});
+		},
 		//显示
 		open(mode = "add") {
 			let that = this;
@@ -362,6 +430,13 @@ export default {
 				if (valid) {
 					that.isSaveing = true;
 					that.form.mgroup = that.mgroup;
+					if(that.testitems.length>0){
+						let oinfo_json = {};
+						that.testitems.forEach((item) => {
+							oinfo_json[item.id] = item.value;
+						})
+						that.form.oinfo_json = oinfo_json;
+					}
 					that.$API.wpm.mlog.quick.req(that.form).then((res) => {
 						if(that.bwItemForms.length>0&&that.batchCountCando!==that.bwItemForms.length){
 							that.bwItemForms.forEach(item=>{