Commit 966cf780294ed86090d90e2c4f3a30f293afc5f1
1 parent
93405e51
投放点
1.点击投放点名称可以查看详情; 2.新增区域和街道查询
Showing
2 changed files
with
62 additions
and
21 deletions
trash-ui/src/views/unit/dropPointInfo/index.vue
| @@ -19,6 +19,16 @@ | @@ -19,6 +19,16 @@ | ||
| 19 | @keyup.enter.native="handleQuery" | 19 | @keyup.enter.native="handleQuery" |
| 20 | /> | 20 | /> |
| 21 | </el-form-item> | 21 | </el-form-item> |
| 22 | + <el-form-item label="请选择所属区域" prop="district"> | ||
| 23 | + <el-select v-model="queryParams.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets"> | ||
| 24 | + <el-option v-for="(area,index) in areas" :label="area.name" :value="area.code" :key="index"/> | ||
| 25 | + </el-select> | ||
| 26 | + </el-form-item> | ||
| 27 | + <el-form-item label="请选择所属街道" prop="street"> | ||
| 28 | + <el-select v-model="queryParams.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys"> | ||
| 29 | + <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code"/> | ||
| 30 | + </el-select> | ||
| 31 | + </el-form-item> | ||
| 22 | <el-form-item label="是否为实行物业管理的区域(小区)" prop="type"> | 32 | <el-form-item label="是否为实行物业管理的区域(小区)" prop="type"> |
| 23 | <el-select v-model="queryParams.type" placeholder="请选择是否为实行物业管理的区域(小区)" clearable size="small"> | 33 | <el-select v-model="queryParams.type" placeholder="请选择是否为实行物业管理的区域(小区)" clearable size="small"> |
| 24 | <el-option label="全部" value=""/> | 34 | <el-option label="全部" value=""/> |
| @@ -80,7 +90,12 @@ | @@ -80,7 +90,12 @@ | ||
| 80 | 90 | ||
| 81 | <el-table v-loading="loading" :data="dropPointInfoList" @selection-change="handleSelectionChange"> | 91 | <el-table v-loading="loading" :data="dropPointInfoList" @selection-change="handleSelectionChange"> |
| 82 | <el-table-column type="selection" width="55" align="center"/> | 92 | <el-table-column type="selection" width="55" align="center"/> |
| 83 | - <el-table-column label="投放点名称" align="center" prop="dropPointName"/> | 93 | + <el-table-column label="投放点编号" align="center" prop="dropPointNo"/> |
| 94 | + <el-table-column label="投放点名称" align="center" prop="dropPointName"> | ||
| 95 | + <template slot-scope="scope"> | ||
| 96 | + <a href="javascript:void(0)" @click="handleInfo(scope.row)" style="color:#90DD5F;">{{ scope.row.dropPointName }}</a> | ||
| 97 | + </template> | ||
| 98 | + </el-table-column> | ||
| 84 | <el-table-column label="所属区域" align="center" prop="district"> | 99 | <el-table-column label="所属区域" align="center" prop="district"> |
| 85 | <template slot-scope="scope"> | 100 | <template slot-scope="scope"> |
| 86 | <span>{{ dict(scope.row.district) }}</span> | 101 | <span>{{ dict(scope.row.district) }}</span> |
| @@ -109,7 +124,6 @@ | @@ -109,7 +124,6 @@ | ||
| 109 | <el-table-column label="管理员" align="center" prop="custodian"/> | 124 | <el-table-column label="管理员" align="center" prop="custodian"/> |
| 110 | <el-table-column label="管理员电话" align="center" prop="custodianPhone"/> | 125 | <el-table-column label="管理员电话" align="center" prop="custodianPhone"/> |
| 111 | <el-table-column label="投放时间" align="center" prop="dropTime" width="180"/> | 126 | <el-table-column label="投放时间" align="center" prop="dropTime" width="180"/> |
| 112 | - <el-table-column label="投放点编号" align="center" prop="dropPointNo"/> | ||
| 113 | <el-table-column label="运营单位" align="center" prop="operatingUnit"/> | 127 | <el-table-column label="运营单位" align="center" prop="operatingUnit"/> |
| 114 | <el-table-column label="运输单位" align="center" prop="transportUnit"/> | 128 | <el-table-column label="运输单位" align="center" prop="transportUnit"/> |
| 115 | <el-table-column label="审批状态" align="center" prop="status"> | 129 | <el-table-column label="审批状态" align="center" prop="status"> |
| @@ -161,60 +175,60 @@ | @@ -161,60 +175,60 @@ | ||
| 161 | </el-form-item> | 175 | </el-form-item> |
| 162 | 176 | ||
| 163 | <el-form-item label="投放点名称" prop="dropPointName"> | 177 | <el-form-item label="投放点名称" prop="dropPointName"> |
| 164 | - <el-input v-model="form.dropPointName" placeholder="请输入投放点名称"/> | 178 | + <el-input v-model="form.dropPointName" placeholder="请输入投放点名称" :disabled="infoDisable"/> |
| 165 | </el-form-item> | 179 | </el-form-item> |
| 166 | 180 | ||
| 167 | <el-form-item label="所属区域" prop="street"> | 181 | <el-form-item label="所属区域" prop="street"> |
| 168 | - <el-select v-model="form.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets"> | 182 | + <el-select v-model="form.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets" :disabled="infoDisable"> |
| 169 | <el-option v-for="(area,index) in areas" :label="area.name" :value="area.code" :key="index"/> | 183 | <el-option v-for="(area,index) in areas" :label="area.name" :value="area.code" :key="index"/> |
| 170 | </el-select> | 184 | </el-select> |
| 171 | </el-form-item> | 185 | </el-form-item> |
| 172 | 186 | ||
| 173 | <el-form-item label="所属街道" prop="street"> | 187 | <el-form-item label="所属街道" prop="street"> |
| 174 | - <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys"> | 188 | + <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys" :disabled="infoDisable"> |
| 175 | <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code"/> | 189 | <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code"/> |
| 176 | </el-select> | 190 | </el-select> |
| 177 | </el-form-item> | 191 | </el-form-item> |
| 178 | 192 | ||
| 179 | <el-form-item label="社区" prop="community"> | 193 | <el-form-item label="社区" prop="community"> |
| 180 | - <el-select v-model="form.community" placeholder="请输入所属社区" style="width: 100%" clearable> | 194 | + <el-select v-model="form.community" placeholder="请输入所属社区" style="width: 100%" clearable :disabled="infoDisable"> |
| 181 | <el-option v-for="(area,index) in communitys" :label="area.name" :value="area.code" :key="area.code" @click.native="createDropPointNo(area,'community')"/> | 195 | <el-option v-for="(area,index) in communitys" :label="area.name" :value="area.code" :key="area.code" @click.native="createDropPointNo(area,'community')"/> |
| 182 | </el-select> | 196 | </el-select> |
| 183 | </el-form-item> | 197 | </el-form-item> |
| 184 | 198 | ||
| 185 | <el-form-item label="小区" prop="plot"> | 199 | <el-form-item label="小区" prop="plot"> |
| 186 | - <el-input v-model="form.plot" placeholder="请输入小区"/> | 200 | + <el-input v-model="form.plot" placeholder="请输入小区" :disabled="infoDisable"/> |
| 187 | </el-form-item> | 201 | </el-form-item> |
| 188 | 202 | ||
| 189 | <el-form-item label="详细地址" prop="address"> | 203 | <el-form-item label="详细地址" prop="address"> |
| 190 | - <el-input v-model="form.address" placeholder="请输入详细地址"/> | 204 | + <el-input v-model="form.address" placeholder="请输入详细地址" :disabled="infoDisable"/> |
| 191 | </el-form-item> | 205 | </el-form-item> |
| 192 | 206 | ||
| 193 | <el-form-item label="是否为实行物业管理的区域(小区)" prop="type"> | 207 | <el-form-item label="是否为实行物业管理的区域(小区)" prop="type"> |
| 194 | - <el-select v-model="form.type" placeholder="请选择是否为实行物业管理的区域(小区)" style="width: 100%"> | 208 | + <el-select v-model="form.type" placeholder="请选择是否为实行物业管理的区域(小区)" style="width: 100%" :disabled="infoDisable"> |
| 195 | <el-option label="是" value="是"/> | 209 | <el-option label="是" value="是"/> |
| 196 | <el-option label="否" value="否"/> | 210 | <el-option label="否" value="否"/> |
| 197 | </el-select> | 211 | </el-select> |
| 198 | </el-form-item> | 212 | </el-form-item> |
| 199 | 213 | ||
| 200 | <el-form-item label="投放点面积(m²)" prop="area"> | 214 | <el-form-item label="投放点面积(m²)" prop="area"> |
| 201 | - <el-input v-model="form.area" placeholder="请输入投放点面积"/> | 215 | + <el-input v-model="form.area" placeholder="请输入投放点面积" :disabled="infoDisable"/> |
| 202 | </el-form-item> | 216 | </el-form-item> |
| 203 | 217 | ||
| 204 | <el-form-item label="投放点容量(m³)" prop="capacity"> | 218 | <el-form-item label="投放点容量(m³)" prop="capacity"> |
| 205 | - <el-input v-model="form.capacity" placeholder="请输入投放点容量"/> | 219 | + <el-input v-model="form.capacity" placeholder="请输入投放点容量" :disabled="infoDisable"/> |
| 206 | </el-form-item> | 220 | </el-form-item> |
| 207 | 221 | ||
| 208 | <el-form-item label="管理单位" prop="managementUnit"> | 222 | <el-form-item label="管理单位" prop="managementUnit"> |
| 209 | - <el-input v-model="form.managementUnit" placeholder="请输入管理单位"/> | 223 | + <el-input v-model="form.managementUnit" placeholder="请输入管理单位" :disabled="infoDisable"/> |
| 210 | </el-form-item> | 224 | </el-form-item> |
| 211 | 225 | ||
| 212 | <el-form-item label="管理员" prop="custodian"> | 226 | <el-form-item label="管理员" prop="custodian"> |
| 213 | - <el-input v-model="form.custodian" placeholder="请输入管理员"/> | 227 | + <el-input v-model="form.custodian" placeholder="请输入管理员" :disabled="infoDisable"/> |
| 214 | </el-form-item> | 228 | </el-form-item> |
| 215 | 229 | ||
| 216 | <el-form-item label="管理员电话" prop="custodianPhone"> | 230 | <el-form-item label="管理员电话" prop="custodianPhone"> |
| 217 | - <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit/> | 231 | + <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="infoDisable"/> |
| 218 | </el-form-item> | 232 | </el-form-item> |
| 219 | 233 | ||
| 220 | <el-form-item label="投放时间" prop="dropTime" v-if="dropTime"> | 234 | <el-form-item label="投放时间" prop="dropTime" v-if="dropTime"> |
| @@ -226,7 +240,7 @@ | @@ -226,7 +240,7 @@ | ||
| 226 | start: '00:00', | 240 | start: '00:00', |
| 227 | step: '00:15', | 241 | step: '00:15', |
| 228 | end: '23:45' | 242 | end: '23:45' |
| 229 | - }"> | 243 | + }" :disabled="infoDisable"> |
| 230 | </el-time-select> | 244 | </el-time-select> |
| 231 | <el-time-select | 245 | <el-time-select |
| 232 | placeholder="结束时间" | 246 | placeholder="结束时间" |
| @@ -237,26 +251,26 @@ | @@ -237,26 +251,26 @@ | ||
| 237 | step: '00:15', | 251 | step: '00:15', |
| 238 | end: '24:00', | 252 | end: '24:00', |
| 239 | minTime: form.dropTime | 253 | minTime: form.dropTime |
| 240 | - }"> | 254 | + }" :disabled="infoDisable"> |
| 241 | </el-time-select> | 255 | </el-time-select> |
| 242 | </el-form-item> | 256 | </el-form-item> |
| 243 | 257 | ||
| 244 | <el-form-item label="运营单位" prop="operatingUnit"> | 258 | <el-form-item label="运营单位" prop="operatingUnit"> |
| 245 | - <el-input v-model="form.operatingUnit" placeholder="请输入运营单位"/> | 259 | + <el-input v-model="form.operatingUnit" placeholder="请输入运营单位" :disabled="infoDisable"/> |
| 246 | </el-form-item> | 260 | </el-form-item> |
| 247 | 261 | ||
| 248 | <el-form-item label="运输单位" prop="transportUnit"> | 262 | <el-form-item label="运输单位" prop="transportUnit"> |
| 249 | - <el-input v-model="form.transportUnit" placeholder="请输入运输单位"/> | 263 | + <el-input v-model="form.transportUnit" placeholder="请输入运输单位" :disabled="infoDisable"/> |
| 250 | </el-form-item> | 264 | </el-form-item> |
| 251 | 265 | ||
| 252 | <el-form-item label="坐标点" prop="coordinatePoint"> | 266 | <el-form-item label="坐标点" prop="coordinatePoint"> |
| 253 | - <el-input v-model="form.coordinatePoint" placeholder="请输入坐标点经纬度" readonly @click.native="handleOpenMap"/> | 267 | + <el-input v-model="form.coordinatePoint" placeholder="请输入坐标点经纬度" readonly @click.native="handleOpenMap" :disabled="infoDisable"/> |
| 254 | </el-form-item> | 268 | </el-form-item> |
| 255 | <!-- <el-button type="primary" @click="handleOpenMap">坐标点</el-button>--> | 269 | <!-- <el-button type="primary" @click="handleOpenMap">坐标点</el-button>--> |
| 256 | 270 | ||
| 257 | </el-form> | 271 | </el-form> |
| 258 | <div slot="footer" class="dialog-footer"> | 272 | <div slot="footer" class="dialog-footer"> |
| 259 | - <el-button type="primary" @click="submitForm">确 定</el-button> | 273 | + <el-button type="primary" @click="submitForm" v-show="!infoDisable">确 定</el-button> |
| 260 | <el-button @click="cancel">取 消</el-button> | 274 | <el-button @click="cancel">取 消</el-button> |
| 261 | </div> | 275 | </div> |
| 262 | </el-dialog> | 276 | </el-dialog> |
| @@ -346,6 +360,8 @@ export default { | @@ -346,6 +360,8 @@ export default { | ||
| 346 | dropPointName: null, | 360 | dropPointName: null, |
| 347 | address: null, | 361 | address: null, |
| 348 | type: null, | 362 | type: null, |
| 363 | + district: null, | ||
| 364 | + street: null, | ||
| 349 | }, | 365 | }, |
| 350 | // 表单参数 | 366 | // 表单参数 |
| 351 | form: {}, | 367 | form: {}, |
| @@ -420,7 +436,8 @@ export default { | @@ -420,7 +436,8 @@ export default { | ||
| 420 | center: null, | 436 | center: null, |
| 421 | circleMarker: null, | 437 | circleMarker: null, |
| 422 | endTime: null, | 438 | endTime: null, |
| 423 | - dropTime: true | 439 | + dropTime: true, |
| 440 | + infoDisable: false | ||
| 424 | }; | 441 | }; |
| 425 | }, | 442 | }, |
| 426 | created() { | 443 | created() { |
| @@ -451,6 +468,26 @@ export default { | @@ -451,6 +468,26 @@ export default { | ||
| 451 | // this.initAMap(); | 468 | // this.initAMap(); |
| 452 | }, | 469 | }, |
| 453 | methods: { | 470 | methods: { |
| 471 | + handleInfo(row){ | ||
| 472 | + this.reset(); | ||
| 473 | + const id = row.id; | ||
| 474 | + this.dropTime = false; | ||
| 475 | + getDropPointInfo(id).then(response => { | ||
| 476 | + let dropTime = response.data.dropTime.split("~"); | ||
| 477 | + this.form = response.data; | ||
| 478 | + let dropNo = response.data.dropPointNo; | ||
| 479 | + console.log(this.form) | ||
| 480 | + this.getStreets(this.form.district) | ||
| 481 | + this.getCommunitys(this.form.street) | ||
| 482 | + this.form.dropTime = dropTime[0]; | ||
| 483 | + this.endTime = dropTime[1]; | ||
| 484 | + this.open = true; | ||
| 485 | + this.title = "查看投放点信息管理"; | ||
| 486 | + this.dropTime = true; | ||
| 487 | + this.infoDisable = true; | ||
| 488 | + this.form.dropPointNo = dropNo; | ||
| 489 | + }); | ||
| 490 | + }, | ||
| 454 | dict(code){ | 491 | dict(code){ |
| 455 | for(let key in this.areas){ | 492 | for(let key in this.areas){ |
| 456 | if(this.areas[key].code === code){ | 493 | if(this.areas[key].code === code){ |
| @@ -714,6 +751,7 @@ export default { | @@ -714,6 +751,7 @@ export default { | ||
| 714 | getDropPointInfo(id).then(response => { | 751 | getDropPointInfo(id).then(response => { |
| 715 | let dropTime = response.data.dropTime.split("~"); | 752 | let dropTime = response.data.dropTime.split("~"); |
| 716 | this.form = response.data; | 753 | this.form = response.data; |
| 754 | + let dropNo = response.data.dropPointNo; | ||
| 717 | console.log(this.form) | 755 | console.log(this.form) |
| 718 | this.getStreets(this.form.district) | 756 | this.getStreets(this.form.district) |
| 719 | this.getCommunitys(this.form.street) | 757 | this.getCommunitys(this.form.street) |
| @@ -722,6 +760,7 @@ export default { | @@ -722,6 +760,7 @@ export default { | ||
| 722 | this.open = true; | 760 | this.open = true; |
| 723 | this.title = "修改投放点信息管理"; | 761 | this.title = "修改投放点信息管理"; |
| 724 | this.dropTime = true; | 762 | this.dropTime = true; |
| 763 | + this.form.dropPointNo = dropNo; | ||
| 725 | }); | 764 | }); |
| 726 | }, | 765 | }, |
| 727 | /** 提交按钮 */ | 766 | /** 提交按钮 */ |
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
| @@ -46,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -46,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 46 | <if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if> | 46 | <if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if> |
| 47 | <if test="type != null and type != ''"> and type = #{type}</if> | 47 | <if test="type != null and type != ''"> and type = #{type}</if> |
| 48 | <if test="dropPointNo != null and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if> | 48 | <if test="dropPointNo != null and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if> |
| 49 | + <if test="district != null and district != ''"> and district = #{district}</if> | ||
| 50 | + <if test="street != null and street != ''"> and street = #{street}</if> | ||
| 49 | <if test="sList != null and sList.size() > 0 "> | 51 | <if test="sList != null and sList.size() > 0 "> |
| 50 | and street in | 52 | and street in |
| 51 | <foreach item="id" collection="sList" open="(" separator="," | 53 | <foreach item="id" collection="sList" open="(" separator="," |