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

src/components/mapdrag/indexMap.vue

@@ -42,7 +42,7 @@ export default {
       ],
       val1: "",
       val2: "",
-      currentPage:this.currentPage,
+      // currentPage:this.currentPage,
     };
 
   },
@@ -57,7 +57,6 @@ export default {
     radio: function (val1, val2) {
       this.val1 = val1
       this.val2 = val2
-
       this.infoList()
       // this.loadmap();
     },
@@ -71,11 +70,10 @@ export default {
     infoList() {
       var that = this
       if (that.val1 == 1) {
-        var that = this;
         travelpathbd({ orderId: that.orderid })
           .then((response) => {
             that.path1 = [];
-            var patharr = response.data
+            var patharr = JSON.parse(response.data.longitudeLatitude) 
             // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
             for (let i = 0; i < patharr.length; i++) {
               that.path1.push([patharr[i].lon, patharr[i].lat]);
@@ -88,7 +86,6 @@ export default {
           });
         // this.path = this.path1
       } else {
-        var that = this;
         travelpath({
           orderId: that.orderid,
           currentPage: that.currentPage,
@@ -109,12 +106,6 @@ export default {
           .catch(() => {
             // console.log(121212)
           });
-        // travelpath({orderId:this.orderid}).then(response => {
-        //   console.log(response)
-        // })
-        // .catch(() => {
-        // })
-        // this.path = this.path2
       }
 
     },
@@ -157,7 +148,6 @@ export default {
           alert("当前环境不支持 Canvas！");
           return;
         }
-
         let pathSimplifierIns = new PathSimplifier({
           zIndex: 100,
           //autoSetFitView:false,

src/router/index.js

@@ -4,19 +4,19 @@ import store from '../store'
 Vue.use(Router)
 
 import Layout from '@/layout'
-import news from './news/index'
-import driverManagement from './driverManagement/index'
-import cargoOwnerManagement from './cargoOwnerManagement/index'
-import enterpriseManagement from './enterpriseManagement/index'
-import orderManagement from './orderManagement/index'
-import contractManagement from './contractManagement/index'
-import platformManagement from './platformManagement/index'
-import feedbackManagement from './feedbackManagement/index'
-import officialWebsiteManagement from './officialWebsiteManagement/index'
-import parkReportManagement from './parkReportManagement/index'
-import administrationManagement from './administrationManagement/index'
-import settlementManagement from './settlementManagement/index'
-import operationLog from './operationLog/index'
+import news from './news/index'//消息
+import driverManagement from './driverManagement/index'//司机管理
+import cargoOwnerManagement from './cargoOwnerManagement/index'//货主管理
+import enterpriseManagement from './enterpriseManagement/index'//企业管理
+import orderManagement from './orderManagement/index'//订单管理
+// import contractManagement from './contractManagement/index'//合同管理
+import platformManagement from './platformManagement/index'//平台规定管理
+import feedbackManagement from './feedbackManagement/index'//投诉举报管理
+import officialWebsiteManagement from './officialWebsiteManagement/index'//官网信息
+import parkReportManagement from './parkReportManagement/index'//园区上报
+import administrationManagement from './administrationManagement/index'//管局上报
+import settlementManagement from './settlementManagement/index'//结算管理
+import operationLog from './operationLog/index'//操作日志
 
 
 export const constantRoutes = [{
@@ -92,13 +92,12 @@ let cofigRouter = [
     cargoOwnerManagement,
     enterpriseManagement,
     orderManagement,
-    contractManagement,
-    platformManagement,
-    feedbackManagement,
-    officialWebsiteManagement,
+    settlementManagement,
     parkReportManagement,
     administrationManagement,
-    settlementManagement,
+    feedbackManagement,
+    platformManagement,
+    officialWebsiteManagement,
     operationLog,
 ]
 export const asyncRoutes = cofigRouter

src/views/administrationManagement/dailyReport.vue

@@ -44,7 +44,7 @@
         </el-row>
       </div>
       <el-table @selection-change="handleSelectionChange" :data="tableData"
-        style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50">
@@ -84,7 +84,7 @@
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
-    <el-drawer title="流水单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="流水单信息" :visible.sync="rightSee">
       <div class="right_css">
         <div class="right_item">单证号：{{ dailyReportData.documentNo }}</div>
         <div class="right_title">实际承运人</div>
@@ -124,12 +124,18 @@
         <div class="right_title">实际支付金额</div>
         <div class="right_item">{{ dailyReportData.amountMoney }}</div>
         <div class="right_title">支付凭证文件</div>
-        <div class="right_item">{{ dailyReportData.paymentVoucher }}</div>
+        <!-- <div class="right_item">{{ dailyReportData.paymentVoucher }}</div> -->
+        <div style="display: flex;" v-if="dailyReportData.paymentVoucher">
+              <div v-for="(item, index) in dailyReportData.paymentVoucher.split(',')" :key="index">
+                <img :src="item" class="img_css" @click="enlarge(item)">
+              </div>
+            </div>
         <div class="right_btn">
           <el-button @click="rightSee = false">关闭</el-button>
         </div>
       </div>
     </el-drawer>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -140,6 +146,10 @@ import {
   dailyReporGetInfo
 } from '@/api/administrationManagement'
 export default {
+  components: {
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
   data() {
     return {
       show: false,
@@ -161,12 +171,23 @@ export default {
       disabled: false,
       rejectInfo: false,
       rightSee: false,
+      //图片预览
+      srcList: [],
+      imgsVisible: false,
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
+    enlarge(url) {
+      this.imgsVisible = true;
+      this.srcList.push(url)
+    },
+    closeImgViewer() {
+      this.srcList = []
+      this.imgsVisible = false;
+    },
     dateChange(e) {
       this.startDate = e[0]
       this.endDate = e[1]
@@ -302,7 +323,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;
@@ -585,7 +606,7 @@ export default {
 
 .right_css {
   // overflow-y: auto !important;
-  min-height: 1266px;
+  // min-height: 1266px;
   padding: 0 20px;
 
   .right_title {

src/views/administrationManagement/driverInformationReporting.vue

@@ -43,7 +43,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="60vh" border
         highlight-current-row @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
@@ -446,7 +446,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;

src/views/administrationManagement/vehicleInformationReporting.vue

@@ -43,7 +43,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="60vh" border
         highlight-current-row @row-click="handleRowClick" @selection-change="handleSelectionChange" >
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
@@ -455,7 +455,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/administrationManagement/waybillReporting.vue

@@ -44,7 +44,7 @@
         </el-row>
       </div>
       <el-table @selection-change="handleSelectionChange" :data="tableData"
-        style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="57.5vh" border highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50">
@@ -82,7 +82,7 @@
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
-    <el-drawer title="运单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="运单信息" :visible.sync="rightSee" >
       <div class="right_css">
         <div class="right_item">订单编号：{{ orderData.orderNo }}</div>
         <div class="right_title">发货时间</div>
@@ -311,7 +311,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;
@@ -594,7 +594,7 @@ export default {
 
 .right_css {
   // overflow-y: auto !important;
-  min-height: 1266px;
+  // min-height: 1266px;
   padding: 0 20px;
 
   .right_title {

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -48,7 +48,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border
         highlight-current-row>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
@@ -798,7 +798,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -36,7 +36,7 @@
 					</el-col>
 				</el-row>
 			</div>
-			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
 				<el-table-column type="index" width="60"  label="序号" align="center">
 					<template scope="scope">
 						<span>{{scope.$index + 1}}</span>
@@ -257,7 +257,7 @@
 	.center {
 		padding: 10px 20px;
 		background: #f5f6f7;
-		height: calc(100vh - 5vh);
+		min-height: calc(100vh - 50px);
 
 		.top_css {
 			padding: 10px;

src/views/cargoOwnerManagement/taskAudit.vue

@@ -9,7 +9,8 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input class='find' placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+							<el-input class='find' placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable
+								@change="find"></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -36,10 +37,11 @@
 					</el-col>
 				</el-row>
 			</div>
-			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
-				<el-table-column type="index" width="60"  label="序号" align="center">
+			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border
+				highlight-current-row>
+				<el-table-column type="index" width="60" label="序号" align="center">
 					<template scope="scope">
-						<span>{{scope.$index + 1}}</span>
+						<span>{{ scope.$index + 1 }}</span>
 						<!-- <span v-else>{{scope.$index}}</span> -->
 					</template>
 				</el-table-column>
@@ -48,24 +50,27 @@
 				<el-table-column prop="cargoOwnerPhone" label="货主账号" min-width="108"></el-table-column>
 				<el-table-column prop="amountMoney" label="发货地" min-width="150">
 					<template slot-scope="scope">
-						{{scope.row.sendPrivate}}{{scope.row.sendCity}}{{scope.row.sendArea}}{{scope.row.sendDetailedAddress}}
+						{{ scope.row.sendPrivate }}{{ scope.row.sendCity }}{{ scope.row.sendArea }}{{ scope.row.sendDetailedAddress }}
 					</template>
 				</el-table-column>
 				<el-table-column prop="amountMoney" label="收货地" min-width="150">
 					<template slot-scope="scope">
-						{{scope.row.unloadPrivate}}{{scope.row.unloadCity}}{{scope.row.unloadArea}}{{scope.row.unloadDetailedAddress}}
+						{{ scope.row.unloadPrivate }}{{ scope.row.unloadCity }}{{ scope.row.unloadArea }}{{ scope.row.unloadDetailedAddress }}
 					</template>
 				</el-table-column>
 				<el-table-column prop="createDate" label="发布日期" min-width="100"></el-table-column>
-			
+
 				<el-table-column prop="backStageStatus" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
+						<el-link target="_blank" @click="adopt(scope.row)" type="primary" :underline="false"
+							:disabled="scope.row.status != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
+						<el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false"
+							:disabled="scope.row.status != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<el-link  target="_blank" @click="reject(scope.row)" type="primary" :underline="false">查看</el-link>
+						<el-link target="_blank" @click="reject(scope.row)" type="primary"
+							:underline="false">查看</el-link>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -97,396 +102,401 @@
 				</div>
 			</div>
 		</el-dialog> -->
-		<el-drawer title="任务详情" :visible.sync="rightSee" >
+		<el-drawer title="任务详情" :visible.sync="rightSee">
 			<div class="right_css">
-						<div class="right_item">任务编号：{{taskLook.taskNo}}</div>
-						<div class="right_title">公司</div>
-						<div class="right_item">{{taskLook.cargoOwner}}</div>
-						<div class="right_title">发货地区</div>
-						<div class="right_item">{{taskLook.sendPrivate}}{{taskLook.sendCity}}{{taskLook.sendArea}}</div>
-						<div class="right_title">发货详细地址</div>
-						<div class="right_item">{{taskLook.sendDetailedAddress}}</div>
-						<div class="right_title">收货地区</div>
-						<div class="right_item">{{taskLook.unloadPrivate}}{{taskLook.unloadCity}}{{taskLook.unloadArea}}</div>
-						<div class="right_title">收货详细地址</div>
-						<div class="right_item">{{taskLook.unloadDetailedAddress}}</div>
-						<div class="right_title">发货联系人</div>
-						<div class="right_item">{{taskLook.sender}}</div>
-						<div class="right_title">发货联系人电话</div>
-						<div class="right_item">{{taskLook.senderPhone}}</div>
-
-						<div class="right_title">收货联系人</div>
-						<div class="right_item">{{taskLook.receiver}}</div>
-						<div class="right_title">收货联系人电话</div>
-						<div class="right_item">{{taskLook.receiverPhone}}</div>
-						<div class="right_title">收货人身份证号</div>
-						<div class="right_item">{{taskLook.receiverIdcard}}</div>
-						<div class="right_title">收货方信用代码（选填）</div>
-						<div class="right_item">{{taskLook.receiverCreditCode?taskLook.receiverCreditCode:'暂无'}}</div>
-						<div class="right_title">运输距离</div>
-						<div class="right_item">约{{taskLook.distance ? taskLook.distance : 0}}km</div>
-						<div class="right_title">货物类别</div>
-						<div class="right_item">{{taskLook.goodsType}}</div>
-						<div class="right_title">货名</div>
-						<div class="right_item">{{taskLook.goodsName}}</div>
-						<div class="right_title">重量（吨）</div>
-						<div class="right_item">{{taskLook.weight}}</div>
-						<div class="right_title">运费计算方式</div>
-						<div class="right_item">{{taskLook.billingMethod == 0 ? "元/吨":"元/车"}}</div>
-						<div class="right_title">{{taskLook.billingMethod == 0 ? "运费单价（元/吨）":"运费单价（元/车）"}}</div>
-						<div class="right_item">{{taskLook.freightPrice}}</div>
-						<div class="right_title">预计装车日期起</div>
-						<div class="right_item">{{taskLook. loadingDateStart}}</div>
-						<div class="right_title">预计装车日期止</div>
-						<div class="right_item">{{taskLook.loadingDateEnd}}</div>
-						<div class="right_title">车长要求（米）</div>
-						<div class="right_item">{{taskLook.carLengthSmall}}~{{taskLook.carLength}}</div>
-						<div class="right_title">载重要求（吨）</div>
-						<div class="right_item">{{taskLook.loadWeightSmall}}~{{taskLook.loadWeight}}</div>
-						<div class="right_title">车型要求</div>
-						<div class="right_item">{{taskLook.carModelText}}</div>
-						<div class="right_title">任务描述</div>
-						<div class="right_item">{{taskLook.taskDescription}}</div>
-						<div class="right_title">任务有效期</div>
-						<div class="right_item">{{taskLook.taskValidity}}</div>
-						<div class="right_item">{{taskLook.freightAdvance == 0 ? "该任务未申请运费垫付":"该任务申请运费垫付"}}</div>
-						<div class="right_btn">
-							<el-button @click="submit(1)" v-if="taskLook.status == '审核中'">通过</el-button>
-							<el-button @click="submit(2)" v-if="taskLook.status == '审核中'">驳回</el-button>
-							<el-button @click="rightSee = false">关闭</el-button>
-						</div>
-					</div>
+				<div class="right_item">任务编号：{{ taskLook.taskNo }}</div>
+				<div class="right_title">公司</div>
+				<div class="right_item">{{ taskLook.cargoOwner }}</div>
+				<div class="right_title">发货地区</div>
+				<div class="right_item">{{ taskLook.sendPrivate }}{{ taskLook.sendCity }}{{ taskLook.sendArea }}</div>
+				<div class="right_title">发货详细地址</div>
+				<div class="right_item">{{ taskLook.sendDetailedAddress }}</div>
+				<div class="right_title">收货地区</div>
+				<div class="right_item">{{ taskLook.unloadPrivate }}{{ taskLook.unloadCity }}{{ taskLook.unloadArea }}</div>
+				<div class="right_title">收货详细地址</div>
+				<div class="right_item">{{ taskLook.unloadDetailedAddress }}</div>
+				<div class="right_title">发货联系人</div>
+				<div class="right_item">{{ taskLook.sender }}</div>
+				<div class="right_title">发货联系人电话</div>
+				<div class="right_item">{{ taskLook.senderPhone }}</div>
+
+				<div class="right_title">收货联系人</div>
+				<div class="right_item">{{ taskLook.receiver }}</div>
+				<div class="right_title">收货联系人电话</div>
+				<div class="right_item">{{ taskLook.receiverPhone }}</div>
+				<div class="right_title">收货人身份证号</div>
+				<div class="right_item">{{ taskLook.receiverIdcard }}</div>
+				<div class="right_title">收货方信用代码（选填）</div>
+				<div class="right_item">{{ taskLook.receiverCreditCode ? taskLook.receiverCreditCode : '暂无' }}</div>
+				<div class="right_title">运输距离</div>
+				<div class="right_item">约{{ taskLook.distance ? taskLook.distance : 0 }}km</div>
+				<div class="right_title">货物类别</div>
+				<div class="right_item">{{ taskLook.goodsType }}</div>
+				<div class="right_title">货名</div>
+				<div class="right_item">{{ taskLook.goodsName }}</div>
+				<div class="right_title">重量（吨）</div>
+				<div class="right_item">{{ taskLook.weight }}</div>
+				<div class="right_title">运费计算方式</div>
+				<div class="right_item">{{ taskLook.billingMethod == 0 ? "元/吨" : "元/车" }}</div>
+				<div class="right_title">{{ taskLook.billingMethod == 0 ? "运费单价（元/吨）" : "运费单价（元/车）" }}</div>
+				<div class="right_item">{{ taskLook.freightPrice }}</div>
+				<div class="right_title">预计装车日期起</div>
+				<div class="right_item">{{ taskLook.loadingDateStart }}</div>
+				<div class="right_title">预计装车日期止</div>
+				<div class="right_item">{{ taskLook.loadingDateEnd }}</div>
+				<div class="right_title">车长要求（米）</div>
+				<div class="right_item">{{ taskLook.carLengthSmall }}~{{ taskLook.carLength }}</div>
+				<div class="right_title">载重要求（吨）</div>
+				<div class="right_item">{{ taskLook.loadWeightSmall }}~{{ taskLook.loadWeight }}</div>
+				<div class="right_title">车型要求</div>
+				<div class="right_item">{{ taskLook.carModelText }}</div>
+				<div class="right_title">任务描述</div>
+				<div class="right_item">{{ taskLook.taskDescription }}</div>
+				<div class="right_title">任务有效期</div>
+				<div class="right_item">{{ taskLook.taskValidity }}</div>
+				<div class="right_item">{{ taskLook.freightAdvance == 0 ? "该任务未申请运费垫付" : "该任务申请运费垫付" }}</div>
+				<div class="right_btn">
+					<el-button @click="submit(1)" v-if="taskLook.status == '审核中'">通过</el-button>
+					<el-button @click="submit(2)" v-if="taskLook.status == '审核中'">驳回</el-button>
+					<el-button @click="rightSee = false">关闭</el-button>
+				</div>
+			</div>
 		</el-drawer>
 	</div>
 </template>
 <script>
-	import {
-		getListLook,
-		toTaskExamine
-	} from '@/api/cargoOwnerManagement'
-	export default {
-		data() {
-			return {
-				tableData: [],
-				//分页
-				searchkeyWord: "",
-				currentPage: 1,
-				pageSize: 10,
-				deptBudgetTotal: 0,
-				deptCircularPage: {},
-				search: "",
-				addressUrl: [],
-				disabled: false,
-				form: {
-					checkList: [],
-					textarea: "",
-				},
-				rightSee:false,
-				taskLook:{},
-			};
-		},
-		mounted() {
-			this.getList()
-		},
-		methods: {
-
-			getList() {
-				
-				this.loading = true
-				let _obj = {}
-				_obj.currentPage = this.currentPage
-				_obj.pageSize = this.pageSize
-				_obj.searchKeyWord = this.searchkeyWord
-				_obj.searchType = this.search
-				getListLook(_obj).then(response => {
-					
-						this.tableData = response.data.records
-						this.deptBudgetTotal = response.data.total
-						this.listLoading = false
-					})
-					.catch(() => {
-						this.loading = false
-					})
+import {
+	getListLook,
+	toTaskExamine
+} from '@/api/cargoOwnerManagement'
+export default {
+	data() {
+		return {
+			tableData: [],
+			//分页
+			searchkeyWord: "",
+			currentPage: 1,
+			pageSize: 10,
+			deptBudgetTotal: 0,
+			deptCircularPage: {},
+			search: "",
+			addressUrl: [],
+			disabled: false,
+			form: {
+				checkList: [],
+				textarea: "",
 			},
-			adopt(row) {
-				this.taskLook = row
-				if(row.carModel){
-					var arr=[]
-					if(row.carModel.indexOf('1')!=-1){
-						arr.push('不限')
-					}
-					if(row.carModel.indexOf('2')!=-1){
-						arr.push('高栏')
-					}
-					if(row.carModel.indexOf('3')!=-1){
-						arr.push('集装箱')
-					}
-					if(row.carModel.indexOf('4')!=-1){
-						arr.push('自卸车')
-					}
-					row.carModelText=arr.toString()
-				}else{
-					row.carModelText=''
+			rightSee: false,
+			taskLook: {},
+		};
+	},
+	mounted() {
+		this.getList()
+	},
+	methods: {
+
+		getList() {
+
+			this.loading = true
+			let _obj = {}
+			_obj.currentPage = this.currentPage
+			_obj.pageSize = this.pageSize
+			_obj.searchKeyWord = this.searchkeyWord
+			_obj.searchType = this.search
+			getListLook(_obj).then(response => {
+
+				this.tableData = response.data.records
+				this.deptBudgetTotal = response.data.total
+				this.listLoading = false
+			})
+				.catch(() => {
+					this.loading = false
+				})
+		},
+		adopt(row) {
+			this.taskLook = row
+			if (row.carModel) {
+				var arr = []
+				if (row.carModel.indexOf('1') != -1) {
+					arr.push('不限')
 				}
-				this.rightSee = true
-			},
-			reject(row) {
-				if(row.carModel){
-					var arr=[]
-					if(row.carModel.indexOf('1')!=-1){
-						arr.push('不限')
-					}
-					if(row.carModel.indexOf('2')!=-1){
-						arr.push('高栏')
-					}
-					if(row.carModel.indexOf('3')!=-1){
-						arr.push('集装箱')
-					}
-					if(row.carModel.indexOf('4')!=-1){
-						arr.push('自卸车')
-					}
-					row.carModelText=arr.toString()
-				}else{
-					row.carModelText=''
+				if (row.carModel.indexOf('2') != -1) {
+					arr.push('高栏')
 				}
-				this.taskLook = row
-				this.rightSee = true
-			},
-			submit(num) {
-				var _taskObj = {}
-				_taskObj.id = this.taskLook.id
-				let taskTitle = ""
-				if(num == 1){
-					_taskObj.flag = 1
-					taskTitle = "通过"
-				}else if(num == 2){
-					_taskObj.flag = 2
-					taskTitle = "驳回"
+				if (row.carModel.indexOf('3') != -1) {
+					arr.push('集装箱')
 				}
-				this.$confirm('确定'+ taskTitle + this.taskLook.cargoOwnerName + '的发运任务？', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						this.listLoading = true
-						
-						toTaskExamine(_taskObj).then(response => {
-							this.rightSee = false
-								this.taskLook = {}
-								this.$notify({
-									title: '成功',
-									message: taskTitle+'成功！',
-									type: 'success'
-								});
-								this.getList()
-								this.listLoading = false
-							})
-							.catch(() => {
-								this.loading = false
-							})
-					})
-			},
-			searchBtn(num) {
-				this.search = num;
-				this.getList();
-			},
-			find() {
-				this.currentPage = 1
-				this.getList();
-			},
-			onChange() {
-				this.$refs.upload
-					.handleSaveBill()
-					.then(async (response) => {
-						this.formData.addressUrl = response;
-					})
-					.catch((res) => {
-						EventBus.$emit("error", (JSON.parse(res) || {}).message);
-						this.$refs.upload.clearFiles();
-					});
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`);
-				this.pageSize = val;
-				this.getList();
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				console.log(`当前页: ${val}`);
-				this.getList();
-			},
+				if (row.carModel.indexOf('4') != -1) {
+					arr.push('自卸车')
+				}
+				row.carModelText = arr.toString()
+			} else {
+				row.carModelText = ''
+			}
+			this.rightSee = true
 		},
-	};
-</script>
-<style lang="scss" scoped>
-	.center {
-		padding: 10px 20px;
-		background: #f5f6f7;
-		height: calc(100vh - 5vh);
-
-		.top_css {
-			padding: 10px;
-
-			.search_btn {
-        height: 80px;
-        background: linear-gradient(#fafbfb, #ffffff);
-				display: flex;
-				margin-top: 20px;
-        .search_block{
-          margin-left: 20px;
-        }
-
-				.search_item {
-					text-align: center;
-					font-size: 14px;
-					font-weight: 600;
-					line-height: 40px;
-					width: 112px;
-					height: 40px;
-					background: #f7f8f9;
-					cursor: pointer;
-          margin-top: 30px;
+		reject(row) {
+			if (row.carModel) {
+				var arr = []
+				if (row.carModel.indexOf('1') != -1) {
+					arr.push('不限')
 				}
-
-				.searchNo {
-					color: #323233;
+				if (row.carModel.indexOf('2') != -1) {
+					arr.push('高栏')
 				}
-
-				.search {
-					color: #2f53eb;
-					background: #ffffff;
+				if (row.carModel.indexOf('3') != -1) {
+					arr.push('集装箱')
+				}
+				if (row.carModel.indexOf('4') != -1) {
+					arr.push('自卸车')
 				}
+				row.carModelText = arr.toString()
+			} else {
+				row.carModelText = ''
 			}
-		}
+			this.taskLook = row
+			this.rightSee = true
+		},
+		submit(num) {
+			var _taskObj = {}
+			_taskObj.id = this.taskLook.id
+			let taskTitle = ""
+			if (num == 1) {
+				_taskObj.flag = 1
+				taskTitle = "通过"
+			} else if (num == 2) {
+				_taskObj.flag = 2
+				taskTitle = "驳回"
+			}
+			this.$confirm('确定' + taskTitle + this.taskLook.cargoOwnerName + '的发运任务？', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					this.listLoading = true
 
-		.center_css {
-			background: #ffffff;
-			border-radius: 1px;
-			margin-top: 10px;
-			padding-bottom: 10px;
-		}
+					toTaskExamine(_taskObj).then(response => {
+						this.rightSee = false
+						this.taskLook = {}
+						this.$notify({
+							title: '成功',
+							message: taskTitle + '成功！',
+							type: 'success'
+						});
+						this.getList()
+						this.listLoading = false
+					})
+						.catch(() => {
+							this.loading = false
+						})
+				})
+		},
+		searchBtn(num) {
+			this.search = num;
+			this.getList();
+		},
+		find() {
+			this.currentPage = 1
+			this.getList();
+		},
+		onChange() {
+			this.$refs.upload
+				.handleSaveBill()
+				.then(async (response) => {
+					this.formData.addressUrl = response;
+				})
+				.catch((res) => {
+					EventBus.$emit("error", (JSON.parse(res) || {}).message);
+					this.$refs.upload.clearFiles();
+				});
+		},
+		handleSizeChange(val) {
+			console.log(`每页 ${val} 条`);
+			this.pageSize = val;
+			this.getList();
+		},
+		handleCurrentChange(val) {
+			this.currentPage = val;
+			console.log(`当前页: ${val}`);
+			this.getList();
+		},
+	},
+};
+</script>
+<style lang="scss" scoped>
+.center {
+	padding: 10px 20px;
+	background: #f5f6f7;
+	min-height: calc(100vh - 50px);
+
+	.top_css {
+		padding: 10px;
 
-		.screen {
+		.search_btn {
+			height: 80px;
+			background: linear-gradient(#fafbfb, #ffffff);
 			display: flex;
+			margin-top: 20px;
 
-			.search {
-				width: 40px;
-				height: 40px;
-				background: #2f53eb;
-				border-radius: 0px 2px 2px 0px;
-				border: 1px solid #DCDFE6;
-        		margin-left:-1px;
+			.search_block {
+				margin-left: 20px;
 			}
 
-			.count_css {
-				width: 80px;
+			.search_item {
 				text-align: center;
+				font-size: 14px;
+				font-weight: 600;
 				line-height: 40px;
-				color: #666666;
-			}
-		}
-
-		.el-button {
-			padding: 10px 20px !important;
-		}
-
-		.center_css {
-
-			::v-deep .el-table th,
-			::v-deep .el-table td {
-				text-align: center;
+				width: 112px;
+				height: 40px;
+				background: #f7f8f9;
+				cursor: pointer;
+				margin-top: 30px;
 			}
 
-			.fujian {
-				font-size: 24px;
-				color: #409eff;
+			.searchNo {
+				color: #323233;
 			}
 
-			.warning {
-				font-size: 14px;
-				color: #ed1d1d;
+			.search {
+				color: #2f53eb;
+				background: #ffffff;
 			}
 		}
 	}
 
-	.car_css {
-		width: 50%;
-		display: inline-block;
-		text-align: center;
-		margin-top: 20px;
+	.center_css {
+		background: #ffffff;
+		border-radius: 1px;
+		margin-top: 10px;
+		padding-bottom: 10px;
 	}
 
-	.car_item {
-		width: 100px;
-		height: 100px;
-	}
+	.screen {
+		display: flex;
 
-	.user {
-		margin-bottom: 20px;
+		.search {
+			width: 40px;
+			height: 40px;
+			background: #2f53eb;
+			border-radius: 0px 2px 2px 0px;
+			border: 1px solid #DCDFE6;
+			margin-left: -1px;
+		}
 
-		.user_id {
-			display: flex;
-			height: 30px;
+		.count_css {
+			width: 80px;
+			text-align: center;
+			line-height: 40px;
+			color: #666666;
 		}
+	}
+
+	.el-button {
+		padding: 10px 20px !important;
+	}
+
+	.center_css {
 
-		.name_css,
-		.id_css {
-			width: 50%;
+		::v-deep .el-table th,
+		::v-deep .el-table td {
+			text-align: center;
 		}
 
-		.name_css {
-			text-align: right;
+		.fujian {
+			font-size: 24px;
+			color: #409eff;
 		}
 
-		.user_item {
-			width: 450px;
-			height: 300px;
+		.warning {
+			font-size: 14px;
+			color: #ed1d1d;
 		}
 	}
+}
 
-	::v-deep .el-table--border .el-table__header th {
-		background: #f7f8f9;
+.car_css {
+	width: 50%;
+	display: inline-block;
+	text-align: center;
+	margin-top: 20px;
+}
+
+.car_item {
+	width: 100px;
+	height: 100px;
+}
+
+.user {
+	margin-bottom: 20px;
+
+	.user_id {
+		display: flex;
+		height: 30px;
+	}
+
+	.name_css,
+	.id_css {
+		width: 50%;
 	}
 
-	.btn_css {
-		color: #2f53eb;
-		cursor: pointer
+	.name_css {
+		text-align: right;
 	}
 
-	.sign {
+	.user_item {
+		width: 450px;
+		height: 300px;
+	}
+}
+
+::v-deep .el-table--border .el-table__header th {
+	background: #f7f8f9;
+}
+
+.btn_css {
+	color: #2f53eb;
+	cursor: pointer
+}
+
+.sign {
+	font-size: 14px;
+	color: red;
+}
+
+.right_css {
+	padding: 0 20px;
+
+	.right_title {
+		color: #9D9D9D;
 		font-size: 14px;
-		color: red;
+		margin-bottom: 4px;
 	}
-	.right_css {
-			padding:0 20px;
-			.right_title {
-				color: #9D9D9D;
-				font-size: 14px;
-				margin-bottom: 4px;
-			}
-	
-			.right_item {
-				color: #0D0D0D;
-				font-size: 14px;
-				margin-bottom: 20px;
-			}
-	
-			.right_btn {
-				text-align: right;
-				margin: 10px 0;
-			}
-	
-			.right_img {
-				width: 200px;
-				height: 120px;
-				margin-top: 10px;
-			}
-		}
-		::v-deep .el-drawer {
-			overflow: auto;
-		}
-	.find::v-deep input.el-input__inner{
-    border-radius:0;
-  }
+
+	.right_item {
+		color: #0D0D0D;
+		font-size: 14px;
+		margin-bottom: 20px;
+	}
+
+	.right_btn {
+		text-align: right;
+		margin: 10px 0;
+	}
+
+	.right_img {
+		width: 200px;
+		height: 120px;
+		margin-top: 10px;
+	}
+}
+
+::v-deep .el-drawer {
+	overflow: auto;
+}
+
+.find::v-deep input.el-input__inner {
+	border-radius: 0;
+}
 </style>

src/views/contractManagement/contractModel.vue

@@ -157,7 +157,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/driverManagement/carCaptain.vue

@@ -7,53 +7,29 @@
           <el-col :span="14" style="height: 45px"> </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input
-                class="find"
-                placeholder="可按车队长姓名、账号查找"
-                @keyup.enter.native="find"
-                v-model="searchkeyWord"
-                clearable
-                @change="find"
-              ></el-input>
-              <el-button class="search" @click="find"
-                ><img
-                  width="16"
-                  height="16"
-                  style="margin-left: -8px"
-                  src="../../../public/img/sousuo.png" /></el-button
-              ><span class="count_css">共{{ deptBudgetTotal }}条</span>
+              <el-input class="find" placeholder="可按车队长姓名、账号查找" @keyup.enter.native="find" v-model="searchkeyWord"
+                clearable @change="find"></el-input>
+              <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
+                  src="../../../public/img/sousuo.png" /></el-button><span class="count_css">共{{
+                    deptBudgetTotal
+                  }}条</span>
             </div>
           </el-col>
         </el-row>
         <el-row>
           <el-col>
             <div class="search_btn">
-              <div
-                :class="search == '' ? 'search' : 'searchNo'"
-                class="search_item search_block"
-                @click="searchBtn('')"
-              >
+              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
+                @click="searchBtn('')">
                 全部
               </div>
-              <div
-                :class="search == 1 ? 'search' : 'searchNo'"
-                class="search_item"
-                @click="searchBtn(1)"
-              >
+              <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
                 待审核
               </div>
-              <div
-                :class="search == 2 ? 'search' : 'searchNo'"
-                class="search_item"
-                @click="searchBtn(2)"
-              >
+              <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
                 已通过
               </div>
-              <div
-                :class="search == 3 ? 'search' : 'searchNo'"
-                class="search_item"
-                @click="searchBtn(3)"
-              >
+              <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 已驳回
               </div>
               <!-- <div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
@@ -63,13 +39,8 @@
           </el-col>
         </el-row>
       </div>
-      <el-table
-        :data="tableData"
-        style="width: 98%; margin: 0 auto; border-radius: 10px"
-        height="55.8vh"
-        border
-        highlight-current-row
-      >
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="58vh" border
+        highlight-current-row>
         <el-table-column type="index" width="60" label="序号" align="center">
           <template scope="scope">
             <span>{{ scope.$index + 1 }}</span>
@@ -78,23 +49,19 @@
         </el-table-column>
         <el-table-column prop="name" label="车队长"></el-table-column>
         <el-table-column prop="accountNumber" label="账号"></el-table-column>
-        <el-table-column prop="idCard" label="身份证号">
+        <el-table-column prop="idCard" label="身份证号" min-width="110">
           <template scope="scope">
-            <el-popover
-              placement="top"
-              trigger="hover"
-              :content="
-                scope.row.cardValidityStartDate +
-                ' ~ ' +
-                scope.row.cardValidityStartDate
-              "
-            >
+            <el-popover placement="top" trigger="hover" :content="
+              scope.row.cardValidityStartDate +
+              ' ~ ' +
+              scope.row.cardValidityStartDate
+            ">
               <div slot="reference">{{ scope.row.idCard }}</div>
             </el-popover>
           </template>
         </el-table-column>
         <el-table-column prop="bankDeposit" label="开户行"></el-table-column>
-        <el-table-column prop="bankCard" label="卡号"></el-table-column>
+        <el-table-column prop="bankCard" label="卡号" min-width="110"></el-table-column>
         <el-table-column prop="status" label="附件">
           <template slot-scope="scoped">
             <span class="btn_css" @click="lookInfo(scoped.row)">查看</span>
@@ -113,23 +80,11 @@
         <el-table-column prop="backStageStatus" label="状态"></el-table-column>
         <el-table-column label="操作" min-width="100">
           <template slot-scope="scope">
-            <el-link
-              target="_blank"
-              type="primary"
-              :underline="false"
-              @click="adopt(scope.row)"
-              :disabled="scope.row.backStageStatus != '待审核'"
-              >通过</el-link
-            >
+            <el-link target="_blank" type="primary" :underline="false" @click="adopt(scope.row)"
+              :disabled="scope.row.backStageStatus != '待审核'">通过</el-link>
             <el-divider direction="vertical"></el-divider>
-            <el-link
-              target="_blank"
-              type="primary"
-              :underline="false"
-              @click="reject(scope.row)"
-              :disabled="scope.row.backStageStatus != '待审核'"
-              >驳回</el-link
-            >
+            <el-link target="_blank" type="primary" :underline="false" @click="reject(scope.row)"
+              :disabled="scope.row.backStageStatus != '待审核'">驳回</el-link>
             <!-- <el-divider direction="vertical"></el-divider> -->
             <!-- <el-link target="_blank" type="primary" :underline="false" @click="lookInfo(scope.row)">查看</el-link>
             <el-divider direction="vertical"></el-divider>
@@ -142,37 +97,18 @@
         </el-table-column>
       </el-table>
     </div>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      style="text-align: center; margin-top: 10px"
-      :page-size="deptCircularPage.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="deptBudgetTotal"
-    >
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="附件"
-      :visible.sync="fujianInfo"
-      width="830px"
-      :before-close="fujianClose"
-    >
+    <el-dialog :close-on-click-modal="false" title="附件" :visible.sync="fujianInfo" width="830px"
+      :before-close="fujianClose">
       <div class="file">
         <div class="fujian_css">
-          <div
-            class="fujian_item"
-            :class="count == 1 ? 'file_btn' : ''"
-            @click="btnChange(1)"
-          >
+          <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
             身份证
           </div>
-          <div
-            class="fujian_item"
-            :class="count == 2 ? 'file_btn' : ''"
-            @click="btnChange(2)"
-          >
+          <div class="fujian_item" :class="count == 2 ? 'file_btn' : ''" @click="btnChange(2)">
             银行卡
           </div>
           <!-- <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
@@ -198,61 +134,45 @@
           </div> -->
         </div>
         <div class="file_tips">
-          <span v-if="count == 3"
-            >有效期：{{ file.drivingLicenseValidityDate }} </span
-          ><span v-if="count == 3">
+          <span v-if="count == 3">有效期：{{ file.drivingLicenseValidityDate }} </span><span v-if="count == 3">
             注册日期：{{ file.drivingLicenseRegistrationDate }}
           </span>
           <span v-if="count == 3">
             发证日期：{{ file.drivingLicenseIssueDate }}
           </span>
           <span v-if="count == 3"> 发证机关：{{ file.lssuingAuthority }}</span>
-          <span v-if="count == 5"
-            >有效期：{{ file.trailerLicenseValidityDate }} </span
-          ><span v-if="count == 5">
+          <span v-if="count == 5">有效期：{{ file.trailerLicenseValidityDate }} </span><span v-if="count == 5">
             注册日期：{{ file.trailerLicenseRegistrationDate }}
           </span>
           <span v-if="count == 5">
             发证日期：{{ file.trailerLicenseIssueDate }}
           </span>
           <span v-if="count == 5">
-            发证机关：{{ file.guaLssuingAuthority }}</span
-          >
+            发证机关：{{ file.guaLssuingAuthority }}</span>
           <span v-if="count == 6">
-            运输证号：{{ file.operationCertificateNumber }} </span
-          ><span v-if="count == 6"
-            >有效期：{{ file.operationCertificateValidityDate }}
+            运输证号：{{ file.operationCertificateNumber }} </span><span v-if="count == 6">有效期：{{
+              file.operationCertificateValidityDate
+            }}
           </span>
           <span v-if="count == 7">
-            挂车运输证号：{{ file.trailerOperationCertificateNumber }} </span
-          ><span v-if="count == 7"
-            >有效期：{{ file.trailerOperationCertificateValidityDate }}
+            挂车运输证号：{{ file.trailerOperationCertificateNumber }} </span><span v-if="count == 7">有效期：{{
+              file.trailerOperationCertificateValidityDate
+            }}
           </span>
         </div>
         <div class="file_img">
           <img :src="img[index]" class="img_css" @click="enlarge(img[index])" />
         </div>
         <div class="btn">
-          <el-button
-            style="margin-right: 120px"
-            @click="index = 0"
-            v-if="count == 1"
-            >{{ abilityName }}</el-button
-          >
-          <el-button @click="index = 1" v-if="count == 1"
-            >{{ abilityName1 }}
+          <el-button style="margin-right: 120px" @click="index = 0" v-if="count == 1">{{ abilityName }}</el-button>
+          <el-button @click="index = 1" v-if="count == 1">{{ abilityName1 }}
           </el-button>
         </div>
       </div>
     </el-dialog>
     <!-- 成员 -->
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="'成员信息' + ' ('+totalLength+')'"
-      :visible.sync="persioninfo"
-      width="500px"
-      :before-close="persioninfoClose"
-    >
+    <el-dialog :close-on-click-modal="false" :title="'成员信息' + ' (' + totalLength + ')'" :visible.sync="persioninfo"
+      width="500px" :before-close="persioninfoClose">
       <div class="persionlist_css">
         <div v-for="(item, index) in persionList" :key="index">
           <div class="persion_css">
@@ -264,13 +184,8 @@
       </div>
     </el-dialog>
     <!-- 账单 -->
-    <el-dialog
-      :close-on-click-modal="false"
-      title="账单信息"
-      :visible.sync="billShow"
-      width="500px"
-      :before-close="billShowClose"
-    >
+    <el-dialog :close-on-click-modal="false" title="账单信息" :visible.sync="billShow" width="500px"
+      :before-close="billShowClose">
       <div class="billList_css">
         <div v-for="(item, index) in billList" :key="index">
           <div class="bill_css">
@@ -302,12 +217,7 @@
         <span>{{item.driverNickname}} 电话{{item.driverPhone}}</span>
       </div>
     </el-dialog> -->
-    <el-image-viewer
-      v-if="imgsVisible"
-      :on-close="closeImgViewer"
-      :url-list="srcList"
-      style="z-index: 9999"
-    />
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index: 9999" />
   </div>
 </template>
 <script>
@@ -347,7 +257,7 @@ export default {
       //成员
       persioninfo: false,
       persionList: [],
-      totalLength:"",//总人数
+      totalLength: "",//总人数
       //账单
       billList: [],
       billShow: false,
@@ -401,7 +311,7 @@ export default {
         carCaptainCommonId: val.commonId,
         currentPage: 1,
         pageSize: 100,
-         houtaiSearch:1,
+        houtaiSearch: 1,
       })
         .then((response) => {
           if (response.code == 200) {
@@ -574,7 +484,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;
@@ -692,10 +602,12 @@ export default {
       background-color: #cfdbfe;
     }
   }
+
   .file_tips {
     margin: 10px auto;
     width: 70%;
   }
+
   .file_img {
     width: 525px;
     height: 332px;
@@ -712,34 +624,42 @@ export default {
     margin: 0 auto;
   }
 }
+
 //查看车队长成员
 .persionlist_css {
   height: 500px;
   overflow-y: scroll;
+
   .persion_css {
     display: flex;
     margin: 10px 0;
+
     .persion_left,
     .persion_right {
       width: 50%;
     }
+
     .persion_right {
       text-align: right;
       margin-right: 10px;
     }
   }
 }
+
 //查看账单
 .billList_css {
   height: 500px;
   overflow-y: scroll;
+
   .bill_css {
     display: flex;
     margin: 10px 0;
+
     .bill_left,
     .bill_right {
       width: 50%;
     }
+
     .bill_right {
       text-align: right;
       margin-right: 10px;

src/views/driverManagement/fleetInfo.vue

@@ -37,7 +37,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -289,7 +289,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/driverManagement/identityExamine.vue

@@ -51,7 +51,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -59,7 +59,7 @@
             </template>
         </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="90"></el-table-column>
-        <el-table-column prop="driverPhone" label="账号" min-width="130"></el-table-column>
+        <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
         <el-table-column prop="carCaptainName" label="车队长" min-width="165">
           <template scope="scope">
@@ -746,7 +746,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/driverManagement/vehicleExamine.vue

@@ -42,7 +42,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="58vh" border highlight-current-row>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -57,10 +57,10 @@
             <span>{{scope.row.carCategory}}</span>
             <span>{{scope.row.carType}}</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号"></el-table-column>
-        <el-table-column prop="guaCarNumber" label="挂车车牌号"></el-table-column>
-        <el-table-column prop="amountMoney" label="附件" min-width="133">
+        </el-table-column> 
+        <el-table-column prop="carNumber" label="车牌号" min-width="90"></el-table-column>
+        <el-table-column prop="guaCarNumber" label="挂车车牌号" min-width="100"></el-table-column>
+        <el-table-column prop="amountMoney" label="附件">
           <template scope="scope">
             <div>
               <span class="btn_css" @click="fujianLook(scope.row)">查看</span>
@@ -91,8 +91,8 @@
         </el-table-column>
         <el-table-column prop="energyType" label="能源类型"></el-table-column>
         <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column prop="updateDate" label="更新日期"></el-table-column>
-        <el-table-column label="操作" min-width="350">
+        <el-table-column prop="updateDate" label="更新日期" min-width="160"></el-table-column>
+        <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="adopt(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.status != '审核中'">通过</el-link>
@@ -193,7 +193,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-drawer title="车辆详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="车辆详情" :visible.sync="rightSee">
       <div class="right_css">
         <div style='height:80vh;overflow-y:scroll;'>
           <!-- <div class="title_name">基本信息</div> -->
@@ -547,7 +547,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -546,7 +546,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;

src/views/feedbackManagement/userFeedback.vue

@@ -33,7 +33,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -261,7 +261,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/officialWebsiteManagement/newInfo.vue

@@ -148,7 +148,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/officialWebsiteManagement/newsAdd.vue

@@ -186,7 +186,7 @@
 <style lang="scss" scoped>
   .center {
     background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
+    min-height: calc(100vh - 50px);
     padding-top: 20px;
 
   }
@@ -194,7 +194,6 @@
   .main_css {
     width: 96%;
     height: 90vh;
-    overflow-y: scroll;
     background: #FFFFFF;
     margin: 20px auto;
     padding-top: 20px;

src/views/officialWebsiteManagement/newsEdit.vue

@@ -209,7 +209,7 @@
 <style lang="scss" scoped>
   .center {
     background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
+    min-height: calc(100vh - 50px);
     padding-top: 20px;
 
   }

src/views/officialWebsiteManagement/notice.vue

@@ -148,7 +148,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/officialWebsiteManagement/noticeAdd.vue

@@ -186,7 +186,7 @@
 <style lang="scss" scoped>
   .center {
     background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
+    min-height: calc(100vh - 50px);
     padding-top: 20px;
 
   }

src/views/officialWebsiteManagement/noticeEdit.vue

@@ -209,7 +209,7 @@
 <style lang="scss" scoped>
   .center {
     background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
+    min-height: calc(100vh - 50px);
     padding-top: 20px;
 
   }

src/views/officialWebsiteManagement/publicity.vue

@@ -148,7 +148,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/officialWebsiteManagement/publicityAdd.vue

@@ -185,7 +185,7 @@ export default {
 <style lang="scss" scoped>
 .center {
   background: #F5F6F7;
-  height: calc(100vh - 4.5vh);
+  min-height: calc(100vh - 50px);
   padding-top: 20px;
 
 }

src/views/officialWebsiteManagement/publicityEdit.vue

@@ -222,7 +222,7 @@
 <style lang="scss" scoped>
   .center {
     background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
+    min-height: calc(100vh - 50px);
     padding-top: 20px;
 
   }

src/views/operationLog/logManagement.vue

@@ -167,7 +167,6 @@
         (date.split('-')[2] < 10 ?
           '0' + date.split('-')[2] :
           date.split('-')[2]);
-        debugger
       this.value1 = [this.startDate, this.endDate];
       this.getList();
     },
@@ -317,7 +316,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       min-width: 1020px;

src/views/orderManagement/orderAudit.vue

@@ -46,7 +46,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="60vh" border
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border
         @row-click="handleRowClick" @selection-change="handleSelectionChange" highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
@@ -82,7 +82,6 @@
         <el-table-column prop="freight" label="预计运费(元)"></el-table-column>
         <el-table-column prop="actualFreight" label="实际运费(元)"></el-table-column>
         <el-table-column prop="advanceCharge" label="预付运费(元)"></el-table-column>
-
         <el-table-column prop="amountMoney" label="司机费用结算">
           <!-- <el-table-column prop="driverServiceCharge" label="服务费(元)"></el-table-column> -->
           <el-table-column prop="payable" label="应付(元)"></el-table-column>
@@ -168,7 +167,8 @@
                   <!-- 垫付类型的订单，平台确认卸车后从未进行过尾款操作（即尾款=0）时显示的按钮。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-link :disabled="scope.row.orderStatus != '运输中' && scope.row.orderStatus != '已完结'" target="_blank"
+                  <!-- :disabled="scope.row.orderStatus != '运输中'" -->
+                  <el-link :disabled="scope.row.orderStatus == '未装车'||scope.row.orderStatus == '待货主确认'||scope.row.orderStatus == '未装车'" target="_blank"
                     type="primary" :underline="false" @click="toMapPage(scope.row)">轨迹</el-link>
                 </el-dropdown-item>
               </el-dropdown-menu>
@@ -221,8 +221,7 @@
         <img src="../../../public/img/yonghu.jpg" class="user_item" />
       </div>
     </el-dialog>
-
-    <el-drawer title="订单详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="订单详情" :visible.sync="rightSee">
       <div class="right_css">
         <div>
           <div class="title_name">基本信息</div>
@@ -747,7 +746,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
 
   .top_css {

src/views/orderManagement/trajectory.vue

@@ -5,8 +5,11 @@
         <el-radio v-model="radio" label="1" @change="change('1')">北斗导航</el-radio>
         <el-radio v-model="radio" label="2" @change="change('2')">平台绘制</el-radio>
         <div class="order-detail">
-          <div>订单：{{ querydata.orderNo }}（{{ startDate }} ~ <span
+          <!-- <div>订单：{{ querydata.orderNo }}（{{ startDate }} ~ <span
               v-if='querydata.orderStatus == "已完结"'>{{ endDate }}</span><span v-else>运输中</span> ）</div>
+          <div> -->
+            <!-- {{ startDate }} ~ <span>{{ endDate }}</span> -->
+            <div>订单：{{ querydata.orderNo }}（<span>{{ querydata.orderStatus }}</span> ）</div>
           <div>
             发货地：{{ querydata.sendPrivate }}{{ querydata.sendCity }}{{ querydata.sendArea }}{{ querydata.sendDetailedAddress }}
           </div>
@@ -74,8 +77,10 @@ export default {
       _obj.currentPage = this.currentPage
       _obj.pageSize = this.pageSize
       travelpath(_obj).then(response => {
-        this.startDate = response.data.startDate
-        this.endDate = response.data.endDate
+        if(response.data.records.length>0){
+          this.startDate = response.data.records[0].startDate
+          this.endDate = response.data.records[0].endDate
+        }
         this.deptBudgetTotal = response.data.total
       }).catch(() => {})
     }

src/views/parkReportManagement/dailyReport.vue

@@ -16,7 +16,8 @@
               <el-input class='find' v-model="searchkeyWord" placeholder="可按订单号、姓名、账号查找" @keyup.enter.native="find"
                 clearable @change="find" />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
-                  src="../../../public/img/sousuo.png"></el-button><span class="count_css">共{{ deptBudgetTotal
+                  src="../../../public/img/sousuo.png"></el-button><span class="count_css">共{{
+                    deptBudgetTotal
                   }}条</span>
             </div>
           </el-col>
@@ -44,7 +45,7 @@
         </el-row>
       </div>
       <el-table @selection-change="handleSelectionChange" :data="tableData"
-        style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50">
@@ -53,7 +54,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="orderNo" label="订单编号" min-width="155"/>
+        <el-table-column prop="orderNo" label="订单编号" min-width="155" />
         <el-table-column prop="driverName" label="司机姓名" />
         <el-table-column prop="payeeName" label="收款人" />
         <el-table-column prop="driverPhone" label="司机账号" />
@@ -61,11 +62,12 @@
         <el-table-column prop="amountMoney" label="金额(元)" />
         <el-table-column prop="paymentType" label="类型" />
         <el-table-column prop="escalationStatus" label="状态">
-           <template slot-scope="scope1">
-            <span>{{scope1.row.escalationStatus}}</span>
-              <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top" v-if="scope1.row.escalationStatus == '未通过'">
-                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
-              </el-tooltip>
+          <template slot-scope="scope1">
+            <span>{{ scope1.row.escalationStatus }}</span>
+            <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top"
+              v-if="scope1.row.escalationStatus == '未通过'">
+              <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
+            </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column prop="paymentDate" label="付款时间" min-width="100" />
@@ -84,7 +86,7 @@
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
-    <el-drawer title="流水单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="流水单信息" :visible.sync="rightSee">
       <div class="right_css">
         <div class="right_item">单证号：{{ dailyReportData.documentNo }}</div>
         <div class="right_title">实际承运人</div>
@@ -114,9 +116,9 @@
         <!-- <div class="right_title">收款帐户信息</div>
         <div class="right_item">{{ dailyReportData.driverName }}</div> -->
         <div class="right_title" v-if="dailyReportData.bankKey">收款方银行代码</div>
-        <div class="right_item" v-if="dailyReportData.bankKey">{{dailyReportData.bankKey}}</div>
-         <div class="right_title">收款方银行卡开户行</div>
-        <div class="right_item">{{dailyReportData.bankDeposit}}</div>
+        <div class="right_item" v-if="dailyReportData.bankKey">{{ dailyReportData.bankKey }}</div>
+        <div class="right_title">收款方银行卡开户行</div>
+        <div class="right_item">{{ dailyReportData.bankDeposit }}</div>
         <div class="right_title">收款方银行卡银行网点名称</div>
         <div class="right_item">{{ dailyReportData.bankDepositBranch }}</div>
         <div class="right_title">收款方银行卡卡号</div>
@@ -126,12 +128,18 @@
         <div class="right_title">实际支付金额</div>
         <div class="right_item">{{ dailyReportData.amountMoney }}</div>
         <div class="right_title">支付凭证文件</div>
-        <div class="right_item">{{ dailyReportData.paymentVoucher }}</div>
+        <!-- <div class="right_item">{{ dailyReportData.paymentVoucher }}</div> -->
+        <div style="display: flex;" v-if="dailyReportData.paymentVoucher">
+          <div v-for="(item, index) in dailyReportData.paymentVoucher.split(',')" :key="index">
+            <img :src="item" class="img_css" @click="enlarge(item)">
+          </div>
+        </div>
         <div class="right_btn">
           <el-button @click="rightSee = false">关闭</el-button>
         </div>
       </div>
     </el-drawer>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -142,6 +150,10 @@ import {
   dailyReporGetInfo
 } from '@/api/parkReportManagement'
 export default {
+  components: {
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
   data() {
     return {
       show: false,
@@ -163,12 +175,23 @@ export default {
       disabled: false,
       rejectInfo: false,
       rightSee: false,
+      //图片预览
+      srcList: [],
+      imgsVisible: false,
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
+    enlarge(url) {
+      this.imgsVisible = true;
+      this.srcList.push(url)
+    },
+    closeImgViewer() {
+      this.srcList = []
+      this.imgsVisible = false;
+    },
     dateChange(e) {
       this.startDate = e[0]
       this.endDate = e[1]
@@ -304,7 +327,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;
@@ -587,7 +610,7 @@ export default {
 
 .right_css {
   // overflow-y: auto !important;
-  min-height: 1266px;
+  // min-height: 1266px;
   padding: 0 20px;
 
   .right_title {
@@ -623,6 +646,7 @@ export default {
     margin-top: 10px;
   }
 }
+
 .find::v-deep input.el-input__inner {
   border-radius: 0;
 }

src/views/parkReportManagement/driverInformationReporting.vue

@@ -43,7 +43,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border
         highlight-current-row @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
@@ -449,7 +449,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;

src/views/parkReportManagement/vehicleInformationReporting.vue

@@ -16,7 +16,8 @@
               <el-input class='find' placeholder="可按司机姓名和账号查找" @keyup.enter.native="find" v-model="searchkeyWord"
                 clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
-                  src="../../../public/img/sousuo.png" /></el-button><span class="count_css">共{{ deptBudgetTotal
+                  src="../../../public/img/sousuo.png" /></el-button><span class="count_css">共{{
+                    deptBudgetTotal
                   }}条</span>
             </div>
           </el-col>
@@ -43,7 +44,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border
         highlight-current-row @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
@@ -59,26 +60,31 @@
         <el-table-column prop="guaCarNumber" label="挂车车牌号"></el-table-column>
         <el-table-column prop="drivingLicenseValidityDate" label="行驶证有效期">
           <template slot-scope="scope">
-            <span
-              :class="scope.row.drivingOverdueFlag == 1 ? 'red_text' : ''">{{ scope.row.drivingLicenseValidityDate }}</span>
+            <span :class="scope.row.drivingOverdueFlag == 1 ? 'red_text' : ''">{{
+              scope.row.drivingLicenseValidityDate
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="trailerLicenseValidityDate" label="挂车行驶证有效期">
           <template slot-scope="scope">
-            <span
-              :class="scope.row.trailerOverdueFlag == 1 ? 'red_text' : ''">{{ scope.row.trailerLicenseValidityDate }}</span>
+            <span :class="scope.row.trailerOverdueFlag == 1 ? 'red_text' : ''">{{
+              scope.row.trailerLicenseValidityDate
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="operationCertificateValidityDate" label="道路运输证有效期">
           <template slot-scope="scope">
-            <span
-              :class="scope.row.operationOverdueFlag == 1 ? 'red_text' : ''">{{ scope.row.operationCertificateValidityDate }}</span>
+            <span :class="scope.row.operationOverdueFlag == 1 ? 'red_text' : ''">{{
+              scope.row.operationCertificateValidityDate
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="上报时间">
           <template slot-scope="scope">
             <span
-              v-if="scope.row.escalationStatus && scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{ scope.row.updateDate }}</span>
+              v-if="scope.row.escalationStatus && scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{
+                scope.row.updateDate
+              }}</span>
             <!-- 未认证和待上报不显示时间 -->
           </template>
         </el-table-column>
@@ -162,7 +168,8 @@
         </div>
         <div class="file_tips">
           <span v-if="count == 1">有效期：{{ file.cardValidityDate }} </span><span v-if="count == 2">
-            准驾车型：{{ file.quasiDrivingVehicle }} </span> <span v-if="count == 2"> 发证机关：{{ file.lssuingAuthority }} </span>
+            准驾车型：{{ file.quasiDrivingVehicle }} </span> <span v-if="count == 2"> 发证机关：{{ file.lssuingAuthority }}
+          </span>
           <span v-if="count == 4"> 从业资格证号：{{ file.qualificationCertificateNumber }}</span>
         </div>
         <div class="file_img">
@@ -459,7 +466,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;

src/views/parkReportManagement/waybillReporting.vue

@@ -44,7 +44,7 @@
         </el-row>
       </div>
       <el-table @selection-change="handleSelectionChange" :data="tableData"
-        style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="58vh" border highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50">
@@ -58,7 +58,7 @@
         <el-table-column prop="cargoOwnerPhone" label="发运人账号" />
         <el-table-column prop="driverName" label="承运人" />
         <el-table-column prop="driverPhone" label="承运人账号" />
-        <el-table-column prop="orderEndDate" label="订单完结时间" />
+        <el-table-column prop="orderEndDate" label="订单完结时间" min-width="110"/>
         <el-table-column prop="escalationStatus" label="状态">
           <template slot-scope="scope1">
             <span>{{scope1.row.escalationStatus}}</span>
@@ -82,7 +82,7 @@
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
-    <el-drawer title="运单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="运单信息" :visible.sync="rightSee">
       <div class="right_css">
         <div class="right_item">订单编号：{{ orderData.orderNo }}</div>
         <div class="right_title">发货时间</div>
@@ -311,7 +311,7 @@ export default {
 .center {
   padding: 10px 20px;
   background: #f5f6f7;
-  height: calc(100vh - 5vh);
+  min-height: calc(100vh - 50px);
 
   .top_css {
     padding: 10px;
@@ -594,7 +594,7 @@ export default {
 
 .right_css {
   // overflow-y: auto !important;
-  min-height: 1266px;
+  // min-height: 1266px;
   padding: 0 20px;
 
   .right_title {

src/views/permissionSetting/permissionSetting.vue

@@ -448,7 +448,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/permissionSetting/permissionSettingPerson.vue

@@ -817,7 +817,7 @@
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/platformManagement/specifiedRecords.vue

@@ -22,7 +22,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -307,7 +307,7 @@ export default {
 	.center {
 		padding: 10px 20px;
 		background: #f5f6f7;
-		height: calc(100vh - 5vh);
+		min-height: calc(100vh - 50px);
 
 		.top_css {
 			padding: 10px;

src/views/platformManagement/specifiedRecordsAdd.vue

@@ -130,15 +130,13 @@
 <style lang="scss" scoped>
   .center {
     background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
+    min-height: calc(100vh - 50px);
     padding-top: 20px;
-
   }
 
   .main_css {
     width: 96%;
     height: 90vh;
-    overflow-y: scroll;
     background: #FFFFFF;
     margin: 20px auto;
     padding-top: 20px;

src/views/platformManagement/specifiedRecordsLook.vue

@@ -162,11 +162,10 @@
 <style lang="scss" scoped>
 	.center {
 		background: #F5F6F7;
-		height: calc(100vh - 4.5vh);
+		min-height: calc(100vh - 50px);
 		padding-top: 20px;
 
 	}
-
 	.main_css {
 		width: 96%;
 		height: 90vh;

src/views/settlementManagement/CashOwner.vue

@@ -4,17 +4,18 @@
       <div class="top_css">
         <el-row>
           <el-col :span="14">
-          <el-button type="primary" @click="batchaduit">批量审核</el-button>
-          <el-date-picker class='date' v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
-              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-          </el-date-picker>
+            <el-button type="primary" @click="batchaduit">批量审核</el-button>
+            <el-date-picker class='date' v-model="value1" value-format="yyyy-MM-dd" @change="dateChange"
+              type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
           </el-col>
           <el-col :span="10">
-          <div class="screen">
-            <el-input class='find' v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按司机姓名和订单编号查找" clearable />
-            <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
+            <div class="screen">
+              <el-input class='find' v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按司机姓名和订单编号查找"
+                clearable />
+              <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
-          </div>
+            </div>
           </el-col>
         </el-row>
         <el-row>
@@ -37,48 +38,45 @@
           </el-col>
         </el-row>
       </div>
-      <el-table @selection-change="handleSelectionChange" :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table @selection-change="handleSelectionChange" :data="tableData"
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column :selectable="selectable" type="selection" width="55"></el-table-column>
         <!-- <el-table-column prop="index" label="序号" >
           <template slot-scope="scope">
             {{scope.row.$index}}
           </el-table-column>
         </el-table-column> -->
-        <el-table-column type="index" width="60"  label="序号" align="center">
-            <template scope="scope">
-                <span>{{scope.$index + 1}}</span>
-                <!-- <span v-else>{{scope.$index}}</span> -->
-            </template>
+        <el-table-column type="index" width="60" label="序号" align="center">
+          <template scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+            <!-- <span v-else>{{scope.$index}}</span> -->
+          </template>
         </el-table-column>
-        <el-table-column prop="cargoOwnerName" label="货主/法人" ></el-table-column>
-        <el-table-column prop="accountNumber" label="账号" >
+        <el-table-column prop="cargoOwnerName" label="货主/法人"></el-table-column>
+        <el-table-column prop="accountNumber" label="账号">
         </el-table-column>
         <el-table-column prop="payeeName" label="收款方" />
-        <el-table-column prop="bankDeposit" label="开户行" >
+        <el-table-column prop="bankDeposit" label="开户行">
           <template scope="scope">
-            <span>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</span>
+            <span>{{ scope.row.bankDeposit }}-{{ scope.row.bankDepositBranch }}</span>
           </template>
         </el-table-column>
         <el-table-column width="180" prop="bankCard" label="银行卡号" />
         <el-table-column prop="amountMoney" label="金额（元）" />
         <el-table-column prop="createDate" label="发起时间" />
-        <el-table-column prop="status" label="状态" >
+        <el-table-column prop="status" label="状态">
           <template scope="scope">
-            <span v-if='scope.row.status!="已到账"'>{{scope.row.status=='审核中'?'待审核':scope.row.status}}</span>
-            <el-popover
-               v-else
-              placement="top-start"
-              title=""
-              width="200"
-              trigger="click">
+            <span v-if='scope.row.status != "已到账"'>{{ scope.row.status == '审核中' ? '待审核' : scope.row.status }}</span>
+            <el-popover v-else placement="top-start" title="" width="200" trigger="click">
               <div v-html='scope.row.content'></div>
-              <span>{{scope.row.status}}</span>
+              <span>{{ scope.row.status }}</span>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" >
+        <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-link v-if='scope.row.status=="审核中"' target="_blank" type="primary" :underline="false" @click="aduit(scope.row)">通过</el-link>
+            <el-link v-if='scope.row.status == "审核中"' target="_blank" type="primary" :underline="false"
+              @click="aduit(scope.row)">通过</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -93,466 +91,468 @@ import {
   getListwithdrawal,
   batchAduit
 } from '@/api/settlementManagement'
-  export default {
-    data() {
-      return {
-        startDate: '',
-        endDate: '',
-         value1: '',
-        tableData: [],
-        // 分页
-        searchkeyWord: '',
-        currentPage: 1,
-        pageSize: 10,
-        deptBudgetTotal: 0,
-        deptCircularPage: {},
-        multipleSelection:[],
-        search: '',
-        disabled: false,
-      }
+export default {
+  data() {
+    return {
+      startDate: '',
+      endDate: '',
+      value1: '',
+      tableData: [],
+      // 分页
+      searchkeyWord: '',
+      currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      deptCircularPage: {},
+      multipleSelection: [],
+      search: '',
+      disabled: false,
+    }
+  },
+  mounted() {
+    this.getPassYearFormatDate()
+    this.getList()
+  },
+  methods: {
+    dateChange(e) {
+      this.startDate = e[0]
+      this.endDate = e[1]
+      this.getList()
     },
-    mounted() {
-      this.getPassYearFormatDate()
+    searchBtn(status) {
+      this.search = status
       this.getList()
     },
-    methods: {
-      dateChange(e) {
-        this.startDate = e[0]
-        this.endDate = e[1]
-        this.getList()
-      },
-      searchBtn(status){
-        this.search=status
-        this.getList()
-      },
-      // 默认日期
-      getPassYearFormatDate() {
-        var nowDate = new Date()
-        var _date = new Date()
-        var year = nowDate.getFullYear()-1
-        var year1 = _date.getFullYear()
-        var month = nowDate.getMonth() + 1
-        var month1 = _date.getMonth() + 1
-        var strDate = nowDate.getDate()
-        var strDate1 = _date.getDate()
-        if (month >= 1 && month <= 9) {
-          month = '0' + month
-        }
-        if (month1 >= 1 && month1 <= 9) {
-          month1 = '0' + month1
-        }
+    // 默认日期
+    getPassYearFormatDate() {
+      var nowDate = new Date()
+      var _date = new Date()
+      var year = nowDate.getFullYear() - 1
+      var year1 = _date.getFullYear()
+      var month = nowDate.getMonth() + 1
+      var month1 = _date.getMonth() + 1
+      var strDate = nowDate.getDate()
+      var strDate1 = _date.getDate()
+      if (month >= 1 && month <= 9) {
+        month = '0' + month
+      }
+      if (month1 >= 1 && month1 <= 9) {
+        month1 = '0' + month1
+      }
 
-        if (strDate >= 0 && strDate <= 9) {
-          strDate = '0' + strDate
-        }
-        if (strDate1 >= 0 && strDate1 <= 9) {
-          strDate1 = '0' + strDate1
-        }
-        this.startDate = year + '-' + month + '-' + strDate
-        this.endDate = year1 + '-' + month1 + '-' + strDate1
-        this.value1 = [this.startDate, this.endDate]
-      },
-      selectable(row,index){
-        if(row.status=='已通过'||row.status=='已到账'){
-          return false
-        }else{
-          return true
-        }
-      },
-      batchaduit(){
-        var money=0
-        var name=[]
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          money+=this.multipleSelection[i].amountMoney
-          if(name.indexOf(this.multipleSelection[i].driverName)==-1){
-              name.push(this.multipleSelection[i].driverName)
-            }
-        }
-        if(this.multipleSelection.length>0){
-          this.$confirm(`确定给${this.multipleSelection[0].cargoOwnerName}等${name.length}人打款合计${money}元？`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            this.listLoading = true
-            var _aduit = {}
-            _aduit.hyCargoOwnerCapitalInfos=this.multipleSelection
-            batchAduit(_aduit).then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '支付成功！',
-                  type: 'success'
-                })
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
-              })
-          })
-        }else{
-          this.$notify({
-            title: '失败',
-            message: '至少选中一条待审核的条目！',
-            type: 'error'
-          })
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = '0' + strDate
+      }
+      if (strDate1 >= 0 && strDate1 <= 9) {
+        strDate1 = '0' + strDate1
+      }
+      this.startDate = year + '-' + month + '-' + strDate
+      this.endDate = year1 + '-' + month1 + '-' + strDate1
+      this.value1 = [this.startDate, this.endDate]
+    },
+    selectable(row, index) {
+      if (row.status == '已通过' || row.status == '已到账') {
+        return false
+      } else {
+        return true
+      }
+    },
+    batchaduit() {
+      var money = 0
+      var name = []
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        money += this.multipleSelection[i].amountMoney
+        if (name.indexOf(this.multipleSelection[i].driverName) == -1) {
+          name.push(this.multipleSelection[i].driverName)
         }
-      },
-      aduit(row){
-        this.$confirm(`确定给${row.cargoOwnerName}打款${row.amountMoney}元？`,'提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
+      }
+      if (this.multipleSelection.length > 0) {
+        this.$confirm(`确定给${this.multipleSelection[0].cargoOwnerName}等${name.length}人打款合计${money}元？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             this.listLoading = true
             var _aduit = {}
-            _aduit.hyCargoOwnerCapitalInfos=[row]
+            _aduit.hyCargoOwnerCapitalInfos = this.multipleSelection
             batchAduit(_aduit).then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '支付成功！',
-                  type: 'success'
-                })
-                this.getList()
-                this.listLoading = false
+              this.$notify({
+                title: '成功',
+                message: '支付成功！',
+                type: 'success'
               })
+              this.getList()
+              this.listLoading = false
+            })
               .catch(() => {
                 this.loading = false
               })
           })
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      getList() {
-        this.loading = true
-        const _obj = {}
-        _obj.currentPage = this.currentPage
-        _obj.pageSize = this.pageSize
-        _obj.searchKeyWord = this.searchkeyWord
-        _obj.startDate =  this.startDate
-        _obj.endDate= this.endDate
-        _obj.searchType = this.search
-        getListwithdrawal(_obj).then(response => {
-          if(response.data.records.length>0){
-            for (let i = 0; i < response.data.records.length; i++) {
-              if(response.data.records[i].status=='已到账'){
-                response.data.records[i].content='流水号：'+response.data.records[i].serialNumber+'<br/>到账时间：'+response.data.records[i].paymentDate
-              }else{
-                response.data.records[i].content=''
-              }
-            }
-          }
-            this.tableData = response.data.records
-            this.deptBudgetTotal = response.data.total
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '至少选中一条待审核的条目！',
+          type: 'error'
+        })
+      }
+    },
+    aduit(row) {
+      this.$confirm(`确定给${row.cargoOwnerName}打款${row.amountMoney}元？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.listLoading = true
+          var _aduit = {}
+          _aduit.hyCargoOwnerCapitalInfos = [row]
+          batchAduit(_aduit).then(response => {
+            this.$notify({
+              title: '成功',
+              message: '支付成功！',
+              type: 'success'
+            })
+            this.getList()
             this.listLoading = false
           })
-          .catch(() => {
-            this.loading = false
-          })
-      },
-      find() {
-        this.currentPage = 1
-        this.getList()
-      },
-      look(row) {
-        this.$router.push({
-          path: 'newsLook',
-          query: {
-            id: row.id,
+            .catch(() => {
+              this.loading = false
+            })
+        })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    getList() {
+      this.loading = true
+      const _obj = {}
+      _obj.currentPage = this.currentPage
+      _obj.pageSize = this.pageSize
+      _obj.searchKeyWord = this.searchkeyWord
+      _obj.startDate = this.startDate
+      _obj.endDate = this.endDate
+      _obj.searchType = this.search
+      getListwithdrawal(_obj).then(response => {
+        if (response.data.records.length > 0) {
+          for (let i = 0; i < response.data.records.length; i++) {
+            if (response.data.records[i].status == '已到账') {
+              response.data.records[i].content = '流水号：' + response.data.records[i].serialNumber + '<br/>到账时间：' + response.data.records[i].paymentDate
+            } else {
+              response.data.records[i].content = ''
+            }
           }
+        }
+        this.tableData = response.data.records
+        this.deptBudgetTotal = response.data.total
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.loading = false
         })
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      }
+    },
+    find() {
+      this.currentPage = 1
+      this.getList()
+    },
+    look(row) {
+      this.$router.push({
+        path: 'newsLook',
+        query: {
+          id: row.id,
+        }
+      })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
     }
   }
+}
 </script>
 <style lang="scss" scoped>
-  .center {
-    padding: 10px 20px;
-    background: #f5f6f7;
-    height: calc(100vh - 5vh);
-
-    .top_css {
-      padding: 10px;
-
-      .search_btn {
-        display: flex;
-        margin-top: 20px;
-
-        .search_item {
-          text-align: center;
-          font-size: 14px;
-          font-weight: 600;
-          line-height: 40px;
-          width: 112px;
-          height: 40px;
-          background: #f7f8f9;
-          cursor: pointer
-        }
+.center {
+  padding: 10px 20px;
+  background: #f5f6f7;
+  min-height: calc(100vh - 50px);
 
-        .searchNo {
-          color: #323233;
-        }
-
-        .search {
-          color: #2f53eb;
-          background: #ffffff;
-        }
-      }
-    }
+  .top_css {
+    padding: 10px;
 
-    .ask_css {
-      position: absolute;
-      margin: 3px 0 0 10px;
-    }
-
-    .center_css {
-      background: #ffffff;
-      border-radius: 1px;
-      margin-top: 10px;
-      padding-bottom: 10px;
-    }
-
-    .screen {
+    .search_btn {
       display: flex;
+      margin-top: 20px;
 
-      .search {
-        width: 40px;
-        height: 40px;
-        background: #2f53eb;
-        border-radius: 0px 2px 2px 0px;
-        border: 1px solid #DCDFE6;
-        margin-left:-1px;
-      }
-
-      .count_css {
-        width: 80px;
+      .search_item {
         text-align: center;
+        font-size: 14px;
+        font-weight: 600;
         line-height: 40px;
-        color: #666666;
-      }
-    }
-
-    .el-button {
-      padding: 10px 20px !important;
-    }
-
-    .center_css {
-
-      ::v-deep .el-table th,
-      ::v-deep .el-table td {
-        text-align: center;
+        width: 112px;
+        height: 40px;
+        background: #f7f8f9;
+        cursor: pointer
       }
 
-      .fujian {
-        font-size: 24px;
-        color: #409eff;
+      .searchNo {
+        color: #323233;
       }
 
-      .warning {
-        font-size: 14px;
-        color: #ed1d1d;
+      .search {
+        color: #2f53eb;
+        background: #ffffff;
       }
     }
   }
 
-  .car_css {
-    width: 50%;
-    display: inline-block;
-    text-align: center;
-    margin-top: 30px;
-    position: relative;
-
-    .status_css {
-      background: #3AC602;
-      width: 50px;
-      height: 17px;
-      position: absolute;
-      top: 0px;
-      right: 15px;
-      border-radius: 3px;
-    }
+  .ask_css {
+    position: absolute;
+    margin: 3px 0 0 10px;
+  }
 
-    .carno_css {
-      padding: 1px 5px;
-      background-color: #F5F6F7;
-      color: #666666;
-      border-radius: 12px;
-      text-align: center;
-      width: 100px;
-      margin: 10px auto 0;
-    }
+  .center_css {
+    background: #ffffff;
+    border-radius: 1px;
+    margin-top: 10px;
+    padding-bottom: 10px;
+  }
+
+  .screen {
+    display: flex;
 
-    .carborder_css {
-      border: 1px solid #F0F1F2;
-      margin: 15px auto 0;
-      width: 90%;
+    .search {
+      width: 40px;
+      height: 40px;
+      background: #2f53eb;
+      border-radius: 0px 2px 2px 0px;
+      border: 1px solid #DCDFE6;
+      margin-left: -1px;
     }
-  }
 
-  .tips {
-    color: #999999;
-    font-size: 14px;
+    .count_css {
+      width: 80px;
+      text-align: center;
+      line-height: 40px;
+      color: #666666;
+    }
   }
 
-  .car_item {
-    width: 200px;
-    height: 160px;
-    border-radius: 5px;
+  .el-button {
+    padding: 10px 20px !important;
   }
 
-  .user {
-    margin-bottom: 20px;
+  .center_css {
 
-    .id_css {
-      font-size: 14px;
+    ::v-deep .el-table th,
+    ::v-deep .el-table td {
+      text-align: center;
     }
 
-    .id_css,
-    .name_css {
-      margin: 5px 0;
-      color: #0D0D0D;
+    .fujian {
+      font-size: 24px;
+      color: #409eff;
     }
 
-    .pay_name {
-      color: #9D9D9D;
+    .warning {
       font-size: 14px;
+      color: #ed1d1d;
     }
+  }
+}
+
+.car_css {
+  width: 50%;
+  display: inline-block;
+  text-align: center;
+  margin-top: 30px;
+  position: relative;
+
+  .status_css {
+    background: #3AC602;
+    width: 50px;
+    height: 17px;
+    position: absolute;
+    top: 0px;
+    right: 15px;
+    border-radius: 3px;
+  }
 
-    .name_css {
-      font-size: 16px;
-    }
+  .carno_css {
+    padding: 1px 5px;
+    background-color: #F5F6F7;
+    color: #666666;
+    border-radius: 12px;
+    text-align: center;
+    width: 100px;
+    margin: 10px auto 0;
+  }
 
-    .user_item {
-      margin: 25px 0;
-      width: 450px;
-      height: 300px;
-    }
+  .carborder_css {
+    border: 1px solid #F0F1F2;
+    margin: 15px auto 0;
+    width: 90%;
+  }
+}
 
-    .border_css {
-      width: 100%;
-      border: 1px solid #F0F1F2;
-    }
+.tips {
+  color: #999999;
+  font-size: 14px;
+}
+
+.car_item {
+  width: 200px;
+  height: 160px;
+  border-radius: 5px;
+}
+
+.user {
+  margin-bottom: 20px;
+
+  .id_css {
+    font-size: 14px;
   }
 
-  ::v-deep .el-table--border .el-table__header th {
-    background: #f7f8f9;
+  .id_css,
+  .name_css {
+    margin: 5px 0;
+    color: #0D0D0D;
   }
 
-  .btn_css {
-    color: #409EFF;
-    cursor: pointer
+  .pay_name {
+    color: #9D9D9D;
+    font-size: 14px;
   }
 
-  .btn_css1 {
-    margin-left: -20px;
+  .name_css {
+    font-size: 16px;
   }
 
-  .sign {
-    font-size: 14px;
-    color: red;
+  .user_item {
+    margin: 25px 0;
+    width: 450px;
+    height: 300px;
   }
 
-  .form_css {
+  .border_css {
     width: 100%;
-    margin: 20px auto 20px;
+    border: 1px solid #F0F1F2;
+  }
+}
 
-    ::v-deep .el-checkbox {
-      width: 40%;
-      height: 30px;
-    }
+::v-deep .el-table--border .el-table__header th {
+  background: #f7f8f9;
+}
 
-    // ::v-deep .el-dialog__body{
-    // 	padding: 10px 20px;
-    // }
-    ::v-deep .el-dialog__title {
-      font-size: 16px;
-    }
+.btn_css {
+  color: #409EFF;
+  cursor: pointer
+}
 
-    ::v-deep .el-textarea__inner {
-      background: #F0F1F2;
-    }
+.btn_css1 {
+  margin-left: -20px;
+}
 
-    .form_btn {
-      text-align: right;
-      margin-top: 10px;
-    }
+.sign {
+  font-size: 14px;
+  color: red;
+}
+
+.form_css {
+  width: 100%;
+  margin: 20px auto 20px;
+
+  ::v-deep .el-checkbox {
+    width: 40%;
+    height: 30px;
   }
 
-  //发送信息
-  .Info_css {
-    .Info_title {
-      color: #323233;
-      font-size: 16px;
-    }
+  // ::v-deep .el-dialog__body{
+  // 	padding: 10px 20px;
+  // }
+  ::v-deep .el-dialog__title {
+    font-size: 16px;
+  }
 
-    .Info_item {
-      margin: 20px 0;
-    }
+  ::v-deep .el-textarea__inner {
+    background: #F0F1F2;
+  }
 
-    .Info_btn {
-      text-align: right;
-      margin-top: 10px;
-    }
+  .form_btn {
+    text-align: right;
+    margin-top: 10px;
   }
+}
 
-  //附件
-  .file {
-    .fujian_css {
-      width: 631px;
-      display: flex;
-      margin: 0 auto;
-      text-align: center;
-      line-height: 32px;
-      border: 1px solid #F0F1F2;
-      border-right: 0px;
-      border-radius: 2px 0px 0px 2px;
-
-      .fujian_item {
-        cursor: pointer;
-        width: 90px;
-        height: 32px;
-        border-right: 1px solid #F0F1F2;
-      }
+//发送信息
+.Info_css {
+  .Info_title {
+    color: #323233;
+    font-size: 16px;
+  }
 
-      .file_btn {
-        color: #2F53EB;
-        background-color: #CFDBFE;
-      }
-    }
+  .Info_item {
+    margin: 20px 0;
+  }
 
-    .file_img {
-      width: 525px;
-      height: 332px;
-      margin: 20px auto;
+  .Info_btn {
+    text-align: right;
+    margin-top: 10px;
+  }
+}
+
+//附件
+.file {
+  .fujian_css {
+    width: 631px;
+    display: flex;
+    margin: 0 auto;
+    text-align: center;
+    line-height: 32px;
+    border: 1px solid #F0F1F2;
+    border-right: 0px;
+    border-radius: 2px 0px 0px 2px;
+
+    .fujian_item {
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      border-right: 1px solid #F0F1F2;
     }
 
-    .img_css {
-      width: 525px;
-      height: 332px;
+    .file_btn {
+      color: #2F53EB;
+      background-color: #CFDBFE;
     }
+  }
 
-    .btn {
-      width: 400px;
-      margin: 0 auto;
-    }
+  .file_img {
+    width: 525px;
+    height: 332px;
+    margin: 20px auto;
   }
-  .date{
-    margin:0 10px;
+
+  .img_css {
+    width: 525px;
+    height: 332px;
   }
-  .find::v-deep input.el-input__inner{
-    border-radius:0;
+
+  .btn {
+    width: 400px;
+    margin: 0 auto;
   }
+}
+
+.date {
+  margin: 0 10px;
+}
+
+.find::v-deep input.el-input__inner {
+  border-radius: 0;
+}
 </style>

src/views/settlementManagement/advancePaymentAndRepaymentSettlement.vue

@@ -34,7 +34,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <!-- <el-table-column prop="index" label="序号" >
           <template slot-scope="scope">
             {{scope.row.$index}}
@@ -176,7 +176,7 @@ import {
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/settlementManagement/driverFeeSettlement.vue

@@ -41,7 +41,7 @@
           </el-col>
         </el-row>
       </div>
-      <el-table @selection-change="handleSelectionChange" :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table @selection-change="handleSelectionChange" :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
         <el-table-column type="selection" :selectable="checkSelectable" width="55"></el-table-column>
         <!-- <el-table-column prop="index" label="序号" >
           <template slot-scope="scope">
@@ -454,7 +454,7 @@ import {
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;

src/views/settlementManagement/ownerFlow.vue

@@ -18,7 +18,7 @@
         </el-row>
       </div>
       
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="57vh" border highlight-current-row>
         <!-- <el-table-column prop="index" label="序号" >
           <template slot-scope="scope">
             {{scope.row.$index}}
@@ -141,7 +141,7 @@ import {
   .center {
     padding: 10px 20px;
     background: #f5f6f7;
-    height: calc(100vh - 5vh);
+    min-height: calc(100vh - 50px);
 
     .top_css {
       padding: 10px;