fis目录调整，未知总成新增提示

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 }

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

@@ -304,7 +304,6 @@
                   clearable
                   size="small"
                   style="width: 240px"
-                  @keyup.enter.native="handleQuery"
                 />
                 <label class = "label1" >-</label>
                 <el-input
@@ -313,7 +312,6 @@
                   clearable
                   size="small"
                   style="width: 240px"
-                  @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
             </el-col>
@@ -328,7 +326,6 @@
                   clearable
                   size="small"
                   style="width: 240px"
-                  @keyup.enter.native="handleQuery"
                 />
                 <label class = "label1" >-</label>
                 <el-input
@@ -337,7 +334,6 @@
                     clearable
                     size="small"
                     style="width: 240px"
-                    @keyup.enter.native="handleQuery"
                   />
               </el-form-item>
             </el-col>
@@ -904,8 +900,16 @@ export default {
           if(response.item !== null)
           {
             this.form.beginHostSN = parseInt(response.item);
+            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
           {
             this.$message({
@@ -1003,45 +1007,49 @@ export default {
         if(this.form.beginHostSN === "" || this.form.endHostSN === "")
         {
           this.$message({
-            message: "请输入完整的底盘号起始范围",
+            message: "请输入完整的顺序号起始范围",
             type: "error",
           });
           return;
         }
         else
+        {
+          if(this.listQuery.productType === 1)//门板
           {
             if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11)
             {
               this.$message({
-              message: "终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11),
+                message: "最多只能打印12个顺序号，终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11),
                 type: "error",
               });
               return;
             }
           }
-
-      }
-      if(this.isShowVin === true)
+          else if(this.listQuery.productType === 2)//柱护板
           {
-        if(this.form.beginVin === "" || this.form.endVin === "")
+            if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 23)
             {
               this.$message({
-            message: "请输入完整的底盘号起始范围",
+              message: "最多只能打印24个顺序号，终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+23),
               type: "error",
               });
               return;
             }
-        else
+          }
+          
+        }
+
+      }
+      if(this.isShowVin === true)
       {
-          if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11)
+        if(this.form.beginVin === "" || this.form.endVin === "")
         {
           this.$message({
-              message: "终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11),
+            message: "请输入完整的底盘号起始范围",
             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;
           });
         }
       }

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",