|
|
@@ -270,7 +270,7 @@
|
|
|
</ws-form-item>
|
|
|
<!--交货所在地区-->
|
|
|
<ws-form-item label="交货所在地区" span="1" prop="sourceGoods">
|
|
|
- <el-cascader
|
|
|
+ <!-- <el-cascader
|
|
|
:options="options_"
|
|
|
v-model="selectedOptions"
|
|
|
clearable
|
|
|
@@ -278,7 +278,13 @@
|
|
|
placeholder="请选择交货所在地区"
|
|
|
style="width: 200%"
|
|
|
@change="handleChange"
|
|
|
- />
|
|
|
+ /> -->
|
|
|
+ <el-button
|
|
|
+ @click="mapInputClick('deliveryProv')"
|
|
|
+ class="address-btn"
|
|
|
+ >
|
|
|
+ {{ newSelectedOptions1 }}
|
|
|
+ </el-button>
|
|
|
</ws-form-item>
|
|
|
<!--点价（元/吨）-->
|
|
|
<ws-form-item label="点价（元/吨）" span="1" prop="pointPrice">
|
|
|
@@ -581,6 +587,15 @@
|
|
|
accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
|
|
|
/>
|
|
|
</ws-form>
|
|
|
+ <div v-if="dialogVisible" class="map">
|
|
|
+ <map-drag
|
|
|
+ @marker="marker"
|
|
|
+ :isShowaddress="true"
|
|
|
+ v-on:addressListen="getAddress"
|
|
|
+ :type="type"
|
|
|
+ >
|
|
|
+ </map-drag>
|
|
|
+ </div>
|
|
|
<div style="text-align: right; padding: 10px" class="center">
|
|
|
<el-button
|
|
|
class="bg-bottom"
|
|
|
@@ -606,11 +621,12 @@ import {
|
|
|
import { regionData,provinceAndCityDataPlus, CodeToText, TextToCode } from 'element-china-area-data'
|
|
|
import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
+import mapDrag from '@/components/mapdrag/mapdrag'
|
|
|
|
|
|
export default {
|
|
|
name: 'viewSpareMoney',
|
|
|
components: {
|
|
|
- WsUpload,
|
|
|
+ WsUpload,mapDrag
|
|
|
},
|
|
|
watch: {
|
|
|
vesselId(val) {
|
|
|
@@ -622,6 +638,9 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ type: '',
|
|
|
+ dialogVisible: false,
|
|
|
+ newSelectedOptions1: '请选择交货所在地区',
|
|
|
//弹出框
|
|
|
dialogViewSpareMoney: false,
|
|
|
dialogApproveFormVisible: false,
|
|
|
@@ -715,6 +734,36 @@ export default {
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+ marker: function (item) {
|
|
|
+ this.deptBudgetList.warehousePositioning =
|
|
|
+ item.lnglat.lat + ',' + item.lnglat.lng
|
|
|
+ },
|
|
|
+ getAddress(data) {
|
|
|
+ console.log('getAddress', data)
|
|
|
+ if (data[4] == 'source') {
|
|
|
+ this.newSelectedOptions = data[0] + '/' + data[1] + '/' + data[2]
|
|
|
+ this.deptBudgetList.sourceProvince = data[0]
|
|
|
+ this.deptBudgetList.sourceCity = data[1]
|
|
|
+ this.deptBudgetList.sourceArea = data[2]
|
|
|
+ this.deptBudgetList.sourceGoods = data[3]
|
|
|
+ } 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]
|
|
|
+ }
|
|
|
+ },
|
|
|
+ mapInputClick(type) {
|
|
|
+ this.dialogVisible = true
|
|
|
+ this.type = type
|
|
|
+ },
|
|
|
+ blurMap(){
|
|
|
+ this.dialogVisible = false
|
|
|
+ },
|
|
|
+ focusMap(){
|
|
|
+ this.dialogVisible = true
|
|
|
+ },
|
|
|
dataFilter(val) {
|
|
|
this.deptBudgetList.personCharge = val
|
|
|
if (val) {
|
|
|
@@ -1866,4 +1915,28 @@ export default {
|
|
|
line-height: inherit;
|
|
|
display: none;
|
|
|
}
|
|
|
+.map {
|
|
|
+ position: fixed;
|
|
|
+ top: 0;
|
|
|
+ bottom: 0;
|
|
|
+ left: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+ width: 800px;
|
|
|
+ height: 400px;
|
|
|
+ background: gainsboro;
|
|
|
+ border-radius: 20px;
|
|
|
+ padding: 10px;
|
|
|
+ box-sizing: border-box;
|
|
|
+ z-index: 99;
|
|
|
+}
|
|
|
+
|
|
|
+.amap-container {
|
|
|
+ width: 100% !important;
|
|
|
+}
|
|
|
+
|
|
|
+.address-btn {
|
|
|
+ width: 100%;
|
|
|
+ text-align: left;
|
|
|
+}
|
|
|
</style>
|
mxx