Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/mtm/route_form.vue

@@ -231,7 +231,7 @@ const defaultForm = {
 	material_out:'',
 	hour_work:0,
 	div_number:1,
-	batch_bind: true,
+	batch_bind: false,
 	is_autotask: true,
 };
 export default {

src/views/wpm_bx/handover.vue

@@ -19,16 +19,15 @@
 				>
 				<el-button
 					type="primary"
-					@click="printSetting"
-					>打印机</el-button
+					icon="el-icon-plus"
+					@click="table_add(50)"
+					v-auth="'handover.create'"
+					>改版</el-button
 				>
 				<el-button
 					type="primary"
-					icon="el-icon-plus"
-					@click="table_add(30)"
-					v-auth="'handover.create'"
-					v-if="mgroup_name=='一次超洗'||mgroup_name=='二次超洗'"
-					>检验</el-button
+					@click="printSetting"
+					>打印机</el-button
 				>
 			</div>
 			<div class="right-panel">

src/views/wpm_bx/handover_form.vue

@@ -123,6 +123,21 @@
 						<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
 					</el-form-item>
 				</el-col>
+				<el-col :md="12" :sm="24" v-if="type==50">
+					<el-form-item label="更改物料">	
+						<xtSelect
+							:apiObj="apiObj"
+							:params="paramsM"
+							v-model="form.material_changed"
+							v-model:label="material_changed_name"
+							style="width:100%"
+						>
+							<el-table-column label="名称" prop="name"></el-table-column>
+							<el-table-column label="工序" prop="process_name"></el-table-column>
+							<el-table-column label="规格" prop="specification"></el-table-column>
+						</xtSelect>
+					</el-form-item>
+				</el-col>
 				<el-col :md="12" :sm="24">
 					<el-form-item label="处理备注">	
 						<el-input v-model="form.note" placeholder="处理备注"></el-input>
@@ -322,6 +337,12 @@ export default {
 					},
 				],
 			},
+			apiObj:this.$API.mtm.material.list,
+			paramsM:{
+				type:20,
+				is_hidde:true,
+			},
+            materials:[],
 			totalCount: 0,
 			deptID:'',
 			bwIndex:0,
@@ -416,9 +437,12 @@ export default {
 			let that = this;
 			var req = {
 				page: 0,
-				state:10,
+				// state:10,
 				mgroupx:that.mgroupId
 			};
+			if(that.type!==50){
+				req.state = 10;
+			}
 			that.materialOptions = [];
 			this.$API.wpm.wmaterial.list.req(req).then((res) => {
 				that.materialOptions = res;