diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 30e3d04e..db38ad2e 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -29,7 +29,7 @@
 						<el-col >{{ form.batch }}</el-col>
 					</el-form-item>
 				</el-row>
-				<el-row v-show="addShow">
+				<el-row v-show="addShow&&route_code!=='tuihuo'">
 					<el-col>
 						<el-form-item label="交接物料">
 							<xtSelect
@@ -55,7 +55,8 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<el-row v-for="(listItem,$index) in form.handoverb" :key="listItem">
+				<div v-if="route_code!=='tuihuo'">
+					<el-row v-for="(listItem,$index) in form.handoverb" :key="listItem">
 					<el-col :span="12"> 
 						<el-form-item label="交接物料">
 							<el-input  v-model="listItem.label" disabled></el-input>
@@ -87,6 +88,7 @@
 						<el-button type="danger" icon="el-icon-delete" @click="delMaterial($index)"></el-button>
 					</el-col>
 				</el-row>
+				</div>
 				<el-row>
 					<el-col :md="12" :sm="24">
 						<el-form-item label="交送日期" prop="send_date">
@@ -190,22 +192,79 @@
 							<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :md="12" :sm="24" v-if="route_code=='tuihuo' || form.oinfo_json.test_file">
-						<el-form-item label="检验附件">
-							<sc-upload-file
-							v-model="form.oinfo_json.test_file"
-							:multiple="false"
-							:limit="1"
-							:accept="['.xlsx', '.xls']"
-							:disabled="mode ==='show'"
+				</el-row>
+				<el-row v-if="addShow&&route_code=='tuihuo'">
+					<el-col>
+						<el-form-item label="交接物料">
+							<xtSelect
+								:apiObj="apiObjM"
+								v-model="selectObjIds"
+								v-model:obj="selectObjs"
+								:labelField="'batch'"
+								style="width: 100%;"
+								:params = "paramsM"
+								:multiple="true"
+								@change="materialChange0"
 							>
-								<!-- <el-button type="primary" icon="el-icon-upload" v-if="mode!=='show'"> </el-button>
-								<br/>
-							 	<el-link v-if="mode!=='add'&&form.oinfo_json" :href="form.oinfo_json.test_file" type="primary" target="_blank">{{form.oinfo_json.test_file}}</el-link> -->
-							</sc-upload-file>
+								<el-table-column label="物料" prop="full_name">
+									<template #default="scope">
+										<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
+										<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
+										<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
+										<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column label="可交接数量" prop="count_canhandover" width="110px"></el-table-column>
+							</xtSelect>
 						</el-form-item>
 					</el-col>
 				</el-row>
+				<div v-if="route_code=='tuihuo'">
+					<el-row v-for="(listItem,$index) in form.handoverb" :key="listItem">
+						<el-col :span="12"> 
+							<el-form-item label="交接物料">
+								<el-input  v-model="listItem.label" disabled></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="4">
+							<el-form-item label="总数量">
+								<span>{{ listItem.count_cando }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="交接数量">
+								<el-input-number
+									v-model="listItem.count"
+									controls-position="right"
+									:min="0"
+									step="1"
+									:max="listItem.count_cando"
+									:disabled="mode==='show'"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="交接数量"
+									@change="countChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="2" v-if="mode!=='show'">
+							<el-button type="danger" icon="el-icon-delete" @click="delMaterial($index)"></el-button>
+						</el-col>
+						<el-col>
+							<el-form-item>
+								<sc-upload-file
+								v-model="form.oinfo_json[listItem.wm]"
+								:multiple="false"
+								:limit="1"
+								:accept="['.xlsx', '.xls']"
+								:disabled="mode ==='show'"
+								>
+								</sc-upload-file>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</div>
 			</el-form>
 			<el-footer>
 				<template  v-if="(route_code=='tuihuo'&&type==10&&mtype==10)||form.ticket!=null">