From 2a61dad694bad8ddcea768ac973cc0c2339a54cc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 06 May 2024 14:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/userHouse/houseList.vue | 110 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 44 deletions(-)
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index c785db9..b673a97 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -32,8 +32,8 @@
<el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
v-if="permission.house_manager" @click="handleHouseholdManager(row)">住户管理
</el-button>
- <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.house_tag"
- @click="manageLabel(row)">标签
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.house_tag" @click="manageLabel(row)">标签
</el-button>
</template>
@@ -99,9 +99,9 @@
</el-col>
</el-row>
</template>
-
+
<script>
-import { setLabelColor } from '@/util/util'
+import { setHouseLabelColor } from '@/util/util'
import {
getList,
@@ -113,7 +113,7 @@
} from "@/api/userHouse/list/house.js"
import {
removeHouseholdLabel,
- saveOrUpdateHouseholdLabel
+ saveOrUpdateHouseLabelInfo
} from "@/api/userHouse/list/userHouseList.js"
import {
getLabelList,
@@ -142,7 +142,7 @@
components: {
householdManager
},
- data () {
+ data() {
//手机号格式校验
let validatorPhone = function (rule, value, callback) {
@@ -328,7 +328,7 @@
prop: "neiCode",
search: false,
type: "tree",
- dicUrl: "/api/blade-system/region/tree",
+ dicUrl: "/api/blade-system/region/treeToCommunity",
props: {
label: "name",
value: "id",
@@ -511,7 +511,7 @@
},
watch: {
'form.source': {
- handler (newData) {
+ handler(newData) {
let locationColumn = this.findObject(
this.option.column,
@@ -528,7 +528,7 @@
},
computed: {
...mapGetters(["userInfo", "permission"]),
- permissionList () {
+ permissionList() {
return {
addBtn: this.vaildData(this.permission.house_add, true),
viewBtn: this.vaildData(this.permission.house_view, true),
@@ -537,7 +537,7 @@
}
},
- textDispose () {
+ textDispose() {
return (row, flag, type) => {
if (row[flag] || row[type] == null) {
return row[type]
@@ -550,7 +550,7 @@
}
}
},
- showLocation () {
+ showLocation() {
return (data) => {
if (data != null && data.indexOf(',') != -1) {
data = data.split(',')
@@ -562,21 +562,21 @@
}
},
- labelDispose () {
+ labelDispose() {
return (list) => {
return list.map(item => item.labelName).join(',')
}
},
- getColor () {
+ getColor() {
return (data) => {
- return setLabelColor(data)
+ return setHouseLabelColor(data)
}
}
},
- mounted () { },
+ mounted() { },
methods: {
- locationDispose (data) {
+ locationDispose(data) {
data = data.split(',')
return {
@@ -586,8 +586,8 @@
}
},
- onsubmit () {
- if (this.labelForm.color === '#EBEDF0') {
+ onsubmit() {
+ if (this.labelForm.color === '#999') {
let params = {
householdId: this.currentRow.id,
labelId: this.currentLabel.id
@@ -606,7 +606,7 @@
this.labelForm.householdId = this.currentRow.id
this.labelForm.labelId = this.currentLabel.id
this.labelForm.lableType = 2
- saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+ saveOrUpdateHouseLabelInfo(this.labelForm).then(res => {
this.$message({
type: "success",
message: "操作成功!"
@@ -618,13 +618,35 @@
}
},
- changLabel (item) {
- this.editLabelFlge = true
+ changLabel(item) {
+ // this.editLabelFlge = true
this.currentLabel = item
- this.labelForm.color = item.color
- this.labelForm.remark = item.remark
+ // this.labelForm.color = item.color
+ // this.labelForm.remark = item.remark
+ // console.log(item,9999)
+ if(item.name == '闲置'){
+ this.labelForm.color = 'green'
+ }
+ if(item.name == '自住'){
+ this.labelForm.color = 'blue'
+ }
+ if(item.name == '出租'){
+ this.labelForm.color = 'yellow'
+ }
+ this.labelForm.houseCode = this.currentRow.houseCode
+ this.labelForm.labelId = this.currentLabel.id
+ this.labelForm.lableType = 2
+ saveOrUpdateHouseLabelInfo(this.labelForm).then(res => {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ // this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false
+ })
},
- manageLabel (item) {
+ manageLabel(item) {
this.loading = true
this.currentRow = item
this.labelFlag = true
@@ -658,14 +680,14 @@
})
})
},
- handleHouseholdManager (row) {
+ handleHouseholdManager(row) {
var that = this
this.householdManagerVisible = true
this.$nextTick(() => {
that.$refs.householdManager.init(row)
})
},
- rowSave (row, done, loading) {
+ rowSave(row, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",")
@@ -690,7 +712,7 @@
loading()
})
},
- rowUpdate (row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",")
@@ -714,7 +736,7 @@
loading()
})
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -731,25 +753,25 @@
})
})
},
- searchReset () {
+ searchReset() {
this.query = {}
this.treeDeptId = ''
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- selectionChange (list) {
+ selectionChange(list) {
this.selectionList = list
},
- selectionClear () {
+ selectionClear() {
this.selectionList = []
this.$refs.crud.toggleSelection()
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据")
return
@@ -771,16 +793,16 @@
this.$refs.crud.toggleSelection()
})
},
- handleImport () {
+ handleImport() {
this.excelBox = true
},
- uploadAfter (res, done, loading, column) {
+ uploadAfter(res, done, loading, column) {
window.console.log(column)
this.excelBox = false
this.refreshChange()
done()
},
- handleExport () {
+ handleExport() {
this.$confirm("是否导出房屋数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -799,12 +821,12 @@
})
})
},
- handleTemplate () {
+ handleTemplate() {
exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
downloadXls(res.data, "房屋数据模板.xlsx")
})
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetatil({
id: this.form.id
@@ -828,16 +850,16 @@
this.initFlag = true
done()
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ refreshChange() {
this.onLoad(this.page, this.query)
},
- onLoad (page, params = {}) {
+ onLoad(page, params = {}) {
this.loading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
@@ -867,13 +889,13 @@
this.selectionClear()
})
},
- showStringDispose (row, type) {
+ showStringDispose(row, type) {
row[type] = !row[type]
}
}
}
</script>
-
+
<style>
.box {
height: 800px;
--
Gitblit v1.9.3