diff --git a/jnpf-java-boot/jnpf-web/src/components/mapComponent/index.vue b/jnpf-java-boot/jnpf-web/src/components/mapComponent/index.vue
new file mode 100644
index 0000000..551c1c0
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/components/mapComponent/index.vue
@@ -0,0 +1,84 @@
+<!--
+ * @Author: 王文杰
+ * @Date: 2024-02-02 09:28:28
+ * @LastEditors: 王文杰
+ * @LastEditTime: 2024-02-02 13:45:21
+ * @FilePath: /jnpf-web/src/components/mapComponents/index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <el-dialog :visible="visible" style="z-index: 9999;" :append-to-body="true" :close-on-click-modal="false" @close="handleCancelMap" width="30%" title="选择地点">
+    <iframe id="mapPage" width="100%" height="600px" frameborder=0 :src="map_src">
+    </iframe>
+    <template slot="footer">
+      <el-button @click="handleSureMap" type='primary'>确定</el-button>
+      <el-button @click="handleCancelMap" type='primary'>取消</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    props: {
+      visibleMap: {
+        type: Boolean,
+        default: false,
+      }
+    },
+    data() {
+      return {
+        visible: this.visibleMap,
+        map_src: 'https://mapapi.qq.com/web/mapComponents/locationPicker/v/index.html?search=1&type=1&key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6&referer=myapp',
+        form: {
+          //省市区ID
+          id_area: [
+            0,
+            0,
+            0
+          ],
+          address: '',
+          lng: '',
+          lat: '',
+        },
+        map_data: {
+          url: 'https://mapapi.qq.com/web/mapComponents/locationPicker/v/index.html?search=1&type=1&key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6&referer=myapp',
+          address: '',
+          lng: '',
+          lat: '',
+        },
+      }
+    },
+    created() {
+      let that = this
+      window.addEventListener('message', function(event) {
+
+        // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+        var loc = event.data;
+        console.log(loc)
+
+        if (loc && loc.module == 'locationPicker') { //防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+          that.map_data.address = loc.poiaddress
+          that.map_data.lat = loc.latlng.lat
+          that.map_data.lng = loc.latlng.lng
+          that.$emit('chooseMapPoint',that.map_data)
+        } else {
+          that.$emit('chooseMapPoint','选择数据为空')
+        }
+      }, false);
+    },
+    methods: {
+      //地图选点确定
+      handleSureMap() {
+        debugger
+        this.$emit('sure', this.map_data)
+      },
+      // 取消
+      handleCancelMap () {
+        this.$emit('cancel')
+      },
+    }
+  }
+</script>
+
+<style>
+</style>
diff --git a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
index c104c6e..583d514 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
@@ -1,298 +1,246 @@
-
-
-
-    <template>
-  <transition name="el-zoom-in-center">
-    <div class="JNPF-preview-main">
-      <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
-        <div class="options">
-          <el-dropdown class="dropdown" placement="bottom">
-            <el-button style="width:70px">
-              更 多<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <template v-if="dataForm.id">
-                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                  {{'上一条'}}
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                  {{'下一条'}}
-                </el-dropdown-item>
-              </template>
-              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                :loading="continueBtnLoading" :disabled='btnLoading'>
-                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
-            :disabled='continueBtnLoading'> 保 存</el-button>
-          <el-button @click="goBack"> 取 消</el-button>
-        </div>
+<template>
+<transition name="el-zoom-in-center">
+  <div class="JNPF-preview-main">
+    <div class="JNPF-common-page-header">
+      <el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
+      <div class="options">
+        <el-dropdown class="dropdown" placement="bottom">
+          <el-button style="width:70px">
+            更 多<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <template v-if="dataForm.id">
+              <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                {{'上一条'}}
+              </el-dropdown-item>
+              <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                {{'下一条'}}
+              </el-dropdown-item>
+            </template>
+            <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading" :disabled='btnLoading'>
+              {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
+        <el-button @click="goBack"> 取 消</el-button>
       </div>
-      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="default"
-          label-width="100px" label-position="right">
-          <template v-if="!loading">
-            <!-- 具体表单 -->
-            <el-col :span="24">
-              <jnpf-form-tip-item>
-                <JnpfGroupTitle content="基础信息" contentPosition="left">
-                </JnpfGroupTitle>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="回收站编号" prop="stationCode">
-                <JnpfInput v-model="dataForm.stationCode" @change="changeData('stationCode',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="回收站名称" prop="stationName">
-                <JnpfInput v-model="dataForm.stationName" @change="changeData('stationName',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="回收站简称" prop="shortName">
-                <JnpfInput v-model="dataForm.shortName" @change="changeData('shortName',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
-                </JnpfInput>
+    </div>
+    <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="default" label-width="100px" label-position="right">
+        <template v-if="!loading">
+          <!-- 具体表单 -->
+          <el-col :span="24">
+            <jnpf-form-tip-item>
+              <JnpfGroupTitle content="基础信息" contentPosition="left">
+              </JnpfGroupTitle>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收站编号" prop="stationCode">
+              <JnpfInput v-model="dataForm.stationCode" @change="changeData('stationCode',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收站名称" prop="stationName">
+              <JnpfInput v-model="dataForm.stationName" @change="changeData('stationName',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item class="site-item" label="回收站位置" prop="stationName">
+              <JnpfInput class="input" disabled v-model="dataForm.stationLocation" @change="changeData('stationName',-1)" placeholder="请选择站点位置" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+               <el-button @click="handleShowMap">选择站点</el-button>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收站简称" prop="shortName">
+              <JnpfInput v-model="dataForm.shortName" @change="changeData('shortName',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="经营模式" prop="managementModel">
+              <JnpfSelect v-model="dataForm.managementModel" @change="changeData('managementModel',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="managementModelOptions" :props="managementModelProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="所在城市" prop="city">
+              <JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :level="1">
+              </JnpfAreaSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收类目" prop="recycleTypeIds">
+              <JnpfSelect v-model="dataForm.recycleTypeIds" @change="changeData('recycleTypeIds',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="recycleTypeIdsOptions" :props="recycleTypeIdsProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
+              <JnpfInput v-model="dataForm.firstContactPerson" @change="changeData('firstContactPerson',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
+              <JnpfInput v-model="dataForm.firstContactPersonPosition" @change="changeData('firstContactPersonPosition',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
+              <JnpfInput v-model="dataForm.firstContactPersonTel" @change="changeData('firstContactPersonTel',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收站状态" prop="stationStatus">
+              <JnpfSwitch v-model="dataForm.stationStatus" @change="changeData('stationStatus',-1)" :active-value="1" :inactive-value="0">
+              </JnpfSwitch>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item>
+              <JnpfGroupTitle content="详细信息" contentPosition="left">
+              </JnpfGroupTitle>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收站照片" prop="stationImg">
+              <JnpfUploadImg v-model="dataForm.stationImg" @change="changeData('stationImg',-1)" :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+              </JnpfUploadImg>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="详细地址" prop="address">
+              <JnpfInput v-model="dataForm.address" @change="changeData('address',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="回收电话" prop="recycleTel">
+              <JnpfInput v-model="dataForm.recycleTel" @change="changeData('recycleTel',-1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="16">
+            <jnpf-form-tip-item label="回收站介绍" prop="stationDescription">
+              <JnpfTextarea v-model="dataForm.stationDescription" @change="changeData('stationDescription',-1)" placeholder="请输入" clearable :style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}'>
+              </JnpfTextarea>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label-width="0">
+              <div class="JNPF-common-title">
+                <h2>价格配置</h2>
+              </div>
+              <el-table :data="dataForm.recyclestationpriceList" size='mini'>
+                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column label="回收类目" prop="recycleTypeId">
+                  <template slot="header" v-if="false">
+                    <span class="required-sign">*</span>回收类目
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfSelect v-model="scope.row.recycleTypeId" @change="changeData('recyclestationprice-recycleTypeId',scope.$index)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="recyclestationpricerecycleTypeIdOptions" :props="recyclestationpricerecycleTypeIdProps">
+                    </JnpfSelect>
+                  </template>
+                </el-table-column>
+                <el-table-column label="单价(kg)" prop="unitPrice">
+                  <template slot="header" v-if="false">
+                    <span class="required-sign">*</span>单价(kg)
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.unitPrice" @change="changeData('recyclestationprice-unitPrice',scope.$index)" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="50">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationpriceList(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="table-actions" @click="addrecyclestationpriceList()">
+                <el-button type="text" icon="el-icon-plus">添加</el-button>
+              </div>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item>
+              <JnpfGroupTitle content="业务配置" contentPosition="left">
+              </JnpfGroupTitle>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-card class="mb-20" shadow="never" header="营业时间配置">
+            <el-col :span="12">
+              <jnpf-form-tip-item label="营业时间" prop="businessDays">
+                <JnpfCheckbox v-model="dataForm.businessDays" @change="changeData('businessDays',-1)" optionType="default" direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions" :props="businessDaysProps">
+                </JnpfCheckbox>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="经营模式" prop="managementModel">
-                <JnpfSelect v-model="dataForm.managementModel"
-                  @change="changeData('managementModel',-1)" placeholder="请选择" clearable
-                  :style='{"width":"100%"}' :options="managementModelOptions"
-                  :props="managementModelProps">
-                </JnpfSelect>
+
+            <el-col :span="6">
+              <jnpf-form-tip-item label="营业时间起" prop="appointmentTimeStart">
+                <JnpfTimePicker v-model="dataForm.appointmentTimeStart" @change="changeData('appointmentTimeStart',-1)" :startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm">
+                </JnpfTimePicker>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="所在城市" prop="city">
-                <JnpfAreaSelect v-model="dataForm.city" @change="changeData('city',-1)"
-                  placeholder="请选择" clearable :style='{"width":"100%"}' :level="1">
-                </JnpfAreaSelect>
+
+            <el-col :span="6">
+              <jnpf-form-tip-item label="营业时间止" prop="appointmentTimeEnd">
+                <JnpfTimePicker v-model="dataForm.appointmentTimeEnd" @change="changeData('appointmentTimeEnd',-1)" :startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm">
+                </JnpfTimePicker>
               </jnpf-form-tip-item>
             </el-col>
+          </el-card>
+          <el-card class="mb-20" shadow="never" header="接单范围配置">
             <el-col :span="8">
-              <jnpf-form-tip-item label="回收类目" prop="recycleTypeIds">
-                <JnpfSelect v-model="dataForm.recycleTypeIds"
-                  @change="changeData('recycleTypeIds',-1)" placeholder="请选择" clearable
-                  :style='{"width":"100%"}' :options="recycleTypeIdsOptions"
-                  :props="recycleTypeIdsProps">
+              <jnpf-form-tip-item label="接单范围" prop="acceptRange">
+                <JnpfSelect v-model="dataForm.acceptRange" @change="changeData('acceptRange',-1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="acceptRangeOptions" :props="acceptRangeProps">
                 </JnpfSelect>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
-                <JnpfInput v-model="dataForm.firstContactPerson"
-                  @change="changeData('firstContactPerson',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
-                <JnpfInput v-model="dataForm.firstContactPersonPosition"
-                  @change="changeData('firstContactPersonPosition',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
-                <JnpfInput v-model="dataForm.firstContactPersonTel"
-                  @change="changeData('firstContactPersonTel',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="回收站状态" prop="stationStatus">
-                <JnpfSwitch v-model="dataForm.stationStatus"
-                  @change="changeData('stationStatus',-1)" :active-value="1" :inactive-value="0">
-                </JnpfSwitch>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24">
-              <jnpf-form-tip-item>
-                <JnpfGroupTitle content="详细信息" contentPosition="left">
-                </JnpfGroupTitle>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="回收站照片" prop="stationImg">
-                <JnpfUploadImg v-model="dataForm.stationImg" @change="changeData('stationImg',-1)"
-                  :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
-                </JnpfUploadImg>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="详细地址" prop="address">
-                <JnpfInput v-model="dataForm.address" @change="changeData('address',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="8">
-              <jnpf-form-tip-item label="回收电话" prop="recycleTel">
-                <JnpfInput v-model="dataForm.recycleTel" @change="changeData('recycleTel',-1)"
-                  placeholder="请输入" clearable :style='{"width":"100%"}'>
-                </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="16">
-              <jnpf-form-tip-item label="回收站介绍" prop="stationDescription">
-                <JnpfTextarea v-model="dataForm.stationDescription"
-                  @change="changeData('stationDescription',-1)" placeholder="请输入" clearable
-                  :style='{"width":"100%"}' :autosize='{"minRows":4,"maxRows":4}'>
-                </JnpfTextarea>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24">
-              <jnpf-form-tip-item label-width="0">
-                <div class="JNPF-common-title">
-                  <h2>价格配置</h2>
-                </div>
-                <el-table :data="dataForm.recyclestationpriceList" size='mini'>
-                  <el-table-column type="index" width="50" label="序号" align="center" />
-                  <el-table-column label="回收类目" prop="recycleTypeId">
-                    <template slot="header" v-if="false">
-                      <span class="required-sign">*</span>回收类目
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfSelect v-model="scope.row.recycleTypeId"
-                        @change="changeData('recyclestationprice-recycleTypeId',scope.$index)"
-                        placeholder="请选择" clearable :style='{"width":"100%"}'
-                        :options="recyclestationpricerecycleTypeIdOptions"
-                        :props="recyclestationpricerecycleTypeIdProps">
-                      </JnpfSelect>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="单价(kg)" prop="unitPrice">
-                    <template slot="header" v-if="false">
-                      <span class="required-sign">*</span>单价(kg)
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.unitPrice"
-                        @change="changeData('recyclestationprice-unitPrice',scope.$index)"
-                        placeholder="请输入" clearable :style='{"width":"100%"}'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" width="50">
-                    <template slot-scope="scope">
-                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                        @click="delrecyclestationpriceList(scope.$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div class="table-actions" @click="addrecyclestationpriceList()">
-                  <el-button type="text" icon="el-icon-plus">添加</el-button>
-                </div>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24">
-              <jnpf-form-tip-item>
-                <JnpfGroupTitle content="业务配置" contentPosition="left">
-                </JnpfGroupTitle>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-card class="mb-20" shadow="never" header="营业时间配置">
-              <el-col :span="12">
-                <jnpf-form-tip-item label="营业时间" prop="businessDays">
-                  <JnpfCheckbox v-model="dataForm.businessDays"
-                    @change="changeData('businessDays',-1)" optionType="default"
-                    direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions"
-                    :props="businessDaysProps">
-                  </JnpfCheckbox>
-                </jnpf-form-tip-item>
-              </el-col>
-
-              <el-col :span="6">
-                <jnpf-form-tip-item label="营业时间起" prop="appointmentTimeStart">
-                  <JnpfTimePicker v-model="dataForm.appointmentTimeStart"
-                    @change="changeData('appointmentTimeStart',-1)"
-                    :startTime="time(false,1,1,'','HH:mm','')"
-                    :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable
-                    :style='{"width":"100%"}' format="HH:mm">
-                  </JnpfTimePicker>
-                </jnpf-form-tip-item>
-              </el-col>
-
-              <el-col :span="6">
-                <jnpf-form-tip-item label="营业时间止" prop="appointmentTimeEnd">
-                  <JnpfTimePicker v-model="dataForm.appointmentTimeEnd"
-                    @change="changeData('appointmentTimeEnd',-1)"
-                    :startTime="time(false,1,1,'','HH:mm','')"
-                    :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable
-                    :style='{"width":"100%"}' format="HH:mm">
-                  </JnpfTimePicker>
-                </jnpf-form-tip-item>
-              </el-col>
-            </el-card>
-            <el-card class="mb-20" shadow="never" header="接单范围配置">
-              <el-col :span="8">
-                <jnpf-form-tip-item label="接单范围" prop="acceptRange">
-                  <JnpfSelect v-model="dataForm.acceptRange" @change="changeData('acceptRange',-1)"
-                    placeholder="请选择" clearable :style='{"width":"100%"}'
-                    :options="acceptRangeOptions" :props="acceptRangeProps">
-                  </JnpfSelect>
-                </jnpf-form-tip-item>
-              </el-col>
-            </el-card>
-            <el-col :span="24">
-              <jnpf-form-tip-item label-width="0">
-                <div class="JNPF-common-title">
-                  <h2>范围内小区</h2>
-                </div>
-                <el-table :data="dataForm.recyclestationhousingestateList" size='mini'>
-                  <el-table-column type="index" width="50" label="序号" align="center" />
-                  <el-table-column label="小区id" prop="housingEstateId">
-                    <template slot="header" v-if="false">
-                      <span class="required-sign">*</span>小区id
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfPopupSelect v-model="scope.row.housingEstateId"
-                        @change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)"
-                        :rowIndex="scope.$index" :formData="dataForm"
-                        :templateJson="interfaceRes.recyclestationhousingestatehousingEstateId"
-                        placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                        popupType="dialog" relationField='name'
-                        :field="'housingEstateId'+scope.$index" interfaceId="520155939362312325"
-                        :pageSize="20"
-                        :columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions"
-                        clearable :style='{"width":"100%"}'>
-                      </JnpfPopupSelect>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" width="50">
-                    <template slot-scope="scope">
-                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                        @click="delrecyclestationhousingestateList(scope.$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div class="table-actions" @click="addrecyclestationhousingestateList()">
-                  <el-button type="text" icon="el-icon-plus">添加</el-button>
-                </div>
-              </jnpf-form-tip-item>
-            </el-col>
-            <!-- 表单结束 -->
-          </template>
-        </el-form>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
-      </el-row>
-    </div>
-  </transition>
+          </el-card>
+          <el-col :span="24">
+            <jnpf-form-tip-item label-width="0">
+              <div class="JNPF-common-title">
+                <h2>范围内小区</h2>
+              </div>
+              <el-table :data="dataForm.recyclestationhousingestateList" size='mini'>
+                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column label="小区id" prop="housingEstateId">
+                  <template slot="header" v-if="false">
+                    <span class="required-sign">*</span>小区id
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfPopupSelect v-model="scope.row.housingEstateId" @change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)" :rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.recyclestationhousingestatehousingEstateId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' :field="'housingEstateId'+scope.$index" interfaceId="520155939362312325" :pageSize="20" :columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                    </JnpfPopupSelect>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="50">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationhousingestateList(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="table-actions" @click="addrecyclestationhousingestateList()">
+                <el-button type="text" icon="el-icon-plus">添加</el-button>
+              </div>
+            </jnpf-form-tip-item>
+          </el-col>
+          <!-- 表单结束 -->
+        </template>
+      </el-form>
+      <mapComponent v-if="visibleMap" :visibleMap='visibleMap' @chooseMapPoint='getCallMap' @cancel='cancelMap' @sure='sureMap'></mapComponent>
+      <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+    </el-row>
+  </div>
+</transition>
 </template>
 
-
 <script>
 import request from '@/utils/request'
 import { mapGetters } from "vuex";
@@ -302,11 +250,16 @@ import { getDefaultCurrentValueUserId } from '@/api/permission/user'
 import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
 import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
 import { thousandsFormat } from "@/components/Generator/utils/index"
+import mapComponent from "@/components/mapComponent"
+
 export default {
-  components: {},
+  components: {
+    mapComponent
+  },
   props: [],
   data() {
     return {
+      visibleMap: false,
       dataFormSubmitType: 0,
       continueBtnLoading: false,
       index: 0,
@@ -328,8 +281,7 @@ export default {
         recyclestationhousingestateList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
       },
       //可选范围默认值
-      ableAll: {
-      },
+      ableAll: {},
       tableRows: {
         recyclestationpriceList: {
           recycleTypeIdOptions: [],
@@ -345,9 +297,11 @@ export default {
       },
       Vmodel: "",
       currVmodel: "",
+      stationLocationObj: {}, // 站点地图信息，经纬度地址
       dataForm: {
         stationCode: undefined,
         stationName: undefined,
+        stationLocation: undefined, // 站点位置
         shortName: undefined,
         managementModel: undefined,
         city: [],
@@ -368,59 +322,48 @@ export default {
         recyclestationhousingestateList: [],
       },
       tableRequiredData: {},
-      dataRule:
-      {
-        stationCode: [
-          {
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          },
-        ],
-        stationName: [
-          {
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          },
-        ],
-        managementModel: [
-          {
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
-        ],
-        city: [
-          {
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          },
-        ],
-        firstContactPerson: [
-          {
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          },
-        ],
-        firstContactPersonTel: [
-          {
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          },
-        ],
-        address: [
-          {
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          },
-        ],
-        recycleTel: [
-          {
+      dataRule: {
+        stationCode: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        }, ],
+        stationName: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        }, ],
+        stationLocation: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        }, ],
+        managementModel: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }, ],
+        city: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        }, ],
+        firstContactPerson: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        }, ],
+        firstContactPersonTel: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        }, ],
+        address: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        }, ],
+        recycleTel: [{
             required: true,
             message: '请输入',
             trigger: 'blur'
@@ -431,34 +374,26 @@ export default {
             trigger: 'blur'
           },
         ],
-        businessDays: [
-          {
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          },
-        ],
-        appointmentTimeStart: [
-          {
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
-        ],
-        appointmentTimeEnd: [
-          {
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
-        ],
-        acceptRange: [
-          {
-            required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
-        ],
+        businessDays: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        }, ],
+        appointmentTimeStart: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }, ],
+        appointmentTimeEnd: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }, ],
+        acceptRange: [{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }, ],
       },
       managementModelOptions: [],
       managementModelProps: { "label": "fullName", "value": "id" },
@@ -470,7 +405,7 @@ export default {
       acceptRangeProps: { "label": "fullName", "value": "id" },
       recyclestationpricerecycleTypeIdOptions: [],
       recyclestationpricerecycleTypeIdProps: { "label": "fullName", "value": "id" },
-      recyclestationhousingestatehousingEstateIdcolumnOptions: [{ "label": "小区名称", "value": "name" },],
+      recyclestationhousingestatehousingEstateIdcolumnOptions: [{ "label": "小区名称", "value": "name" }, ],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {
@@ -507,8 +442,24 @@ export default {
     this.initDefaultData()
     this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
   },
-  mounted() { },
+  mounted() {
+  },
   methods: {
+    handleShowMap() {
+      this.visibleMap = true
+    },
+    getCallMap(e) {
+       console.log('chooseMapPoint',e)
+    },
+    cancelMap () {
+      this.visibleMap = false
+    },
+    sureMap(valObj){
+      this.stationLocationObj = valObj
+      this.dataForm.stationLocation = valObj.address
+      console.log('位置信息',valObj)
+      this.visibleMap = false
+    },
     prev() {
       this.index--
       if (this.index === 0) {
@@ -746,8 +697,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.dataForm.recyclestationpriceList.splice(index, 1);
-      }).catch(() => {
-      });
+      }).catch(() => {});
     },
     getrecyclestationpriceList(value) {
       let item = { ...this.tableRows.recyclestationpriceList, ...value }
@@ -768,8 +718,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.dataForm.recyclestationhousingestateList.splice(index, 1);
-      }).catch(() => {
-      });
+      }).catch(() => {});
     },
     getrecyclestationhousingestateList(value) {
       let item = { ...this.tableRows.recyclestationhousingestateList, ...value }
@@ -860,6 +809,11 @@ export default {
     },
     dataList() {
       var _data = this.dataForm;
+      // stationLocationObj 站点信息，经纬度
+      var _data_new = {
+        ..._data,
+        stationLocationObj: this.stationLocationObj
+      }
       return _data;
     },
     dataInfo(dataAll) {
@@ -877,5 +831,19 @@ export default {
     },
   },
 }
-
 </script>
+
+<style scoped lang="scss">
+.site-item {
+  display: flex;
+  ::v-deep .el-form-item__content {
+    display: flex!important;
+    align-items: flex-start;
+    margin-left: 0!important;
+    .input {
+      width: 200px!important;
+      margin-right: 10px;
+    }
+  }
+}
+</style>