From bd85918f8df2c94d36e66d36a6c1c08d54e5e143 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 12 Nov 2024 13:59:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E7=97=87=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/curriculumVitae/preview.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 3caa8ea1..53d7d0cc 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -371,6 +371,9 @@
             :label="$t('curriculumVitae:clinicalTrials:table:indication')"
             v-if="true"
           >
+            <template slot-scope="scope">
+              <span>{{ $fd('Indication', scope.row.IndicationEnum) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="VisitReadingCount"

From 1e36464182c0b971e4a6aa113a278f00a57c48c4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 12 Nov 2024 14:02:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/email/components/EmailForm.vue   |  10 +-
 .../template/email/components/EmailList.vue   | 102 +++++++++++++++---
 2 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/src/views/dictionary/template/email/components/EmailForm.vue b/src/views/dictionary/template/email/components/EmailForm.vue
index aae9502d..dca729b3 100644
--- a/src/views/dictionary/template/email/components/EmailForm.vue
+++ b/src/views/dictionary/template/email/components/EmailForm.vue
@@ -151,7 +151,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="systemLevel">
         <el-form-item label="是否区分标准" prop="IsDistinguishCriteria">
           <el-radio-group
             v-model="form.IsDistinguishCriteria"
@@ -310,6 +310,12 @@ export default {
         return 0
       },
     },
+    isDistinguishCriteria: {
+      type: Boolean,
+      default() {
+        return false
+      },
+    },
   },
   components: { vcrontab },
   data() {
@@ -391,6 +397,8 @@ export default {
       this.form.EmailUrgentEnum = 3
       this.form.IsReturnRequired = false
       this.form.IsDistinguishCriteria = false
+    } else {
+      this.form.IsDistinguishCriteria = this.isDistinguishCriteria
     }
   },
   methods: {
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index f03a4a25..fe3ca77d 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -1,13 +1,8 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form
-        v-if="!systemLevel"
-        :inline="true"
-        size="mini"
-        class="base-search-form"
-      >
-        <el-form-item label="是否需要回执:">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item label="是否需要回执:" v-if="!systemLevel">
           <el-select
             v-model="searchData.IsReturnRequired"
             clearable
@@ -21,7 +16,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否加急:">
+        <el-form-item label="是否加急:" v-if="!systemLevel">
           <el-select
             v-model="searchData.IsUrgent"
             clearable
@@ -35,7 +30,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否启用:">
+        <el-form-item label="是否启用:" v-if="!systemLevel">
           <el-select
             v-model="searchData.IsEnable"
             clearable
@@ -51,7 +46,7 @@
         </el-form-item>
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
-          v-if="isDistinguishCriteria"
+          v-if="isDistinguishCriteria && !systemLevel"
         >
           <el-select
             v-model="searchData.CriterionTypeEnum"
@@ -66,6 +61,67 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('trials:emailManageCfg:form:BusinessModule')">
+          <el-select
+            v-model="searchData.BusinessModuleEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.BusinessModule"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:emailManageCfg:form:BusinessScenario')"
+        >
+          <el-select
+            v-model="searchData.BusinessScenarioEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('trials:emailManageCfg:form:ToUserType')">
+          <el-select
+            v-model="searchData.ToUserType"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of UserTypeList"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:emailManageCfg:form:EmailUrgent')"
+          v-if="systemLevel === 1"
+        >
+          <el-select
+            v-model="searchData.EmailUrgentEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.EmailUrgent"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleSearch">查询</el-button>
           <el-button type="primary" @click="handleReset">重置</el-button>
@@ -164,13 +220,12 @@
           {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
         </template>
       </el-table-column>
-      <!-- 收件人 -->
+      <!-- 收件人v-if="systemLevel !== 1" -->
       <el-table-column
         prop="ToUserTypeList"
         :label="$t('trials:emailManageCfg:title:toUserTypeList')"
         show-overflow-tooltip
         min-width="100"
-        v-if="systemLevel !== 1"
       >
         <template slot-scope="scope">
           {{
@@ -182,13 +237,12 @@
           }}
         </template>
       </el-table-column>
-      <!-- 抄送人 -->
+      <!-- 抄送人v-if="!systemLevel" -->
       <el-table-column
         prop="CopyUserTypeList"
         :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
         show-overflow-tooltip
         min-width="100"
-        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           {{
@@ -200,25 +254,25 @@
           }}
         </template>
       </el-table-column>
+      <!---v-if="!systemLevel"-->
       <el-table-column
         prop="EmailUrgentEnum"
         label="加急状态"
         sortable="custom"
         show-overflow-tooltip
         min-width="100"
-        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
+      <!---v-if="!systemLevel"-->
       <el-table-column
         prop="EmailCron"
         label="发送周期和时间"
         sortable="custom"
         show-overflow-tooltip
         min-width="160"
-        v-if="!systemLevel"
       />
       <!-- 附件 -->
       <el-table-column
@@ -341,6 +395,7 @@
       <EmailForm
         :data="rowData"
         :system-level="systemLevel"
+        :isDistinguishCriteria="isDistinguishCriteria"
         @closeDialog="closeDialog"
         @getList="getList"
         @PreviewHTML="preview"
@@ -392,6 +447,10 @@ const searchDataDefault = () => {
     IsUrgent: '',
     IsEnable: '',
     CriterionTypeEnum: null,
+    BusinessModuleEnum: null,
+    BusinessScenarioEnum: null,
+    EmailUrgentEnum: null,
+    ToUserType: null,
     PageIndex: 1,
     PageSize: 20,
     SortField: 'Code',
@@ -430,6 +489,17 @@ export default {
       previewHTML: null,
     }
   },
+  computed: {
+    UserTypeList() {
+      if (this.systemLevel === 1) {
+        return this.$d.UserType
+      } else {
+        return this.$d.UserType.filter(
+          (item) => ![7, 31, 32, 21, 26, 27].includes(item.value)
+        )
+      }
+    },
+  },
   mounted() {
     this.getList()
   },

From ede1455bc452179fb0f90bbcd60d17c782edbcd9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 12 Nov 2024 14:18:00 +0800
Subject: [PATCH 3/4] 1

---
 src/views/reviewers/components/EducationTraining.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue
index 4b69dd96..1892096b 100644
--- a/src/views/reviewers/components/EducationTraining.vue
+++ b/src/views/reviewers/components/EducationTraining.vue
@@ -216,11 +216,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{
-            !isEN
-              ? `${scope.row.Hospital} / ${scope.row.HospitalCN}`
-              : scope.row.Hospital
-          }}
+          {{ !isEN ? scope.row.HospitalCN : scope.row.Hospital }}
         </template>
       </el-table-column>
       <el-table-column

From f34faa7db36e7c65602150986010a02fb21e2162 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 12 Nov 2024 14:59:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AE=80=E5=8E=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

---
 src/views/reviewers/components/TrialExperience.vue            | 2 +-
 .../curriculumVitae/components/info/clinicalTrials.vue        | 4 +++-
 .../curriculumVitae/components/info/continuingTraining.vue    | 2 +-
 .../curriculumVitae/components/info/educationalExperience.vue | 2 +-
 .../reviewers/curriculumVitae/components/info/holiday.vue     | 2 +-
 src/views/reviewers/curriculumVitae/preview.vue               | 4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index f3701d58..0575e077 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -57,7 +57,7 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.StartTime"
-              >{{ scope.row.StartTime.split('-')[0] }}-{{
+              >{{ scope.row.StartTime.split('-')[0] }} ~ {{
                 scope.row.EndTime ? scope.row.EndTime.split('-')[0] : '至今'
               }}</span
             >
diff --git a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
index d5a2220c..fea28d75 100644
--- a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
@@ -69,7 +69,9 @@
         <template slot-scope="scope">
           <span v-if="scope.row.StartTime"
             >{{ scope.row.StartTime.split('-')[0] }}-{{
-              scope.row.EndTime ? scope.row.EndTime.split('-')[0] : ''
+              scope.row.EndTime
+                ? scope.row.EndTime.split('-')[0]
+                : $t('curriculumVitae:lineIIcon:soFar')
             }}</span
           >
         </template>
diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
index 72941201..1ad1192a 100644
--- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
@@ -22,7 +22,7 @@
         :label="$t('curriculumVitae:continuingTraining:table:time')"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.BeginDateStr }}-{{ scope.row.EndDateStr }}</span>
+          <span>{{ scope.row.BeginDateStr }} ~ {{ scope.row.EndDateStr }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
index 73f3940a..cca64618 100644
--- a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
@@ -22,7 +22,7 @@
         :label="$t('curriculumVitae:EducationalExperience:table:time')"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.BeginDateStr }}-{{ scope.row.EndDateStr }}</span>
+          <span>{{ scope.row.BeginDateStr }} ~ {{ scope.row.EndDateStr }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/reviewers/curriculumVitae/components/info/holiday.vue b/src/views/reviewers/curriculumVitae/components/info/holiday.vue
index 53d7744b..d6e23e5e 100644
--- a/src/views/reviewers/curriculumVitae/components/info/holiday.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/holiday.vue
@@ -111,7 +111,7 @@ export default {
       this.$emit('update:visible', false)
     },
     handleAddHoliday() {
-      if (this.daterange) {
+      if (this.daterange && this.daterange.length > 0) {
         const param = {
           DoctorId: this.reviewerId,
           StartDate: this.daterange[0],
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 53d7d0cc..7519147e 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -389,7 +389,9 @@
             <template slot-scope="scope">
               <span v-if="scope.row.StartTime"
                 >{{ scope.row.StartTime.split('-')[0] }}-{{
-                  scope.row.EndTime ? scope.row.EndTime.split('-')[0] : ''
+                  scope.row.EndTime
+                    ? scope.row.EndTime.split('-')[0]
+                    : $t('curriculumVitae:lineIIcon:soFar')
                 }}</span
               >
             </template>