Redeem 1 tahun lalu
induk
melakukan
b36865e3e1

+ 27 - 20
src/views/OYE/components/mapTest.vue

@@ -102,7 +102,7 @@
 import { shallowRef } from '@vue/reactivity'
 import { lazyAMapApiLoaderInstance } from 'vue-amap'
 import Slider from './slider.vue'
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 Vue.use(Slider)
 import Vue from 'vue'
 var infoWindow
@@ -113,7 +113,7 @@ export default {
     capacityNumber: '',
     startPointName: '',
     endPointName: '',
-    statusCode:''
+    statusCode: ''
   },
   setup() {
     const map = shallowRef(null)
@@ -416,10 +416,10 @@ export default {
       let that = this
       let increment = that.listPath[0].runPath.length * 0.1
       let result = that.point + increment
-      if(result < that.listPath[0].runPath.length){
+      if (result < that.listPath[0].runPath.length) {
         that.pathNavigator.start(that.point + increment)
-      }else{
-        that.pathNavigator.start(that.listPath[0].runPath.length-1)
+      } else {
+        that.pathNavigator.start(that.listPath[0].runPath.length - 1)
       }
     },
     ///che
@@ -469,8 +469,8 @@ export default {
     },
     initData(orderNumber) {
       let that = this
-      if(this.map){
-        this.map.destroy();
+      if (this.map) {
+        this.map.destroy()
       }
       that.axios
         .post('/api/v1/otms/fullPath?orderNumber=' + orderNumber)
@@ -535,25 +535,32 @@ export default {
       that.geocoder.getAddress(lnglatXY, function(status, result) {
         if (status === 'complete' && result.info === 'OK') {
           that.currentPointName = result.regeocode.formattedAddress
-          let content= that.statusCode+
+          let content =
+            that.statusCode +
             ':' +
-              that.currentPointName +
-              '<br/>' +
-              '距离:' +
-              that.listPath[0].miled +
-              '<br/>' +
-              '时间范围:' +
-              that.startTime +
-              ' 至 ' +
-              that.endTime;
-          if(getCookie('orgCode')!='wuliuyunshubu' && getCookie('orgCode')!='shichangxinxibu' && getCookie('orgCode')!='caiwubu'){
-            content = that.statusCode +':' +
+            that.currentPointName +
+            '<br/>' +
+            '距离:' +
+            that.listPath[0].miled +
+            '<br/>' +
+            '时间范围:' +
+            that.startTime +
+            ' 至 ' +
+            that.endTime
+          if (
+            getCookie('orgCode') != 'wuliuyunshubu' &&
+            getCookie('orgCode') != 'shichangxinxibu' &&
+            getCookie('orgCode') != 'caiwubu'
+          ) {
+            content =
+              that.statusCode +
+              ':' +
               that.currentPointName +
               '<br/>' +
               '时间范围:' +
               that.startTime +
               ' 至 ' +
-              that.endTime;
+              that.endTime
           }
           that.initCustomMarkes(
             that.capacityNumber,

+ 0 - 1
src/views/OYE/components/oYeRealTimeInventory.vue

@@ -136,7 +136,6 @@ export default {
       queryMap[this.screen1] = this.con1
       queryMap['consigneeName'] = this.loginName
       queryMap['inboundWarehouse'] = this.inboundWarehouse
-
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

+ 3 - 3
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -135,7 +135,7 @@
         <el-form-item>
           <el-button
             type="primary"
-            @click="batchCarrier"
+            @click="batchCarrier()"
             v-privilege="activeMenu + 'batchCarrier'"
           >
             <i class="el-icon-share"></i>批量</el-button
@@ -144,7 +144,7 @@
         <el-form-item v-privilege="activeMenu + 'more'">
           <el-button
             type="primary"
-            @click="exceptionHandle"
+            @click="exceptionHandle()"
             v-privilege="activeMenu + 'exceptionHandle'"
           >
             <i class="el-icon-s-open"></i>
@@ -152,7 +152,7 @@
           </el-button>
           <el-button
             type="primary"
-            @click="mergeSplit"
+            @click="mergeSplit()"
             v-privilege="activeMenu + 'mergeSplit'"
           >
             <i class="el-icon-pie-chart"></i>