门板和柱护板打印 调整1220

vue/src/router/index.js

@@ -168,13 +168,13 @@ export const asyncRoutes = [
   /** when your routing map is too long, you can split it into small modules **/
   managerRouter,//系统首页
   personRouter,//系统管理
-  //basedataRouter,//基础数据维护
+  basedataRouter,//基础数据维护
-  //vwFisDataRouter,//结算与开票数据导入
+  vwFisDataRouter,//结算与开票数据导入
-  //billdataRouter,//销售结算与开票报表
+  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/detailMB.vue

@@ -378,7 +378,7 @@ export default {
   watch: {
     customerInfosMB: {
       handler(newVal) {
-        console.log("门板-接收的父组件的值："+JSON.stringify(newVal))
+        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
         if (newVal == "" || newVal == "undefined") {
           //TODO
         } else {
@@ -386,9 +386,7 @@ export default {
             this.customerInfo.printType = element.PrintType;
             this.customerInfo.productLine = element.ProductLine;
           });
-          if (
+          if (this.customerInfo.productLine != "") {
-            this.customerInfo.productLine != ""
-          ) {
             this.getList();
           }
         }
@@ -586,12 +584,15 @@ export default {
               });
               return;
             } else {
-              let dataname = JSON.stringify(response.item);
+              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log("门板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
+              console.log(
+                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
               this.$axios
                 .posts(
                   "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(dataname)
+                  qs.stringify(this.fileQuery)
                 )
                 .then((response) => {
                   this.printpdf(response); //打印我文件流

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

@@ -274,7 +274,7 @@ export default {
       totalCount: 0,
       listLoading: true,
       customerInfo: {
-        printType: "",
+        printType: "1",
         productLine: "",
       },
       // 高级搜索
@@ -358,18 +358,16 @@ export default {
   watch: {
     customerInfosZHB: {
       handler(newVal) {
-        console.log("柱护板-接收的父组件的值："+JSON.stringify(newVal))
+        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
         if (newVal == "" || newVal == "undefined") {
           //TODO
         } else {
           newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
+            this.customerInfo.printType = "1";
             this.customerInfo.productLine = element.ProductLine;
           });
-          console.log("柱护板监控传值："+JSON.stringify(this.customerInfo))
+          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (
+          if (this.customerInfo.productLine != "") {
-            this.customerInfo.productLine != ""
-          ) {
             this.getList();
           }
         }
@@ -516,7 +514,7 @@ export default {
         this.listQuery.ProductLine = this.customerInfo.productLine;
       }
 
-      console.log("柱护板-列表查询条件："+JSON.stringify(this.listQuery));
+      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
@@ -549,7 +547,7 @@ export default {
         let beginVin1 = this.multipleSelection[0].beginVin1;
         let endVin1 = this.multipleSelection[0].endVin1;
         var params = {
-          printType: this.customerInfo.printType,
+          printType: "1",
           productLine: this.customerInfo.productLine,
           beginVin: beginVin1,
           endVin: endVin1,
@@ -558,7 +556,7 @@ export default {
         this.$axios
           .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
           .then((response) => {
-            console.log("柱护版-打印返回的状态："+response.status);
+            console.log("柱护版-打印返回的状态：" + response.status);
             const index = this.list.indexOf(row);
             if (response.status === false) {
               this.$message({
@@ -567,12 +565,15 @@ export default {
               });
               return;
             } else {
-              let dataname = JSON.stringify(response.item);
+              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log("柱板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
+              console.log(
+                "柱板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
               this.$axios
                 .posts(
                   "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(dataname)
+                  qs.stringify(this.fileQuery)
                 )
                 .then((response) => {
                   this.printpdf(response); //打印我文件流

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

@@ -1575,7 +1575,6 @@ export default {
       document.body.appendChild(ifr);
       this.doPrint("printPdf" + date);
       window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      alert()
       this.dialogFormVisible = false;
     },
     httpPost(URL, PARAMS) {