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

src/api/parkReportManagement.js

@@ -39,3 +39,12 @@ export function carReport(data) {
      data: data,
   })
 }
+  //查看单条数据
+  export function carGetInfo(data) {
+    return request({
+      url: '/driverCarInfo/getDriverCarInfo',
+      method: 'get',
+      params: data,
+    })
+  }
+

src/api/settlementManagement.js

@@ -15,6 +15,22 @@ export function getListaccountstatement(data) {
      params: data,
   })
 }
+// 司机运费结算列表
+export function getListdriverfreight(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/selectFreightSettlement',
+    method: 'get',
+     params: data,
+  })
+}
+// 垫付还款结算列表
+export function getListpadsettleaccounts(data) {
+  return request({
+    url: '/repaymentInfo/selectAdvanceRepayment',
+    method: 'get',
+     params: data,
+  })
+}
 // 货主提现批量审核
 export function batchAduit(data) {
   return request({
@@ -22,4 +38,20 @@ export function batchAduit(data) {
     method: 'post',
      data: data,
   })
+}
+// 司机运费结算暂缓支付
+export function deferpay(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/api/deferredPayment',
+    method: 'post',
+     data: data,
+  })
+}
+// 司机运费结算批量付款
+export function batchpay(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/api/paymentList',
+    method: 'post',
+     data: data,
+  })
 }

src/views/driverManagement/vehicleExamine.vue

@@ -141,6 +141,9 @@
           <div class="fujian_item" :class="count == 8 ? 'file_btn' : ''" @click="btnChange(8)">
             人车合影
           </div>
+          <div class="fujian_item" :class="count == 9 ? 'file_btn' : ''" @click="btnChange(9)">
+            人和挂车合影
+          </div>
         </div>
         <div class="file_tips">
           <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>
@@ -280,6 +283,9 @@
         } else if (num == 8) {
           this.index = 0;
           this.img[0] = this.file.addressUrl;
+        } else if (num == 9) {
+          this.index = 0;
+          this.img[0] = this.file.guaAddressUrl;
         }
       },
 

src/views/feedbackManagement/userFeedback.vue

@@ -35,6 +35,7 @@
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
         <el-table-column prop="number" label="工单编号"></el-table-column>
+        <el-table-column prop="orderNo" label="关联订单"></el-table-column>
         <el-table-column prop="initiator" label="发起方"></el-table-column>
         <el-table-column prop="initiatorNumber" label="发起方账号"></el-table-column>
         <el-table-column prop="passive" label="被动方"></el-table-column>

src/views/operationLog/logManagement.vue

@@ -189,7 +189,7 @@
           let fileName = headers["content-disposition"];
           fileName = fileName.split('=')[1]
           //download是a标签的一个属性，可以自定义文件名称
-          a.download = fileName;
+          a.download = "日志记录.xlsx";
           let binaryData = [];
           binaryData.push(blob);
           // a.href = URL.createObjectURL(blob);

src/views/orderManagement/orderAudit.vue

@@ -49,13 +49,13 @@
         @row-click="handleRowClick" @selection-change="handleSelectionChange" highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
-        <el-table-column type="index" label="序号" width="50">
+        <el-table-column fixed="left" type="index" label="序号" width="50">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="orderNo" label="订单编号" min-width="182">
+        <el-table-column fixed="left" prop="orderNo" label="订单编号" min-width="182">
           <template scope="scope">
             <div>{{scope.row.orderNo}} <span class="pad_css" v-if="scope.row.freightAdvance == '垫付'">垫</span></div>
           </template>
@@ -111,7 +111,7 @@
               width="200"
               trigger="hover">
               <div v-html='scope.row.content'></div>
-              <i v-if='scope.row.cargoOwnerStatus=="已终止"' slot="reference" class="el-icon-question"></i>
+              <i v-if='scope.row.cargoOwnerStatus=="已终止"&&scope.row.terminator' slot="reference" class="el-icon-question"></i>
             </el-popover>
           </template>
         </el-table-column>
@@ -212,105 +212,107 @@
 
     <el-drawer title="订单详情" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
-        <div class="title_name">基本信息</div>
-        <div class="right_item">订单编号：{{costData.orderNo}}</div>
-        <div class="right_title">货主</div>
-        <div class="right_item">{{costData.cargoOwner}}</div>
-        <div class="right_title">司机</div>
-        <div class="right_item">{{costData.driverName}}</div>
-        <div class="right_title">发货单位</div>
-        <div class="right_item">{{costData.compName}}</div>
-        <div class="right_title">发货地</div>
-        <div class="right_item">
-          {{costData.sendPrivate}}{{costData.sendCity}}{{costData.sendArea}}{{costData.sendDetailedAddress}}
-        </div>
-        <div class="right_title">卸货地</div>
-        <div class="right_item">
-          {{costData.unloadPrivate}}{{costData.unloadCity}}{{costData.unloadArea}}{{costData.unloadDetailedAddress}}
-        </div>
-         <div class="right_title">货物类别</div>
-        <div class="right_item">{{costData.goodsType}}</div>
-        <div class="right_title">货名</div>
-        <div class="right_item">{{costData.goodsName}}</div>
-        <div class="right_title">发货联系人</div>
-        <div class="right_item">{{costData.publishTaskInfo.sender}}</div>
-         <div class="right_title">发货联系人电话</div>
-        <div class="right_item">{{costData.publishTaskInfo.senderPhone}}</div>
-
-         <div class="right_title">收货联系人</div>
-        <div class="right_item">{{costData.publishTaskInfo.receiver}}</div>
-         <div class="right_title">收货联系人电话</div>
-        <div class="right_item">{{costData.publishTaskInfo.receiverPhone}}</div>
-         <div class="right_title">收货人身份证号</div>
-        <div class="right_item">{{costData.publishTaskInfo.receiverIdcard}}</div>
-          <div class="right_title">收货方信用代码（选填）</div>
-        <div class="right_item">{{costData.publishTaskInfo.receiverCreditCode?costData.publishTaskInfo.receiverCreditCode:'暂无'}}</div>
-
-
-        <div class="right_title">距离</div>
-        <div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
-        <div class="right_title">预计运费</div>
-        <div class="right_item">{{costData.freight}}</div>
-        <el-divider v-if="costData.hyCarrierInfo"></el-divider>
-        <div v-if="costData.hyCarrierInfo">
-          <div class="title_name">承运信息</div>
-          <div class="right_title">承运合同编号</div>
-          <div class="right_item">{{costData.contractNo}}</div>
-          <div class="right_title">委托合同编号</div>
-          <div class="right_item">{{costData.wtContractNo}}</div>
-          <div class="right_title">车牌号</div>
-          <div class="right_item">{{costData.hyCarrierInfo.carNo}}</div>
-          <!-- <div class="right_title">预计运费</div>
-          <div class="right_item">{{costData.hyCarrierInfo.estimatedFreight}}</div> -->
-          <div class="right_title">装车时间</div>
-          <div class="right_item">{{costData.hyCarrierInfo.loadingDate}}</div>
-          <div class="right_title">装车定位</div>
-          <div class="right_item">{{costData.hyCarrierInfo.loadingCity}}{{costData.hyCarrierInfo.loadingArea}}</div>
-          <div class="right_title">装车照片</div>
-          <div style="display: flex;" v-if="costData.hyCarrierInfo.loadingImg">
-            <div v-for="(item,index) in costData.hyCarrierInfo.loadingImg.split(',')" :key="index">
-              <img :src="item" class="img_css" @click="enlarge(item)">
+        <div style='height:80vh;overflow-y:scroll;'>
+          <div class="title_name">基本信息</div>
+          <div class="right_item">订单编号：{{costData.orderNo}}</div>
+          <div class="right_title">货主</div>
+          <div class="right_item">{{costData.cargoOwner}}</div>
+          <div class="right_title">司机</div>
+          <div class="right_item">{{costData.driverName}}</div>
+          <div class="right_title">发货单位</div>
+          <div class="right_item">{{costData.compName}}</div>
+          <div class="right_title">发货地</div>
+          <div class="right_item">
+            {{costData.sendPrivate}}{{costData.sendCity}}{{costData.sendArea}}{{costData.sendDetailedAddress}}
+          </div>
+          <div class="right_title">卸货地</div>
+          <div class="right_item">
+            {{costData.unloadPrivate}}{{costData.unloadCity}}{{costData.unloadArea}}{{costData.unloadDetailedAddress}}
+          </div>
+          <div class="right_title">货物类别</div>
+          <div class="right_item">{{costData.goodsType}}</div>
+          <div class="right_title">货名</div>
+          <div class="right_item">{{costData.goodsName}}</div>
+          <div class="right_title">发货联系人</div>
+          <div class="right_item">{{costData.publishTaskInfo.sender}}</div>
+          <div class="right_title">发货联系人电话</div>
+          <div class="right_item">{{costData.publishTaskInfo.senderPhone}}</div>
+
+          <div class="right_title">收货联系人</div>
+          <div class="right_item">{{costData.publishTaskInfo.receiver}}</div>
+          <div class="right_title">收货联系人电话</div>
+          <div class="right_item">{{costData.publishTaskInfo.receiverPhone}}</div>
+          <div class="right_title">收货人身份证号</div>
+          <div class="right_item">{{costData.publishTaskInfo.receiverIdcard}}</div>
+            <div class="right_title">收货方信用代码（选填）</div>
+          <div class="right_item">{{costData.publishTaskInfo.receiverCreditCode?costData.publishTaskInfo.receiverCreditCode:'暂无'}}</div>
+
+
+          <div class="right_title">距离</div>
+          <div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
+          <div class="right_title">运费</div>
+          <div class="right_item">{{costData.freight}}</div>
+          <el-divider v-if="costData.hyCarrierInfo"></el-divider>
+          <div v-if="costData.hyCarrierInfo">
+            <div class="title_name">承运信息</div>
+            <div class="right_title">承运合同编号</div>
+            <div class="right_item">{{costData.contractNo}}</div>
+            <div class="right_title">委托合同编号</div>
+            <div class="right_item">{{costData.wtContractNo}}</div>
+            <div class="right_title">车牌号</div>
+            <div class="right_item">{{costData.hyCarrierInfo.carNo}}</div>
+            <div class="right_title">预计运费</div>
+            <div class="right_item">{{costData.hyCarrierInfo.estimatedFreight}}</div>
+            <div class="right_title">装车时间</div>
+            <div class="right_item">{{costData.hyCarrierInfo.loadingDate}}</div>
+            <div class="right_title">装车定位</div>
+            <div class="right_item">{{costData.hyCarrierInfo.loadingCity}}{{costData.hyCarrierInfo.loadingArea}}</div>
+            <div class="right_title">装车照片</div>
+            <div style="display: flex;" v-if="costData.hyCarrierInfo.loadingImg">
+              <div v-for="(item,index) in costData.hyCarrierInfo.loadingImg.split(',')" :key="index">
+                <img :src="item" class="img_css" @click="enlarge(item)">
+              </div>
+            </div>
+            <div class="right_title" v-if="costData.hyCarrierInfo.totalFreight">合计应付运费</div>
+            <div class="right_item">{{costData.hyCarrierInfo.totalFreight}}</div>
+            <div class="right_title" v-if="costData.hyCarrierInfo.unloadingDate">卸车时间</div>
+            <div class="right_item">{{costData.hyCarrierInfo.unloadingDate}}</div>
+            <div class="right_title">卸车定位</div>
+            <div class="right_item">{{costData.hyCarrierInfo.unloadingCity}}{{costData.hyCarrierInfo.unloadingArea}}</div>
+            <div class="right_title" v-if="costData.hyCarrierInfo.unloadingImg">卸车照片</div>
+            <div style="display: flex;" v-if="costData.hyCarrierInfo.unloadingImg">
+              <div v-for="(item,index) in costData.hyCarrierInfo.unloadingImg.split(',')" :key="index">
+                <img :src="item" class="img_css" @click="enlarge(item)">
+              </div>
             </div>
           </div>
-          <div class="right_title" v-if="costData.hyCarrierInfo.totalFreight">合计应付运费</div>
-          <div class="right_item">{{costData.hyCarrierInfo.totalFreight}}</div>
-          <div class="right_title" v-if="costData.hyCarrierInfo.unloadingDate">卸车时间</div>
-          <div class="right_item">{{costData.hyCarrierInfo.unloadingDate}}</div>
-          <div class="right_title">卸车定位</div>
-          <div class="right_item">{{costData.hyCarrierInfo.unloadingCity}}{{costData.hyCarrierInfo.unloadingArea}}</div>
-          <div class="right_title" v-if="costData.hyCarrierInfo.unloadingImg">卸车照片</div>
-          <div style="display: flex;" v-if="costData.hyCarrierInfo.unloadingImg">
-            <div v-for="(item,index) in costData.hyCarrierInfo.unloadingImg.split(',')" :key="index">
-              <img :src="item" class="img_css" @click="enlarge(item)">
+          <el-divider v-if="costData.freightInfo"></el-divider>
+          <div v-if="costData.freightInfo">
+            <div class="title_name">运费信息（单位：元）</div>
+            <div class="right_title">预付运费</div>
+            <div class="right_item">{{costData.freightInfo.prepaidFreight}} <span
+                style="margin-left: 100px;">{{costData.freightInfo.prepaidFreightDate}}</span></div>
+            <div class="right_title">运费尾款</div>
+            <div class="right_item">{{costData.freightInfo.freightBalance?costData.freightInfo.freightBalance:'未支付'}}
+              <span style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
+            <div class="right_title" v-if="costData.freightInfo.freightBalance">明细</div>
+            <div class="right_item" v-if="costData.freightInfo.freightBalance">
+              预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元，服务费{{costData.freightInfo.driverServiceCharge ? costData.freightInfo.driverServiceCharge:0}}元，尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元，合计收款{{costData.freightInfo.totalCollection ? costData.freightInfo.totalCollection:0}}元。
             </div>
           </div>
-        </div>
-        <el-divider v-if="costData.freightInfo"></el-divider>
-        <div v-if="costData.freightInfo">
-          <div class="title_name">运费信息（单位：元）</div>
-          <div class="right_title">预付运费</div>
-          <div class="right_item">{{costData.freightInfo.prepaidFreight}} <span
-              style="margin-left: 100px;">{{costData.freightInfo.prepaidFreightDate}}</span></div>
-          <div class="right_title">运费尾款</div>
-          <div class="right_item">{{costData.freightInfo.freightBalance?costData.freightInfo.freightBalance:'未支付'}}
-            <span style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
-          <div class="right_title" v-if="costData.freightInfo.freightBalance">明细</div>
-          <div class="right_item" v-if="costData.freightInfo.freightBalance">
-            预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元，服务费{{costData.freightInfo.driverServiceCharge ? costData.freightInfo.driverServiceCharge:0}}元，尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元，合计收款{{costData.freightInfo.totalCollection ? costData.freightInfo.totalCollection:0}}元。
+          <el-divider v-if="costData.repaymentInfo"></el-divider>
+          <div v-if="costData.repaymentInfo">
+            <div class="title_name">还款信息</div>
+            <div class="right_title">运费</div>
+            <div class="right_item">{{costData.freight}}</div>
+            <div class="right_title">超期费（每天3%）</div>
+            <div class="right_item">{{costData.repaymentInfo.overdueFee}}</div>
+            <div class="right_title">合计应还</div>
+            <div class="right_item">{{costData.repaymentInfo.totalRepayable}}</div>
+            <div class="right_title">还款（尾号6666）</div>
+            <div class="right_item">{{costData.repaymentInfo.alreadyRepaid}}</div>
           </div>
         </div>
-        <el-divider v-if="costData.repaymentInfo"></el-divider>
-        <div v-if="costData.repaymentInfo">
-          <div class="title_name">还款信息</div>
-          <div class="right_title">运费</div>
-          <div class="right_item">{{costData.freight}}</div>
-          <div class="right_title">超期费（每天3%）</div>
-          <div class="right_item">{{costData.repaymentInfo.overdueFee}}</div>
-          <div class="right_title">合计应还</div>
-          <div class="right_item">{{costData.repaymentInfo.totalRepayable}}</div>
-          <div class="right_title">还款（尾号6666）</div>
-          <div class="right_item">{{costData.repaymentInfo.alreadyRepaid}}</div>
-        </div>
         <div class="right_btn">
           <el-button @click="submit(1)" v-if="costData.orderStatusKey == 9 || costData.orderStatusKey == 19">
             确认</el-button>

src/views/parkReportManagement/driverInformationReporting.vue

@@ -276,7 +276,7 @@
           this.$message.error("请勾选要上报的条目")
           return
         }
-          this.$confirm("确定上报信息？", "提示", {
+          this.$confirm("确定上报司机信息？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -286,7 +286,7 @@
              if (response.code == 200) {
               this.$notify({
                 title: "成功",
-                message: "上报成功！",
+                message: "司机信息上报成功！",
                 type: "success",
               });
               this.musterList = []
@@ -408,13 +408,11 @@
         this.getList();
       },
       selectInit(row) {
-        // if (row.escalationStatus != '未上报'|| row.escalationStatus != '未通过') {  
-        //   return false;
-        // }else{
-        //   return true;
-        // }
+        if (row.escalationStatus != '未上报'&& row.escalationStatus != '未通过') {  
+          return false;
+        }else{
           return true;
-        
+        }
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`);

src/views/parkReportManagement/vehicleInformationReporting.vue

@@ -55,25 +55,27 @@
           </template>
         </el-table-column>
         <el-table-column prop="driverName" label="司机姓名"></el-table-column>
-        <el-table-column prop="driverPhone" label="账号"></el-table-column>
-        <el-table-column prop="driverLicenseValidityStartDate" label="驾驶证有效期">
+        <el-table-column prop="accountNumber" label="账号"></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="drivingLicenseValidityDate" label="行驶证有效期">
           <template slot-scope="scope">
-            <span :class="scope.row.driverOverdueFlag == 1?'red_text':''">{{scope.row.driverLicenseValidityStartDate}}</span>
+            <span :class="scope.row.drivingOverdueFlag == 1?'red_text':''">{{scope.row.drivingLicenseValidityDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="qualificationCertificateValidityDate" label="从业资格证有效期">
+        <el-table-column prop="trailerLicenseValidityDate" label="挂车行驶证有效期">
            <template slot-scope="scope">
-            <span :class="scope.row.qualificationOverdueFlag == 1?'red_text':''">{{scope.row.qualificationCertificateValidityDate}}</span>
+            <span :class="scope.row.trailerOverdueFlag == 1?'red_text':''">{{scope.row.trailerLicenseValidityDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="cardValidityDate" label="身份证有效期">
-             <template slot-scope="scope">
-            <span :class="scope.row.overdueFlag == 1?'red_text':''">{{scope.row.cardValidityDate}}</span>
+        <el-table-column prop="operationCertificateValidityDate" label="道路运输证有效期">
+          <template slot-scope="scope">
+            <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.updateDate}}</span><!-- 未认证和待上报不显示时间 -->
+            <span v-if="scope.row.escalationStatus&&scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{scope.row.updateDate}}</span><!-- 未认证和待上报不显示时间 -->
           </template>
         </el-table-column>
         <el-table-column prop="paymentDate" label="附件">
@@ -89,10 +91,14 @@
                 scope.row.trailerOperationOverdueFlag == 1
               ">
               <div slot="content">
-                <span v-if="scope.row.overdueFlag == 1">身份证已过有效期<br /></span>
-                <span v-if="scope.row.driverOverdueFlag == 1">驾驶证已过有效期<br /></span><span
-                  v-if="scope.row.qualificationOverdueFlag == 1">从业资格证已过有效期<br /></span>
-              </div>
+                  <!-- <span v-if="scope.row.overdueFlag == 1">身份证已过有效期<br /></span> -->
+                  <!-- <span v-if="scope.row.driverOverdueFlag == 1">驾驶证已过有效期<br /></span> -->
+                  <span v-if="scope.row.drivingOverdueFlag == 1">行驶证已过有效期<br /></span>
+                  <span v-if="scope.row.trailerOverdueFlag == 1">挂车行驶证已过有效期<br /></span>
+                  <span v-if="scope.row.operationOverdueFlag == 1">运营证已过有效期<br /></span>
+                  <span v-if="scope.row.operationOverdueFlag == 1">道路运输证已过有效期<br /></span>
+                  <span v-if="scope.row.trailerOperationOverdueFlag == 1">挂车道路运输证已过有效期<br /></span>
+                </div>
               <span style="margin-top: 10px"></span>
               <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
             </el-tooltip>
@@ -129,19 +135,19 @@
       :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> -->
+          <!-- <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)">
-            行驶证
           </div> -->
-          <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
-            从业资格证
+          <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
+            行驶证
           </div>
-          <!-- <div class="fujian_item" :class="count == 5 ? 'file_btn' : ''" @click="btnChange(5)">
+          <!-- <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
+            从业资格证
+          </div> -->
+          <div class="fujian_item" :class="count == 5 ? 'file_btn' : ''" @click="btnChange(5)">
             挂车行驶证
           </div>
           <div class="fujian_item" :class="count == 6 ? 'file_btn' : ''" @click="btnChange(6)">
@@ -149,7 +155,7 @@
           </div>
           <div class="fujian_item" :class="count == 7 ? 'file_btn' : ''" @click="btnChange(7)">
             挂车运营证
-          </div> -->
+          </div>
         </div>
         <div class="file_tips">
           <span v-if="count == 1">有效期：{{file.cardValidityDate}} </span><span v-if="count == 2">
@@ -170,35 +176,45 @@
     <el-drawer title="司机信息" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
         <div class="title_name">基本信息</div>
-        <div class="right_item">姓名：{{costData.driverName}}</div>
-        <div class="right_title">性别</div>
-        <div class="right_item">{{costData.driverSex}} </div>
-         <div class="right_title">手机号码</div>
-        <div class="right_item">{{costData.driverPhone}} </div>
-         <div class="right_title">身份证照片(人像面)</div>
-        <img :src="costData.cardAddressUrl" alt="" class="img_css" @click="enlarge(costData.cardAddressUrl)">
-        <div class="right_title">身份证照片(国徽面)</div>
-         <img :src="costData.cardBackAddressUrl" alt="" class="img_css"  @click="enlarge(costData.cardBackAddressUrl)">
-        <div class="right_title">身份证号：</div>
-        <div class="right_item">{{costData.numberCard}}</div>
-        <div class="right_title">身份证有效期</div>
-        <div class="right_item">{{costData.cardValidityDate}} </div>
-         <div class="right_title">驾驶证照片(正页)</div>
-        <img :src="costData.driverLicenseHomePage" alt="" class="img_css" @click="enlarge(costData.driverLicenseHomePage)">
-        <div class="right_title">驾驶证照片(副页)</div>
-        <img :src="costData.driverLicenseBackPage" alt="" class="img_css" @click="enlarge(costData.driverLicenseBackPage)">
-        <div class="right_title">准驾车型</div>
-        <div class="right_item">{{costData.quasiDrivingVehicle}}</div>
-        <div class="right_title">驾驶证发证机关</div>
-        <div class="right_item">{{costData.lssuingAuthority}}</div>
-        <div class="right_title">驾驶证有效期</div>
-        <div class="right_item">{{costData.driverLicenseValidityDate}}</div>
-        <div class="right_title">道路运输从业资格证照片</div>
-        <img :src="costData.qualificationCertificate" alt="" class="img_css" @click="enlarge(costData.qualificationCertificate)">
-        <div class="right_title">从业资格证有效期</div>
-        <div class="right_item">{{costData.qualificationCertificateValidityDate}} </div>
-        <div class="right_title">从业资格证号</div>
-        <div class="right_item">{{costData.qualificationCertificateNumber}} </div>
+        <div class="right_item">车辆号{{costData.carNumber}}</div>
+        <div class="right_title">所有人</div>
+        <div class="right_item">{{costData.owner}} </div>
+         <div class="right_title">使用性质</div>
+        <div class="right_item">{{costData.useNature}} </div>
+         <!-- <div class="right_title">车辆识别代号</div>
+        <div class="right_item">{{costData.useNature}} </div> -->
+        <div class="right_title">发证机关</div>
+          <div class="right_item">{{costData.lssuingAuthority}} </div>
+        <div class="right_title">车长(毫米)</div>
+        <div class="right_item">{{costData.carLong}}</div>
+        <div class="right_title">车宽(毫米)</div>
+        <div class="right_item">{{costData.carWidth}} </div>
+         <div class="right_title">车高(毫米)</div>
+        <div class="right_item">{{costData.carHeight}} </div>
+        <div class="right_title">注册日期</div>
+      <div class="right_item">{{costData.trailerLicenseRegistrationDate}} </div>
+        <div class="right_title">发证日期</div>
+        <div class="right_item">{{costData.drivingLicenseIssueDate}}</div>
+        <div class="right_title">车辆能源类型</div>
+        <div class="right_item">{{costData.energyType}}</div>
+        <div class="right_title">核定载质量</div>
+        <div class="right_item">{{costData.carApprovedWeight}}</div>
+        <div class="right_title">总质量</div>
+        <div class="right_item">{{costData.servicingWeight}}</div>
+        <div class="right_title">道路运输证号</div>
+        <div class="right_item">{{costData.operationCertificateNumber}} </div>
+        <div class="right_title">行驶证有效期</div>
+        <div class="right_item">{{costData.drivingLicenseValidityDate}} </div>
+        <div class="right_title">行驶证照片（正页）</div>
+         <img :src="costData.drivingLicenseHomePage" alt="" class="img_css" @click="enlarge(costData.drivingLicenseHomePage)">
+        <div class="right_title">行驶证照片（副页）</div>
+         <img :src="costData.drivingLicenseBackPage" alt="" class="img_css" @click="enlarge(costData.drivingLicenseBackPage)">
+        <div class="right_title">道路运输证照片</div>
+         <img :src="costData.operationCertificate" alt="" class="img_css" @click="enlarge(costData.operationCertificate)">
+        <div class="right_title">挂车道路运输证照片</div>
+         <img :src="costData.trailerOperationCertificate" alt="" class="img_css" @click="enlarge(costData.trailerOperationCertificate)">
+        <div class="right_title">人车合影照片</div>
+         <img :src="costData.addressUrl" alt="" class="img_css" @click="enlarge(costData.addressUrl)">
       </div>
     </el-drawer>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
@@ -208,7 +224,7 @@
   import {
     carGetList,
     carReport,
-    getInfo
+    carGetInfo
   } from "@/api/parkReportManagement";
   export default {
     components: {
@@ -281,12 +297,12 @@
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
-          carReport({hyDriverInfoList:this.musterList})
+          carReport({hyDriverCarInfoList:this.musterList})
           .then((response) => {
              if (response.code == 200) {
               this.$notify({
                 title: "成功",
-                message: "上报成功！",
+                message: "车辆上报成功！",
                 type: "success",
               });
               this.musterList = []
@@ -305,8 +321,8 @@
       see(row) { 
         this.loading = true
         this.rightSee = true
-        getInfo({
-            commonId: row.commonId
+        carGetInfo({
+            id: row.id
           }).then(response => {
             this.costData = response.data
             this.listLoading = false
@@ -408,13 +424,11 @@
         this.getList();
       },
       selectInit(row) {
-        // if (row.escalationStatus != '未上报'|| row.escalationStatus != '未通过') {  
-        //   return false;
-        // }else{
-        //   return true;
-        // }
+        if (row.escalationStatus != '未上报' && row.escalationStatus != '未通过') {  
+          return false;
+        }else{
           return true;
-        
+        }
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`);
@@ -548,7 +562,7 @@
   //附件
   .file {
     .fujian_css {
-      width: 270px;
+      width: 330px;
       display: flex;
       margin: 0 auto;
       text-align: center;

src/views/settlementManagement/CashOwner.vue

@@ -161,12 +161,15 @@ import {
       },
       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}等${this.multipleSelection.length}人打款合计${money}元？`, '提示', {
+          this.$confirm(`确定给${this.multipleSelection[0].cargoOwnerName}等${name.length}人打款合计${money}元？`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -197,7 +200,7 @@ import {
         }
       },
       aduit(row){
-        this.$confirm(`确定给${row.cargoOwnerName}打款${row.amountMoney}元？`, '提示', {
+        this.$confirm(`确定给${row.cargoOwnerName}打款${row.amountMoney}元？`,'提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'

src/views/settlementManagement/advancePaymentAndRepaymentSettlement.vue

@@ -46,16 +46,16 @@
                 <!-- <span v-else>{{scope.$index}}</span> -->
             </template>
         </el-table-column>
-        <el-table-column prop="number" label="订单编号" />
-        <el-table-column prop="title" label="货主" />
-         <el-table-column prop="issuingDate" label="账号" />
-        <el-table-column prop="issuingAgency" label="所属企业" />
+        <el-table-column prop="orderNo" label="订单编号" />
+        <el-table-column prop="cargoOwnerName" label="货主" />
+         <el-table-column prop="accountNumber" label="账号" />
+        <el-table-column prop="affiliatedEnterprise" label="所属企业" />
         <el-table-column prop="updateDate" label="垫付金额（元）" />
-        <el-table-column prop="updateDate" label="超期金额（元）" />
-        <el-table-column prop="updateDate" label="合计应还（元）" />
-        <el-table-column prop="updateDate" label="已还金额（元）" />
-        <el-table-column prop="updateDate" label="未还金额（元）" />
-        <el-table-column prop="updateDate" label="还款时间" />
+        <el-table-column prop="overdueFee" label="超期金额（元）" />
+        <el-table-column prop="totalRepayable" label="合计应还（元）" />
+        <el-table-column prop="alreadyRepaid" label="已还金额（元）" />
+        <el-table-column prop="notRepaid" label="未还金额（元）" />
+        <el-table-column prop="repaymentDate" label="还款时间" />
         <el-table-column prop="status" label="状态" >
           <template scope="scope">
             <span>{{scope.row.status}}</span>
@@ -70,7 +70,7 @@
 </template>
 <script>
 import {
-  getListwithdrawal
+  getListpadsettleaccounts
 } from '@/api/settlementManagement'
   export default {
     data() {
@@ -85,7 +85,7 @@ import {
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: 1,
+        search: '',
         disabled: false,
       }
     },
@@ -134,8 +134,14 @@ import {
         _obj.searchKeyWord = this.searchkeyWord
         _obj.startDate =  this.startDate
         _obj.endDate= this.endDate
-        _obj.searchType = '公告'
-        getList(_obj).then(response => {
+        _obj.searchType = this.scarch
+        getListpadsettleaccounts(_obj).then(response => {
+          if(response.data.records.length>0){
+            for (let i = 0; i < response.data.records.length; i++) {
+              response.data.records[i].padmoney=response.data.records[i].serviceCharge+response.data.records[i].freight
+              
+            }
+          }
             this.tableData = response.data.records
             this.deptBudgetTotal = response.data.total
             this.listLoading = false

src/views/settlementManagement/driverFeeSettlement.vue

@@ -21,17 +21,17 @@
         <el-row>
           <el-col>
             <div class="search_btn">
-              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
+              <div :class="searchType == '' ? 'search' : 'searchNo'" class="search_item search_block"
                 @click="searchBtn('')">
                 全部
               </div>
-              <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
+              <div :class="searchType == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
                 待支付
               </div>
-              <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+              <div :class="searchType == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
                 已支付
               </div>
-              <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+              <div :class="searchType == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 暂缓中
               </div>
             </div>
@@ -39,7 +39,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>
-        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="selection" :selectable="checkSelectable" width="55"></el-table-column>
         <!-- <el-table-column prop="index" label="序号" >
           <template slot-scope="scope">
             {{scope.row.$index}}
@@ -51,11 +51,22 @@
                 <!-- <span v-else>{{scope.$index}}</span> -->
             </template>
         </el-table-column>
-        <el-table-column prop="number" label="订单编号" />
-        <el-table-column prop="title" label="司机姓名" />
-         <el-table-column prop="issuingDate" label="开户行" />
-        <el-table-column prop="issuingAgency" label="银行卡号" />
-        <el-table-column prop="updateDate" label="付款类型" />
+        <el-table-column prop="orderNo" label="订单编号" >
+          <template scope="scope">
+              <span>{{scope.row.orderNo}}</span>
+              <span class="pad_css" v-if="scope.row.freightAdvance == '1'">垫</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="driverName" label="司机姓名" />
+         <el-table-column prop="issuingDate" label="开户行" >
+            <template scope="scope">
+              <span>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="bankCard" label="银行卡号" />
+        <el-table-column prop="paymentType" label="付款类型" />
+        <el-table-column prop="amountMoney" label="金额（元）" />
+        <el-table-column prop="paymentDate" label="付款时间" />
         <el-table-column prop="status" label="状态" >
           <template scope="scope">
             <span>{{scope.row.status}}</span>
@@ -64,7 +75,6 @@
         <el-table-column label="操作" min-width="300">
           <template slot-scope="scope">
             <el-link v-if='scope.row.status!="已付款"' target="_blank" type="primary" :underline="false" @click="payment(scope.row)">付款</el-link>
-           
           </template>
         </el-table-column>
       </el-table>
@@ -76,7 +86,9 @@
 </template>
 <script>
 import {
-  getListwithdrawal
+  getListdriverfreight,
+  deferpay,
+  batchpay
 } from '@/api/settlementManagement'
   export default {
     data() {
@@ -93,6 +105,7 @@ import {
         deptCircularPage: {},
         multipleSelection:[],
         search: 1,
+        searchType:'1',
         disabled: false,
       }
     },
@@ -101,6 +114,17 @@ import {
       this.getList()
     },
     methods: {
+      checkSelectable(row) {
+        if(row.status!='已付款'){
+          return true
+        }else{
+          return false
+        }
+      },
+      searchBtn(status){
+        this.searchType=status
+        this.getList()
+      },
       dateChange(e) {
         this.startDate = e[0]
         this.endDate = e[1]
@@ -142,9 +166,9 @@ import {
           })
           .then(() => {
             this.listLoading = true
-            var _del = {}
-            _del.id = row.id
-            delFormData(_del).then(response => {
+            var _obj = {}
+            _obj.hyFreightSettlementInfos=this.multipleSelection
+            deferpay(_obj).then(response => {
                 this.$notify({
                   title: '成功',
                   message: '操作成功！',
@@ -168,16 +192,24 @@ import {
       },
       batchpayment(){
         if(this.multipleSelection.length>0){
-          this.$confirm('确定支付张三等5人运费合计6000.000元？', '提示', {
+          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)
+            }
+          }
+          this.$confirm(`确定支付${this.multipleSelection[0].driverName}等${name.length}人运费合计${money}元？`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           })
           .then(() => {
             this.listLoading = true
-            var _del = {}
-            _del.id = row.id
-            delFormData(_del).then(response => {
+            var _obj = {}
+            _obj.hyFreightSettlementInfos = this.multipleSelection
+            batchpay(_obj).then(response => {
                 this.$notify({
                   title: '成功',
                   message: '支付成功！',
@@ -199,16 +231,16 @@ import {
         }
       },
       payment(row){
-        this.$confirm('确定支付张三等5人运费合计6000.000元？', '提示', {
+        this.$confirm(`确定支付${row.driverName}运费${row.amountMoney}元？`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           })
           .then(() => {
             this.listLoading = true
-            var _del = {}
-            _del.id = row.id
-            delFormData(_del).then(response => {
+            var _obj = {}
+            _obj.hyFreightSettlementInfos = [row]
+            batchpay(_obj).then(response => {
                 this.$notify({
                   title: '成功',
                   message: '支付成功！',
@@ -233,8 +265,8 @@ import {
         _obj.searchKeyWord = this.searchkeyWord
         _obj.startDate =  this.startDate
         _obj.endDate= this.endDate
-        _obj.searchType = '公告'
-        getList(_obj).then(response => {
+        _obj.searchType = this.searchType
+        getListdriverfreight(_obj).then(response => {
             this.tableData = response.data.records
             this.deptBudgetTotal = response.data.total
             this.listLoading = false
@@ -544,4 +576,10 @@ import {
   .find::v-deep input.el-input__inner{
     border-radius:0;
   }
+  .pad_css {
+    background: #F0F4FF;
+    color: #2F53EB;
+    padding: 2px;
+    margin-left: 10px;
+  }
 </style>