From bb67f3793ccc0b96252d1972fad0e89ef6d065e4 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 22 Jul 2021 18:02:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.7.7=20=E6=88=91=E6=9C=89?= =?UTF-8?q?=E4=BA=8B=E8=AF=B4=E6=A0=87=E7=AD=BE=E5=A2=9E=E5=8A=A0=E4=BA=BA?= =?UTF-8?q?=E7=89=A9=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- .../discussion/pages/addIssue/addIssue.js | 100 +++++++++++++++--- .../discussion/pages/addIssue/addIssue.wxml | 32 +++++- .../discussion/pages/addIssue/addIssue.wxss | 99 +++++++++++++++++ subpages/discussion/utils/api.js | 12 ++- 5 files changed, 229 insertions(+), 16 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 68f02a2..18249b6 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.7.6" + const versionNum = "1.7.7" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/discussion/pages/addIssue/addIssue.js b/subpages/discussion/pages/addIssue/addIssue.js index eff0b77..cadbbb8 100644 --- a/subpages/discussion/pages/addIssue/addIssue.js +++ b/subpages/discussion/pages/addIssue/addIssue.js @@ -1,7 +1,7 @@ const QQMapWX = require("../../utils/qqmap-wx-jssdk") import { $wuxActionSheet } from "../../../../dist/index" const config = require("../../../../utils/config") -import { addIssue, getEventTagList } from "../../utils/api" +import { addIssue, getEventTagList, getEventtagWorkuser } from "../../utils/api" Page({ data: { @@ -21,6 +21,14 @@ Page({ tagIds: [], checkboxs: [], lock: false, //锁定发布状态，防止连击 + showDialog: false, + boxTitle: '', // checkbox 对话框标题 + leaderList: [], + pageIndex: 1, + pageSize: 10, + loadMoreType: "none", + workuserId: '', // 选中工作人员id + workUserIds: [], // 选中工作人员id集合 }, onLoad () { this.getEventTagList() @@ -46,6 +54,32 @@ Page({ addressContent: e.detail.value.trim('') }) }, + // + getEventtagWorkuser () { + let param = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + eventTagId: this.data.workuserId + } + getEventtagWorkuser(param).then(res => { + let leaderList = [ ...this.data.leaderList, ...res.data ] + this.setData({ + leaderList, + loadMoreType: res.data.length === 10 ? "loading" : "none" + }) + if (this.data.leaderList.length > 0 && !this.data.showDialog) { + this.setData({ + showDialog: true + }) + } + }).catch(err => { + this.setData({ + leaderList: [], + loadMoreType: "none" + }) + console.log(err) + }) + }, //获取事件标签列表 getEventTagList () { getEventTagList().then(res => { @@ -252,7 +286,8 @@ Page({ issueLatitude: this.data.latitude, images: imagesList, isConReview: this.data.isConReview, - tagIds: this.data.tagIds + tagIds: this.data.tagIds, + workUserIds: this.data.workUserIds } this.setData({ lock: true @@ -330,9 +365,10 @@ Page({ }, checkboxClick (e) { + this.data.tagIds = [] //当前版本标签单选 + this.data.workUserIds = [] if (this.data.checkboxs[e.currentTarget.dataset.index].checked) { this.data.checkboxs[e.currentTarget.dataset.index].checked = false - this.data.tagIds = [] //当前版本标签单选 } else { for(let i=0;i { + this.getEventtagWorkuser() + }) } this.setData({ checkboxs: this.data.checkboxs }) - console.log(this.data.tagIds) + // console.log(this.data.tagIds) + }, + // 关闭对话框 + closeCheckboxDialog () { + this.setData({ + showDialog: false, + leaderList: [], + loadMoreType: "none", + pageIndex: 1 + }) + }, + // + confirmCheckboxDialog () { + let list = [] + this.data.leaderList.forEach(item => { + if (item.checked) { + list.push(item.id) + } + }) + this.setData({ + showDialog: false, + leaderList: [], + loadMoreType: "none", + pageIndex: 1, + workUserIds: [ ...list ] + }) + }, + checkboxChange (e) { + let item = this.data.leaderList[e.currentTarget.dataset.index] + item.checked = !item.checked + this.setData({ + leaderList: this.data.leaderList + }) + }, + dialogReachBottom () { + if (this.data.loadMoreType === "loading") { + this.setData({ + pageIndex: this.data.pageIndex + 1 + }) + this.getEventtagWorkuser() + } } - // toOperationDesc(phrase) { //常用于点击事件 - // // console.log(phrase.currentTarget.dataset.phrase) - // this.setData({ - // issueContent: this.data.issueContent + phrase.currentTarget.dataset.phrase, - // }) - // // console.log(phrase.currentTarget.dataset.phrase) - // }, }) \ No newline at end of file diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index 083f9d5..741fdb1 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -22,7 +22,7 @@ -