前端问题修改

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://192.168.50.4:18080/";
+window.hostUrl = "http://127.0.0.1:18080/"
 window.tableHeight =  (document.body.clientHeight*0.6-20);

src/views/noCar/billway.vue

@@ -259,7 +259,7 @@ import XLSX from "xlsx";
 
     const fileType = ['xlsx', 'xlc', 'xlm', 'xls', 'xlt', 'xlw', 'csv'].some(item => item === types)
     if (!fileType) {
-      this.$message('格式错误！请重新选择')
+      this.$message(fileType+'格式错误！请重新选择xlsx xls格式')
       return
     }
     this.file2Xce(file).then(tabJson => {
@@ -373,6 +373,19 @@ import XLSX from "xlsx";
         this.$message.error('数据存在错误，请检查文件中数据');
       }
     },
+     formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            for(var i in sheet){
+              if(sheet[i]['v'] == '运单费用'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
          async  exportExcel() {
               let curr = this.current;
               let pagesize1 = this.pagesize;
@@ -391,6 +404,7 @@ import XLSX from "xlsx";
             /* 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",

src/views/noCar/calculateInfo.vue

@@ -157,6 +157,19 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+          formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            for(var i in sheet){
+              if(sheet[i]['v'] == '费用'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async    exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -174,6 +187,7 @@ import XLSX from "xlsx";
       /* 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",

src/views/noCar/calculateInfostatis.vue

@@ -99,7 +99,19 @@ import XLSX from "xlsx";
             }
           },
 
-         
+         formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            for(var i in sheet){
+              if(sheet[i]['v'] == '费用个数'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async    exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -117,6 +129,7 @@ import XLSX from "xlsx";
       /* 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",

src/views/noCar/hcInvoice.vue

@@ -65,9 +65,26 @@
           </el-table-column>
           <el-table-column
             prop="rawInvoiceNum"
+            width="140"
             label="原票发票号码"
             show-overflow-tooltip>
           </el-table-column>
+          <el-table-column
+            prop="invoiceCode"
+            label="红票代码"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="invoiceNum"
+            label="红票号码"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="invoiceUrl"
+            width="140"
+            label="红票下载url"
+            show-overflow-tooltip>
+          </el-table-column>
         </el-table>
       </template> 
     </div>
@@ -85,7 +102,7 @@ import XLSX from "xlsx";
           }
         },
         created() {
-          this.heightt = tableHeight;
+          this.heightt = tableHeight+100;
         },
         filters: {
             rounding (value) {
@@ -116,6 +133,20 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+          formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '金额'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async     exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -133,6 +164,7 @@ import XLSX from "xlsx";
       /* 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",

src/views/noCar/invoice.vue

@@ -85,6 +85,16 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="sellerTaxpayerCode"
+            label="销方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="sellerName"
+            label="销方名称"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             prop="exStation"
             label="出口收费站"
              width="100"
@@ -253,7 +263,7 @@ import XLSX from "xlsx";
     // let file = file.files[0] // 使用传统的input方法需要加上这一步
     const filename = file.name
     if(!filename||typeof filename!='string'){
-      this.$message('格式错误！请重新选择')
+      this.$message('格式错误！请按照模板中格式')
      return
     }
   let a = filename.split('').reverse().join('');
@@ -261,7 +271,7 @@ import XLSX from "xlsx";
 
     const fileType = ['xlsx', 'xlc', 'xlm', 'xls', 'xlt', 'xlw', 'csv'].some(item => item === types)
     if (!fileType) {
-      this.$message('格式错误！请重新选择')
+      this.$message(types+'格式错误！请按照模板中格式')
       return
     }
     this.file2Xce(file).then(tabJson => {
@@ -384,6 +394,20 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+          formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '交易金额'||sheet[i]['v'] == "价税合计"||sheet[i]['v'] == "税额"||sheet[i]['v'] == "金额"||sheet[i]['v'] == "税率"){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async    exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -401,6 +425,8 @@ import XLSX from "xlsx";
       /* 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",

src/views/platform/apply/already.vue

@@ -229,6 +229,19 @@ export default{
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+          formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            for(var i in sheet){
+              if(sheet[i]['v'] == '税额(元)'||sheet[i]['v'] == '价税合计(元)'||sheet[i]['v'] == '交易金额(元)'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async     exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -246,6 +259,7 @@ export default{
       /* 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",

src/views/platform/apply/selfCarTrade.vue

@@ -201,6 +201,20 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+           formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '交易费用'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async     exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -218,6 +232,7 @@ import XLSX from "xlsx";
       /* 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",

src/views/platform/invoice/list.vue

@@ -288,6 +288,7 @@ export default{
             } if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
                                                     this.companyList = [{'companyName':'.'}];
                                                   }
+                                                  
             this.taxPlayerCode = this.companyList[0]['companyName'];
             this.loadData();
     },
@@ -315,6 +316,20 @@ export default{
     checkLook(user) {
       window.location.href= user;
     },
+    formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '税额(元)' || sheet[i]['v'] == '价税合计(元)' || sheet[i]['v'] == '交易金额(元)' || sheet[i]['v'] == '税率'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
      //导出功能
    async exportOut() {
        let curr = this.current;
@@ -334,6 +349,7 @@ export default{
             /* 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",

src/views/platform/waybill/history.vue

@@ -169,7 +169,7 @@
                 <span>{{scope.row.fee / 100}}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="billwayStatus"
             label="运单状态"
             show-overflow-tooltip>
@@ -181,7 +181,7 @@
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
            <el-table-column
             label="是否成功"
             show-overflow-tooltip>
@@ -300,7 +300,7 @@ export default{
       let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
        let AllUpExt = ".xlsx";
        if( extName != AllUpExt){
-          this.$message.error('格式错误！请重新选择');
+          this.$message.error('格式错误！请上传xlsx的文件');
           return false;
     }
 
@@ -328,7 +328,7 @@ export default{
         this.$message.error('数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式');
       }else {
         loading.close();
-        this.$message.error("数据存在错误，请检查文件中数据");
+        this.$message.error("数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式");
       }
     },
     // 查看批次数据
@@ -361,6 +361,20 @@ export default{
           this.totaltwo = response.data.data.total;
         }
     },
+     formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '运单费用(元)'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
     async    exportExcel() {
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
@@ -378,6 +392,7 @@ export default{
       /* generate workbook object from table */
       //  .table要导出的是哪一个表格
       var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      this.formartNum(wb);
       /* get binary string as output */
       var wbout = XLSX.write(wb, {
         bookType: "xlsx",

src/views/platform/waybill/waybill.vue

@@ -171,7 +171,7 @@
                 <span>{{scope.row.fee / 100}}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="billwayStatus"
             label="运单状态"
             show-overflow-tooltip>
@@ -183,7 +183,7 @@
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
            <el-table-column
             label="是否成功"
             show-overflow-tooltip>
@@ -301,7 +301,7 @@ export default{
       let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
        let AllUpExt = ".xlsx";
        if( extName != AllUpExt){
-          this.$message.error('格式错误！请重新选择');
+          this.$message.error('格式错误！请重新选择xlsx格式的文件');
           return false;
     }
 
@@ -326,7 +326,7 @@ export default{
         this.$message.success('上传成功');
       }else if(code === 1 && msg == null && data == null) {
        loading.close();
-        this.$message.error('数据存在错误，请检查文件中数据');
+        this.$message.error('数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式');
       }else {
        loading.close();
         this.$message.error("数据存在错误，请检查文件中数据");

src/views/platform/waybillmanagement/noinvoice.vue

@@ -237,6 +237,20 @@ export default{
             this.companyName = this.companyList[0]['companyName'];
             this.loadDataCar();
     },
+     formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '运单费用(元)'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
     //查看
    async    exportExcel() {
           let curr = this.currenttwo;
@@ -255,6 +269,7 @@ export default{
       /* generate workbook object from table */
       //  .table要导出的是哪一个表格
       var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      this.formartNum(wb);
       /* get binary string as output */
       var wbout = XLSX.write(wb, {
         bookType: "xlsx",

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -272,6 +272,20 @@ export default{
 
       window.location.href= url;
     },
+     formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '运单费用(元)'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
     async    exportExcel() {
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
@@ -289,6 +303,7 @@ export default{
       /* generate workbook object from table */
       //  .table要导出的是哪一个表格
       var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      this.formartNum(wb);
       /* get binary string as output */
       var wbout = XLSX.write(wb, {
         bookType: "xlsx",

src/views/platform/waybillmanagement/waybillList.vue

@@ -272,6 +272,20 @@ export default{
 
       window.location.href= url;
     },
+     formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == '运单费用(元)'){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
 async    exportExcel() {
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
@@ -289,6 +303,7 @@ async    exportExcel() {
       /* 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",

src/views/selfCar/calculateInfo.vue

@@ -137,6 +137,20 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+          formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == "费用"){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
         async    exportExcel() {
           let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -154,6 +168,7 @@ import XLSX from "xlsx";
       /* 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",

src/views/selfCar/invoice.vue

@@ -68,6 +68,28 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="sellerTaxpayerCode"
+            label="销方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="sellerName"
+            label="销方名称"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="enStation"
+            label="入口收费站"
+            width="100"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="exStation"
+            label="出口收费站"
+            width="100"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             prop="invoiceCode"
             label="发票代码"
             show-overflow-tooltip>
@@ -109,6 +131,14 @@
             label="销方税号"
             show-overflow-tooltip>
           </el-table-column> -->
+           <el-table-column
+            prop="fee"
+            label="交易金额"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{scope.row.fee/100| rounding}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="totalAmount"
             label="价税合计"
@@ -126,7 +156,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="fee"
+            prop="amount"
             label="金额"
             show-overflow-tooltip>
             <template slot-scope="scope">
@@ -321,7 +351,7 @@ importExcel (content) {
       let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
        let AllUpExt = ".xlsx";
        if( extName != AllUpExt){
-          this.$message.error('格式错误！请重新选择');
+          this.$message.error(extName+'格式错误！请重新选择xlsx文件');
           return false;
     }
 
@@ -362,6 +392,20 @@ importExcel (content) {
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
+          formartNum(wb){
+            var sheet = wb['Sheets']['Sheet1'];
+            var replaceTemp = [];
+            debugger;
+            for(var i in sheet){
+              if(sheet[i]['v'] == "价税合计"||sheet[i]['v'] == "税额"||sheet[i]['v'] == "金额"||sheet[i]['v'] == "税率"||sheet[i]['v'] == "交易金额"){
+                replaceTemp.push(i.replace(/[0-9]/g,''));
+                continue;
+              }
+              if(replaceTemp.includes(i.replace(/[0-9]/g,''))){
+                sheet[i]['t']='n';
+              }
+            }
+          },
        async     exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
@@ -379,6 +423,7 @@ importExcel (content) {
       /* 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",

src/views/selfCar/selfCarTrade.vue

@@ -198,7 +198,7 @@ import XLSX from "xlsx";
 
     const fileType = ['xlsx', 'xlc', 'xlm', 'xls', 'xlt', 'xlw', 'csv'].some(item => item === types)
     if (!fileType) {
-      this.$message('格式错误！请重新选择')
+      this.$message(fileType+'格式错误！请重新选择xlsx格式')
       return
     }
     this.file2Xce(file).then(tabJson => {