From bb6f98ccffc2c1fff2e934bb4fa9cd5885224d16 Mon Sep 17 00:00:00 2001 From: "yu.wu" Date: Thu, 2 Dec 2021 13:59:54 +0800 Subject: [PATCH] =?UTF-8?q?fis=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E7=9F=A5=E6=80=BB=E6=88=90=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/index.js | 10 +-- .../pg-fis/basedate/m100Online/index.vue | 72 +++++++++++++------ .../pg-fis/basedate/unknownAssembly/index.vue | 9 +++ 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 84ce41c9..3af27889 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -168,14 +168,14 @@ export const asyncRoutes = [ /** when your routing map is too long, you can split it into small modules **/ managerRouter,//系统首页 personRouter,//系统管理 - basedataRouter,//基础数据维护 + //basedataRouter,//基础数据维护 //newjitRouter,//FIS数据管理 - vwFisDataRouter,//结算与开票数据导入 - billdataRouter,//销售结算与开票报表 + //vwFisDataRouter,//结算与开票数据导入 + //billdataRouter,//销售结算与开票报表 //businessdataRouter, - wheeldataRouter,//大众看板和备件 + //wheeldataRouter,//大众看板和备件 pgfis,//派格fis - JobTimeDataRouter,//后台作业监控 + //JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 73bc0076..bcc117ed 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -304,7 +304,6 @@ clearable size="small" style="width: 240px" - @keyup.enter.native="handleQuery" /> @@ -328,7 +326,6 @@ clearable size="small" style="width: 240px" - @keyup.enter.native="handleQuery" /> @@ -904,7 +900,15 @@ export default { if(response.item !== null) { this.form.beginHostSN = parseInt(response.item); - this.form.endHostSN = parseInt(response.item) + 11; + if(this.listQuery.productType === 1)//门板 + { + this.form.endHostSN = parseInt(response.item) + 11; + } + else if(this.listQuery.productType === 2)//柱护板 + { + this.form.endHostSN = parseInt(response.item) + 23; + } + } else { @@ -1003,21 +1007,36 @@ export default { if(this.form.beginHostSN === "" || this.form.endHostSN === "") { this.$message({ - message: "请输入完整的底盘号起始范围", + message: "请输入完整的顺序号起始范围", type: "error", }); return; } else { - if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11) + if(this.listQuery.productType === 1)//门板 { - this.$message({ - message: "终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11), + if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11) + { + this.$message({ + message: "最多只能打印12个顺序号，终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11), + type: "error", + }); + return; + } + } + else if(this.listQuery.productType === 2)//柱护板 + { + if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 23) + { + this.$message({ + message: "最多只能打印24个顺序号，终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+23), type: "error", - }); - return; + }); + return; + } } + } } @@ -1031,17 +1050,6 @@ export default { }); return; } - else - { - if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11) - { - this.$message({ - message: "终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11), - type: "error", - }); - return; - } - } } /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */ @@ -1186,6 +1194,11 @@ export default { } }) .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; }); } @@ -1226,6 +1239,11 @@ export default { } }) .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; }); } } @@ -1277,6 +1295,11 @@ export default { }) .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; }); } else if(this.listQuery.productType === 2)//柱护板 @@ -1316,6 +1339,11 @@ export default { } }) .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; }); } } diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue index 36f51605..4ab2080e 100644 --- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue +++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue @@ -910,6 +910,15 @@ export default { /* 添加总成最终提交的数据事件*/ save() { //if(this.data2.length ===0){ + if(this.data2.length !==0) + { + this.$message({ + message: "还有结算价代码尚未匹配", + type: "error", + }); + return; + } + var lastSubmit = { billId:this.listUnknownAssemblyQuery.billId, scanPoint: "M100",