From c1351d02f62d6999e6d84cc5616034bb355dd633 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 18 May 2026 11:10:17 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=E7=A6=85=E9=81=93396=E6=8A=95?=
 =?UTF-8?q?=E4=BA=A7=E6=9F=A5=E8=AF=A2=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/intoDefect_bdgy.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/statistics/bxerp/intoDefect_bdgy.vue b/src/views/statistics/bxerp/intoDefect_bdgy.vue
index 339ef963..858655d0 100644
--- a/src/views/statistics/bxerp/intoDefect_bdgy.vue
+++ b/src/views/statistics/bxerp/intoDefect_bdgy.vue
@@ -12,6 +12,11 @@
 				>
 					<el-table-column label="物料名称" prop="name"></el-table-column>
 				</xtSelect>
+				<el-input v-model="query.batch" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
                 <el-date-picker
 					v-model="query.start_date"
 					type="date"
@@ -68,6 +73,7 @@ export default {
 	data() {
 		return {
 			query:{
+				batch:'',
 				end_date:'',
 				material_name:'',
 				start_date:'2025-11-01',

From 4cfaa59600d49e343ac8a98c114fb0cc9e02b66d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 18 May 2026 13:56:28 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=E7=A6=85=E9=81=93405=E6=8E=92?=
 =?UTF-8?q?=E7=89=88=E7=BB=9F=E8=AE=A1/=E7=BB=9F=E8=AE=A12=EF=BC=8C?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=92=8C=E7=89=A9=E6=96=99=E5=9C=A8=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E5=8A=A0=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/workHoursPB.vue | 32 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/statistics/bxerp/workHoursPB.vue b/src/views/statistics/bxerp/workHoursPB.vue
index c854a793..ad77f320 100644
--- a/src/views/statistics/bxerp/workHoursPB.vue
+++ b/src/views/statistics/bxerp/workHoursPB.vue
@@ -41,7 +41,7 @@
 								stripe
 							>
 								<el-table-column type="index" width="50"  fixed="left"/>
-								<el-table-column label="员工" prop="员工">
+								<el-table-column label="员工" prop="员工" :filters="userFilters" :filter-method="filterUser" filter-placement="bottom-end">
 								</el-table-column>
 								<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
 								</el-table-column>
@@ -108,9 +108,9 @@
 								stripe
 							>
 								<el-table-column type="index" width="50"  fixed="left"/>
-								<el-table-column label="员工" prop="员工">
+								<el-table-column label="员工" prop="员工" :filters="userFilters" :filter-method="filterUser" filter-placement="bottom-end">
 								</el-table-column>
-								<el-table-column label="物料名" prop="物料名">
+								<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
 								</el-table-column>
 								<el-table-column label="总数">
 									<template #default="scope">
@@ -346,12 +346,17 @@ export default {
 	methods: {
         getData1(){
              let that = this;
+			let userList = [],users = [];
 			let nameList = [],names = [];
             let params = {};
             params.query = that.query;
 			that.$API.bi.dataset.exec.req('product_defect_pb_m', params).then((res) => {
 				let data = res.data2.ds0;
 				data.forEach(item=>{
+					if(users.indexOf(item.员工)>-1){}else{
+						users.push(item.员工);
+						userList.push({text:item.员工,value:item.员工})
+					}
 					if(names.indexOf(item.物料名)>-1){}else{
 						names.push(item.物料名);
 						nameList.push({text:item.物料名,value:item.物料名})
@@ -366,7 +371,7 @@ export default {
 					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
 					let count_hgls = item.暗点合格?item.暗点合格.含:0;
 					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
-					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组){
 						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
 							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
 						}
@@ -384,6 +389,7 @@ export default {
 					item.合格率数 = count_hgls;//：在暗点合格含里刨除剪切可加工和剪切不合格
 				})
 				that.$nextTick(() => {
+					that.userFilters = userList;
                   	that.nameFilters = nameList;
 					that.tableData = data;
                 })
@@ -392,10 +398,20 @@ export default {
 		getData2(){
             let that = this;
             let params = {};
+			let userList = [],users = [];
+			let nameList = [],names = [];
             params.query = that.query;
 			that.$API.bi.dataset.exec.req('product_defect_pb_user_mname', params).then((res) => {
 				let data = res.data2.ds0;
 				data.forEach(item=>{
+					if(users.indexOf(item.员工)>-1){}else{
+						users.push(item.员工);
+						userList.push({text:item.员工,value:item.员工})
+					}
+					if(names.indexOf(item.物料名)>-1){}else{
+						names.push(item.物料名);
+						nameList.push({text:item.物料名,value:item.物料名})
+					}
 					if(item.缺陷分布!==null){
 						let defect = JSON.parse(item.缺陷分布);
 						for(let key in defect){
@@ -406,7 +422,7 @@ export default {
 					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
 					let count_hgls = item.暗点合格?item.暗点合格.含:0;
 					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
-					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组){
 						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
 							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
 						}
@@ -424,6 +440,8 @@ export default {
 					item.合格率数 = count_hgls;
 				})
 				that.$nextTick(() => {
+					that.userFilters = userList;
+                  	that.nameFilters = nameList;
 					that.tableData = data;
                 })
 			});
@@ -460,7 +478,7 @@ export default {
 					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
 					let count_hgls = item.暗点合格?item.暗点合格.含:0;
 					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
-					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组){
 						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
 							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
 						}
@@ -512,7 +530,7 @@ export default {
 					item.剪切合格 = item['剪切￠18.3mm不合格']?item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含:item.总切片数 - item['剪切￠18.3mm不合格'].含:item['剪切￠18.3mm可加工']?item.总切片数 - item['剪切￠18.3mm可加工'].含:item.总切片数;
 					let count_hgls = item.暗点合格?item.暗点合格.含:0;
 					let count1 = item['剪切￠18.3mm不合格']?item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含:item.总切片数 - item.长点数;
-					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组!==null){
+					if(item['剪切￠18.3mm不合格']&&item['剪切￠18.3mm不合格'].组){
 						if(item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']){
 							count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
 						}

From e9e4a253b0a90568bcb50f0e6e6e3f3b31fff0d9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 18 May 2026 13:49:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=96=B7=E7=A0=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=8B=AC=E7=AB=8B=E5=88=B0=E9=A1=B6=E6=A0=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE,=20=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80=E4=B8=BA"?=
 =?UTF-8?q?=E5=96=B7=E7=A0=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 顶栏新增独立"喷码设置"图标与弹窗, 与打印机解耦
- coder_ip/port/field 持久化到 localStorage (新增 tool.setCoder)
- 标签模板编辑页移除 coder_* 三个字段 (后端已删除)
- wprList 喷码下发改为从 localStorage 读取配置, 显式带 body 下发
- 全部界面文案统一为"喷码", API 字段名 coder_* 不变

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/api/model/cm.js               |  2 +-
 src/layout/components/userbar.vue | 39 +++++++++++++++++++++++++++++++
 src/utils/tool.js                 |  5 ++++
 src/views/sys/labeltemplate.vue   | 21 -----------------
 src/views/wpm_bx/wprList.vue      | 19 +++++++++------
 5 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/src/api/model/cm.js b/src/api/model/cm.js
index 55e3d55c..cf9940e3 100644
--- a/src/api/model/cm.js
+++ b/src/api/model/cm.js
@@ -95,7 +95,7 @@ export default {
 			}
 		},
 		sendToCoder:{
-			name: "下发到打码器",
+			name: "下发到喷码",
 			req: async function(id, data){
 				return await http.post(
 					`${config.API_URL}/cm/labeltemplate/${id}/send_to_coder/`,
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 36040479..20d61451 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -5,6 +5,11 @@
 				<el-icon-printer :size="26"/>
 			</el-icon>
 		</div>
+		<div class="screen panel-item" @click="coderSetting" title="喷码设置">
+			<el-icon>
+				<el-icon-postcard :size="26"/>
+			</el-icon>
+		</div>
 		<scan-dialog ref="scanDialog" :type="'info'" @closed="scanClose"> </scan-dialog>
 		<div class="screen panel-item hidden-sm-and-down" @click="screen">
 			<el-icon>
@@ -104,6 +109,22 @@
 			<el-button type="primary" @click="savePrinter">保存</el-button>
 		</el-footer>
 	</el-dialog>
+	<el-dialog title="喷码设置" v-model="setCoderVisible" width="600px">
+		<el-form label-width="120px">
+			<el-form-item label="喷码IP">
+				<el-input v-model="coder_ip" placeholder="留空则使用模板配置"></el-input>
+			</el-form-item>
+			<el-form-item label="喷码端口">
+				<el-input v-model="coder_port" placeholder="留空则使用模板配置, 默认3100"></el-input>
+			</el-form-item>
+			<el-form-item label="喷码用户区">
+				<el-input v-model="coder_field" placeholder="留空则使用模板配置, 默认1"></el-input>
+			</el-form-item>
+		</el-form>
+		<el-footer>
+			<el-button type="primary" @click="saveCoder">保存</el-button>
+		</el-footer>
+	</el-dialog>
 	<el-dialog
 		v-model="searchVisible"
 		:width="700"
@@ -131,6 +152,7 @@ export default {
 			userNameF: "",
 			visible:false,
 			setNameVisible:false,
+			setCoderVisible:false,
 			searchVisible: false,
 			msg: false,
 			msgList: {},
@@ -144,6 +166,9 @@ export default {
 			scanType:'',
 			printer_name:'',
 			printer_ip:'',
+			coder_ip:'',
+			coder_port:'',
+			coder_field:'',
 			scanVisible:false,
 		};
 	},
@@ -164,6 +189,9 @@ export default {
 		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";
+		this.coder_ip = localStorage.getItem("coder_ip") || "";
+		this.coder_port = localStorage.getItem("coder_port") || "";
+		this.coder_field = localStorage.getItem("coder_field") || "";
 	},
 	methods: {
 		openBook() {
@@ -263,6 +291,17 @@ export default {
 			});
 			this.setNameVisible=false;
 		},
+		coderSetting(){
+			this.setCoderVisible=true;
+		},
+		saveCoder(){
+			this.$TOOL.setCoder({
+				"coder_ip":this.coder_ip,
+				"coder_port":this.coder_port,
+				"coder_field":this.coder_field
+			});
+			this.setCoderVisible=false;
+		},
 		//显示短消息
 		showMsg() {
 			this.msg = true;
diff --git a/src/utils/tool.js b/src/utils/tool.js
index 35d080dc..89c37df9 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -147,6 +147,11 @@ tool.setPrint = function (val) {
 		localStorage.setItem('printer_name', val)
 	}
 }
+tool.setCoder = function (val) {
+	localStorage.setItem('coder_ip', val.coder_ip || '')
+	localStorage.setItem('coder_port', val.coder_port || '')
+	localStorage.setItem('coder_field', val.coder_field || '')
+}
 /* 复制对象 */
 tool.objCopy = function (obj) {
 	return JSON.parse(JSON.stringify(obj));
diff --git a/src/views/sys/labeltemplate.vue b/src/views/sys/labeltemplate.vue
index c9aa249b..d8b6e113 100644
--- a/src/views/sys/labeltemplate.vue
+++ b/src/views/sys/labeltemplate.vue
@@ -13,11 +13,6 @@
 			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="模板名称" prop="name" min-width="100"></el-table-column>
-				<el-table-column label="打码器" min-width="170">
-					<template #default="scope">
-						<span v-if="scope.row.coder_ip">{{ scope.row.coder_ip }}:{{ scope.row.coder_port }}</span>
-					</template>
-				</el-table-column>
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
@@ -47,15 +42,6 @@
 						:key="item.id"></el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="打码器IP">
-				<el-input v-model="addForm.coder_ip" clearable placeholder="不填则该模板不向打码器下发"></el-input>
-			</el-form-item>
-			<el-form-item label="打码器端口">
-				<el-input-number v-model="addForm.coder_port" :min="1" :max="65535" :controls="false"></el-input-number>
-			</el-form-item>
-			<el-form-item label="打码器用户区">
-				<el-input v-model="addForm.coder_field" clearable placeholder="喷码机里用户区名(默认 1)，切码型时填不同用户区名"></el-input>
-			</el-form-item>
 			<el-form-item label="模板代码" prop="commands">
 				<el-input v-model="addForm.commands" clearable :rows="9" type="textarea"></el-input>
 			</el-form-item>
@@ -71,9 +57,6 @@
 		id:"",
 		name: "",
 		commands: "",
-		coder_ip: "",
-		coder_port: 3100,
-		coder_field: "1",
 	};
 	export default {
 		name: 'labeltemplate',
@@ -132,7 +115,6 @@
 						let arr = [];
 						arr = that.addForm.commands.split("\n");
 						that.addForm.commands = arr;
-						if (!that.addForm.coder_ip) that.addForm.coder_ip = null;
 						if(this.type==='add'){
 							this.$API.cm.labeltemplate.create.req(that.addForm).then(res=>{
 								this.isSaveing = false;
@@ -156,9 +138,6 @@
 				this.addForm.id=row.id;
 				this.addForm.name=row.name;
 				this.addForm.commands=row.commands.join("\n");
-				this.addForm.coder_ip=row.coder_ip;
-				this.addForm.coder_port=row.coder_port;
-				this.addForm.coder_field=row.coder_field || "1";
 				this.limitedVisible = true;
 			},
 
diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue
index de0e49a8..237b7e90 100644
--- a/src/views/wpm_bx/wprList.vue
+++ b/src/views/wpm_bx/wprList.vue
@@ -343,10 +343,17 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 				that.$message.warning("请先设置打印机");
 			}
 		},
-		//喷码: 通过名为'喷码模板'的标签模板向打码器下发产品编号
+		//喷码: 通过名为'喷码模板'的标签模板向喷码机下发产品编号
 		sendToCoder(row){
 			let that = this;
 			if (that.coderLoadingIds[row.id]) return;
+			let coder_ip = localStorage.getItem('coder_ip') || '';
+			let coder_port = localStorage.getItem('coder_port') || '';
+			let coder_field = localStorage.getItem('coder_field') || '';
+			if (!coder_ip) {
+				that.$message.error('请先在右上角"喷码设置"配置喷码IP');
+				return;
+			}
 			that.coderLoadingIds = { ...that.coderLoadingIds, [row.id]: true };
 			let templateName = '喷码模板';
 			let tdata = {
@@ -368,12 +375,10 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 					release();
 					return;
 				}
-				if (!template.coder_ip) {
-					that.$message.error(`模板 ${templateName} 未配置打码器IP`);
-					release();
-					return;
-				}
-				that.$API.cm.labeltemplate.sendToCoder.req(template.id, {tdata}).then(() => {
+				let body = {tdata, coder_ip};
+				if (coder_port) body.coder_port = Number(coder_port);
+				if (coder_field) body.coder_field = coder_field;
+				that.$API.cm.labeltemplate.sendToCoder.req(template.id, body).then(() => {
 					that.$message.success("喷码下发成功");
 				}).finally(release);
 			}).catch(release);

From 8881997c89b84218fd48de184ba131e632b51945 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 18 May 2026 15:33:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=E7=A6=85=E9=81=93412?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/bxerp/intoDefect_bdgy.vue      | 49 +++++++++++++++++--
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/views/statistics/bxerp/intoDefect_bdgy.vue b/src/views/statistics/bxerp/intoDefect_bdgy.vue
index 858655d0..4e67f584 100644
--- a/src/views/statistics/bxerp/intoDefect_bdgy.vue
+++ b/src/views/statistics/bxerp/intoDefect_bdgy.vue
@@ -44,18 +44,25 @@
 				:data="tableData"
 				id="exportDiv"
 				row-key="id"
+				:summary-method="getSummaries" 
+				show-summary
 				hidePagination
 				hideDo
 				stripe
 			>
-				<el-table-column type="index" width="50"  fixed="left"/>
-				<el-table-column label="工段名" prop="工段名">
+				<el-table-column type="index" width="50" fixed="left"/>
+				<el-table-column label="工段名" prop="工段名" fixed="left">
 				</el-table-column>
-				<el-table-column label="生产数" prop="生产数">
+				<el-table-column label="生产数" prop="生产数" fixed="left">
 				</el-table-column>
-				<el-table-column label="合格数" prop="合格数">
+				<el-table-column label="合格数" prop="合格数" fixed="left">
 				</el-table-column>
-				<el-table-column label="完全合格数" prop="完全合格数">
+				<el-table-column label="完全合格数" prop="完全合格数" fixed="left">
+				</el-table-column>
+				<el-table-column label="合格率" prop="合格率" fixed="left">
+					<template #default="scope">
+						{{ ((scope.row.合格数/scope.row.生产数)*100).toFixed(2) + '%' }}
+					</template>
 				</el-table-column>
 				<el-table-column v-for="item in lists" :key="item" :label="item" :prop="item">
 					<template #default="scope">
@@ -118,6 +125,38 @@ export default {
 		handleQuery(){
 			this.getData();
 		},
+		getSummaries({ columns, data }) {
+			const sums = [];
+			let total = columns.length;
+			columns.forEach((column, index) => {
+				if (index === 0) {
+					sums[index] = "合计";
+					return;
+				}
+				if (index <total && (index!==0||index!==1||index!==5)) {
+					const values = data.map((item) =>
+						Number(item[column.property])
+					);
+					if (!values.every((value) => Number.isNaN(value))) {
+						sums[index] = values.reduce((prev, curr) => {
+							const value = Number(curr); 
+							let sum = Number(
+								Number(prev) + Number(curr)
+							).toFixed(1); 
+							if (!isNaN(value)) {
+								return sum;
+							} else {
+								return prev;
+							}
+						}, 0);
+					} 
+				}
+				if(index==5){
+					sums[index] = ((sums[3]/sums[2])*100).toFixed(2) + '%';
+				}
+			});
+			return sums;
+		},
 	},
 };
 </script>

From acc9d2d321b8337731a16439ae9579968eaa3682 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 18 May 2026 15:57:30 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20wprList=20=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=96=B7=E7=A0=81=E6=94=B9=E4=B8=BA=E5=8D=95=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?,=20=E5=8D=95/=E6=89=B9=E5=85=B1=E7=94=A8=20tdata=5Flist=20?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 抽出 _postCoder + rowToTdata 公共逻辑
- batchSendToCoder 改为一次 POST 携带整批 tdata_list, 后端走 CQI+JDI 队列
- 单条 sendToCoder 也走同一接口, 列表长度=1
- 按钮加批量级 loading

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/views/wpm_bx/wprList.vue | 79 +++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue
index 237b7e90..a43fd34f 100644
--- a/src/views/wpm_bx/wprList.vue
+++ b/src/views/wpm_bx/wprList.vue
@@ -12,6 +12,7 @@
 			<el-button
 				type="warning"
 				:disabled="selectedRows.length === 0"
+				:loading="batchCoderLoading"
 				@click="batchSendToCoder"
 			>批量喷码</el-button>
 			<el-input
@@ -129,6 +130,7 @@ export default {
 			scQr_code:'',
 			wprList:[],
 			selectedRows:[],
+			batchCoderLoading: false,
 			digitNum:3,
 			wprTableHeight:500,
 			printer_name:localStorage.getItem("printer_name"),
@@ -343,53 +345,64 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
 				that.$message.warning("请先设置打印机");
 			}
 		},
-		//喷码: 通过名为'喷码模板'的标签模板向喷码机下发产品编号
+		//把 wpr 行转成模板渲染数据
+		rowToTdata(row){
+			return {
+				number: row.number,
+				name: (row.material_name||'').split('|')[0],
+				ofrom_name: this.ofromName,
+				ofrom_batch: this.ofromBatch,
+			};
+		},
+		//下发喷码: 单行入队 1 条
 		sendToCoder(row){
 			let that = this;
 			if (that.coderLoadingIds[row.id]) return;
-			let coder_ip = localStorage.getItem('coder_ip') || '';
-			let coder_port = localStorage.getItem('coder_port') || '';
-			let coder_field = localStorage.getItem('coder_field') || '';
-			if (!coder_ip) {
-				that.$message.error('请先在右上角"喷码设置"配置喷码IP');
-				return;
-			}
-			that.coderLoadingIds = { ...that.coderLoadingIds, [row.id]: true };
-			let templateName = '喷码模板';
-			let tdata = {
-				number: row.number,
-				name: (row.material_name||'').split('|')[0],
-				ofrom_name: that.ofromName,
-				ofrom_batch: that.ofromBatch,
-			};
 			let release = () => {
 				let map = { ...that.coderLoadingIds };
 				delete map[row.id];
 				that.coderLoadingIds = map;
 			};
-			that.$API.cm.labeltemplate.list.req({name: templateName, page: 0}).then((res) => {
-				let list = Array.isArray(res) ? res : (res && res.results) || [];
-				let template = list.find(t => t.name === templateName);
-				if (!template) {
-					that.$message.error(`未找到标签模板: ${templateName}`);
-					release();
-					return;
-				}
-				let body = {tdata, coder_ip};
-				if (coder_port) body.coder_port = Number(coder_port);
-				if (coder_field) body.coder_field = coder_field;
-				that.$API.cm.labeltemplate.sendToCoder.req(template.id, body).then(() => {
-					that.$message.success("喷码下发成功");
-				}).finally(release);
-			}).catch(release);
+			that.coderLoadingIds = { ...that.coderLoadingIds, [row.id]: true };
+			that._postCoder([that.rowToTdata(row)])
+				.then(() => that.$message.success("喷码下发成功"))
+				.finally(release);
 		},
 		handleSelectionChange(rows){
 			this.selectedRows = rows;
 		},
+		//批量喷码: 一次请求入队 N 条
 		batchSendToCoder(){
 			let that = this;
-			that.selectedRows.forEach(row => {
-				that.sendToCoder(row);
+			if (!that.selectedRows.length || that.batchCoderLoading) return;
+			let tdataList = that.selectedRows.map(r => that.rowToTdata(r));
+			that.batchCoderLoading = true;
+			that._postCoder(tdataList)
+				.then(() => that.$message.success(`已入队 ${tdataList.length} 条`))
+				.finally(() => { that.batchCoderLoading = false; });
+		},
+		//公共: 查模板 + 拼 body + 调接口
+		_postCoder(tdataList){
+			let that = this;
+			let coder_ip = localStorage.getItem('coder_ip') || '';
+			let coder_port = localStorage.getItem('coder_port') || '';
+			let coder_field = localStorage.getItem('coder_field') || '';
+			if (!coder_ip) {
+				that.$message.error('请先在右上角"喷码设置"配置喷码IP');
+				return Promise.reject(new Error('no coder_ip'));
+			}
+			let templateName = '喷码模板';
+			return that.$API.cm.labeltemplate.list.req({name: templateName, page: 0}).then((res) => {
+				let list = Array.isArray(res) ? res : (res && res.results) || [];
+				let template = list.find(t => t.name === templateName);
+				if (!template) {
+					that.$message.error(`未找到标签模板: ${templateName}`);
+					return Promise.reject(new Error('no template'));
+				}
+				let body = {tdata_list: tdataList, coder_ip};
+				if (coder_port) body.coder_port = Number(coder_port);
+				if (coder_field) body.coder_field = coder_field;
+				return that.$API.cm.labeltemplate.sendToCoder.req(template.id, body);
 			});
 		},
 		//本地更新数据

From 0cc6d2a3414591f54bfa0261abb8e11efc320dae Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 18 May 2026 16:01:05 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=E5=96=B7=E7=A0=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=96=B7=E7=A0=81=E7=94=A8=E6=88=B7=E5=8C=BA?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/userbar.vue | 8 +++++++-
 src/utils/tool.js                 | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 20d61451..25213f3e 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -120,6 +120,9 @@
 			<el-form-item label="喷码用户区">
 				<el-input v-model="coder_field" placeholder="留空则使用模板配置, 默认1"></el-input>
 			</el-form-item>
+			<el-form-item label="喷码用户区2">
+				<el-input v-model="coder_field2" placeholder="留空则使用模板配置"></el-input>
+			</el-form-item>
 		</el-form>
 		<el-footer>
 			<el-button type="primary" @click="saveCoder">保存</el-button>
@@ -169,6 +172,7 @@ export default {
 			coder_ip:'',
 			coder_port:'',
 			coder_field:'',
+			coder_field2:'',
 			scanVisible:false,
 		};
 	},
@@ -192,6 +196,7 @@ export default {
 		this.coder_ip = localStorage.getItem("coder_ip") || "";
 		this.coder_port = localStorage.getItem("coder_port") || "";
 		this.coder_field = localStorage.getItem("coder_field") || "";
+		this.coder_field2 = localStorage.getItem("coder_field2") || "";
 	},
 	methods: {
 		openBook() {
@@ -298,7 +303,8 @@ export default {
 			this.$TOOL.setCoder({
 				"coder_ip":this.coder_ip,
 				"coder_port":this.coder_port,
-				"coder_field":this.coder_field
+				"coder_field":this.coder_field,
+				"coder_field2":this.coder_field2
 			});
 			this.setCoderVisible=false;
 		},
diff --git a/src/utils/tool.js b/src/utils/tool.js
index 89c37df9..da8767be 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -151,6 +151,7 @@ tool.setCoder = function (val) {
 	localStorage.setItem('coder_ip', val.coder_ip || '')
 	localStorage.setItem('coder_port', val.coder_port || '')
 	localStorage.setItem('coder_field', val.coder_field || '')
+	localStorage.setItem('coder_field2', val.coder_field2 || '')
 }
 /* 复制对象 */
 tool.objCopy = function (obj) {