Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -7,10 +7,10 @@
|
||||
</div>
|
||||
<div class="cards" v-for="item in treeList" :key="item.id" @click="itemClick(item)">
|
||||
<div class="imges">
|
||||
<!-- <img src="./images/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
|
||||
@click.stop="girdClick(item, index)"/>
|
||||
<img src="./images/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
|
||||
@click.stop="girdClick(item)"/>
|
||||
<img src="./images/xz.png" alt="" class="imgselect" v-else
|
||||
@click.stop="girdClick(item, index)"/> -->
|
||||
@click.stop="girdClick(item)"/>
|
||||
<img src="./images/gird--select-icon.png" alt="" class="avatras"/>
|
||||
</div>
|
||||
<div class="rightes">
|
||||
@@ -18,7 +18,7 @@
|
||||
<img src="./images/right-icon.png" alt="" class="imgs"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="userCards" v-for="(e, index) in userList" :key="e.id">
|
||||
<!-- <div class="userCards" v-for="(e, index) in userList" :key="e.id">
|
||||
<div class="imges">
|
||||
<img src="./images/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)"/>
|
||||
<img src="./images/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)"/>
|
||||
@@ -30,7 +30,7 @@
|
||||
</div>
|
||||
<div class="idNumbers">{{ e.phone }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<AiEmpty description="暂无数据" v-if="!hasData"/>
|
||||
</div>
|
||||
<div class="subBtn" @click="submit">
|
||||
@@ -104,42 +104,39 @@ export default {
|
||||
this.getGridsAndUsersByParent(row.id)
|
||||
}
|
||||
},
|
||||
// girdClick(row, index) {
|
||||
// if (this.treeList[index].isChecked) {
|
||||
// //取消
|
||||
// this.treeList[index].isChecked = false
|
||||
// this.selected = {}
|
||||
// } else {
|
||||
// this.treeList.map((item, i) => {
|
||||
// item.isChecked = index == i
|
||||
// })
|
||||
// this.selected = {...row, kind: "grid"}
|
||||
// }
|
||||
// this.$forceUpdate()
|
||||
// },
|
||||
|
||||
userClick(row) {
|
||||
girdClick(row) {
|
||||
row.isChecked = !!!row.isChecked
|
||||
// if (this.userList[index].isChecked) {//取消
|
||||
// this.userList[index].isChecked = false
|
||||
// if (this.treeList[index].isChecked) {//取消
|
||||
// this.treeList[index].isChecked = false
|
||||
// this.selected = {}
|
||||
// } else {
|
||||
// this.userList.map((item, i) => {
|
||||
// this.treeList.map((item, i) => {
|
||||
// item.isChecked = index == i
|
||||
// })
|
||||
// this.selected = {...row, kind: "user"}
|
||||
// this.selected = {...row, kind: "grid"}
|
||||
// }
|
||||
if(row.isChecked){
|
||||
|
||||
if(row.isChecked) {
|
||||
this.selected.push(row)
|
||||
}else{
|
||||
console.log(this.selected)
|
||||
} else {
|
||||
let index=this.selected.findIndex(item=>row.id===item.id)
|
||||
index>=0&&this.selected.splice(index, 1)
|
||||
index >= 0 && this.selected.splice(index, 1)
|
||||
}
|
||||
// this.selected = this.userList.filter(v=> v.isChecked)
|
||||
uni.setStorageSync('userSelect', this.selected)
|
||||
this.$forceUpdate()
|
||||
},
|
||||
|
||||
// userClick(row) {
|
||||
// row.isChecked = !!!row.isChecked
|
||||
// if(row.isChecked){
|
||||
// this.selected.push(row)
|
||||
// }else{
|
||||
// console.log(this.selected)
|
||||
// let index=this.selected.findIndex(item=>row.id===item.id)
|
||||
// index>=0&&this.selected.splice(index, 1)
|
||||
// }
|
||||
// uni.setStorageSync('userSelect', this.selected)
|
||||
// },
|
||||
|
||||
submit() {
|
||||
if (!this.selected.length) {
|
||||
return this.$u.toast('请选择网格员')
|
||||
|
||||
Reference in New Issue
Block a user