Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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()

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"
           />
         </div>
@@ -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)
       )
     },
   },

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() {