From af5a12b69aff761e8bbce85dacafac1e675f0d63 Mon Sep 17 00:00:00 2001 From: changjinpeng <185154740@qq.com> Date: Thu, 3 Mar 2022 19:01:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8D=95=E9=80=89=E6=90=9E=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppWorkonline/Opinion.vue | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue index b0f670ad..a4e3d617 100644 --- a/src/apps/AppWorkonline/Opinion.vue +++ b/src/apps/AppWorkonline/Opinion.vue @@ -48,13 +48,15 @@ -
+
* {{ item.fieldName }}:
- + + +
@@ -110,12 +112,12 @@ export default { filedIndex: 0, fileNameList: [], opinion: '', + showStstus: false, } }, onLoad(options) { this.objid = options.id this.type = options.type - this.getList() }, onShow() { @@ -131,15 +133,13 @@ export default { .post(`/app/approv-alapply-info/approval-popup?type=${this.type}&id=${this.objid}`) .then((res) => { if (res.code == 0) { - this.list = res.data.fieldInfos - console.log(this.list) res.data.fieldInfos.map((item) => { - // this.list.push(item) - // if (item.fieldDataType == 1) { - // item.fieldValue = '' - // } - // if (item.fieldType == 3) { - // } + if (item.fieldType != 3) { + item.fieldValue = '' + } + if (item.fieldType == 3) { + this.list.push(item) + } }) } }) @@ -162,6 +162,10 @@ export default { }) }, + selectStatus(e) { + this.$set(this.list[index], 'fieldValue', this.value) + }, + btn() { // if (this.type == 0 && this.opinion == '') { // return uni.showToast({ From ddcbc904b1b496e2c5a5bfe6e3cf4a285c0eb0a0 Mon Sep 17 00:00:00 2001 From: changjinpeng <185154740@qq.com> Date: Fri, 4 Mar 2022 10:21:27 +0800 Subject: [PATCH 2/9] 28025 28011 --- src/apps/AppWorkonline/Detail.vue | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue index a0f127ca..fc118649 100644 --- a/src/apps/AppWorkonline/Detail.vue +++ b/src/apps/AppWorkonline/Detail.vue @@ -89,7 +89,7 @@
- +
@@ -98,10 +98,7 @@ {{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }} - {{ $dict.getLabel(items.dictionaryCode, itemL) }} - - + {{ $dict.getLabel(items.dictionaryCode, itemL) }}
@@ -174,7 +171,10 @@ {{ item4.fieldValue }}
--> - 审批意见:{{ item.opinion }} + + 审批意见: + {{ item.opinion }} +
@@ -285,20 +285,22 @@ export default { this.inforlist = [[], [], [], [], [], [], [], [], [], []] res.data.tableInfo.tableFieldInfos.map((item) => { - if (item.groupIndex) { - this.inforlist[item.groupIndex - 1].push(item) - } + this.inforlist[item.groupIndex].push(item) if (item.dictionaryCode) { this.dictList.push(item.dictionaryCode) - } - if (item.fieldDataType == 5) { - // item.fieldValue = item.fieldValue.split(',') - } - }) - this.$dict.load(this.dictList).then(() => { - // this.pageShow = true + this.$dict.load(this.dictList) + } + + if (item.fieldDataType == 5) { + item.fieldValue = item.fieldValue && item.fieldValue.split(',') + } + + if (item.fieldDataType == 9) { + console.log(item.dictionaryCode) + console.log(this.$dict.getDict(item.dictionaryCode, item.fieldValue)) + } }) } } From de87739c088ceb8be9b5cbbaed51c4245459a8ef Mon Sep 17 00:00:00 2001 From: changjinpeng <185154740@qq.com> Date: Fri, 4 Mar 2022 10:57:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC=E5=9B=9E?= =?UTF-8?q?=E6=98=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppWorkonline/Detail.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue index fc118649..04221485 100644 --- a/src/apps/AppWorkonline/Detail.vue +++ b/src/apps/AppWorkonline/Detail.vue @@ -94,10 +94,16 @@
{{ items.fieldName }} - - - {{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }} - + + + + + {{ $dict.getDict(items.dictionaryCode, items.fieldValue)[$dict.getLabel(items.dictionaryCode, items.fieldValue)].dictName }} + + + {{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }} + + {{ $dict.getLabel(items.dictionaryCode, itemL) }}
@@ -296,11 +302,6 @@ export default { if (item.fieldDataType == 5) { item.fieldValue = item.fieldValue && item.fieldValue.split(',') } - - if (item.fieldDataType == 9) { - console.log(item.dictionaryCode) - console.log(this.$dict.getDict(item.dictionaryCode, item.fieldValue)) - } }) } } From c63659b541cca5c2348035e7e803ba707f26b7f0 Mon Sep 17 00:00:00 2001 From: changjinpeng <185154740@qq.com> Date: Fri, 4 Mar 2022 11:04:11 +0800 Subject: [PATCH 4/9] 27659 --- src/apps/AppWorkonline/Opinion.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue index a4e3d617..274f0a45 100644 --- a/src/apps/AppWorkonline/Opinion.vue +++ b/src/apps/AppWorkonline/Opinion.vue @@ -123,10 +123,7 @@ export default { onShow() { document.title = '审批详情' }, - computed: {}, watch: {}, - onShow() {}, - mounted() {}, methods: { getList() { this.$http From fda78e13d6d114846d5df5619c1d2d464885d43c Mon Sep 17 00:00:00 2001 From: changjinpeng <185154740@qq.com> Date: Fri, 4 Mar 2022 11:21:02 +0800 Subject: [PATCH 5/9] bug --- src/apps/AppWorkonline/Opinion.vue | 52 +++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue index 274f0a45..13126744 100644 --- a/src/apps/AppWorkonline/Opinion.vue +++ b/src/apps/AppWorkonline/Opinion.vue @@ -20,11 +20,22 @@
+
+ + 同意意见: + + +
清空内容
+
+ {{ opinion.length }} + /150 +
+
+
- -
+ + {{ item.fieldName }}: @@ -33,7 +44,7 @@ {{ item.fieldValue && item.fieldValue.length }} /{{ item.fieldLength }}
-
+
--> @@ -305,6 +316,39 @@ export default { } } } + .textarea_msgfont { + position: relative; + height: 400px; + padding: 32px; + background-color: #fff; + + .msgfont { + font-size: 32px; + + .icon { + margin-right: 8px; + color: #ff4466; + } + } + + .textarea { + margin-top: 10px; + } + + .clearns { + color: #1365dd; + } + + .msg_length { + position: absolute; + bottom: 42px; + right: 32px; + + .font { + color: #999; + } + } + } } .reply_files { From c38a6504704be84841e7c97a839fa5b729b186ec Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 4 Mar 2022 11:37:36 +0800 Subject: [PATCH 6/9] 28040 --- src/apps/AppIntegralAudit/AppIntegralAudit.vue | 4 ++++ src/apps/AppVillagersCircle/commentList.vue | 4 ++++ src/apps/AppVillagersCircle/infoList.vue | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index 4eafad9a..f8a32b6e 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -108,6 +108,10 @@ export default { onShow() { document.title = '积分审核' }, + onReachBottom() { + this.current ++ + this.getList() + } } diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/apps/AppVillagersCircle/commentList.vue index 6394c8ad..238feb23 100644 --- a/src/apps/AppVillagersCircle/commentList.vue +++ b/src/apps/AppVillagersCircle/commentList.vue @@ -104,6 +104,10 @@ export default { onShow() { document.title = '发布评论审核' }, + onReachBottom() { + this.current ++, + this.getList() + } } diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/apps/AppVillagersCircle/infoList.vue index 8da6b0cc..cbfdcd81 100644 --- a/src/apps/AppVillagersCircle/infoList.vue +++ b/src/apps/AppVillagersCircle/infoList.vue @@ -100,6 +100,10 @@ export default { onShow() { document.title = '发布信息审核' }, + onReachBottom() { + this.current ++, + this.getList() + } } From 7c47b51399a3e8e858eabfd5d9213e8633764197 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 4 Mar 2022 11:43:25 +0800 Subject: [PATCH 7/9] 28040 --- src/apps/AppIntegralAudit/AppIntegralAudit.vue | 2 +- src/apps/AppVillagersCircle/commentList.vue | 2 +- src/apps/AppVillagersCircle/infoList.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index f8a32b6e..388afa6c 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -82,7 +82,7 @@ export default { } }).then(res => { if(res?.data){ - this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records + this.integralList = this.current > 1 ? res.data.records:[...this.integralList, ...res.data.records] this.$forceUpdate() this.flag = true } diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/apps/AppVillagersCircle/commentList.vue index 238feb23..b7147a90 100644 --- a/src/apps/AppVillagersCircle/commentList.vue +++ b/src/apps/AppVillagersCircle/commentList.vue @@ -92,7 +92,7 @@ export default { } }).then(res=>{ if(res?.data) { - this.data = this.current >1 ? [...this.data, ...this.res.data.records] : res.data.records + this.data = this.current >1 ? res.data.records:[...this.data, ...res.data.records] } }) }, diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/apps/AppVillagersCircle/infoList.vue index cbfdcd81..1c9f0182 100644 --- a/src/apps/AppVillagersCircle/infoList.vue +++ b/src/apps/AppVillagersCircle/infoList.vue @@ -80,7 +80,7 @@ export default { } }).then(res=>{ if(res?.data) { - this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records + this.villagerList = this.current >1 ? res.data.records:[...this.villagerList,...res.data.records] } }) }, From f489d424bd22882bd8e42413cd7587e38d884bf9 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 4 Mar 2022 13:48:14 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppIntegralAudit/AppIntegralAudit.vue | 3 +-- src/apps/AppVillagersCircle/commentList.vue | 4 +--- src/apps/AppVillagersCircle/infoList.vue | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index 388afa6c..0e59b1c5 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -74,8 +74,7 @@ export default { getList() { this.$http.post('/app/appvillagerintegraldeclare/list',null,{ params: { - current: 1, - size: 10, + current: this.current, description : this.keyword, applyIntegralType: this.applyIntegralType, auditType: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : 1 diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/apps/AppVillagersCircle/commentList.vue index b7147a90..4bffe69d 100644 --- a/src/apps/AppVillagersCircle/commentList.vue +++ b/src/apps/AppVillagersCircle/commentList.vue @@ -43,7 +43,6 @@ export default { tabIndex: '', showType: false, content: '', - // typeList: [], current: 1, topic: '', topicType: '', @@ -83,8 +82,7 @@ export default { getList() { this.$http.post('/app/appvillagercirclecomment/list',null,{ params: { - current: 1, - size: 10, + current: this.current, topic:this.topic, content: this.content, auditType: this.tabIndex==0? '': this.tabIndex==1? 0 : 1, diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/apps/AppVillagersCircle/infoList.vue index 1c9f0182..66ef1653 100644 --- a/src/apps/AppVillagersCircle/infoList.vue +++ b/src/apps/AppVillagersCircle/infoList.vue @@ -72,8 +72,7 @@ export default { getList() { this.$http.post('app/appvillagercircleinfo/list',null,{ params: { - current: 1, - size: 10, + current: this.current, auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1, topic: this.topic, content: this.content From cb086431b7bf52354f537b37c6afc32e4ba1439c Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 4 Mar 2022 13:58:56 +0800 Subject: [PATCH 9/9] bug --- src/apps/AppIntegralAudit/AppIntegralAudit.vue | 4 ++-- src/apps/AppVillagersCircle/commentList.vue | 2 +- src/apps/AppVillagersCircle/infoList.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index 0e59b1c5..4c821df0 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -81,7 +81,7 @@ export default { } }).then(res => { if(res?.data){ - this.integralList = this.current > 1 ? res.data.records:[...this.integralList, ...res.data.records] + this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records]:res.data.records this.$forceUpdate() this.flag = true } @@ -108,7 +108,7 @@ export default { document.title = '积分审核' }, onReachBottom() { - this.current ++ + this.current ++, this.getList() } } diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/apps/AppVillagersCircle/commentList.vue index 4bffe69d..24986122 100644 --- a/src/apps/AppVillagersCircle/commentList.vue +++ b/src/apps/AppVillagersCircle/commentList.vue @@ -90,7 +90,7 @@ export default { } }).then(res=>{ if(res?.data) { - this.data = this.current >1 ? res.data.records:[...this.data, ...res.data.records] + this.data = this.current >1 ? [...this.data, ...res.data.records]:res.data.records } }) }, diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/apps/AppVillagersCircle/infoList.vue index 66ef1653..f67bccd8 100644 --- a/src/apps/AppVillagersCircle/infoList.vue +++ b/src/apps/AppVillagersCircle/infoList.vue @@ -79,7 +79,7 @@ export default { } }).then(res=>{ if(res?.data) { - this.villagerList = this.current >1 ? res.data.records:[...this.villagerList,...res.data.records] + this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records]:res.data.records } }) },