修改地图点击事件

src/api/V2/tradeServicesManagement/index.js

@@ -12,4 +12,6 @@ export const API_GET_WAREHOUSE_LIST = '/warehouseBaseInfo/getWarehouse'
 export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
 // 获取业务编号
 export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
+// 列表页删除
+export const API_POST_DELETETRANEINFO = '/tradeWarehouseReceiptAppl/deleteTrageInfo'
 

src/components/mapdrag/warehouseReceiptMap.vue

@@ -1,25 +1,30 @@
 <style lang='scss' scoped>
-.mapContent {
-  position: relative;
-  height: 95%;
-  transition: 0.5s;
-  .center-add {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    z-index: 999;
-    width: 30px;
-    height: 30px;
+  .mapContent {
+    position: relative;
+    height: 95%;
+    transition: 0.5s;
+
+    .center-add {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+      z-index: 999;
+      width: 30px;
+      height: 30px;
+    }
+  }
+
+  #mapContainer {
+    width: 100%;
+    height: 100%;
   }
-}
 
-#mapContainer {
-  width: 100%;
-  height: 100%;
-}
+  .amap-info-close {
+    display: none !important;
+  }
 </style>
 
 <template>
@@ -29,132 +34,140 @@
 </template>
 
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import image from '../../../public/img/ic_locationmarker.jpg'
-export default {
-  data() {
-    return {
-      clickData: {},
-      map: null,
-      marker: null,
-      provinces: [],
-      province: '',
-      districts: [],
-      district: '',
-      citys: [],
-      city: '',
-      polygons: [],
-      selectedOptions1: [],
-      areacode: '',
-      address: '',
-      objPoint: [],
-      markers: [],
-      zoomEnable: true,
-      dragEnable: true,
-      status: true,
-      center: ''
-    }
-  },
-  props: [
-    'flagVisible',
-    'position',
-    'selectedOptions',
-    'isShowaddress',
-    'type'
-  ],
-  computed: {},
-  watch: {},
-  async created() {
-    // 已载入高德地图API，则直接初始化地图
-    if (window.AMap && window.AMapUI) {
-      this.initMap()
-      // 未载入高德地图API，则先载入API再初始化
-    } else {
-      // await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}`)
-      // await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
-      // this.initMap()
-    }
-  },
-  mounted() {
-    // console.log(this)
-    setTimeout(() => {
-      var that = this
-      this.map = new AMap.Map('mapContainer', {
-        resizeEnable: true,
-        zoom: 5,
-        center:[103.809074,36.051121],
-        zoomEnable: this.zoomEnable,
-        dragEnable: this.dragEnable
-      })
-      this.loadmap()
-    }, 500)
-  },
-  methods: {
-    loadmap(val) {
-      let that = this
-      AMap.plugin(['AMap.DistrictSearch', 'AMap.Polygon'], function() {
-        var geolocation = new AMap.Geolocation({
-          // 是否使用高精度定位，默认：true
-          enableHighAccuracy: true, // 设置定位超时时间，默认：无穷大
-          timeout: 10000, // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
-          buttonOffset: new AMap.Pixel(10, 20), // 定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
-          zoomToAccuracy: true, // 定位按钮的排放位置, RB表示右下
-          buttonPosition: 'RB'
+  import {
+    regionData,
+    CodeToText,
+    TextToCode
+  } from 'element-china-area-data'
+  import image from '../../../public/img/ic_locationmarker.jpg'
+  export default {
+    data() {
+      return {
+        map: null,
+        marker: null,
+        markers: [],
+        zoomEnable: true,
+        dragEnable: true,
+        status: true,
+      }
+    },
+    props: [
+      'listData'
+    ],
+    computed: {},
+    watch: {
+      listData: function(val1, val2) {
+        debugger
+        this.listData = val1
+        var that = this
+        this.map = new AMap.Map('mapContainer', {
+          resizeEnable: true,
+          zoom: 5,
+          center: [103.809074, 36.051121],
+          zoomEnable: this.zoomEnable,
+          dragEnable: this.dragEnable
         })
-        geolocation.getCurrentPosition()
-        AMap.event.addListener(geolocation, 'complete', e => {
-          console.log(e) // 定位成功之后做的事 // 定位成功之后再定位处添加一个marker
-          that.markers = [
-            [122.26399, 40.583527],
-            [122.527662, 40.581441],
-            [122.26811, 40.18498]
-          ]
-          var infoWindow = new AMap.InfoWindow({
-            offset: new AMap.Pixel(0, -30)
+        this.loadmap()
+      }
+    },
+    async created() {
+      // 已载入高德地图API，则直接初始化地图
+      if (window.AMap && window.AMapUI) {
+        this.initMap()
+        // 未载入高德地图API，则先载入API再初始化
+      } else {
+        // await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=${MapKey}`)
+        // await remoteLoad('http://webapi.amap.com/ui/1.0/main.js')
+        // this.initMap()
+      }
+    },
+    mounted() {},
+    methods: {
+      makeMarkersList() {
+        let _list = this.listData
+        for (let i = 0; i < _list.length; i++) {
+          _list[i].marker = []
+          _list[i].marker.push(_list[i].warehousePositioning.split(',')[1])
+          _list[i].marker.push(_list[i].warehousePositioning.split(',')[0])
+        }
+      },
+      loadmap(val) {
+        let that = this
+        //构造markersList
+        this.makeMarkersList()
+        AMap.plugin(['AMap.DistrictSearch', 'AMap.Polygon'], function() {
+          var geolocation = new AMap.Geolocation({
+            // 是否使用高精度定位，默认：true
+            enableHighAccuracy: true, // 设置定位超时时间，默认：无穷大
+            timeout: 10000, // 定位按钮的停靠位置的偏移量，默认：Pixel(10, 20)
+            buttonOffset: new AMap.Pixel(10, 20), // 定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
+            zoomToAccuracy: true, // 定位按钮的排放位置, RB表示右下
+            buttonPosition: 'RB'
           })
-          function infoOpen(e) {
-            infoWindow.setContent(e.target.content)
-            infoWindow.open(that.map, e.target.getPosition())
-          }
-          function infoClose(e) {
-            infoWindow.close(that.map, e.target.getPosition())
-          }
-              function toGetList(e) {
-            that.$parent.getList(e,1)
-          }
-
-          for (let i = 0; i < that.markers.length; i++) {
-            var marker = new AMap.Marker({
-              position: that.markers[i], // （e.position）--->定位点的点坐标, position ---> marker的定位点坐标，也就是marker最终显示在那个点上，
-              icon: '', // marker的图标，可以自定义，不写默认使用高德自带的
-              map: that.map // map ---> 要显示该marker的地图对象
+          geolocation.getCurrentPosition()
+          AMap.event.addListener(geolocation, 'complete', e => {
+            console.log(e) // 定位成功之后做的事 // 定位成功之后再定位处添加一个marker
+            var infoWindow = new AMap.InfoWindow({
+              offset: new AMap.Pixel(0, -30)
             })
-            // marker.setMap(that.map);
-            // 设置鼠标划过点标记显示的文字提示
-            // marker.setTitle('我是marker的title');
-            marker.content = '<h4>我是第' + (i + 1) + '个</h4>'
-            marker.on('mouseover', infoOpen)
-            marker.on('mouseout', infoClose)
-            marker.on('click',toGetList)
-            // 设置label标签
-            // label默认蓝框白底左上角显示，样式className为：amap-marker-label
-            // marker.setLabel({
-            //     offset: new AMap.Pixel(20, 20),  //设置文本标注偏移量
-            //     content: "<div class='info'>我是 marker 的 label 标签</div>", //设置文本标注内容
-            //     direction: 'right' //设置文本标注方位
-            // });
-          }
-          // var marker = new AMap.Marker({
-          //   position: e.position, // （e.position）--->定位点的点坐标, position ---> marker的定位点坐标，也就是marker最终显示在那个点上，
-          //   icon: '', // marker的图标，可以自定义，不写默认使用高德自带的
-          //   map: that.map // map ---> 要显示该marker的地图对象
-          // })
-        })
-        AMap.event.addListener(geolocation, 'error', e => {
-          console.log(e) // 定位失败做的事
+
+            function infoOpen(e) {
+              infoWindow.setContent(e.target.content)
+              infoWindow.open(that.map, e.target.getPosition())
+            }
+
+            function infoClose(e) {
+              infoWindow.close(that.map, e.target.getPosition())
+            }
+
+            function toGetList(e) {debugger
+              // console.log(e.target.getExtData())
+              
+              that.$parent.getList(e.target.getExtData().id, 1)
+            }
+            for (let i = 0; i < that.listData.length; i++) {
+              var marker = new AMap.Marker({
+                map: that.map,
+                position: that.listData[i]
+                  .marker, // marker最终显示在那个点上，
+                icon: new AMap.Icon({
+                  image: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/home_pic.png",
+                  size: new AMap.Size(20, 20), //图标大小
+                  imageSize: new AMap.Size(20, 20),
+                }),
+              })
+
+              marker.setExtData({'id':that.listData[i].warehouseName})
+              let _cwList = '<div class="cw-wrap">'
+              for (let k = 0; k < that.listData[i].tradeWarehouseReceiptAppls.length; k++) {
+                let _k = that.listData[i].tradeWarehouseReceiptAppls[k]
+                _cwList += '<div style="display:flex">' +
+                  '<div style="margin:10px 20px">' + _k.warehouseNo + '仓位</div>' +
+                  '<div style="margin:10px 20px">' + _k.goodsName + '</div>' +
+                  '<div style="margin:10px 20px">' + _k.weight + '</div>' +
+                  '</div>'
+              }
+              _cwList = _cwList + '</div>'
+              console.log('地图仓位数据',_cwList)
+              marker.content = '<div style="display:flex;justify-content: center">' + that.listData[i]
+                .warehouseName + '</div>' + _cwList + '</div>'
+              marker.on('mouseover', infoOpen)
+              marker.on('mouseout', infoClose)
+              marker.on('click', toGetList)
+              // 设置label标签
+              // label默认蓝框白底左上角显示，样式className为：amap-marker-label
+              // marker.setLabel({
+              //     offset: new AMap.Pixel(20, 20),  //设置文本标注偏移量
+              //     content: "<div class='info'>我是 marker 的 label 标签</div>", //设置文本标注内容
+              //     direction: 'right' //设置文本标注方位
+              // });
+            }
+          })
+          AMap.event.addListener(geolocation, 'error', e => {
+            console.log(e) // 定位失败
+          })
         })
-      })
+      }
     }
   }
-}
 </script>

src/model/tradeServicesManagement/index.js

@@ -6,7 +6,8 @@ import {
     API_POST_WAREHOUSE_EDIT,
     API_GET_BILLNO,
     API_GET_TRADESERVICES_LIST,
-    API_POST_RECEIPTAPPL_ADD
+    API_POST_RECEIPTAPPL_ADD,
+    API_POST_DELETETRANEINFO
 } from '@/api/V2/tradeServicesManagement'
 
 // 列表
@@ -20,3 +21,5 @@ export const getwarehousewarrantList = appRx.get(API_GET_WAREHOUSE_LOOK, errorCa
 export const editList = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
 // 获取业务编号
 export const getbillno = appRx.get(API_GET_BILLNO, errorCatcher, errorHandle, filter)
+// 列表删除
+export const deleteTrageInfo = appRx.post(API_POST_DELETETRANEINFO, errorCatcher, errorHandle, filter)

src/views/tradeServicesManagement/component/routers/route.js

@@ -4,12 +4,14 @@ const tradeServicesManagementRouter = {
 
   path: '/tradeServicesManagement',
   component: Layout,
-  redirect: {name : 'warehouseReceiptRegulation'},
+  redirect: {
+    name: 'warehouseReceiptRegulation'
+  },
   name: 'warehouseReceiptRegulation',
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'warehouseReceiptRegulation',
-    module: 'transportationTask.transportation.transportationInfo',
+    module: 'tradeServicesManagement',
     icon: '-renwuguanli'
   },
   children: [
@@ -17,12 +19,12 @@ const tradeServicesManagementRouter = {
     {
       path: 'warehouseReceiptRegulation',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptRegulation'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptRegulation'),
       name: 'stockWarehouseReceiptRegulation',
       meta: {
         title: 'stockWarehouseReceiptRegulation',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },
@@ -32,12 +34,13 @@ const tradeServicesManagementRouter = {
     {
       path: 'onWaywarehouseReceiptRegulation',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/onWaywarehouseReceiptRegulation'),
+        import( /* webpackChunkName: "applDetail" */
+          '@/views/tradeServicesManagement/onWaywarehouseReceiptRegulation'),
       name: 'onWaywarehouseReceiptRegulation',
       meta: {
         title: 'onWaywarehouseReceiptRegulation',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },
@@ -47,12 +50,12 @@ const tradeServicesManagementRouter = {
     {
       path: 'warehouseReceiptAdd',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptAdd'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptAdd'),
       name: 'warehouseReceiptAdd',
       meta: {
         title: 'warehouseReceiptAdd',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.add',
         permissicon: [],
         keepAlive: true
       },
@@ -62,27 +65,27 @@ const tradeServicesManagementRouter = {
     {
       path: 'reviewWarehouseReceipt',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/reviewWarehouseReceipt'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/reviewWarehouseReceipt'),
       name: 'reviewWarehouseReceipt',
       meta: {
         title: 'reviewWarehouseReceipt',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     },
-     //审批仓单
-     {
+    //审批仓单
+    {
       path: 'approveWarehouseReceipt',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/approveWarehouseReceipt'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/approveWarehouseReceipt'),
       name: 'approveWarehouseReceipt',
       meta: {
         title: 'approveWarehouseReceipt',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },
@@ -92,57 +95,57 @@ const tradeServicesManagementRouter = {
     {
       path: 'inOutRecord',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/inOutRecord'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/inOutRecord'),
       name: 'inOutRecord',
       meta: {
         title: 'inOutRecord',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     },
-     //修改仓单
-     {
+    //修改仓单
+    {
       path: 'warehouseReceiptEdit',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptEdit'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptEdit'),
       name: 'warehouseReceiptEdit',
       meta: {
         title: 'warehouseReceiptEdit',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.edit',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     },
-     //查看仓单
-     {
+    //查看仓单
+    {
       path: 'warehouseReceiptLook',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptLook'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/warehouseReceiptLook'),
       name: 'warehouseReceiptLook',
       meta: {
         title: 'warehouseReceiptLook',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     },
-     //还款
-     {
+    //还款
+    {
       path: 'repayment',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/repayment'),
+        import( /* webpackChunkName: "applDetail" */ '@/views/tradeServicesManagement/repayment'),
       name: 'repayment',
       meta: {
         title: 'repayment',
-        shortcutEntrance: 'tradeServicesManagement',
-        module: 'transportationTask.transportation.transportationInfo',
+        shortcutEntrance: 'warehouseReceiptRegulation',
+        module: 'tradeServicesManagement.tradeService.view',
         permissicon: [],
         keepAlive: true
       },

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -1,7 +1,7 @@
 //贸易服务管理
 <template>
   <div class="container">
-    <map-drag :class="{active:isActive}"></map-drag>
+    <map-drag :class="{active:isActive}" :listData='mapInfo'></map-drag>
     <div class="bottom" :class="{active:isActive}">
       <div class="bottom-content">
         <div class="bottom-item" @click="startHacking">查看申请记录</div>
@@ -25,7 +25,7 @@
         <el-button type="" :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(5)">已还</el-button>
         <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input" v-model="searchKeyWord"></el-input>
         <el-button type="primary" @click='findList'>查找</el-button>
-        <el-button type="primary" class="add" @click="add">添加</el-button>
+        <el-button type="primary" v-hasPermission=" `tradeServicesManagement.tradeService.add`" class="add" @click="add">添加</el-button>
       </div>
       <el-table :data="tradeServicesList" style="width: 100%; margin-top: 20px" ref="tradeServicesList" border
         height="calc(100% - 90px)">
@@ -38,11 +38,7 @@
         <el-table-column prop="billNo" label="业务编号"></el-table-column>
         <el-table-column prop="contractNo" label="合同编号"></el-table-column>
         <el-table-column prop="warehouseName" label="仓库名"></el-table-column>
-        <el-table-column prop="warehouseNo" label="仓位号">
-          <!-- <template slot-scope="scope">
-            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
-          </template> -->
-        </el-table-column>
+        <el-table-column prop="warehouseNo" label="仓位号"></el-table-column>
         <el-table-column prop="goodsName" label="货名"></el-table-column>
         <el-table-column prop="weight" label="重量（吨）"></el-table-column>
         <el-table-column prop="unitPrice" label="单价（元/吨）"></el-table-column>
@@ -51,27 +47,23 @@
         <el-table-column prop="amountDue" label="应还金额（元）"></el-table-column>
         <el-table-column prop="amountRepaid" label="已还金额（元）"></el-table-column>
         <el-table-column prop="amountToRepaid" label="待还金额（元）"></el-table-column>
-        <el-table-column prop="status" label="状态">
-          <!-- <template slot-scope="scope">
-            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
-          </template> -->
+        <el-table-column prop="approveStatus" label="状态">
+          <template slot-scope="scope">
+            <div>{{scope.row.approveStatus}}</div>
+          </template>
         </el-table-column>
         <el-table-column prop="address" label="操作" width="430">
           <template slot-scope="scope">
-            <el-button size="mini" @click="lookBtnClick(scope.row, 2)" v-show="scope.row.authenticationStatus!='已删除'">
+            <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
               查看</el-button>
-            <el-button size="mini" @click="toExamineBtnClick(scope.row, 2)"
-              v-show="scope.row.authenticationStatus!='已删除'">
+            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
               审核</el-button>
-            <el-button size="mini" @click="approveBtnClick(scope.row, 2)"
-              v-show="scope.row.authenticationStatus!='已删除'">
+            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
               审批</el-button>
-            <el-button size="mini" @click="repaymentBtnClick(scope.row, 2)"
-              v-show="scope.row.authenticationStatus!='已删除'">
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.return`" size="mini" @click="repaymentBtnClick(scope.row, 2)">
               还款</el-button>
-            <el-button size="mini" @click="rowEditBtnClick(scope.row, 3)"
-              v-show="scope.row.authenticationStatus!='已删除'">修改</el-button>
-            <el-button size="mini" type="danger" @click="rowDeleteBtnClick(scope.row, '')">删除</el-button>
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.edit`" size="mini" @click="rowEditBtnClick(scope.row, 3)">修改</el-button>
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.delete`" size="mini" type="danger" @click="rowDeleteBtnClick(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -87,7 +79,8 @@
   import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
   import {
     getList,
-    getMapInfo
+    getMapInfo,
+    deleteTrageInfo
   } from '@/model/tradeServicesManagement/index'
   import {
     selectWarehouseSelf,
@@ -140,7 +133,8 @@
     methods: {
       getMapInfo() {
         getMapInfo().toPromise().then((response) => {
-          console.log('地图数据', response)
+          // console.log('地图数据', response)
+          this.mapInfo = response
           // this.mapInfo = response.data.records
         })
       },
@@ -180,7 +174,13 @@
           name: 'warehouseReceiptEdit'
         })
       },
-      rowDeleteBtnClick(val1, val2) {},
+      rowDeleteBtnClick(val1) {
+          deleteTrageInfo().toPromise().then((response) => {
+             this.$message.success('删除成功')
+            // this.mapInfo = response.data.records
+          })
+
+      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
@@ -207,9 +207,11 @@
             this.warehouseList = response
           })
       },
-      getList(e, type) {
+      getList(val, type) {debugger
+        // type=1 地图点击
         if (type == 1) {
           this.isActive = true
+          this.searchKeyWord = val
         }
         getList({
             compId: this.compId,