自有车前端改造

src/views/platform/apply/already.vue

@@ -5,16 +5,26 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="formList.plateNum"></el-input>
+              <el-select v-model="formList.companyName" placeholder="请选择公司名称">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.companyName">
+                </el-option>
+              </el-select>
+              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="formList.carNum"></el-input>
               <el-date-picker
-                v-model="formList.startInvoiceMakeTime"
+                v-model="formList.startTime"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
                 placeholder="选择开始日期时间"
                 style="margin-left: 1%;">
               </el-date-picker>
               <el-date-picker
-                v-model="formList.endInvoiceMakeTime"
+                v-model="formList.endTime"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
                 placeholder="选择结束日期时间"
                 style="margin-left: 1%;">
               </el-date-picker>
@@ -125,44 +135,39 @@ export default{
       roleId: '',
       // codeNumber: '',
       formList: {
-        "companyNum": "",
-        "userId": "",
-        "plateNum": "",
-        "startInvoiceMakeTime": "",
-        "endInvoiceMakeTime": "",
+        "companyName": "",
+        "customerName": "",
+        "carNum": "",
+        "startTime": "",
+        "endTime": "",
       },
+      companyList:[]
 
     }
   },
   created() {
-    this.formList.companyNum = sessionStorage.getItem('companyNum');
-    this.formList.userId = sessionStorage.getItem('userId');
-    // this.loadData();
+    this.formList.customerName = sessionStorage.getItem('userName');
+    this.initCompanyList();
   },
   methods: {
     // 查询已开发票数据
     async queryLook() {
-      this.formList.companyNum = sessionStorage.getItem('companyNum');
-      this.formList.userId = sessionStorage.getItem('userId');
-      this.fullscreenLoading = true;
-      this.formList.startInvoiceMakeTime = (new Date(this.formList.startInvoiceMakeTime)).getTime();
-      this.formList.endInvoiceMakeTime = (new Date(this.formList.endInvoiceMakeTime)).getTime();
-      const response = await this.$http.post(`/b2bInvoiceQuery/query`, this.formList);
+      debugger;
+      const response = await this.$http.post(`/selfCar/findSelfcarInvoiceByTime`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0) {
         this.usertabletwo = response.data.data;
-        this.fullscreenLoading = false;
-        this.formList.plateNum = '';
-        this.formList.startInvoiceMakeTime = '';
-        this.formList.endInvoiceMakeTime = '';
       }else{
-        this.fullscreenLoading = false;
         this.$message.error(msg);
-        this.formList.plateNum = '';
-        this.formList.startInvoiceMakeTime = '';
-        this.formList.endInvoiceMakeTime = '';
       }
     },
+    async initCompanyList(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
+            if (response.data.code === 0) {
+              this.companyList = response.data.data;
+            }
+            this.formList.companyName = this.companyList[0]['companyName'];
+    },
     // 展示发票全部信息
     checkLook(user) {
       window.location.href= user;

src/views/platform/apply/apply.vue

@@ -4,22 +4,35 @@
       <div class="title">
         <el-row>
           <el-col :span="24">
-            <div class="top">
-              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="plateNum"></el-input>
+            <div class="top" style="margin-left:15px">
+              <el-select v-model="companyName" placeholder="请选择公司名称">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.companyName">
+                </el-option>
+              </el-select>
+              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="carNum"></el-input>
+            
+              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="applyForTicket">全部开票</el-button>
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="top" >
               <el-date-picker
-                v-model="startExTime"
+                v-model="startTime"
                 type="datetime"
                 placeholder="选择开始日期时间"
                 style="margin-left: 1%;">
                </el-date-picker>
               <el-date-picker
-                v-model="endExTime"
+                v-model="endTime"
                 type="datetime"
                 placeholder="选择结束日期时间"
                 style="margin-left: 1%;">
                </el-date-picker>
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
-              <el-button type="success" style="margin-left: 1%;" @click="applyForTicket">全部开票</el-button>
             </div>
           </el-col>
         </el-row>
@@ -68,64 +81,63 @@ export default{
   data() {
     return {
       usertabletwo: [],
-      plateNum: '',
-      startExTime: '',
-      endExTime: '',
-      companyNum: '',
-      userId: '',
-      roleId: '',
+      carNum: '',
+      startTime: '',
+      endTime: '',
+      companyName: '',
+      customerName:'',
       // codeNumber: '',
-      formList: []
+      formList: {},
+      companyList:[]
     }
   },
   created() {
-    this.companyNum = sessionStorage.getItem('companyNum');
-    this.userId = sessionStorage.getItem('userId');
+    this.initCompanyList();
+    this.customerName = sessionStorage.getItem('userName');
   },
   methods: {
     // 查询交易数据
     async queryLook() {
-      this.startExTime = (new Date(this.startExTime)).getTime();
-      this.endExTime = (new Date(this.endExTime)).getTime();
-      var object = new Object();
-      object.companyNum = this.companyNum;
-      object.userId = this.userId;
-      object.plateNum = this.plateNum;
-      object.startExTime = this.startExTime;
-      object.endExTime = this.endExTime;
-      this.formList.push(object);
-      const response = await this.$http.post(`/cardTrade/query`, this.formList);
+      this.startTime = (new Date(this.startTime)).getTime();
+      this.endTime = (new Date(this.endTime)).getTime();
+      this.formList.companyName = this.companyName;
+      this.formList.customerName = this.customerName;
+      this.formList.carNum = this.carNum;
+      this.formList.startTime = this.startTime;
+      this.formList.endTime = this.endTime;
+      const response = await this.$http.post(`/selfCar/getTradeList`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0) {
         this.usertabletwo = response.data.data;
-        this.formList = [];
       }else{
         this.$message.error(msg);
-        this.formList = [];
       }
     },
+     async initCompanyList(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
+            if (response.data.code === 0) {
+              this.companyList = response.data.data;
+            }
+            this.companyName = this.companyList[0]['companyName'];
+    },
     //申请开票
     async applyForTicket() {
-      this.startExTime = (new Date(this.startExTime)).getTime();
-      this.endExTime = (new Date(this.endExTime)).getTime();
-      var object = new Object();
-      object.companyNum = this.companyNum;
-      object.userId = this.userId;
-      object.plateNum = this.plateNum;
-      object.startExTime = this.startExTime;
-      object.endExTime = this.endExTime;
-      this.formList.push(object);
-      const response = await this.$http.post(`/b2bInvoice/apply`, this.formList);
+      this.startTime = (new Date(this.startTime)).getTime();
+      this.endTime = (new Date(this.endTime)).getTime();
+      this.formList.companyName = this.companyName;
+      this.formList.customerName = this.customerName;
+      this.formList.carNum = this.carNum;
+      this.formList.startTime = this.startTime;
+      this.formList.endTime = this.endTime;
+      const response = await this.$http.post(`/selfCar/applTradeList`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.$message({
           type: 'success',
           message: '开票成功'
         });
-        this.formList = [];
       }else{
         this.$message.error(msg);
-        this.formList = [];
       }
     },
 

src/views/platform/apply/packaging.vue

@@ -6,10 +6,19 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
+              <el-select v-model="formPackList.companyName" placeholder="请选择公司名称">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.companyName">
+                </el-option>
+              </el-select>
               <el-date-picker
-                v-model="formPackList.makeMonth"
+                v-model="formPackList.month"
                 type="month"
                 placeholder="选择月"
+                value-format="yyyy-MM-01"
                 style="margin-left: 1%;">
               </el-date-picker>
               <el-button type="success" style="margin-left: 1%;" @click="applyForTicket">发票打包</el-button>
@@ -56,18 +65,6 @@
           </el-table-column>
         </el-table>
       </template>
-
-      <div class="block">
-        <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="current"
-        :page-sizes="[6, 8, 10]"
-        :page-size="pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total">
-        </el-pagination>
-      </div>
   </div>
 </template>
 
@@ -76,58 +73,31 @@ export default{
   data() {
     return {
       loading: false,
-      companyName: '',
       usertable: [],
-      current: 1,
-      pagesize: 8,
-      total: 0,
-      formList: {
-        "userId": "",
-        "roleId": ""
-      },
       formPackList: {
-        "userId": "",
-        "companyNum": "",
-        "makeMonth": "",
-      }
+        "customerName": "",
+        "companyName": "",
+        "month": "",
+      },
+      companyList: []
     }
   },
   created() {
+    this.formPackList.customerName = sessionStorage.getItem('userName');
+    this.initCompanyList();
     this.loadData();
-    this.formPackList.companyNum = sessionStorage.getItem('companyNum');
-    this.formPackList.userId = sessionStorage.getItem('userId');
   },
   methods: {
     //数据加载
     async loadData() {
-      this.formList.userId = sessionStorage.getItem('userId');
-      this.formList.roleId = sessionStorage.getItem('roleId');
-
-      if(this.formList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        const response = await this.$http.post(`b2bInvoicePackage/page`, formData);
-        if (response.data.code === 0) {
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('userId', this.formList.userId);
-        const response = await this.$http.post(`b2bInvoicePackage/page`, formData);
-        if (response.data.code === 0) {
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        };
-      };
+      //  const response = await this.$http.post(`b2bInvoicePackage/page`, formData);
+      //   if (response.data.code === 0) {
+      //     this.usertable = response.data.data.records;
+      //   }
     },
     //发票打包
     async applyForTicket() {
-      this.formPackList.makeMonth = (new Date(this.formPackList.makeMonth)).getTime();
-      const response = await this.$http.post(`/b2bInvoicePackage/package`, this.formPackList);
+      const response = await this.$http.post(`/selfCarService/getSelfCarInvoicePackage`, this.formPackList);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         // console.log(response.data.data);
@@ -140,6 +110,13 @@ export default{
         this.$message.error(msg);
       }
     },
+     async initCompanyList(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
+            if (response.data.code === 0) {
+              this.companyList = response.data.data;
+            }
+            this.formPackList.companyName = this.companyList[0]['companyName'];
+    },
     //下载打包
     Download(url) {
       window.location.href= url;

src/views/platform/carbinding/carbinding.vue

@@ -5,6 +5,14 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
+               <el-select v-model="formList.companyName" placeholder="请输入公司名称">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.companyName">
+                </el-option>
+              </el-select>
               <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="plateNum"></el-input>
               <el-select v-model="plateColor" placeholder="请选择车牌颜色">
                 <el-option
@@ -88,8 +96,8 @@
             <el-input v-model="formCodeList.mobile" auto-complete="off" placeholder="请输入联系电话"></el-input>
           </el-form-item>
 
-          <el-form-item label="验证码" prop="bankNumber">
-            <el-input v-model="codeNumber" auto-complete="off" placeholder="请输入验证码" style="width: 70%;"></el-input>
+          <el-form-item label="验证码" prop="validCode">
+            <el-input v-model="formBindingList.validCode" auto-complete="off" placeholder="请输入验证码" style="width: 70%;"></el-input>
             <el-button type="success" style="margin-left: 1%; width: 28%;" @click="getCode">获取验证码</el-button>
           </el-form-item>
 
@@ -168,51 +176,42 @@ export default{
       multipleSelection: [],
       formCodeList: {
         "mobile": "",
-        "userId": "",
-        "companyNum": "",
-        "cardList": []
+        "customerName": "",
+        "companyName": "",
+        "cards": []
       },
       formBindingList: {
         "mobile": "",
-        "userId": "",
-        "companyNum": "",
+        "customerName": "",
+        "companyName": "",
+        "validCode":""
       },
       formList: {
-        "companyNum": "",
-        "userId": "",
-        "vehicleList": []
-      }
+        "companyName": "",
+        "customerName": "",
+        "cards": []
+      },
+      companyList:[]
     }
   },
   created() {
-    this.formList.companyNum = sessionStorage.getItem('companyNum');
-    this.formList.userId = sessionStorage.getItem('userId');
+    this.initCompanyList();
   },
   methods: {
-    // 查询银行卡数据
     async queryLook() {
-      this.formList.companyNum = sessionStorage.getItem('companyNum');
-      this.formList.userId = sessionStorage.getItem('userId');
+      this.formList.customerName = sessionStorage.getItem('userName');
       var object = new Object();
-      object.plateNum = this.plateNum;
-      object.plateColor = this.plateColor;
-      this.formList.vehicleList.push(object);
-      const response = await this.$http.post(`/carEtcCard/queryCard`, this.formList);
+      object.num = this.plateNum;
+      object.color = this.plateColor;
+      this.formList.cards.push(object);
+      const response = await this.$http.post(`/selfCarService/queryEtcInfo`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.usertabletwo = response.data.data;
-        this.plateNum = '';
-        this.plateColor = '';
-        this.formList.companyNum = '';
-        this.formList.userId = '';
-        this.formList.vehicleList = [];
+        this.formList.cards = [];
       }else{
         this.$message.error(msg);
-        this.plateNum = '';
-        this.plateColor = '';
-        this.formList.companyNum = '';
-        this.formList.userId = '';
-        this.formList.vehicleList = [];
+        this.formList.cards = [];
       }
     },
     // 当选择中列表前的小框时候
@@ -220,12 +219,19 @@ export default{
         this.multipleSelection = val;
         // console.log(this.multipleSelection)
     },
+    async initCompanyList(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
+            if (response.data.code === 0) {
+              this.companyList = response.data.data;
+            }
+            this.formList.companyName = this.companyList[0]['companyName'];
+    },
     // 获取验证码数据
     checkLook() {
-      this.formCodeList.companyNum = sessionStorage.getItem('companyNum');
-      this.formCodeList.userId = sessionStorage.getItem('userId');
-      this.formBindingList.companyNum = sessionStorage.getItem('companyNum');
-      this.formBindingList.userId = sessionStorage.getItem('userId');
+      this.formCodeList.companyName = this.formList.companyName;
+      this.formCodeList.customerName = sessionStorage.getItem('userName');
+      this.formBindingList.companyName = this.formList.companyName;
+      this.formBindingList.customerName = sessionStorage.getItem('userName');
       var len = this.multipleSelection.length;
 
       var flag = true;
@@ -234,8 +240,8 @@ export default{
           flag = false;
         }else{
           var object = new Object();
-          object.cardId = this.multipleSelection[i].id;
-          this.formCodeList.cardList.push(object);
+          object.etcNum = this.multipleSelection[i].id;
+          this.formCodeList.cards.push(object);
         }
       }
       if(len === 0 ) {
@@ -252,7 +258,7 @@ export default{
 
     // 获取验证码
     async getCode() {
-      const response = await this.$http.post(`/carEtcCard/send`, this.formCodeList);
+      const response = await this.$http.post(`/selfCarService/customerETCRec`, this.formCodeList);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
 
@@ -263,7 +269,7 @@ export default{
     //绑定银行卡
     async BindingCard () {
       this.formBindingList.mobile = this.formCodeList.mobile;
-      const response = await this.$http.post(`/carEtcCard/bind/${this.codeNumber}`, this.formBindingList);
+      const response = await this.$http.post(`/selfCarService/customerETCRecValid`, this.formBindingList);
        var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.binDing = false;

src/views/platform/carbinding/carbindinglist.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="plateNum"></el-input>
+              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="carNum"></el-input>
               <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
             </div>
           </el-col>
@@ -22,11 +22,11 @@
           tooltip-effect="dark">
           <el-table-column
             label="车牌号码"
-            prop="plateNum"
+            prop="carNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="mobile"
+            prop="custPhone"
             label="手机号码"
             show-overflow-tooltip>
           </el-table-column>
@@ -34,11 +34,11 @@
             label="绑定时间"
             show-overflow-tooltip>
             <template slot-scope="scope" show-overflow-tooltip>
-              <span>{{scope.row.bindTime | fmtDate}}</span>
+              <span>{{scope.row.succTime | fmtDate}}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="cardId"
+            prop="etcNum"
             label="ETC卡号"
             show-overflow-tooltip>
           </el-table-column>
@@ -75,12 +75,12 @@ export default{
       pagesize: 8,
       total: 0,
       usertable: [],
-      plateNum: '',
+      carNum: '',
       roleId: '',
       formList: {
-        "userId": "",
-        "roleId": ""
-      },
+        "companyName": "",
+        "customerName": ""
+      }
     }
   },
   created() {
@@ -89,62 +89,40 @@ export default{
   methods: {
     //数据加载
     async loadData() {
-      this.formList.userId = sessionStorage.getItem('userId');
-      this.formList.roleId = sessionStorage.getItem('roleId');
-      if(this.formList.roleId == 1) {
-        const formData = new FormData();
+      this.formList.customerName = sessionStorage.getItem('userName');
+       const formData = new FormData();
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
-        const response = await this.$http.post(`carEtcCard/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('userId', this.formList.userId);
-        const response = await this.$http.post(`carEtcCard/list`, formData);
+        formData.append('customerName', this.formList.customerName);
+         formData.append('recStatus', 2);
+         formData.append('businessType',0);
+        const response = await this.$http.post(`noCar/findCarRec`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertable = response.data.data.records;
           this.total = response.data.data.total;
         };
-      };
     },
     // 查询
     async queryLook() {
-      if(this.formList.roleId == 1) {
         const formData = new FormData();
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
-        formData.append('plateNum', this.plateNum);
-        const response = await this.$http.post(`carEtcCard/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('userId', this.formList.userId);
-        formData.append('plateNum', this.plateNum);
-        const response = await this.$http.post(`carEtcCard/list`, formData);
+        formData.append('customerName', this.formList.customerName);
+        formData.append('carNum', this.carNum);
+        formData.append('recStatus', 2);
+         formData.append('businessType',0);
+        const response = await this.$http.post(`noCar/findCarRec`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertable = response.data.data.records;
           this.total = response.data.data.total;
         };
-      };
     },
     // 分页方法
     handleSizeChange(val) {
       this.pagesize = val;
-      if(this.plateNum !== '') {
+      if(this.carNum !== '') {
         this.queryLook();
       }else{
         this.loadData();
@@ -153,7 +131,7 @@ export default{
     },
     handleCurrentChange(val) {
       this.current = val;
-      if(this.plateNum !== '') {
+      if(this.carNum !== '') {
         this.queryLook();
       }else{
         this.loadData();

src/views/platform/check/check.vue

@@ -254,6 +254,7 @@
           const formData = new FormData();
           formData.append('current', this.current);
           formData.append('size', this.pagesize);
+           formData.append('customerName', this.formUserList.customerName);
           const response = await this.$http.post(`customer/customeRecQueryListByPage`, formData);
           if (response.data.code === 0) {
             this.loading = false;