From b0529dca5f1921be3b5d33f889d5d627175753bb Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 6 Jan 2025 13:19:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF=E6=97=B6=EF=BC=8C=E6=94=B6?= =?UTF-8?q?=E4=BB=B6=E4=BA=BA=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E5=8E=BB?= =?UTF-8?q?=E9=99=A4RC=E5=92=8Cadmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/email-manage/components/DefaultQS.vue | 13 ++++++------- .../setting/email-manage/components/EmailList.vue | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue b/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue index 10ad9201..25f3581d 100644 --- a/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue +++ b/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue @@ -396,6 +396,12 @@ export default { return false }, }, + UserTypeList: { + type: Array, + default() { + return [] + }, + }, }, data() { return { @@ -407,13 +413,6 @@ export default { total: 0, } }, - computed: { - UserTypeList() { - return this.$d.UserType.filter( - (item) => ![7, 31, 32, 21, 26, 27].includes(item.value) - ) - }, - }, mounted() { this.trialId = this.$route.query.trialId this.getList() diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue index 72288af2..5e879517 100644 --- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue +++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue @@ -358,6 +358,7 @@ @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" :isShow="isBtnShow" + :UserTypeList="UserTypeList" @close="addVisible = false" /> @@ -423,7 +424,7 @@ export default { computed: { UserTypeList() { return this.$d.UserType.filter( - (item) => ![7, 8, 31, 32, 21, 26, 27].includes(item.value) + (item) => ![4, 7, 8, 31, 32, 21, 26, 27].includes(item.value) ) }, }, From af42a3aec0bcc72a3262b2302203a7c2bbc25f0c Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 6 Jan 2025 13:49:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=AD=BE=E7=BD=B2=E5=90=8E=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=9C=AA=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-workbench/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue index 1f8e6886..c51d9b0e 100644 --- a/src/views/trials/trials-workbench/index.vue +++ b/src/views/trials/trials-workbench/index.vue @@ -522,7 +522,7 @@ export default { }) }, refreshSysData(){ - --this.tabList.SysWaitSignDocCount + this.tabList.SysWaitSignDocCount = this.tabList.SysWaitSignDocCount - 1 store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount) }, getUserTobeDoneRecord() {