elink-star
/
epmet-oper-gov
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并分支

test
曲树通 4 years ago
parent
b87666795f dbfa30ca28
commit
0494c65121
3 changed files with 1239 additions and 1221 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/views/modules/base/community/community.vue
  2. 15
      src/views/modules/base/community/roomForm.vue
  3. 91
      src/views/modules/base/community/roomTable.vue

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

@ -79,8 +79,13 @@
<div class="resi-cell-label">房屋用途</div> <div class="resi-cell-label">房屋用途</div>
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select v-model="purpose" placeholder="房屋用途" clearable> <el-select v-model="purpose"
<el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"> placeholder="房屋用途"
clearable>
<el-option v-for="item in purposeArr"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
@ -99,7 +104,6 @@
</div> </div>
</div> </div>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--search" class="diy-button--search"
size="small" size="small"
@ -147,16 +151,16 @@
</template> </template>
<script> <script>
import CDialog from '@c/CDialog' import CDialog from '@c/CDialog'
import communityTable from './communityTable' import communityTable from './communityTable'
import buildTable from './buildTable' import buildTable from './buildTable'
import roomTable from './roomTable' import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
filterText: '', filterText: '',
@ -475,63 +479,63 @@
components: { components: {
communityTable, buildTable, roomTable communityTable, buildTable, roomTable
} }
} }
</script> </script>
<style lang="scss" scoped > <style lang="scss" scoped >
.div_main { .div_main {
display: flex; display: flex;
} }
.scrollar { .scrollar {
margin-top: 10px; margin-top: 10px;
} }
.div_tree { .div_tree {
flex: 0 0 280px; flex: 0 0 280px;
background-color: #ffffff; background-color: #ffffff;
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
overflow-y: hidden; overflow-y: hidden;
} }
.filter_tree { .filter_tree {
overflow-x: auto; overflow-x: auto;
} }
.div_table { .div_table {
margin-left: 15px; margin-left: 15px;
// flex: 1; // flex: 1;
width: calc(100% - 300px); width: calc(100% - 300px);
background-color: #ffffff; background-color: #ffffff;
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
} }
.div_btn { .div_btn {
margin-top: 20px; margin-top: 20px;
} }
.row { .row {
padding: 10px; padding: 10px;
} }
</style> </style>
<style> <style>
/* .aui-content > .el-tabs > .el-tabs__content { /* .aui-content > .el-tabs > .el-tabs__content {
padding: 0px; padding: 0px;
} */ } */
.el-tree-node:focus > .el-tree-node__content { .el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */ /* background-color: #ccc !important; */
color: #2195fe; color: #2195fe;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.div_tree { .div_tree {
/deep/ .el-scrollbar__wrap { /deep/ .el-scrollbar__wrap {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
} }
</style> </style>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss"; @import "@/assets/scss/modules/visual/communityManage.scss";
</style> </style>

15
src/views/modules/base/community/roomForm.vue
View File

@ -115,6 +115,7 @@
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_1" <el-input class="item_width_1"
maxlength="30"
placeholder="请输入备注" placeholder="请输入备注"
v-model="dataForm.remark"> v-model="dataForm.remark">
</el-input> </el-input>
@ -135,13 +136,13 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost, requestGet } from '@/js/dai/request' import { requestPost, requestGet } from '@/js/dai/request'
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
@ -387,8 +388,8 @@
}, },
props: {} props: {}
} }
</script> </script>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss"; @import "@/assets/scss/modules/visual/communityManageForm.scss";
</style> </style>

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

@ -188,14 +188,14 @@
<script> <script>
import roomForm from './roomForm' import roomForm from './roomForm'
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
source: 'tree',//来源 source: 'tree',//来源
@ -209,11 +209,7 @@ export default {
// showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
agencyObj: {},//树所选的小区对象 agencyObj: {},//树所选的小区对象
ownerName: '',
ownerPhone: '',
rentFlag: '',
purpose: '',
remark: '',
validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
selection: [], selection: [],
@ -264,13 +260,13 @@ export default {
return index + 1; return index + 1;
}, },
handleSortOrderChange (value) { handleSortOrderChange (value) {
console.log(value.column, value.prop, value.order)
this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
this.loadTable() this.loadTable()
}, },
handleSortChange (value) { handleSortChange (value) {
console.log(value.column, value.prop, value.order)
this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
this.loadTable() this.loadTable()
@ -285,7 +281,7 @@ export default {
async handleChangeSort (row, index) { async handleChangeSort (row, index) {
// row.isChange = false // row.isChange = false
console.log(row.sort)
let params = { let params = {
id: row.houseId, id: row.houseId,
sort: row.sort, sort: row.sort,
@ -325,7 +321,7 @@ export default {
}, },
async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag, purpose, remark) { async loadTable (source, treeObj) {
this.source = source this.source = source
this.tableLoading = true this.tableLoading = true
@ -333,18 +329,10 @@ export default {
if (source === 'tree') {//来源于tree，查询数据清空 if (source === 'tree') {//来源于tree，查询数据清空
this.sortType = 'asc' this.sortType = 'asc'
this.agencyObj = treeObj this.agencyObj = treeObj
this.ownerName = null
this.ownerPhone = null
this.rentFlag = null
this.purpose = null
this.remark = null
} else if (source === 'search') {//来源于查询 } else if (source === 'search') {//来源于查询
this.agencyObj = treeObj this.agencyObj = treeObj
this.ownerName = ownerName
this.ownerPhone = ownerPhone
this.rentFlag = rentFlag
this.purpose = purpose
this.remark = remark
} }
// if (fromTree) { // if (fromTree) {
@ -359,9 +347,9 @@ export default {
ownerName: this.ownerName, ownerName: this.ownerName,
ownerPhone: this.ownerPhone, ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag, rentFlag: this.rentFlag,
sortType: this.sortType,
purpose: this.purpose, purpose: this.purpose,
remark: this.remark remark: this.remark,
sortType: this.sortType,
} }
const url = "/gov/org/house/houselist" const url = "/gov/org/house/houselist"
@ -411,7 +399,7 @@ export default {
this.formTitle = '新增房屋' this.formTitle = '新增房屋'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
console.log(this.agencyObj)
this.$refs.ref_form.initForm('add', null, this.agencyObj) this.$refs.ref_form.initForm('add', null, this.agencyObj)
}) })
}, },
@ -628,15 +616,40 @@ export default {
let url = "/gov/org/house/exportHouseUser" let url = "/gov/org/house/exportHouseUser"
let params = { let params = {
agencyId: '', agencyId: '',
gridId: '', gridId: '',
ownerName: this.ownerName, ownerName: this.ownerName,
ownerPhone: this.ownerPhone, ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
purpose: this.purpose, purpose: this.purpose,
remark: this.remark, remark: this.remark,
buildingId: this.agencyObj.id rentFlag: this.rentFlag,
buildingId: '',
neighborHoodId: ''
}
if (this.agencyObj.level === 'grid') {
params.gridId = this.agencyObj.id
params.agencyId = ''
params.buildingId = ''
params.neighborHoodId = ''
} else if (this.agencyObj.level === 'neighborHood') {
params.neighborHoodId = this.agencyObj.id
params.agencyId = ''
params.buildingId = ''
params.gridId = ''
} else if (this.agencyObj.level === 'building') {
params.buildingId = this.agencyObj.id
params.agencyId = ''
params.neighborHoodId = ''
params.gridId = ''
} else {
params.agencyId = this.agencyObj.id
params.buildingId = ''
params.neighborHoodId = ''
params.gridId = ''
} }
app.ajax.exportFilePost( app.ajax.exportFilePost(
@ -799,23 +812,23 @@ export default {
remark: { remark: {
type: String, type: String,
default: '', default: '',
},
} }
} }
}
</script> </script>
<style lang="scss" scoped > <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; width: 120px;
} }
/deep/.el-input-number--medium .el-input-number__decrease, /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__increase {
width: 26px; width: 26px;
} }
/deep/.el-input-number--medium .el-input__inner { /deep/.el-input-number--medium .el-input__inner {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save