From ff0ddeea9a9853225709b45f5290546e24d449be Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 15:58:45 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/medical-feedback/components/ChatForm.vue        | 4 ++--
 .../reading/mim-medical-audit/components/ChatForm.vue       | 4 ++--
 .../reading/mim-medical-audit/components/Conclusions.vue    | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5a8c2668..ccf2b913 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,8 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt)">
+                <div v-if="record.MedicalDialogCloseEnum!== null">{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
 
               </template>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index b2012239..58a8f22f 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,8 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt)">
+                <div v-if="record.MedicalDialogCloseEnum!== null">{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
 
               </template>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 899e1396..81c9d179 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -260,7 +260,11 @@ export default {
       if (Object.keys(this.medicalReviewInfo).length > 0) {
         for (const k in this.form) {
           if (this.medicalReviewInfo.hasOwnProperty(k)) {
-            this.form[k] = this.medicalReviewInfo[k];
+            if (k === 'IsHaveQuestion' && this.medicalReviewInfo.AuditState === 0) {
+              this.form[k] = null
+            } else {
+              this.form[k] = this.medicalReviewInfo[k]
+            }
           }
         }
         this.fileList = [];

From efe3d937b4dbbe38db0aa49949970ac586096f67 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:16:23 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/medical-feedback/components/ChatForm.vue       | 7 +++----
 .../reading/mim-medical-audit/components/ChatForm.vue      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index ccf2b913..3907976a 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,9 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt)">
-                <div v-if="record.MedicalDialogCloseEnum!== null">{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-                <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
 
               </template>
               <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
@@ -60,7 +59,7 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
                 <div>{{ record.Content }}</div>
               </template>
 
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 58a8f22f..7e4f6b7b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,9 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt)">
-                <div v-if="record.MedicalDialogCloseEnum!== null">{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-                <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
 
               </template>
               <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
@@ -60,7 +59,7 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 

From e0f42e815ebf71eee91366c02da36d3556ffe09b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:26:03 +0800
Subject: [PATCH 03/12] 1

---
 .../medical-feedback/components/ChatForm.vue       | 14 +++++++-------
 .../mim-medical-audit/components/ChatForm.vue      | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 3907976a..5abce1aa 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,12 +11,9 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-
-              </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
+                  111
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
                   <ol style="font-weight: bold;">
@@ -59,11 +56,14 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              </template>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
+              <template v-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 7e4f6b7b..bb717a57 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,11 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-
-              </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
+              
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
@@ -59,11 +56,14 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              </template>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
+              <template v-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>

From d04898dc28f2381ab3f8bb42cbec06631954d2a7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:38:16 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/UserInfo.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 557113f6..6e1761c5 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -73,7 +73,8 @@
       </el-form-item>
       <el-form-item
         :label="$t('system:userlist:table:UserType')"
-        prop="UserTypeId"
+        prop="Roles"
+        v-if="type === 0"
       >
         <div style="display: flex; align-items: center">
           <el-select
@@ -85,7 +86,6 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
-            v-if="type === 0"
           >
             <template v-for="userType of userTypeOptions">
               <el-option
@@ -96,6 +96,14 @@
               />
             </template>
           </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item
+        :label="$t('system:userlist:table:UserType')"
+        prop="userTypeId"
+        v-else
+      >
+        <div style="display: flex; align-items: center">
           <el-select
             ref="userType"
             v-model="Roles"
@@ -105,7 +113,6 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
-            v-else
           >
             <template v-for="userType of userTypeOptions">
               <el-option

From 9d362e13de220c0b65c503e712bbc22a71e03cd8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:38:52 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A7=92=E8=89=B2=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E6=97=B6=E8=87=AA=E5=8A=A8=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue                  | 12 ++++++++++++
 src/views/trials/trials-myinfo/account.vue |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 21f33813..7a353d14 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -510,6 +510,18 @@ export default {
         this.loginByRole(this.$store.state.user.roles[0].Id)
         return
       }
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
+          .length ===
+          this.$store.state.user.roles.length - 1
+      ) {
+        let role = this.$store.state.user.roles.find(
+          (item) => !item.IsUserRoleDisabled
+        )
+        this.loginByRole(role.Id)
+        return
+      }
       return (this.toggleRoleVisible = true)
     },
     cancel() {
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index feb9161b..35244193 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -119,7 +119,7 @@
               v-for="item in roles"
               :key="item.Id"
               :label="item.Id"
-              :disabled="item.isUserRoleDisabled"
+              :disabled="item.IsUserRoleDisabled"
               style="margin-bottom: 10px"
             >
               {{ item.UserTypeShortName }}
@@ -210,6 +210,7 @@ export default {
   },
   computed: {
     roles() {
+      console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
       return this.$store.state.user.roles
     },
     hasRole() {

From e56440634ef5ae83c61738c6ee1e76f131ecc2b7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:47:19 +0800
Subject: [PATCH 06/12] 1

---
 src/views/trials/trials-myinfo/account.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 35244193..3bbfe432 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -210,7 +210,6 @@ export default {
   },
   computed: {
     roles() {
-      console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
       return this.$store.state.user.roles
     },
     hasRole() {

From 79caed3fd9d8dd8a06303316d282d26886d6a6b9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:49:02 +0800
Subject: [PATCH 07/12] 1

---
 .../reading/medical-feedback/components/ChatForm.vue             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5abce1aa..8a9acda4 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -13,7 +13,6 @@
             <div class="info-content">
               <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
-                  111
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
                   <ol style="font-weight: bold;">

From e3f6f9107d62d5779a5f0d87bddf8ff7e107f485 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 17:12:33 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=8F=AF=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=80=89=E9=A1=B9=E4=B8=8D=E8=B6=B3=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-layout/components/trialsNavbar.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index c5c47cc9..004aa805 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -146,7 +146,11 @@ export default {
       return this.$store.state.user.roles
     },
     hasRole() {
-      return this.roles && this.roles.length > 1
+      return (
+        this.roles &&
+        this.roles.length > 1 &&
+        this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
+      )
     },
   },
   watch: {

From b209c6566b509e294dcf1b6457e4dc544bd0dc85 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 09:48:25 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BC=B9=E6=A1=86=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/personnel-manage/components/staffExternalForm.vue   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d1fe8dbd..18dc25d1 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -24,6 +24,7 @@
         <el-button
           size="mini"
           type="primary"
+          style="margin-right: 10px"
           icon="el-icon-refresh-left"
           @click="handleReset"
         >
@@ -491,6 +492,7 @@ export default {
 .participant-container {
   height: 100%;
   .el-header {
+    padding-right: 5px;
     .filter-container {
       display: flex;
       align-items: center;

From 6e66dd8bbe3e712fdb90f9c6e5b5d9b803acabbc Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 22 Jan 2025 09:48:28 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/configList.vue                 | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
index 933452c2..edf6b235 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -22,12 +22,15 @@
       <el-table-column 
         v-for="item in exportInfo.DicList"
         :key="item.Code" 
-        :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
+        :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+        
+      >
         <template v-slot="scope">
           <el-checkbox
             @change="() => changeState(scope, item.Code)"
             :checked="getCheckState(scope, item.Code)"
             :disabled="getDisabledState(scope.row, item)"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-checkbox>
         </template>
@@ -43,6 +46,7 @@
             v-model="scope.row.CDISCCode"
             size="mini"
             :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
         </template>
@@ -91,29 +95,7 @@ export default {
     async submit() {
       this.loading = true
       try {
-        let params= {
-          questionList: [],
-          tableQuestionList: []
-        }
-        params.questionList = this.exportInfo.QuestionList.map(i => {
-          return {
-            questionId: i.QuestionId,
-            tableQuestionId: i.TableQuestionId,
-            exportResult: i.ExportResult,
-            CDISCCode: i.CDISCCode
-          }
-        })
-        this.exportInfo.QuestionList.forEach(i => {
-          let childlist = i.Children.map(k => {
-            return {
-              questionId: i.QuestionId,
-              tableQuestionId: k.TableQuestionId,
-              exportResult: k.ExportResult,
-              CDISCCode: k.CDISCCode
-            }
-          })
-          params.tableQuestionList = params.tableQuestionList.concat(childlist)
-        })
+        let params = this.filterQuestions(this.exportInfo.QuestionList)
         let res = await setTrialQuestionExportResult(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -124,6 +106,36 @@ export default {
         console.log(e)
       }
     },
+    filterQuestions(arr) {
+      let params= {
+        questionList: [],
+        tableQuestionList: []
+      }
+      for (let i of arr) {
+        if (!i.IsGroup && !i.IsTableQuestion) {
+          params.questionList.push({
+            questionId: i.QuestionId,
+            tableQuestionId: i.TableQuestionId,
+            exportResult: i.ExportResult,
+            CDISCCode: i.CDISCCode
+          })
+        }
+        if (i.TableQuestionId) {
+          params.tableQuestionList.push({
+            questionId: i.QuestionId,
+            tableQuestionId: i.TableQuestionId,
+            exportResult: i.ExportResult,
+            CDISCCode: i.CDISCCode
+          })
+        }
+        if (i.Children && i.Children.length > 0) {
+            const childResults = this.filterQuestions(i.Children)
+            params.questionList = params.questionList.concat(childResults.questionList)
+            params.tableQuestionList = params.tableQuestionList.concat(childResults.tableQuestionList)
+        }
+      }
+      return params;
+    },
     // 获取状态
     getCheckState(item, code) {
       return item.row.ExportResult.indexOf(code) > -1

From 21c96300ad8d6a3f921bc9cf9741e5db341ea4ba Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 10:21:32 +0800
Subject: [PATCH 11/12] 1

---
 src/components/BaseForm/search-form.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 101e399b..f1f99380 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/src/components/BaseForm/search-form.vue
@@ -13,6 +13,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           :readonly="item.readonly"
         />
@@ -22,6 +23,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -37,6 +39,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -96,6 +99,7 @@
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           :picker-options="item.pickerOption"
+          clearable
         />
         <!-- 时间 -->
         <el-time-select
@@ -104,6 +108,7 @@
           :placeholder="item.placeholder"
           type=""
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间 -->
         <el-date-picker
@@ -114,6 +119,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           :disabled="item.disable && item.disable(searchData[item.prop])"
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间段 -->
         <el-date-picker

From 7b3fe4265483177fc70f929bd09cac4fc82bb995 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 15:27:20 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/noticeMarquee.vue              |   2 +
 src/views/trials/trials-notice/index.vue      | 100 ++++++++++++------
 .../components/needSignSysDoc.vue             |   4 +-
 .../components/needSignedSysDoc.vue           |   4 +-
 4 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 4b54f77b..336504f7 100644
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@@ -71,6 +71,8 @@ export default {
 <style lang="scss" scoped>
 .notice-marquee_wrapper{
   width: 100%;
+  display: flex;
+  align-items: center;
   /deep/ .el-dialog__header{
     padding: 10px;
   }
diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue
index 966e17e6..a733e44d 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -17,7 +17,7 @@
         <el-form-item :label="$t('trials:notice:table:notificationContent')">
           <el-input
             v-model="searchData.NoticeContent"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -36,7 +36,11 @@
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
@@ -44,7 +48,7 @@
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="loading"
         :data="list"
         stripe
@@ -79,7 +83,15 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag :type="scope.row.ActualNoticeStateEnum === 0 ? 'info' : scope.row.ActualNoticeStateEnum === 1 ? 'success' : 'error'">
+            <el-tag
+              :type="
+                scope.row.ActualNoticeStateEnum === 0
+                  ? 'info'
+                  : scope.row.ActualNoticeStateEnum === 1
+                  ? 'success'
+                  : 'error'
+              "
+            >
               {{ $fd('NoticeState', scope.row.ActualNoticeStateEnum) }}
             </el-tag>
           </template>
@@ -113,7 +125,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <a :href="OSSclientConfig.basePath + scope.row.Path" target="_blank" style="color:#428bca">{{ scope.row.FileName }}</a>
+            <a
+              :href="OSSclientConfig.basePath + scope.row.Path"
+              target="_blank"
+              style="color: #428bca"
+              >{{ scope.row.FileName }}</a
+            >
           </template>
         </el-table-column>
         <el-table-column
@@ -124,11 +141,19 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsRead">{{ $fd('YesOrNo', scope.row.IsRead) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsRead) }}</el-tag>
+            <el-tag v-if="scope.row.IsRead">{{
+              $fd('YesOrNo', scope.row.IsRead)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd('YesOrNo', scope.row.IsRead)
+            }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
+        <el-table-column
+          :label="$t('common:action:action')"
+          min-width="100"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <el-button
               circle
@@ -136,12 +161,17 @@
               icon="el-icon-info"
               @click="showDetail(scope.row)"
             />
-
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
   </BaseContainer>
 </template>
@@ -157,9 +187,10 @@ const searchDataDefault = () => {
     ApplicableProjectEnum: null,
     NoticeModeEnum: null,
     NoticeStateEnum: null,
-    Asc: true,
+    Asc: false,
+    SortField: 'PublishedTime',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
@@ -171,7 +202,7 @@ export default {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -180,17 +211,21 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      getUserSystemNoticeList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      getUserSystemNoticeList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     showDetail(row) {
       var currentNoticeType = this.$fd('NoteType', row.NoticeTypeEnum)
       if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
         this.$alert(row.NoticeContent, currentNoticeType, {
-          showConfirmButton: false
+          showConfirmButton: false,
         })
       } else {
         const h = this.$createElement
@@ -200,18 +235,22 @@ export default {
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
               instance.confirmButtonLoading = true
-              setSystemNoticeHaveRead(row.Id).then(async res => {
-                if (res.IsSuccess) {
-                  await this.$store.dispatch('global/getNoticeList')
-                  this.getList()
-                }
-                instance.confirmButtonLoading = false
-                done()
-              }).catch(() => { instance.confirmButtonLoading = false })
+              setSystemNoticeHaveRead(row.Id)
+                .then(async (res) => {
+                  if (res.IsSuccess) {
+                    await this.$store.dispatch('global/getNoticeList')
+                    this.getList()
+                  }
+                  instance.confirmButtonLoading = false
+                  done()
+                })
+                .catch(() => {
+                  instance.confirmButtonLoading = false
+                })
             } else {
               done()
             }
-          }
+          },
         })
       }
     },
@@ -237,10 +276,9 @@ export default {
       this.searchData.SortField = column.prop
       this.searchData.PageIndex = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-
 </style>
diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index ce8a7d16..1f97a933 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -59,7 +59,7 @@
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        prop="CreateTime"
         show-overflow-tooltip
         sortable="custom"
       />
@@ -168,7 +168,7 @@ const searchDataDefault = () => {
     pageIndex: 1,
     pageSize: 20,
     asc: false,
-    sortField: 'UpdateTime',
+    sortField: 'CreateTime',
   }
 }
 export default {
diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
index c5dd013f..e26c7553 100644
--- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@@ -38,7 +38,7 @@
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        prop="CreateTime"
         show-overflow-tooltip
         sortable="custom"
       />
@@ -130,7 +130,7 @@ const searchDataDefault = () => {
     pageIndex: 1,
     pageSize: 20,
     asc: false,
-    sortField: 'UpdateTime'
+    sortField: 'CreateTime'
   }
 }
 export default {