Commit aace68e1d2af9e9bf2c0fde6d07e1da2e7f02ce4
m
Showing
2 changed files
with
23 additions
and
2 deletions
trash-ui/src/views/unit/dropPointInfo/index.vue
| ... | ... | @@ -29,6 +29,12 @@ |
| 29 | 29 | <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code"/> |
| 30 | 30 | </el-select> |
| 31 | 31 | </el-form-item> |
| 32 | + <el-form-item label="请选择所属社区" prop="community"> | |
| 33 | + <el-select v-model="queryParams.community" placeholder="请输入所属社区" style="width: 100%" clearable :disabled="infoDisable"> | |
| 34 | + <el-option v-for="(area,index) in communitys" :label="area.name" :value="area.code" :key="area.code" @click.native="createDropPointNo(area,'community')"/> | |
| 35 | + </el-select> | |
| 36 | + </el-form-item> | |
| 37 | + | |
| 32 | 38 | <el-form-item label="是否为实行物业管理的区域（小区）" prop="type"> |
| 33 | 39 | <el-select v-model="queryParams.type" placeholder="请选择是否为实行物业管理的区域（小区）" clearable size="small"> |
| 34 | 40 | <el-option label="全部" value=""/> |
| ... | ... | @@ -366,6 +372,7 @@ export default { |
| 366 | 372 | type: null, |
| 367 | 373 | district: null, |
| 368 | 374 | street: null, |
| 375 | + community: null | |
| 369 | 376 | }, |
| 370 | 377 | // 表单参数 |
| 371 | 378 | form: {}, |
| ... | ... | @@ -390,7 +397,7 @@ export default { |
| 390 | 397 | {required: true, message: "请输入详细地址", trigger: "blur"} |
| 391 | 398 | ], |
| 392 | 399 | type: [ |
| 393 | - {required: true, message: "请选择投放点形式", trigger: "change"} | |
| 400 | + {required: true, message: "请选择是否为实行物业管理的区域（小区）", trigger: "change"} | |
| 394 | 401 | ], |
| 395 | 402 | area: [ |
| 396 | 403 | {required: true, message: "请输入投放点面积", trigger: "blur"}, |
| ... | ... | @@ -665,6 +672,14 @@ export default { |
| 665 | 672 | |
| 666 | 673 | }, |
| 667 | 674 | getStreets(regionName) { |
| 675 | + if(this.queryParams.district!=null){ | |
| 676 | + this.queryParams.street = null; | |
| 677 | + this.queryParams.community = null; | |
| 678 | + } | |
| 679 | + if(this.form.district!=null){ | |
| 680 | + this.form.street = null; | |
| 681 | + this.form.community = null; | |
| 682 | + } | |
| 668 | 683 | this.streets = []; |
| 669 | 684 | this.form.dropPointNo = null; |
| 670 | 685 | // this.form.street = null; |
| ... | ... | @@ -672,7 +687,12 @@ export default { |
| 672 | 687 | this.streets = region.items; |
| 673 | 688 | }, |
| 674 | 689 | getCommunitys(regionName){ |
| 675 | - console.log(regionName) | |
| 690 | + if(this.queryParams.street!=null){ | |
| 691 | + this.queryParams.community = null; | |
| 692 | + } | |
| 693 | + if(this.form.street!=null){ | |
| 694 | + this.form.community = null; | |
| 695 | + } | |
| 676 | 696 | this.communitys = []; |
| 677 | 697 | this.form.dropPointNo = null; |
| 678 | 698 | // this.form.community = null; | ... | ... |
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
| ... | ... | @@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 49 | 49 | <if test="dropPointNo != null and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if> |
| 50 | 50 | <if test="district != null and district != ''"> and district = #{district}</if> |
| 51 | 51 | <if test="street != null and street != ''"> and street = #{street}</if> |
| 52 | + <if test="community != null and community != ''"> and community = #{community}</if> | |
| 52 | 53 | <if test="sList != null and sList.size() > 0 "> |
| 53 | 54 | and street in |
| 54 | 55 | <foreach item="id" collection="sList" open="(" separator="," | ... | ... |