diff --git a/src/api/model/qm.js b/src/api/model/qm.js
index bcdacbe0..b15c4e2a 100644
--- a/src/api/model/qm.js
+++ b/src/api/model/qm.js
@@ -365,5 +365,11 @@ export default {
 				return await http.post(`${config.API_URL}/qm/ftestwork/${id}/submit/`);
 			},
 		},
+		revert: {
+			name: "撤回检验工作",
+			req: async function (id) {
+				return await http.post(`${config.API_URL}/qm/ftestwork/${id}/revert/`);
+			},
+		},
 	},
 };
diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
index 56b4e1f6..8d62634e 100644
--- a/src/api/model/wpm.js
+++ b/src/api/model/wpm.js
@@ -548,9 +548,9 @@ export default {
 	},
 	prints: {
 		name: "打印",
-		req: async function (data) {
+		req: async function (ip, data) {
 			// return await http.post("http://localhost:8080/prints/", data);
-			return await http.post("http://127.0.0.1:8080/prints/", data);
+			return await http.post(`http://${ip}:8080/prints/`, data);
 		},
 	},
 	ana:{
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 38b62c7b..36040479 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -90,6 +90,11 @@
 		</el-dropdown>
 	</div>
 	<el-dialog title="打印机设置" v-model="setNameVisible" width="600px">
+		<el-form label-width="100px">
+			<el-form-item label="打印机IP">
+				<el-input v-model="printer_ip"></el-input>
+			</el-form-item>
+		</el-form>
 		<el-form label-width="100px">
 			<el-form-item label="打印机名称">
 				<el-input v-model="printer_name"></el-input>
@@ -138,6 +143,7 @@ export default {
 			scanId:'',
 			scanType:'',
 			printer_name:'',
+			printer_ip:'',
 			scanVisible:false,
 		};
 	},
@@ -157,6 +163,7 @@ export default {
 		this.userName = userInfo.username;
 		this.userNameF = this.userName.substring(0, 1);
 		this.printer_name = localStorage.getItem("printer_name") || "";
+		this.printer_ip = localStorage.getItem("printer_ip") || "127.0.0.1";
 	},
 	methods: {
 		openBook() {
@@ -250,7 +257,10 @@ export default {
 			this.setNameVisible=true;
 		},
 		savePrinter(){
-			this.$TOOL.setPrint(this.printer_name);
+			this.$TOOL.setPrint({
+				"printer_name":this.printer_name,
+				"printer_ip":this.printer_ip
+			});
 			this.setNameVisible=false;
 		},
 		//显示短消息
diff --git a/src/utils/tool.js b/src/utils/tool.js
index ddedb5d2..35d080dc 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -140,7 +140,12 @@ tool.screen = function (element) {
 	}
 }
 tool.setPrint = function (val) {
-    localStorage.setItem('printer_name', val)
+	if (val.printer_name) {
+		localStorage.setItem('printer_name', val.printer_name)
+		localStorage.setItem('printer_ip', val.printer_ip)
+	}else{
+		localStorage.setItem('printer_name', val)
+	}
 }
 /* 复制对象 */
 tool.objCopy = function (obj) {
diff --git a/src/views/em/ecate.vue b/src/views/em/ecate.vue
index be3f6b2d..c1119eb2 100644
--- a/src/views/em/ecate.vue
+++ b/src/views/em/ecate.vue
@@ -31,21 +31,21 @@
 						<span>{{ typeOptions_[scope.row.type] }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="是否用于安全" show-overflow-tooltip v-if="project_code!=='bxerp'">
+				<el-table-column label="是否用于安全" show-overflow-tooltip v-if="project_code=='pf'">
 					<template #default="scope">
 						<el-icon v-if="scope.row.is_for_safe" color="green">
 							<CircleCheckFilled />
 						</el-icon>
 					</template>
 				</el-table-column>
-				<el-table-column label="是否用于环保" show-overflow-tooltip v-if="project_code!=='bxerp'">
+				<el-table-column label="是否用于环保" show-overflow-tooltip v-if="project_code=='pf'">
 					<template #default="scope">
 						<el-icon v-if="scope.row.is_for_enp" color="green">
 							<CircleCheckFilled />
 						</el-icon>
 					</template>
 				</el-table-column>
-				<el-table-column label="是否为车辆" show-overflow-tooltip v-if="project_code!=='bxerp'">
+				<el-table-column label="是否为车辆" show-overflow-tooltip v-if="project_code=='pf'">
 					<template #default="scope">
 						<el-icon v-if="scope.row.is_car" color="green">
 							<CircleCheckFilled />
diff --git a/src/views/em/ecate_form.vue b/src/views/em/ecate_form.vue
index 569dbfb5..8058f921 100644
--- a/src/views/em/ecate_form.vue
+++ b/src/views/em/ecate_form.vue
@@ -48,7 +48,7 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
-					<el-row v-if="project_code!=='bxerp'">
+					<el-row v-if="project_code=='pf'">
 						<el-col :md="12" :sm="24">
 							<el-form-item label="是否用于安全">
 								<el-switch v-model="form.is_for_safe" />
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 8cd2dd46..c96e9958 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -364,7 +364,8 @@ table_print(row){
         let obj = {};
         obj.printer_commands = res.commands;
         obj.printer_name = that.printer_name;
-        that.$API.wpm.prints.req(obj).then((response) => {
+        let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
           that.$message.success("打印成功");
         });
       });
diff --git a/src/views/inm/good.vue b/src/views/inm/good.vue
index a006a9a5..5d8fc86c 100644
--- a/src/views/inm/good.vue
+++ b/src/views/inm/good.vue
@@ -72,12 +72,12 @@
 						</el-table-column>
 						<el-table-column label="更新时间" prop="update_time">
 						</el-table-column>
-						<el-table-column width="90">
+						<el-table-column width="80">
 							<template #default="scope">
-								<el-button @click="printMaterial(scope.row)" type="text">标签</el-button>
-								<el-link :underline="false"  type="primary" 
+								<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
+								<!-- <el-link :underline="false"  type="primary" 
 									@click="handleWatch(scope.row)"
-								>流程图</el-link>
+								>流程图</el-link> -->
 							</template>
 						</el-table-column>
 					</scTable>
@@ -273,15 +273,52 @@ export default {
 				});
 			})
 		},
-		//打印物料标签
-		printMaterial(row){
+		//打签
+		printMaterial(row,type){
 			let that = this;
-			that.wmId = row.id;
-			that.wmtype = row.material_.type;
-			that.print_m = true;
-			this.$nextTick(() => {
-			    this.$refs.printmaterial.open();
-			})
+			let printer_name=localStorage.getItem("printer_name");
+			let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+			if(printer_name!==''&&printer_name!==null&&printer_name!==undefined){
+				if(that.project_code!=='gz'){
+					if(type=='mb'){
+						let params = {};
+						params.tid = row.id;
+						params.label_template_name = '库存标签模板';
+						params.extra_data={count:row.count};
+						that.$API.cm.labelmat.fromMb.req(params).then((res) => {
+							let obj = {};
+							obj.printer_commands = res.commands;
+							obj.printer_name = printer_name;
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
+								that.$message.success("打印成功");
+							});
+						})
+					}else{
+						let params = {};
+						let name = row.material_name.split('|')[0];
+						params.label_template_name = '单件打印模板';
+						params.data = {number:row.number,name:name};
+						that.$API.cm.labeltemplate.commands.req(params).then((res) => {
+							let obj = {};
+							obj.printer_commands = res.commands;
+							obj.printer_name = printer_name;
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
+								that.$message.success("打印成功");
+							});
+						});
+					}
+				}else{
+					that.wmId = row.id;
+					that.wmtype = row.material_.type;
+					that.print_m = true;
+					this.$nextTick(() => {
+						this.$refs.printmaterial.open();
+					})
+				}
+			}else{
+				that.$message.error("请先设置打印机");
+			}
 		},
 	},
 };
diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index d1043bda..8b682d74 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -123,16 +123,7 @@
 							v-auth="'mio.submit'"
 							v-if="scope.row.state == 20"
 						>
-							撤销
-						</el-button>
-						<el-button
-							link
-							type="warning"
-							@click="revert(scope.row)"
-							v-auth="'mio.submit'"
-							v-if="scope.row.state == 20"
-						>
-							撤销
+							撤回
 						</el-button>
 						<el-button
 							link
@@ -260,14 +251,14 @@ export default {
 				.catch(() => {});
 		},
 		revert(row) {
-			this.$confirm(`确定撤销该操作吗？`, "提示", {
+			this.$confirm(`确定撤回该操作吗？`, "提示", {
 				type: "warning",
 			})
 				.then(() => {
 					this.$API.inm.mio.revert
 						.req(row.id)
 						.then((res) => {
-							this.$message.success("撤销成功");
+							this.$message.success("撤回成功");
 							this.$refs.table.refresh();
 							return res;
 						})
diff --git a/src/views/inm/halfgood.vue b/src/views/inm/halfgood.vue
index b37664c2..827d2c3c 100644
--- a/src/views/inm/halfgood.vue
+++ b/src/views/inm/halfgood.vue
@@ -66,15 +66,13 @@
 						</el-table-column>
 						<el-table-column label="物料存量" prop="count">
 						</el-table-column>
-						<!-- <el-table-column label="有效期" prop="expiration_date">
-						</el-table-column> -->
 						<el-table-column label="更新时间" prop="update_time">
 						</el-table-column>
-						<!-- <el-table-column width="90">
+						<el-table-column width="80">
 							<template #default="scope">
-								<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
+								<el-button @click="printMaterial(scope.row,'mb')" type="primar">打签</el-button>
 							</template>
-						</el-table-column> -->
+						</el-table-column>
 					</scTable>
 				</el-main>
 			</el-container>
@@ -199,15 +197,52 @@ export default {
 		resetQuery() {
 			this.query = {};
 		},
-		//打印物料标签
-		printMaterial(row){
+		//打签
+		printMaterial(row,type){
 			let that = this;
-			that.wmId = row.id;
-			that.wmtype = row.material_.type;
-			that.print_m = true;
-			this.$nextTick(() => {
-			    this.$refs.printmaterial.open();
-			})
+			let printer_name=localStorage.getItem("printer_name");
+			if(printer_name!==''&&printer_name!==null&&printer_name!==undefined){
+				if(that.project_code!=='gz'){
+					if(type=='mb'){
+						let params = {};
+						params.tid = row.id;
+						params.label_template_name = '库存标签模板';
+						params.extra_data={count:row.count};
+						that.$API.cm.labelmat.fromMb.req(params).then((res) => {
+							let obj = {};
+							obj.printer_commands = res.commands;
+							obj.printer_name = printer_name;
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
+								that.$message.success("打印成功");
+							});
+						})
+					}else{
+						let params = {};
+						let name = row.material_name.split('|')[0];
+						params.label_template_name = '单件打印模板';
+						params.data = {number:row.number,name:name};
+						that.$API.cm.labeltemplate.commands.req(params).then((res) => {
+							let obj = {};
+							obj.printer_commands = res.commands;
+							obj.printer_name = printer_name;
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
+								that.$message.success("打印成功");
+							});
+						});
+					}
+				}else{
+					that.wmId = row.id;
+					that.wmtype = row.material_.type;
+					that.print_m = true;
+					this.$nextTick(() => {
+						this.$refs.printmaterial.open();
+					})
+				}
+			}else{
+				that.$message.error("请先设置打印机");
+			}
 		},
 	},
 };
diff --git a/src/views/inm/halfgood_mio.vue b/src/views/inm/halfgood_mio.vue
index 973ecc15..5fcf7f7f 100644
--- a/src/views/inm/halfgood_mio.vue
+++ b/src/views/inm/halfgood_mio.vue
@@ -145,7 +145,7 @@
 							v-auth="'mio.submit'"
 							v-if="scope.row.state == 20"
 						>
-							撤销
+							撤回
 						</el-button>
 					</template>
 				</el-table-column>
@@ -259,14 +259,14 @@ export default {
 				.catch(() => {});
 		},
 		revert(row) {
-			this.$confirm(`确定撤销该操作吗？`, "提示", {
+			this.$confirm(`确定撤回该操作吗？`, "提示", {
 				type: "warning",
 			})
 				.then(() => {
 					this.$API.inm.mio.revert
 						.req(row.id)
 						.then((res) => {
-							this.$message.success("撤销成功");
+							this.$message.success("撤回成功");
 							this.$refs.table.refresh();
 							return res;
 						})
diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue
index ad8fbf35..8c7ddb97 100644
--- a/src/views/inm/helpso.vue
+++ b/src/views/inm/helpso.vue
@@ -187,7 +187,7 @@ export default {
 		resetQuery() {
 			this.query = {};
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.wmId = row.id;
diff --git a/src/views/inm/mainso.vue b/src/views/inm/mainso.vue
index b81876a0..03b9f8c9 100644
--- a/src/views/inm/mainso.vue
+++ b/src/views/inm/mainso.vue
@@ -61,11 +61,11 @@
 				</el-table-column>
 				<el-table-column label="更新时间" prop="update_time">
 				</el-table-column>
-				<el-table-column width="140">
+				<el-table-column width="80">
 					<template #default="scope">
 						<!-- <el-button type="primary" link v-if="project_code == 'gx'" @click="mbCheck(scope.row)">检验</el-button>
 						<el-button type="success" link v-if="project_code == 'gx'" @click="mbCheckList(scope.row)">检验记录</el-button> -->
-						<el-button type="text"  @click="printMaterial(scope.row,'mb')">物料标签</el-button>
+						<el-button type="text"  @click="printMaterial(scope.row,'mb')">打签</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -100,7 +100,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>
@@ -441,7 +441,7 @@ export default {
 				that.getCheckList();
 			})
 		},
-		//打印物料标签
+		//打印打签
 		printMaterial(row,type){
 			let that = this;
 			let printer_name=localStorage.getItem("printer_name");
@@ -456,7 +456,8 @@ export default {
 							let obj = {};
 							obj.printer_commands = res.commands;
 							obj.printer_name = printer_name;
-							that.$API.wpm.prints.req(obj).then((response) => {
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 								that.$message.success("打印成功");
 							});
 						})
@@ -469,7 +470,8 @@ export default {
 							let obj = {};
 							obj.printer_commands = res.commands;
 							obj.printer_name = printer_name;
-							that.$API.wpm.prints.req(obj).then((response) => {
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 								that.$message.success("打印成功");
 							});
 						});
diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue
index 63ad6549..243f4aa3 100644
--- a/src/views/inm/mainso_mio.vue
+++ b/src/views/inm/mainso_mio.vue
@@ -154,7 +154,7 @@
 							v-auth="'mio.submit'"
 							v-if="scope.row.state == 20"
 						>
-							撤销
+							撤回
 						</el-button>
 					</template>
 				</el-table-column>
@@ -275,14 +275,14 @@ export default {
 				.catch(() => {});
 		},
 		revert(row) {
-			this.$confirm(`确定撤销该操作吗？`, "提示", {
+			this.$confirm(`确定撤回该操作吗？`, "提示", {
 				type: "warning",
 			})
 				.then(() => {
 					this.$API.inm.mio.revert
 						.req(row.id)
 						.then((res) => {
-							this.$message.success("撤销成功");
+							this.$message.success("撤回成功");
 							this.$refs.table.refresh();
 							return res;
 						})
diff --git a/src/views/inm/mio.vue b/src/views/inm/mio.vue
index c5e67611..5edfb9ec 100644
--- a/src/views/inm/mio.vue
+++ b/src/views/inm/mio.vue
@@ -127,7 +127,7 @@
 								(scope.row.type == 'other_in' ||
 									scope.row.type == 'other_out')"
 						>
-							撤销
+							撤回
 						</el-button>
 						<el-button
 							link
@@ -269,14 +269,14 @@ export default {
 			});
 		},
 		revert(row) {
-			this.$confirm(`确定撤销该操作吗？`, "提示", {
+			this.$confirm(`确定撤回该操作吗？`, "提示", {
 				type: "warning",
 			})
 				.then(() => {
 					this.$API.inm.mio.revert
 						.req(row.id)
 						.then((res) => {
-							this.$message.success("撤销成功");
+							this.$message.success("撤回成功");
 							this.$refs.table.refresh();
 							return res;
 						})
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 0b19cc46..a1b0a974 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -203,7 +203,7 @@
 									type="primary"
 									v-if="mioObj.type == 'do_out'"
 									@click="printMaterial(scope.row,'mioitem')"
-								>物料标签</el-link>
+								>打签</el-link>
 								<el-link
 									type="primary"
 									v-if="mioObj.state == 20&&mioObj.type == 'sale_out'"
@@ -275,7 +275,7 @@
 					width="120"
 				>
 					<template #default="scope">
-						<el-link :underline="false" v-if="mioObj.type == 'do_out'" @click="printMaterial(scope.row,'wpr')" type="primary">打印标签</el-link>
+						<el-link :underline="false" v-if="mioObj.type == 'do_out'" @click="printMaterial(scope.row,'wpr')" type="primary">打签</el-link>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -601,9 +601,9 @@ export default {
 					this.$message.error("导入失败，请重新尝试");
 				});
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row,type){
-			console.log('打印物料标签',row);
+			console.log('打签',row);
 			let that = this;
 			let is_mainso = this.url_code.includes('mainso');
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -616,7 +616,8 @@ export default {
 						let obj = {};
 						obj.printer_commands = res.commands;
 						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
+						let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 							that.$message.success("打印成功");
 						});
 					})
@@ -629,7 +630,8 @@ export default {
 						let obj = {};
 						obj.printer_commands = res.commands;
 						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
+						let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 							that.$message.success("打印成功");
 						});
 					});
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
index 20fa0bde..b061c83d 100644
--- a/src/views/inm/mioitem_check.vue
+++ b/src/views/inm/mioitem_check.vue
@@ -7,7 +7,7 @@
 		@closed="$emit('closed')"
 	>
 		<el-container v-loading="loading">
-			<el-main style="padding: 0 20px 20px 20px">
+			<el-main style="padding: 0">
 				<el-form
 					ref="dialogForm"
 					:model="form"
@@ -593,7 +593,139 @@
 						</el-col>
 					</el-row>
 					<!-- 入厂检验 -->
-					<el-row v-if="type == 'pur_in'">
+					<el-row v-if="type == 'pur_in'&&project_code=='gx'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="产品名称:" label-width="100">
+								{{ objitem.material_name }}
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="入厂批次号:" label-width="100">
+								{{ objitem.batch }}
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="批次号" required label-width="100">
+								<el-input v-model="form.batch"> </el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="接收总数" required label-width="100">
+								<el-input-number
+									v-model="form.count"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+									@change="gxPurInCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="合格数" label-width="100">
+								<el-input-number
+									v-model="form.count_ok"
+									disabled
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="不合格数量" label-width="100">
+								<el-input
+									v-model="form.count_notok"
+									disabled
+									style="width: 100%"
+									placeholder="不合格数量"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col>异常项：</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="直径" label-width="100">
+								<el-input-number
+									v-model="form.count_n_zw"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+									@change="nqtChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="长度" label-width="100">
+								<el-input-number
+									v-model="form.count_n_dl"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+									@change="nqtChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="崩面" label-width="100">
+								<el-input-number
+									v-model="form.count_n_b"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+									@change="nqtChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="亮面" label-width="100">
+								<el-input-number
+									v-model="form.count_n_zz"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+									@change="nqtChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验日期" prop="test_date" label-width="100">
+								<el-date-picker
+									v-model="form.test_date"
+									type="date"
+									value-format="YYYY-MM-DD"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验员" prop="test_user" label-width="100">
+								<el-select
+									v-model="form.test_user"
+									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-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="备注" label-width="100">
+								<el-input v-model="form.test_note"> </el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row v-if="type == 'pur_in'&&project_code!='gx'">
 						<el-col :md="12" :sm="24">
 							<el-form-item label="产品名称:">
 								{{ objitem.material_name }}
@@ -605,16 +737,6 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item v-if="project_code === 'gx'" label="总数">
-								<el-input-number
-									v-model="form.count"
-									:min="0"
-									disabled="true"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
 							<el-form-item  v-if="project_code === 'gz'" label="总袋（桶）数">
 								<el-input-number
 									v-model="form.count_bag"
@@ -626,26 +748,8 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="不合格数量" v-if="project_code === 'gx'&&type == 'pur_in'">
+							<el-form-item label="抽样数量">
 								<el-input
-									disabled
-									v-model="form.count_notok"
-									placeholder="不合格数量"
-								/>
-							</el-form-item>
-							<el-form-item label="抽样数量" v-else>
-								<!-- 光芯 -->
-								<el-input-number
-									v-if="project_code === 'gx'"
-									v-model="form.count_sampling"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-								<!-- 光子 -->
-								<el-input
-									v-else
 									disabled
 									v-model="form.count_sampling"
 									placeholder="抽样数量"
@@ -681,17 +785,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="崩边"  v-if="project_code === 'gx'&&type == 'pur_in'">
-								<el-input-number
-									v-model="form.count_n_qt"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-									@change="nqtChange"
-								>
-								</el-input-number>
-							</el-form-item>
-							<el-form-item label="检验合格" prop="is_testok" v-else>
+							<el-form-item label="检验合格" prop="is_testok">
 								<el-select
 									v-model="form.is_testok"
 									placeholder="检验合格"
@@ -995,8 +1089,11 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		let date = new Date();
 		let config_base = that.$TOOL.data.get("BASE_INFO").base;
+		that.form.test_date = that.$TOOL.dateFormat2(date, "yyyy-MM-dd");
 		that.project_code = config_base.base_code;
+		console.log("that.form.test_date", that.form.test_date);
 		setTimeout(() => {
 			this.tableHeight = document.getElementById('mioitemwMain').clientHeight-20;
 		},500)
@@ -1011,7 +1108,14 @@ export default {
 				that.form.material_name = that.objitem.material_name;
 				that.form.batch = that.objitem.batch;
 				that.form.count = that.objitem.count;
+				that.form.count_ok = that.objitem.count;
 				that.form.count_bag = that.objitem.count_bag;
+				if(that.project_code=='gx'){
+					that.form.count_n_zw = 0;//直径
+					that.form.count_n_zz = 0;//亮面
+					that.form.count_n_b = 0;//崩面
+					that.form.count_n_dl = 0;//长度
+				}
 			}
 			if (
 				(that.type == "do_in" && that.cate == "halfgood") ||
@@ -1096,8 +1200,12 @@ export default {
 			}
 			return this;
 		},
+		gxPurInCountChange(){
+			this.form.count_ok = this.form.count - this.form.count_notok;
+		},
 		nqtChange(){
-			this.form.count_notok = this.form.count_n_qt;
+			this.form.count_notok = this.form.count_n_zw+this.form.count_n_zz+this.form.count_n_b+this.form.count_n_dl;
+			this.form.count_ok = this.form.count - this.form.count_notok;
 		},
 		getMaterialItem(){
 			let that = this;
@@ -1373,14 +1481,12 @@ export default {
 									that.$message.success("操作成功");
 								});
 						} else {
-							that.$API.inm.mioitem.test
-								.req(that.mioitemId, that.form)
-								.then((res) => {
-									that.isSaveing = false;
-									that.$emit("success");
-									that.visible = false;
-									that.$message.success("操作成功");
-								});
+							that.$API.inm.mioitem.test.req(that.mioitemId, that.form).then((res) => {
+								that.isSaveing = false;
+								that.$emit("success");
+								that.visible = false;
+								that.$message.success("操作成功");
+							});
 						}
 					} catch (err) {
 						//可以处理校验错误
diff --git a/src/views/inm/mioitemlist.vue b/src/views/inm/mioitemlist.vue
index 9c1b575b..f3013649 100644
--- a/src/views/inm/mioitemlist.vue
+++ b/src/views/inm/mioitemlist.vue
@@ -29,6 +29,20 @@
 				>
 					<el-table-column label="物料" prop="full_name"></el-table-column>
 				</xtSelect>
+				<el-select
+					v-model="params.mio__type"
+					clearable
+					style="width: 120px; margin-left: 2px"
+					placeholder="出入库类型"
+					@change="handleQuery"
+				>
+					<el-option
+						v-for="item in cateOptions"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					></el-option>
+				</el-select>
 				<el-input
 					v-model="params.search"
 					placeholder="名称"
@@ -171,6 +185,7 @@ export default {
 				with_mio:'yes',
 				material__type:40,
 				mio__state:20,
+				mio__type:'',
 				mio__inout_date__gte:'',
 				mio__inout_date__lte:'',
 				material:'',
@@ -197,13 +212,21 @@ export default {
 				20: "已提交",
 			},
 			typeDict: {
-				do_out: "生产领料",
-				sale_out: "销售发货",
 				pur_in: "采购入库",
-				do_in: "生产入库",
+				do_out: "生产领料",
+				borrow_out: "领用出库",
+				return_in: "退还入库",
+				pur_out: "采购退货",
 				other_in: "其他入库",
-				other_out: "其他出库",
 			},
+			cateOptions: [
+				{ id: "pur_in", name: "采购入库" },
+				{ id: "do_out", name: "生产领料" },
+				{ id: "borrow_out", name: "领用出库" },
+				{ id: "return_in", name: "退还入库" },
+				{ id: "pur_out", name: "采购退货"},
+				{ id: "other_in", name: "其他入库"},
+			],
 			selectObj: {},
 			apiObj:this.$API.inm.mioitem.list,
 			apiObjm:this.$API.mtm.material.list,
@@ -362,7 +385,7 @@ export default {
 			var that = this;
 			that.params.material = that.selectObj.id;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row,type){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -375,7 +398,8 @@ export default {
 						let obj = {};
 						obj.printer_commands = res.commands;
 						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
+						let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 							that.$message.success("打印成功");
 						});
 					})
@@ -388,7 +412,8 @@ export default {
 						let obj = {};
 						obj.printer_commands = res.commands;
 						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
+						let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 							that.$message.success("打印成功");
 						});
 					});
diff --git a/src/views/inm/packPrint_form.vue b/src/views/inm/packPrint_form.vue
index bf789752..71a713a8 100644
--- a/src/views/inm/packPrint_form.vue
+++ b/src/views/inm/packPrint_form.vue
@@ -257,7 +257,8 @@ export default {
 					let obj = {};
 					obj.printer_commands = commands;
 					obj.printer_name = that.printer_name;
-					that.$API.wpm.prints.req(obj).then((response) => {
+					let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 						that.$message.success("打印成功");
 						that.isSaveing = false;
 						that.$emit("success");
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 6943ee0d..fff7ff24 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -108,8 +108,10 @@ export default {
     },
   },
   mounted() { 
-    this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
-    console.log('this.project_code',this.project_code);
+    this.$nextTick(()=>{
+      this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
+      console.log('this.project_code',this.project_code);
+    });
   },
   methods: {
     async login() {
diff --git a/src/views/qm/qct.vue b/src/views/qm/qct.vue
index 8410e374..a79bf6f8 100644
--- a/src/views/qm/qct.vue
+++ b/src/views/qm/qct.vue
@@ -117,18 +117,12 @@ import recordDialog from "./qctDetail.vue";
 				tagsOptions: [
 					{value:"process",name:"过程检验"},
 					{value:"inm",name:"库存检验"},
-					// {value:"purin",name:"入厂检验"},
-					// {value:"first",name:"首件检验"},
-					// {value:"prod",name:"成品检验"},
-					// {value:"performance",name:"性能检验"},
+					{value:"fix",name:"返修检验"},
 				],
 				tags_:{
-					// "purin":"入厂检验",
-					// "first":"首件检验",
-					// "prod":"成品检验",
 					"process":"过程检验",
 					"inm":"库存检验",
-					// "performance":"性能检验"
+					"fix":"返修检验",
 				},
 			}
 		},
diff --git a/src/views/statistics/bxerp/cpccjc.vue b/src/views/statistics/bxerp/cpccjc.vue
index ddae9801..cece0888 100644
--- a/src/views/statistics/bxerp/cpccjc.vue
+++ b/src/views/statistics/bxerp/cpccjc.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_批次号 }}</span>
@@ -115,9 +116,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品尺寸检测_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/cpwgfj1.vue b/src/views/statistics/bxerp/cpwgfj1.vue
index d8dfa4e3..cc2ea20f 100644
--- a/src/views/statistics/bxerp/cpwgfj1.vue
+++ b/src/views/statistics/bxerp/cpwgfj1.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检一_批次号 }}</span>
@@ -145,9 +146,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品外观复检一_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/cpwgfj2.vue b/src/views/statistics/bxerp/cpwgfj2.vue
index 9d533d1a..4c4f8646 100644
--- a/src/views/statistics/bxerp/cpwgfj2.vue
+++ b/src/views/statistics/bxerp/cpwgfj2.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检二_批次号 }}</span>
@@ -145,9 +146,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品外观复检二_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/cpwgnzcj.vue b/src/views/statistics/bxerp/cpwgnzcj.vue
index 82c1c4ae..1a86e7fb 100644
--- a/src/views/statistics/bxerp/cpwgnzcj.vue
+++ b/src/views/statistics/bxerp/cpwgnzcj.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内外初检_批次号 }}</span>
@@ -240,9 +241,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品内外初检_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
diff --git a/src/views/statistics/bxerp/cpwgnzfj.vue b/src/views/statistics/bxerp/cpwgnzfj.vue
index f1202c2c..d777aa9f 100644
--- a/src/views/statistics/bxerp/cpwgnzfj.vue
+++ b/src/views/statistics/bxerp/cpwgnzfj.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内质复检_批次号 }}</span>
@@ -240,9 +241,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品内外初检_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
diff --git a/src/views/statistics/bxerp/cpxnjy.vue b/src/views/statistics/bxerp/cpxnjy.vue
index b30c6abb..ef2b9620 100644
--- a/src/views/statistics/bxerp/cpxnjy.vue
+++ b/src/views/statistics/bxerp/cpxnjy.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品性能检测_批次号 }}</span>
@@ -155,9 +156,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品性能检测_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/cpzj.vue b/src/views/statistics/bxerp/cpzj.vue
index 4ce52805..4dd67709 100644
--- a/src/views/statistics/bxerp/cpzj.vue
+++ b/src/views/statistics/bxerp/cpzj.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品自检_批次号 }}</span>
@@ -195,9 +196,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__成品自检_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue
index 2590343e..b9332cde 100644
--- a/src/views/statistics/bxerp/fenjian.vue
+++ b/src/views/statistics/bxerp/fenjian.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.分检_批次号 }}</span>
@@ -129,9 +130,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__分检_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/gzcpjc.vue b/src/views/statistics/bxerp/gzcpjc.vue
index 3783011e..2c7975f2 100644
--- a/src/views/statistics/bxerp/gzcpjc.vue
+++ b/src/views/statistics/bxerp/gzcpjc.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -31,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.光锥成品检测_批次号 }}</span>
@@ -125,9 +126,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__光锥成品检测_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index bb7f8c4e..b0f64566 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,11 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-				>导出</el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -32,6 +32,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.毛坯检测_批次号 }}</span>
@@ -202,9 +204,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__毛坯检测_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
@@ -234,64 +236,64 @@ export default {
 					return;
 				}
 				let propert = '';
-				if(index == 4&&column.label=='合格数'){
+				if(index == 5&&column.label=='合格数'){
 					propert= '毛坯检测_缺陷项_放大率￠2mm不合格';
 				}
-				if(index == 6&&column.label=='合格数'){
+				if(index == 7&&column.label=='合格数'){
 					propert= '毛坯检测_缺陷项_放大率￠16mm不合格';
 				}
-				if(index == 9&&column.label=='合格数'){
+				if(index == 10&&column.label=='合格数'){
 					propert= '毛坯检测_缺陷项_剪切￠18.3mm不合格';
 				}
-				if(index == 10&&column.label=='可加工'){
+				if(index == 11&&column.label=='可加工'){
 					propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工';
 				}
-				if(index == 11&&column.label=='内标合格'){
+				if(index == 12&&column.label=='内标合格'){
 					propert= '毛坯检测_缺陷项_暗点合格';
 				}
-				if(index == 12&&column.label=='长点不合格'){
+				if(index == 13&&column.label=='长点不合格'){
 					propert= '毛坯检测_缺陷项_暗点不合格';
 				}
-				if(index == 13&&column.label=='可加工'){
+				if(index == 14&&column.label=='可加工'){
 					propert= '毛坯检测_缺陷项_暗点合格';
 				}
-				if(index == 14&&column.label=='暗点重'){
+				if(index == 15&&column.label=='暗点重'){
 					propert= '毛坯检测_缺陷项_暗点重';
 				}
-				if(index == 15&&column.label=='花丝'){
+				if(index == 16&&column.label=='花丝'){
 					propert= '毛坯检测_缺陷项_花丝';
 				}
-				if(index == 16&&column.label=='网格'){
+				if(index == 17&&column.label=='网格'){
 					propert= '毛坯检测_缺陷项_网格';
 				}
-				if(index == 17&&column.label=='轻'){
+				if(index == 18&&column.label=='轻'){
 					propert= '毛坯检测_缺陷项_花朵';
 				}
-				if(index == 18&&column.label=='重'){
+				if(index == 19&&column.label=='重'){
 					propert= '毛坯检测_缺陷项_花朵重';
 				}
-				if(index == 19&&column.label=='S畸变不合格'){
+				if(index == 20&&column.label=='S畸变不合格'){
 					propert= '毛坯检测_缺陷项_S畸变不合格';
 				}
-				if(index == 20&&column.label=='弓形畸变不合格'){
+				if(index == 21&&column.label=='弓形畸变不合格'){
 					propert= '毛坯检测_缺陷项_弓形畸变不合格';
 				}
-				if(index == 21&&column.label=='炸废'){
+				if(index == 22&&column.label=='炸废'){
 					propert= '毛坯检测_缺陷项_炸废';
 				}
-				if(index == 22&&column.label=='角偏'){
+				if(index == 23&&column.label=='角偏'){
 					propert= '毛坯检测_缺陷项_角偏';
 				}
-				if(index == 23&&column.label=='色差'){
+				if(index == 24&&column.label=='色差'){
 					propert= '毛坯检测_缺陷项_色差';
 				}
 				if (propert!=='') {
 					let values = [];
-					if(index==4||index==6){
+					if(index==5||index==7){
 						values = data.map((item) =>!item.data[propert]?1:0);
-					}else if(index==9){
+					}else if(index==10){
 						values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0);
-					}else if(index==13){
+					}else if(index==14){
 						values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_暗点不合格']?1:0);
 					}else{
 						values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);
diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue
index 6215dff7..1c8b7222 100644
--- a/src/views/statistics/bxerp/niuzhuan.vue
+++ b/src/views/statistics/bxerp/niuzhuan.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<!-- <el-input v-model="query.name__contains" 
+				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input> -->
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -17,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -36,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.扭后检测_批次号 }}</span>
@@ -219,9 +215,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__扭后检测_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue
index d9aa9810..ff652b41 100644
--- a/src/views/statistics/bxerp/zhongjian1.vue
+++ b/src/views/statistics/bxerp/zhongjian1.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<!-- <el-input v-model="query.name__contains" 
+				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input> -->
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -17,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -36,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_批次号 }}</span>
@@ -53,47 +49,47 @@
 						<span>{{ scope.row.data.中检一_缺陷项_偏?scope.row.data.中检一_缺陷项_偏:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="掉头" align="center" class-name="colorheader2">
+				<el-table-column label="掉头" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_掉头?scope.row.data.中检一_缺陷项_掉头:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="台阶划伤" align="center" class-name="colorheader1">
+				<el-table-column label="台阶划伤" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_台阶划伤?scope.row.data.中检一_缺陷项_台阶划伤:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="柱面划伤" align="center" class-name="colorheader2">
+				<el-table-column label="柱面划伤" align="center" class-name="colorheader5">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_柱面划伤?scope.row.data.中检一_缺陷项_柱面划伤:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="台棱" align="center" class-name="colorheader3">
+				<el-table-column label="台棱" align="center" class-name="colorheader6">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_台棱?scope.row.data.中检一_缺陷项_台棱:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="台糙" align="center" class-name="colorheader4">
+				<el-table-column label="台糙" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_台糙?scope.row.data.中检一_缺陷项_台糙:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="尺寸大/小" align="center" class-name="colorheader6">
+				<el-table-column label="尺寸大/小" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data['中检一_缺陷项_尺寸大/小']?scope.row.data['中检一_缺陷项_尺寸大/小']:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="崩" align="center" class-name="colorheader5">
+				<el-table-column label="崩" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_崩?scope.row.data.中检一_缺陷项_崩:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="修崩/炸" align="center" class-name="colorheader7">
+				<el-table-column label="修崩/炸" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data['中检一_缺陷项_修崩/炸']?scope.row.data['中检一_缺陷项_修崩/炸']:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="拆头" align="center" class-name="colorheader7">
+				<el-table-column label="拆头" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_拆头?scope.row.data.中检一_缺陷项_拆头:0 }}</span>
 					</template>
@@ -103,27 +99,27 @@
 						<span>{{ scope.row.data.中检一_缺陷项_外黑?scope.row.data.中检一_缺陷项_外黑:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="外磕" align="center" class-name="colorheader1">
+				<el-table-column label="外磕" align="center" class-name="colorheader6">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_外磕?scope.row.data.中检一_缺陷项_外磕:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="打毛/打台" align="center" class-name="colorheader3">
+				<el-table-column label="打毛/打台" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span>{{ scope.row.data['中检一_缺陷项_打毛/打台']?scope.row.data['中检一_缺陷项_打毛/打台']:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="喷码" align="center" class-name="colorheader6">
+				<el-table-column label="喷码" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_喷码?scope.row.data.中检一_缺陷项_喷码:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="掉皮" align="center" class-name="colorheader3">
+				<el-table-column label="掉皮" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_掉皮?scope.row.data.中检一_缺陷项_掉皮:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="量崩" align="center" class-name="colorheader4">
+				<el-table-column label="量崩" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_量崩?scope.row.data.中检一_缺陷项_量崩:0 }}</span>
 					</template>
@@ -175,9 +171,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__中检一_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue
index 0205b508..6ee2cff5 100644
--- a/src/views/statistics/bxerp/zhongjian2.vue
+++ b/src/views/statistics/bxerp/zhongjian2.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<!-- <el-input v-model="query.name__contains" 
+				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input> -->
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -17,12 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -36,6 +30,8 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检二_批次号 }}</span>
@@ -175,9 +171,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__中检二_物料名';
+			obj3.field = 'material__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index 5c8ad9e3..cceff688 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -11,6 +11,7 @@
 					v-model="query.shiftcc" 
 					placeholder="尺寸班次"
 					style="width: 130px;"
+					:clearable="true"
 				>
 					<el-option 
 						v-for="item in shiftOptions"
@@ -23,6 +24,7 @@
 					v-model="query.shiftwg" 
 					placeholder="外观班次"
 					style="width: 130px;"
+					:clearable="true"
 				>
 					<el-option 
 						v-for="item in shiftOptions"
@@ -439,47 +441,90 @@ export default {
 			let that = this;
 			that.params.page = 1;
 			that.params.querys=[];
-			let arr1 = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"}],
-			arr2 = [{field:"data__has_key",compare:"",value:"外观检验_日期"}],
-			arr3 = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}];
+			let arrays = {};
+			if(that.query.batch != "" && that.query.batch != null && that.query.batch != undefined&&that.query.batch.indexOf(' ')){
+				let arrs = that.query.batch.split(' ');
+				console.log('arrs',arrs);
+				arrs.forEach((item, index) => {
+					let obj = {};
+					obj.value = item;
+					obj.field = "batch";
+					obj.compare = "contains";
+					let newArrayName1 = 'arr1' + index; 
+					let newArrayName2 = 'arr2' + index; 
+					let newArrayName3 = 'arr3' + index; 
+					console.log('obj',obj);
+					arrays[newArrayName1] = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj]; 
+					arrays[newArrayName2] = [{field:"data__has_key",compare:"",value:"外观检验_日期"},obj]; 
+					arrays[newArrayName3] = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj]; 
+				});
+			}else{
+				let obj = {};
+				obj.value =that.query.batch;
+				obj.field = "batch";
+				obj.compare = "contains";
+				arrays.arr1=[{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj];
+				arrays.arr2=[{field:"data__has_key",compare:"",value:"外观检验_日期"},obj];
+				arrays.arr3=[{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj];
+			}
+			console.log('arrays',arrays);
 			for(let key in that.query){
-				if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined){
+				if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined&&key!='batch'){
 					let obj = {};
 					obj.value = that.query[key];
-					if(key=='batch'){
-						obj.field = "batch";
-						obj.compare = "contains";
-					}else if(key=='cc_data_start'){
+					if(key=='cc_data_start'){
 						obj.compare = "gte";
 						obj.field = "data__尺寸检验_日期";
-					}else if(key=='cc_data_end'){
+					}
+					if(key=='cc_data_end'){
 						obj.compare = "lte";
 						obj.field = "data__尺寸检验_日期";
-					}else if(key=='shiftcc'){
+					}
+					if(key=='shiftcc'){
 						obj.compare = "";
 						obj.field = "data__尺寸检验_班次";
-					}else if(key=='wg_data_start'){
+					}
+					if(key=='wg_data_start'){
 						obj.compare = "gte";
 						obj.field = "data__外观检验_日期";
-					}else if(key=='wg_data_end'){
+					}
+					if(key=='wg_data_end'){
 						obj.compare = "lte";
 						obj.field = "data__外观检验_日期";
-					}else if(key=='shiftwg'){
+					}
+					if(key=='shiftwg'){
 						obj.compare = "";
 						obj.field = "data__外观检验_班次";
-					}else if(key=='fx_data_start'){
+					}
+					if(key=='fx_data_start'){
 						obj.compare = "gte";
 						obj.field = "data__外观检验_返修_日期";
-					}else if(key=='fx_data_end'){
+					}
+					if(key=='fx_data_end'){
 						obj.compare = "lte";
 						obj.field = "data__外观检验_返修_日期";
 					}
-					arr1.push(obj);
-					arr2.push(obj);
-					arr3.push(obj);
+					if(that.query.batch.indexOf(' ')){
+						let arrs = that.query.batch.split(' ');
+						arrs.forEach((item,index)=>{
+							let newArrayName1 = 'arr1' + index; 
+							let newArrayName2 = 'arr2' + index; 
+							let newArrayName3 = 'arr3' + index; 
+							arrays[newArrayName1].push(obj);
+							arrays[newArrayName2].push(obj);
+							arrays[newArrayName3].push(obj);
+								
+						});
+					}else{
+						arrays.arr1.push(obj);
+						arrays.arr2.push(obj);
+						arrays.arr3.push(obj);
+					}
 				}
 			}
-			that.params.querys.push(arr1,arr2,arr3);
+			for(let key in arrays){
+				that.params.querys.push(arrays[key]);	
+			}
 			this.getList();
 		},
 		getSummaries({ columns, data }) {
diff --git a/src/views/statistics/good_check_gx2.vue b/src/views/statistics/good_check_gx2.vue
index 9516a314..f5f1193c 100644
--- a/src/views/statistics/good_check_gx2.vue
+++ b/src/views/statistics/good_check_gx2.vue
@@ -11,6 +11,7 @@
 					v-model="query.shiftcc" 
 					placeholder="尺寸班次"
 					style="width: 130px;"
+					:clearable="true"
 				>
 					<el-option 
 						v-for="item in shiftOptions"
@@ -23,6 +24,7 @@
 					v-model="query.shiftwg" 
 					placeholder="外观班次"
 					style="width: 130px;"
+					:clearable="true"
 				>
 					<el-option 
 						v-for="item in shiftOptions"
diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue
index 66262d97..cbe0153d 100644
--- a/src/views/statistics/stock_statistics.vue
+++ b/src/views/statistics/stock_statistics.vue
@@ -336,20 +336,13 @@ export default {
 						this.echartsOptions = JSON.parse(res.echart_options);
 					}
 				})
-			}else{
-				if(that.params.type==40){
-					query2.select_material="material.cate as cate";
-					query2.groupby_material="material.cate";
-					query2.select_material_name = "";
-					query2.groupby_material_name = "";
-				}
-				this.$API.bi.dataset.exec.req("materialCount2", {query:query2 }).then((res) => {
+			}else if(that.params.type==40){
+				this.$API.bi.dataset.exec.req("helpso_cate", {}).then((res) => {
 					if (res.echart_options) {
 						this.echartsOptions = JSON.parse(res.echart_options);
 					}
 				})
 			}
-			
 		},
 		//更改周预估用量
 		weekcountChange(row) {
diff --git a/src/views/template/printmaterial.vue b/src/views/template/printmaterial.vue
index de465546..d9bcd58b 100644
--- a/src/views/template/printmaterial.vue
+++ b/src/views/template/printmaterial.vue
@@ -118,7 +118,8 @@ export default {
                         that.$message.warning("请等待当前打印任务完成");
                     }
                 }else{
-                    that.$API.wpm.prints.req(obj).then((response) => {});
+                    let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {});
                 }
                 
 			})
@@ -128,7 +129,8 @@ export default {
         },
         printLabel(obj){
             let that = this;
-            that.$API.wpm.prints.req(obj).then((response) => {
+            let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
                 that.count_printed ++
                 if (that.count_printed >= that.print_count){
                     let printerInterval = that.$TOOL.data.get('printerInterval');
diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index 58bf8a2f..9440a594 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -137,22 +137,22 @@
 					label="操作"
 					fixed="right"
 					align="center"
-					width="120"
+					width="180"
 				>
 					<template #default="scope">
-						<el-link :underline="false"  @click="printMaterial(scope.row,'wm')" type="primary">物料标签</el-link>
-						<el-link :underline="false" v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"  @click="tableCheckList(scope.row)" type="primary">检验记录</el-link>
-						<el-link 
+						<el-button :underline="false"  @click="printMaterial(scope.row,'wm')" type="success">打签</el-button>
+						<el-button :underline="false" v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"  @click="tableCheckList(scope.row)" type="warning">检验记录</el-button>
+						<el-button 
 							v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"
 							:underline="false"  
 							@click="inmCheck(scope.row)" 
 							type="primary" 
 							style="margin-left: 10px;"
-						>检验</el-link>
-						<el-link :underline="false"  type="success" 
+						>检验</el-button>
+						<el-button :underline="false"  type="success" 
 							v-if="route_code=='pengma'"
 							@click="handleAddWpr(scope.row)"
-						>混批加料</el-link>
+						>混批加料</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -219,7 +219,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>
@@ -550,7 +550,7 @@ export default {
 				this.$refs.handoverDialog.open("add",row,20);
 			});
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row,type){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -654,7 +654,8 @@ export default {
 								let obj = {};
 								obj.printer_commands = res.commands;
 								obj.printer_name = that.printer_name;
-								that.$API.wpm.prints.req(obj).then((response) => {
+								let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 									that.$message.success("打印成功");
 								});
 							});
@@ -697,7 +698,8 @@ export default {
 							let obj = {};
 							obj.printer_commands = res.commands;
 							obj.printer_name = that.printer_name;
-							that.$API.wpm.prints.req(obj).then((response) => {
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 								that.$message.success("打印成功");
 							});
 						});
@@ -714,7 +716,8 @@ export default {
 				let obj = {};
 				obj.printer_commands = res.commands;
 				obj.printer_name = that.printer_name;
-				that.$API.wpm.prints.req(obj).then((response) => {
+				let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 					that.$message.success("打印成功");
 				});
 			})
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index 4e6af062..10831004 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -152,18 +152,18 @@
 					label="操作"
 					fixed="right"
 					align="center"
-					width="120"
+					width="180"
 				>
 					<template #default="scope">
-						<el-link :underline="false"  @click="printMaterial(scope.row,'wm')" type="primary">物料标签</el-link>
-						<el-link :underline="false" v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"  @click="tableCheckList(scope.row)" type="primary">检验记录</el-link>
-						<el-link 
+						<el-button :underline="false"  @click="printMaterial(scope.row,'wm')" type="success">打签</el-button>
+						<el-button :underline="false" v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"  @click="tableCheckList(scope.row)" type="warning">检验记录</el-button>
+						<el-button 
 							v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"
 							:underline="false"  
 							@click="inmCheck(scope.row)" 
 							type="primary" 
 							style="margin-left: 10px;"
-						>检验</el-link>
+						>检验</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -230,7 +230,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>
@@ -574,7 +574,7 @@ export default {
 			this.dialog.save = false;
 			this.$refs.table.refresh();
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row,type){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -679,7 +679,8 @@ export default {
 								let obj = {};
 								obj.printer_commands = res.commands;
 								obj.printer_name = that.printer_name;
-								that.$API.wpm.prints.req(obj).then((response) => {
+								let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 									that.$message.success("打印成功");
 								});
 							});
@@ -722,7 +723,8 @@ export default {
 							let obj = {};
 							obj.printer_commands = res.commands;
 							obj.printer_name = that.printer_name;
-							that.$API.wpm.prints.req(obj).then((response) => {
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 								that.$message.success("打印成功");
 							});
 						});
@@ -738,7 +740,8 @@ export default {
 				let obj = {};
 				obj.printer_commands = res.commands;
 				obj.printer_name = that.printer_name;
-				that.$API.wpm.prints.req(obj).then((response) => {
+				let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 					that.$message.success("打印成功");
 				});
 			})
diff --git a/src/views/wpm_bx/inm_record.vue b/src/views/wpm_bx/inm_record.vue
index 9e207f13..b5715d40 100644
--- a/src/views/wpm_bx/inm_record.vue
+++ b/src/views/wpm_bx/inm_record.vue
@@ -271,7 +271,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>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -499,7 +499,7 @@ export default {
 		handlePrint(){
 			this.printVisible = true;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.wmId = row.id;
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 38c75042..1e96f370 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -339,6 +339,7 @@
 					:dept="deptId"
 					:mgroup="mgroup"
 					:cutCount="cutCount"
+					:material_in="materialIn"
 					:material_out="mlogItem.material_out"
 					:mgroupName= "mlogItem.mgroup_name"
 					:isSubmit="isSubmit"
@@ -563,7 +564,6 @@ export default {
 		this.paramsOut.mlog = this.mlogId;
 		this.apiObj = this.$API.wpm.mlogb.list;
 		let userInfo = that.$TOOL.data.get("USER_INFO");
-		that.addTemplate.mlog = that.mlogItem.id;
 		that.addTemplate.equipment = "";
 		that.addTemplate.handle_user = userInfo.id;
 		that.addTemplate.handle_user_name = userInfo.name;
@@ -585,7 +585,7 @@ export default {
 			let that = this;
 			that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
 				that.mlogItem = res;
-				that.getcutCount(res.material_in);
+				that.addTemplate.mlog = that.mlogItem.id;
 				that.isSubmit = res.submit_time==null?false:true;
 				if(that.processType=='10'&&that.mlogItem.material_out_&&that.mlogItem.material_out_.tracking==20){
 					that.getMlogbw();
@@ -608,16 +608,19 @@ export default {
 					that.fileList = [{name:res.test_file,url:res.test_file}];
 					that.form.test_file = res.test_file;
 				}
-				that.materialIn = res.material_in;
+				that.materialIn = res.material_in!==null?res.material_in:res.mlogb_full[0]?res.mlogb_full[0].material_in:null;
 				that.deptId = res.belong_dept;
 				that.checkTableShow = true;
 				that.apiObjWm = that.$API.wpm.wmaterial.list;
 				that.$API.wpm.mlogb.list.req(that.paramsOut).then((res) => {
 					that.tableData2 = res;
 				})
-				that.$API.mtm.routepack.list.req({page:0,search:res.routepack_name}).then((res) => {
-					that.route_file = res[0].document_!==null?res[0].document_.path:null;
-				})
+				if(!res.is_fix){
+					that.getcutCount(res.material_in);
+					that.$API.mtm.routepack.list.req({page:0,search:res.routepack_name}).then((res) => {
+						that.route_file = res[0].document_!==null?res[0].document_.path:null;
+					})
+				}
 			});
 		},
 		getEquipment(){
@@ -989,7 +992,7 @@ export default {
 			let that = this;
 			that.printVisible = true;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.apiObjPrint.req({tid:row.id}).then((res) => {
@@ -1008,7 +1011,8 @@ export default {
 				let obj = {};
 				obj.printer_commands = str;
 				obj.printer_name = that.printer_name;
-                that.$API.wpm.prints.req(obj).then((response) => {
+                let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
                     that.$message.success("打印成功");
 				});
 			})
diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue
index 2420e74b..45a69502 100644
--- a/src/views/wpm_bx/mlog_form.vue
+++ b/src/views/wpm_bx/mlog_form.vue
@@ -59,7 +59,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'">
+						<el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'||route_code=='djg'||route_code=='cnc'">
 							<el-form-item label="生产设备" prop="equipment">
 								<el-select
 									v-model="form.equipment"
diff --git a/src/views/wpm_bx/mlog_form2.vue b/src/views/wpm_bx/mlog_form2.vue
index e363489e..a915c0c4 100644
--- a/src/views/wpm_bx/mlog_form2.vue
+++ b/src/views/wpm_bx/mlog_form2.vue
@@ -60,7 +60,7 @@
 								<el-input-number v-model="form.count_use" :disabled="materialTracking==20" style="width: 100%;"></el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'">
+						<el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'||route_code=='djg'||route_code=='cnc'">
 							<el-form-item label="生产设备" prop="equipment">
 								<el-select
 									v-model="form.equipment"
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index 3c71303e..cc0a7d42 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -8,17 +8,17 @@
 		@closed="$emit('closed')"
 	>
 		<el-container v-loading="loading">
-			<el-main style="padding: 0 20px 20px 20px">
+			<el-main style="padding: 0">
 				<el-form
 					ref="dialogForm"
 					:model="form"
 					:rules="rules"
 					label-position="right"
 					label-width="80px"
-					style="padding: 0 10px"
+					style="padding: 0"
 				>
 					<el-row>
-						<el-col v-if="!hasRoute&&!is_fix">
+						<el-col :md="12" :sm="12" :xs="24" v-if="!isfix&&!hasRoute">
 							<el-form-item label="工艺步骤" prop="route">
 								<el-select
 									v-model="form.route"
@@ -74,13 +74,15 @@
 										:label="item.batch"
 										:value="item.id"
 									>
+									<span>{{ item.batch }}</span>
+									<span v-if="item.defect_name&&item.defect_name!==null">({{ item.defect_name }})</span>
+									<span style="float: right;">{{ item.count_cando }}</span>
 									</el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col>
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="物料扫码" style="display: flex;">
-								<!-- <scScanner @scanResult="formWminChange"></scScanner> -->
 								<el-input ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)" style="width: 200px;margin-left: 4px;"></el-input>
 							</el-form-item>
 						</el-col>
@@ -221,14 +223,16 @@ export default {
 		this.params.mlog = this.mlog;
 		let arr = this.$route.path.split("/");
 		this.mgroup_code = arr[2];
-		this.getMlogbIn();
-		this.getMtask();
-		this.getMaterial();
-		this.getParentList();
-		this.getEquipment();
-		if(!this.hasRoute){
-			this.getRoute();
-		}
+		this.$nextTick(()=>{
+		   this.getMlogbIn();
+			this.getMtask();
+			this.getMaterial();
+			this.getParentList();
+			this.getEquipment();
+			if(!this.hasRoute&&!this.isfix){
+				this.getRoute();
+			}
+		})
 	},
 	methods: {
 		open() {
@@ -307,7 +311,7 @@ export default {
 				obj.route =that.routeId;
 			}
 			obj.page =0;
-			if(that.is_fix){//来料未完成的返修品&&出料已完成的返修品和不合格品
+			if(that.isfix ){//来料未完成的返修品&&出料已完成的返修品和不合格品
 				obj.tag = 'canfix';
 			}else{
 				if(that.materialIn!==null&&that.materialIn!==''){
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index b2947711..d71c4955 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -987,7 +987,7 @@ export default {
 			let that = this;
 			that.printVisible = true;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.apiObjPrint.req({tid:row.id}).then((res) => {
@@ -1006,7 +1006,8 @@ export default {
 				let obj = {};
 				obj.printer_commands = str;
 				obj.printer_name = that.printer_name;
-                that.$API.wpm.prints.req(obj).then((response) => {
+                let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
                     that.$message.success("打印成功");
 				});
 			})
diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue
index 929474ba..334106bf 100644
--- a/src/views/wpm_bx/mlogbw_check_table.vue
+++ b/src/views/wpm_bx/mlogbw_check_table.vue
@@ -17,10 +17,21 @@
 			</div>
 		</el-header>
 		<el-main id="mlogbwMain">
-			<el-button type="primary" v-if="!isSubmit" @click="check_add">新增</el-button>
-			<el-button type="primary" v-if="!isSubmit&&processType=='20'" @click="check_start">检验</el-button>
-			<el-button type="primary" v-if="multipleSet" @click="check_set" style="position: relative;left: 210px;">批量操作</el-button>
-			<el-input v-if="multipleSet" v-model="wprInputText"  @change="wprinputChange" style="width:200px;position: relative;left: 308px;"></el-input>
+			<div style="margin-top: -5px;margin-bottom: 5px;position: relative;">
+				<el-button type="primary" v-if="!isSubmit" @click="check_add">新增</el-button>
+				<el-button type="primary" v-if="!isSubmit&&processType=='20'" @click="check_start">检验</el-button>
+				<el-button type="primary" v-if="multipleSet" @click="check_set" style="position: absolute;left: 210px;">批量操作</el-button>
+				<el-input v-if="multipleSet" v-model="wprInputText"  @change="wprinputChange" style="width:200px;position: absolute;left: 308px;"></el-input>
+				<div style="width:100px;position: absolute;right: 40px;display: inline-block;">
+					<scFileImport
+						v-if="project_code=='tcerp'&&processType=='20'&&!isSubmit"
+						:name = "'上传检验附件'"
+						accept=".xlsx"
+						:apiObj="$API.common.upload"
+						@success="upSuccess"
+					></scFileImport><!-- :templateUrl="checkTemplate" -->
+				</div>
+			</div>
 			<table id="mlogbwlist" class="tables">
 				<thead>
 					<tr>
@@ -246,7 +257,10 @@
 	</el-dialog>
 </template>
 <script>
+import { ElLoading } from "element-plus";
+import scFileImport from "@/components/scFileImport";
 export default {
+	components: {scFileImport},
 	props: {
 		qct: {
 			type: String,
@@ -331,6 +345,7 @@ export default {
 			wprNumber:"",
 			route_code:"",
 			wprInputText:"",
+			project_code:"",
 			canMultiple:false,
 			selectedAll:false,
 			checkAll: false,
@@ -376,31 +391,53 @@ export default {
 			qct_defects_origin:[],
 			tableHeight:500,
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
-			printer_name:localStorage.getItem("printer_name")
+			printer_name:localStorage.getItem("printer_name"),
+			// checkTemplate: " /media/default/template/material.xlsx",
 		};
 	},
 	watch: {},
 	mounted() {
 		let that = this;
+		that.route_code = that.$route.path.split("/")[2];
+		that.currentDate = that.$TOOL.dateFormat2(new Date());
+		that.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
+		that.checkTemplate = this.checkTemplate+"?t=" + new Date().getTime();
 		if(that.processType=='20'){
 			that.canMultiple = true;
 		}
 		if(that.qct!==''&&that.qct!==null){//输出
 			that.getdefects();
-		}else if(that.material_out!==''&&that.material_out!==null){//输入
-			that.$API.qm.qct.getQct.req({ material: that.material_out,type:'out',tag:'process' }).then((res) => {
-				that.qctId = res.id;
-				that.testdefectss(res);
-			}).catch(()=>{
-				that.getList();
-			})
+		}else{
+			if(that.material_in!==''&&that.material_in!==null){//输入
+				if(that.route_code=='chengpingfanxiu'){
+					that.$API.qm.qct.getQct.req({ material: that.material_in,type:'out',tag:'fix' }).then((res) => {
+						that.qctId = res.id;
+						that.testdefectss(res);
+					}).catch(()=>{
+						that.getList();
+					})
+				}else{
+					that.$API.qm.qct.getQct.req({ material: that.material_in,type:'out',tag:'process' }).then((res) => {
+						that.qctId = res.id;
+						that.testdefectss(res);
+					}).catch(()=>{
+						that.getList();
+					})
+				}
+			}else if(that.material_out!==''&&that.material_out!==null){//输入
+				that.$API.qm.qct.getQct.req({ material: that.material_out,type:'out',tag:'process' }).then((res) => {
+					that.qctId = res.id;
+					that.testdefectss(res);
+				}).catch(()=>{
+					that.getList();
+				})
+			}
 		}
 		that.visible = true;
 		setTimeout(() => {
 			that.tableHeight = document.getElementById('mlogbwMain').clientHeight-20;
 		},500)
-		that.route_code = that.$route.path.split("/")[2];
-		that.currentDate = that.$TOOL.dateFormat2(new Date());
+		
 	},
 	methods: {
 		refreshfun(){
@@ -707,7 +744,7 @@ export default {
 			let that = this;
 			that.printVisible = true;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.apiObjPrint.req({tid:row.id}).then((res) => {
@@ -726,7 +763,8 @@ export default {
 				let obj = {};
 				obj.printer_commands = str;
 				obj.printer_name = that.printer_name;
-                that.$API.wpm.prints.req(obj).then((response) => {
+                let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
                     that.$message.success("打印成功");
 				});
 			})
@@ -971,6 +1009,23 @@ export default {
 			// 	item.value = false;
 			// });
 		},
+		upSuccess(res, close){
+			let that = this;
+			close();
+			const loading = ElLoading.service({
+				fullscreen: true,
+				text: "解析中...请稍等",
+			});
+			console.log(res);
+			this.$API.wpm.mlog.change.req(that.mlogId,{ test_file: res.path }).then((res) => {
+					loading.close();
+					this.$message.success("导入成功");
+					this.getList();
+				}).catch((err) => {
+					loading.close();
+					this.$message.error("导入失败，请重新尝试");
+				});
+		},
 	},
 };
 </script>
diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index bc281519..37206920 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -3,12 +3,14 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button
+				    v-if="route_code!=='chengpingfanxiu'"
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add2"
 					v-auth="'mlog.create'"
 				>快速报工</el-button>
 				<el-button
+					v-if="route_code!=='chengpingfanxiu'"
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add"
@@ -64,7 +66,6 @@
 				row-key="id"
 				:params="params"
 				:query="params"
-				@row-click="table_detail"
 			>
 				<el-table-column
 					label="#"
diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue
index 67320515..b432b290 100644
--- a/src/views/wpm_bx/wprList.vue
+++ b/src/views/wpm_bx/wprList.vue
@@ -54,7 +54,7 @@
 				>
 					<template #default="scope">
 						<el-button v-if="mode=='ins'&&mgroupName=='毛坯检测后打码'"  @click="QRCode(scope.row)" type="success">二维码</el-button>
-						<el-button  @click="printMaterial(scope.row)" type="primary">打印标签</el-button>
+						<el-button  @click="printMaterial(scope.row)" type="primary">打签</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -252,7 +252,7 @@ export default {
 				}
 			})
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -276,7 +276,8 @@ export default {
 							let obj = {};
 							obj.printer_commands = res.commands;
 							obj.printer_name = that.printer_name;
-							that.$API.wpm.prints.req(obj).then((response) => {
+							let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 								that.$message.success("打印成功");
 							});
 						});
@@ -319,7 +320,8 @@ export default {
 						let obj = {};
 						obj.printer_commands = res.commands;
 						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
+						let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 							that.$message.success("打印成功");
 						});
 					});
diff --git a/src/views/wpm_gx/check_drawer.vue b/src/views/wpm_gx/check_drawer.vue
index e29a9233..1ff8ebe6 100644
--- a/src/views/wpm_gx/check_drawer.vue
+++ b/src/views/wpm_gx/check_drawer.vue
@@ -54,17 +54,24 @@
 					</el-table-column>
 					<el-table-column label="检验人" prop="test_user_name">
 					</el-table-column>
-					<!-- <el-table-column label="操作" fixed="right" width="60">
+					<el-table-column label="操作" fixed="right" width="80">
 						<template #default="scope">
 							<el-button
 								link
-								type="primary"
+								type="warning"
+								v-if="scope.row.submit_time!==null"
 								v-auth="'ftestwork.update'"
-								@click="table_del(scope.row)"
-								>删除
-							</el-button>
+								@click="table_revert(scope.row)"
+							>撤回</el-button>
+							<el-button
+								link
+								v-if="scope.row.submit_time==null"
+								type="danger"
+								v-auth="'ftestwork.update'"
+								@click="table_delete(scope.row)"
+							>删除</el-button>
 						</template>
-					</el-table-column> -->
+					</el-table-column>
 				</scTable>
 			</el-main>
 		</el-container>
@@ -97,11 +104,21 @@ export default {
 			this.apiObj = this.$API.qm.ftestwork.list;
 			return this;
 		},
-		table_del(row){
-			this.$API.qm.ftestwork.delete.req(row.id).then((res) => {
-				this.$refs.drawer_table.fetch();
+		table_revert(row){
+			this.$API.qm.ftestwork.revert.req(row.id).then((res) => {
+				this.$refs.drawer_table.refresh();
 			});
 		},
+		table_delete(row){
+			let that = this;
+			that.$confirm("确定删除该检验记录吗？", "提示", {
+				type: "warning",
+			}).then(() => {
+				that.$API.qm.ftestwork.delete.req(row.id).then((res) => {
+					that.$refs.drawer_table.refresh();
+				});
+			}).catch(() => {});
+		},
 	},
 };
 </script>
diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 725c0af7..70d266b4 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -343,7 +343,7 @@ export default {
 				that.printVisible = true;
 			})
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.$API.cm.labelmat.fromWm.req({tid:row.id}).then((res) => {
@@ -364,7 +364,8 @@ export default {
 				let obj = {};
 				obj.printer_commands = str;
 				obj.printer_name = that.printer_name;
-				this.$API.wpm.prints.req(obj).then((response) => {});
+				let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+				this.$API.wpm.prints.req(printer_ip, obj).then((response) => {});
 			})
 			
 		},
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index b5211ce5..dd463857 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -363,6 +363,7 @@ export default {
 				{ name: "交送", value: "send" },
 				{ name: "接收", value: "recive" },
 				{ name: "合批", value: "hepi" },
+				{ name: "拆批", value: "chaipi" },
 			],
 			searchType: "",
 			options: ["交送", "接收"],
@@ -489,23 +490,17 @@ export default {
 		searchTypeQuery() {
 			let that = this;
 			if (that.searchType == "send") {
-				if(that.mgroupName=="size"||that.mgroupName=="facade"){
-					that.query.send_dept = that.deptId;
-					that.query.recive_dept = "";
-				}else{
-					that.query.send_mgroup = that.mgroupId;
-					that.query.recive_mgroup = "";
-				}
+				that.query.send_mgroup = that.mgroupId;
+				that.query.recive_mgroup = "";
+				that.query.mtype =10;
 			} else if (that.searchType == "recive") {
-				if(that.mgroupName=="size"||that.mgroupName=="facade"){
-					that.query.send_dept = "";
-					that.query.recive_dept =that.deptId;
-				}else{
-					that.query.recive_mgroup = that.mgroupId;
-					that.query.send_mgroup = "";
-				}
+				that.query.recive_mgroup = that.mgroupId;
+				that.query.send_mgroup = "";
+				that.query.mtype =10;
 			}else if (that.searchType == "hepi") {
 				that.query.mtype =30;
+			} else if (that.searchType == "chaipi") {
+				that.query.mtype =20;
 			} else {
 				that.query.send_mgroup = "";
 				that.query.recive_mgroup = "";
diff --git a/src/views/wpm_gx/helpso.vue b/src/views/wpm_gx/helpso.vue
index 5c5cfa8f..2bc26846 100644
--- a/src/views/wpm_gx/helpso.vue
+++ b/src/views/wpm_gx/helpso.vue
@@ -86,7 +86,7 @@
 					width="100"
 				>
 					<template #default="scope">
-						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
+						<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -145,7 +145,7 @@ export default {
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -157,7 +157,8 @@ export default {
 					let obj = {};
 					obj.printer_commands = res.commands;
 					obj.printer_name = that.printer_name;
-					that.$API.wpm.prints.req(obj).then((response) => {
+					let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 						that.$message.success("打印成功");
 					});
 				})
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 0b0c0735..85bf3020 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -124,7 +124,7 @@
 							v-if="scope.row.defect_name == null"
 							>检验记录
 						</el-button> -->
-						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
+						<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -444,7 +444,7 @@ export default {
 			this.dialog.save = false;
 			this.$refs.table.refresh();
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -456,7 +456,8 @@ export default {
 					let obj = {};
 					obj.printer_commands = res.commands;
 					obj.printer_name = that.printer_name;
-					that.$API.wpm.prints.req(obj).then((response) => {
+					let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 						that.$message.success("打印成功");
 					});
 				})
diff --git a/src/views/wpm_gx/inmOut.vue b/src/views/wpm_gx/inmOut.vue
index 4383ff82..c5377829 100644
--- a/src/views/wpm_gx/inmOut.vue
+++ b/src/views/wpm_gx/inmOut.vue
@@ -10,12 +10,30 @@
 				<scScanner :labeltext="'报废扫码'" @scanResult="codeTextChange40"></scScanner>
 			</div>
 			<div class="right-panel">
+				<el-date-picker
+					v-if="route_code=='chicuncheck'||route_code=='waiguancheck'"
+					v-model="query.mlog_date_start"
+					type="date"
+					placeholder="产出开始日期"
+					value-format="YYYY-MM-DD"
+					clearable
+					style="width: 130px; margin: 5px"
+				></el-date-picker>
+				<el-date-picker
+					v-if="route_code=='chicuncheck'||route_code=='waiguancheck'"
+					v-model="query.mlog_date_end"
+					type="date"
+					placeholder="产出结束日期"
+					value-format="YYYY-MM-DD"
+					clearable
+					style="width: 130px; margin:0"
+				></el-date-picker>
 				<el-select
 					v-model="queryState"
 					placeholder="物料状态"
 					clearable
 					@change="searchStateChange"
-					style="width: 250px"
+					style="width: 110px"
 				>
 					<el-option
 						v-for="item in stateOptions"
@@ -25,7 +43,7 @@
 					/>
 				</el-select>
 				<el-input
-					style="margin-right: 5px"
+					style="margin-right: 5px;width: 200px"
 					v-model="query.search"
 					placeholder="名称"
 					clearable
@@ -121,7 +139,7 @@
 							@click="tableCheckList(scope.row)"
 							v-if="scope.row.state == 10||scope.row.state == 34"
 						>检验记录</el-button>
-						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
+						<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -266,6 +284,7 @@ export default {
 				material: "",
 			},
 			queryState:null,
+			route_code:'',
 			cate_type:'',
 			materialType: "wm",
 			changebatch:false,
@@ -278,6 +297,7 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		that.route_code = that.$route.path.split("/")[2];
 		that.params.mgroup = that.mgroupId;
 		that.params.tag = 'done';
 		that.$TOOL.data.set('gx_deptID',that.deptId);
@@ -441,7 +461,7 @@ export default {
 			this.dialog.save = false;
 			this.$refs.table.refresh();
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
@@ -453,7 +473,8 @@ export default {
 					let obj = {};
 					obj.printer_commands = res.commands;
 					obj.printer_name = that.printer_name;
-					that.$API.wpm.prints.req(obj).then((response) => {
+					let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
+that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 						that.$message.success("打印成功");
 					});
 				})
diff --git a/src/views/wpm_gx/inm_record.vue b/src/views/wpm_gx/inm_record.vue
index 8b33e2be..a8f3239e 100644
--- a/src/views/wpm_gx/inm_record.vue
+++ b/src/views/wpm_gx/inm_record.vue
@@ -278,7 +278,7 @@
 				</el-table-column>
 				<el-table-column width="90" v-if="cate=='do_in'|| cate=='do_out'">
 					<template #default="scope">
-						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
+						<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -554,7 +554,7 @@ export default {
 		handlePrint(){
 			this.printVisible = true;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.wmId = row.id;
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 787779cb..3bb51d40 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -691,7 +691,7 @@ export default {
 			let that = this;
 			that.printVisible = true;
 		},
-		//打印物料标签
+		//打签
 		printMaterial(row){
 			let that = this;
 			that.wmId = row.id;
diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index 155ce09a..eca59188 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -386,6 +386,8 @@ export default {
 			that.visible = true;
 			that.mlogbItem = data;
 			that.form.batch = data.batch;
+			that.form.test_user = data.test_user;
+			that.form.test_user_name = data.test_user_name;
 			that.form.count_real =Number(data.count_real);
 			that.form.count_ok= Number(data.count_ok);
 			that.form.count_ok_full= Number(data.count_ok_full);