From aa9cc87b525ca6da5d2c1048b85b462b9295d0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 31 Dec 2021 11:28:45 +0800 Subject: [PATCH 1/5] 26211 --- src/apps/AppWalkask/AppWalkask.vue | 2 -- src/apps/AppWalkask/add.vue | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue index 09c726e7..e1f007bf 100644 --- a/src/apps/AppWalkask/AppWalkask.vue +++ b/src/apps/AppWalkask/AppWalkask.vue @@ -164,14 +164,12 @@ export default { }, goDetail(item, hint) { - console.log('详情',hint) if (hint == 1) { uni.navigateTo({ url: `./detail?id=${item.id}` }) } }, toAdd(item, hint) { - console.log('编辑',hint) if (hint == 2) { uni.navigateTo({ url: `./add?id=${item.id}` }) } else { diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue index c36d3ffa..35dbdef3 100644 --- a/src/apps/AppWalkask/add.vue +++ b/src/apps/AppWalkask/add.vue @@ -24,17 +24,18 @@
- - -
{{ forms.title.length }}/30
+ + +
{{ forms.title.length }}/30
- - -
{{ forms.description.length }}/500
+ + + +
{{ forms.description.length }}/500
@@ -105,7 +106,6 @@ export default { }) uni.$on('goBack', (data) => { - console.log(data) this.forms.menuLevel3Name = data.applicationName this.forms.applicationId = data.applicationId this.forms.name = data.selectUser.name @@ -195,7 +195,6 @@ export default { }, areaSelect(e) { - console.log(e) this.forms.areaId = e }, @@ -213,11 +212,6 @@ export default { }, toWalkObject() { - console.log(1); - // if (this.id) return - // this.addList = false - // this.comp = 'selectType' - // this.paramss = 111 uni.navigateTo({ url: `./selectType` }) }, }, @@ -287,6 +281,12 @@ export default { background: #f3f6f9; } + .hint { + padding: 4px 32px 8px 0; + text-align: right; + color: #999; + } + .avatars { .u-form-item__body { .default { From b7261fd83861253023711f4d0545bcc58bceebf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 31 Dec 2021 11:44:34 +0800 Subject: [PATCH 2/5] 26262 --- src/apps/AppWalkask/AppWalkask.vue | 1 + src/apps/AppWalkask/selectType.vue | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue index e1f007bf..9a9e1558 100644 --- a/src/apps/AppWalkask/AppWalkask.vue +++ b/src/apps/AppWalkask/AppWalkask.vue @@ -157,6 +157,7 @@ export default { }, change(index) { + this.data = [] this.areaId = this.user.areaId this.keyword = '' this.currentTabs = index diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue index bb58c2fa..e984b8b1 100644 --- a/src/apps/AppWalkask/selectType.vue +++ b/src/apps/AppWalkask/selectType.vue @@ -107,7 +107,12 @@ export default { getUser(data) { this.applicationId = data.id - this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}¤t=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => { + this.appId = data.id + this.getUsers() + }, + + getUsers() { + this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}¤t=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => { if (res.code == 0) { res.data.records.map((item) => { item.isChecked = false @@ -139,17 +144,18 @@ export default { }, handerSearch(e) { - if (this.showType) { + if (!this.showType) { this.keyword = e this.current = 1 - this.getUser() + // this.getUser() + this.getUsers() } }, handerClear() { this.keyword = '' this.current = 1 - this.getUser() + this.getUsers() }, }, } From c97b6515f0149030f8b757faae378cc24c256a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 31 Dec 2021 11:48:12 +0800 Subject: [PATCH 3/5] 26261 --- src/apps/AppWalkask/selectType.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue index e984b8b1..53f1ec19 100644 --- a/src/apps/AppWalkask/selectType.vue +++ b/src/apps/AppWalkask/selectType.vue @@ -123,9 +123,12 @@ export default { }, submit() { - uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId }) - uni.navigateBack() - // uni.navigateTo({ url: `./add` }) + if (this.selectUser.length > 0) { + uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId }) + uni.navigateBack() + } else { + return this.$u.toast('请选择人员') + } }, toUserSelect(item) { From 7429e255a5fb891db6aa5cad6f46dbb0a00f0358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 31 Dec 2021 11:53:11 +0800 Subject: [PATCH 4/5] 26206 --- src/apps/AppWalkask/selectType.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue index 53f1ec19..f52af701 100644 --- a/src/apps/AppWalkask/selectType.vue +++ b/src/apps/AppWalkask/selectType.vue @@ -40,8 +40,7 @@
{{ e.name }}
- - +
{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}
@@ -256,14 +255,14 @@ export default { align-items: center; margin-left: 32px; border-bottom: 1px solid #e4e5e6; + padding-right: 20px; .applicationNames { font-size: 36px; font-weight: 500; color: #333333; } - .imgs { - width: 40px; - height: 40px; + .idNumbers { + color: #666; } } } From adeb6f3062e0ded7088d7a30e5861464d3a982c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 31 Dec 2021 14:07:32 +0800 Subject: [PATCH 5/5] 26122 --- src/apps/AppResidentActivitie/Add.vue | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue index 79f41a26..0c8302cf 100644 --- a/src/apps/AppResidentActivitie/Add.vue +++ b/src/apps/AppResidentActivitie/Add.vue @@ -207,9 +207,9 @@ export default { if (this.showStartTime == true) { var nowTime = new Date().getTime() * 1 - var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 + var beginTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 - if (nowTime > historyTime) { + if (nowTime > beginTimes) { this.forms.beginTime = '' return this.$u.toast('开始时间应大于当前时间') } else { @@ -217,15 +217,18 @@ export default { } } if (this.showEndTime == true) { - var nowTime = new Date().getTime() * 1 + if (!this.forms.beginTime) { + return this.$u.toast('请先选择开始时间') + } + var beginTimes = new Date(this.forms.beginTime).getTime() * 1 - var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 + var endTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 - if (nowTime > historyTime) { - this.forms.endTime = '' - return this.$u.toast('结束时间应大于当前时间') - } else { + if (endTimes > beginTimes && endTimes != beginTimes) { this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00' + } else { + this.forms.endTime = '' + return this.$u.toast('结束时间应大于开始时间') } } },