liyg 2 years ago
parent
commit
3c28d3454f

+ 2 - 2
src/views/sale/components/transport_appointment/openDistribution.vue

@@ -1,7 +1,7 @@
 // 定向派单接单
 // 定向派单接单
 <template>
 <template>
-  <div class="steel_inbound">
-    <div class="sache">
+  <div >
+    <div >
         <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
         <el-select v-model="condition1" placeholder="请选择筛选条件"  style="width:150px" clearable>
         <el-option
         <el-option
           v-for="item in options"
           v-for="item in options"

+ 15 - 5
src/views/statisticalReport/components/salesLogisticsStatistics/mapTest.vue

@@ -102,6 +102,7 @@
 import { shallowRef } from '@vue/reactivity'
 import { shallowRef } from '@vue/reactivity'
 import { lazyAMapApiLoaderInstance } from 'vue-amap'
 import { lazyAMapApiLoaderInstance } from 'vue-amap'
 import Slider from './slider.vue'
 import Slider from './slider.vue'
+import { getCookie } from "@/utils/util.js";
 Vue.use(Slider)
 Vue.use(Slider)
 import Vue from 'vue'
 import Vue from 'vue'
 var infoWindow
 var infoWindow
@@ -531,9 +532,7 @@ export default {
       that.geocoder.getAddress(lnglatXY, function(status, result) {
       that.geocoder.getAddress(lnglatXY, function(status, result) {
         if (status === 'complete' && result.info === 'OK') {
         if (status === 'complete' && result.info === 'OK') {
           that.currentPointName = result.regeocode.formattedAddress
           that.currentPointName = result.regeocode.formattedAddress
-          that.initCustomMarkes(
-            that.capacityNumber,
-            that.statusCode+
+          let content= that.statusCode+
             ':' +
             ':' +
               that.currentPointName +
               that.currentPointName +
               '<br/>' +
               '<br/>' +
@@ -543,8 +542,19 @@ export default {
               '时间范围:' +
               '时间范围:' +
               that.startTime +
               that.startTime +
               ' 至 ' +
               ' 至 ' +
-              that.endTime,
-
+              that.endTime;
+          if(getCookie('orgCode')!='wuliuyunshubu'){
+            content = that.statusCode +':' +
+              that.currentPointName +
+              '<br/>' +
+              '时间范围:' +
+              that.startTime +
+              ' 至 ' +
+              that.endTime;
+          }
+          that.initCustomMarkes(
+            that.capacityNumber,
+            content,
             lnglatXY[0],
             lnglatXY[0],
             lnglatXY[1]
             lnglatXY[1]
           )
           )