Browse Source

前端代码合并提交

Administrator 3 years ago
parent
commit
b6113be195

+ 2 - 2
src/vendor/Export2Excel.js

@@ -54,7 +54,7 @@ function datenum(v, date1904) {
 }
 
 function sheet_from_array_of_arrays(data, opts) {
-    
+
     var ws = {};
     var ws2 ={};
     var range = { s: { c: 10000000, r: 10000000 }, e: { c: 0, r: 0 } };
@@ -165,4 +165,4 @@ debugger;
     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");
-}
+}

+ 1 - 1
src/views/customer/Customer.vue

@@ -1122,7 +1122,7 @@ import XLSX from "xlsx";
                                       background: 'rgba(0, 0, 0, 0.7)'
                                     });
         let customer = this.formCondition.customerName;
-        window.location.href = hostUrl+"customer/findCustomerRecListExport?customerName="+customer+"&&companyName="+this.formCondition.subCompany+"&&companyBelongName="+this.formCondition.company;
+        window.location.href = hostUrl+"customer/findCustomerRecListExport?customerName="+customer+"&&companyName="+this.formCondition.subCompany+"&&companyBelongName="+this.formCondition.company+"&&token="+sessionStorage.getItem('token');
          loading.close();
       //   let curr = this.current;
       // let pagesize1 = this.pagesize;

+ 17 - 4
src/views/platform/apply/selfCarTrade.vue

@@ -30,7 +30,7 @@
                  <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
                  <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
-                <el-button type="success" style="margin-left: 1%;" @click="loadDataUpper">查询上游</el-button>
+                <el-button type="success" style="margin-left: 1%;" @click="loadDataUpper">最新状态</el-button>
                               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
             </div>
@@ -194,10 +194,23 @@ import XLSX from "xlsx";
                        this.multipleSelection = value;
            },
             async update(){
-            if(this.multipleSelection.length == 0){return};
-             const formData = new FormData();
+               var loading = null;
+            const formData = new FormData();
+            if(this.multipleSelection.length == 0){
+               loading = this.$loading({
+                          lock: true,
+                          text: '全量更新中,速度较慢,请您耐心等待...',
+                          spinner: 'el-icon-loading',
+                          background: 'rgba(0, 0, 0, 0.7)'
+                        });
+              formData.append("companyName",this.formCondition.companyName);
+            };
+            
             formData.append('selfCarTradesStr', JSON.stringify(this.multipleSelection));
-               const response = await this.$http.post(`selfCar/updateTrades`, formData);
+              const response = await this.$http.post(`selfCar/updateTrades`, formData);
+              if(this.multipleSelection.length == 0){
+                    loading.close();
+               };
                this.loadData();
                 this.$message({
                       type: 'success',

+ 82 - 3
src/views/selfCar/selfCarTrade.vue

@@ -16,7 +16,6 @@
                       </el-option>
                 </el-select>
                 <el-button style="margin-left: 10px;" @click="DownloadTemplate">查询模板下载</el-button>
-                  <el-button type="primary"  @click="exportExcel">导出报表</el-button>
                 </el-upload>
 
               </div>
@@ -32,6 +31,7 @@
                  <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                  <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                  <el-button type="success" style="margin-left: 1%;" @click="update">更新</el-button>
+                  <el-button type="primary"  @click="exportExcel">导出报表</el-button>
               </div>
             </div>
           </el-col>
@@ -133,6 +133,7 @@
     </div>
 </template>
 <script type="text/javascript">
+import CsvExportor from "csv-exportor";
 import FileSaver from "file-saver";
 import XLSX from "xlsx";
       export default {
@@ -314,7 +315,7 @@ import XLSX from "xlsx";
             this.current = val;
               this.loadData();
           },
-       async     exportExcel() {
+       async     exportExcel1() {
        const loading = this.$loading({
                              lock: true,
                              text: '系统正在努力接收中,过程大概需要几分钟的时间,请您耐心等待...',
@@ -357,7 +358,85 @@ import XLSX from "xlsx";
       loading.close();
       return wbout;
     },
-        }
+     async     exportExcel() {
+         const loading = this.$loading({
+                               lock: true,
+                               text: '系统正在努力接收中,过程大概需要几分钟的时间,请您耐心等待...',
+                               spinner: 'el-icon-loading',
+                               background: 'rgba(0, 0, 0, 0.7)'
+                             });
+            var recodes = [];  
+            debugger;               
+            for(var j=1;j<=this.total/10000+1;j++){ 
+              
+              const formData = new FormData();
+              formData.append('current', j);
+              formData.append('size', 10000);
+              for(var i in this.formCondition){
+                  formData.append(i,this.formCondition[i]);
+              }
+              const response = await this.$http.post('selfCar/findTrades', formData);
+               if (response.data.code === 0) {
+                recodes = recodes.concat(response.data.data.records);
+                }
+            }
+           
+               // 设置当前日期
+                    let time = new Date();
+                    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":"companyReferencenum"},
+                      {"title":"交易Id","key":"tradeId"},
+                      {"title":"etc卡号","key":"cardId"},
+					      
+                      {"title":"交易费用","key":"fee"},
+                      {"title":"交易时间","key":"exTime"},
+                      {"title":"申请开票时间","key":"aclTime"},
+                      {"title":"状态","key":"status"}  
+                    ];
+                    this.exportExcelComm(cloums,recodes,name,loading)
+
+     },
+ // 导出Excel
+  exportExcelComm(columns,list,excelName,loading){
+                  let tHeader = []
+                      let filterVal = []
+                      columns.forEach(item =>{
+                          tHeader.push(item.title)
+                          filterVal.push(item.key)
+                      })
+                     
+                     const data = this.formatJson(filterVal,list);
+                      data.unshift(tHeader);
+                     CsvExportor.downloadCsv(data, { tHeader }, excelName+".csv");
+                      loading.close();
+            },
+            formatJson (filterVal, jsonData) {
+            return jsonData.map(v => filterVal.map(j => {
+             if(j == 'status'){
+                 if(v[j] == 1){
+                   return "待开票";
+                 } else if(v[j] == 2){
+                   return "开票中";
+                 }else if(v[j] == 3){
+                   return "开票完成";
+                 }
+              }else if(j =='fee'){
+                  return v[j]/100;
+              }else if(j=='companyReferencenum' || j=='cardId' ){
+                 return v[j]+'\t';
+              }else{
+                  return v[j];
+              }
+              
+              }));
+          },
+  }
       };
 </script>
 <style>