与客户沟通对接，装修垃圾投放点新增页面需要修改：

1、社区录入改成字典下拉格式（客户回去统计字典数据） 2、增加小区字段，放在社区下面，小区隶属社区为必填项（非下拉） 3、投放点编号规则修改：原有基础上拼接社区代码 4、“投放点形式”改为“是否为实行物业管理的区域（小区）”为下拉格式 5、把管理单位一栏改为非必填 6、“管理人”改为“管理员” 7、投放时间格式更改：改为时间段格式（HH:mm~HH:mm）

与客户沟通对接，装修垃圾投放点新增页面需要修改：
1、社区录入改成字典下拉格式（客户回去统计字典数据） 2、增加小区字段，放在社区下面，小区隶属社区为必填项（非下拉） 3、投放点编号规则修改：原有基础上拼接社区代码 4、“投放点形式”改为“是否为实行物业管理的区域（小区）”为下拉格式 5、把管理单位一栏改为非必填 6、“管理人”改为“管理员” 7、投放时间格式更改：改为时间段格式（HH:mm~HH:mm）
2c2c2c
1 parent aaac800b
Showing 2 changed files with 117 additions and 93 deletions
trash-ui/src/views/activiti/task/dropPointinfo.vue
trash-ui/src/views/h5/task/dropPointinfo.vue
@@ -11,26 +11,29 @@
       </el-form-item>
       <el-form-item label="所属区域" prop="district">
-        <el-input v-model="infoData.district" placeholder="请输入投放点名称" :disabled="true"/>
+        <el-input v-model="infoData.district" placeholder="请输入区域" :disabled="true"/>
       </el-form-item>
       <el-form-item label="所属街道" prop="street">
-        <el-input v-model="infoData.street" placeholder="请输入投放点名称" :disabled="true"/>
+        <el-input v-model="infoData.street" placeholder="请输入街道" :disabled="true"/>
       </el-form-item>
       <el-form-item label="社区" prop="community">
         <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
       </el-form-item>
+      <el-form-item label="所属小区" prop="street">
+        <el-input v-model="infoData.plot" placeholder="请输入小区" :disabled="true"/>
+      </el-form-item>
       <el-form-item label="详细地址" prop="address">
         <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
       </el-form-item>
-      <el-form-item label="投放点形式" prop="type">
-        <el-select v-model="infoData.type" placeholder="请选择投放点形式" :disabled="true" style="width: 100%">
-          <el-option label="固定" value="固定"/>
-          <el-option label="临时" value="临时"/>
+      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+        <el-select v-model="infoData.type" placeholder="请选择是否为实行物业管理的区域（小区）" :disabled="true" style="width: 100%">
+          <el-option label="是" value="是"/>
+          <el-option label="否" value="否"/>
         </el-select>
       </el-form-item>
@@ -46,8 +49,8 @@
         <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
       </el-form-item>
-      <el-form-item label="管理人" prop="custodian">
-        <el-input v-model="infoData.custodian" placeholder="请输入管理人" :disabled="true"/>
+      <el-form-item label="管理员" prop="custodian">
+        <el-input v-model="infoData.custodian" placeholder="请输入管理员" :disabled="true"/>
       </el-form-item>
       <el-form-item label="管理员电话" prop="custodianPhone">
@@ -56,7 +59,18 @@
       <el-form-item label="投放时间" prop="dropTime">
         <el-time-select
-          v-model="infoData.dropTime"
+          v-model="infoData.dropTime[0]"
+          style="width: 100%"
+          :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+        <el-time-select
+          v-model="infoData.dropTime[1]"
           style="width: 100%"
           :picker-options="{
                     start: '00:00',
@@ -175,8 +189,7 @@ export default {
       getDropPointInfo(id).then(response => {
         this.infoData = response.data;
-        this.infoData.district = this.dict(this.infoData.district);
-        this.infoData.street = this.dictInfo(this.infoData.street);
+        this.infoData.dropTime = response.data.dropTime.split("~");
         // getArea().then(res => {
         //   this.areas = res.result;
         //   this.loading = false;
 <template>
   <div>
-    <div v-loading="loading" style="border: 1px solid black;">
-      <el-form ref="form" :model="infoData" label-width="128px">
-
-        <el-form-item label="投放点编号" prop="dropPointNo">
-          <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="投放点名称" prop="dropPointName">
-          <el-input v-model="infoData.dropPointName" placeholder="请输入投放点名称" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="所属区域" prop="district">
-          <el-input v-model="infoData.district" placeholder="请输入投放点名称" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="所属街道" prop="street">
-          <el-input v-model="infoData.street" placeholder="请输入投放点名称" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="社区" prop="community">
-          <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="详细地址" prop="address">
-          <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="投放点形式" prop="type">
-          <el-select v-model="infoData.type" placeholder="请选择投放点形式" :disabled="true" style="width: 100%">
-            <el-option label="固定" value="固定"/>
-            <el-option label="临时" value="临时"/>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="投放点面积(m²)" prop="area" :disabled="true">
-          <el-input v-model="infoData.area" placeholder="请输入投放点面积" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="投放点容量(m³)" prop="capacity">
-          <el-input v-model="infoData.capacity" placeholder="请输入投放点容量" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="管理单位" prop="managementUnit">
-          <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="管理人" prop="custodian">
-          <el-input v-model="infoData.custodian" placeholder="请输入管理人" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="管理员电话" prop="custodianPhone">
-          <el-input v-model="infoData.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="投放时间" prop="dropTime">
-          <el-time-select
-            v-model="infoData.dropTime"
-            style="width: 100%"
-            :picker-options="{
+    <el-form ref="form" :model="infoData" label-width="128px">
+
+      <el-form-item label="投放点编号" prop="dropPointNo">
+        <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放点名称" prop="dropPointName">
+        <el-input v-model="infoData.dropPointName" placeholder="请输入投放点名称" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属区域" prop="district">
+        <el-input v-model="infoData.district" placeholder="请输入区域" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属街道" prop="street">
+        <el-input v-model="infoData.street" placeholder="请输入街道" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="社区" prop="community">
+        <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属小区" prop="street">
+        <el-input v-model="infoData.plot" placeholder="请输入小区" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="详细地址" prop="address">
+        <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+        <el-select v-model="infoData.type" placeholder="请选择是否为实行物业管理的区域（小区）" :disabled="true" style="width: 100%">
+          <el-option label="是" value="是"/>
+          <el-option label="否" value="否"/>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="投放点面积(m²)" prop="area" :disabled="true">
+        <el-input v-model="infoData.area" placeholder="请输入投放点面积" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放点容量(m³)" prop="capacity">
+        <el-input v-model="infoData.capacity" placeholder="请输入投放点容量" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理单位" prop="managementUnit">
+        <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理员" prop="custodian">
+        <el-input v-model="infoData.custodian" placeholder="请输入管理员" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理员电话" prop="custodianPhone">
+        <el-input v-model="infoData.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放时间" prop="dropTime">
+        <el-time-select
+          v-model="infoData.dropTime[0]"
+          style="width: 100%"
+          :picker-options="{
                     start: '00:00',
                     step: '00:30',
                     end: '23:30'
                   }"
-            :disabled="true"
-            placeholder="选择时间">
-          </el-time-select>
-        </el-form-item>
-
-        <el-form-item label="运营单位" prop="operatingUnit">
-          <el-input v-model="infoData.operatingUnit" placeholder="请输入运营单位" :disabled="true" />
-        </el-form-item>
-
-        <el-form-item label="运输单位" prop="transportUnit">
-          <el-input v-model="infoData.transportUnit" placeholder="请输入运输单位" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="坐标点" prop="coordinatePoint">
-          <el-input v-model="infoData.coordinatePoint" placeholder="请输入坐标点经纬度"  :disabled="true"/>
-        </el-form-item>
-        <!--            <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
-
-      </el-form>
-    </div>
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+        <el-time-select
+          v-model="infoData.dropTime[1]"
+          style="width: 100%"
+          :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+      </el-form-item>
+
+      <el-form-item label="运营单位" prop="operatingUnit">
+        <el-input v-model="infoData.operatingUnit" placeholder="请输入运营单位" :disabled="true" />
+      </el-form-item>
+
+      <el-form-item label="运输单位" prop="transportUnit">
+        <el-input v-model="infoData.transportUnit" placeholder="请输入运输单位" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="坐标点" prop="coordinatePoint">
+        <el-input v-model="infoData.coordinatePoint" placeholder="请输入坐标点经纬度"  :disabled="true"/>
+      </el-form-item>
+      <!--            <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
+
+    </el-form>
   </div>
 </template>
@@ -177,8 +189,7 @@ export default {
       getDropPointInfo(id).then(response => {
         this.infoData = response.data;
-        this.infoData.street = this.dictInfo(this.infoData.street);
-        this.infoData.district = this.dict(this.infoData.district);
+        this.infoData.dropTime = response.data.dropTime.split("~");
         // getArea().then(res => {
         //   this.areas = res.result;
         //   this.loading = false;