diff --git a/src/components/pages/multiplyArea.vue b/src/components/pages/multiplyArea.vue
index 14a37cab..e7bf20e3 100644
--- a/src/components/pages/multiplyArea.vue
+++ b/src/components/pages/multiplyArea.vue
@@ -49,7 +49,8 @@ export default {
},
valueLevel() {
return this.$route.query.valueLevel || 5
- }
+ },
+ extra: v => v.$route.query.extra
},
methods: {
getOptionsByRoot() {
@@ -77,8 +78,17 @@ export default {
this.selectList.push(row)
this.options = res.data.map(e => ({...e, isChecked: !!this.selected[e.id]}))
}
- row.locked = false
- })
+ }).finally(() => row.locked = false)
+ } else if (this.extra && !row.locked) {
+ row.locked = true
+ this.$http.post("/admin/appresident/queryAreaIdGroup", null, {
+ params: {currentAreaId: id}
+ }).then(res => {
+ if (res?.data) {
+ this.selectList.push(row)
+ this.options = res.data.map(id => ({id, name: id, isChecked: !!this.selected[id]}))
+ }
+ }).finally(() => row.locked = false)
}
},
selectListClick(row, index) {
diff --git a/src/project/police/AppMessageNotification/chooseUser.vue b/src/project/police/AppMessageNotification/chooseUser.vue
index e44a9b29..37bd1f39 100644
--- a/src/project/police/AppMessageNotification/chooseUser.vue
+++ b/src/project/police/AppMessageNotification/chooseUser.vue
@@ -3,17 +3,17 @@
-
+
-
{{item.name}}
+
{{ item.name }}
-
{{items.name}}
+
+ {{ items.name }}
+
@@ -61,10 +63,10 @@ export default {
computed: {
...mapState(['user']),
moreText() {
- if(this.userList.length) return '已选择'
+ if (this.userList.length) return '已选择'
},
moreTextDept() {
- if(this.deptList.length) return '已选择'
+ if (this.deptList.length) return '已选择'
},
},
methods: {
@@ -74,7 +76,7 @@ export default {
res.data.records.map((item) => {
item.tagList.map((items) => {
items.isCheck = false
- if(this.tagIdList.includes(items.id)) {
+ if (this.tagIdList.includes(items.id)) {
items.isCheck = true
}
})
@@ -93,7 +95,7 @@ export default {
this.tagIdList = []
this.tagList.map((item) => {
item.tagList.map((items) => {
- if(items.isCheck) {
+ if (items.isCheck) {
this.tagIdList.push(items.id)
}
})
@@ -117,7 +119,7 @@ export default {
uni.navigateBack({})
},
toSelectDept() {
- uni.navigateTo({ url: `./selectDept` })
+ uni.navigateTo({url: `./selectDept`})
},
},
onShow() {
@@ -127,13 +129,13 @@ export default {
console.log(option)
this.areaId = this.user.areaId
this.areaName = this.user.areaName
- if(option.areaList) {
+ if (option.areaList) {
this.areaList = option.areaList.split(',')
}
- if(option.tagIdList) {
- this.tagIdList = option.tagIdList.split(',')
+ if (option.tagIdList) {
+ this.tagIdList = option.tagIdList.split(',')
}
- if(option.userList) {
+ if (option.userList) {
var list = option.userList.split(',')
list.map(item => {
var info = {
@@ -141,9 +143,9 @@ export default {
}
this.userList.push(info)
})
-
+
}
- if(option.deptList) {
+ if (option.deptList) {
var list = option.deptList.split(',')
list.map(item => {
var info = {
@@ -158,64 +160,76 @@ export default {