diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 3bf7d03a..02d96aad 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -465,20 +465,54 @@ export default { if(type=='wm'){ let params = {}; params.tid = row.id; - if(that.route_code=='paiyicibang'){ - params.label_template_name = '排一次棒打印模板'; + if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ + params.label_template_name = '工序带板段号打印模板'; + that.wprParams.wm = row.id; + let numbers = ['','','','','','','']; + this.$API.wpm.wpr.list.req(that.wprParams).then((res) => { + let leng = res.length; + if(leng>0){ + let nums = leng/4; + for(let i=0;i { + 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.extra_data={count:row.count}; - params.label_template_name = '其他工序打印模板'; + if(that.route_code=='paiyicibang'){ + params.label_template_name = '排一次棒打印模板'; + }else{ + params.extra_data={count:row.count}; + params.label_template_name = '其他工序打印模板'; + } + that.apiObjPrint.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("打印成功"); + }); + }) } - that.apiObjPrint.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(type=='wpr'){ let params = {}; let name = row.material_name.split('|')[0]; diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index a6997cfd..1d657f86 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -466,20 +466,53 @@ export default { if(type=='wm'){ let params = {}; params.tid = row.id; - if(that.route_code=='paiyicibang'){ - params.label_template_name = '排一次棒打印模板'; + if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'){ + params.label_template_name = '工序带板段号打印模板'; + that.wprParams.wm = row.id; + let numbers = ['','','','','','','']; + this.$API.wpm.wpr.list.req(that.wprParams).then((res) => { + let leng = res.length; + if(leng>0){ + let nums = leng/4; + for(let i=0;i { + 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.extra_data={count:row.count}; - params.label_template_name = '其他工序打印模板'; + if(that.route_code=='paiyicibang'){ + params.label_template_name = '排一次棒打印模板'; + }else{ + params.extra_data={count:row.count}; + params.label_template_name = '其他工序打印模板'; + } + that.apiObjPrint.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("打印成功"); + }); + }) } - that.apiObjPrint.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(type=='wpr'){ let params = {}; let name = row.material_name.split('|')[0];