20211026前台代码修改

src/views/customerRechargeMoney/customerRechargeMoney.vue

@@ -4,23 +4,8 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-             <el-date-picker
-                v-model="rechargeStartTime"
-                type="datetime"
-                placeholder="选择充值开始时间">
-              </el-date-picker>
-              
-              <el-date-picker
-                class="input-demo"
-                v-model="rechargeEndTime"
-                type="datetime"
-                placeholder="选择充值结束时间">
-              </el-date-picker>
 
-
-              
-               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
-               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+                   <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
             </div>
           </el-col>
@@ -45,14 +30,14 @@
                <span>{{scope.row.beforeMony-scope.row.rechargeMony| rounding}}</span>
             </template>
           </el-table-column> -->
-           <el-table-column
+         <!--    <el-table-column
             prop="beforeMony"
             label="当前余额"
             show-overflow-tooltip>
             <template slot-scope="scope">
                <span>{{scope.row.beforeMony| rounding}}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
            <el-table-column
             prop="rechargeMony"
             label="充值金额"
@@ -120,7 +105,7 @@ import XLSX from "xlsx";
             formData.append('rechargeStartTime',  this.rechargeStartTime);
             formData.append('rechargeEndTime',  this.rechargeEndTime);
 
-            const response = await this.$http.post(`customer/findCustomerRecharge`, formData);
+            const response = await this.$http.post(`customer/findCustomerRechargeMoney`, formData);
             if (response.data.code === 0) {
               this.customerRechargeList = response.data.data.records;
               this.total = response.data.data.total;

src/views/noCar/billway.vue

@@ -8,7 +8,7 @@
               <el-upload
                 class="upload-demo"
                 ref="upload"
-                style="margin-bottom: 10px"
+                style="margin-bottom: 10px;display: inline-block"
                 action="http://invoice.back.jkcredit.com/dishonestuser/upload"
                 :on-preview="handlePreview"
                 :on-remove="handleRemove"
@@ -18,7 +18,6 @@
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
               </el-upload>
             </div>
-            <div class="top">
               <div class="demo-input-suffix">
                <el-input  placeholder="公司名称" class="input-demo" v-model="noCarWayBill.companyName"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="noCarWayBill.billNum"></el-input>
@@ -38,7 +37,6 @@
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;" @click="updateStatus">更新状态</el-button>
                
-              </div>
             </div>
           </el-col>
         </el-row>

src/views/noCar/invoice.vue

@@ -4,7 +4,6 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <div class="top" >
                <span style="margin-top: 10px;margin-bottom: 10px;">导入文件：</span>
               <el-upload
                 class="upload-demo"
@@ -19,7 +18,6 @@
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
               </el-upload>
               
-            </div>
               <div class="demo-input-suffix">
                 <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="formCondition.waybillNum"></el-input>
@@ -275,6 +273,21 @@ import XLSX from "xlsx";
           },
              // 批量上传模板信息
     async batchUpload() {
+      
+         const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('file', this.formUserList.file);

src/views/platform/car/carupload.vue

@@ -338,6 +338,20 @@ export default{
     },
     // 批量上传模板信息
     async batchUpload() {
+         const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+       
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('userId', this.formUserList.userId);

src/views/platform/invoice/invoice.vue

@@ -299,6 +299,20 @@ export default{
     },
     // 批量上传模板信息
     async batchUpload() {
+         const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+       
       this.fullscreenLoading = false;
       this.formUserList.userId = sessionStorage.getItem('userId');
       const formData = new FormData();

src/views/platform/waybill/history.vue

@@ -296,6 +296,20 @@ export default{
     },
     // 批量上传模板信息
     async batchUpload() {
+         const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+       
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('customerName', this.formUserList.customerName);

src/views/platform/waybill/over.vue

@@ -230,6 +230,20 @@ export default{
     },
     // 批量上传模板信息
     async batchUpload() {
+         const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+       
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('customerName', this.formUserList.customerName);

src/views/platform/waybill/waybill.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <span style="margin-top: 10px;">导入文件：</span>
+               <span style="margin-top: 10px;" >导入文件：</span>
               <el-upload
                 class="upload-demo"
                 ref="upload"
@@ -296,6 +296,20 @@ export default{
     },
     // 批量上传模板信息
     async batchUpload() {
+      debugger
+      const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('customerName', this.formUserList.customerName);

src/views/platform/waybillmanagement/waybillList.vue

@@ -14,7 +14,7 @@
                 </el-option>
               </el-select>
               <el-input  placeholder="运单编号" class="theinput" v-model="billNum"></el-input>
-              <el-input  placeholder="车牌号" class="theinput" v-model="plateNumber"></el-input>
+              <el-input  placeholder="车牌号" class="theinput" v-model="plateNum"></el-input>
            <el-select v-model="success" placeholder="是否成功">
                 <el-option
                   v-for="item in optionone"
@@ -34,29 +34,33 @@
           <el-col :span="24">
             <div class="top">
               <el-date-picker
-                v-model="billStartTime"
+                v-model="startBegin"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
                 placeholder="选择运单开始时间">
               </el-date-picker>
 
               <el-date-picker
                 class="input-demo"
-                v-model="billEndTime"
+                v-model="startEnd"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
                 placeholder="选择运单结束时间">
               </el-date-picker>
 
               <el-date-picker
                 class="input-demo"
-                v-model="createStartTime"
+                v-model="endBegin"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
                 placeholder="选择创建开始时间">
               </el-date-picker>
 
               <el-date-picker
                 class="input-demo"
-                v-model="createEndTime"
+                v-model="endEnd"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
                 placeholder="选择创建结束时间">
               </el-date-picker>
 
@@ -186,13 +190,13 @@ export default{
 
       loading: false,
       billNum: '',
-      plateNumber: '',
+      plateNum: '',
       batchNumber: '',
-      billStartTime: '',
-      billEndTime: '',
-      createStartTime: '',
+      startBegin: '',
+      startEnd: '',
+      endBegin: '',
       success:'',
-      createEndTime: '',
+      endEnd: '',
        hightt:'0px',
       // taxPlayerCode: '',
       // status: '',
@@ -234,14 +238,14 @@ export default{
       formData.append('customerName', this.customerName);
       formData.append('companyName', this.companyName);
       formData.append('billNum', this.billNum);
-      formData.append('plateNumber', this.plateNumber);
+      formData.append('plateNum', this.plateNum);
      // formData.append('batchNumber', this.batchNumber);
-     // formData.append('billStartTime', this.billStartTime);
-      //formData.append('billEndTime', this.billEndTime);
-      //formData.append('createStartTime', this.createStartTime);
-      //formData.append('createEndTime', this.createEndTime);
+      formData.append('startBegin', this.startBegin);
+      formData.append('startEnd', this.startEnd);
+      formData.append('endBegin', this.endBegin);
+      formData.append('endEnd', this.endEnd);
         // formData.append('isSuccess', 1);
-      const response = await this.$http.post(`noCar/findBillWay`, formData);
+      const response = await this.$http.post(`noCar/findBillWayCust`, formData);
       if (response.data.code === 0) {
          this.loading = false;
         this.usertabletwo = response.data.data.records;

src/views/selfCar/invoice.vue

@@ -262,6 +262,20 @@ import XLSX from "xlsx";
 
                 // 批量上传模板信息
           async batchUpload() {
+               const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+       
           this.fullscreenLoading = true;
           const formData = new FormData();
           formData.append('file', this.formUserList.file);

src/views/selfCar/selfCarTrade.vue

@@ -4,7 +4,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <div class="top" >
+              
                <span style="margin-top: 10px;margin-bottom: 10px;">导入文件：</span>
 
               <el-upload
@@ -22,14 +22,22 @@
                   <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
               </el-upload>
-              </div>
+            
                <div class="demo-input-suffix">
                <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.cardId"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="formCondition.companyReferencenum"></el-input>
                 <el-input  placeholder="交易id" class="input-demo" v-model="formCondition.tradeId"></el-input>
               </div>
-              <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
+              <div class="demo-input-suffix" style="margin-top: 5px;margin-left:12px;">
+                <el-select v-model="formCondition.status" placeholder="状态">
+                <el-option
+                  v-for="item in optionone"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
                  <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" 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="daterange" 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>
@@ -134,6 +142,16 @@ import XLSX from "xlsx";
             formCondition:{
 
             },
+             optionone: [{
+              value: '1',
+              label: '代开票'
+            }, {
+              value: '2',
+              label: '开票中'
+            }, {
+              value: '3',
+              label: '已开票'
+            }],
             formUserList: {
             "file": ""
             },
@@ -206,6 +224,20 @@ import XLSX from "xlsx";
           },
                       // 批量上传模板信息
       async batchUpload() {
+           const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
+      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
+       let AllUpExt = ".xlsx";
+       if( extName != AllUpExt){
+          this.$message.error('文件格式不正确!');
+          return false;
+    }
+
+      if (!isLt50M) {
+                this.$message.error('上传文件大小不能超过50MB!');
+                return false;
+       }
+       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
+       
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('file', this.formUserList.file);