Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/inm/good.vue

@@ -74,7 +74,7 @@
 						</el-table-column>
 						<el-table-column width="90">
 							<template #default="scope">
-								<!-- <el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button> -->
+								<el-button @click="printMaterial(scope.row)" type="text">标签</el-button>
 								<el-link :underline="false"  type="primary" 
 									@click="handleWatch(scope.row)"
 								>流程图</el-link>

src/views/inm/mio_form.vue

@@ -161,7 +161,7 @@
 				</el-select>
 			</el-form-item>
 			<el-form-item label="备注">
-				<el-input v-model="form.note" placeholder="编号" />
+				<el-input v-model="form.note" placeholder="备注" />
 			</el-form-item>
 		</el-form>
 		<template #footer>

src/views/inm/mioitem_form.vue

@@ -362,11 +362,12 @@ export default {
 		},
 		inputChange(e){
 			console.log('e',e);
+			let that = this;
 			if(e!==''&&e!==null&&e!==undefined){
 				let codeId = e.split('#')[1];
 				this.$API.cm.labelmat.item.req(codeId).then((res) => {
 					if(res){
-						arr = that.batchOptions.filter((item) => {
+						let arr = that.batchOptions.filter((item) => {
 							return item.batch == res.batch&&item.state==res.state;
 						})
 						if (arr.length > 0) {
@@ -377,6 +378,9 @@ export default {
 							that.form.count = Number(arr[0].count_canmio);
 							that.form.warehouse = arr[0].warehouse;
 							that.inputBatchDisable = true;
+							setTimeout(() => {
+								options.value =  res.batch;
+							}, 200)
 						}else{
 							that.selectBatch = '';
 							that.$message.error("批次号不存在");

src/views/wpm_bx/handover_form.vue

@@ -257,6 +257,10 @@ export default {
 			type: String,
 			default: "done",
 		},
+		wmItem: {
+			type: Object,
+			default: () => ({}),
+		},
 	},
 	components: {
 		scanDialog
@@ -384,6 +388,11 @@ export default {
 		that.materialObj = materialObj;
 		that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date());
 		that.form.send_mgroup = that.mgroupId;
+		if(that.wmItem.wm){
+			that.form.new_batch = that.wmItem.batch;
+			that.form.material_changed = that.wmItem.material;
+			that.form.material_changed_fname = that.wmItem.material_name;
+		}
 		if(that.type==20||that.type==50){
 			that.form.recive_mgroup = that.mgroupId;
 		}

src/views/wpm_bx/inmIn.vue

@@ -149,9 +149,9 @@
 							type="primary" 
 							style="margin-left: 10px;"
 						>检验</el-link>
-						<!-- <el-link :underline="false"  type="primary" 
-							@click="handleWatch(scope.row)"
-						>流程图</el-link> -->
+						<el-link :underline="false"  type="primary" 
+							@click="handleAddWpr(scope.row)"
+						>添加物料</el-link>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -244,6 +244,7 @@
 			ref="scrapDialog"
 			:type="type"
 			:tag="tag"
+			:wmItem="wmItem"
 			:mgroupName="mgroup_name"
 			:mgroupId="mgroupId"
 			@success="handleScrapSuccess"
@@ -377,6 +378,7 @@ export default {
 				search: "",
 				material: "",
 			},
+			wmItem:{},
 			wprParams:{ 
 				page:0,
 				wm: "" 
@@ -693,7 +695,22 @@ export default {
 			
 			})
 		},
-		handleWprSuccess(row){}
+		handleAddWpr(row){
+			this.dialog.scrap = true;
+			this.type = 50;
+			let obj = {};
+			obj.wm = row.id;
+			obj.batch = row.batch;	
+			obj.mgroup = row.mgroup;
+			obj.material = row.material;
+			obj.mgroup_name = row.mgroup_name;
+			obj.material_name = row.material_name;
+			this.wmItem = obj;
+			this.$nextTick(() => {
+				this.$refs.scrapDialog.open("add");
+			});
+		},
+		handleWprSuccess(row){},
 	},
 };
 </script>

src/views/wpm_bx/inmOut.vue

@@ -234,6 +234,7 @@
 				>
 					<template #default="scope">
 						<el-link :underline="false" @click="printMaterial(scope.row,'wpr')" type="primary">物料标签</el-link>
+						<el-link :underline="false" type="primary" @click="handleAddWpr(scope.row)">添加物料</el-link>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -258,6 +259,7 @@
 			v-if="dialog.scrap"
 			ref="scrapDialog"
 			:type="type"
+			:wmItem="wmItem"
 			:mgroupName="mgroup_name"
 			:mgroupId="mgroupId"
 			@success="handleScrapSuccess"
@@ -397,6 +399,7 @@ export default {
 				page:0,
 				wm: "" 
 			},
+			wmItem:{},
 			number_out_last:'',
 			route_code:"",
 			wmMaterial:'',
@@ -735,6 +738,21 @@ export default {
 			
 			})
 		},
+		handleAddWpr(row){
+			this.dialog.scrap = true;
+			this.type = 50;
+			let obj = {};
+			obj.wm = row.id;
+			obj.batch = row.batch;	
+			obj.mgroup = row.mgroup;
+			obj.material = row.material;
+			obj.mgroup_name = row.mgroup_name;
+			obj.material_name = row.material_name;
+			this.wmItem = obj;
+			this.$nextTick(() => {
+				this.$refs.scrapDialog.open("add");
+			});
+		},
 	},
 };
 </script>

src/views/wpm_gx/inmrecord.vue

@@ -3,17 +3,17 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'"
-				 v-if="mgroupName!=='size'&&mgroupName!=='facade'&&project_code=='gxerp'"
+				 v-if="mgroupName!=='size'&&mgroupName!=='facade'&&project_code=='gx'"
 				>领料</el-button>
 				<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'">入库</el-button>
 				<el-button
 					type="primary"
 					@click="tomio('return_in')"
 					v-auth="'mio.do'"
-					v-if="project_code=='gxerp'"
+					v-if="project_code=='gx'"
 				>退还入库</el-button>
 				<el-select
-					v-if="project_code=='gxerp'"
+					v-if="project_code=='gx'"
 					v-model="query.type"
 					clearable
 					style="width: 120px; margin-left: 2px"
@@ -225,6 +225,7 @@ export default {
 			process: "",
 			cate: "good",
 			mioId: "",
+			project_code: "",
 			visibleDrawer: false,
 			inmRecordDialog:false,
 		};
@@ -234,6 +235,7 @@ export default {
 		that.params.mgroup = that.mgroupId;
 		that.apiObj = that.$API.inm.mio.list;
 		that.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
+		console.log("project_code",that.project_code);
 	},
 	methods: {
 		tomio(type) {