From 666cc9725756b4eb1d72af3211e97a24fdab2d22 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Tue, 28 Nov 2023 12:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintTable/WaitPrintAppService.cs | 4 ++-- .../PrintTable/WaitPrintAppService_ZHB.cs | 6 +++--- vue/src/router/index.js | 4 ++-- vue/src/router/modules/fisprint.js | 2 +- vue/src/views/pg-fis/basedate/alreadyPrint/index.vue | 5 +++-- .../views/pg-fis/basedate/m100Online/normalPritIndex.vue | 7 +++++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs index ebd8fe9..d79d20b 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs @@ -854,7 +854,7 @@ namespace WY.NewJit.PrintTable bool isBreakNum = billLst.Any(itm => itm.BillStatus == BillStatusEnum.BreakNum); if (isBreakNum) { - var breakNumLst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.BreakNum).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ",").ToList(); + var breakNumLst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.BreakNum).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ", ").ToList(); string breakNumStr = string.Join(" ", breakNumLst); // string breakNumStr = string.Concat(breakNumLst); @@ -865,7 +865,7 @@ namespace WY.NewJit.PrintTable bool containNotMatch = billLst.Any(itm => itm.BillStatus == BillStatusEnum.NotMatch); if (containNotMatch) { - var lst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.NotMatch).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ",").ToList(); + var lst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.NotMatch).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ", ").ToList(); string str = string.Join(" ", lst); //string str = string.Concat(lst); retLst.Add($"存在未知总成：{str}"); diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs index 211d0b1..c13ab25 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService_ZHB.cs @@ -845,8 +845,8 @@ namespace WY.NewJit.PrintTable bool isBreakNum = billLst.Any(itm => itm.BillStatus == BillStatusEnum.BreakNum); if (isBreakNum) { - var breakNumLst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.BreakNum).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ",").ToList(); - string breakNumStr = string.Concat(breakNumLst); + var breakNumLst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.BreakNum).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ", ").ToList(); + string breakNumStr = string.Join(" ", breakNumLst); retLst.Add($"存在断号：{breakNumStr}"); return new ListResultDto(retLst); } @@ -855,7 +855,7 @@ namespace WY.NewJit.PrintTable if (containNotMatch) { var lst = billLst.Where(itm => itm.BillStatus == BillStatusEnum.NotMatch).OrderBy(itm => itm.HostSN2).Select(itm => itm.HostSN2.ToString() + ", ").ToList(); - string str = string.Concat(lst); + string str = string.Join(" ", lst); retLst.Add($"存在未知总成：{str}"); return new ListResultDto(retLst); } diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 3624ac6..181d5e8 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -64,11 +64,11 @@ export const constantRoutes = [ }, { path: '/login', - //component: () => import('@/views/login/index'), + component: () => import('@/views/login/index'), //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), - component: () => import('@/views/pg-fis/basedate/alreadyPrint/index.vue'), + //component: () => import('@/views/pg-fis/basedate/alreadyPrint/index.vue'), hidden: true }, { diff --git a/vue/src/router/modules/fisprint.js b/vue/src/router/modules/fisprint.js index 00971bc..4962305 100644 --- a/vue/src/router/modules/fisprint.js +++ b/vue/src/router/modules/fisprint.js @@ -45,7 +45,7 @@ const pgfisPrint = { //roles: ['SettleAccount.Reports'], icon: '客户零件' } - }, + } ] } diff --git a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue index 468b6ab..f05fe1c 100644 --- a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue +++ b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue @@ -536,7 +536,7 @@ export default { var offsetHei = document.documentElement.clientHeight; //console.log(offsetHei); let boxH = this.$refs.box.offsetHeight; - this.tableHeight = offsetHeight - boxH - 37 - 79; //57为footer高度，79为页面上部标签高度 + this.tableHeight = offsetHei - boxH - 37 - 79; //57为footer高度，79为页面上部标签高度 //this.tableHeight = offsetHei -260 }) }, @@ -867,7 +867,8 @@ export default { //获取所有产线 getProductLine() { - this.listPLQuery.UserId = this.userInfo.userId; + debugger + this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId; this.$axios .gets("/api/newjit/product-line/list", this.listPLQuery) .then((response) => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 5d0e30b..7f88079 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -282,7 +282,8 @@ :gutter="0" > @@ -679,6 +680,7 @@ export default { }, 5000); }, created() { + this.billState.forEach((element, index) => { if (index === 0) { this.listQuery.state.push(element.id); @@ -1882,7 +1884,8 @@ export default { //获取所有产线 getProductLine() { - this.listPLQuery.UserId = this.userInfo.userId; + debugger + this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId; // console.log( // "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + // this.listPLQuery.UserId