订单管理模块，修改bug

src/port/region/regionManage.js

 import {put, get, post, deletes} from '@/request/http'
 // 获取列表
-export function getRegionManageList(data = {},u ) {
+export function getRegionManageList(data = {}, u, platformId) {
     const url = (u ? u+'/brand' : process.env.VUE_APP_BASE_API5) + '/area/V2/condition';
-    return get(url, data)
+    return get(url, data, platformId)
 }
 //虚拟号配置查询列表
 export function getConfigurationList(platformId,startPage,pageNumber) {

src/port/set-request.js

@@ -393,21 +393,21 @@ export function getYunCubicProductData1(data) {
 }
 
 /* 多条件查询订单列表 */
-export function getAllOrderList(data) {
-    const url = targetBaseUrl + '/xoado/order/query'
-    return post(url, data)
+export function getAllOrderList(data, u, platformId) {
+    const url = (u ? u+'/brand' : targetBaseUrl) + '/xoado/order/query'
+    return post(url, data, platformId)
 }
 
 /* 多条件查询订单列表 */
-export function getThisorderInfo(data) {
-    const url = targetBaseUrl + '/xoado/order/select'
-    return post(url, data)
+export function getThisorderInfo(data, u, platformId) {
+    const url = (u ? u+'/brand' : targetBaseUrl) + '/xoado/order/select'
+    return post(url, data, platformId)
 }
 
 /* 多条件导出订单列表 */
-export function exportAllOrderList(data) {
-    const url = targetBaseUrl + '/xoado/order/export'
-    return postblob(url, data)
+export function exportAllOrderList(data, u, platformId) {
+    const url = (u ? u+'/brand' : targetBaseUrl) + '/xoado/order/export'
+    return postblob(url, data, platformId)
 }
 
 /* 分成公式新增 */
@@ -919,9 +919,9 @@ export function exportsettlement(data) {
 }
 
 /* 订单详情左侧列表 */
-export function OrderDetailsSelect(data = {}) {
+export function OrderDetailsSelect(data = {}, platformId) {
     const url = process.env.VUE_APP_BASE_API6 + "/details/detailsSelect";
-    return post(url, data);
+    return post(url, data, platformId);
 }
 
 

src/request/http.js

@@ -110,7 +110,12 @@ axios.interceptors.response.use(
  * @param {String} url [请求的url地址]
  * @param {Object} params [请求时携带的参数]
  */
-export function get(url, params) {
+export function get(url, params, platformId) {
+	if(platformId) {
+		axios.defaults.headers.XOADOPLATFORMID = platformId
+	}else {
+		axios.defaults.headers.XOADOPLATFORMID = PLATFORMID
+	}
 	return new Promise((resolve, reject) => {
 		axios.get(url, {
 			params: params
@@ -127,7 +132,12 @@ export function get(url, params) {
  * @param {String} url [请求的url地址]
  * @param {Object} params [请求时携带的参数]
  */
-export function post(url, params) {
+export function post(url, params, platformId) {
+	if(platformId) {
+		axios.defaults.headers.XOADOPLATFORMID = platformId
+	}else {
+		axios.defaults.headers.XOADOPLATFORMID = PLATFORMID
+	}
 	return new Promise((resolve, reject) => {
 		console.log(url,"11111")
 		console.log(params)
@@ -146,7 +156,12 @@ export function post(url, params) {
  * @param {String} url [请求的url地址]
  * @param {Object} params [请求时携带的参数]
  */
-export function put(url, params) {
+export function put(url, params, platformId) {
+	if(platformId) {
+		axios.defaults.headers.XOADOPLATFORMID = platformId
+	}else {
+		axios.defaults.headers.XOADOPLATFORMID = PLATFORMID
+	}
 	return new Promise((resolve, reject) => {
 		console.log(url)
 		console.log(params)
@@ -165,7 +180,12 @@ export function put(url, params) {
  * @param {String} url [请求的url地址]
  * @param {Object} params [请求时携带的参数]
  */
-export function deletes(url, params) {
+export function deletes(url, params, platformId) {
+	if(platformId) {
+		axios.defaults.headers.XOADOPLATFORMID = platformId
+	}else {
+		axios.defaults.headers.XOADOPLATFORMID = PLATFORMID
+	}
 	return new Promise((resolve, reject) => {
 		axios.delete(url, {
 			params: params,
@@ -178,7 +198,12 @@ export function deletes(url, params) {
 	})
 }
 
-export function postblob(url, params) {
+export function postblob(url, params, platformId) {
+	if(platformId) {
+		axios.defaults.headers.XOADOPLATFORMID = platformId
+	}else {
+		axios.defaults.headers.XOADOPLATFORMID = PLATFORMID
+	}
 	return new Promise((resolve, reject) => {
 		axios.post(url, params, {responseType: 'blob',timeout: 600000})
 			.then(res => {

src/router/index.js

@@ -206,6 +206,27 @@ export const routes = [
 		},
 		children: [
 			{
+				path: 'order-index',
+				name: 'OrderIndex',
+				component: () =>
+					import('@/views/business/orderManagement/index.vue'),
+				meta: {
+					icon: 'el-icon-upload',
+					title: '订单列表'
+				}
+			},
+			{
+				path: 'order-Detail',
+				name: 'orderDetail',
+				component: () =>
+					import('@/views/business/orderManagement/orderDetail.vue'),
+				meta: {
+					icon: 'el-icon-picture',
+					title: '订单详情'
+				},
+				hidden: true
+			},
+			{
 				path: 'waybill-index',
 				name: 'waybillIndex',
 				component: () =>

src/store/getters.js

 const getters = {
-  token: state => state.user.token,
-  roles: state => state.user.roles,
-  userInfo: state => state.user.userInfo,
-  platformId: state => state.user.platformId,
-  transportId: state => state.user.transportId,
-  accountPlatformId: state => state.user.accountPlatformId,
-  routes: state => state.permission.routes,
-  orderStatus: state => state.business.orderStatus,
-  msgIsShow: state => state.app.msgIsShow,
-  nameInfo: state => {
-    let arr = Object.keys(state.user.userInfo);
-    if (arr.length > 0) {
-      return JSON.parse(state.user.userInfo)
-    } else {
-      return {}
-    }
-  },
-  areaCodeObj: state => {
-    let arr = Object.keys(state.business.areaCodeObj);
-    if (arr.length > 0) {
-      return JSON.parse(state.business.areaCodeObj)
-    } else {
-      return {}
-    }
-  },
-    productJJInfo: state => {
-    let arr = Object.keys(state.business.productJJInfo);
-    if (arr.length > 0) {
-      return JSON.parse(state.business.productJJInfo)
-    } else {
-      return {}
-    }
-  },
-  complantObj: state => {
-    let arr = Object.keys(state.business.complantObj);
-    if (arr.length > 0) {
-      return JSON.parse(state.business.complantObj)
-    } else {
-      return {}
-    }
-  },
-  opened: state => {
-    if (state.app.opened === 'false') {
-      return false
-    } else if (state.app.opened === 'true') {
-      return true
-    }
-  }
+	token: state => state.user.token,
+	roles: state => state.user.roles,
+	userInfo: state => state.user.userInfo,
+	platformId: state => state.user.platformId,
+	transportId: state => state.user.transportId,
+	accountPlatformId: state => state.user.accountPlatformId,
+	routes: state => state.permission.routes,
+	orderStatus: state => state.business.orderStatus,
+	msgIsShow: state => state.app.msgIsShow,
+	nameInfo: state => {
+		let arr = Object.keys(state.user.userInfo);
+		if (arr.length > 0) {
+			return JSON.parse(state.user.userInfo)
+		} else {
+			return {}
+		}
+	},
+	areaCodeObj: state => {
+		let arr = Object.keys(state.business.areaCodeObj);
+		if (arr.length > 0) {
+			return JSON.parse(state.business.areaCodeObj)
+		} else {
+			return {}
+		}
+	},
+	orderDetail: state => {
+		let arr = Object.keys(state.business.orderDetail);
+		if (arr.length > 0) {
+			return JSON.parse(state.business.orderDetail)
+		} else {
+			return {}
+		}
+	},
+	productJJInfo: state => {
+		let arr = Object.keys(state.business.productJJInfo);
+		if (arr.length > 0) {
+			return JSON.parse(state.business.productJJInfo)
+		} else {
+			return {}
+		}
+	},
+	complantObj: state => {
+		let arr = Object.keys(state.business.complantObj);
+		if (arr.length > 0) {
+			return JSON.parse(state.business.complantObj)
+		} else {
+			return {}
+		}
+	},
+	opened: state => {
+		if (state.app.opened === 'false') {
+			return false
+		} else if (state.app.opened === 'true') {
+			return true
+		}
+	}
 }
 export default getters

src/store/modules/business.js

@@ -6,31 +6,36 @@
  */
 
 const state = {
-  areaCodeObj: sessionStorage.getItem('areaCodeObj') || {},
-  complantObj: sessionStorage.getItem('complantObj') || '',
-  orderStatus: sessionStorage.getItem('orderStatus') || '',
-  productJJInfo: sessionStorage.getItem('productJJInfo') || '',
+	areaCodeObj: sessionStorage.getItem('areaCodeObj') || {},
+	complantObj: sessionStorage.getItem('complantObj') || '',
+	orderStatus: sessionStorage.getItem('orderStatus') || '',
+	productJJInfo: sessionStorage.getItem('productJJInfo') || {},
+	orderDetail: sessionStorage.getItem('orderDetail') || {},
 }
 const mutations = {
-  SET_AREACODE(state, payload) {
-    state.areaCodeObj = String(payload)
-    sessionStorage.setItem('areaCodeObj', payload)
-  },
-  SET_COMPLANT(state, payload) {
-    state.complantObj = payload
-    sessionStorage.setItem('complantObj', payload)
-  },
-  SET_WAYBILL(state, payload){
-    state.orderStatus = payload
-    sessionStorage.setItem('orderStatus', payload)
-  },
-  SET_PRODUCTJJINFO(state, payload){
-    state.productJJInfo = payload
-    sessionStorage.setItem('productJJInfo', payload)
-  },
+	SET_AREACODE(state, payload) {
+		state.areaCodeObj = String(payload)
+		sessionStorage.setItem('areaCodeObj', payload)
+	},
+	SET_ORDERDETAIL(state, payload) {
+		state.areaCodeObj = String(payload)
+		sessionStorage.setItem('orderDetail', payload)
+	},
+	SET_COMPLANT(state, payload) {
+		state.complantObj = payload
+		sessionStorage.setItem('complantObj', payload)
+	},
+	SET_WAYBILL(state, payload) {
+		state.orderStatus = payload
+		sessionStorage.setItem('orderStatus', payload)
+	},
+	SET_PRODUCTJJINFO(state, payload) {
+		state.productJJInfo = payload
+		sessionStorage.setItem('productJJInfo', payload)
+	},
 }
 export default {
-  namespaced: true,
-  state,
-  mutations
+	namespaced: true,
+	state,
+	mutations
 }

src/views/business/orderManagement/components/CopyIcon/index.vue

+<template>
+  <span
+    class="el-icon-document-copy"
+    v-clipboard:copy="msg"
+    v-clipboard:success="onCopy"
+    v-clipboard:error="onError"
+  ></span>
+</template>
+
+<script>
+import JudgeType from "@/mixins/judgeType";
+export default {
+  name: "CopyIcon",
+  mixins: [JudgeType],
+  props: {
+    msg: null
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.el-icon-document-copy {
+  display: inline-block;
+  margin: 0 0.5em;
+  cursor: pointer;
+  color: #000000;
+  font-size: 16px;
+}
+</style>

src/views/business/orderManagement/maps.vue

+<template>
+  <div id="demo">
+    <el-amap ref="maps" v-if="!!startLat" vid="amapDemo" :amap-manager="amapManager" :events="mapEvents"
+             class="amap-demo">
+    </el-amap>
+  </div>
+</template>
+
+<script>
+import VueAMap from 'vue-amap'
+
+let amapManager = new VueAMap.AMapManager();
+export default {
+  name: "maps",
+  props: ["startLat", "startLng", "endLat", "endLng", "polylines"],
+  data() {
+    return {
+      amapManager,
+      mapEvents: {}
+    }
+  },
+  watch: {
+    polylines(newValue) {
+      console.log('我的值变化了')
+      console.log(newValue)
+      if (newValue.length > 0) {
+        this.reload(newValue)
+      }
+    }
+  },
+  created() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      let that = this;
+      this.mapEvents = {
+        init(o) {
+          o.clearMap(); // 清除覆盖物
+          o.setMapStyle('amap://styles/macaron'); // 自定义的高德地图的样式，我选的是马卡龙
+          let marker = new AMap.Marker({ // 点图标
+            position: [that.startLng, that.startLat]
+          })
+          o.setZoomAndCenter(16, [that.startLng, that.startLat])
+          marker.setMap(o)
+          o.setFitView()
+          o.plugin(["AMap.Driving"], function () {
+            var driving = new AMap.Driving({
+              map: o,
+              policy: 'REAL_TRAFFIC'
+            })
+            driving.search(new AMap.LngLat(that.startLng, that.startLat), new AMap.LngLat(that.endLng, that.endLat), {}, function (status, result) {
+              if (status === 'complete') {
+                console.log('绘制成功');
+              } else {
+                console.log('绘制失败', result);
+              }
+            });
+            o.addControl(driving);
+          })
+        },
+        click: (e) => {
+          console.info(e)
+        },
+        mouseover: e => {
+          // e.target.setOptions({
+          //   strokeColor: "#f31f2a",
+          //   strokeWeight: 8
+          // });
+        },
+        mouseout: e => {
+          // e.target.setOptions({
+          //   strokeColor: "#f31f2a",
+          //   strokeWeight: 6
+          // });
+        }
+      }
+    },
+    reload(path) {
+      let o = amapManager.getMap();
+      let Polyline = new AMap.Polyline({
+        map: o,
+        path: path, // 这里是轨迹的坐标拼成的数组
+        showDir: true,
+        strokeColor: "#28F", //线颜色
+        // strokeOpacity: 1,   //线透明度
+        strokeWeight: 6 //线宽
+        // strokeStyle: "solid" //线样式
+      })
+      Polyline.setMap(o)
+      this.movingPolyline()
+    },
+    movingPolyline() {
+      let o = amapManager.getMap();
+      let passedPolyline = new AMap.Polyline({
+        map: o,
+        // path: lineArr,
+        strokeColor: "#AF5",  //线颜色
+        // strokeOpacity: 1,     //线透明度
+        strokeWeight: 6,      //线宽
+        // strokeStyle: "solid"  //线样式
+      });
+      let marker = new AMap.Marker({
+        map: o,
+        position: this.polylines[0],
+        icon: "https://webapi.amap.com/images/car.png",
+        offset: new AMap.Pixel(-26, -13),
+        autoRotation: true,
+        angle: -90,
+      });
+      marker.setMap(o);
+      marker.moveAlong(this.polylines, 2000);
+      marker.on('moving', function (e) {
+        passedPolyline.setPath(e.passedPath);
+      });
+      o.setFitView();
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.amap-demo {
+  width: 100%;
+  height: 400px;
+  margin: 0 auto;
+}
+</style>

src/views/business/waybillManagement/index.vue

@@ -9,7 +9,7 @@
         class="wabill-order-body"
     >
 
-        <el-row style="background-color: #ffffff;padding: 10px 0 0 10px;">
+        <el-row style="background-color: #ffffff;padding: 10px 0 0 20px;">
             <el-radio-group v-model="platformId" @change="changePlatform">
                 <el-radio-button
                     v-for="(item, index) in platformList"
@@ -929,7 +929,6 @@ export default {
                 rows: 9999,
             }
 
-            let url = JSON.parse(this.platformId).domain[0];
             getRegionManageList(params, this.brandUrl).then(res => {
             // getRegionManageListByPlatform(url, params).then(res => {
                 if (res.status == 200) {

src/views/configure/BasicsCartype.vue

@@ -70,6 +70,7 @@
             <el-pagination
                 background
                 layout="prev, pager, next, jumper, total"
+                :current-page="page"
                 :total="total"
                 @current-change="current_change"
             >

src/views/configure/componenets/platformCarType/addDialog.vue

@@ -79,13 +79,14 @@
             </el-form-item>
             <el-form-item label="可接单类型" prop="runTypes">
                 <el-select v-model="form.runTypes" multiple>
-                    <el-option
-                        v-for="(item, index) in platformData"
-                        :label="item.typeName"
-                        :value="item.id"
-                        :key="'polygon' + index"
-                    >
-                    </el-option>
+                    <template v-for="(item, index) in platformData">
+                        <el-option
+                            :label="item.typeName"
+                            :value="item.typeItem"
+                            :key="'polygon' + index"
+                        >
+                        </el-option>
+                    </template>
                 </el-select>
             </el-form-item>
         </el-form>
@@ -168,7 +169,7 @@ export default {
                         typeContent: this.form.definition,
                         typeItem: item.typeItem,
                         typeName: item.typeItemName,
-                        rangeOfApplication: this.form.runTypes
+                        rangeOfApplication: this.form.runTypes.concat(item.typeItem)
                     }
                     if(this.form.hasOwnProperty('id')) {
                         params['id'] = this.form.id;
@@ -286,6 +287,10 @@ export default {
             console.log(JSON.stringify(row))
             if (Object.keys(row).length > 0) {
                 this.title = "修改品牌车型";
+                let range = row.rangeOfApplication.filter(item => {
+                    return item != row.typeItem
+                })
+                debugger
                 this.form = {
                     id: row.id,
                     platform: row.platformId,
@@ -293,7 +298,7 @@ export default {
                     type: row.carType,
                     typeName: JSON.stringify({typeItem: row.typeItem, typeItemName: row.typeName}),
                     definition: row.typeContent,
-                    runTypes: JSON.parse(row.rangeOfApplication),
+                    runTypes: range,
                 };
                 await this.getPlatformCar();
                 await this.getModelsCar();

src/views/configure/platformCarType.vue

@@ -79,7 +79,7 @@
             <el-table-column label="可接单车型" align="center" prop="runTypes">
                 <template slot-scope="scope">
                     <span
-                        v-for="(item, index) in scope.row.rangeOfApplication"
+                        v-for="(item, index) in scope.row.rangeOfApplicationName"
                         :key="'runTypes'+index">
                         {{index === 0 ? item : '、'+item}}
                     </span>
@@ -100,6 +100,7 @@
                 background
                 layout="prev, pager, next, jumper, total"
                 :total="total"
+                :current-page="page"
                 @current-change="current_change"
             >
             </el-pagination>

src/views/platform/regionManage.vue

@@ -126,6 +126,7 @@ export default {
     name: 'regionManage',
     data() {
         return {
+            plat: '',
             platform: '',
             platformList: [],
             brandUrl: '',
@@ -173,6 +174,7 @@ export default {
 
                     this.platform = this.platformList.length > 0 ? this.platformList[0].value : '';
                     this.brandUrl = sessionStorage.getItem('test') ? '' : JSON.parse(this.platformList[0].value).brandUrl;
+                    this.plat = sessionStorage.getItem('test') ? '61fdff1d455c4ab8a2efc564c245b905' : JSON.parse(this.platformList[0].value).platformId;
                 }
             });
         },
@@ -230,7 +232,7 @@ export default {
                 page: this.tableData.pageNum,
                 rows: this.tableData.pageSize
             };
-            await getRegionManageList(params, this.brandUrl).then((res) => {
+            await getRegionManageList(params, this.brandUrl, this.plat).then((res) => {
                 if (res.status === 200) {
                     this.tableData.data = res.data.content;
                     this.tableData.total = res.data.total;