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 5857b82..7838e9c 100644
--- a/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue
@@ -1,244 +1,303 @@
 <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>
+  <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>
       </div>
-    </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.address" @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">
+      <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.address"
+                  @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>
+            <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="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>
+            <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="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>
+            <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-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>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="业务配置" contentPosition="left">
+                </JnpfGroupTitle>
               </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>
-      <mapComponent v-if="visibleMap" :visibleMap='visibleMap' :longitude="dataForm.longitude" :latitude="dataForm.latitude" :address="dataForm.address" @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>
+            <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>
+        <mapComponent v-if="visibleMap" :visibleMap='visibleMap' :longitude="dataForm.longitude"
+          :latitude="dataForm.latitude" :address="dataForm.address" @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>
@@ -328,73 +387,73 @@ export default {
           required: true,
           message: '请输入',
           trigger: 'blur'
-        }, ],
+        },],
         stationName: [{
           required: true,
           message: '请输入',
           trigger: 'blur'
-        }, ],
+        },],
         address: [{
           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'
-          },
-          {
-            pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-            message: '请输入正确的联系方式',
-            trigger: 'blur'
-          },
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },
+        {
+          pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+          message: '请输入正确的联系方式',
+          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'
-        }, ],
+        },],
       },
       managementModelOptions: [],
       managementModelProps: { "label": "fullName", "value": "id" },
@@ -402,11 +461,11 @@ export default {
       recycleTypeIdsProps: { "label": "fullName", "value": "id" },
       businessDaysOptions: [{ "fullName": "周一", "id": "1" }, { "fullName": "周二", "id": "2" }, { "fullName": "周三", "id": "3" }, { "fullName": "周四", "id": "4" }, { "fullName": "周五", "id": "5" }, { "fullName": "周六", "id": "6" }, { "fullName": "周日", "id": "7" }],
       businessDaysProps: { "label": "fullName", "value": "id" },
-      acceptRangeOptions: [{ "fullName": "无限制", "id": "0" }, { "fullName": "1KM", "id": "1" }, { "fullName": "3KM", "id": "3" }, { "fullName": "5KM", "id": "5" }],
+      acceptRangeOptions: [{ "fullName": "5KM以内", "id": 5000 }, { "fullName": "10KM以内", "id": 100000 }, { "fullName": "20KM以内", "id": 200000 }],
       acceptRangeProps: { "label": "fullName", "value": "id" },
       recyclestationpricerecycleTypeIdOptions: [],
       recyclestationpricerecycleTypeIdProps: { "label": "fullName", "value": "id" },
-      recyclestationhousingestatehousingEstateIdcolumnOptions: [{ "label": "小区名称", "value": "name" }, ],
+      recyclestationhousingestatehousingEstateIdcolumnOptions: [{ "label": "小区名称", "value": "name" },],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {
@@ -450,16 +509,16 @@ export default {
       this.visibleMap = true
     },
     getCallMap(e) {
-       console.log('chooseMapPoint',e)
+      console.log('chooseMapPoint', e)
     },
-    cancelMap () {
+    cancelMap() {
       this.visibleMap = false
     },
-    sureMap(valObj){
+    sureMap(valObj) {
       this.dataForm.address = valObj.address
       this.dataForm.longitude = valObj.lng
       this.dataForm.latitude = valObj.lat
-      console.log('位置信息',valObj)
+      console.log('位置信息', valObj)
       this.visibleMap = false
     },
     prev() {
@@ -699,7 +758,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.dataForm.recyclestationpriceList.splice(index, 1);
-      }).catch(() => {});
+      }).catch(() => { });
     },
     getrecyclestationpriceList(value) {
       let item = { ...this.tableRows.recyclestationpriceList, ...value }
@@ -720,7 +779,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.dataForm.recyclestationhousingestateList.splice(index, 1);
-      }).catch(() => {});
+      }).catch(() => { });
     },
     getrecyclestationhousingestateList(value) {
       let item = { ...this.tableRows.recyclestationhousingestateList, ...value }
@@ -834,9 +893,9 @@ export default {
 .site-item {
   display: flex;
   ::v-deep .el-form-item__content {
-    display: flex!important;
+    display: flex !important;
     align-items: flex-start;
-    margin-left: 0!important;
+    margin-left: 0 !important;
     .input {
       // width: 300px!important;
       margin-right: 10px;