前端代码合并提交

build/webpack.base.conf.js

@@ -45,6 +45,7 @@ module.exports = {
     alias: {
       'vue$': 'vue/dist/vue.esm.js',
       '@': resolve('src'),
+      'vendor': path.resolve(__dirname, 'src/vendor') // 添加一个别名
     }
   },
   plugins: [

package-lock.json

@@ -9599,6 +9599,12 @@
         }
       }
     },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
+      "dev": true
+    },
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -10059,6 +10065,15 @@
         "ajv": "^5.0.0"
       }
     },
+    "script-loader": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz",
+      "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==",
+      "dev": true,
+      "requires": {
+        "raw-loader": "~0.5.1"
+      }
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",

package.json

@@ -58,6 +58,7 @@
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
     "rimraf": "^2.6.0",
+    "script-loader": "^0.7.2",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",

src/config/globle.js

@@ -1,3 +1,3 @@
-window.hostUrl = "http://192.168.50.4:18080/";
-//window.hostUrl = "http://127.0.0.1:18080/"
+//window.hostUrl = "http://47.94.149.131:80/";
+window.hostUrl = "http://127.0.0.1:18080/"
 window.tableHeight =  (document.body.clientHeight*0.6-20);

src/views/noCar/billway.vue

@@ -404,51 +404,93 @@ import XLSX from "xlsx";
             }
           },
          async  exportExcel() {
-         const loading = this.$loading({
+            const loading = this.$loading({
                                lock: true,
                                text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
                                spinner: 'el-icon-loading',
                                background: 'rgba(0, 0, 0, 0.7)'
                              });
-              let curr = this.current;
-              let pagesize1 = this.pagesize;
+            
+            const formData = new FormData();
+            formData.append('current', 1);
+            formData.append('size', this.total);
+            for(var i in this.noCarWayBill){
+                formData.append(i,this.noCarWayBill[i]);
+            }
 
-              this.current = 1;
-              this.pagesize = this.total;
-             await this.loadData();
-            // 设置当前日期
-            let time = new Date();
-            //console.log(time);
-            let year = time.getFullYear();
-            let month = time.getMonth() + 1;
-            let day = time.getDate();
-            let name = "无车运单查询列表_"+year + "" + month + "" + day;
-            // console.log(name)
-            /* generate workbook object from table */
-            //  .table要导出的是哪一个表格
-            var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
-            this.formartNum(wb);
-            /* get binary string as output */
-            var wbout = XLSX.write(wb, {
-              bookType: "xlsx",
-              bookSST: true,
-              type: "array"
-            });
-            try {
-              //  name+'.xlsx'表示导出的excel表格名字
-              FileSaver.saveAs(
-                new Blob([wbout], { type: "application/octet-stream" }),
-                name + ".xlsx"
-              );
-            } catch (e) {
-              if (typeof console !== "undefined") console.log(e, wbout);
+            const response = await this.$http.post(`noCar/findBillWay`, formData);
+            if (response.data.code === 0) {
+               // 设置当前日期
+                    let time = new Date();
+                    //console.log(time);
+                    let year = time.getFullYear();
+                    let month = time.getMonth() + 1;
+                    let day = time.getDate();
+                    let name = "无车运单查询列表_"+year + "" + month + "" + day;
+                    let cloums = [
+                          {"title":"企业编号","key":"companyNum"},
+                          {"title":"公司名称","key":"companyName"},
+                          {"title":"运单号","key":"billNum"},
+                          {"title":"税号","key":"taxplayerCode"},
+                          {"title":"车牌号码","key":"plateNum"},
+                          {"title":"运单开始时间","key":"startTime"},
+                          {"title":"运单结束时间","key":"predictEndTime"},
+                          {"title":"运单开始地址","key":"sourceAddr"},
+                          {"title":"运单结束地址","key":"destAddr"},
+                          {"title":"运单费用(分)","key":"fee"},
+                          {"title":"运单状态","key":"billwayStatus"},
+                          {"title":"失败原因","key":"failReason"},
+                          {"title":"运单类型","key":"hisFlag"},
+                    ];
+                    debugger;
+                    await this.exportExcelComm(cloums,response.data.data.records,name)
+              
+                loading.close();
             }
-            this.current = curr;
-            this.pagesize = pagesize1;
-            this.loadData();
-            loading.close();
-            return wbout;
           },
+          formatJson (filterVal, jsonData) {
+            return jsonData.map(v => filterVal.map(j => {
+              if(j == 'billwayStatus'){
+                 if(v[j] == 1){
+                   return "未结束";
+                 } else if(v[j] == -2){
+                   return "上传失败";
+                 }else if(v[j] == -3){
+                   return "指令结束上传失败";
+                 }else if(v[j] == 2){
+                   return "开票中";
+                 }else if(v[j] == 3){
+                   return "开票完成";
+                 }else {
+                   return "超时运单";
+                 }
+              }else if(j=='hisFlag'){
+                if(v[j] == 0){
+                  return "历史运单";
+                }else{
+                  return "实时运单";
+                }
+              }else{
+                  return v[j];
+              }
+              
+              }));
+          },
+          // 导出Excel
+          exportExcelComm(columns,list,excelName){
+                  require.ensure([], () => {
+                      const { export_json_to_excel } = require('@/vendor/Export2Excel');
+                      let tHeader = []
+                      let filterVal = []
+                      columns.forEach(item =>{
+                          tHeader.push(item.title)
+                          filterVal.push(item.key)
+                      })
+                      const data = this.formatJson(filterVal, list);
+                      debugger;
+                      export_json_to_excel(tHeader, data, excelName);
+                  })
+            }
         }
       };
 </script>

src/views/noCar/invoice.vue

@@ -419,52 +419,146 @@ import XLSX from "xlsx";
               }
             }
           },
-       async    exportExcel() {
-       const loading = this.$loading({
-                             lock: true,
-                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
-                             spinner: 'el-icon-loading',
-                             background: 'rgba(0, 0, 0, 0.7)'
-                           });
-         let curr = this.current;
-      let pagesize1 = this.pagesize;
-      this.current = 1;
-      this.pagesize = this.total;
-      await this.loadData();
-      // 设置当前日期
-      let time = new Date();
-      //console.log(time);
-      let year = time.getFullYear();
-      let month = time.getMonth() + 1;
-      let day = time.getDate();
-      let name = "无车发票查询列表_"+year + "" + month + "" + day;
-      // console.log(name)
-      /* generate workbook object from table */
-      //  .table要导出的是哪一个表格
-      var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
-      this.formartNum(wb);
-      console.log(wb);
-      /* get binary string as output */
-      var wbout = XLSX.write(wb, {
-        bookType: "xlsx",
-        bookSST: true,
-        type: "array"
-      });
-      try {
-        //  name+'.xlsx'表示导出的excel表格名字
-        FileSaver.saveAs(
-          new Blob([wbout], { type: "application/octet-stream" }),
-          name + ".xlsx"
-        );
-      } catch (e) {
-        if (typeof console !== "undefined") console.log(e, wbout);
-      }
-       this.current = curr;
-      this.pagesize = pagesize1;
-      this.loadData();
-      loading.close();
-      return wbout;
-    },
+    //    async    exportExcel() {
+    //    const loading = this.$loading({
+    //                          lock: true,
+    //                          text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+    //                          spinner: 'el-icon-loading',
+    //                          background: 'rgba(0, 0, 0, 0.7)'
+    //                        });
+    //      let curr = this.current;
+    //   let pagesize1 = this.pagesize;
+    //   this.current = 1;
+    //   this.pagesize = this.total;
+    //   await this.loadData();
+    //   // 设置当前日期
+    //   let time = new Date();
+    //   //console.log(time);
+    //   let year = time.getFullYear();
+    //   let month = time.getMonth() + 1;
+    //   let day = time.getDate();
+    //   let name = "无车发票查询列表_"+year + "" + month + "" + day;
+    //   // console.log(name)
+    //   /* generate workbook object from table */
+    //   //  .table要导出的是哪一个表格
+    //   var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
+    //   this.formartNum(wb);
+    //   console.log(wb);
+    //   /* get binary string as output */
+    //   var wbout = XLSX.write(wb, {
+    //     bookType: "xlsx",
+    //     bookSST: true,
+    //     type: "array"
+    //   });
+    //   try {
+    //     //  name+'.xlsx'表示导出的excel表格名字
+    //     FileSaver.saveAs(
+    //       new Blob([wbout], { type: "application/octet-stream" }),
+    //       name + ".xlsx"
+    //     );
+    //   } catch (e) {
+    //     if (typeof console !== "undefined") console.log(e, wbout);
+    //   }
+    //    this.current = curr;
+    //   this.pagesize = pagesize1;
+    //   this.loadData();
+    //   loading.close();
+    //   return wbout;
+    // },
+    async  exportExcel() {
+            const loading = this.$loading({
+                               lock: true,
+                               text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                               spinner: 'el-icon-loading',
+                               background: 'rgba(0, 0, 0, 0.7)'
+                             });
+            
+             const formData = new FormData();
+            formData.append('current', 1);
+            formData.append('size', this.total);
+             for(var i in this.formCondition){
+                formData.append(i,this.formCondition[i]);
+            }
+            const response = await this.$http.post('noCar/findNocarInvoices', formData);
+            if (response.data.code === 0) {
+               // 设置当前日期
+                    let time = new Date();
+                    //console.log(time);
+                    let year = time.getFullYear();
+                    let month = time.getMonth() + 1;
+                    let day = time.getDate();
+                    let name = "无车发票查询列表_"+year + "" + month + "" + day;
+                    let cloums = [
+                      {"title":"企业编号","key":"companyNum"},
+                      {"title":"公司名称","key":"companyName"},
+                      {"title":"运单号","key":"waybillNum"},
+                      {"title":"购方税号","key":"buyerTaxpayerCode"},
+                      {"title":"车牌号码","key":"plateNum"},
+                      {"title":"运单开始时间","key":"waybillStartTime"},
+                      {"title":"运单结束时间","key":"waybillEndTime"},
+                      {"title":"销方税号","key":"sellerTaxpayerCode"},
+                      {"title":"销方名称","key":"sellerName"},
+                      {"title":"入口收费站","key":"enStation"},
+                      {"title":"出口收费站","key":"exStation"},
+                      {"title":"发票代码","key":"invoiceCode"},
+                      {"title":"发票号码","key":"invoiceNum"},
+                      {"title":"交易Id","key":"transactionId"},
+                      {"title":"开票时间","key":"invoiceMakeTime"},      
+                      {"title":"交易时间","key":"exTime"},
+                      {"title":"交易金额(分)","key":"fee"},
+                      {"title":"价税合计(分)","key":"totalAmount"},
+                      {"title":"税额(分)","key":"totalTaxAmount"},
+                      {"title":"金额(分)","key":"amount"},
+                      {"title":"税率","key":"taxRate"},
+                      {"title":"扣费时间","key":"calculateTime"},
+                      {"title":"运单状态","key":"billStatus"},
+                      {"title":"预览地址","key":"invoiceHtmlUrl"},
+                      {"title":"下载地址","key":"invoiceUrl"}  
+                         
+                    ];
+                    debugger;
+                    await this.exportExcelComm(cloums,response.data.data.records,name)
+              
+                loading.close();
+            }
+          },
+          formatJson (filterVal, jsonData) {
+            return jsonData.map(v => filterVal.map(j => {
+             if(j == 'billStatus'){
+                 if(v[j] == 1){
+                   return "未结束";
+                 } else if(v[j] == -2){
+                   return "上传失败";
+                 }else if(v[j] == -3){
+                   return "指令结束上传失败";
+                 }else if(v[j] == 2){
+                   return "开票中";
+                 }else if(v[j] == 3){
+                   return "开票完成";
+                 }else {
+                   return "超时运单";
+                 }
+              }else{
+                  return v[j];
+              }
+              
+              }));
+          },
+          // 导出Excel
+          exportExcelComm(columns,list,excelName){
+                  require.ensure([], () => {
+                      const { export_json_to_excel } = require('@/vendor/Export2Excel');
+                      let tHeader = []
+                      let filterVal = []
+                      columns.forEach(item =>{
+                          tHeader.push(item.title)
+                          filterVal.push(item.key)
+                      })
+                      const data = this.formatJson(filterVal, list);
+                      debugger;
+                      export_json_to_excel(tHeader, data, excelName);
+                  })
+            }
         }
       };
 </script>