改bug

public/index.html

@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <!-- <meta http-equiv="Content-Security-Policy"> -->
-    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <meta http-equiv="Content-Security-Policy">
+    <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
   </head>

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -239,6 +239,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 +342,7 @@ export default {
       paySee: {},
       rechargeShow: false,
       imageUrl: '',
-      rechargeData: {},
+      rechargeData: {bankCard:''},
     };
   },
   mounted() {
@@ -592,6 +608,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/enterpriseManagement/enterpriseAudit.vue

@@ -172,6 +172,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 +300,7 @@ export default {
       messageshow: false,
       rechargeShow: false,
       imageUrl: '',
-      rechargeData: {},
+      rechargeData: {bankCard:''},
       imgsVisible: false,
     };
   },
@@ -428,6 +444,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/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/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>