gjy 3 years ago
parent
commit
6994bdaf3a

+ 2 - 0
src/components/mapdrag/mapdrag.vue

@@ -411,6 +411,7 @@
           zoomEnable: true,
           dragEnable: true,
         }
+
         this.map.setStatus(status)
         this.loadmap()
       },
@@ -500,6 +501,7 @@
         _data.push(this.district)
         _data.push(this.address)
         _data.push(this.type)
+        _data.push(this.center)
         this.$emit('addressListen', _data)
         this.$parent.blurMap()
         console.log("submit")

+ 2 - 0
src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -552,12 +552,14 @@
           this.deptBudgetList.contractGoodsInfo.outputPrivate = data[0]
           this.deptBudgetList.contractGoodsInfo.outputCity = data[1]
           this.deptBudgetList.contractGoodsInfo.outputArea = data[2]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -731,12 +731,14 @@ export default {
         this.deptBudgetList.contractGoodsInfo.outputPrivate =  data[0]
         this.deptBudgetList.contractGoodsInfo.outputCity =  data[1]
         this.deptBudgetList.contractGoodsInfo.outputArea =  data[2]
+        this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
       } else {
         this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
         this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
         this.deptBudgetList.deliveryCity = data[1]
         this.deptBudgetList.deliveryArea = data[2]
         this.deptBudgetList.placeDelivery = data[3]
+        this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
       }
     },
     mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/futuresSalesContractEdit.vue

@@ -437,12 +437,14 @@
           this.deptBudgetList.contractGoodsInfo.outputPrivate = data[0]
           this.deptBudgetList.contractGoodsInfo.outputCity = data[1]
           this.deptBudgetList.contractGoodsInfo.outputArea = data[2]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 3 - 0
src/views/contractManagement/purchaseContractAdd.vue

@@ -585,12 +585,15 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          console.log(data[4])
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/purchaseContractEdit.vue

@@ -393,12 +393,14 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/salesContractAdd.vue

@@ -556,12 +556,14 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/salesContractEdit.vue

@@ -476,12 +476,14 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {