修改bug

src/port/maintenance/index.js

-import {post, get} from "@/request/http";
+import { post, get } from "@/request/http";
 
 /*
  *获取订单详情
  */
 export function getOrderInfoApi(u, data) {
-	const url = u +'/xoado/order/select';
-	return post(url, data)
+    const url = u + '/xoado/order/select';
+    return post(url, data)
 }
 /*
  *删除订单
  */
 export function delDispatchDataApi(id) {
-	const url = process.env.VUE_APP_BASE_API6 +`/orderUnIfyReceipt/delDispatchData/${id}`;
-	return get(url, {})
+    const url = process.env.VUE_APP_BASE_API6 + `/orderUnIfyReceipt/delDispatchData/${id}`;
+    return get(url, {})
 }
 /*
  *获取运单详情
  */
 export function getWaybillInfoApi(data) {
-	const url = process.env.VUE_APP_BASE_API6 +'/new/waybill/obj';
-	return get(url, data)
+    const url = process.env.VUE_APP_BASE_API6 + '/new/waybill/obj';
+    return get(url, data)
 }
 /*
  *获取商户订单
  */
 export function paymentRecordApi(data) {
-	const url = process.env.VUE_APP_BASE_API6 +'/waybill/payment/record';
-	return get(url, data)
+    const url = process.env.VUE_APP_BASE_API6 + '/waybill/payment/record';
+    return get(url, data)
 }
 /*
  *获取商户订单
  */
-export function pushDriverApi(u, data) {
-	const url = u +'/xoado/order/pushDriver';
-	return get(url, data)
+export function pushDriverApi(data) {
+    const url = process.env.VUE_APP_BASE_API6 + '/new/waybill/pushDriverToBrand/waybillId';
+    return post(url, data)
 }
 /*
  *运单强制完单
  */
 export function forceFinishApi(data) {
-	const url = process.env.VUE_APP_BASE_API6 +'/temporaryDispatch/forceFinish';
-	return get(url, data)
-}
+    const url = process.env.VUE_APP_BASE_API6 + '/temporaryDispatch/forceFinish';
+    return get(url, data)
+}
\ No newline at end of file

src/port/orderOperation/index.js

@@ -19,8 +19,8 @@ export function updateBatchOrder(data) {
 /*
  *推送司机信息
  */
-export function pushDriver(data) {
-    const url = process.env.VUE_APP_BASE_API5 + `/xoado/order/pushDriver`;
+export function pushDriver(u, data) {
+    const url = u + '/xoado/order/pushDriver/orderId';
     return post(url, data)
 
 }

src/store/getters.js

@@ -34,6 +34,14 @@ const getters = {
             return []
         }
     },
+    orderDetail: state => {
+        let arr = Object.keys(state.business.orderDetail);
+        if (arr.length > 0) {
+            return JSON.parse(state.business.orderDetail)
+        } else {
+            return {}
+        }
+    },
     areaCodeObj: state => {
         let arr = Object.keys(state.business.areaCodeObj);
         if (arr.length > 0) {

src/views/business/complaintList/components/item.vue

@@ -130,6 +130,9 @@ export default {
         }
     },
     created() {
+       console.log(this.searchInfo);
+    
+                
     },
     filters: {
         preDate(v) {
@@ -156,6 +159,7 @@ export default {
         },
         handledbClick(row) {
             let search = this.searchInfo;
+            
             this.$store.commit('business/SET_ORDERDETAIL', JSON.stringify({brandUrl: search.brandUrl, platformId: JSON.parse(search.platformId).platformId}));
             this.$router.push({path: '/business/complaint-detail', query: {id: row.complaintId, orderId: row.orderId}})
         },

src/views/maintenance/waybill/index.vue

@@ -8,7 +8,7 @@
             </el-row>
             <div style="margin-top: 10px; display: inline-block">
                 <div style="display: flex; align-items: center">
-                    <div style="margin-right: 10px; display: flex; align-items: center">
+                    <!-- <div style="margin-right: 10px; display: flex; align-items: center">
                         <span style="white-space: nowrap; margin-right: 10px">
                             品牌：
                         </span>
@@ -21,7 +21,7 @@
                             >
                             </el-option>
                         </el-select>
-                    </div>
+                    </div> -->
 
                     <el-input v-model="orderId" placeholder="请输入内容" style="width: 300px"></el-input>
 
@@ -44,8 +44,8 @@
                 </div>
 
                 <el-row v-if="isShow">
-                    <el-button v-if="dataSource.waybillStatus == '1'" type="primary" style="padding: 5px 20px;" @click="synchronization">同步司机信息</el-button>
-                    <el-button v-if="dataSource.waybillStatus >= 1 && dataSource.waybillStatus < 6" type="warning" style="padding: 5px 20px;" @click="force" :loading="forceLoading">强制完单</el-button>
+                    <el-button v-if="!!dataSource.driverId " type="primary" style="padding: 5px 20px;" @click="synchronization">同步司机信息</el-button>
+                    <el-button  type="warning" style="padding: 5px 20px;" @click="force" :loading="forceLoading">强制完单</el-button>
                 </el-row>
             </el-row>
 
@@ -571,11 +571,10 @@ export default {
         pushDriver() {
             this.synchronizationLoading = true;
             let params = {
-                orderId: this.orderId,
-                platformId: JSON.parse(this.platformInfo).platformId
+                waybillId: this.orderId,
+                
             }
-
-            pushDriverApi(JSON.parse(this.platformInfo).brandUrl, params)
+            pushDriverApi( params)
                 .then((res) => {
                     if(res.status === 200) {
                         this.$message.success('推送成功');

src/views/operation/orderDetail.vue

@@ -363,45 +363,32 @@
                 <div class="clearfix">
                   <span class="title">订单详情</span>
                   <div>
-                    <el-button
-                      type="danger"
-                      size="mini"
-                      @click="cancelOrder()"
-                      v-if="dataSource.status * 1 < 3"
+                    <el-button type="danger" size="mini" @click="cancelOrder()"
                       >取消订单
                     </el-button>
-                    <el-button
-                      type="primary"
-                      size="mini"
-                      @click="driverInfo()"
-                      v-if="
-                        dataSource.status * 1 == 2 || dataSource.status * 1 == 1
-                      "
+                    <!-- v-if="dataSource.status * 1 < 3" -->
+                    <el-button type="primary" size="mini" @click="driverInfo()" v-if="
+                        !!dataSource.driverId"
                       >同步司机信息
                     </el-button>
-                    <el-button
-                      type="warning"
-                      size="mini"
-                      v-if="
-                        dataSource.status * 1 < 6 && dataSource.status * 1 >= 1
-                      "
-                      @click="finishOrder()"
+                    <!-- v-if="
+                        dataSource.status * 1 == 2 || dataSource.status * 1 == 1
+                      " -->
+                    <el-button type="warning" size="mini" @click="finishOrder()"
                       >强制完单
                     </el-button>
-
-                    <el-button
-                      type="warning"
-                      size="mini"
-                      @click="setpaystatus"
-                      v-if="
+                    <!-- v-if="
+                        dataSource.status * 1 < 6 && dataSource.status * 1 >= 1
+                      " -->
+                    <el-button type="warning" size="mini" @click="setpaystatus"
+                      >更改支付状态
+                    </el-button>
+                    <!-- v-if="
                         dataSource.status * 1 >= 6 &&
                         (dataSource.orderSource * 1 == 6 ||
                           dataSource.orderSource * 1 == 4 ||
                           dataSource.orderSource * 1 == 7)
-                      "
-                      >更改支付状态
-                    </el-button>
-
+                      " -->
                     <!-- orderSource=6 4 7 -->
                     <!-- 完单 未支付 自营 -->
                     <!-- <span v-html="renderfun(dataSource)"></span> -->
@@ -919,11 +906,12 @@ export default {
       });
     },
     pushDrive() {
+      let u=JSON.parse( this.platformInfo).brandUrl
       let json = {
         platformId: this.driverdata.platformId,
         orderId: this.driverdata.orderId,
       };
-      pushDriver(json).then((res) => {
+      pushDriver(u,json).then((res) => {
         if (res.status == 200) {
           this.driverStatus = false;
           this.$message({