From a9e1229e6294d95eafa62efb0d7e431e599b7a03 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 25 May 2026 14:30:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=96=B7=E7=A0=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20coder=5Fjobname/coder=5Fjobname2=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E5=BC=8F=E4=BC=A0=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- src/layout/components/userbar.vue | 26 +++++++++++++++++++------- src/utils/tool.js | 4 +++- src/views/wpm_bx/wprList.vue | 16 +++++++++------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 32fe88ea..5993f14d 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -57,7 +57,7 @@ 事件中心 - + @@ -110,19 +110,25 @@ - + - + - + + + + + + + 保存 @@ -145,7 +151,7 @@ import search from "./search.vue"; import scanDetail from "./scan_detail.vue"; import scanDialog from "./../../views/template/scan.vue"; -export default { +export default { components: { search,scanDialog,scanDetail }, @@ -173,6 +179,8 @@ export default { coder_port:'', coder_field:'', coder_field2:'', + coder_jobname:'', + coder_jobname2:'', scanVisible:false, }; }, @@ -197,6 +205,8 @@ export default { this.coder_port = localStorage.getItem("coder_port") || ""; this.coder_field = localStorage.getItem("coder_field") || ""; this.coder_field2 = localStorage.getItem("coder_field2") || ""; + this.coder_jobname = localStorage.getItem("coder_jobname") || ""; + this.coder_jobname2 = localStorage.getItem("coder_jobname2") || ""; }, methods: { openBook() { @@ -304,7 +314,9 @@ export default { "coder_ip":this.coder_ip, "coder_port":this.coder_port, "coder_field":this.coder_field, - "coder_field2":this.coder_field2 + "coder_field2":this.coder_field2, + "coder_jobname":this.coder_jobname, + "coder_jobname2":this.coder_jobname2 }); this.setCoderVisible=false; }, @@ -322,7 +334,7 @@ export default { this.searchVisible = true; }, scanClose(data){ - + let that = this; let arr = []; if(data.indexOf(':')>-1){ diff --git a/src/utils/tool.js b/src/utils/tool.js index da8767be..70291773 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -1,4 +1,4 @@ -/* +/* * @Descripttion: 工具集 * @version: 1.2 * @LastEditors: sakuya @@ -152,6 +152,8 @@ tool.setCoder = function (val) { localStorage.setItem('coder_port', val.coder_port || '') localStorage.setItem('coder_field', val.coder_field || '') localStorage.setItem('coder_field2', val.coder_field2 || '') + localStorage.setItem('coder_jobname', val.coder_jobname || '') + localStorage.setItem('coder_jobname2', val.coder_jobname2 || '') } /* 复制对象 */ tool.objCopy = function (obj) { diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue index aa426fe0..90c92119 100644 --- a/src/views/wpm_bx/wprList.vue +++ b/src/views/wpm_bx/wprList.vue @@ -94,8 +94,8 @@ @@ -412,7 +412,7 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => { }; }, //下发喷码: 单行入队 1 条 - sendToCoder(row, coderFieldKey = 'coder_field'){ + sendToCoder(row, coderJobNameKey = 'coder_jobname', coderFieldKey = 'coder_field'){ let that = this; if (that.coderLoadingIds[row.id]) return; let release = () => { @@ -421,7 +421,7 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => { that.coderLoadingIds = map; }; that.coderLoadingIds = { ...that.coderLoadingIds, [row.id]: true }; - that._postCoder([that.rowToTdata(row)],coderFieldKey) + that._postCoder([that.rowToTdata(row)], coderFieldKey, coderJobNameKey) .then(() => that.$message.success("喷码下发成功")) .finally(release); }, @@ -434,7 +434,7 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => { if (!that.selectedRows.length || that.batchCoderLoading) return; let tdataList = that.selectedRows.map(r => that.rowToTdata(r)); that.batchCoderLoading = true; - that._postCoder(tdataList, 'coder_field') + that._postCoder(tdataList, 'coder_field', 'coder_jobname') .then(() => that.$message.success(`已入队 ${tdataList.length} 条`)) .finally(() => { that.batchCoderLoading = false; }); }, @@ -444,12 +444,12 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => { if (!that.selectedRows.length || that.batchCoderLoading2) return; let tdataList = that.selectedRows.map(r => that.rowToTdata(r)); that.batchCoderLoading2 = true; - that._postCoder(tdataList, 'coder_field2') + that._postCoder(tdataList, 'coder_field2', 'coder_jobname2') .then(() => that.$message.success(`已入队 ${tdataList.length} 条`)) .finally(() => { that.batchCoderLoading2 = false; }); }, //公共: 查模板 + 拼 body + 调接口 - _postCoder(tdataList, coderFieldKey = 'coder_field'){ + _postCoder(tdataList, coderFieldKey = 'coder_field', coderJobNameKey = ''){ let that = this; let coder_ip = localStorage.getItem('coder_ip') || ''; let coder_port = localStorage.getItem('coder_port') || ''; @@ -469,6 +469,8 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => { let body = {tdata_list: tdataList, coder_ip}; if (coder_port) body.coder_port = Number(coder_port); if (coder_field) body.coder_field = coder_field; + let coder_jobname = localStorage.getItem(coderJobNameKey) || ''; + if (coder_jobname) body.coder_jobname = coder_jobname; return that.$API.cm.labeltemplate.sendToCoder.req(template.id, body); }); },