前端

src/views/orderManagement/orderAudit.vue

@@ -95,7 +95,26 @@
          </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" min-width="160"></el-table-column>
-        <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92"></el-table-column>
+        <!-- <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92">
+          <template scope="scope">
+            <span>{{scope.row.cargoOwnerStatus}}</span>
+            <i v-if='scope.row.cargoOwnerStatus=="已"' class="el-icon-question"></i>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92">
+          <template slot-scope="scope">
+            <span>{{scope.row.cargoOwnerStatus}}</span>
+            <el-popover
+              v-if='scope.row.terminator==1||scope.row.terminator==2'
+              placement="top-start"
+              :title="scope.row.terminator==1?'司机终止订单':'货主终止订单'"
+              width="200"
+              trigger="hover">
+              <div v-html='scope.row.content'></div>
+              <i v-if='scope.row.cargoOwnerStatus=="已终止"' slot="reference" class="el-icon-question"></i>
+            </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="350">
           <template slot-scope="scope">
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
@@ -191,7 +210,7 @@
       </div>
     </el-dialog>
 
-    <el-drawer title="任务详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <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>
@@ -243,6 +262,8 @@
           <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">
@@ -253,6 +274,8 @@
           <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">
@@ -441,6 +464,24 @@
         _obj.startDate = this.startDate
         _obj.endDate = this.endDate
         getListData(_obj).then(response => {
+          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
+                }
+                
+              }else{
+                response.data.records[i].content=''
+              }
+            }
+          }
             this.tableData = response.data.records
             this.deptBudgetTotal = response.data.total
             this.listLoading = false