前端

src/views/driverManagement/identityExamine.vue

@@ -52,8 +52,8 @@
         </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 prop="driverName" label="司机姓名" min-width="110"></el-table-column>
-        <el-table-column prop="driverPhone" label="账号" min-width="90"></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="numberCard" label="身份证号" min-width="165"></el-table-column>
         <el-table-column prop="shipmentsNumber" label="承运次数">
           <template scope="scope">

src/views/driverManagement/vehicleExamine.vue

@@ -93,6 +93,7 @@
             <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="lookmessage(scope.row)" type="primary" :underline="false">查看</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -148,6 +149,8 @@
         <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>
           <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>
+          <span v-if="count == 6"> 运输证号：{{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}} </span>
         </div>
         <div class="file_img">
           <img :src="img[index]" class="img_css" @click="enlarge(img[index])" />
@@ -183,6 +186,119 @@
         </div>
       </div>
     </el-dialog>
+    <el-drawer title="订单详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+      <div class="right_css">
+        <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>
+          <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>
+          <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>
+        <div class="right_btn">
+          <el-button @click="submit(1)" v-if="costData.orderStatusKey == 9 || costData.orderStatusKey == 19">
+            确认</el-button>
+          <el-button @click="submit(2)" v-if="costData.orderStatusKey == 9 || costData.orderStatusKey == 19">
+            驳回</el-button>
+          <el-button @click="complete" v-if="costData.cargoOwnerStatusKey == 29">完结</el-button>
+          <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>
@@ -215,6 +331,7 @@
         carSee: {},
         //附件
         file: {},
+        rightSee:false,
         img: [],
         index: "0",
         count: "1",
@@ -230,6 +347,9 @@
       this.getList()
     },
     methods: {
+      lookmessage(row){
+        this.rightSee=true
+      },
       closeImgViewer() {
          this.srcList = []
         this.imgsVisible = false;
@@ -563,7 +683,7 @@
   //查看附件
   .file {
     .fujian_css {
-      width: 620px;
+      width: 746px;
       display: flex;
       margin: 0 auto;
       text-align: center;
@@ -574,7 +694,7 @@
 
       .fujian_item {
         cursor: pointer;
-        width: 105px;
+        width: 135px;
         height: 32px;
         border-right: 1px solid #f0f1f2;
       }

src/views/orderManagement/orderAudit.vue

@@ -471,16 +471,29 @@
           if(response.data.records){
             for (let i = 0; i < response.data.records.length; i++) {
               if(response.data.records[i].cargoOwnerStatus=='已终止'){
-                if(response.data.records[i].terminationReason==1){
-                  response.data.records[i].content='原因：已与货主协商<br/>描述：'+response.data.records[i].terminationReasonDescription
-                }else if(response.data.records[i].terminationReason==2){
-                  response.data.records[i].content='原因：货主原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
-                }else if(response.data.records[i].terminationReason==3){
-                  response.data.records[i].content='原因：司机个人原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
-                }else if(response.data.records[i].terminationReason==4){
-                  response.data.records[i].content='原因：其他<br/>描述：'+response.data.records[i].terminationReasonDescription
+                if(response.data.records[i].terminator==1){
+                  if(response.data.records[i].terminationReason==1){
+                    response.data.records[i].content='原因：已与货主协商<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }else if(response.data.records[i].terminationReason==2){
+                    response.data.records[i].content='原因：货主原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }else if(response.data.records[i].terminationReason==3){
+                    response.data.records[i].content='原因：司机个人原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }else if(response.data.records[i].terminationReason==4){
+                    response.data.records[i].content='原因：其他<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }
+                }else if(response.data.records[i].terminator==2){
+                  if(response.data.records[i].terminationReason==1){
+                    response.data.records[i].content='原因：已与司机协商<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }else if(response.data.records[i].terminationReason==2){
+                    response.data.records[i].content='原因：司机原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }else if(response.data.records[i].terminationReason==3){
+                    response.data.records[i].content='原因：司机个人原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }else if(response.data.records[i].terminationReason==4){
+                    response.data.records[i].content='原因：其他<br/>描述：'+response.data.records[i].terminationReasonDescription
+                  }
                 }
                 
+                
               }else{
                 response.data.records[i].content=''
               }