-
+
网格选择
diff --git a/src/apps/AppGridManagement/SelectGird.vue b/src/apps/AppGridManagement/SelectGird.vue
deleted file mode 100644
index 8392653e..00000000
--- a/src/apps/AppGridManagement/SelectGird.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/apps/AppHandSnapshot/List.vue b/src/apps/AppHandSnapshot/List.vue
index f258f377..52d83b86 100644
--- a/src/apps/AppHandSnapshot/List.vue
+++ b/src/apps/AppHandSnapshot/List.vue
@@ -5,8 +5,7 @@
@change="change">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
- 
- 
-
-
-
-
-
-
- {{ item.girdName }}
-
-
- 清空
- 确定选择
-
-
+
diff --git a/src/apps/AppSpecialPeople/AppSpecialPeople.vue b/src/apps/AppSpecialPeople/AppSpecialPeople.vue
index d416a6ef..6d2e2df6 100644
--- a/src/apps/AppSpecialPeople/AppSpecialPeople.vue
+++ b/src/apps/AppSpecialPeople/AppSpecialPeople.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index d62e266c..ef15343a 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -151,7 +151,7 @@
{{ item.mustFill == 1 ? '*' : '' }}{{ item.fieldName }}
-
+
diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
index 2640af04..2f228146 100644
--- a/src/components/pages/selectGird.vue
+++ b/src/components/pages/selectGird.vue
@@ -1,46 +1,33 @@
-
-
-
+
- /{{ item.girdName }}
-
-
+
+
+
+
+
+
-
-
-
-
-
@@ -49,125 +36,99 @@
import {mapState} from "vuex";
export default {
- name: 'selectGird',
- appName: "网格选择",
+ name: 'SelectGird',
data() {
return {
- current: 1,
- name: '',
- list: [],
- selected: [],
SelectGird: {},
allData: null,
treeList: [],
- selectList: [],
- userList: [],
- girdLevel: 0,
+ slectList: [],
parentGirdId: '',
- isMyGird: false, //是否只查询当前户对应的网格员管理的三级网格
- isDisabledOneGird: false, //是否可以选择一级网格 true不可选
+ isFormMap: 0, //1为网格地图 一级不允许选中
}
},
computed: {
...mapState(['user']),
- options() {
- return this.treeList.filter(e => e.girdName?.indexOf(this.name) > -1 || !this.name) || []
+ isMyGirds() {
+ return this.$route.query.self == true
},
- isGirdUser() {
- return this.user.girdCheckType != 0
- }
+ isGridMember() {
+ return this.user.girdCheckType > 0
+ },
+ //是否是网格员申报
+ isApply: v => v.$route.query.formType == 2,
+ clearable: v => v.$route.query.clearable,
+ selected: v => [v.$route.query.selected].flat()
},
- onLoad(params) {
- if (params.girdLevel) {
- this.girdLevel = params.girdLevel
+ onLoad(option) {
+ if (option.isFormMap) {
+ this.isFormMap = option.isFormMap
}
- if (params.isMyGird) {
- this.isMyGird = params.isMyGird
- }
-
- if (params.isDisabledOneGird) {
- this.isDisabledOneGird = params.isDisabledOneGird
- }
- if (this.isGirdUser) {
- if (this.isMyGird) {
- this.getMyGird()
- } else {
- this.getTree()
- }
- } else this.$u.toast('当前人员不是网格员或网格管理员')
+ this.isGridMember || this.isApply ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长')
},
methods: {
- getMyGird() {
- this.selectList = []
- this.$http.post('/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser').then((res) => {
- if (res?.data) {
- this.allData = res.data
- this.treeInit()
- }
- })
- },
- getTree() {
- this.selectList = []
- this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${this.girdLevel}&girdMemberId=${this.user.girdMemberId}&parentGirdId=${this.parentGirdId}`).then((res) => {
- if (res?.data) {
- this.allData = res.data
- this.treeInit()
- }
- })
- },
-
- treeInit() {
- this.treeList = this.allData
- this.treeList.map((item) => {
- item.isChecked = false
- })
- let obj = {
- girdName: '可选范围',
- id: '',
- girdLevel: ''
+ getAllGrids() {
+ this.slectList = []
+ let {girdMemberId} = this.user,
+ url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`,
+ params = {girdMemberId}
+ if (this.isApply) {
+ url = `/app/appgirdinfo/listByInfo`
+ params = {}
}
- this.selectList.push(obj)
- },
-
- itemClick(row) {
- if (row.girdLevel == 2) return
- const obj = {
- girdName: row.girdName,
- id: row.id,
- girdLevel: row.girdLevel
- };
- this.selectList.push(obj)
- this.searckGird(row)
- },
-
- searckGird(row) {
- if (row.girdLevel == 2) return
- const girdLevel = Number(row.girdLevel) + 1;
- this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${girdLevel}&girdMemberId=${this.user.girdMemberId}&parentGirdId=${row.id}`).then((res) => {
+ if (this.isMyGirds) {
+ url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2`
+ }
+ this.$http.post(url, null, {params}).then((res) => {
if (res?.data) {
- this.treeList = res.data
+ let parents = res.data.map(e => e.parentGirdId)
+ this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)}))
+ this.treeInit()
}
})
},
-
- girdNameClick(row, index) {
- this.userList = []
- if (!index) { //第一级别
- this.selectList = []
- this.treeInit()
- } else {
- const list = [];
- this.selectList.map((item, i) => {
- if (i <= index) {
- list.push(item)
+ treeInit(isClick) {
+ let last = uni.getStorageSync("lastSelectedGrid")
+ if (!isClick && last && !this.isApply) {
+ this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, {
+ params: {girdId: last}
+ }).then(res => {
+ if (res?.data) {
+ this.slectList = [{girdName: '可选范围', id: ''}, res.data.filter(e => !!this.allData.find(a => a.id == e.id))].flat()
+ this.getGridsByGridMemberAndParent({id: last})
}
})
- this.selectList = list
- this.searckGird(row)
+ } else {
+ this.treeList = this.allData.filter((e, i, arr) => !arr.map(e => e.id).includes(e.parentGirdId) || this.isMyGirds)
+ this.treeList.map((item) => item.isChecked = this.selected.includes(item.id))
+ let obj = {girdName: '可选范围', id: ''}
+ this.slectList.push(obj)
+ }
+ },
+ itemClick(row) {
+ if (row.hasChildren) {
+ let obj = {
+ girdName: row.girdName,
+ id: row.id,
+ }
+ this.slectList.push(obj)
+ this.getGridsByGridMemberAndParent(row)
+ }
+ },
+ getGridsByGridMemberAndParent(row) {
+ let {id: parentGirdId} = row
+ this.treeList = this.allData.filter(e => e.parentGirdId == parentGirdId)
+ this.treeList.map((item) => item.isChecked = this.selected.includes(item.id))
+ },
+ girdNameClick(row, index) {
+ if (!index) { //第一级别
+ this.slectList = []
+ this.treeInit(true)
+ } else {
+ this.slectList.splice(index, 8)
+ this.getGridsByGridMemberAndParent(row)
}
},
-
-
girdClick(row, index) {
if (this.treeList[index].isChecked) {//取消
this.treeList[index].isChecked = false
@@ -181,42 +142,50 @@ export default {
}
this.$forceUpdate()
},
- confirm() {
+ submit() {
if (this.SelectGird.id != null) {
+ if (!this.isApply && !this.isMyGirds) {
+ uni.setStorageSync("lastSelectedGrid", this.SelectGird.parentGirdId)
+ }
uni.navigateBack({
success: () => {
- uni.$emit("pagePicker:gird", [this.SelectGird])
+ uni.$emit("pagePicker:gird", this.SelectGird)
}
})
} else {
return this.$u.toast('请选择网格')
}
},
+ cancel() {
+ this.SelectGird = {}
+ uni.navigateBack({
+ success: () => {
+ uni.$emit("pagePicker:gird", this.SelectGird)
+ }
+ })
+ }
}
}
- 
+
+
+
-
+
- 
- 
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
{{ item.girdName }}
-