diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index e76670b5..ca64c413 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -97,24 +97,25 @@
 					width="50"
 				></el-table-column>
 				<el-table-column type="expand">
-						<template #default="props">
-							<div style="padding-left: 50px">
-								<template v-for="item in props.row.handoverb" :key="item.id">
-									<el-descriptions :column="3">
-										<el-descriptions-item label="批次">
-											{{item.batch}}
-										</el-descriptions-item>
-										<el-descriptions-item label="数量">
-											{{item.count}}
-										</el-descriptions-item>
-										<el-descriptions-item label="不合格标记" v-if="item.defect_name!==null&&item.defect_name!==undefind">
-											{{item.defect_name}}
-										</el-descriptions-item>
-									</el-descriptions>
-								</template>
+					<template #default="props">
+						<div class="handover-detail">
+							<div class="handover-detail__row handover-detail__header">
+								<span>批次</span>
+								<span>数量</span>
+								<span>不合格标记</span>
 							</div>
-						</template>
-					</el-table-column>
+							<div
+								v-for="item in props.row.handoverb"
+								:key="item.id"
+								class="handover-detail__row"
+							>
+								<span>{{ item.batch }}</span>
+								<span>{{ item.count }}</span>
+								<span>{{ item.defect_name || '-' }}</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
 				<el-table-column label="物料" prop="material_name" min-width="120"></el-table-column>
 				<el-table-column label="数量" prop="count" width="80"></el-table-column>
 				<el-table-column label="批次" prop="batch" min-width="60">
@@ -471,21 +472,21 @@ export default {
 			});
 		},
 		//编辑
-		table_edit(row) {
+		async table_edit(row) {
 			this.type=row.type;
 			this.dialog.save = true;
 			this.mode = "edit";
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open("edit").setData(row);
-			});
+			await this.$nextTick();
+			this.$refs.saveDialog.open("edit", "", row.mtype);
+			await this.$refs.saveDialog.loadData(row.id);
 		},
-		table_show(row){
+		async table_show(row){
 			this.type=row.type;
 			this.dialog.save = true;
 			this.mode = "show";
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open("show").setData(row);
-			});
+			await this.$nextTick();
+			this.$refs.saveDialog.open("show", "", row.mtype);
+			await this.$refs.saveDialog.loadData(row.id);
 		},
 		//删除
 		async table_del(row) {
@@ -603,6 +604,35 @@ export default {
 };
 </script>
 <style scoped>
+.handover-detail {
+	padding: 4px 50px;
+	font-size: 13px;
+	color: var(--el-text-color-regular);
+}
+
+.handover-detail__row {
+	display: grid;
+	grid-template-columns: minmax(240px, 2fr) minmax(120px, 1fr) minmax(180px, 1fr);
+	align-items: center;
+	min-height: 30px;
+	border-bottom: 1px solid var(--el-border-color-lighter);
+}
+
+.handover-detail__row:last-child {
+	border-bottom: 0;
+}
+
+.handover-detail__header {
+	min-height: 28px;
+	font-weight: 500;
+	color: var(--el-text-color-secondary);
+	background: var(--el-fill-color-light);
+}
+
+.handover-detail__row > span {
+	padding: 4px 12px;
+}
+
 .treeMain {
 	width: 100%;
 	height: 280px;
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 442ddd35..f2c4c8cd 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -1,12 +1,72 @@
 <template>
 	<el-container>
-		<el-main class="nopadding">
+		<el-main class="nopadding" v-loading="loading">
 			<el-form
 				ref="dialogForm"
 				:model="form"
 				:rules="rules"
 				label-width="80px"
 			>
+				<template v-if="mode === 'show'">
+					<div class="form-section-title">基本信息</div>
+					<el-descriptions :column="3" border class="handover-summary">
+						<el-descriptions-item label="交接类别">{{ form.type_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="操作类型">{{ form.mtype_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="交送日期">{{ form.send_date || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="物料">{{ form.material_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="交接数量">{{ totalCount }}</el-descriptions-item>
+						<el-descriptions-item label="记录状态">
+							<el-tag :type="form.submit_time ? 'success' : 'info'" size="small">
+								{{ form.submit_time ? '已提交' : '未提交' }}
+							</el-tag>
+						</el-descriptions-item>
+						<el-descriptions-item label="交送部门">{{ form.send_dept_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="交送工段">{{ form.send_mgroup_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="交送人">{{ form.send_user_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="接收部门">{{ form.recive_dept_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="接收工段">{{ form.recive_mgroup_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item label="接收人">{{ form.recive_user_name || '-' }}</el-descriptions-item>
+						<el-descriptions-item v-if="form.new_batch" label="新批次号">{{ form.new_batch }}</el-descriptions-item>
+						<el-descriptions-item v-if="form.material_changed_fname" label="变更后物料">{{ form.material_changed_fname }}</el-descriptions-item>
+						<el-descriptions-item v-if="form.material_changed && form.state_changed_name" label="变更后状态">{{ form.state_changed_name }}</el-descriptions-item>
+						<el-descriptions-item v-if="form.clear_defect" label="清除批次缺陷">是</el-descriptions-item>
+						<el-descriptions-item v-if="form.submit_time" label="提交时间">{{ form.submit_time }}</el-descriptions-item>
+						<el-descriptions-item v-if="form.submit_user_name" label="提交人">{{ form.submit_user_name }}</el-descriptions-item>
+						<el-descriptions-item label="备注" :span="3">{{ form.note || '-' }}</el-descriptions-item>
+					</el-descriptions>
+
+					<div class="form-section-title">交接明细</div>
+					<el-table :data="form.handoverb" border stripe size="small">
+						<el-table-column v-if="hasProductDetails" type="expand" width="42">
+							<template #default="scope">
+								<div class="product-detail-list" v-if="scope.row.handoverbw && scope.row.handoverbw.length">
+									<span class="product-detail-label">单件编号</span>
+									<el-tag v-for="item in scope.row.handoverbw" :key="item.id || item.number" size="small" effect="plain">
+										{{ item.number }}<template v-if="item.note">（{{ item.note }}）</template>
+									</el-tag>
+								</div>
+								<el-empty v-else description="无单件编号" :image-size="48" />
+							</template>
+						</el-table-column>
+						<el-table-column label="批次" prop="batch" min-width="150" />
+						<el-table-column label="物料" prop="material_name" min-width="180">
+							<template #default="scope">{{ scope.row.material_name || form.material_name || '-' }}</template>
+						</el-table-column>
+						<el-table-column label="状态" prop="state_name" width="90" />
+						<el-table-column label="缺陷等级" prop="defect_grade_name" width="100" />
+						<el-table-column label="具体缺陷" prop="defect_name" min-width="120">
+							<template #default="scope">{{ scope.row.defect_name || '-' }}</template>
+						</el-table-column>
+						<el-table-column label="不合格标记" prop="notok_sign_name" width="110">
+							<template #default="scope">{{ scope.row.notok_sign_name || '-' }}</template>
+						</el-table-column>
+						<el-table-column label="来源位置" min-width="130">
+							<template #default="scope">{{ scope.row.mgroup_name || scope.row.belong_dept_name || '全局库存' }}</template>
+						</el-table-column>
+						<el-table-column label="交接数量" prop="count" width="100" align="right" />
+					</el-table>
+				</template>
+				<template v-else>
 				<el-row>
 					<el-form-item label="交接物料">
 						<el-button type="primary" @click="addMaterial" v-if="mode!=='show'">手动添加</el-button>
@@ -106,23 +166,18 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="24" v-if="mtype!==30">
-						<el-form-item label="交送人">
-							<span v-if="mode==='show'">{{ form.send_user_name }}</span>
-							<el-select
-								v-else
+						<el-form-item label="交送人" prop="send_user">
+							<xtSelect
+								:apiObj="$API.system.user.list"
+								:params="sendUserParams"
 								v-model="form.send_user"
+								v-model:label="form.send_user_name"
 								placeholder="交送人"
-								clearable
-								filterable
 								style="width: 100%"
 							>
-								<el-option
-									v-for="item in userList"
-									:key="item.id"
-									:label="item.name"
-									:value="item.id"
-								/>
-							</el-select>
+								<el-table-column label="姓名" prop="name" />
+								<el-table-column label="部门" prop="belong_dept_name" />
+							</xtSelect>
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="24" v-if="mtype!==30">
@@ -133,7 +188,7 @@
 								clearable
 								style="width: 100%"
 								:disabled="type==40||mode!=='add'"
-								@change="getUserList2"
+								@change="reciveMgroupChange"
 							>
 								<el-option
 									v-for="item in mgroupOptions"
@@ -146,22 +201,18 @@
 					</el-col>
 					<el-col :md="12" :sm="24"  v-if="mtype!==30">
 						<el-form-item label="接收人">
-							<span v-if="mode==='show'">{{ form.recive_user_name }}</span>
-							<el-select
-								v-else
+							<xtSelect
+								:apiObj="$API.system.user.list"
+								:params="reciveUserParams"
 								v-model="form.recive_user"
+								v-model:label="form.recive_user_name"
+								:edit="Boolean(form.recive_dept) || type == 40"
 								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-table-column label="姓名" prop="name" />
+								<el-table-column label="部门" prop="belong_dept_name" />
+							</xtSelect>
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="24" v-if="type==50">
@@ -276,14 +327,15 @@
 						</el-col>
 					</el-row>
 				</div>
+				</template>
 			</el-form>
 			<el-footer>
-				<template  v-if="(route_code=='tuihuo'&&type==10&&mtype==10)||form.ticket!=null">
+				<template v-if="mode !== 'show' && ((route_code=='tuihuo'&&type==10&&mtype==10)||form.ticket!=null)">
 					<ticketd_b :workflow_key="'backfire'" :title="'退火交接审批单'" :t_id="form.id" :ticket_="form.ticket_"
 					@success="()=>{$emit('success')} " :submit_b_func="submit_b_func" ref="ticketd_b"></ticketd_b>
 				</template>
 				<el-button v-else-if="mode!='show'" type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
-				<el-button @click="$emit('closed')">取消</el-button>
+				<el-button @click="$emit('closed')">{{ mode === 'show' ? '关闭' : '取消' }}</el-button>
 			</el-footer>
 		</el-main>
 		<el-aside width="20%" v-if="form.ticket">
@@ -421,8 +473,6 @@ export default {
 			codeText: "",
 			batchList:[],
 			fileList:[],
-			userList: [],
-			userList2: [],
 			handoverbIds:[],
 			mgroupOptions: [],
 			materialOptions: [],
@@ -436,6 +486,9 @@ export default {
 		let that  = this;
 		that.change_batch = that.changebatch;
 		that.form.type = that.type;
+		const userInfo = that.$TOOL.data.get("USER_INFO");
+		that.form.send_user = userInfo.id;
+		that.form.send_user_name = userInfo.name;
 		let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT");
 		that.materialObj = materialObj;
 		that.form.handle_date = that.form.send_date = this.$TOOL.dateFormat2(new Date());
@@ -448,13 +501,7 @@ export default {
 		// type=50 改版       灵活无限制
 		//mtype  10:正常交接 ；20:分批操作 ；30:合批操作
 		//state  10:合格;20:不合格;30:返工;34:返工完成;40:检验;50:报废
-		//获取交接人员
-		if(that.type==20&&that.mgroupName=='废品库'){//废品出库交接
-			that.getCkUserList();
-		}else{
-			that.deptID = that.$TOOL.data.get('gx_deptID');
-			that.getUserList();
-		}
+		that.deptID = that.$TOOL.data.get('gx_deptID');
 		//获取交接物料
 		if(that.type==20&&that.mgroupName!=='废品库'){
 			//返工交接
@@ -473,14 +520,26 @@ export default {
 			that.paramsM = {mgroup: that.mgroupId,state:10,tag : 'done'};
 		}
 		that.apiObjM = this.$API.wpm.wmaterial.list;
-		if(that.type==40||that.type==20){
-			that.getMgroupOptions();
-		}else{
-			that.getMgroupOptions();
-		}
 		that.getTid();
 	},
 	computed: {
+		hasProductDetails() {
+			return (this.form.handoverb || []).some(
+				(item) => item.handoverbw && item.handoverbw.length > 0
+			);
+		},
+		sendUserParams() {
+			if (this.type == 20 && this.mgroupName === "废品库") {
+				return { posts__code: "inm&check" };
+			}
+			return { depts: this.deptID };
+		},
+		reciveUserParams() {
+			if (this.type == 40) {
+				return { posts__code: "inm&check" };
+			}
+			return this.form.recive_dept ? { depts: this.form.recive_dept } : {};
+		},
 		canClearBatchDefect() {
 			return Number(this.mtype) === 30 || this.change_batch;
 		},
@@ -498,12 +557,6 @@ export default {
 		}
 	},
 	watch: {
-		batchList:{
-			deep:true,
-			handler (v) {
-				console.log('batchList',v)
-			}
-		},
 		canClearBatchDefect(val) {
 			if (!val) {
 				this.form.clear_defect = false;
@@ -511,21 +564,30 @@ export default {
 		}
 	},
 	methods: {
-		getTid (){
-			var that = this;
-		    if (that.t_id) {
-				that.$API.wpm.handover.item.req(that.t_id).then(res=>{
-					that.setData(res);
-					if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
-						that.mode = "edit";
-					}else{
-						that.mode = "show";
-					}
-						// that.$nextTick(()=>{
-						// 	that.$refs.ticketd_b.init();
-						// })
-					
-					})
+		async getTid (){
+			if (!this.t_id) {
+				return;
+			}
+			const data = await this.loadData(this.t_id);
+			const userId = this.$TOOL.data.get("USER_INFO").id;
+			if (data.ticket_?.state_?.type == 1 && data.create_by == userId) {
+				this.mode = "edit";
+				this.prepareEditor();
+			}
+		},
+		async loadData(id) {
+			this.loading = true;
+			try {
+				const data = await this.$API.wpm.handover.item.req(id);
+				this.setData(data);
+				return data;
+			} finally {
+				this.loading = false;
+			}
+		},
+		prepareEditor() {
+			if (this.mode === "add" && this.type == 40) {
+				this.getMgroupOptions();
 			}
 		},
 		//获取工段列表
@@ -537,9 +599,9 @@ export default {
 					res.forEach(item=>{
 						if(item.name=="废品库"){
 							that.form.recive_mgroup = item.id;
+							that.form.recive_dept = item.belong_dept;
 						}
 					})
-					that.getCkUserList();//废品库接收人
 				}
 			});
 		},
@@ -553,70 +615,15 @@ export default {
 				that.mgroupOptions = res;
 				if(res.length==1){
 					that.form.recive_mgroup = res[0].id;
-					that.getUserList2();
+					that.reciveMgroupChange(res[0].id);
 				}
 			})
 		},
-		//获取交送工段人员
-		getUserList() {
-			let that = this;
-			let userInfo = that.$TOOL.data.get("USER_INFO");
-			this.$API.system.user.list.req({ depts: that.deptID, page: 0 }).then((res) => {
-				that.userList = res;
-				let arr = res.filter(item=>{
-					return item.id==userInfo.id;
-				})
-				if(arr.length>0){
-					that.form.send_user = userInfo.id;
-				}else{
-					let obj = {};
-					obj.id = userInfo.id;
-					obj.name = userInfo.name;
-					that.userList.push(obj)
-					that.form.send_user = userInfo.id;
-				}
-				
-			});
-		},
-		//获取仓库人员
-		getCkUserList() {
-			let that = this;
-			this.$API.system.user.list.req({ page: 0, posts__code: "inm&check" })
-			.then((res) => {
-				if(that.type==40){
-					that.userList2 = [];
-					that.userList2 = res;
-				}else if(that.type==20&&that.mgroupName=='废品库'){
-					that.userList = [];
-					that.userList = res;
-				}
-			});
-		},
-		//获取接收工段人员
-		getUserList2() {
-			let that = this;
-			let deptID = '';
-			if(that.form.recive_dept&&that.form.recive_dept!==''&&that.form.recive_dept!==null){
-				deptID = that.form.recive_dept;
-			}else{
-				that.mgroupOptions.forEach(item => {
-					if(item.id==that.form.recive_mgroup){
-						deptID = item.belong_dept;
-					}
-				});
-			}
-			that.$API.system.user.list.req({ depts: deptID, page: 0 }).then((res) => {
-				that.userList2 = res;
-			});
-		},
-		//获取接收部门人员
-		getUserList3() {
-			let that = this;
-			this.$API.system.user.list
-				.req({ depts: that.form.recive_dept, page: 0 })
-				.then((res) => {
-					that.userList2 = res;
-				});
+		reciveMgroupChange(mgroupId) {
+			const mgroup = this.mgroupOptions.find((item) => item.id == mgroupId);
+			this.form.recive_dept = mgroup?.belong_dept || null;
+			this.form.recive_user = null;
+			this.form.recive_user_name = "";
 		},
 		remoFun(val){
 			let that = this;
@@ -665,11 +672,13 @@ export default {
 		},
 		//显示
 		open(mode = "add",data,mtype) {
-			console.log(data)
 			this.mode = mode;
-			this.mtype = mtype;
+			this.mtype = Number(mtype ?? 10);
 			this.form.clear_defect = false;
-			if (mtype === 30) {
+			if (mode !== "show") {
+				this.prepareEditor();
+			}
+			if (this.mtype === 30) {
 				this.paramsM = {
 					...this.paramsM,
 					state__in: '10,20,34'
@@ -677,7 +686,6 @@ export default {
 				delete this.paramsM.state;
 			}
 			if(data!==''&&data!==null&&data!==undefined){
-				console.log(typeof(data)=='string')
 				if(typeof(data)=='string'){
 					this.codeText = data.replace(" ","");
 					this.codeTextChange(this.codeText)
@@ -700,7 +708,7 @@ export default {
 					})
 				}
 			}
-			if(mtype==30){//合批
+			if(this.mtype==30){//合批
 				this.change_batch = true;
 			}
 			return this;
@@ -796,8 +804,6 @@ export default {
 							if(res.length>0){
 								that.form.new_wm = res[0].id;
 							}
-							console.log('that.form.new_wm',that.form.new_wm);
-							console.log('that.form.new_batch',that.form.new_batch);
 							that.$API.wpm.handover.createsubmit.req(that.form).then((res) => {
 								that.isSaveing = false;
 								that.$emit("success");
@@ -842,26 +848,31 @@ export default {
 		},
 		//表单注入数据
 		setData(data) {
-			console.log('交接记录查看',data)
-			let that = this;
 			Object.assign(this.form, data);
+			this.mtype = Number(data.mtype ?? 10);
+			this.change_batch = Boolean(data.new_batch) || this.mtype === 30;
 			let obj = {};
 			if(data.oinfo_json&&data.oinfo_json.test_file){
 				obj.name=data.oinfo_json.test_file;
 				obj.url=data.oinfo_json.test_file;
 				this.fileList.push(obj);
 			}
-			that.totalCount = 0;
-			that.form.handoverb = data.handoverb;
-			data.handoverb.forEach(item=>{
-				item.label = item.batch;
-				that.totalCount += Number(item.count);
-			})
-			if(data.type==30){
-				that.getUserList3();
-			}else{
-				that.getUserList2();
+			this.totalCount = 0;
+			this.form.handoverb = data.handoverb || [];
+			if (data.recive_mgroup && data.recive_mgroup_name) {
+				this.mgroupOptions = [{
+					id: data.recive_mgroup,
+					name: data.recive_mgroup_name,
+					belong_dept: data.recive_dept,
+				}];
 			}
+			this.form.handoverb.forEach(item=>{
+				const details = [item.defect_grade_name, item.defect_name].filter(Boolean);
+				const materialName = item.material_name || data.material_name || "";
+				item.label = `${item.batch}${materialName ? `(${materialName})` : ""}${details.length ? ` [${details.join("｜")}]` : ""}`;
+				item.count_cando = item.count_available ?? item.count;
+				this.totalCount += Number(item.count);
+			})
 		},
 		//设置过滤项
 		setFilters(filters) {
@@ -927,6 +938,35 @@ export default {
 };
 </script>
 <style scoped>
+.form-section-title {
+	margin: 4px 0 12px;
+	font-size: 15px;
+	font-weight: 600;
+	color: var(--el-text-color-primary);
+}
+
+.form-section-title:not(:first-child) {
+	margin-top: 20px;
+}
+
+.handover-summary {
+	font-size: 13px;
+}
+
+.product-detail-list {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	gap: 8px;
+	padding: 8px 16px;
+}
+
+.product-detail-label {
+	margin-right: 4px;
+	font-weight: 500;
+	color: var(--el-text-color-secondary);
+}
+
 .formTitle {
 	margin-bottom: 10px;
 	font-weight: 600;