Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-htqd

src/permission.js

@@ -17,7 +17,7 @@ NProgress.configure({
   showSpinner: false
 }) // NProgress Configuration
 
-const whiteList = ['/login', '/dashboard'] // no redirect whitelist
+const whiteList = ['/login'] // no redirect whitelist
 
 router.beforeEach(async (to, from, next) => {
   // start progress bar
@@ -41,10 +41,9 @@ router.beforeEach(async (to, from, next) => {
       const hasGetUserInfo = store.getters.name
       // console.log(store.getters)
       if (store.getters.token) {
-        
-        // if (!whiteList.includes(to.path)) {
-        //   checkLoginUser();
-        // }
+        if (!whiteList.includes(to.path)) {
+          checkLoginUser();
+        }
         next();
       } else {
         // try {
@@ -82,11 +81,17 @@ router.beforeEach(async (to, from, next) => {
     //   next(`/login?redirect=${to.path}`)
     //   NProgress.done()
     // }
+    
     if (whiteList.indexOf(to.path) !== -1) {
-      if (!whiteList.includes(to.path)) {
-        checkLoginUser();
-      }
-      next();
+      // if(!localStorage.getItem('ws-pf_userId')){
+      //   next(getLoginOutUrl() + `?redirect=${to.path}`);
+      //   NProgress.done();
+      // }else{
+        if (!whiteList.includes(to.path)) {
+          checkLoginUser();
+        }
+        next();
+      // }
     } else {
       next(getLoginOutUrl() + `?redirect=${to.path}`);
       NProgress.done();

src/store/modules/user.js

@@ -40,7 +40,6 @@ const mutations = {
     state.avatar = avatar
   },
   SET_ROLES: (state, roles) => {
-    console.log(roles)
     state.roles = roles
   },
 }
@@ -122,6 +121,7 @@ const actions = {
     vesselBankFlag = 'B',
     compName = ''
   }) {
+    debugger
     const response = await getInfo()
     const {
       staffName,

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -50,6 +50,12 @@
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
         highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
         <el-table-column prop="phone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="cardNumber" label="身份证号" min-width="165"></el-table-column>
@@ -239,6 +245,22 @@
             </el-input>
           </div>
         </div>
+        <div class="pay_css">
+          <div class="title_css">流水号:</div>
+          <div class="recharge_css" style="margin: -24px 32px 44px 69px;">
+            <el-input type="text" @mousewheel.native.prevent v-model="rechargeData.serialNumber" placeholder="输入流水号"
+              maxlength="30" size="small">
+            </el-input>
+          </div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">银行卡号:</div>
+          <div class="recharge_css" style="margin: -24px 32px 44px 69px;">
+            <el-input type="text" @mousewheel.native.prevent v-model="rechargeData.bankCard" placeholder="输入银行卡号"
+              maxlength="30" size="small">
+            </el-input>
+          </div>
+        </div>
         <div class="recharge_css">
           <div class="title_css">上传截图 :</div>
           <div class="upLoad">
@@ -326,7 +348,7 @@ export default {
       paySee: {},
       rechargeShow: false,
       imageUrl: '',
-      rechargeData: {},
+      rechargeData: {bankCard:''},
     };
   },
   mounted() {
@@ -592,6 +614,9 @@ export default {
     },
     recharge(item) {
       // this.rechargeData = item
+      this.rechargeData.bankCard=item.bankCard
+      this.rechargeData.bankDeposit=item.bankDeposit
+      this.rechargeData.bankDepositBranch=item.bankDepositBranch
       this.rechargeData.name = item.name
       this.rechargeData.rechargeId = item.id;
       this.rechargeData.flag = 1;

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -37,6 +37,12 @@
 				</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 type="index" width="60"  label="序号" align="center">
+					<template scope="scope">
+						<span>{{scope.$index + 1}}</span>
+						<!-- <span v-else>{{scope.$index}}</span> -->
+					</template>
+				</el-table-column>
 				<el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
 				<el-table-column prop="phone" label="账号" min-width="107"></el-table-column>
 				<el-table-column prop="cardNumber" label="身份证号" min-width="162"></el-table-column>

src/views/cargoOwnerManagement/taskAudit.vue

@@ -37,6 +37,12 @@
 				</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 type="index" width="60"  label="序号" align="center">
+					<template scope="scope">
+						<span>{{scope.$index + 1}}</span>
+						<!-- <span v-else>{{scope.$index}}</span> -->
+					</template>
+				</el-table-column>
 				<el-table-column prop="cargoOwnerName" label="货主姓名" min-width="125"></el-table-column>
 				<el-table-column prop="taskNo" label="任务编号" min-width="165"></el-table-column>
 				<el-table-column prop="cargoOwnerPhone" label="货主账号" min-width="108"></el-table-column>

src/views/contractManagement/contractModel.vue

@@ -49,6 +49,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
         <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>

src/views/driverManagement/fleetInfo.vue

@@ -38,6 +38,12 @@
         </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 type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="队长"></el-table-column>
         <el-table-column prop="driverNumber" label="账号"></el-table-column>
         <el-table-column prop="fleetName" label="车队名称"></el-table-column>

src/views/driverManagement/identityExamine.vue

@@ -52,6 +52,12 @@
         </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 type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </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>

src/views/driverManagement/vehicleExamine.vue

@@ -43,6 +43,12 @@
         </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 type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
         <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -42,6 +42,12 @@
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
         highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="companyName" label="企业名称" min-width="150"></el-table-column>
         <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" min-width="160"></el-table-column>
         <el-table-column prop="legalPersonName" label="法定代表人" min-width="91"></el-table-column>
@@ -172,6 +178,22 @@
             </el-input>
           </div>
         </div>
+        <div class="pay_css">
+          <div class="title_css">流水号:</div>
+          <div class="recharge_css" style="margin: -24px 32px 44px 69px;">
+            <el-input type="number" @mousewheel.native.prevent v-model="rechargeData.serialNumber" placeholder="输入流水号"
+              maxlength="100" size="small">
+            </el-input>
+          </div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">银行卡号:</div>
+          <div class="recharge_css" style="margin: -24px 32px 44px 69px;">
+            <el-input type="number" @mousewheel.native.prevent v-model="rechargeData.bankCard" placeholder="输入银行卡号"
+              maxlength="100" size="small">
+            </el-input>
+          </div>
+        </div>
         <div class="recharge_css">
           <div class="title_css">上传截图 :</div>
           <div class="upLoad">
@@ -284,7 +306,7 @@ export default {
       messageshow: false,
       rechargeShow: false,
       imageUrl: '',
-      rechargeData: {},
+      rechargeData: {bankCard:''},
       imgsVisible: false,
     };
   },
@@ -428,6 +450,9 @@ export default {
     },
     recharge(item) {
       // this.rechargeData = item
+      this.rechargeData.bankCard=item.bankCard
+      this.rechargeData.bankDeposit=item.bankDeposit
+      this.rechargeData.bankDepositBranch=item.bankDepositBranch
       this.rechargeData.companyName = item.companyName
       this.rechargeData.rechargeId = item.id;
       this.rechargeData.flag = 2;

src/views/feedbackManagement/userFeedback.vue

@@ -34,6 +34,12 @@
         </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 type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <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>

src/views/orderManagement/orderAudit.vue

@@ -60,8 +60,18 @@
             <div>{{scope.row.orderNo}} <span class="pad_css" v-if="scope.row.freightAdvance == '垫付'">垫</span></div>
           </template>
         </el-table-column>
-        <el-table-column prop="cargoOwner" label="货主"></el-table-column>
-        <el-table-column prop="driverName" label="司机"></el-table-column>
+        <el-table-column min-width="160" prop="cargoOwner" label="货主">
+          <template scope="scope">
+            <div>{{scope.row.cargoOwner}} </div>
+            <div>（{{scope.row.cargoOwnerPhone}}）</div>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="160" prop="driverName" label="司机">
+          <template scope="scope">
+            <div>{{scope.row.driverName}} </div>
+            <div>（{{scope.row.driverPhone}}）</div>
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="freight" label="运费(元)">
           <template slot-scope="scope">
              //用货主订单key值来判断（装车前不显示）3未装车
@@ -159,7 +169,7 @@
                   <!-- 垫付类型的订单，平台确认卸车后从未进行过尾款操作（即尾款=0）时显示的按钮。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-link :disabled="scope.row.cargoOwnerStatus != '运输中'&&scope.row.cargoOwnerStatus != '已完结'" target="_blank" type="primary" :underline="false" @click="toMapPage(scope.row)">轨迹</el-link>
+                  <el-link :disabled="scope.row.orderStatus != '运输中'&&scope.row.orderStatus != '已完结'" target="_blank" type="primary" :underline="false" @click="toMapPage(scope.row)">轨迹</el-link>
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -287,6 +297,12 @@
                 <img :src="item" class="img_css" @click="enlarge(item)">
               </div>
             </div>
+            <div class="right_title" v-if="costData.hyCarrierInfo.receiptImg">回单照片</div>
+            <div style="display: flex;" v-if="costData.hyCarrierInfo.receiptImg">
+              <div v-for="(item,index) in costData.hyCarrierInfo.receiptImg.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">
@@ -456,7 +472,8 @@
             unloadPrivate:row.unloadPrivate,
             unloadCity:row.unloadCity,
             unloadArea:row.unloadArea,
-            unloadDetailedAddress:row.unloadDetailedAddress
+            unloadDetailedAddress:row.unloadDetailedAddress,
+            orderStatus:row.orderStatus
           }
         })
       },

src/views/orderManagement/trajectory.vue

@@ -5,7 +5,7 @@
          <el-radio v-model="radio" label="1" @change="change('1')">北斗导航</el-radio>
           <el-radio v-model="radio" label="2" @change="change('2')">平台绘制</el-radio>
         <div class="order-detail">
-          <div>订单：{{querydata.orderNo}}</div>
+          <div>订单：{{querydata.orderNo}}（{{startDate}} ~ <span v-if='querydata.orderStatus=="已完结"'>{{endDate}}</span><span v-else>运输中</span> ）</div>
           <div>发货地：{{querydata.sendPrivate}}{{querydata.sendCity}}{{querydata.sendArea}}{{querydata.sendDetailedAddress}}</div>
           <div>卸货地：{{querydata.unloadPrivate}}{{querydata.unloadCity}}{{querydata.unloadArea}}{{querydata.unloadDetailedAddress}}</div>
         </div>
@@ -26,26 +26,35 @@
     data() {
       return {
         radio: '1',
-        querydata:{}
+        querydata:{},
+        endDate:'',
+        startDate:''
       }
     },
     components: {
       mapDrag
     },
     mounted() {
+      
       this.querydata=this.$route.query
-      //  let _obj = {}
-      //   _obj.orderId = this.querydata.id
-      //     travelpath(_obj).then(response => {
-      //       console.log(response)
-      //     })
-      //     .catch(() => {
-      //     })
+      console.log(this.querydata)
+       this.getTime()
     },
     methods:{
       change(val){
-       
+       this.getTime()
         this.radio=val
+      },
+      getTime(){
+        let _obj = {}
+        _obj.orderId = this.querydata.id
+          travelpath(_obj).then(response => {
+            console.log(response)
+            this.startDate=response.data.startDate
+            this.endDate=response.data.endDate
+          })
+          .catch(() => {
+          })
       }
     }
   }

src/views/platformManagement/specifiedRecords.vue

@@ -23,6 +23,12 @@
         </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 type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="versionNumber" label="版本号" />
         <el-table-column prop="compilationUnit" label="编写单位" />
         <el-table-column prop="editor" label="编撰人员" />

src/views/settlementManagement/CashOwner.vue

@@ -59,7 +59,7 @@
             <span>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="bankCard" label="银行卡号" />
+        <el-table-column width="180" prop="bankCard" label="银行卡号" />
         <el-table-column prop="amountMoney" label="金额（元）" />
         <el-table-column prop="createDate" label="发起时间" />
         <el-table-column prop="status" label="状态" >
@@ -78,7 +78,7 @@
         </el-table-column>
         <el-table-column label="操作" >
           <template slot-scope="scope">
-            <el-link v-if='status=="审核中"' target="_blank" type="primary" :underline="false" @click="aduit(scope.row)">通过</el-link>
+            <el-link v-if='scope.row.status=="审核中"' target="_blank" type="primary" :underline="false" @click="aduit(scope.row)">通过</el-link>
           </template>
         </el-table-column>
       </el-table>

src/views/settlementManagement/statisticalReport.vue

@@ -260,6 +260,7 @@ export default {
 
             type: 'bar',
             data: that.barList,
+            barWidth : 43, //柱图宽度
             itemStyle: {
               normal: {
                 // 每根柱子颜色设置