diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index eb376ac9..99a435b3 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -59,7 +59,7 @@
:data="tableData"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
border
- @sort-change="handleSortChange"
+ @sort-change="handleSortOrderChange"
:height="tableHeight"
v-loading="tableLoading"
style="width: 100%"
@@ -85,7 +85,7 @@
+ min-width="110">
{{scope.row.sort}}
@@ -199,6 +200,7 @@ export default {
total: 0,
pageSize: 20,
pageNo: 0,
+ sortType: 'asc',//asc:正,desc:倒
tableLoading: true,
tableData: [],
@@ -231,9 +233,15 @@ export default {
},
methods: {
- handleSortChange () {
+ handleSortOrderChange (value) {
+ console.log(value.column, value.prop, value.order)
+ this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+ this.loadTable()
},
+ // handleChangeSort(row){
+
+ // },
handleEditSort (row) {
if (!row.isChange) {
@@ -242,10 +250,32 @@ export default {
},
- onInputBlur (row) {
- row.isChange = false
+ async handleChangeSort (row, index) {
+ // row.isChange = false
console.log(row.sort)
+ let params = {
+ id: row.buildingId,
+ sort: row.sort,
+ type: 'building',
+ }
+
+ let url = '/gov/org/house/update-sort'
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.$message({
+ type: 'success',
+ message: '操作成功'
+ })
+
+
+ } else {
+
+ this.$message.error(msg)
+ }
+
},
@@ -262,6 +292,7 @@ export default {
async loadTable (fromTree, treeObj) {
this.tableLoading = true
if (fromTree) {
+ this.sortType = 'asc'
this.agencyObj = treeObj
@@ -278,7 +309,7 @@ export default {
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
-
+ sortType: this.sortType,
neighborHoodId: this.agencyObj.id
}
@@ -288,6 +319,7 @@ export default {
this.validTableDataNum = 0
this.total = data.total
data.list.forEach(item => {
+ item.sort = item.sort.toFixed(2)
item.isChange = false
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
@@ -688,7 +720,7 @@ export default {
@import "@/assets/scss/modules/visual/communityManage.scss";
.item_width_4 {
- width: 100px;
+ width: 120px;
}
/deep/.el-input-number--medium .el-input-number__decrease,
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 3b771eca..bb1b835e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -42,6 +42,7 @@
:data="tableData"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
v-loading="tableLoading"
+ @sort-change="handleSortOrderChange"
border
:height="tableHeight"
style="width: 100%"
@@ -51,6 +52,26 @@
:selectable="checkSelect"
width="55">
+
+
+
+ {{scope.row.sort}}
+
+
+
+
+
@@ -168,6 +189,7 @@ export default {
total: 0,
pageSize: 20,
pageNo: 0,
+ sortType: 'asc',//asc:正,desc:倒
tableLoading: true,
// showImportBtn: false,//是否显示操作按钮,根据登录人所属组织判断
@@ -220,7 +242,53 @@ export default {
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
+ handleSortOrderChange (value) {
+ console.log(value.column, value.prop, value.order)
+ this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+ this.loadTable()
+
+ },
+ handleSortChange (value) {
+ console.log(value.column, value.prop, value.order)
+ this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+ this.loadTable()
+
+ },
+
+ handleEditSort (row) {
+ if (!row.isChange) {
+ row.isChange = true
+ }
+
+ },
+
+ async handleChangeSort (row, index) {
+ // row.isChange = false
+ console.log(row.sort)
+ let params = {
+ id: row.houseId,
+ sort: row.sort,
+ type: 'house',
+ }
+ let url = '/gov/org/house/update-sort'
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.$message({
+ type: 'success',
+ message: '操作成功'
+ })
+
+
+ } else {
+
+ this.$message.error(msg)
+ }
+
+
+ },
checkSelect (row, index) {
let isChecked = false;
@@ -242,6 +310,7 @@ export default {
this.tableLoading = true
if (source === 'tree') {//来源于tree,查询数据清空
+ this.sortType = 'asc'
this.agencyObj = treeObj
this.ownerName = null
this.ownerPhone = null
@@ -265,6 +334,7 @@ export default {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
+ sortType: this.sortType,
}
const url = "/gov/org/house/houselist"
@@ -275,6 +345,8 @@ export default {
this.total = data.total
this.validTableDataNum = 0
data.list.forEach(item => {
+ item.sort = item.sort.toFixed(2)
+ item.isChange = false
item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
if (item.agencyId === this.staffAgencyId) {
@@ -650,4 +722,17 @@ export default {