Revert "story#7062,供应商培训和财务发票上传挂钩--曹智龙"

This reverts commit 2c94eee160.

src/api/mine.js

@@ -317,12 +317,3 @@ export function unifiedOCRWithCompress(data){
         data
     })
 }
-
-// 服务商是否培训
-export function jumpPage(data){
-    return request({
-        url:'/supplierAppV2/dispatchApp/user/jumpPage',
-        method:'POST',
-        data
-    })
-}

src/api/secondHandCar.js

@@ -103,13 +103,3 @@ export function auditCarInfoAgain(data){
     data
   })
 }
-
-
-// 我的发布列表
-export function getAddressForService(data){
-  return request({
-    url: '/base/gaodeMap/getPlaceByAddress',
-    method:'GET',
-    params: data,
-  })
-}

src/utils/map.js

@@ -1,4 +1,3 @@
-import { getAddressForService } from "@/api/secondHandCar"
 // 获取定位, 返回 经纬度
 export function getLocal(mapContext) {
   return new Promise((resolve, reject) => {
@@ -47,19 +46,7 @@ export function getAddress(mapContext, lnglat) {
 // 输入提示
 export function searchFun(mapContext, cityCode, keyword) {
   return new Promise((resolve) => {
-     getAddressForService({
+    mapContext.plugin('AMap.AutoComplete', function(){
-      city: '',
-      address: keyword
-    }).then((res) => {
-      if(res.code == 200) {
-        resolve(res?.data?.pois || [])
-      } else {
-        resolve([])
-      }
-    }).catch(() => {
-      resolve([])
-    })
-    /*mapContext.plugin('AMap.AutoComplete', function(){
       var autoOptions = {
         city: cityCode || '全国',
       };
@@ -74,7 +61,7 @@ export function searchFun(mapContext, cityCode, keyword) {
           resolve([])
         }
       })
-    })*/
+    })
   })
 }
 

src/views/index/uploadInvoice.vue

@@ -76,7 +76,7 @@
   import { Decimal } from 'decimal.js';
   import { Dialog } from "vant";
   import { myMixins } from "@/utils/myMixins"
-  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch, jumpPage} from "@/api/mine"
+  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch } from "@/api/mine"
   export default {
     name: "uploadInvoice",
     mixins:[ myMixins ],
@@ -132,10 +132,6 @@
       }
     },
     methods: {
-      async getJumpHandler() {
-        let res = await jumpPage();
-        return res
-      },
       async initData() {
         this.list = JSON.parse(localStorage.getItem('list'));
         this.batchIds = [];
@@ -234,12 +230,7 @@
         }).catch(() => {
         });
       },
-      async beforeRead (file) {
+      beforeRead (file) {
-        let res = await this.getJumpHandler();
-        if(res?.data?.jump) {
-          this.$message.warning("您有没有完成的培训，请在中道调度APP上完成培训，再进行发票上传")
-          return false
-        }
         const FileExt = file.name.replace(/.+\./, "");
         if (['jpg', 'png', 'jpeg', 'pdf', 'ofd'].indexOf(FileExt.toLowerCase()) === -1) {
           this.$toast('请上传后缀名为jpg、jpeg、png、pdf、ofd的文件！')

src/views/report/addressMap.vue

@@ -75,14 +75,13 @@
         }
         let content = '<div class="dest-position"></div>';
         let activeObj = this.addressList[this.activeIndex];
-        let lanLat = activeObj.location.split(',');
         this.marker = new AMap.Marker({
-          position: new AMap.LngLat( lanLat[0], lanLat[1] ),
+          position: new AMap.LngLat( activeObj.location.lng, activeObj.location.lat ),
           content: content,
           offset: new AMap.Pixel(-13, -30)
         });
         this.map.add(this.marker)
-        this.map.setCenter([lanLat[0], lanLat[1]])
+        this.map.setCenter([activeObj.location.lng, activeObj.location.lat])
       },
       successHandler() {
         if( this.activeIndex == null ) {
@@ -90,11 +89,10 @@
           return
         }
         let activeObj = this.addressList[this.activeIndex];
-        let lanLat = activeObj.location.split(',');
         let _tempObj = {
-          startPoiAddress:  activeObj?.address + activeObj?.name,
+          startPoiAddress: activeObj?.district + activeObj?.address + activeObj?.name,
-          startLat: lanLat[0],
+          startLat: activeObj?.location?.lat,
-          startLng: lanLat[1],
+          startLng: activeObj?.location?.lng,
           adCode: activeObj?.adcode,
         }
         sessionStorage.setItem('reportAddress', JSON.stringify(_tempObj))