youxiw2000 / trash · Commits

Commit 45860aa5150ba5847b6d5c7d00e92cc177f2f9e4

Authored by 2c2c2c
1 parent aaac800b
build: skipped

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

1、社区录入改成字典下拉格式（客户回去统计字典数据）
2、增加小区字段，放在社区下面，小区隶属社区为必填项（非下拉）
3、投放点编号规则修改：原有基础上拼接社区代码
4、“投放点形式”改为“是否为实行物业管理的区域（小区）”为下拉格式
5、把管理单位一栏改为非必填
6、“管理人”改为“管理员”
7、投放时间格式更改：改为时间段格式（HH:mm~HH:mm）
Inline Side-by-side
Showing 2 changed files with 117 additions and 93 deletions
trash-ui/src/views/activiti/task/dropPointinfo.vue
  View file @45860aa
... ... @@ -11,26 +11,29 @@
11 11 </el-form-item>
12 12  
13 13 <el-form-item label="所属区域" prop="district">
14   - <el-input v-model="infoData.district" placeholder="请输入投放点名称" :disabled="true"/>
  14 + <el-input v-model="infoData.district" placeholder="请输入区域" :disabled="true"/>
15 15 </el-form-item>
16 16  
17 17 <el-form-item label="所属街道" prop="street">
18   - <el-input v-model="infoData.street" placeholder="请输入投放点名称" :disabled="true"/>
  18 + <el-input v-model="infoData.street" placeholder="请输入街道" :disabled="true"/>
19 19 </el-form-item>
20 20  
21 21 <el-form-item label="社区" prop="community">
22 22 <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
23 23 </el-form-item>
24 24  
  25 + <el-form-item label="所属小区" prop="street">
  26 + <el-input v-model="infoData.plot" placeholder="请输入小区" :disabled="true"/>
  27 + </el-form-item>
25 28  
26 29 <el-form-item label="详细地址" prop="address">
27 30 <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
28 31 </el-form-item>
29 32  
30   - <el-form-item label="投放点形式" prop="type">
31   - <el-select v-model="infoData.type" placeholder="请选择投放点形式" :disabled="true" style="width: 100%">
32   - <el-option label="固定" value="固定"/>
33   - <el-option label="临时" value="临时"/>
  33 + <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
  34 + <el-select v-model="infoData.type" placeholder="请选择是否为实行物业管理的区域（小区）" :disabled="true" style="width: 100%">
  35 + <el-option label="是" value="是"/>
  36 + <el-option label="否" value="否"/>
34 37 </el-select>
35 38 </el-form-item>
36 39  
... ... @@ -46,8 +49,8 @@
46 49 <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
47 50 </el-form-item>
48 51  
49   - <el-form-item label="管理人" prop="custodian">
50   - <el-input v-model="infoData.custodian" placeholder="请输入管理人" :disabled="true"/>
  52 + <el-form-item label="管理员" prop="custodian">
  53 + <el-input v-model="infoData.custodian" placeholder="请输入管理员" :disabled="true"/>
51 54 </el-form-item>
52 55  
53 56 <el-form-item label="管理员电话" prop="custodianPhone">
... ... @@ -56,7 +59,18 @@
56 59  
57 60 <el-form-item label="投放时间" prop="dropTime">
58 61 <el-time-select
59   - v-model="infoData.dropTime"
  62 + v-model="infoData.dropTime[0]"
  63 + style="width: 100%"
  64 + :picker-options="{
  65 + start: '00:00',
  66 + step: '00:30',
  67 + end: '23:30'
  68 + }"
  69 + :disabled="true"
  70 + placeholder="选择时间">
  71 + </el-time-select>
  72 + <el-time-select
  73 + v-model="infoData.dropTime[1]"
60 74 style="width: 100%"
61 75 :picker-options="{
62 76 start: '00:00',
... ... @@ -175,8 +189,7 @@ export default {
175 189 getDropPointInfo(id).then(response => {
176 190  
177 191 this.infoData = response.data;
178   - this.infoData.district = this.dict(this.infoData.district);
179   - this.infoData.street = this.dictInfo(this.infoData.street);
  192 + this.infoData.dropTime = response.data.dropTime.split("~");
180 193 // getArea().then(res => {
181 194 // this.areas = res.result;
182 195 // this.loading = false;
... ...
trash-ui/src/views/h5/task/dropPointinfo.vue
  View file @45860aa
1 1 <template>
2 2 <div>
3   - <div v-loading="loading" style="border: 1px solid black;">
4   - <el-form ref="form" :model="infoData" label-width="128px">
5   -
6   - <el-form-item label="投放点编号" prop="dropPointNo">
7   - <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
8   - </el-form-item>
9   -
10   - <el-form-item label="投放点名称" prop="dropPointName">
11   - <el-input v-model="infoData.dropPointName" placeholder="请输入投放点名称" :disabled="true"/>
12   - </el-form-item>
13   -
14   - <el-form-item label="所属区域" prop="district">
15   - <el-input v-model="infoData.district" placeholder="请输入投放点名称" :disabled="true"/>
16   - </el-form-item>
17   -
18   - <el-form-item label="所属街道" prop="street">
19   - <el-input v-model="infoData.street" placeholder="请输入投放点名称" :disabled="true"/>
20   - </el-form-item>
21   -
22   - <el-form-item label="社区" prop="community">
23   - <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
24   - </el-form-item>
25   -
26   -
27   - <el-form-item label="详细地址" prop="address">
28   - <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
29   - </el-form-item>
30   -
31   - <el-form-item label="投放点形式" prop="type">
32   - <el-select v-model="infoData.type" placeholder="请选择投放点形式" :disabled="true" style="width: 100%">
33   - <el-option label="固定" value="固定"/>
34   - <el-option label="临时" value="临时"/>
35   - </el-select>
36   - </el-form-item>
37   -
38   - <el-form-item label="投放点面积(m²)" prop="area" :disabled="true">
39   - <el-input v-model="infoData.area" placeholder="请输入投放点面积" :disabled="true"/>
40   - </el-form-item>
41   -
42   - <el-form-item label="投放点容量(m³)" prop="capacity">
43   - <el-input v-model="infoData.capacity" placeholder="请输入投放点容量" :disabled="true"/>
44   - </el-form-item>
45   -
46   - <el-form-item label="管理单位" prop="managementUnit">
47   - <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
48   - </el-form-item>
49   -
50   - <el-form-item label="管理人" prop="custodian">
51   - <el-input v-model="infoData.custodian" placeholder="请输入管理人" :disabled="true"/>
52   - </el-form-item>
53   -
54   - <el-form-item label="管理员电话" prop="custodianPhone">
55   - <el-input v-model="infoData.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="true"/>
56   - </el-form-item>
57   -
58   - <el-form-item label="投放时间" prop="dropTime">
59   - <el-time-select
60   - v-model="infoData.dropTime"
61   - style="width: 100%"
62   - :picker-options="{
  3 + <el-form ref="form" :model="infoData" label-width="128px">
  4 +
  5 + <el-form-item label="投放点编号" prop="dropPointNo">
  6 + <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
  7 + </el-form-item>
  8 +
  9 + <el-form-item label="投放点名称" prop="dropPointName">
  10 + <el-input v-model="infoData.dropPointName" placeholder="请输入投放点名称" :disabled="true"/>
  11 + </el-form-item>
  12 +
  13 + <el-form-item label="所属区域" prop="district">
  14 + <el-input v-model="infoData.district" placeholder="请输入区域" :disabled="true"/>
  15 + </el-form-item>
  16 +
  17 + <el-form-item label="所属街道" prop="street">
  18 + <el-input v-model="infoData.street" placeholder="请输入街道" :disabled="true"/>
  19 + </el-form-item>
  20 +
  21 + <el-form-item label="社区" prop="community">
  22 + <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
  23 + </el-form-item>
  24 +
  25 + <el-form-item label="所属小区" prop="street">
  26 + <el-input v-model="infoData.plot" placeholder="请输入小区" :disabled="true"/>
  27 + </el-form-item>
  28 +
  29 + <el-form-item label="详细地址" prop="address">
  30 + <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
  31 + </el-form-item>
  32 +
  33 + <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
  34 + <el-select v-model="infoData.type" placeholder="请选择是否为实行物业管理的区域（小区）" :disabled="true" style="width: 100%">
  35 + <el-option label="是" value="是"/>
  36 + <el-option label="否" value="否"/>
  37 + </el-select>
  38 + </el-form-item>
  39 +
  40 + <el-form-item label="投放点面积(m²)" prop="area" :disabled="true">
  41 + <el-input v-model="infoData.area" placeholder="请输入投放点面积" :disabled="true"/>
  42 + </el-form-item>
  43 +
  44 + <el-form-item label="投放点容量(m³)" prop="capacity">
  45 + <el-input v-model="infoData.capacity" placeholder="请输入投放点容量" :disabled="true"/>
  46 + </el-form-item>
  47 +
  48 + <el-form-item label="管理单位" prop="managementUnit">
  49 + <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
  50 + </el-form-item>
  51 +
  52 + <el-form-item label="管理员" prop="custodian">
  53 + <el-input v-model="infoData.custodian" placeholder="请输入管理员" :disabled="true"/>
  54 + </el-form-item>
  55 +
  56 + <el-form-item label="管理员电话" prop="custodianPhone">
  57 + <el-input v-model="infoData.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="true"/>
  58 + </el-form-item>
  59 +
  60 + <el-form-item label="投放时间" prop="dropTime">
  61 + <el-time-select
  62 + v-model="infoData.dropTime[0]"
  63 + style="width: 100%"
  64 + :picker-options="{
63 65 start: '00:00',
64 66 step: '00:30',
65 67 end: '23:30'
66 68 }"
67   - :disabled="true"
68   - placeholder="选择时间">
69   - </el-time-select>
70   - </el-form-item>
71   -
72   - <el-form-item label="运营单位" prop="operatingUnit">
73   - <el-input v-model="infoData.operatingUnit" placeholder="请输入运营单位" :disabled="true" />
74   - </el-form-item>
75   -
76   - <el-form-item label="运输单位" prop="transportUnit">
77   - <el-input v-model="infoData.transportUnit" placeholder="请输入运输单位" :disabled="true"/>
78   - </el-form-item>
79   -
80   - <el-form-item label="坐标点" prop="coordinatePoint">
81   - <el-input v-model="infoData.coordinatePoint" placeholder="请输入坐标点经纬度" :disabled="true"/>
82   - </el-form-item>
83   - <!-- <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
84   -
85   - </el-form>
86   - </div>
  69 + :disabled="true"
  70 + placeholder="选择时间">
  71 + </el-time-select>
  72 + <el-time-select
  73 + v-model="infoData.dropTime[1]"
  74 + style="width: 100%"
  75 + :picker-options="{
  76 + start: '00:00',
  77 + step: '00:30',
  78 + end: '23:30'
  79 + }"
  80 + :disabled="true"
  81 + placeholder="选择时间">
  82 + </el-time-select>
  83 + </el-form-item>
  84 +
  85 + <el-form-item label="运营单位" prop="operatingUnit">
  86 + <el-input v-model="infoData.operatingUnit" placeholder="请输入运营单位" :disabled="true" />
  87 + </el-form-item>
  88 +
  89 + <el-form-item label="运输单位" prop="transportUnit">
  90 + <el-input v-model="infoData.transportUnit" placeholder="请输入运输单位" :disabled="true"/>
  91 + </el-form-item>
  92 +
  93 + <el-form-item label="坐标点" prop="coordinatePoint">
  94 + <el-input v-model="infoData.coordinatePoint" placeholder="请输入坐标点经纬度" :disabled="true"/>
  95 + </el-form-item>
  96 + <!-- <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
  97 +
  98 + </el-form>
87 99 </div>
88 100 </template>
89 101  
... ... @@ -177,8 +189,7 @@ export default {
177 189 getDropPointInfo(id).then(response => {
178 190  
179 191 this.infoData = response.data;
180   - this.infoData.street = this.dictInfo(this.infoData.street);
181   - this.infoData.district = this.dict(this.infoData.district);
  192 + this.infoData.dropTime = response.data.dropTime.split("~");
182 193 // getArea().then(res => {
183 194 // this.areas = res.result;
184 195 // this.loading = false;
... ...