From 299995dd09ff4cb6767aa7c32929356834f8e0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 7 Mar 2024 17:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=8C=BB=E9=99=A2=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../institutions/components/HospitalForm.vue  | 11 +++++----
 src/views/system/notice/index.vue             | 24 +++++++++----------
 src/views/trials/trials-workbench/index.vue   | 20 ++++++++--------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/views/dictionary/institutions/components/HospitalForm.vue b/src/views/dictionary/institutions/components/HospitalForm.vue
index 9c5897c7..0452a4f2 100644
--- a/src/views/dictionary/institutions/components/HospitalForm.vue
+++ b/src/views/dictionary/institutions/components/HospitalForm.vue
@@ -8,12 +8,15 @@
     label-width="170px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Hospital CN: " prop="SiteId">
-        <el-select v-model="form.SiteId" style="width: 100%" filterable @change="siteChange">
+      <el-form-item label="Site: ">
+        <el-select v-model="form.SiteId" style="width: 100%" clearable filterable @change="siteChange">
           <el-option v-for="item of siteList" :value="item.Id" :key="item.Id" :label="item.SiteName">
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="Hospital CN: " prop="HospitalNameCN">
+        <el-input v-model="form.HospitalNameCN" />
+      </el-form-item>
       <el-form-item label="Hospital EN: " prop="HospitalName">
         <el-input v-model="form.HospitalName" />
       </el-form-item>
@@ -88,9 +91,7 @@ export default {
       },
       siteList: [],
       rules: {
-        SiteId: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        HospitalName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+        HospitalNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
         UniversityAffiliated: [{ max: 100, message: 'The maximum length is 100' }],
         UniversityAffiliatedCN: [{ max: 100, message: 'The maximum length is 100' }],
         Country: [{ required: true, message: 'Please specify', trigger: 'blur' },
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index cd9e8131..ae7382e2 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -59,56 +59,56 @@
       </el-form>
       <el-table v-loading="loading" v-adaptive="{bottomOffset:45}" height="100" :data="list" class="table">
         <el-table-column type="index" width="50" />
-        <el-table-column :label="$t('system:notice:table:NoticeLevel')" label="通知级别" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeLevel')" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}) ? $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeType')" label="通知类型" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeType')" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}) ? $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeContent')" label="通知内容" prop="NoticeContent" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeContent')" prop="NoticeContent" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeContent }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeState')" label="通知状态" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeState')" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tag :type="scope.row.ActualNoticeStateEnum === 0 ? 'info' : scope.row.ActualNoticeStateEnum === 1 ? 'success' : 'danger'">
               {{ $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}) ? $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}).label : '' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:ApplicableProject')" label="适用项目" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:ApplicableProject')" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}) ? $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" label="适用角色" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeUserTypeList.map(v => v.UserTypeShortName).toString() }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeMode')" label="提示方式" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeMode')" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}) ? $d.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:StartDate')" label="保留时长" prop="StartDate" min-width="240" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:StartDate')" prop="StartDate" min-width="240" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.StartDate }}-{{ scope.row.EndDate }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:PublishUserName')" label="发布人" prop="PublishUserName" min-width="100" show-overflow-tooltip />
-        <el-table-column :label="$t('system:notice:table:PublishedTime')" label="发布时间" prop="PublishedTime" min-width="160" show-overflow-tooltip />
-        <el-table-column :label="$t('system:notice:table:UpdateTime')" label="更新时间" prop="UpdateTime" min-width="160" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:PublishUserName')" prop="PublishUserName" min-width="100" show-overflow-tooltip />
+        <el-table-column :label="$t('system:notice:table:PublishedTime')" prop="PublishedTime" min-width="160" show-overflow-tooltip />
+        <el-table-column :label="$t('system:notice:table:UpdateTime')" prop="UpdateTime" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.StartDate ? scope.row.StartDate: scope.row.CreateTime }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:FileName')" label="附件" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:FileName')" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <a :href="OSSclientConfig.basePath + scope.row.FullFilePath" target="_blank" style="color:#428bca">{{ scope.row.FileName }}</a>
           </template>
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 33f826e9..ed5e1ebf 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -11,9 +11,9 @@
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
             <!-- PM/APM -->
             <!-- 阅片期 -->
-            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
-                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
+<!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
+<!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
             <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
                 <consistencyCheck v-if="activeName === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
@@ -40,13 +40,13 @@
             </el-tab-pane>
             <!-- CRC -->
             <!-- 临床数据录入 -->
-            <el-tab-pane name="clinicalData" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
-                <clinicalData v-if="activeName === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 临床数据确认 -->
-            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
-                <clinicalDataConfirm v-if="activeName === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
+<!--            <el-tab-pane name="clinicalData" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">-->
+<!--                <clinicalData v-if="activeName === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
+<!--            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">-->
+<!--                <clinicalDataConfirm v-if="activeName === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
             <!-- 影像质疑 -->
             <el-tab-pane name="ImageQuestion" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
                 <ImageQuestion v-if="activeName === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />