十一前提交，佛山FIS基本测试通过

vue/src/router/index.js

@@ -68,8 +68,8 @@ export const constantRoutes = [
 	//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
 	//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
 	//component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
-	//component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
-	component: () => import('@/views/pg-fis/basedate/select'), //M100查询
+	//component: () => import('@/views/pg-fis/basedate/select'), //M100查询
   },
   {
     path: '/auth-redirect',

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

@@ -384,7 +384,7 @@
                   clearable
                   :disabled="true"
                   size="small"
-                  style="width: 240px"
+                  style="width: 240px;"
                 />
               </el-form-item>
             </el-col>
@@ -1321,6 +1321,7 @@ export default {
     closeDialog() {},
     /**打印 */
     print() {
+		debugger
       (this.hostPrintQuery = {
         printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
@@ -1359,16 +1360,17 @@ export default {
         console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
         this.$axios
           .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            "/api/newjit/bill-m100/get-print-start-hostsn3",
             this.hostSNQuery
           )
           .then((response) => {
             console.log("获取hostsn大众顺序号起始");
             console.log(response.item);
             if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
+              this.form.beginHostSN = parseInt(response.item.beginHostSN);
+			  this.printNum = parseInt(response.item.count);
               if (this.listQuery.productType === 1) {
-                this.form.endHostSN = parseInt(response.item) + 11;
+                this.form.endHostSN = parseInt(response.item.beginHostSN) + parseInt(response.item.count) - 1;
               } else if (this.listQuery.productType === 2) {
                 //柱护板
                 this.form.endHostSN = parseInt(response.item) + 23;
@@ -1397,6 +1399,9 @@ export default {
 		    console.log(response.item);
 		    if (response.item !== null) {
 		      this.printNumZHB = parseInt(response.item);
+			  
+			  //this.form.endHostSN = this.form.beginHostSN + this.printNumZHB - 1;
+			  this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
 		    } else {
 		      this.$message({
 		        message: "获取柱护板打印数量失败，返回空",
@@ -1423,7 +1428,8 @@ export default {
                 this.form.endHostSN = parseInt(response.item) + 11;
               } else if (this.listQuery.productType === 2) {
                 //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
+                //this.form.endHostSN = parseInt(response.item) + 23;
+				this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
               }
             } else {
               this.$message({
@@ -1534,11 +1540,11 @@ export default {
     },
     save() {
       this.$refs.form.validate((valid) => {
-        
+        debugger
         if (valid) {
           //this.listLoaddingPrint = true;
           if (this.isShowHostSN === true) {
-            if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
+            if (this.form.beginHostSN === "") { // || this.form.endHostSN === ""
               this.$message({
                 message: "请输入完整的顺序号起始范围",
                 type: "error",
@@ -1560,19 +1566,19 @@ export default {
                 }
               } else if (this.listQuery.productType === 2) {
                 //柱护板
-                if (
+                // if (
-                  parseInt(this.form.endHostSN) -
+                //   parseInt(this.form.endHostSN) -
-                    parseInt(this.form.beginHostSN) >
+                //     parseInt(this.form.beginHostSN) >
-                  23
+                //   23
-                ) {
+                // ) {
-                  this.$message({
+                //   this.$message({
-                    message:
+                //     message:
-                      "最多只能打印24个顺序号，终止顺序号不能大于" +
+                //       "最多只能打印24个顺序号，终止顺序号不能大于" +
-                      (parseInt(this.form.beginHostSN) + 23),
+                //       (parseInt(this.form.beginHostSN) + 23),
-                    type: "error",
+                //     type: "error",
-                  });
+                //   });
-                  return;
+                //   return;
-                }
+                // }
               }
             }
           }
@@ -1594,7 +1600,7 @@ export default {
             this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
 
             if (this.listQuery.productType === 1) {
-              //柱护板-打印
+              //门板-打印
               this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
               this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
               this.hostCheckQuery.productLine = this.listQuery.productLine;