elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master-bugfix'

shibei_master
jianjun 3 years ago
parent
a07ece81c8 423ea72c04
commit
891e193306
6 changed files with 1199 additions and 1077 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/assets/scss/modules/management/list-main.scss
  2. 2
      src/assets/scss/modules/visual/communityManage.scss
  3. 22
      src/views/modules/base/community/buildTable.vue
  4. 269
      src/views/modules/base/community/community.vue
  5. 22
      src/views/modules/base/community/communityTable.vue
  6. 50
      src/views/modules/base/community/roomTable.vue

3
src/assets/scss/modules/management/list-main.scss
View File

@ -2,6 +2,9 @@
.div_main {
width: 100%;
.marginl-20{
margin-left: 16px;
}
.div_search {
background: #ffffff;

2
src/assets/scss/modules/visual/communityManage.scss
View File

@ -49,7 +49,7 @@
.div_btn {
display: flex;
margin-top: 20px;
margin-top: 10px;
.btn_upload {
margin-left: 10px;

22
src/views/modules/base/community/buildTable.vue
View File

@ -241,7 +241,7 @@ export default {
computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
},
@ -603,6 +603,10 @@ export default {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
purpose: this.purpose,
remark: this.remark,
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
neighborHoodId: this.agencyObj.id
}
@ -778,6 +782,22 @@ export default {
type: String,
default: '',
},
purpose: {
type: String,
default: '',
},
remark: {
type: String,
default: '',
},
updateStartDate: {
type: String,
default: '',
},
updateEndDate: {
type: String,
default: '',
},
}
}
</script>

269
src/views/modules/base/community/community.vue
View File

@ -30,38 +30,38 @@
</div>
<div :style="{height:rowHeight}"
class="div_table">
<div class="div_search">
<div class="resi-cell">
<div class="resi-cell-label">房主姓名</div>
<div class="resi-cell-value">
class=div_left>
<div class="div_search marginl-20">
<el-form :inline="true"
ref="ref_searchform"
:label-width="'80px'">
<div>
<el-form-item label="房主姓名"
prop="ownerName">
<el-input v-model="ownerName"
class="resi-cell-input"
class="item_width_2"
size="small"
clearable
placeholder="请输入内容">
</el-input>
</div>
</div>
<div class="resi-cell">
<div class="resi-cell-label">房主手机</div>
<div class="resi-cell-value">
</el-input>
</el-form-item>
<el-form-item label="房主手机"
prop="ownerPhone">
<el-input v-model="ownerPhone"
class="resi-cell-input"
class="item_width_2"
size="small"
clearable
placeholder="请输入内容">
placeholder="请输入手机">
</el-input>
</div>
</div>
<div class="resi-cell">
<div class="resi-cell-label">房屋状态</div>
<div class="resi-cell-value">
</el-form-item>
<el-select class="item_width_1"
<el-form-item label="房屋状态"
prop="rentFlag">
<el-select class="item_width_2"
v-model="rentFlag"
placeholder="请选择"
size="small"
@ -72,47 +72,68 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
</div>
<div class="resi-cell">
<div class="resi-cell-label">房屋用途</div>
<div class="resi-cell-value">
<el-select v-model="purpose" placeholder="房屋用途" clearable>
<el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
<el-form-item label="房屋用途"
prop="purpose">
<el-select v-model="purpose"
class="item_width_2"
placeholder="请选择"
size="small"
clearable>
<el-option v-for="item in purposeArr"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</div>
</div>
<div class="resi-cell">
<div class="resi-cell-label">备注</div>
<div class="resi-cell-value">
</el-form-item>
<el-form-item label="备注"
prop="remark">
<el-input v-model="remark"
class="item_width_2"
size="small"
clearable
placeholder="请输入备注">
</el-input>
</div>
</div>
<el-button style="margin-left:10px"
class="diy-button--search"
</el-form-item>
<el-form-item label="更新时间"
prop="updateStartDate">
<el-date-picker v-model="updateStartDate"
:picker-options="startPickerOptions"
class="item_width_2"
size="small"
type="date"
value-format="yyyyMMdd"
value="yyyy-MM-dd"
placeholder="开始时间">
</el-date-picker>
<span class="data-tag">至</span>
<el-date-picker v-model="updateEndDate"
:picker-options="endPickerOptions"
class="item_width_2 data-tag"
size="small"
type="date"
value-format="yyyyMMdd"
value="yyyy-MM-dd"
placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-button style="margin-left:30px"
size="small"
class="diy-button--search"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
<!-- <el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button> -->
@click="resetSearch">重置</el-button>
</div>
</el-form>
</div>
<div class=div_left_table>
<build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
ref="ref_neighTable"
:staffAgencyId="staffAgencyId"
@ -122,6 +143,8 @@
:rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
:updateStartDate="updateStartDate"
:updateEndDate="updateEndDate"
@toNextLevel="toNextLevel"
@refreshTree="refreshTree"></build-table>
@ -133,6 +156,8 @@
:rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
:updateStartDate="updateStartDate"
:updateEndDate="updateEndDate"
ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table>
@ -144,26 +169,42 @@
:rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
:updateStartDate="updateStartDate"
:updateEndDate="updateEndDate"
ref="ref_communityTable"
@refreshTree="refreshTree"></community-table>
</div>
</div>
</div>
</template>
<script>
import CDialog from '@c/CDialog'
import communityTable from './communityTable'
import buildTable from './buildTable'
import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画
export default {
import CDialog from '@c/CDialog'
import communityTable from './communityTable'
import buildTable from './buildTable'
import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画
export default {
data () {
let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
if (this.updateStartDate) {
let startTime = new Date(this.updateStartDate)
return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
} else {
return time.getTime() > nowData
}
}
let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
return time.getTime() > nowData
}
return {
filterText: '',
treeLoading: true,
@ -199,6 +240,8 @@
rentFlag: '',
purpose: '',
remark: '',
updateStartDate: '',
updateEndDate: '',
showRoomTable: false,
selObj: {},
purposeArr: [
@ -209,7 +252,13 @@
{ dictValue: '5', dictName: '仓储' },
{ dictValue: '6', dictName: '商住混用' },
{ dictValue: '7', dictName: '其他' }
]
],
endPickerOptions: {
disabledDate: endDisabledDate
},
startPickerOptions: {
disabledDate: startDisabledDate
},
}
},
components: {
@ -248,15 +297,15 @@
methods: {
handleSearch () {
if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
// if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
this.showRoomTable = true
this.$nextTick(() => {
this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
})
} else {
this.$message.warning('请输入查询条件')
}
// } else {
// this.$message.warning('请输入查询条件')
// }
},
@ -268,10 +317,12 @@
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.updateStartDate = ''
this.updateEndDate = ''
this.pageSize = 10
this.pageNo = 1
this.handleNodeClick(this.selObj)
// this.handleNodeClick(this.selObj)
// this.loadTable()
},
@ -341,6 +392,8 @@
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.updateStartDate = ''
this.updateEndDate = ''
this.showRoomTable = false
this.selObj = JSON.parse(JSON.stringify(obj))
@ -481,63 +534,71 @@
components: {
communityTable, buildTable, roomTable
}
}
}
</script>
<style>
/* .aui-content > .el-tabs > .el-tabs__content {
padding: 0px;
} */
.el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */
color: #2195fe;
}
</style>
<style lang="scss" scoped>
.div_tree {
/deep/ .el-scrollbar__wrap {
overflow-x: hidden !important;
}
}
</style>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss";
@import "@/assets/scss/modules/management/list-main.scss";
</style>
<style lang="scss" scoped >
.div_main {
.div_main {
display: flex;
}
.scrollar {
}
.scrollar {
margin-top: 10px;
}
}
.div_tree {
.div_tree {
flex: 0 0 280px;
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
overflow-y: hidden;
}
.filter_tree {
}
.filter_tree {
overflow-x: auto;
}
.div_table {
margin-left: 15px;
}
// .div_table {
// margin-left: 15px;
// // flex: 1;
// width: calc(100% - 300px);
// background-color: #ffffff;
// border-radius: 5px;
// padding: 10px;
// }
.div_left {
// flex: 1;
width: calc(100% - 300px);
}
.div_left_table {
margin-top: 10px;
margin-left: 15px;
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
}
.div_btn {
margin-top: 20px;
}
.row {
padding: 10px;
}
}
</style>
<style>
/* .aui-content > .el-tabs > .el-tabs__content {
padding: 0px;
} */
.el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */
color: #2195fe;
}
</style>
<style lang="scss" scoped>
.div_tree {
/deep/ .el-scrollbar__wrap {
overflow-x: hidden !important;
}
}
</style>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss";
</style>

22
src/views/modules/base/community/communityTable.vue
View File

@ -236,7 +236,7 @@ export default {
},
computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
},
@ -583,6 +583,10 @@ export default {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
purpose: this.purpose,
remark: this.remark,
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
}
if (this.agencyObj.level === 'grid') {
@ -777,6 +781,22 @@ export default {
type: String,
default: '',
},
purpose: {
type: String,
default: '',
},
remark: {
type: String,
default: '',
},
updateStartDate: {
type: String,
default: '',
},
updateEndDate: {
type: String,
default: '',
},
}
}

50
src/views/modules/base/community/roomTable.vue
View File

@ -109,6 +109,10 @@
label="身份证"
width="170">
</el-table-column>
<el-table-column prop="remark"
label="备注"
width="170">
</el-table-column>
<el-table-column prop="sort"
sortable="custom"
@ -188,14 +192,14 @@
<script>
import roomForm from './roomForm'
import roomForm from './roomForm'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画
export default {
let loading // 加载动画
export default {
data () {
return {
source: 'tree',//来源
@ -249,7 +253,7 @@
},
computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
},
@ -350,6 +354,8 @@
purpose: this.purpose,
remark: this.remark,
sortType: this.sortType,
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
}
const url = "/gov/org/house/houselist"
@ -545,6 +551,8 @@
rentFlag: this.rentFlag,
purpose: this.purpose,
remark: this.remark,
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
buildingId: this.agencyObj.id
}
@ -625,6 +633,8 @@
rentFlag: this.rentFlag,
purpose: this.purpose,
remark: this.remark,
updateStartDate: this.updateStartDate,
updateEndDate: this.updateEndDate,
buildingId: '',
neighborHoodId: ''
}
@ -813,22 +823,30 @@
type: String,
default: '',
},
updateStartDate: {
type: String,
default: '',
},
updateEndDate: {
type: String,
default: '',
},
}
}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
.item_width_4 {
.item_width_4 {
width: 120px;
}
}
/deep/.el-input-number--medium .el-input-number__decrease,
/deep/.el-input-number--medium .el-input-number__increase {
/deep/.el-input-number--medium .el-input-number__decrease,
/deep/.el-input-number--medium .el-input-number__increase {
width: 26px;
}
/deep/.el-input-number--medium .el-input__inner {
}
/deep/.el-input-number--medium .el-input__inner {
padding-left: 0px;
padding-right: 0px;
}
}
</style>

Write Preview
Loading…
Cancel
Save