Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-htqd

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -763,6 +763,7 @@ export default {
       this.getList();
     },
     find() {
+      this.currentPage = 1
       this.getList();
     },
     onChange() {

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -226,6 +226,7 @@
 				this.getList();
 			},
 			find() {
+				this.currentPage = 1
 				this.getList();
 			},
 			onChange() {

src/views/cargoOwnerManagement/taskAudit.vue

@@ -258,6 +258,7 @@
 				this.getList();
 			},
 			find() {
+				this.currentPage = 1
 				this.getList();
 			},
 			onChange() {

src/views/contractManagement/contractModel.vue

@@ -133,6 +133,7 @@
         this.listLoading = true
       },
       find() {
+        this.currentPage = 1
         this.getList()
       },
       sendInfoClose() {

src/views/driverManagement/fleetInfo.vue

@@ -268,6 +268,7 @@
           });
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       handleSizeChange(val) {

src/views/driverManagement/identityExamine.vue

@@ -205,13 +205,13 @@
     <el-dialog :close-on-click-modal='false' title="账单" :visible.sync="billShow" width="500px" :before-close="billClose">
       <div style="height: 450px" class="bill_css">
         <div class="user" v-for="(item, index) in billInfo" :key="index">
-          <div class="flex">
-            <div>订单编号：{{ item.orderNo }}</div>
-            <div>{{ item.types }}</div>
+          <div class="flex order">
+            <div class="left">订单编号：{{ item.orderNo }}</div>
+            <div class="right">{{ item.types }}</div>
           </div>
-          <div class="flex">
-            <div>{{ item.updateDate }}</div>
-            <div>{{ item.amountMoney }}</div>
+          <div class="flex order">
+            <div class="left">{{ item.updateDate }}</div>
+            <div class="right">{{ item.amountMoney }} {{item.amountMoney?"元":""}}</div>
           </div>
         </div>
         <div v-show="billInfo.length == 0">暂无账单信息</div>
@@ -644,6 +644,7 @@
         this.getList();
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       adopt(row) {
@@ -907,6 +908,17 @@
       width: 100%;
       border: 1px solid #f0f1f2;
     }
+    .order{
+      margin-top: 8px;
+      display: flex;
+      .left,.right{
+        width: 50%;
+      }
+      .right{
+        text-align: right;
+        margin-right: 20px;
+      }
+    }
   }
 
   ::v-deep .el-table--border .el-table__header th {

src/views/driverManagement/vehicleExamine.vue

@@ -516,6 +516,7 @@
         this.getList();
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       onChange() {

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -508,6 +508,7 @@ export default {
       this.getList();
     },
     find() {
+      this.currentPage = 1
       this.getList();
     },
     onChange() {

src/views/feedbackManagement/userFeedback.vue

@@ -212,6 +212,7 @@
           });
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       sendInfoClose() {

src/views/operationLog/logManagement.vue

@@ -281,6 +281,7 @@
         this.getList();
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       selectInit() {

src/views/orderManagement/orderAudit.vue

@@ -630,6 +630,7 @@
         this.getList();
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       submit(num) {

src/views/parkReportManagement/dailyReport.vue

@@ -272,6 +272,7 @@ export default {
       this.getList();
     },
     find() {
+      this.currentPage = 1
       this.getList()
     },
     look(row) {

src/views/parkReportManagement/driverInformationReporting.vue

@@ -412,6 +412,7 @@
         this.getList();
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       selectInit(row) {

src/views/parkReportManagement/vehicleInformationReporting.vue

@@ -421,6 +421,7 @@
         this.getList();
       },
       find() {
+        this.currentPage = 1
         this.getList();
       },
       selectInit(row) {

src/views/parkReportManagement/waybillReporting.vue

@@ -278,6 +278,7 @@ export default {
       this.getList();
     },
     find() {
+      this.currentPage = 1
       this.getList()
     },
     look(row) {

src/views/platformManagement/specifiedRecords.vue

@@ -231,6 +231,7 @@ export default {
         })
     },
     find() {
+      this.currentPage = 1
       this.getList()
     },
     look(row) {

src/views/settlementManagement/CashOwner.vue

@@ -254,6 +254,7 @@ import {
           })
       },
       find() {
+        this.currentPage = 1
         this.getList()
       },
       look(row) {

src/views/settlementManagement/advancePaymentAndRepaymentSettlement.vue

@@ -151,6 +151,7 @@ import {
           })
       },
       find() {
+        this.currentPage = 1
         this.getList()
       },
       handleSizeChange(val) {

src/views/settlementManagement/driverFeeSettlement.vue

@@ -411,6 +411,7 @@ import {
           })
       },
       find() {
+        this.currectdata = 1
         this.getList()
       },
       look(row) {

src/views/settlementManagement/ownerFlow.vue

@@ -121,6 +121,7 @@ import {
           })
       },
       find() {
+        this.currentPage = 1
         this.getList()
       },
       handleSizeChange(val) {