diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 0ed3beaf..34a19998 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -26,20 +26,6 @@
 						/>
 					</el-form-item>
 				</el-col>
-				<!-- <el-col :md="12" :sm="24">
-					<el-form-item label="交接数量" width="100">
-						<el-input-number
-							v-model="form.count"
-							controls-position="right"
-							:min="0"
-							step="1"
-							:step-strictly="true"
-							style="width: 100%"
-							placeholder="交接数量"
-						>
-						</el-input-number>
-					</el-form-item>
-				</el-col> -->
 				<el-col :md="12" :sm="24">
 					<el-form-item label="交送人" prop="send_user">
 						<el-select
@@ -58,61 +44,6 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<!-- <el-col :md="12" :sm="24" v-if="type==30">
-					<el-form-item label="接收部门" prop="recive_dept">
-						<el-select
-							v-model="form.recive_dept"
-							placeholder="接收部门"
-							clearable
-							style="width: 100%"
-							@change="getUserList3"
-						>
-							<el-option
-								v-for="item in deptOptions"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :md="12" :sm="24" v-else>
-					<el-form-item label="接收工段" prop="recive_mgroup">
-						<el-select
-							v-model="form.recive_mgroup"
-							placeholder="接收工段"
-							clearable
-							style="width: 100%"
-							:disabled="type==40"
-							@change="getUserList2"
-						>
-							<el-option
-								v-for="item in mgroupOptions"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :md="12" :sm="24">
-					<el-form-item label="接收人" prop="recive_user">
-						<el-select
-							v-model="form.recive_user"
-							placeholder="接收人"
-							clearable
-							filterable
-							style="width: 100%"
-						>
-							<el-option
-								v-for="item in userList2"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col> -->
 				<el-col :md="12" :sm="24">
 					<el-form-item label="更改批次">	
 						<el-switch v-model="change_batch"></el-switch>
@@ -484,8 +415,6 @@ export default {
 					that.getCkUserList();//废品库接收人
 				}else if(that.type==30){
 					this.getUserList3();
-				}else{
-					this.getUserList2();
 				}
 			});
 		},
@@ -555,14 +484,21 @@ export default {
 		//获取接收工段人员
 		getUserList2() {
 			let that = this;
-			this.mgroupOptions.forEach(item => {
-				if(item.id==that.form.recive_mgroup){
-					let deptID = item.belong_dept;
-					this.$API.system.user.list.req({ belong_dept: deptID, page: 0 }).then((res) => {
+			if(that.mode=="add"){
+				that.$API.mtm.mgroup.item.req(that.form.recive_mgroup).then((res) => {
+					this.$API.system.user.list.req({ belong_dept: res.belong_dept, page: 0 }).then((res) => {
 						that.userList2 = res;
 					});
-				}
-			});
+				})
+			}else{
+				this.mgroupOptions.forEach(item => {
+					if(item.id==that.form.recive_mgroup){
+						this.$API.system.user.list.req({ belong_dept: item.belong_dept, page: 0 }).then((res) => {
+							that.userList2 = res;
+						});
+					}
+				});
+			}
 		},
 		//获取接收部门人员
 		getUserList3() {
@@ -679,12 +615,27 @@ export default {
 		},
 		//表单注入数据
 		setData(data) {
+			let that = this;
 			this.totalCount = data.count?data.count:data.handoverb.count;
 			Object.assign(this.form, data);
 			if(data.type==30){
 				this.getUserList3();
 			}else{
-				this.getUserList2();
+				this.$API.system.user.list.req({ belong_dept: data.recive_dept, page: 0 }).then((res) => {
+					that.userList2 = res;
+				});
+				setTimeout(() => {
+				    let arr =that.userList2.filter((item) => {
+						return item.id == data.recive_user
+					})
+					if(arr.length>0){}else{
+						let obj = {};
+						obj.id = data.recive_user;
+						obj.name = data.recive_user_name;
+						that.userList2.push(obj);
+					}
+				},500)
+				
 			}
 			if(data.new_batch!==''&&data.new_batch!==undefined&&data.new_batch!==null){
 				this.change_batch = true;
diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue
index 318a0535..bfbcf994 100644
--- a/src/views/wpm_bx/inm.vue
+++ b/src/views/wpm_bx/inm.vue
@@ -168,13 +168,13 @@
 			@success="handleinmSuccess"
 		>
 		</save-dialog>
-		<el-drawer v-model="wprVisibleDrawer" :size="'50%'">
+		<el-drawer v-model="wprVisibleDrawer" :size="'70%'">
 			<template #header>
 				<h4>关联产品</h4>
 			</template>
 			<template #default>
 				<scTable ref="wprTable" hidePagination :data="wprList">
-					<el-table-column label="产品编号" prop="number"></el-table-column>
+					<el-table-column label="产品编号" prop="number" min-width="100px"></el-table-column>
 					<el-table-column label="记录数据" prop="oinfo">
 						<template #default="scope">
 							<div v-for="(item,index) in scope.row.oinfo" :key="item.id">
@@ -183,7 +183,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="缺陷项">
+					<el-table-column label="缺陷项"  min-width="200px">
 						<template #default="scope">
 							<span v-for="item in scope.row.wprdefect" :key="item.id">
 								<el-tag
@@ -199,7 +199,7 @@
 						width="120"
 					>
 						<template #default="scope">
-							<el-link :underline="false"  @click="printMaterial(scope.row,'wpr')" type="primary">物料标签</el-link>
+							<el-link :underline="false"  @click="printMaterial(scope.row,'wpr')" type="primary">打印标签</el-link>
 						</template>
 					</el-table-column>
 				</scTable>
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index fdc7ed37..75fa6c89 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -300,7 +300,7 @@
 							<el-link
 								:underline="false"
 								type="primary"
-								v-if="mlogItem.submit_time == null&&mlogItem.material_out_&&mlogItem.material_out_.tracking==20"
+								v-if="mlogItem.material_out_&&mlogItem.material_out_.tracking==20"
 								@click="table_out_check_single(scope.row,'outs')"
 							>详情</el-link>
 						</template>
@@ -356,6 +356,7 @@
 				ref="checkDialogSingle"
 				:mlogb="mlogb"
 				:wm = "wm"
+				:isSubmit="isSubmit"
 				:batchNumber="batchNumber"
 				:handle_user="handle_user"
 				:handle_date="handle_date"
@@ -482,6 +483,7 @@ export default {
 			qct:null,
 			defectlist:[],
 			batchNumber:'',
+			isSubmit:false,
 		};
 	},
 	mounted() {
@@ -597,6 +599,7 @@ export default {
 			let that = this;
 			that.mlogb = row.id;
 			that.wm = row.wm_in;
+			that.isSubmit = that.mlogItem.submit_time == null ? false : true;
 			that.batchNumber = row.batch;
 			that.handle_date=that.mlogItem.handle_date;
 			that.handle_user = that.mlogItem.handle_user;
diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue
index a967ce1b..012d8b1f 100644
--- a/src/views/wpm_bx/mlog_form.vue
+++ b/src/views/wpm_bx/mlog_form.vue
@@ -17,7 +17,7 @@
 					style="padding: 0 10px"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="生产类型" prop="mtype">
 								<el-select
 									v-model="form.mtype"
@@ -35,7 +35,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="form.mtype == 20">
+						<el-col  :md="12" :sm="12" :xs="24" v-if="form.mtype == 20">
 							<el-form-item
 								label="外协单位"
 								prop="supplier"
@@ -57,7 +57,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="mode=='add'">
+						<el-col :md="12" :sm="12" :xs="24" v-if="mode=='add'">
 							<el-form-item label="关联任务" prop="mtask">
 								<el-select
 									v-model="form.mtask"
@@ -76,7 +76,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="工艺路线">
 								<el-select
 									v-model="form.route"
@@ -97,7 +97,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="生产设备">
 								<el-select
 									v-model="form.equipment"
@@ -119,7 +119,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-for="item in testitems" :key="item.id">
+						<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'"
@@ -174,7 +174,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item
 								label="开始时间"
 								prop="work_start_time"
@@ -185,11 +185,12 @@
 									type="datetime"
 									value-format="YYYY-MM-DD HH:mm:ss"
 									style="width: 100%"
+									popper-append-to-body
 								/>
 							</el-form-item>
 						</el-col>
 
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="结束时间" prop="work_end_time">
 								<el-date-picker
 									v-model="form.work_end_time"
@@ -197,10 +198,11 @@
 									value-format="YYYY-MM-DD HH:mm:ss"
 									style="width: 100%"
 									:disabledDate="disabledDateFn"
+									popper-append-to-body
 								/>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="操作人">
 								<ehsSelect
 									v-model="form.handle_user"
@@ -210,7 +212,7 @@
 								></ehsSelect>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="备注">
 								<el-input
 									v-model="form.note"
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index 2f0bb8d6..98b5fd93 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -16,7 +16,7 @@
 				:addTemplate="addTemplate"
 				placeholder="暂无数据"
 			>
-				<el-table-column prop="number" label="物料编号">
+				<el-table-column prop="number" label="物料编号" fixed min-width="120px">
 					<template #default="scope">
 						<span v-if="!scope.row.isEdit">{{ scope.row.number }}</span>
 						<el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input>
@@ -38,7 +38,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id">
+				<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px">
 					<template #default="scope">
 						<el-input-number
 							v-if="item.testitem_field_type=='input-number'"
@@ -103,7 +103,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="70px">
+				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="80px">
 					<template #default="scope">
 						<el-switch 
 							:disabled="!scope.row.isEdit"
@@ -119,7 +119,7 @@
 						<el-input v-else v-model="scope.row.note" placeholder="备注"></el-input>
 					</template>
 				</el-table-column>
-				<el-table-column prop="open" label="操作" width="60" align="center">
+				<el-table-column prop="open" label="操作" width="60" align="center" v-if="!isSubmit">
 					<template #default="scope">
 						<el-button
 							v-if="scope.row.isEdit"
@@ -185,6 +185,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		isSubmit:{
+			type: Boolean,
+			default: false,
+		},
 	},
 	emits: ["success", "closed"],
 	data() {
diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index d8dca1ab..f2252ef2 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -37,11 +37,13 @@
 					label="#"
 					type="index"
 					width="50"
+					fixed
 				></el-table-column>
 				<el-table-column
 					label="工艺路线"
 					prop="material_out_name"
 					min-width="130"
+					fixed
 				>
 				</el-table-column>
 				<el-table-column
@@ -87,9 +89,8 @@
 				></el-table-column>
 				<el-table-column label="是否提交">
 					<template #default="scope">
-						<el-icon v-if="scope.row.submit_time != null" color="green">
-							<CircleCheckFilled />
-						</el-icon>
+						<el-tag  v-if="scope.row.submit_time == null" type="warning">未提交</el-tag>
+						<el-tag  v-else type="success">已提交</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column