From caf6efa0259a8e52a56024f98acb1c63cb922dc5 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 10:11:58 +0800 Subject: [PATCH 01/13] 30701 --- .../saas/AppCooperationPropaganda/AppCooperationPropaganda.vue | 2 +- .../saas/AppPropagandaStatistics/AppPropagandaStatistics.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index 1f7ca630..67aaea16 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -162,7 +162,7 @@ export default { }, }, onShow() { - document.title = '群发居民群' + document.title = '协同宣发' this.$dict.load(['mstStatus']).then(() => { this.list = [] this.current = 1 diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index f183dcbb..7104915f 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -566,7 +566,7 @@ export default { }) this.getColumnarEcharts(xData, yData) }) - },1000) + }, 2000) } } }); From 63affdbf6454acddfb9082276a4f4f2701edcb8e Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 10:23:58 +0800 Subject: [PATCH 02/13] createUserDept --- .../AppCooperationPropaganda/AppCooperationPropaganda.vue | 4 ++-- src/project/saas/AppCooperationPropaganda/detail.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index 67aaea16..aaf1cd3e 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -19,8 +19,8 @@
共需{{ item.groupOwnerCount || 0 }}名成员完成群发，目前已完成{{ item.completionRate || 0 }}%
创建部门： - - + / +
diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index bec83d54..b8b02808 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -16,14 +16,14 @@
审批人 - + 、
所在部门 - -
+
/
+
From 3ba504f2a9f8bef053656a0c9f7e4d62e06c2973 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 10:44:20 +0800 Subject: [PATCH 03/13] 30705 --- .../AppCooperationPropaganda/AppCooperationPropaganda.vue | 2 +- src/project/saas/AppCooperationPropaganda/detail.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index aaf1cd3e..aed38e9a 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -19,7 +19,7 @@
共需{{ item.groupOwnerCount || 0 }}名成员完成群发，目前已完成{{ item.completionRate || 0 }}%
创建部门： - / +
diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index b8b02808..0c5128bf 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -22,7 +22,7 @@
所在部门 -
/
+
@@ -39,7 +39,8 @@
群发范围 - 按条件筛选的全部{{ data.receiveGroupCount || 0}}个客户群 + 全部{{ data.receiveGroupCount || 0}}个居民群 + 按条件筛选的{{ data.receiveGroupCount || 0}}个居民群

群发内容

From 670c7b9d92783f1c83ee5e9e3137d9f09ab1d5b1 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 10:47:14 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E9=A1=BF=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 0c5128bf..d8d32caa 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -16,7 +16,7 @@
审批人 - 、 + 、
From 54e10d515165cf215cdf03e5589240bd40025620 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 11:25:31 +0800 Subject: [PATCH 05/13] bug121025 --- .../cooperationDetail.vue | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index e730756d..670e0ce6 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -17,9 +17,10 @@
-
{{ detail.taskTitle }}
+
{{ detail.taskTitle }} {{ $dict.getLabel('mstStatus', detail.status) }}
- 创建时间: {{ createTime }} + 创建时间: {{ createTime }}
查看详情
@@ -344,6 +345,7 @@ export default { }, onShow() { document.title = "群发居民群统计"; + this.$dict.load("mstStatus") this.getStatistics(); this.getDetail(); }, @@ -397,7 +399,7 @@ export default { } .header { - height: 160px; + // height: 160px; padding: 32px; box-sizing: border-box; background: #fff; @@ -410,6 +412,37 @@ export default { font-size: 32px; font-weight: 600; margin-bottom: 10px; + + span { + display: inline-block; + padding: 0 8px; + border: 1px solid; + border-radius: 6px; + font-size: 26px; + font-weight: normal; + margin-left: 8px; + } + .status0 { + color: #FFA938 !important; + } + .status1 { + color: #FF6758 !important; + } + .status2 { + color: #3399FF !important; + } + .status3 { + color: #FF6758 !important; + } + .status4 { + color: #3399FF !important; + } + .status5 { + color: #1CCEB0 !important; + } + .status6 { + color: #666666 !important; + } } div:last-child { color: #666666; From c883513c673e0d0757d19c163c7c1a100754596a Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 11:36:39 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8B=92=E7=BB=9D?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index d8d32caa..63329b6d 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -121,7 +121,7 @@ export default { this.webpage = res.data.contents.filter(v=> v.msgType == 4) this.miniapp = res.data.contents.filter(v=> v.msgType == 5) if(res.data.status==1) { // 拒绝 - this.approver = res.data.examines.filter(e=> e.examineUserId == user.openId) + this.approver = res.data.examines.filter(e=> e.examineUserId == this.user.openId) } else { // 通过 this.approver = res.data.examines } From 4a7627586fd69d2d381ed73ae21e8fc3ef694a6c Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 11:49:23 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=8A=A0?= =?UTF-8?q?=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 63329b6d..872d2048 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -16,7 +16,9 @@
审批人 - 、 + + 、 +
From 85dcbb20aef89fffd8e0674e66ef77710551305b Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 11:59:05 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 872d2048..42b0cae3 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -17,7 +17,7 @@ 审批人 - 、 + 、
From 3a69146e95525e738a61cd840ac6463f4ddd4448 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 14:08:03 +0800 Subject: [PATCH 09/13] 30705 30713 --- src/project/saas/AppCooperationPropaganda/detail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 42b0cae3..d854dc4d 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -16,7 +16,7 @@
审批人 - + 、 @@ -41,8 +41,8 @@
群发范围 - 全部{{ data.receiveGroupCount || 0}}个居民群 - 按条件筛选的{{ data.receiveGroupCount || 0}}个居民群 + 全部{{ data.receiveGroupCount || 0}}个居民群 + 按条件筛选的{{ data.receiveGroupCount || 0}}个居民群

群发内容

@@ -81,7 +81,7 @@
-
拒绝通过
+
审核拒绝
审核通过
From c99344dd3687cb8be19f0c076ad62e983fd375df Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 14:08:56 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index d854dc4d..62d8f83c 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -42,7 +42,7 @@
群发范围 全部{{ data.receiveGroupCount || 0}}个居民群 - 按条件筛选的{{ data.receiveGroupCount || 0}}个居民群 + 按条件筛选的{{ data.receiveGroupCount || 0}}个居民群

群发内容

From f83fdf92c02b4ff602b2ce356aed17b388b43e31 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 14:55:05 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 62d8f83c..cc8c1429 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -17,7 +17,7 @@ 审批人 - 、 + 、
From 1bcd7406cd85ba6cf29e0c6e98b147feec205084 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 14:57:10 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=8A=A0=E9=A1=BF=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index cc8c1429..60559a3e 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -17,7 +17,7 @@ 审批人 - 、 + 、
From e502506a99118dcba07d74a0211dd75b93f80bdd Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 1 Aug 2022 16:08:20 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8B=92=E7=BB=9Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/saas/AppCooperationPropaganda/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 60559a3e..09e70f6a 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -123,7 +123,7 @@ export default { this.webpage = res.data.contents.filter(v=> v.msgType == 4) this.miniapp = res.data.contents.filter(v=> v.msgType == 5) if(res.data.status==1) { // 拒绝 - this.approver = res.data.examines.filter(e=> e.examineUserId == this.user.openId) + this.approver = res.data.examines.filter(e=> e.examineStatus == 2) } else { // 通过 this.approver = res.data.examines }