diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 09f0c304..933d4051 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -102,6 +102,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="24" v-if="mgroupName=='成品抛'">
 							<el-form-item label="批次序号">
 								<el-input-number
@@ -268,6 +323,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		process:{
+			type: String,
+			default: "",
+		},
 	},
 	computed: {
 		title() {
@@ -306,6 +365,7 @@ export default {
 			visible: false,
 			isSaveing: false,
 			options: [],
+			testitems:[],
 			qct_defects:[],
 			routeOptions: [],
 			supplierOptions: [],
@@ -317,10 +377,23 @@ export default {
 		this.getShift();
 		this.getMgroup();
 		this.getMtask();
+		this.gettestitem();
 		this.form.fmlog = this.fmlog;
 		this.form.handle_date =  this.$TOOL.dateFormat2(new Date());;
 	},
 	methods: {
+		//获取操作项
+		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);
+				})
+			});
+		},
 		disabledDateFn(time) {
 			return time.getTime() > new Date().getTime();
 		},
diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 5ce16001..0171490a 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -174,6 +174,7 @@
 				:fmlog="params.fmlog"
 				:mgroup="mgroup"
 				:mtask="mtask"
+				:process="processId"
 				@success="handleSaveSuccess"
 				@closed="dialog.save = false"
 			>
@@ -201,6 +202,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		processId:{
+			type: String,
+			default: "",
+		},
 	},
 	components: {
 		saveDialog,
diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue
index dfaed964..33359808 100644
--- a/src/views/wpm_gx/fmlogs.vue
+++ b/src/views/wpm_gx/fmlogs.vue
@@ -148,6 +148,7 @@
 			v-if="dialog.detail"
 			ref="detailDialog"
 			:fmlogId="fmlogId"
+			:processId="processId"
 			@closed="detailClose"
 		>
 		</detail-drawer>