前端

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -640,9 +640,9 @@
       font-size: 16px;
     }
 
-    ::v-deep .el-textarea__inner {
-      background: #F0F1F2;
-    }
+    // ::v-deep .el-textarea__inner {
+    //   background: #F0F1F2;
+    // }
 
     .form_btn {
       text-align: right;

src/views/driverManagement/identityExamine.vue

@@ -877,9 +877,9 @@
       font-size: 16px;
     }
 
-    ::v-deep .el-textarea__inner {
-      background: #f0f1f2;
-    }
+    // ::v-deep .el-textarea__inner {
+    //   background: #f0f1f2;
+    // }
 
     .form_btn {
       text-align: right;

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -186,7 +186,7 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: '1',
+        search: '5',
         addressUrl: [],
         disabled: false,
         rejectInfo: false,
@@ -230,15 +230,44 @@
       },
       getList() {
         this.loading = true
-        let _obj = {}
-        _obj.currentPage = this.currentPage
-        _obj.pageSize = this.pageSize
-        _obj.searchKeyWord = this.searchkeyWord
-        _obj.searchType = this.search
-        getList(_obj).then(response => {
-            this.tableData = response.data.records
-            this.deptBudgetTotal = response.data.total
-            this.listLoading = false
+       let _obj = {}
+        let start_obj = {}
+        start_obj.currentPage = this.currentPage
+        start_obj.pageSize = this.pageSize
+        start_obj.searchKeyWord = this.searchkeyWord
+        start_obj.searchType = 1
+        console.log(start_obj)
+        getList(start_obj).then(response => {
+          if(response.data.records.length>0){
+            this.search=1
+            _obj.currentPage = this.currentPage
+            _obj.pageSize = this.pageSize
+            _obj.searchKeyWord = this.searchkeyWord
+            _obj.searchType = this.search
+            getList(_obj).then(response => {
+              this.tableData = response.data.records
+              this.deptBudgetTotal = response.data.total
+              this.listLoading = false
+            })
+              .catch(() => {
+            this.loading = false
+          })
+          }else{
+            this.search=''
+            _obj.currentPage = this.currentPage
+            _obj.pageSize = this.pageSize
+            _obj.searchKeyWord = this.searchkeyWord
+            _obj.searchType = this.search
+            getList(_obj).then(response => {
+              this.tableData = response.data.records
+              this.deptBudgetTotal = response.data.total
+              this.listLoading = false
+            })
+              .catch(() => {
+            this.loading = false
+          })
+          }
+            
           })
           .catch(() => {
             this.loading = false

src/views/orderManagement/orderAudit.vue

@@ -104,7 +104,20 @@
          </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 slot-scope="scope">
+            <span>{{scope.row.cargoOwnerStatus}}</span>
+            <el-popover
+              v-if='scope.row.terminator==1'
+              placement="top-start"
+              title="司机终止订单"
+              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"
@@ -234,6 +247,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">
@@ -244,6 +259,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">
@@ -335,7 +352,12 @@
       };
     },
     mounted() {
-      this.getList()
+      console.log(12212,this)
+      var that=this
+      this.$nextTick(()=>{
+        that.getList()
+      })
+      
     },
     methods: {
       closeImgViewer() {
@@ -365,6 +387,7 @@
         })
       },
       getList() {
+        console.log(222222)
         this.loading = true
         let _obj = {}
         _obj.currentPage = this.currentPage
@@ -374,6 +397,26 @@
         _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=''
+              }
+            }
+          }
+          
+          console.log(response.data.records)
             this.tableData = response.data.records
             this.deptBudgetTotal = response.data.total
             this.listLoading = false