修改bug

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}");

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<string>(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<string>(retLst);
             }

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
   },
   {

vue/src/router/modules/fisprint.js

@@ -45,7 +45,7 @@ const pgfisPrint = {
                 //roles: ['SettleAccount.Reports'],
                 icon: '客户零件'
             }
-        },				
+        }				
 
     ]
 }

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) => {

vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@@ -282,7 +282,8 @@
           :gutter="0"
         >
           <template slot="header" slot-scope="scope">
-           <div :style="{'color':scope.row.BillStatus==2?'#333':'red'}"> {{ scope.column.label }}</div>
+<!--         <div :style="{'color':scope.row.BillStatus==2?'#333':'red'}"> {{ scope.column.label }}</div> -->
+           {{ scope.column.label }}
           </template>
         </el-table-column>
       </el-table>
@@ -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