zhongtianhaoyuan 2 years ago
parent
commit
7bdb76a3cd
2 changed files with 19 additions and 21 deletions
  1. 17 18
      src/router/index.js
  2. 2 3
      src/views/orderManagement/orderAudit.vue

+ 17 - 18
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

+ 2 - 3
src/views/orderManagement/orderAudit.vue

@@ -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,7 +221,6 @@
         <img src="../../../public/img/yonghu.jpg" class="user_item" />
       </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;'>