From bff9408474956a5b96e463da580183febc8fb7f3 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Aug 2025 16:27:04 +0800 Subject: [PATCH 01/27] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inm.vue | 547 ----------------------------------- src/views/wpm_bx/mlog_bx.vue | 117 -------- src/views/wpm_bx/mock.json | 7 - src/views/wpm_bx/print.vue | 141 --------- 4 files changed, 812 deletions(-) delete mode 100644 src/views/wpm_bx/inm.vue delete mode 100644 src/views/wpm_bx/mlog_bx.vue delete mode 100644 src/views/wpm_bx/mock.json delete mode 100644 src/views/wpm_bx/print.vue diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue deleted file mode 100644 index 5c4948c4..00000000 --- a/src/views/wpm_bx/inm.vue +++ /dev/null @@ -1,547 +0,0 @@ - - - diff --git a/src/views/wpm_bx/mlog_bx.vue b/src/views/wpm_bx/mlog_bx.vue deleted file mode 100644 index 47b38b16..00000000 --- a/src/views/wpm_bx/mlog_bx.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - diff --git a/src/views/wpm_bx/mock.json b/src/views/wpm_bx/mock.json deleted file mode 100644 index fb7911d5..00000000 --- a/src/views/wpm_bx/mock.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "x":2.5, - "y":3.5, - "z":5.0 - } -] \ No newline at end of file diff --git a/src/views/wpm_bx/print.vue b/src/views/wpm_bx/print.vue deleted file mode 100644 index 47b2c584..00000000 --- a/src/views/wpm_bx/print.vue +++ /dev/null @@ -1,141 +0,0 @@ - - - From 1d1952786491181295bee60cfc1620b910b4f6ea Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Aug 2025 16:27:44 +0800 Subject: [PATCH 02/27] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96wprList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/index.vue | 3 +- src/views/wpm_bx/inmIn.vue | 57 +++++-- src/views/wpm_bx/inmOut.vue | 37 ++++- src/views/wpm_bx/wprList.vue | 298 +++++++++++++++++++++++++++++++++++ 4 files changed, 372 insertions(+), 23 deletions(-) create mode 100644 src/views/wpm_bx/wprList.vue diff --git a/src/views/wpm_bx/index.vue b/src/views/wpm_bx/index.vue index c2774679..cd553579 100644 --- a/src/views/wpm_bx/index.vue +++ b/src/views/wpm_bx/index.vue @@ -85,7 +85,6 @@ diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 3426f722..69ae0096 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -204,6 +204,17 @@ @success="handleinmSuccess" > + + - + { + that.$refs.inmWprDialog.open("out"); + }); + // that.ofrom_name = row.material_ofrom_name; + // that.ofrom_batch = row.batch; + // that.wprParams.wm = row.id; + // that.wprVisibleDrawer = true; + // that.getRowWpr(); }, getRowWpr(){ let that = this; diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue new file mode 100644 index 00000000..1da7e8fa --- /dev/null +++ b/src/views/wpm_bx/wprList.vue @@ -0,0 +1,298 @@ + + From 8aa32be6dd772893835015c699886b2ba0841216 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Aug 2025 16:57:32 +0800 Subject: [PATCH 03/27] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96wprList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/wprList.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue index 1da7e8fa..cb4cc4b2 100644 --- a/src/views/wpm_bx/wprList.vue +++ b/src/views/wpm_bx/wprList.vue @@ -24,7 +24,7 @@ > - + @@ -122,17 +122,22 @@ export default { scQr_code:'', wprList:[], digitNum:3, - wprTableHeight: 500, + wprTableHeight:500, apiObjPrint:this.$API.cm.labelmat.fromWm, }; }, mounted() {}, methods: { open(mode) { + let that = this; this.mode = mode; this.params.wm = this.wm; this.visible = true; this.getRowWpr(); + that.$nextTick(() => { + let heights = document.getElementsByClassName("el-drawer__body")[0].clientHeight; + that.wprTableHeight = heights-20; + }) return this; }, getRowWpr(){ @@ -232,11 +237,11 @@ export default { let that = this; that.wprList.forEach((item,index)=>{ if(item.number.indexOf(that.search) > -1){ + that.$refs.wprTable.setCurrentRow(item); let rows = document.querySelectorAll("#wprTable .el-table__row"); - console.log('rows',rows) let row = rows[index]; let rowTop = row.offsetTop; - this.$refs.wprTable.scrollTo({ top: rowTop }); + that.$refs.wprTable.scrollTo({ top: rowTop }); } }) }, From 70af5880011c90711147f846fd3f22b06eb17d48 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Aug 2025 17:14:25 +0800 Subject: [PATCH 04/27] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96wprList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 152 +--------------------- src/views/wpm_bx/inmOut.vue | 235 +---------------------------------- src/views/wpm_bx/wprList.vue | 101 +++++++++------ 3 files changed, 71 insertions(+), 417 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 293f9f55..93a20d89 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -129,7 +129,7 @@ width="120" > diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 69ae0096..bbffd2c1 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -225,76 +225,6 @@ @closed="dialog.handover = false" > - - - - - - - - - - - - - - - -

没有找到该前缀的发货编号，请完善发货流水号位数（填整数）

- - - - - - - { that.$refs.inmWprDialog.open("out"); }); - // that.ofrom_name = row.material_ofrom_name; - // that.ofrom_batch = row.batch; - // that.wprParams.wm = row.id; - // that.wprVisibleDrawer = true; - // that.getRowWpr(); - }, - getRowWpr(){ - let that = this; - that.$API.wpm.wpr.list.req(that.wprParams).then((res) => { - that.wprList = res; - }) }, + //分批mtype:20 rowClick(row){ this.dialog.handover = true; @@ -566,87 +481,7 @@ export default { this.$refs.handoverDialog.open("add",row,20); }); }, - wprNumberChange(){ - let that = this; - that.showBatch = true; - }, - wprNumberClear(){ - let that = this; - let items = []; - for(let i=0;i< that.wprList.length;i++){ - let obj = {}; - obj.id = that.wprList[i].id; - obj.number_out = null; - items.push(obj) - } - let params = {}; - params.items = items; - that.$API.wpm.wpr.assginNumberOut.req(params).then((res) => { - that.getRowWpr(); - }) - }, - getWprNum(){ - let that = this; - let params0 = {}; - params0.prefix = that.prefix; - that.$API.wpm.wpr.numberOutLast.req(params0).then((res) => { - let number_out_last = ''; - if(res.number_out_last==null){//没有该前缀的发货编号 - number_out_last = null; - that.showBatch=false; - that.showDigit = true; - }else{//有该前缀的发货编号 - let items = []; - number_out_last = res.number_out_last; - let str = number_out_last.replace(/[^a-zA-Z]/g, ''); // 提取字母 - let num = number_out_last.replace(/[^0-9]/g, ''); // 提取数字 - let length = num.length;//流水号的长度 - for(let i=0;i< that.wprList.length;i++){ - let numb = Number(num)+i+1; - let numbs = numb+''; - let len = numbs.length; - let zoreStr = ''; - for(let j=0;j { - that.showBatch=false; - that.getRowWpr(); - }) - } - }) - }, - //没有找到前缀的发货编号，从1开始编号时 - digitSure(){ - let that = this; - //根据前缀和流水位数获取编号 - let items = []; - for(let i=0;i< that.wprList.length;i++){ - let numb = i+1,zoreStr = ''; - numb+= ''; - let len = numb.length; - for(let j=0;j { - that.showDigit = false; - that.getRowWpr(); - }) - }, + //本地更新数据 handleSaveSuccess(data, mode) { this.dialog.save = false; @@ -656,8 +491,7 @@ export default { printMaterial(row,type){ let that = this; if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){ - if(type=='wm'){ - let params = {}; + let params = {}; params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; @@ -728,69 +562,6 @@ export default { }); }) } - }else if(type=='wpr'){ - let params = {}; - let name = row.material_name.split('|')[0]; - if(that.route_code=='paiyicibang'){ - that.$API.mtm.route.list.req({material_out:row.material,page:0}).then((res) => { - console.log('排一次棒单件打印res',res); - let data = res[0].params_json; - data.number = row.number; - data.name=name; - data.ofrom_name=that.ofrom_name; - params.data = data; - params.label_template_name = '排一次棒单件打印模板'; - that.$API.cm.labeltemplate.commands.req(params).then((res) => { - let obj = {}; - obj.printer_commands = res.commands; - obj.printer_name = that.printer_name; - that.$API.wpm.prints.req(obj).then((response) => { - that.$message.success("打印成功"); - }); - }); - }) - }else{ - if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'|| - that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo' - ){ - let oinfo = []; - for(let key in row.oinfo){ - oinfo.push(row.oinfo[key]) - } - let data = {sigao:'',duibian:'',moban:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofrom_name,ofrom_batch:that.ofrom_batch}; - if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ - params.label_template_name = '脱膜测量单件标签模板'; - }else{ - params.label_template_name = '排扳单件打印模板'; - } - if(oinfo.length>0){ - oinfo.forEach((item)=>{ - if(item.name=="丝高"){ - data.sigao = item.val; - }else if(item.name=="对边"){ - data.duibian = item.val; - }else if(item.name=="模具号"){ - data.moban = item.val; - }else if(item.name=="实验板段"){ - data.istest = item.val?'是':'否'; - } - }) - } - params.data = data; - }else{ - 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 = that.printer_name; - that.$API.wpm.prints.req(obj).then((response) => { - that.$message.success("打印成功"); - }); - }); - } - } }else{ that.$message.warning("请先设置打印机"); } diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue index cb4cc4b2..736fd819 100644 --- a/src/views/wpm_bx/wprList.vue +++ b/src/views/wpm_bx/wprList.vue @@ -126,7 +126,12 @@ export default { apiObjPrint:this.$API.cm.labelmat.fromWm, }; }, - mounted() {}, + mounted() { + let that = this; + let paths = that.$route.path; + let arr = paths.split("/"); + that.route_code = arr[2]; + }, methods: { open(mode) { let that = this; @@ -251,45 +256,65 @@ export default { if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){ let params = {}; let name = row.material_name.split('|')[0]; - if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'|| - that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo' - ){ - let oinfo = []; - for(let key in row.oinfo){ - oinfo.push(row.oinfo[key]) - } - let data = {sigao:'',duibian:'',moban:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofrom_name,ofrom_batch:that.ofrom_batch}; - if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ - params.label_template_name = '脱膜测量单件标签模板'; - }else{ - params.label_template_name = '排扳单件打印模板'; - } - if(oinfo.length>0){ - oinfo.forEach((item)=>{ - if(item.name=="丝高"){ - data.sigao = item.val; - }else if(item.name=="对边"){ - data.duibian = item.val; - }else if(item.name=="模具号"){ - data.moban = item.val; - }else if(item.name=="实验板段"){ - data.istest = item.val?'是':'否'; - } - }) - } - params.data = data; + if(that.route_code=='paiyicibang'){ + that.$API.mtm.route.list.req({material_out:row.material,page:0}).then((res) => { + console.log('排一次棒单件打印res',res); + let data = res[0].params_json; + data.number = row.number; + data.name=name; + data.ofrom_name=that.ofrom_name; + params.data = data; + params.label_template_name = '排一次棒单件打印模板'; + that.$API.cm.labeltemplate.commands.req(params).then((res) => { + let obj = {}; + obj.printer_commands = res.commands; + obj.printer_name = that.printer_name; + that.$API.wpm.prints.req(obj).then((response) => { + that.$message.success("打印成功"); + }); + }); + }) }else{ - 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 = that.printer_name; - that.$API.wpm.prints.req(obj).then((response) => { - that.$message.success("打印成功"); + if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'|| + that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo' + ){ + let oinfo = []; + for(let key in row.oinfo){ + oinfo.push(row.oinfo[key]) + } + let data = {sigao:'',duibian:'',moban:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofrom_name,ofrom_batch:that.ofrom_batch}; + if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ + params.label_template_name = '脱膜测量单件标签模板'; + }else{ + params.label_template_name = '排扳单件打印模板'; + } + if(oinfo.length>0){ + oinfo.forEach((item)=>{ + if(item.name=="丝高"){ + data.sigao = item.val; + }else if(item.name=="对边"){ + data.duibian = item.val; + }else if(item.name=="模具号"){ + data.moban = item.val; + }else if(item.name=="实验板段"){ + data.istest = item.val?'是':'否'; + } + }) + } + params.data = data; + }else{ + 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 = that.printer_name; + that.$API.wpm.prints.req(obj).then((response) => { + that.$message.success("打印成功"); + }); }); - }); + } }else{ that.$message.warning("请先设置打印机"); } From b5279f43c114355b9f875dd7903332c3c1ce72a3 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 29 Aug 2025 09:09:24 +0800 Subject: [PATCH 05/27] =?UTF-8?q?fix:bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/wprList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue index 736fd819..f711a86c 100644 --- a/src/views/wpm_bx/wprList.vue +++ b/src/views/wpm_bx/wprList.vue @@ -123,6 +123,7 @@ export default { wprList:[], digitNum:3, wprTableHeight:500, + printer_name:localStorage.getItem("printer_name"), apiObjPrint:this.$API.cm.labelmat.fromWm, }; }, From 8cee4405598e89c4091db45ce42fbaa934da6ae2 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 29 Aug 2025 14:55:51 +0800 Subject: [PATCH 06/27] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/handover_form.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index 3738d6c7..9291f587 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -192,7 +192,7 @@ -