浏览代码

前端代码提交

mashengyi 3 年之前
父节点
当前提交
d1e9215bfd

+ 2 - 1
src/vendor/Export2Excel.js

@@ -159,5 +159,6 @@ export function export_json_to_excel(th, jsonData, defaultTitle) {
     
     var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
     var title = defaultTitle || 'excel-list'
-    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx")
+    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx");
+    console.log(2222);
 }

+ 9 - 0
src/views/customer/Customer.vue

@@ -1010,7 +1010,14 @@ import XLSX from "xlsx";
             console.log(this.customerRec);
              this.$refs['recRuleForm'].validate(async (valid) => {
                if(valid){
+                  const loading = this.$loading({
+                               lock: true,
+                               text: '保存备案信息中,请稍后...',
+                               spinner: 'el-icon-loading',
+                               background: 'rgba(0, 0, 0, 0.7)'
+                             });
                     const response = await this.$http.post(`customer/customerRecAdd`, this.customerRec);
+
                   if(response.data.code === 0) {
 
                   const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":this.customer.customerName});
@@ -1018,11 +1025,13 @@ import XLSX from "xlsx";
                     this.customeRecQueryListTable = response.data.data;
                   }
                     this.addCustomerRecShow1 = false;
+                    loading.close();
                     this.$message({
                       type: 'success',
                       message: '保存成功'
                     });
                   }else {
+                    loading.close();
                     this.$message({
                       type: 'error',
                       message: '保存失败:'+response.data.msg

+ 3 - 1
src/views/noCar/billway.vue

@@ -437,7 +437,7 @@ import XLSX from "xlsx";
                           {"title":"运单结束时间","key":"predictEndTime"},
                           {"title":"运单开始地址","key":"sourceAddr"},
                           {"title":"运单结束地址","key":"destAddr"},
-                          {"title":"运单费用()","key":"fee"},
+                          {"title":"运单费用()","key":"fee"},
                           {"title":"运单状态","key":"billwayStatus"},
                           {"title":"失败原因","key":"failReason"},
                           {"title":"运单类型","key":"hisFlag"},
@@ -462,6 +462,8 @@ import XLSX from "xlsx";
                  }else {
                    return "超时运单";
                  }
+              }else if(j =='fee'){
+                  return v[j]/100;
               }else if(j=='hisFlag'){
                 if(v[j] == 0){
                   return "历史运单";

+ 12 - 4
src/views/noCar/invoice.vue

@@ -505,10 +505,10 @@ import XLSX from "xlsx";
                       {"title":"交易Id","key":"transactionId"},
                       {"title":"开票时间","key":"invoiceMakeTime"},      
                       {"title":"交易时间","key":"exTime"},
-                      {"title":"交易金额()","key":"fee"},
-                      {"title":"价税合计()","key":"totalAmount"},
-                      {"title":"税额()","key":"totalTaxAmount"},
-                      {"title":"金额()","key":"amount"},
+                      {"title":"交易金额()","key":"fee"},
+                      {"title":"价税合计()","key":"totalAmount"},
+                      {"title":"税额()","key":"totalTaxAmount"},
+                      {"title":"金额()","key":"amount"},
                       {"title":"税率","key":"taxRate"},
                       {"title":"扣费时间","key":"calculateTime"},
                       {"title":"运单状态","key":"billStatus"},
@@ -536,6 +536,14 @@ import XLSX from "xlsx";
                  }else {
                    return "超时运单";
                  }
+              }else if(j =='fee'){
+                  return v[j]/100;
+              }else if(j =='totalAmount'){
+                  return v[j]/100;
+              }else if(j =='totalTaxAmount'){
+                  return v[j]/100;
+              }else if(j =='amount'){
+                  return v[j]/100;
               }else{
                   return v[j];
               }

+ 18 - 4
src/views/platform/invoice/list.vue

@@ -437,6 +437,12 @@ export default{
             return wbout;
     },
     async  exportOut() {
+       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);
@@ -475,10 +481,10 @@ export default{
                       {"title":"交易Id","key":"transactionId"},
                       {"title":"开票时间","key":"invoiceMakeTime"},      
                       {"title":"交易时间","key":"exTime"},
-                      {"title":"交易金额()","key":"fee"},
-                      {"title":"价税合计()","key":"totalAmount"},
-                      {"title":"税额()","key":"totalTaxAmount"},
-                      {"title":"金额()","key":"amount"},
+                      {"title":"交易金额()","key":"fee"},
+                      {"title":"价税合计()","key":"totalAmount"},
+                      {"title":"税额()","key":"totalTaxAmount"},
+                      {"title":"金额()","key":"amount"},
                       {"title":"税率","key":"taxRate"},
                       {"title":"扣费时间","key":"calculateTime"},
                       {"title":"运单状态","key":"billStatus"},
@@ -506,6 +512,14 @@ export default{
                  }else {
                    return "超时运单";
                  }
+              }else if(j =='fee'){
+                  return v[j]/100;
+              }else if(j =='totalAmount'){
+                 return v[j]/100;
+              }else if(j =='totalTaxAmount'){
+                  return v[j]/100;
+              }else if(j =='amount'){
+                 return v[j]/100;
               }else{
                   return v[j];
               }

+ 3 - 1
src/views/platform/waybillmanagement/waybillList.vue

@@ -328,7 +328,7 @@ async  exportExcel() {
                           {"title":"运单结束时间","key":"predictEndTime"},
                           {"title":"运单开始地址","key":"sourceAddr"},
                           {"title":"运单结束地址","key":"destAddr"},
-                          {"title":"运单费用()","key":"fee"},
+                          {"title":"运单费用()","key":"fee"},
                           {"title":"运单状态","key":"billwayStatus"},
                           {"title":"失败原因","key":"failReason"},
                           {"title":"运单类型","key":"hisFlag"},
@@ -360,6 +360,8 @@ async  exportExcel() {
                 }else{
                   return "实时运单";
                 }
+              }else if(j =='fee'){
+                  return v[j]/100;
               }else{
                   return v[j];
               }