病灶对齐逻辑更改

# Conflicts:
#	src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
#	src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

.env.prop

@@ -2,6 +2,9 @@
 ENV = 'prop'
 NODE_ENV = 'prop'
 
+# base public path
+VUE_APP_BASE_PATH = '/'
+
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 

.svn/pristine/a5/a510475a0912f21efb3b36f41ecdfc3f783e4b6d.svn-base

@@ -10516,7 +10516,7 @@ class BaseViewer {
 
     const pageNumber = this._currentPageNumber,
           state = this.#scrollModePageState,
-          viewer = this.viewer;
+          viewmr = this.viewer;
     viewer.textContent = "";
     state.pages.length = 0;
 

src/App.vue

@@ -29,7 +29,7 @@
       direction="rtl"
       size="80%"
     >
-      <div style="width: 620px">
+      <div style="width: 800px">
         <el-form
           label-width="100px"
           @submit.native.prevent
@@ -62,12 +62,14 @@
         v-adaptive="{ bottomOffset: 50 }"
         height="100"
         style="width: 100%"
+        @sort-change="handleSortByColumn"
       >
         <el-table-column
           prop="Code"
           :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
+          sortable="custom"
         >
         </el-table-column>
         <!--        <el-table-column-->
@@ -79,7 +81,11 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" :label="$t('il8n:table:en')">
+        <el-table-column
+          prop="Value"
+          :label="$t('il8n:table:en')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -92,7 +98,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:cn')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -105,7 +115,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.State"
@@ -122,7 +136,11 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="Version" :label="$t('il8n:table:Version')">
+        <el-table-column
+          prop="Version"
+          :label="$t('il8n:table:Version')"
+          sortable="custom"
+        >
         </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
@@ -195,6 +213,18 @@ export default {
   //   },
   // },
   methods: {
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.tableData.sort((a, b) =>
+          a[column.prop].localeCompare(b[column.prop])
+        )
+      } else {
+        this.tableData.sort((a, b) =>
+          b[column.prop].localeCompare(a[column.prop])
+        )
+      }
+    },
     handleStateChange() {
       this.tableData.forEach((item) => {
         item.State = this.State
@@ -209,9 +239,12 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
+              (v.Code &&
+                ~v.Code.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.Value &&
+                ~v.Value.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.ValueCN &&
+                ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase()))
           )
         )
       } else {

src/api/admin.js

@@ -342,3 +342,11 @@ export function addNewUserSendEmail(data) {
     data
   })
 }
+// 用户追溯
+export function getUserJoinedTrialList(data) {
+  return request({
+    url: `/TrialMaintenance/getUserJoinedTrialList`,
+    method: 'post',
+    data
+  })
+}

src/api/dictionary.js

@@ -212,7 +212,20 @@ export function getSystemDocumentList(param) {
     data: param
   })
 }
-
+export function publishSystemDocument(param) {
+  return request({
+    url: `/SystemDocument/publishSystemDocument`,
+    method: 'post',
+    data: param
+  })
+}
+export function outLineSystemDocument(param) {
+  return request({
+    url: `/SystemDocument/outLineSystemDocument`,
+    method: 'post',
+    data: param
+  })
+}
 export function addOrUpdateSystemDocument(param) {
   return request({
     url: `/SystemDocument/addOrUpdateSystemDocument`,
@@ -220,6 +233,29 @@ export function addOrUpdateSystemDocument(param) {
     data: param
   })
 }
+// 新增/修改通用培训附件
+export function addOrUpdateSystemDocumentAttachment(param) {
+  return request({
+    url: `/SystemDocument/addOrUpdateSystemDocumentAttachment`,
+    method: 'post',
+    data: param
+  })
+}
+// 通用培训附件列表
+export function getSystemDocumentAttachmentList(param) {
+  return request({
+    url: `/SystemDocument/getSystemDocumentAttachmentList`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除通用培训附件
+export function deleteSystemDocumentAttachment(systemDocumentAttachmentId) {
+  return request({
+    url: `/SystemDocument/deleteSystemDocumentAttachment/${systemDocumentAttachmentId}`,
+    method: 'delete',
+  })
+}
 
 export function deleteSystemDocument(id) {
   return request({
@@ -1069,4 +1105,255 @@ export function batchAddEnrollOrPdEmailConfig(params) {
     method: 'post',
     params
   })
-}
+}
+// 文件记录-系统文件列表
+export function getSysFileTypeList(data) {
+  return request({
+    url: `/SysFileType/getSysFileTypeList`,
+    method: 'post',
+    data
+  })
+}
+// 文件记录-新增/编辑系统文件
+export function addOrUpdateSysFileType(data) {
+  return request({
+    url: `/SysFileType/addOrUpdateSysFileType`,
+    method: 'post',
+    data
+  })
+}
+// 文件记录-删除系统文件
+export function deleteSysFileType(id) {
+  return request({
+    url: `/SysFileType/deleteSysFileType/${id}`,
+    method: 'delete'
+  })
+}
+// 项目文档-获取项目菜单
+export function getTrialFileTypeData(data) {
+  return request({
+    url: `/TrialFileType/getTrialFileTypeData`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改项目菜单启用
+export function setAuthorizedView(data) {
+  return request({
+    url: `/TrialFileType/setAuthorizedView`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-新增/修改项目菜单
+export function addOrUpdateTrialFileType(data) {
+  return request({
+    url: `/TrialFileType/addOrUpdateTrialFileType`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除项目菜单
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/TrialFileType/deleteTrialFileType/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-报告/文档列表
+export function getTrialFinalRecordList(data) {
+  return request({
+    url: `/TrialFinalRecord/getTrialFinalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-报告/文档授权
+export function authorizedTrialFinalRecord(data) {
+  return request({
+    url: `/TrialFinalRecord/authorizedTrialFinalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-报告/文档新增/修改
+export function addOrUpdateTrialFinalRecord(data) {
+  return request({
+    url: `/TrialFinalRecord/addOrUpdateTrialFinalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除报告/文档
+export function deleteTrialFinalRecord(id) {
+  return request({
+    url: `/TrialFinalRecord/deleteTrialFinalRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-一般文件记录列表
+export function getTrialNormalRecordList(data) {
+  return request({
+    url: `/TrialNormalRecord/getTrialNormalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录授权
+export function authorizedTTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/authorizedTTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录批量新增
+export function batchAddTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/batchAddTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录新增/修改
+export function addOrUpdateTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/addOrUpdateTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除一般文件记录
+export function deleteTrialNormalRecord(id) {
+  return request({
+    url: `/TrialNormalRecord/deleteTrialNormalRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-批量删除一般文件记录
+export function deleteTrialNormalRecordList(data) {
+  return request({
+    url: `/TrialNormalRecord/deleteTrialNormalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录列表
+export function getTrialTrianingRecordList(data) {
+  return request({
+    url: `/TrialTrianingRecord/getTrialTrianingRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录新增/修改
+export function addOrUpdateTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/addOrUpdateTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录批量新增/修改
+export function batchAddTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/batchAddTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除培训记录
+export function deleteTrialTrianingRecord(id) {
+  return request({
+    url: `/TrialTrianingRecord/deleteTrialTrianingRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-培训记录授权
+export function authorizedTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/authorizedTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-阅片人简历
+export function getTrialDoctorList(data) {
+  return request({
+    url: `/DoctorList/getTrialDoctorList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-上传同意入项记录
+export function uploadTrialFileTypeFile(data) {
+  return request({
+    url: `/TrialFileType/uploadTrialFileTypeFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-获取上传同意入项记录
+export function getTrialFileTypeFile(data) {
+  return request({
+    url: `/TrialFileType/getTrialFileTypeFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除上传同意入项记录
+export function deleteTrialTypeFile(params) {
+  return request({
+    url: `/TrialFileType/deleteTrialTypeFile`,
+    method: 'post',
+    params
+  })
+}
+// 项目文档-获取资质材料列表
+export function getTrialAttachments(data) {
+  return request({
+    url: `/Attachment/getTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改资质材料稽查状态
+export function setAuthorizedViewC(data) {
+  return request({
+    url: `/Attachment/setAuthorizedView`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-上传资质材料
+export function saveTrialAttachments(data) {
+  return request({
+    url: `/Attachment/saveTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-资质材料(获取医生列表)
+export function getTrialDoctorListC(data) {
+  return request({
+    url: `/Attachment/getTrialDoctorList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改资质材料
+export function updateTrialAttachments(data) {
+  return request({
+    url: `/Attachment/updateTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除资质材料
+export function deleteAttachment(data) {
+  return request({
+    url: `/Attachment/deleteAttachment`,
+    method: 'post',
+    data
+  })
+}

src/api/trials.js

@@ -1035,7 +1035,27 @@ export function getQCVisitList(param) {
     data: param
   })
 }
-
+export function getImageBackList(param) {
+  return request({
+    url: `/QCList/getImageBackList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getImageBackApplyUserList(params) {
+  return request({
+    url: `/QCList/getImageBackApplyUserList`,
+    method: 'get',
+    params
+  })
+}
+export function auditImageBack(params) {
+  return request({
+    url: `/QCOperation/auditImageBack`,
+    method: 'put',
+    params
+  })
+}
 export function getQCChallengeList(param) {
   return request({
     url: `/QCList/getQCChallengeList`,
@@ -1080,7 +1100,13 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
     method: 'put'
   })
 }
-
+export function setNodicomStudyState(params) {
+  return request({
+    url: `/QCOperation/setNodicomStudyState`,
+    method: 'put',
+    params
+  })
+}
 export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
   return request({
     url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
@@ -1372,9 +1398,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'
   })
 }
@@ -1593,6 +1619,13 @@ export function getDocumentConfirmList(param) {
     data: param
   })
 }
+export function getSysDocumentConfirmList(param) {
+  return request({
+    url: `/TrialDocument/getSysDocumentConfirmList`,
+    method: 'post',
+    data: param
+  })
+}
 export function getTrialUserSelect(trialId) {
   return request({
     url: `/TrialDocument/getTrialUserSelect/${trialId}`,
@@ -1607,6 +1640,13 @@ export function getTrialDocAndSystemDocType(trialId) {
   })
 }
 
+export function getSysDocSignUserList() {
+  return request({
+    url: `/TrialDocument/getSysDocSignUserList`,
+    method: 'get'
+  })
+}
+
 export function updateSubjectStatus(param) {
   return request({
     url: `/Subject/updateSubjectStatus`,
@@ -3302,6 +3342,13 @@ export function getReReadingApplyToBeDoneList(param) {
     data: param
   })
 }
+export function getPMImageBackToBeDoneList(param) {
+  return request({
+    url: `/PersonalWorkstation/getPMImageBackToBeDoneList`,
+    method: 'post',
+    data: param
+  })
+}
 
 export function deleteClinicalForm(param) {
   return request({
@@ -3940,8 +3987,6 @@ export function updateTrialUserRole(data) {
   })
 }
 
-
-
 // 获取报表配置
 export function getTrialQuestionExportResult(data) {
   return request({
@@ -3965,4 +4010,117 @@ export function trialUserSendJoinEmail(data) {
     method: 'post',
     data
   })
+}
+
+// 获取非Dicom标记
+export function getNoneDicomMarkListOutDto(data) {
+  return request({
+    url: `/ReadingImageTask/getNoneDicomMarkListOutDto`,
+    method: 'post',
+    data
+  })
+}
+// 添加非Dicom标记
+export function addNoneDicomMark(data) {
+  return request({
+    url: `/ReadingImageTask/addNoneDicomMark`,
+    method: 'post',
+    data
+  })
+}
+// 删除非Dicom标记
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/ReadingImageTask/deleteTrialFileType/${id}`,
+    method: 'post'
+  })
+}
+
+// 工作台-获取稽查文档
+export function getAuditDocumentData(data) {
+  return request({
+    url: `/AuditDocument/getAuditDocumentData`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-新增稽查文档
+export function addAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/addAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-获取当前目录层级
+export function getBreadcrumbData(data) {
+  return request({
+    url: `/AuditDocument/getBreadcrumbData`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-修改稽查文档
+export function updateAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/updateAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-删除稽查文档
+export function deleteAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/deleteAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档获取历史版本
+export function getHistoricalVersion(data) {
+  return request({
+    url: `/AuditDocument/getHistoricalVersion`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档设置当前版本
+export function setCurrentVersion(data) {
+  return request({
+    url: `/AuditDocument/setCurrentVersion`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档移动
+export function movieFileOrFolder(data) {
+  return request({
+    url: `/AuditDocument/movieFileOrFolder`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档复制
+export function copyFileOrFolder(data) {
+  return request({
+    url: `/AuditDocument/copyFileOrFolder`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档授权
+export function setIsAuthorization(data) {
+  return request({
+    url: `/AuditDocument/setIsAuthorization`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档新增文件夹
+export function addFolder(data) {
+  return request({
+    url: `/AuditDocument/addFolder`,
+    method: 'post',
+    data
+  })
 }

src/api/trials/setting.js

@@ -110,4 +110,12 @@ export function addOrUpdateTrialBodyPart(data) {
     data
   })
 }
+// 修改检查名称列表
+export function updateTrialStudyNameList(data) {
+  return request({
+    url: `/TrialConfig/updateTrialStudyNameList`,
+    method: 'post',
+    data
+  })
+}
 

src/api/trials/visit.js

@@ -287,4 +287,12 @@ export function forwardSVDicomImage(param) {
     data: param
   })
 }
+// crc、iqc申请影像退回
+export function requestImageBack(params) {
+  return request({
+    url: `/QCOperation/requestImageBack`,
+    method: 'put',
+    params
+  })
+}
 

src/api/user.js

@@ -209,3 +209,11 @@ export function loginSelectUserRole(params) {
     params,
   })
 }
+// 忽略异地登录
+export function setIsIgnoreUncommonly(data) {
+  return request({
+    url: `/User/setIsIgnoreUncommonly`,
+    method: 'post',
+    data,
+  })
+}

src/components/BaseContainer/index.vue

@@ -4,6 +4,7 @@
       <el-col :span="24">
         <div class="box">
           <div class="box-body">
+            <slot name="title-container" />
             <div class="search">
               <slot name="search-container" />
             </div>
@@ -24,42 +25,42 @@ export default {
   props: {
     noTitle: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   computed: {
     contentClass() {
       return this.noTitle ? 'content-notitle' : 'content'
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-  .box-body{
-     padding:  0px;
-     background-color: #fff;
-     .el-card__body {
-      padding: 0px;
-    }
-    .search{
-      display: flex;
-      padding: 5px;
+.box-body {
+  padding: 0px;
+  background-color: #fff;
+  .el-card__body {
+    padding: 0px;
+  }
+  .search {
+    display: flex;
+    padding: 5px;
 
-      .mr5{
-        margin-right:5px;
-      }
-      .el-form-item{
-        margin-bottom: 10px;
-      }
+    .mr5 {
+      margin-right: 5px;
     }
-    .page{
-      text-align: right;
-      padding-top: 3px;
-    }
-    .el-button.is-circle {
-      padding: 9px;
-      font-weight: bold;
-      font-size: 14px;
+    .el-form-item {
+      margin-bottom: 10px;
     }
   }
+  .page {
+    text-align: right;
+    padding-top: 3px;
+  }
+  .el-button.is-circle {
+    padding: 9px;
+    font-weight: bold;
+    font-size: 14px;
+  }
+}
 </style>

src/components/BaseForm/search-form.vue

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <div class="base-search-form">
-    <el-form :size="size" :inline="true" :label-width="labelWidth">
+    <el-form :inline="true" :label-width="labelWidth">
       <el-form-item
         v-for="item in searchForm"
         :key="item.prop"
@@ -146,17 +146,18 @@
         <!-- 具名slot -->
         <slot v-if="item.type === 'Custom'" :name="item.slot" />
       </el-form-item>
-      <el-form-item v-for="item in searchHandle" :key="item.label">
-        <slot v-if="item.slot" :name="item.slot" />
-        <el-button
-          v-else
-          :type="item.type"
-          :size="item.size || size"
-          :icon="item.icon || ''"
-          @click="handleClick(item.emitKey)"
-          >{{ item.label }}</el-button
-        >
-      </el-form-item>
+      <div style="display: inline-block;width: fit-content;">
+        <el-form-item v-for="item in searchHandle" :key="item.label">
+          <slot v-if="item.slot" :name="item.slot" />
+          <el-button
+            v-else
+            :type="item.type"
+            :icon="item.icon || ''"
+            @click="handleClick(item.emitKey)"
+            >{{ item.label }}</el-button
+          >
+        </el-form-item>
+      </div>
     </el-form>
   </div>
 </template>
@@ -174,11 +175,11 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: "",
+      default: '',
     },
     size: {
       type: String,
-      default: "mini",
+      default: 'mini',
     },
     searchForm: {
       type: Array,
@@ -196,10 +197,10 @@ export default {
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`);
+      this.$emit(`${emitKey}`)
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .base-search-form {

src/components/BaseTable/index.vue

@@ -62,7 +62,6 @@
                   </a> -->
                   <span v-for="(operate, i) in column.operates" :key="i">
                     <el-button
-                      :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
                       v-if="
                         (operate.show && scope.row[operate.show]) ||

src/components/Dicom/DicomCanvas.vue

@@ -90,7 +90,7 @@
       custom-class="base-dialog-wrapper"
       append-to-body
     >
-      <DicomTags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
+      <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
     </el-dialog>
   </div>
 </template>
@@ -217,10 +217,10 @@ export default {
         this.stack.description = dicomSeries.description
         this.toolState.viewportInvert = false
         this.toolState.dicomInfoVisible = false
-        var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
-        var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-        instanceId = instanceId.split('.')[0]
-        this.stack.instanceId = instanceId
+        // var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
+        // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+        // instanceId = instanceId.split('.')[0]
+        // this.stack.instanceId = instanceId
         this.toolState.clipPlaying = false
         const element = this.$refs.canvas
         cornerstone.enable(element)
@@ -346,9 +346,9 @@ export default {
       //   return
       // }
       // this.stack.instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
-      this.stack.instanceId = instanceId
+      // var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
+      // instanceId = instanceId.split('.')[0]
+      // this.stack.instanceId = instanceId
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
       this.resetWwwc()
     },
@@ -415,15 +415,16 @@ export default {
     },
 
     onImageRendered(e) {
-      var imageId = e.detail.image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
+      // var imageId = e.detail.image.imageId
+      // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+      // instanceId = instanceId.split('.')[0]
 
-      if (this.imageId !== instanceId) {
-        this.getOrientationMarker(e.detail.element)
-        this.imageId = instanceId
-      }
-      this.stack.instanceId = instanceId
+      // if (this.imageId !== instanceId) {
+      //   this.getOrientationMarker(e.detail.element)
+      //   this.imageId = instanceId
+      // }
+      this.getOrientationMarker(e.detail.element)
+      // this.stack.instanceId = instanceId
       var viewport = e.detail.viewport
       this.dicomInfo.wwwc = `${Math.round(
         viewport.voi.windowWidth

src/components/PreviewFile/index.vue

@@ -1,28 +1,28 @@
 <template>
   <div class="preview-wrapper">
-    <iframe
-      v-if="fileType.indexOf('jpg') !== -1 || fileType.indexOf('png') !== -1"
-      frameborder="0"
-      :src="filePath"
-      width="100%"
-      height="100%"
-    />
+    <iframe v-if="fileType.indexOf('jpg') !== -1 || fileType.indexOf('png') !== -1" frameborder="0" :src="filePath"
+      width="100%" height="100%" />
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
-    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <iframe v-else-if="fileType.indexOf('pdf') !== -1"
+      :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+      width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!--    <pdf-->
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
     <!--    </pdf>-->
-    <div v-else>
+    <iframe v-else
+      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+      width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <!-- <div v-else>
       {{ $t('common:message:downloadFile') }}
       <el-link type="primary" @click="downLoadFile">{{ $t('common:button:download') }}</el-link>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex'
-
+import DOCUMENTTYPE from "@/utils/onlyOffice_type.js"
 export default {
   name: 'PreviewFile',
   computed: {
@@ -36,12 +36,22 @@ export default {
     fileType: {
       type: String,
       required: true
-    }
+    },
+    title: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
-      COMPANY:process.env.VUE_APP_COMPANY_NAME
+      COMPANY: process.env.VUE_APP_COMPANY_NAME
+    }
+  },
+  computed: {
+    documentType() {
+      console.log(DOCUMENTTYPE[`.${this.fileType}`], 'documentType')
+      return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },
   mounted() {
@@ -62,14 +72,16 @@ export default {
 }
 </script>
 <style lang="scss">
-.preview-wrapper{
+.preview-wrapper {
   height: 100%;
-  width:100%;
+  width: 100%;
   padding: 10px;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;

src/components/Preview_onlyoffice/fun.js

@@ -0,0 +1,23 @@
+import Vue from "vue";
+import OnlyOffice from "./index.vue";
+
+const PreviewConstructor = Vue.extend(OnlyOffice);
+
+const onlyOffice = options => {
+    const { path, type, title } = options;
+    if (!path) throw `path is requred.but ${path}`
+    const id = `OnlyOffice_${new Date().getTime()}`;
+    const instance = new PreviewConstructor();
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open(path, type, title);
+    instance.vm.$on("closed", () => {
+        instance.vm.docEditor = null
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+    });
+    return instance.vm;
+}
+export default onlyOffice;

src/components/Preview_onlyoffice/index.js

@@ -0,0 +1,7 @@
+import OnlyOffice from "./index.vue";
+import onlyOffice from "./fun";
+
+export default Vue => {
+    Vue.component(OnlyOffice.name, OnlyOffice);
+    Vue.prototype.$onlyOffice = onlyOffice;
+};

src/components/Preview_onlyoffice/index.vue

@@ -0,0 +1,45 @@
+<template>
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
+    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+      <iframe v-if="visible"
+        :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${path}?type=${type}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+        width="100%" height="99%" frameborder="0" crossorigin="anonymous" />
+    </div>
+  </el-dialog>
+</template>
+<script>
+import DOCUMENTTYPE from "@/utils/onlyOffice_type.js"
+export default {
+  name: "OnlyOffice",
+  data() {
+    return {
+      visible: false,
+      path: null,
+      type: null,
+      title: null,
+      documentType: null,
+      currentUser: zzSessionStorage.getItem('userName'),
+    };
+  },
+  methods: {
+
+    open(path, type, title) {
+      this.path = path;
+      this.type = type.toLowerCase();
+      this.documentType = DOCUMENTTYPE[`.${this.type}`]
+      this.title = title;
+      this.visible = true;
+    },
+    handleClose() {
+      this.$emit("closed");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+#placeholder {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -316,9 +316,9 @@
               scope.row.dicomInfo.fileCount
             }}
             ({{
-              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
+              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
             }}MB/{{
-              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
+              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
             }}MB)
           </span>
         </template>
@@ -1308,7 +1308,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
@@ -1421,7 +1421,7 @@ export default {
                     v.instanceList[0].imageColumns,
                     v.instanceList[0].imageRows
                   )
-                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                   let OSSclient = scope.OSSclient
                   try {
                     let seriesRes = await OSSclient.put(thumbnailPath, blob)
@@ -1499,8 +1499,8 @@ export default {
       return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
           let canvas = document.createElement('canvas')
-          canvas.width = width
-          canvas.height = height
+          canvas.width = (width * 60) / height
+          canvas.height = 60
           if (image) {
             cornerstone.renderToCanvas(canvas, image)
             // 将 Canvas 图像对象转换为 PNG 格式

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -8,65 +8,29 @@
       </div>
     </div>
     <!--检查列表-->
-    <el-table
-      :data="list"
-      style="width: 100%"
-      v-adaptive="{ bottomOffset: 60 }"
-      :loading="loading"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
-    >
+    <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
+      @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!--受试者-->
-      <el-table-column
-        prop="SubjectCode"
-        :label="$t('upload:nonedicom:table:subject')"
-      />
+      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
       <!--任务名称-->
-      <el-table-column
-        prop="TaskBlindName"
-        :label="$t('upload:nonedicom:table:taskName')"
-        sortable="custom"
-      />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" />
       <!--检查类型-->
-      <el-table-column
-        prop="Modality"
-        :label="$t('upload:nonedicom:table:molityType')"
-        sortable="custom"
-      >
+      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
       </el-table-column>
       <!--检查部位-->
-      <el-table-column
-        prop="BodyPart"
-        :label="$t('upload:nonedicom:table:bodyPart')"
-        sortable="custom"
-      />
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom" />
       <!--原文件数-->
-      <el-table-column
-        prop="FileCount"
-        :label="$t('upload:nonedicom:table:fileCount')"
-      >
+      <el-table-column prop="FileCount" :label="$t('upload:nonedicom:table:fileCount')">
         <template slot-scope="scope">
-          <el-popover
-            v-if="scope.row.FileCount"
-            trigger="click"
-            placement="bottom"
-          >
+          <el-popover v-if="scope.row.FileCount" trigger="click" placement="bottom">
             <el-table :data="scope.row.FileList" height="300" size="small">
               <!-- 文件名称 -->
-              <el-table-column
-                prop="FileName"
-                :label="$t('trials:audit:table:nonDicomsFileName')"
-                width="200"
-              />
-              <el-table-column
-                prop="FileSize"
-                :label="$t('trials:audit:table:nonDicomsFileSize')"
-                width="100"
-              >
+              <el-table-column prop="FileName" :label="$t('trials:audit:table:nonDicomsFileName')" width="200" />
+              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
                     scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
                       : ''
                   }}</span>
                 </template>
@@ -74,27 +38,13 @@
               <el-table-column :label="$t('common:action:action')" width="120">
                 <template slot-scope="files">
                   <!-- 预览 -->
-                  <viewer
-                    :ref="files.row.Path"
-                    style="margin: 0 10px"
-                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
-                  >
-                    <el-button
-                      circle
-                      icon="el-icon-view"
-                      :title="$t('upload:nonedicom:button:preview')"
-                      :disabled="
-                        files.row.FileType &&
-                        files.row.FileType.indexOf('zip') >= 0
-                      "
-                      @click.native.prevent="previewFile(files.row)"
-                    />
-                    <img
-                      v-show="false"
-                      crossorigin="anonymous"
-                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
-                      alt="Image"
-                    />
+                  <viewer :ref="files.row.Path" style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]">
+                    <el-button circle icon="el-icon-view" :title="$t('upload:nonedicom:button:preview')" :disabled="files.row.FileType &&
+                      files.row.FileType.indexOf('zip') >= 0
+                      " @click.native.prevent="previewFile(files.row)" />
+                    <img v-show="false" crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image" />
                   </viewer>
                 </template>
               </el-table-column>
@@ -109,36 +59,17 @@
         </template>
       </el-table-column>
       <!--后处理文件数-->
-      <el-table-column
-        prop="UploadedFileCount"
-        :label="$t('upload:nonedicom:table:uploadFileCount')"
-      >
+      <el-table-column prop="UploadedFileCount" :label="$t('upload:nonedicom:table:uploadFileCount')">
         <template slot-scope="scope">
-          <el-popover
-            v-if="scope.row.UploadedFileCount"
-            trigger="click"
-            placement="bottom"
-          >
-            <el-table
-              :data="scope.row.UploadedFileList"
-              height="300"
-              size="small"
-            >
+          <el-popover v-if="scope.row.UploadedFileCount" trigger="click" placement="bottom">
+            <el-table :data="scope.row.UploadedFileList" height="300" size="small">
               <!-- 文件名称 -->
-              <el-table-column
-                prop="FileName"
-                :label="$t('trials:audit:table:nonDicomsFileName')"
-                width="200"
-              />
-              <el-table-column
-                prop="FileSize"
-                :label="$t('trials:audit:table:nonDicomsFileSize')"
-                width="100"
-              >
+              <el-table-column prop="FileName" :label="$t('trials:audit:table:nonDicomsFileName')" width="200" />
+              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
                     scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
                       : ''
                   }}</span>
                 </template>
@@ -146,27 +77,13 @@
               <el-table-column :label="$t('common:action:action')" width="120">
                 <template slot-scope="files">
                   <!-- 预览 -->
-                  <viewer
-                    :ref="files.row.Path"
-                    style="margin: 0 10px"
-                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
-                  >
-                    <el-button
-                      circle
-                      icon="el-icon-view"
-                      :title="$t('upload:nonedicom:button:preview')"
-                      :disabled="
-                        files.row.FileType &&
-                        files.row.FileType.indexOf('zip') >= 0
-                      "
-                      @click.native.prevent="previewFile(files.row)"
-                    />
-                    <img
-                      v-show="false"
-                      crossorigin="anonymous"
-                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
-                      alt="Image"
-                    />
+                  <viewer :ref="files.row.Path" style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]">
+                    <el-button circle icon="el-icon-view" :title="$t('upload:nonedicom:button:preview')" :disabled="files.row.FileType &&
+                      files.row.FileType.indexOf('zip') >= 0
+                      " @click.native.prevent="previewFile(files.row)" />
+                    <img v-show="false" crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image" />
                   </viewer>
                 </template>
               </el-table-column>
@@ -180,75 +97,34 @@
           <span v-else>{{ scope.row.UploadedFileCount }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
         <template slot-scope="scope">
           <!--预览--->
-          <el-button
-            circle
-            :disabled="scope.row.UploadedFileCount <= 0"
-            icon="el-icon-view"
-            :title="$t('upload:nonedicom:button:preview')"
-            @click.stop="handlePreviewNoneDicomFiles(scope.row)"
-          />
+          <el-button circle :disabled="scope.row.UploadedFileCount <= 0" icon="el-icon-view"
+            :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
           <!--上传--->
-          <el-button
-            circle
-            icon="el-icon-upload2"
-            :title="$t('upload:nonedicom:button:upload')"
-            @click.native.prevent="handleUpload(scope.row)"
-          />
+          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
+            @click.native.prevent="handleUpload(scope.row)" />
           <!--删除--->
-          <el-button
-            :disabled="
-              scope.row.UploadedFileCount <= 0 ||
-              scope.row.ReadingTaskState === 2
-            "
-            circle
-            icon="el-icon-delete"
-            :title="$t('upload:nonedicom:button:delete')"
-            @click.stop="remove(scope.row)"
-          />
+          <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
+            scope.row.ReadingTaskState === 2
+            " circle icon="el-icon-delete" :title="$t('upload:nonedicom:button:delete')"
+            @click.stop="remove(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
     <!-- 预览单个图像 -->
-    <el-dialog
-      v-if="imgObj.visible"
-      :visible.sync="imgObj.visible"
-      :title="$t('upload:nonedicom:dialogTitle:preview')"
-      append-to-body
-      width="565px"
-    >
-      <div
-        v-loading="imgObj.loading"
-        class="base-modal-body"
-        style="border: 2px solid #ccc; padding: 10px"
-      >
-        <el-image
-          :src="`${OSSclientConfig.basePath}${imgObj.url}`"
-          crossorigin="anonymous"
-          fit="fit"
-          style="height: 500px; width: 500px"
-          @error="imgObj.loading = false"
-          @load="imgObj.loading = false"
-        />
+    <el-dialog v-if="imgObj.visible" :visible.sync="imgObj.visible" :title="$t('upload:nonedicom:dialogTitle:preview')"
+      append-to-body width="565px">
+      <div v-loading="imgObj.loading" class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+        <el-image :src="`${OSSclientConfig.basePath}${imgObj.url}`" crossorigin="anonymous" fit="fit"
+          style="height: 500px; width: 500px" @error="imgObj.loading = false" @load="imgObj.loading = false" />
       </div>
     </el-dialog>
     <!-- 上传非dicom文件 -->
-    <el-dialog
-      v-if="uploadVisible"
-      :visible.sync="uploadVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')"
-      width="800px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-      @close="resetFileDiaolg"
-    >
+    <el-dialog v-if="uploadVisible" :visible.sync="uploadVisible" :close-on-click-modal="false"
+      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')" width="800px" append-to-body
+      custom-class="base-dialog-wrapper" @close="resetFileDiaolg">
       <!-- 多文件上传 -->
       <form id="inputForm" ref="uploadForm">
         <el-divider content-position="left">{{
@@ -256,33 +132,15 @@
         }}</el-divider>
         <div class="form-group">
           <div class="upload" style="margin-right: 10px">
-            <input
-              multiple="multiple"
-              webkitdirectory=""
-              directory
-              accept="*/*"
-              type="file"
-              name="uploadFolder"
-              class="select-file"
-              title=""
-              @change="beginScanFiles($event)"
-              v-if="!btnLoading"
-            />
+            <input multiple="multiple" webkitdirectory="" directory accept="*/*" type="file" name="uploadFolder"
+              class="select-file" title="" @change="beginScanFiles($event)" v-if="!btnLoading" />
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:selectFolder') }}
             </div>
           </div>
           <div class="upload">
-            <input
-              class="select-file"
-              multiple=""
-              :accept="faccept.join(',')"
-              type="file"
-              name="uploadFile"
-              title=""
-              @change="beginScanFiles($event)"
-              v-if="!btnLoading"
-            />
+            <input class="select-file" multiple="" :accept="faccept.join(',')" type="file" name="uploadFile" title=""
+              @change="beginScanFiles($event)" v-if="!btnLoading" />
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:select') }}
             </div>
@@ -293,82 +151,46 @@
         </div>
       </form>
       <!-- 文件列表 -->
-      <el-table
-        ref="filesTable"
-        :data="fileList"
-        class="dicomFiles-table"
-        height="300"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          :selectable="(row, index) => row.status !== 2 && !btnLoading"
-        />
+      <el-table ref="filesTable" :data="fileList" class="dicomFiles-table" height="300"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" :selectable="(row, index) => row.status !== 2 && !btnLoading" />
         <el-table-column type="index" width="50" />
         <!-- 文件名称 -->
-        <el-table-column
-          prop="name"
-          :label="$t('trials:uploadNonDicoms:table:fileName')"
-          min-width="100"
-        />
+        <el-table-column prop="name" :label="$t('trials:uploadNonDicoms:table:fileName')" min-width="100" />
         <!-- 文件大小 -->
-        <el-table-column
-          prop="size"
-          :label="$t('trials:uploadNonDicoms:table:fileSize')"
-        >
+        <el-table-column prop="size" :label="$t('trials:uploadNonDicoms:table:fileSize')">
           <template slot-scope="scope">
             <span>{{
               scope.row.size && scope.row.size > 0
-                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
-                : ''
+                ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
+                : '0MB'
             }}</span>
           </template>
         </el-table-column>
         <!-- 文件类型 -->
-        <el-table-column
-          prop="type"
-          :label="$t('trials:uploadNonDicoms:table:fileType')"
-        />
+        <el-table-column prop="type" :label="$t('trials:uploadNonDicoms:table:fileType')" />
         <!-- 上传状态 -->
-        <el-table-column
-          prop="status"
-          :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
-          min-width="100"
-        >
+        <el-table-column prop="status" :label="$t('trials:uploadNonDicoms:table:uploadStatus')" min-width="100">
           <template slot-scope="scope">
-            <el-tag
-              :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
-              v-if="scope.row.status || scope.row.status === 0"
-              >{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+            <el-tag :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+              v-if="scope.row.status || scope.row.status === 0">{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          :label="$t('trials:uploadNonDicoms:table:failedFileCount')"
-          min-width="150"
-          show-overflow-tooltip
-        >
+        <el-table-column :label="$t('trials:uploadNonDicoms:table:failedFileCount')" min-width="150"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-progress
-              color="#409eff"
-              :percentage="
-                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
-                1
-              "
-            />
+            <el-progress color="#409eff" :percentage="scope.row.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+              1
+              : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
+              1
+              " />
           </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              icon="el-icon-delete"
-              circle
-              :disabled="btnLoading"
-              :title="$t('trials:crcUpload:action:delete')"
-              @click="handleRemoveFile(scope.row)"
-            />
+            <el-button size="mini" icon="el-icon-delete" circle :disabled="btnLoading"
+              :title="$t('trials:crcUpload:action:delete')" @click="handleRemoveFile(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -376,13 +198,8 @@
         <span style="margin-right: 10px">{{
           $store.state.trials.uploadTip
         }}</span>
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="selectArr.length == 0"
-          :loading="btnLoading"
-          @click="beginUpload"
-        >
+        <el-button size="small" type="primary" :disabled="selectArr.length == 0" :loading="btnLoading"
+          @click="beginUpload">
           {{ $t('trials:uploadNonDicoms:action:upload') }}
         </el-button>
       </div>
@@ -588,7 +405,7 @@ export default {
             )
           }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     resetUploadForm() {
       this.$nextTick(() => {
@@ -714,11 +531,10 @@ export default {
       if (!this.uploadVisible) return
       let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
       file.status = 1
-      let path = `/${this.$route.query.trialId}/TaskImage/${
-        this.currentRow.SubjectId
-      }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
-        .substring(file.name.lastIndexOf('.'))
-        .toLocaleLowerCase()}`
+      let path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
+        }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+          .substring(file.name.lastIndexOf('.'))
+          .toLocaleLowerCase()}`
       file.curPath = path
       const fileData = await this.fileToBlob(file.file)
       let res = await this.fileToOss(path, fileData, file)
@@ -772,7 +588,7 @@ export default {
           (percentage, checkpoint, lastPer) => {
             item.uploadFileSize += checkpoint.size * (percentage - lastPer)
             if (item.uploadFileSize > file.fileSize) {
-              item.uploadFileSize = file.fileSize
+              item.uploadFileSize = file.fileSize > 0 ? file.fileSize : 1
             }
           }
         )
@@ -869,6 +685,7 @@ export default {
 .top {
   margin: 10px 0;
 }
+
 .upload {
   display: inline-block;
   height: 30px;
@@ -883,6 +700,7 @@ export default {
   background: #428bca;
   border-color: #428bca;
   color: #fff;
+
   .select-file {
     height: 30px;
     width: 90px;
@@ -893,6 +711,7 @@ export default {
     opacity: 0;
     font-size: 0;
   }
+
   .btn-select {
     //给显示在页面上的按钮写样式
     width: 90px;
@@ -908,10 +727,12 @@ export default {
     pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
   }
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/components/uploadImage/components/upload-list.vue

@@ -567,7 +567,7 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         let dicom = arr[i];
         if (dicom.StudyInstanceUid !== StudyInstanceUid) continue;
-        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.png`;
+        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.jpg`;
         if (!studyObj[dicom.StudyId]) {
           studyObj[dicom.StudyId] = {
             StudyId: dicom.StudyId,

src/main.js

@@ -54,6 +54,8 @@ import upload from '@/components/element-ui/upload'
 Vue.use(upload)
 import Preview from '@/components/Preview/index'
 Vue.use(Preview)
+import Onlyoffice from '@/components/Preview_onlyoffice/index'
+Vue.use(Onlyoffice)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
@@ -461,8 +463,8 @@ async function VueInit() {
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
             let my_userid = zzSessionStorage.getItem('userId')
-            let my_EMail = zzSessionStorage.getItem('my_EMail')
-            if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
+            let my_EMail = zzSessionStorage.getItem('my_EMail') || ''
+            if (md5(_vm.unlock.my_password) === my_password && (my_username === _vm.unlock.my_username || my_EMail.toUpperCase() === vm.unlock.my_username.toUpperCase())) {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {

src/permission.js

@@ -7,15 +7,15 @@ import 'nprogress/nprogress.css'
 import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
-import WHITELIST from "./utils/whiteList"
+import WHITELIST from './utils/whiteList'
 import { getTrialExtralConfig } from '@/api/trials'
 // import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
 const whiteList = WHITELIST
-store.state.trials.whiteList = whiteList;
-router.beforeEach(async (to, from, next) => {
+store.state.trials.whiteList = whiteList
+router.beforeEach(async(to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
@@ -27,13 +27,13 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    let res = await getTrialExtralConfig({
-      TrialId: to.query.trialId,
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
     })
     if (res.IsSuccess) {
       store.dispatch('trials/setConfig', {
         trialId: to.query.trialId,
-        ...res.Result,
+        ...res.Result
       })
     }
   }
@@ -45,13 +45,13 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    let res = await getTrialExtralConfig({
-      TrialId: to.query.trialId,
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
     })
     if (res.IsSuccess) {
       store.dispatch('trials/setConfig', {
         trialId: to.query.trialId,
-        ...res.Result,
+        ...res.Result
       })
     }
   }
@@ -72,12 +72,12 @@ router.beforeEach(async (to, from, next) => {
       NProgress.done()
     } else if (from.path === '/researchForm') {
       removeToken()
-      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
       next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
       NProgress.done()
     } else if (from.path === '/researchDetail_m') {
       removeToken()
-      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
       next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
       NProgress.done()
     } else {
@@ -107,7 +107,7 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
-        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
         if (flag) {
           next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
@@ -123,11 +123,11 @@ router.beforeEach(async (to, from, next) => {
       }
     } else {
       if (to.path === '/researchForm') {
-        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/researchDetail_m') {
-        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {

src/router/index.js

@@ -50,11 +50,11 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/test',
-    component: () => import('@/views/test/index'),
-    hidden: true
-  },
+  // {
+  //   path: '/test',
+  //   component: () => import('@/views/test/index'),
+  //   hidden: true
+  // },
   {
     path: '/resetpassword',
     component: () => import('@/views/forgetpassword/index'),

src/settings.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-undef
 module.exports = {
 
-  title: 'IRCIS',
+  title: 'IRC Imaging System',
 
   /**
  * @type {boolean} true | false

src/store/getters.js

@@ -48,6 +48,8 @@ const getters = {
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
   IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
-  TrialStatusStr: state => state.user.TrialStatusStr
+  TrialStatusStr: state => state.user.TrialStatusStr,
+  lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
+  currentTaskState: state => state.noneDicomReview.currentTaskState
 }
 export default getters

src/store/index.js

@@ -12,7 +12,7 @@ import trials from './modules/trials'
 import financials from './modules/financials'
 import reading from './modules/reading'
 import lang from './modules/lang'
-
+import noneDicomReview from './modules/noneDicomReview'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -27,7 +27,8 @@ const store = new Vuex.Store({
     trials,
     financials,
     reading,
-    lang
+    lang,
+    noneDicomReview
   },
   getters
 })

src/store/modules/noneDicomReview.js

@@ -0,0 +1,28 @@
+const getDefaultState = () => {
+  return {
+    lastViewportTaskId: null,
+    currentTaskState: 0
+  }
+}
+const state = getDefaultState
+
+const mutations = {
+
+}
+
+const actions = {
+  setLastViewportTaskId({ state }, id) {
+    state.lastViewportTaskId = id
+  },
+  setCurrentTaskState({ state }, taskState) {
+    state.currentTaskState = taskState
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

src/store/modules/reading.js

@@ -862,6 +862,7 @@ const actions = {
             const data = {}
             data.StudyId = study.StudyId
             data.StudyCode = study.StudyCode
+            data.StudyName = study.StudyName
             data.Modalities = study.Modalities
             data.SeriesCount = study.SeriesCount
             data.InstanceCount = study.InstanceCount

src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || 'IRCIS'
+const title = defaultSettings.title || 'IRC Imaging System'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

src/utils/index.js

@@ -34,7 +34,7 @@ export function parseTime(time, cFormat) {
   const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
     const value = formatObj[key]
     // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
     return value.toString().padStart(2, '0')
   })
   return time_str
@@ -51,12 +51,44 @@ export function param2Obj(url) {
   }
   return JSON.parse(
     '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, ' ') +
-      '"}'
+    decodeURIComponent(search)
+      .replace(/"/g, '\\"')
+      .replace(/&/g, '","')
+      .replace(/=/g, '":"')
+      .replace(/\+/g, ' ') +
+    '"}'
   )
 }
 
+export function deepClone(source, map = new WeakMap()) {
+  // 处理基本类型和函数（直接返回）
+  if (typeof source !== 'object' || source === null) {
+    return source;
+  }
+
+  // 处理循环引用
+  if (map.has(source)) {
+    return map.get(source);
+  }
+
+  // 创建新容器
+  const target = Array.isArray(source) ? [] : {};
+  map.set(source, target);  // 记录克隆关系
+
+  // 克隆普通键值
+  for (const key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      target[key] = deepClone(source[key], map);
+    }
+  }
+
+  // 克隆Symbol键值（ES6+）
+  const symbolKeys = Object.getOwnPropertySymbols(source);
+  for (const symKey of symbolKeys) {
+    if (source.propertyIsEnumerable(symKey)) {
+      target[symKey] = deepClone(source[symKey], map);
+    }
+  }
+
+  return target;
+}

src/utils/metaDataProvider.js

@@ -99,5 +99,27 @@ function metaDataProvider(type, imageId) {
       columnPixelSpacing,
     };
   }
+  if (type === 'imagePixelModule') {
+    return {
+      samplesPerPixel: dataSet.uint16('x00280002'),
+      photometricInterpretation: dataSet.string('x00280004'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      bitsAllocated: dataSet.uint16('x00280100'),
+      bitsStored: dataSet.uint16('x00280101'),
+      highBit: dataSet.uint16('x00280102'),
+      pixelRepresentation: dataSet.uint16('x00280103'),
+      planarConfiguration: dataSet.uint16('x00280006'),
+      pixelAspectRatio: dataSet.uint16('x00280034'),
+      smallestPixelValue: null,
+      largestPixelValue: null,
+      redPaletteColorLookupTableDescriptor: dataSet.string('x00281101'),
+      greenPaletteColorLookupTableDescriptor: dataSet.string('x00281102'),
+      bluePaletteColorLookupTableDescriptor: dataSet.string('x00281103'),
+      redPaletteColorLookupTableData: dataSet.string('x00281201'),
+      greenPaletteColorLookupTableData: dataSet.string('x00281202'),
+      bluePaletteColorLookupTableData: dataSet.string('x00281203')
+    }
+  }
 }
 export default metaDataProvider;

src/utils/multipartUpload/aws.js

@@ -445,7 +445,7 @@ function setTimer() {
                 totalBytes = totalBytes / 1024;
                 unit = "MB/s";
             }
-            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+            store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
         }
         if (timeList.length >= 5) {
             delete bytesReceivedPerSecond[timeList[0]]

src/utils/multipartUpload/oss.js

@@ -150,7 +150,7 @@ function setTimer() {
                 totalBytes = totalBytes / 1024;
                 unit = "MB/s";
             }
-            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+            store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
         }
         if (timeList.length >= 5) {
             delete bytesReceivedPerSecond[timeList[0]]

src/utils/onlyOffice_type.js

@@ -0,0 +1,66 @@
+let TYPES = ['word', 'cell', 'slide', 'pdf']
+
+let DOCUMENTTYPE = {
+    '.doc': TYPES[0],
+    '.docm': TYPES[0],
+    '.docx': TYPES[0],
+    '.dot': TYPES[0],
+    '.dotm': TYPES[0],
+    '.dotx': TYPES[0],
+    '.epub': TYPES[0],
+    '.fb2': TYPES[0],
+    '.fodt': TYPES[0],
+    '.htm': TYPES[0],
+    '.html': TYPES[0],
+    '.mht': TYPES[0],
+    '.mhtml': TYPES[0],
+    '.odt': TYPES[0],
+    '.ott': TYPES[0],
+    '.pages': TYPES[0],
+    '.rtf': TYPES[0],
+    '.stw': TYPES[0],
+    '.sxw': TYPES[0],
+    '.txt': TYPES[0],
+    '.wps': TYPES[0],
+    '.wpt': TYPES[0],
+    '.xml': TYPES[0],
+    '.csv': TYPES[1],
+    '.et': TYPES[1],
+    '.ett': TYPES[1],
+    '.fods': TYPES[1],
+    '.numbers': TYPES[1],
+    '.ods': TYPES[1],
+    '.ots': TYPES[1],
+    '.sxc': TYPES[1],
+    '.xls': TYPES[1],
+    '.xlsb': TYPES[1],
+    '.xlsm': TYPES[1],
+    '.xlsx': TYPES[1],
+    '.xlt': TYPES[1],
+    '.xltm': TYPES[1],
+    '.xltx': TYPES[1],
+    '.xml': TYPES[1],
+    '.dps': TYPES[2],
+    '.dpt': TYPES[2],
+    '.fodp': TYPES[2],
+    '.key': TYPES[2],
+    '.odp': TYPES[2],
+    '.otp': TYPES[2],
+    '.pot': TYPES[2],
+    '.potm': TYPES[2],
+    '.potx': TYPES[2],
+    '.pps': TYPES[2],
+    '.ppsm': TYPES[2],
+    '.ppsx': TYPES[2],
+    '.ppt': TYPES[2],
+    '.pptm': TYPES[2],
+    '.pptx': TYPES[2],
+    '.sxi': TYPES[2],
+    '.djvu': TYPES[3],
+    '.docxf': TYPES[3],
+    '.oform': TYPES[3],
+    '.oxps': TYPES[3],
+    '.pdf': TYPES[3],
+    '.xps': TYPES[3]
+}
+export default DOCUMENTTYPE

src/utils/oss.js

@@ -41,7 +41,13 @@ async function ossGenerateSTS() {
               let _vm = router.default.app
               if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
                 var objectItem = objectName.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+                  0,
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                ).toLocaleLowerCase()}`
                 objectName = objectItem.join('/')
               }
               let res = await OSSclient.put(objectName, object)
@@ -78,7 +84,13 @@ async function ossGenerateSTS() {
               let _vm = router.default.app
               if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
                 var objectItem = data.path.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+                  0,
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                ).toLocaleLowerCase()}`
                 data.path = objectItem.join('/')
               }
               let res = await customerHttp(OSSclient, data, progress);
@@ -185,7 +197,13 @@ function uploadAWS(aws, data, progress) {
       let _vm = router.default.app
       if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
         var objectItem = data.path.split('/')
-        objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+        // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+        objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+          0,
+          objectItem[objectItem.length - 1].lastIndexOf('.')
+        )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+          objectItem[objectItem.length - 1].lastIndexOf('.')
+        ).toLocaleLowerCase()}`
         data.path = objectItem.join('/')
       }
       let bucketName = data.path.split("/")[1] || Vue.prototype.OSSclientConfig.bucket

src/utils/parseDicom.js

@@ -189,8 +189,8 @@ const dicomToPng = (imageId, width, height) => {
     return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
             let canvas = document.createElement("canvas");
-            canvas.width = width;
-            canvas.height = height;
+            canvas.width = (width * 60) / height
+            canvas.height = 60
             if (image) {
                 cornerstone.renderToCanvas(canvas, image);
                 // 将 Canvas 图像对象转换为 PNG 格式

src/utils/request.js

@@ -9,6 +9,7 @@ const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
+  // baseURL: process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api',
   timeout: 2 * 360000, // request timeout
   withCredentials: false
 })
@@ -20,6 +21,8 @@ service.interceptors.request.use(
   async config => {
     path = router && router.app && router.app._route && router.app._route.path
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    config.baseURL = process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api'
+    config.headers['Self-Referer'] = window.location.href
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()

src/utils/stream.js

@@ -20,7 +20,7 @@ function zipFiles(zipName, files) {
                         ctrl.close();
                     } else {
                         let { name, url } = fileInfo.value;
-                        url = decodeUtf8(url);
+                        // url = decodeUtf8(url); // 待定，可能做过特殊处理
                         return fetch(url).then(res => {
                             ctrl.enqueue({
                                 name,
@@ -58,7 +58,7 @@ async function updateFile(file, name) {
         try {
             store.dispatch('trials/setUnLock', true)
             const fileOutputStream = streamSaver.createWriteStream(name);
-            file = decodeUtf8(file);
+            // file = decodeUtf8(file);
             let res = await fetch(file);
             res.body.pipeTo(fileOutputStream).then(() => {
                 store.dispatch('trials/setUnLock', true)

src/views/dicom-show/dicom-preview.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="preview-wrapper">
+  <div ref="preview-wrapper" class="preview-wrapper">
     <div class="viewerContainer">
       <div class="viewerContentWrapper" style="padding-top:25px;">
         <div class="viewerLeftSidePanel">
@@ -38,7 +38,39 @@
                     </span>
                   </span>-->
                     <div class="viewernavitextwrapper">
-                      <div style="padding: 1px;">#{{ item.seriesNumber }}</div>
+                      <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                        <div style="padding: 1px;">#{{ item.seriesNumber }}</div>
+                        <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
+                              <el-popover
+                                v-model="item.isShowPopper"
+                                placement="right-start"
+                                trigger="manual"
+                                popper-class="instance_frame_wrapper"
+                              >
+                                <div style="text-align: right;">
+                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="item.isShowPopper = false" />
+                                </div>
+                                <div class="frame_list">
+                                  <div
+                                    v-for="(instance, idx) in item.instanceInfoList"
+                                    :key="instance.InstanceUid"
+                                    class="frame_content"
+                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
+                                    @click="showMultiFrames(item, index, instance)"
+                                  >
+                                    <div>
+                                      <div>{{ instance.InstanceNumber }}</div>
+                                      <div>
+                                        {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(seriesList, item)" />
+                              </el-popover>
+                            </div>
+                      </div>
+                      
                       <div style="padding: 1px;">{{ item.description }}</div>
                       <div
                         v-show="item.instanceCount"
@@ -147,7 +179,11 @@ export default {
         })
 
         var imageIds = []
+        let isExistMutiFrames = false
+        let instanceInfoList = []
         series.instanceList.forEach(function(instance) {
+          console.log(instance)
+          let instanceInfo = {}
           var fileId = cornerstoneWADOImageLoader.wadouri.fileManager.add(
             instance.file
           )
@@ -155,7 +191,19 @@ export default {
             for (var i = 0; i < instance.frameCount; ++i) {
               imageIds.push(`${fileId}?frame=${i}`)
             }
-          } else imageIds.push(fileId)
+            isExistMutiFrames = true
+            instanceInfo.NumberOfFrames = instance.frameCount
+            instanceInfo.InstanceNumber = instance.instanceNumber
+            instanceInfo.InstanceUid = instance.instanceUid
+            instanceInfo.FileId = fileId
+          } else {
+            imageIds.push(fileId)
+            instanceInfo.NumberOfFrames = 0
+            instanceInfo.InstanceNumber = instance.instanceNumber
+            instanceInfo.InstanceUid = instance.instanceUid
+            instanceInfo.FileId = fileId
+          }
+          instanceInfoList.push(instanceInfo)
         })
 
         scope.seriesList.push({
@@ -164,13 +212,43 @@ export default {
           modality: series.modality,
           instanceCount: series.instanceList.length,
           imageIds: imageIds,
-          previewImageId: imageIds[0]
+          previewImageId: imageIds[0],
+          isExistMutiFrames: isExistMutiFrames,
+          instanceInfoList: instanceInfoList,
+          isShowPopper: false
         })
       })
 
       this.showSeriesImage(0)
     },
-
+    popperClick(seriesList, series) {
+      for (let i = 0; i < seriesList.length; i++) {
+        if (seriesList[i].isShowPopper) {
+          seriesList[i].isShowPopper = false
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
+    showMultiFrames(series, seriesIndex, instanceInfo) {
+      this.currentSeriesIndex = seriesIndex
+      const imageIds = []
+      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
+          imageIds.push(`${instanceInfo.FileId}?frame=${j}`)
+        }
+      } else {
+        imageIds.push(instanceInfo.FileId)
+      }
+      const seriesInfo = {
+        seriesNumber: series.seriesNumber,
+        description: series.description,
+        modality: series.modality,
+        instanceCount: series.instanceCount,
+        imageIds: imageIds,
+        previewImageId: imageIds[0],
+      }
+      this.$refs.dicomViewer.loadImageStack(seriesInfo)
+    },
     showSeriesImage(seriesIndex) {
       // if (seriesIndex === this.currentSeriesIndex) return;
       this.currentSeriesIndex = seriesIndex
@@ -183,136 +261,172 @@ export default {
 }
 </script>
 
-<style scoped>
-::-webkit-scrollbar {
-  width: 7px;
-  height: 7px;
-}
+<style lang="scss">
+  ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
 
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background: #d0d0d0;
-}
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
 
-.viewerContainer {
-  display: block;
-  height: 100%;
-  margin-top: 20px;
-  margin-left: auto;
-  margin-right: auto;
-  background-color: #444;
-  overflow: hidden;
-}
+  .viewerContainer {
+    width: 100%;
+    display: block;
+    height: 100%;
+    margin-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+    background-color: #444;
+    overflow: hidden;
+  }
 
-.viewerBanner {
-  background: linear-gradient(0, #444, #222);
-  min-height: 28px;
-  font-size: 16px;
-  margin: 0;
-  height: 30px;
-  padding-top: 0;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-weight: bold;
-}
+  .viewerBanner {
+    background: linear-gradient(0, #444, #222);
+    min-height: 28px;
+    font-size: 16px;
+    margin: 0;
+    height: 30px;
+    padding-top: 0;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+  }
 
-.viewerContentWrapper {
-  display: flex;
-  flex-direction: row;
-  width: 100%;
-  padding: 5px;
-  height: 99%;
-  /* height: 95%; */
-  overflow: hidden;
-  text-overflow: clip;
-  white-space: nowrap;
-}
+  .viewerContentWrapper {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    padding: 5px;
+    height: 99%;
+    /* height: 95%; */
+    overflow: hidden;
+    text-overflow: clip;
+    white-space: nowrap;
+  }
 
-.viewerContentWrapper > div {
-  display: inline-block;
-  white-space: normal;
-}
+  .viewerContentWrapper > div {
+    display: inline-block;
+    white-space: normal;
+  }
 
-.viewerLeftSidePanel {
-  width: 200px;
-  background-color: #323232;
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-  margin-right: 2px;
-  color: #d0d0d0;
-  overflow-y: auto;
-}
+  .viewerLeftSidePanel {
+    width: 200px;
+    background-color: #323232;
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    margin-right: 2px;
+    color: #d0d0d0;
+    overflow-y: auto;
+  }
 
-.viewerContentWrapper > div > .sidePanelBody {
-  background: rgba(50, 50, 50, 1);
-  word-break: break-all;
-  display: table;
-  width: 100%;
-  border: 1px solid #3e3f3a;
-}
+  .viewerContentWrapper > div > .sidePanelBody {
+    background: rgba(50, 50, 50, 1);
+    word-break: break-all;
+    display: table;
+    width: 100%;
+    border: 1px solid #3e3f3a;
+  }
 
-.viewerContentWrapper > div > div.sidePanelBody > div {
-  width: 100%;
-  height: 100%;
-}
+  .viewerContentWrapper > div > div.sidePanelBody > div {
+    width: 100%;
+    height: 100%;
+  }
 
-.studyDesc {
-  font-weight: bold;
-  font-size: 13px;
-  text-align: center;
-  background: rgb(88 84 83);
-  color: #d0d0d0;
-  padding: 5px;
-}
+  .studyDesc {
+    font-weight: bold;
+    font-size: 13px;
+    text-align: center;
+    background: rgb(88 84 83);
+    color: #d0d0d0;
+    padding: 5px;
+  }
 
-.ps {
-  overflow: hidden !important;
-  overflow-anchor: none;
-  -ms-overflow-style: none;
-  touch-action: auto;
-  -ms-touch-action: auto;
-}
+  .ps {
+    overflow: hidden !important;
+    overflow-anchor: none;
+    -ms-overflow-style: none;
+    touch-action: auto;
+    -ms-touch-action: auto;
+  }
 
-.viewerLeftSidePanel .viewernavigatorwrapper {
-  display: flex;
-  width: 196px;
-  height: 84px;
-  padding: 1px 2px 1px 8px;
-  margin: 6px 0 6px 1px;
-  border-radius: 2px;
-  border: 1px solid #404040;
-}
+  .viewerLeftSidePanel .viewernavigatorwrapper {
+    display: flex;
+    width: 196px;
+    height: 84px;
+    padding: 1px 2px 1px 8px;
+    margin: 6px 0 6px 1px;
+    border-radius: 2px;
+    border: 1px solid #404040;
+  }
 
-.ui-draggable-handle {
-  -ms-touch-action: none;
-  touch-action: none;
-}
+  .ui-draggable-handle {
+    -ms-touch-action: none;
+    touch-action: none;
+  }
 
-.viewerLeftSidePanel .image-preview {
-  border: 2px solid #252525;
-  cursor: pointer;
-}
+  .viewerLeftSidePanel .image-preview {
+    border: 2px solid #252525;
+    cursor: pointer;
+  }
 
-.viewerLeftSidePanel .viewernavitextwrapper {
-  flex: 1;
-  padding: 3px 1px 3px 4px;
-  vertical-align: top;
-  font-size: 12px;
-}
+  .viewerLeftSidePanel .viewernavitextwrapper {
+    flex: 1;
+    padding: 3px 1px 3px 4px;
+    vertical-align: top;
+    font-size: 12px;
+  }
 
-.viewerSideActive {
-  background: #16477b;
-  background: #16477b80;
-  border: 1px solid #23527b;
-}
+  .viewerSideActive {
+    background: #16477b;
+    background: #16477b80;
+    border: 1px solid #23527b;
+  }
 
-.viewerContent {
-  flex: 1;
-  height: 100%;
-  display: block;
-  background-color: black;
-  color: #d0d0d0;
-  font-size: 13px;
-}
+  .viewerContent {
+    flex: 1;
+    height: 100%;
+    display: block;
+    background-color: black;
+    color: #d0d0d0;
+    font-size: 13px;
+  }
+  .instance_frame_wrapper{
+    min-width: 120px;
+    background-color: #2c2c2c;
+    border: 1px solid #2c2c2c;
+    padding: 5px;
+  }
+  .frame_list{
+    max-height: 500px;
+    overflow-y: auto;
+  }
+  .instance_frame_wrapper ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  .instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+  .frame_content{
+    /* height: 50px; */
+    padding: 10px;
+    display: flex;
+    justify-content: flex-start;
+    color: #ddd;
+    font-size: 12px;
+    border: 1px solid #404040;
+  }
+  .frame_content:hover {
+    /* font-weight: bold; */
+    /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+    cursor: pointer;
+    /* color: #428bca; */
+    border-color: #213a54 !important;
+    background-color: #213a54;
+  }
 </style>

src/views/dictionary/attachment/components/CommonTemplate/TemplateForm.vue

@@ -9,10 +9,10 @@
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Code" prop="Code">
+      <el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
-      <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
+      <el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
         <el-select
           v-model="form.BusinessScenarioEnum"
           style="width:100%;"
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:attachment:export:form:file')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"

src/views/dictionary/attachment/components/CommonTemplate/index.vue

@@ -2,7 +2,8 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
             style="width:150px;"
@@ -16,7 +17,8 @@
 
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
           <el-input
             v-model="searchData.Name"
             style="width:130px;"
@@ -37,7 +39,6 @@
       </el-form>
       <el-button
         type="primary"
-        icon="el-icon-plus"
         style="margin-left:auto;"
         size="small"
         @click="handleAdd"
@@ -57,14 +58,14 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:label:code')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:label:businessScenario')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -76,18 +77,18 @@
 
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:label:name')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:label:description')"
           show-overflow-tooltip
         />
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:label:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -98,30 +99,30 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="上传时间"
+          :label="$t('dictionary:attachment:label:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column label="Action" width="300">
           <template slot-scope="scope">
             <el-button
               type="text"
               @click="handleDownload(scope.row)"
             >
-              下载
+              {{ $t('common:button:download') }}
             </el-button>
             <el-button
               type="text"
               @click="handleEdit(scope.row)"
             >
-              编辑
+              {{ $t('common:action:edit') }}
             </el-button>
             <el-button
               type="text"
               @click="handleDelete(scope.row)"
             >
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -176,9 +177,9 @@ export default {
   },
   methods: {
     handleDelete(row) {
-      this.$confirm('确定删除该文件？').then(() => {
+      this.$confirm(this.$t('dictionary:attachment:export:confirm:delete')).then(() => {
         deleteCommonDocument(row.Id).then(() => {
-          this.$message.success('删除成功')
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.getList()
         })
       })
@@ -195,7 +196,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.currentRow = { FileTypeEnum: FileTypeEnum }
       this.editDialog.visible = true
     },
@@ -208,7 +209,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:action:edit')
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },

src/views/dictionary/attachment/components/EmailTemplate/index.vue

@@ -2,7 +2,8 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
             style="width:150px;"
@@ -16,7 +17,8 @@
 
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
           <el-input
             v-model="searchData.Name"
             style="width:130px;"
@@ -57,14 +59,14 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:label:code')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:label:businessScenario')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -76,7 +78,7 @@
 
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:label:name')"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -92,12 +94,12 @@
         </el-table-column>
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:label:description')"
           show-overflow-tooltip
         />
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:label:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -108,18 +110,18 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="上传时间"
+          :label="$t('dictionary:attachment:label:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
             <el-button
               type="text"
               @click="handleDownload(scope.row)"
             >
-              下载
+              {{ $t('common:button:download') }}
             </el-button>
             <!-- <el-button
               type="text"

src/views/dictionary/attachment/components/ExportTemplate/TemplateForm.vue

@@ -9,7 +9,7 @@
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Code" prop="Code">
+      <el-form-item :label="$t('dictionary:attachment:export:search:code')" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
       <el-form-item
@@ -76,8 +76,9 @@
         :label="$t('dictionary:attachment:export:form:isDeleted')"
       >
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio :label="true">是</el-radio>
-          <el-radio :label="false">否</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">
+            {{ item.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item

src/views/dictionary/attachment/components/ExportTemplate/index.vue

@@ -39,7 +39,6 @@
         </el-form-item>
         <el-button
           type="primary"
-          icon="el-icon-plus"
           style="float: right"
           size="small"
           @click="handleAdd"
@@ -60,7 +59,7 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:export:search:code')"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -120,7 +119,7 @@
           sortable="custom"
         />
 
-        <el-table-column :label="$t('common:action:action')">
+        <el-table-column :label="$t('common:action:action')" width="300">
           <template slot-scope="scope">
             <el-button type="text" @click="PreviewFile(scope.row)">
               {{ $t('common:button:preview') }}
@@ -235,7 +234,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.currentRow = { FileTypeEnum: FileTypeEnum }
       this.editDialog.visible = true
     },
@@ -252,7 +251,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:action:edit')
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },

src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue

@@ -1,100 +1,45 @@
 <template>
-  <el-form
-    ref="sysAttachmentFrom"
-    v-loading="loading"
-    :model="form"
-    label-width="190px"
-    size="small"
-    :rules="rules"
-    class="upload-temporary-file"
-  >
+  <el-form ref="sysAttachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
+    class="upload-temporary-file">
     <div class="base-dialog-body">
-      <el-form-item
-        :label="$t('dictionary:signature:form:FileTypeId')"
-        prop="FileTypeId"
-      >
-        <el-select
-          v-model="form.FileTypeId"
-          style="width: 100%"
-          size="small"
-          filterable
-        >
-          <el-option
-            v-for="item of dictionaryList.Sys_Document"
-            :key="item.Id"
-            :label="item.Value"
-            :value="item.Id"
-          />
+      <el-form-item :label="$t('dictionary:signature:form:FileTypeId')" prop="FileTypeId">
+        <el-select v-model="form.FileTypeId" style="width: 100%" size="small" filterable>
+          <el-option v-for="item of dictionaryList.Sys_Document" :key="item.Id" :label="item.Value" :value="item.Id" />
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
-          <el-upload
-            class="upload-demo"
-            action
-            accept=".pdf"
-            :before-upload="beforeUpload"
-            :http-request="handleUploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemoveFile"
-            :show-file-list="true"
-            :file-list="fileList"
-            :limit="1"
-            :on-exceed="handleExceed"
-            :disabled="form.Type === ''"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              :disabled="form.FileTypeId === ''"
-              :loading="btnLoading"
-              >{{ $t('common:button:check') }}</el-button
-            >
+          <el-upload class="upload-demo" action accept=".pdf" :before-upload="beforeUpload"
+            :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
+            :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed"
+            :disabled="form.Type === ''">
+            <el-button size="small" type="primary" :disabled="form.FileTypeId === ''" :loading="btnLoading">{{
+              $t('common:button:check') }}</el-button>
             <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
               ({{ $t('trials:signature:label:mustBepdf') }})
             </span>
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item
-        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
-        prop="NeedConfirmedUserTypeIdList"
-      >
-        <el-select
-          v-model="form.NeedConfirmedUserTypeIdList"
-          style="width: 100%"
-          multiple
-        >
-          <el-option
-            v-for="item of userTypeOptions"
-            :key="item.Id"
-            :label="item.UserTypeShortName"
-            :value="item.Id"
-          />
+      <el-form-item :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
+        prop="NeedConfirmedUserTypeIdList">
+        <el-select v-model="form.NeedConfirmedUserTypeIdList" style="width: 100%" multiple>
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id" />
         </el-select>
       </el-form-item>
-      <el-form-item
-        :label="$t('dictionary:signature:form:DocUserSignType')"
-        prop="DocUserSignType"
-      >
-        <el-switch
-          v-model="form.DocUserSignType"
-          :active-value="1"
-          :inactive-value="0"
-        >
+      <el-form-item :label="$t('dictionary:signature:form:DocUserSignType')" prop="DocUserSignType">
+        <el-switch v-model="form.DocUserSignType" :active-value="1" :inactive-value="0">
         </el-switch>
       </el-form-item>
-      <el-form-item
-        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
-        prop="SignViewMinimumMinutes"
-      >
-        <el-input-number
-          v-model="form.SignViewMinimumMinutes"
-          controls-position="right"
-          :min="1"
-          :max="50"
-        />
+      <el-form-item :label="$t('dictionary:signature:form:SignViewMinimumMinutes')" prop="SignViewMinimumMinutes">
+        <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:signature:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
+        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="1" :max="1000" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:signature:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
+        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="1" :max="1000" />
       </el-form-item>
       <!-- <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
@@ -105,14 +50,8 @@
     </div>
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item style="text-align: right">
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="form.FileTypeId === '' || form.Name === ''"
-          :loading="saveBtnLoading"
-          @click="handleSave"
-          >{{ $t('common:button:save') }}</el-button
-        >
+        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
+          :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
       </el-form-item>
     </div>
   </el-form>
@@ -141,6 +80,8 @@ export default {
         IsDeleted: false,
         SignViewMinimumMinutes: null,
         DocUserSignType: 0,
+        CurrentStaffTrainDays: null,
+        NewStaffTrainDays: null,
       },
       rules: {
         FileTypeId: [
@@ -198,6 +139,8 @@ export default {
         this.form.IsDeleted = this.data.IsDeleted
         this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
         this.form.DocUserSignType = this.data.DocUserSignType
+        this.form.CurrentStaffTrainDays = this.data.CurrentStaffTrainDays
+        this.form.NewStaffTrainDays = this.data.NewStaffTrainDays
       }
       this.loading = false
     },
@@ -207,7 +150,7 @@ export default {
         .then((res) => {
           this.dictionaryList = { ...res.Result }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 获取用户类型下拉数据
     getUserType() {
@@ -305,13 +248,16 @@ export default {
     width: 80px;
     height: 40px;
   }
+
   .upload-container .el-input--small {
     margin-bottom: 5px;
   }
+
   .upload-container .el-icon-circle-check {
     color: #428bca;
     font-size: 13px;
   }
+
   .account_item_clear {
     .el-tag__close {
       display: none !important;

src/views/dictionary/attachment/components/SignatureTemplate/attachmentForm.vue

@@ -0,0 +1,223 @@
+<template>
+    <el-form ref="attachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
+        class="upload-temporary-file">
+        <div class="base-dialog-body">
+            <el-form-item :label="$t('dictionary:signature:form:FileName')" prop="Name">
+                <el-input v-model="form.Name" clearable></el-input>
+            </el-form-item>
+            <el-form-item :label="$t('dictionary:signature:form:OffLine')" prop="OffLine">
+                <el-switch v-model="form.OffLine" :active-value="true" :inactive-value="false"
+                    :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
+                </el-switch>
+            </el-form-item>
+            <el-form-item :label="$t('dictionary:signature:form:File')">
+                <div class="upload-container">
+                    <el-upload class="upload-demo" action :accept="this.accept.join(',')" :before-upload="beforeUpload"
+                        :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
+                        :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
+                        <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
+                        }}</el-button>
+                        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
+                            ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
+                        </span>
+                    </el-upload>
+                </div>
+            </el-form-item>
+        </div>
+        <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+            <el-form-item style="text-align: right">
+                <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
+                    :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+            </el-form-item>
+        </div>
+    </el-form>
+</template>
+<script>
+import { addOrUpdateSystemDocumentAttachment } from '@/api/dictionary'
+export default {
+    props: {
+        data: {
+            type: Object,
+            default() {
+                return {}
+            },
+        },
+        SystemDocumentId: {
+            type: String,
+            default: ''
+        }
+    },
+
+    data() {
+        return {
+            form: {
+                Id: '',
+                Name: null,
+                FileFormat: null,
+                FileName: null,
+                FilePath: null,
+                FileSize: null,
+                OffLine: false,
+                SystemDocumentId: null
+            },
+            rules: {
+                Name: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:specify'),
+                        trigger: ['change'],
+                    },
+                ],
+            },
+            fileList: [],
+            btnLoading: false,
+            saveBtnLoading: false,
+            loading: false,
+            accept: ['.jpg',
+                '.jpeg',
+                '.png',
+                '.pdf',
+                '.ppt',
+                '.pptx',
+                '.doc',
+                '.docx',
+                '.xls',
+                '.xlsx']
+        }
+    },
+    mounted() {
+        this.initForm()
+    },
+    methods: {
+        async initForm() {
+            this.loading = true
+            if (this.data && this.data.Id) {
+                Object.keys(this.form).forEach(key => {
+                    this.form[key] = this.data[key]
+                })
+                this.fileList = [
+                    {
+                        name: this.data.FileName,
+                        url: this.data.FilePath,
+                        path: this.data.FilePath,
+                    },
+                ]
+            }
+            this.loading = false
+        },
+        beforeUpload(file) {
+            // 检测文件类型是否符合要求
+            if (this.checkFileSuffix(file.name)) {
+                this.fileList = []
+                return true
+            } else {
+                this.$alert(this.$t('trials:signature:label:type').replace("xxx", this.accept.join(", ")))
+
+                return false
+            }
+        },
+        async handleUploadFile(param) {
+            this.loading = true
+            var file = await this.fileToBlob(param.file)
+            const res = await this.OSSclient.put(
+                `/System/DocumentToSign/${param.file.name}${new Date().getTime()}`,
+                file
+            )
+            this.fileList.push({
+                name: param.file.name,
+                path: this.$getObjectName(res.url),
+                url: this.$getObjectName(res.url),
+            })
+            this.form.Name = param.file.name
+            this.form.FileName = param.file.name
+            this.form.FilePath = this.$getObjectName(res.url)
+            this.form.FileSize = param.file.size
+            this.form.FileFormat = param.file.name
+                .substring(param.file.name.lastIndexOf('.'))
+                .toLocaleLowerCase().split('.')[1]
+            this.loading = false
+        },
+        handleSave() {
+            this.$refs.attachmentFrom.validate((valid) => {
+                if (!valid) return false
+                if (!this.form.FilePath)
+                    return this.$alert(this.$t('trials:signature:message:selectFile'))
+                this.saveBtnLoading = true
+                if (this.SystemDocumentId) this.form.SystemDocumentId = this.SystemDocumentId
+                addOrUpdateSystemDocumentAttachment(this.form)
+                    .then((res) => {
+                        this.saveBtnLoading = false
+                        this.$emit('closeDialog')
+                        this.$emit('getList')
+                        this.$message.success(this.$t('common:message:updatedSuccessfully'))
+                    })
+                    .catch(() => {
+                        this.saveBtnLoading = false
+                    })
+            })
+        },
+        handleRemoveFile() {
+            this.fileList = []
+            this.form.FilePath = ''
+            this.form.FileSize = ''
+            this.form.FileFormat = ''
+            this.form.FileName = ''
+        },
+        handlePreview(file) {
+            if (file.fullPath) {
+                window.open(file.fullPath, '_blank')
+            }
+        },
+        handleExceed(files, fileList) {
+            this.$message.warning(this.$t('upload:rule:maxFile1'))
+        },
+        checkFileSuffix(fileName) {
+            var typeArr = [
+                'jpg',
+                'jpeg',
+                'png',
+                'pdf',
+                'ppt',
+                'pptx',
+                'doc',
+                'docx',
+                'xls',
+                'xlsx',
+            ]
+            var extendName = fileName
+                .substring(fileName.lastIndexOf('.') + 1)
+                .toLocaleLowerCase()
+            if (typeArr.indexOf(extendName) !== -1) {
+                return true
+            } else {
+                return false
+            }
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+.upload-temporary-file {
+    .upload-container .el-upload--text {
+        border: none;
+        width: 80px;
+        height: 40px;
+    }
+
+    .upload-container .el-input--small {
+        margin-bottom: 5px;
+    }
+
+    .upload-container .el-icon-circle-check {
+        color: #428bca;
+        font-size: 13px;
+    }
+
+    .account_item_clear {
+        .el-tag__close {
+            display: none !important;
+        }
+    }
+}
+</style>

src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue

@@ -0,0 +1,229 @@
+<template>
+    <div v-if="config.visible">
+        <base-model :config="config">
+            <template slot="dialog-body">
+                <el-button size="mini" type="primary" style="float:right" @click.stop="edit({})">
+                    {{ $t('common:button:add') }}</el-button>
+                <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading"
+                    @sort-change="handleSortByColumn">
+                    <el-table-column type="index" width="60" />
+                    <el-table-column prop="Name" :label="$t('dictionary:signature:attachmentList:FileName')"
+                        sortable="custom" />
+                    <el-table-column prop="OffLine" :label="$t('dictionary:signature:attachmentList:OffLine')"
+                        sortable="custom">
+                        <template slot-scope="scope">
+                            <el-switch v-model="scope.row.OffLine" @change="(val) => OffLine(scope.row, val)"
+                                :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
+                                :inactive-text="$fd('YesOrNo', false)">
+                            </el-switch>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="CreateTime" :label="$t('dictionary:signature:attachmentList:CreateTime')"
+                        sortable="custom" />
+                    <el-table-column :label="$t('common:action:action')" min-width="120px">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="text" @click.stop="preview(scope.row)">
+                                {{ $t('common:button:preview') }}
+                            </el-button>
+                            <el-button size="mini" type="text" @click.stop="edit(scope.row)">
+                                {{ $t('common:button:edit') }}
+                            </el-button>
+                            <!-- <el-button size="mini" type="text" @click.stop="OffLine(scope.row, true)"
+                                :disabled="scope.row.OffLine">
+                                {{ $t('dictionary:signature:attachmentList:OffLine') }}
+                            </el-button> -->
+                            <el-button size="mini" type="text" @click.stop="del(scope.row)">
+                                {{ $t('common:button:delete') }}
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!-- 新增/编辑附件 -->
+                <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
+                    width="800px" custom-class="base-dialog-wrapper">
+                    <attachmentForm v-if="visible" :data="rowData" :SystemDocumentId="SystemDocumentId"
+                        @closeDialog="closeDialog" @getList="getAllList" />
+                </el-dialog>
+            </template>
+        </base-model>
+        <viewer ref="picture_perview2" style="margin: 0 10px"
+            v-if="rowData.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowData.FileFormat.toLowerCase())"
+            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">
+
+            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`" alt="Image" />
+        </viewer>
+        <!-- <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible"
+            v-if="perview_visible" /> -->
+    </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+import attachmentForm from './attachmentForm'
+// import attachmentPreview from './attachmentPreview'
+import { addOrUpdateSystemDocumentAttachment, getSystemDocumentAttachmentList, deleteSystemDocumentAttachment } from '@/api/dictionary'
+const defaultSearchData = () => {
+    return {
+        PageIndex: 1,
+        PageSize: 1000,
+        Asc: false,
+        SortField: null
+    }
+}
+export default {
+    components: {
+        BaseModel,
+        attachmentForm,
+        //  attachmentPreview 
+    },
+    props: {
+        config: {
+            type: Object,
+            default: () => {
+                return {
+                    visible: false,
+                    title: this.$t('dictionary:signature:attachmentList:title'),
+                    width: '800px',
+                }
+            }
+        },
+        SystemDocumentId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            searchData: defaultSearchData(),
+            visible: false,
+            title: null,
+            list: [],
+            rowData: {},
+            loading: false,
+            viewerOptions: {
+                toolbar: {
+                    zoomIn: true,
+                    zoomOut: true,
+                    reset: true,
+                    prev: false,
+                    next: false,
+                    rotateLeft: true,
+                    rotateRight: true,
+                    flipHorizontal: true,
+                    flipVertical: true,
+                }
+            },
+            // perview_visible: false
+        }
+    },
+    watch: {
+        SystemDocumentId: {
+            handler() {
+                this.getList()
+            },
+            immediate: true,
+        }
+    },
+    methods: {
+        closeDialog() {
+            this.visible = false
+        },
+        getAllList() {
+            this.getList()
+            this.$emit("getList")
+        },
+        async del(row) {
+            try {
+                let confirm = await this.$confirm(this.$t("dictionary:signature:attachmentList:message:del"))
+                if (!confirm) return false
+                this.loading = true
+                let res = await deleteSystemDocumentAttachment(row.Id)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getAllList()
+                }
+            } catch (err) {
+                console.log(err)
+                this.loading = false
+            }
+        },
+        edit(row) {
+            this.rowData = Object.assign({}, row)
+            this.visible = true
+        },
+        async getList() {
+            try {
+                if (!this.SystemDocumentId) return false
+                this.loading = true
+                this.searchData.SystemDocumentId = this.SystemDocumentId
+                let res = await getSystemDocumentAttachmentList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.list = res.Result.CurrentPageData
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        async OffLine(row, val) {
+            try {
+                let data = Object.assign({}, row)
+                data.OffLine = val
+                this.loading = true
+                let res = await addOrUpdateSystemDocumentAttachment(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.$t('dictionary:signature:attachmentList:updateSuccessfully')
+                    this.getList()
+                }
+            } catch (err) {
+                this.loading = false
+                row.OffLine = !row.OffLine
+                console.log(err)
+            }
+        },
+        preview(data) {
+            // return this.perview_visible = true
+            this.rowData = Object.assign({}, data)
+            if (['.ppt',
+                '.pptx',
+                '.doc',
+                '.docx',
+                '.xls',
+                '.xlsx'].includes(`.${data.FileFormat.toLowerCase()}`)) {
+                this.$onlyOffice({
+                    path: data.FilePath,
+                    type: data.FileFormat,
+                    title: data.Name
+                })
+            }
+            if (['.jpg',
+                '.jpeg',
+                '.png'].includes(`.${data.FileFormat.toLowerCase()}`)) {
+                this.$nextTick(() => {
+                    this.$refs['picture_perview2'].$viewer.show()
+                })
+            }
+            if (['.pdf'].includes(`.${data.FileFormat.toLowerCase()}`)) {
+                this.$preview({
+                    path: data.Path || data.FilePath,
+                    type: 'pdf',
+                    title: data.Name,
+                })
+            }
+        },
+        // 排序
+        handleSortByColumn(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+    }
+
+}
+</script>

src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue

@@ -0,0 +1,305 @@
+<template>
+    <el-dialog :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+        custom-class="base-dialog-wrapper" :before-close="handleClose">
+        <div v-loading="loading" class="img-container" v-if="visible">
+            <el-card class="box-card left">
+                <div class="title">
+                    {{ $t('dictionary:signature:fileList') }}
+                </div>
+                <div class="left-content">
+                    <!-- 检查层级 -->
+                    <div id="imgList" style="height: 100%; overflow: hidden">
+                        <template v-for="(item, index) in list">
+                            <div :id="`img${item.Id}`" :key="item.Id" :class="{
+                                'is-boxActive': item.Id === rowData.Id,
+                            }" class="img-box" @click="selected(item)">
+                                <div class="file-image">
+                                    <el-image v-if="
+                                        [
+                                            'jpeg',
+                                            'jpg',
+                                            'png',
+                                        ].includes(item.FileFormat)
+                                    " style="width: 100%; height: 100%"
+                                        :src="`${OSSclientConfig.basePath}${item.FilePath}?x-oss-process=image/resize,w_50,h_50/format,png`"
+                                        fit="contain" crossorigin="anonymous" />
+                                    <el-image v-else style="width: 100%; height: 100%" :src="getsrc(item.FileFormat)"
+                                        fit="contain" crossorigin="anonymous" />
+                                </div>
+                                <div v-if="item.Name.length < 15" class="img-text">
+                                    {{ `${index + 1}. ${item.Name}` }}
+                                </div>
+                                <el-tooltip v-else :content="item.Name" placement="bottom">
+                                    <div class="img-text">
+                                        {{ `${index + 1}. ${item.Name}` }}
+                                    </div>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                    </div>
+                </div>
+            </el-card>
+            <!-- 预览图像 -->
+            <el-card class="box-card right">
+                <div style="width: 100%; height: 100%" v-if="[
+                    'jpeg',
+                    'jpg',
+                    'png',
+                ].includes(rowData.FileFormat)">
+                    <imageViewer :rowData="rowData" />
+                </div>
+                <div style="width: 100%; height: 100%" v-else>
+                    <PreviewFile v-if='rowData.FilePath' :file-path="rowData.FilePath" :file-type="rowData.FileFormat"
+                        :title="rowData.Name" />
+                </div>
+            </el-card>
+
+            <!-- <el-card class="box-card" style="width:300px;height:100%;padding: 10px;margin-left:10px;">
+        <CheckForm />
+      </el-card> -->
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import pdf from '@/assets/file_icon/pdf.png'
+import zip from '@/assets/file_icon/zip.png'
+import doc from '@/assets/file_icon/doc.png'
+import docx from '@/assets/file_icon/docx.png'
+import ppt from '@/assets/file_icon/ppt.png'
+import pptx from '@/assets/file_icon/pptx.png'
+import xls from '@/assets/file_icon/xls.png'
+import xlsx from '@/assets/file_icon/xlsx.png'
+import PreviewFile from '@/components/PreviewFile'
+import imageViewer from './image-viewer'
+import { getSystemDocumentAttachmentList } from '@/api/dictionary'
+const defaultSearchData = () => {
+    return {
+        PageIndex: 1,
+        PageSize: 1000,
+        Asc: false,
+        OffLine: false,
+        SortField: null
+    }
+}
+export default {
+    name: 'Notice',
+    components: {
+        PreviewFile,
+        imageViewer
+    },
+    props: {
+        SystemDocumentId: {
+            type: String,
+            default: ''
+        },
+        visible: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            pdf,
+            zip,
+            doc,
+            docx,
+            ppt,
+            pptx,
+            xls,
+            xlsx,
+            rowData: {},
+            list: [],
+            searchData: defaultSearchData(),
+            title: this.$t('dictionary:signature:fileList')
+        }
+    },
+    watch: {
+        SystemDocumentId: {
+            handler() {
+                this.getList()
+            },
+            immediate: true,
+        }
+    },
+    methods: {
+        getsrc(type) {
+            return this[type.toLowerCase()]
+        },
+        selected(row) {
+            this.rowData = row
+        },
+        handleClose() {
+            this.$emit("update:visible", false)
+        },
+        async getList() {
+            try {
+                if (!this.SystemDocumentId) return false
+                this.loading = true
+                this.searchData.SystemDocumentId = this.SystemDocumentId
+                let res = await getSystemDocumentAttachmentList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.list = res.Result.CurrentPageData
+                    this.rowData = this.list[0] || {}
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.img-container {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    padding: 10px;
+    display: flex;
+
+    ::-webkit-scrollbar {
+        width: 7px;
+        height: 7px;
+    }
+
+    ::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        background: #d0d0d0;
+    }
+
+    ::v-deep .el-card__body {
+        padding: 0px;
+    }
+}
+
+.study-desc {
+    padding: 10px 5px;
+    line-height: 20px;
+    background-color: #d5d5d5;
+    font-weight: 500;
+}
+
+.left {
+    width: 220px;
+    height: 100%;
+
+    ::v-deep .el-card__body {
+        height: 100%;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .title {
+        height: 40px;
+        line-height: 40px;
+        border: 1ppx solid;
+        border: 1px solid #ebe7e7;
+        padding-left: 10px;
+        background-color: #4e4e4e;
+        color: #ffffff;
+    }
+
+    .left-content {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    // ::v-deep .el-tabs{
+    //   height: 100%;
+    // }
+    // ::v-deep .el-tabs__header{
+    //   height: 40px;
+    // }
+    // ::v-deep .el-tabs__content{
+    //   flex: 1;
+    //   overflow-y: auto;
+    //   padding: 0;
+    // }
+    .img-box {
+        // position: relative;
+        display: inline-block;
+        box-sizing: border-box;
+        border-bottom: 2px solid #f3f3f3;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        padding: 5px 10px;
+
+        cursor: pointer;
+        // margin-bottom: 5px;
+        padding-left: 5px;
+    }
+
+    .img-text {
+        display: inline-block;
+        width: calc(100% - 60px);
+        margin-left: 5px;
+        height: 50px;
+        line-height: 50px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        /* 用省略号表示溢出的文本 */
+        white-space: nowrap;
+    }
+
+    .img-box:nth-last-child(1) {
+        margin-bottom: 0px;
+    }
+
+    .is-boxActive {
+        // border-color: #409eff;
+        color: #409eff;
+    }
+
+    .is-boxActiv:after {
+        opacity: 0;
+    }
+}
+
+.right {
+    flex: 1;
+    height: 100%;
+    margin-left: 10px;
+
+    ::v-deep .el-card__body {
+        height: 100%;
+        width: 100%;
+    }
+}
+
+.switchBox {
+    width: 100%;
+    margin: 5px 0;
+    color: #4e4e4e;
+
+    .item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 5px;
+    }
+}
+
+.file-image {
+    width: 50px;
+    height: 50px;
+}
+
+::v-deep .el-collapse-item__header {
+    background-color: #d5d5d5;
+}
+
+::v-deep .el-collapse-item__header {
+    min-height: 48px;
+    height: auto;
+}
+
+::v-deep .el-collapse-item__content {
+    padding-bottom: 0;
+}
+</style>

src/views/dictionary/attachment/components/SignatureTemplate/image-viewer.vue

@@ -0,0 +1,381 @@
+/* eslint-disable no-unused-vars */
+<template>
+  <div style="width: 100%; height: 100%">
+    <transition name="viewer-fade">
+      <div ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper" :style="{ 'z-index': 5 }">
+        <!-- Arrow -->
+        <!-- 工具栏 -->
+        <div class="image-viewer__btn image-viewer__actions">
+          <div class="image-viewer__actions__inner">
+            <i class="el-icon-zoom-out" @click="handleActions('zoomOut')" />
+            <i class="el-icon-zoom-in" @click="handleActions('zoomIn')" />
+            <i class="el-image-viewer__actions__divider" />
+            <i class="el-icon-c-scale-to-original" @click="toggleMode" />
+            <i class="el-image-viewer__actions__divider" />
+            <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
+            <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
+          </div>
+        </div>
+        <!-- 图片 -->
+        <div id="image-viewer__canvas" class="image-viewer__canvas">
+          <img  crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`
+            " :style="imgStyle" style="max-width: 100%; max-height: 100%" @load="handleImgLoad" @error="handleImgError"
+            @mousedown="handleMouseDown" />
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script>
+import { on, off } from 'element-ui/src/utils/dom'
+import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
+
+const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
+
+export default {
+  name: 'ImageViewer',
+  props: {
+    onSwitch: {
+      type: Function,
+      default: () => { },
+    },
+    onClose: {
+      type: Function,
+      default: () => { },
+    },
+    rowData:{
+      type: Object,
+      default: () => {
+        return {}
+       },
+    }
+  },
+
+  data() {
+    return {
+      loading: false,
+      transform: {
+        scale: 1,
+        deg: 0,
+        offsetX: 0,
+        offsetY: 0,
+        enableTransition: false,
+      },
+    }
+  },
+  computed: {
+    imgStyle() {
+      const { scale, deg, offsetX, offsetY, enableTransition } = this.transform
+      const style = {
+        transform: `scale(${scale}) rotate(${deg}deg)`,
+        transition: enableTransition ? 'transform .3s' : '',
+        'margin-left': `${offsetX}px`,
+        'margin-top': `${offsetY}px`,
+      }
+      return style
+    },
+  },
+  mounted() {
+    document.getElementById('image-viewer__canvas').onmousewheel = (event) => {
+      if (event.deltaY > 0) {
+        // 缩小
+        this.handleActions('zoomOut', {
+          zoomRate: 0.015,
+          enableTransition: false,
+        })
+      } else {
+        // 放大
+        this.handleActions('zoomIn', {
+          zoomRate: 0.015,
+          enableTransition: false,
+        })
+      }
+      return false
+    }
+    this.deviceSupportInstall()
+  },
+  methods: {
+    hide() {
+      this.deviceSupportUninstall()
+      this.onClose()
+    },
+    deviceSupportInstall() {
+      this._keyDownHandler = (e) => {
+        e.stopPropagation()
+        const keyCode = e.keyCode
+        switch (keyCode) {
+          // ESC
+          case 27:
+            this.hide()
+            break
+          // SPACE
+          case 32:
+            this.toggleMode()
+            break
+          // LEFT_ARROW
+          case 37:
+            this.prev()
+            break
+          // UP_ARROW
+          case 38:
+            this.handleActions('zoomIn')
+            break
+          // RIGHT_ARROW
+          case 39:
+            this.next()
+            break
+          // DOWN_ARROW
+          case 40:
+            this.handleActions('zoomOut')
+            break
+        }
+      }
+      this._mouseWheelHandler = rafThrottle((e) => {
+        const delta = e.wheelDelta ? e.wheelDelta : -e.detail
+        if (delta > 0) {
+          this.handleActions('zoomIn', {
+            zoomRate: 0.015,
+            enableTransition: false,
+          })
+        } else {
+          this.handleActions('zoomOut', {
+            zoomRate: 0.015,
+            enableTransition: false,
+          })
+        }
+      })
+      on(document, 'keydown', this._keyDownHandler)
+
+      on(document, mousewheelEventName, null)
+      // on(document, mousewheelEventName, this._mouseWheelHandler)
+    },
+    deviceSupportUninstall() {
+      off(document, 'keydown', this._keyDownHandler)
+      off(document, mousewheelEventName, this._mouseWheelHandler)
+      this._keyDownHandler = null
+      this._mouseWheelHandler = null
+    },
+    handleImgLoad(e) {
+      this.loading = false
+    },
+    handleImgError(e) {
+      this.loading = false
+      e.target.alt = '加载失败'
+    },
+    handleMouseDown(e) {
+      if (this.loading || e.button !== 0) return
+
+      const { offsetX, offsetY } = this.transform
+      const startX = e.pageX
+      const startY = e.pageY
+      this._dragHandler = rafThrottle((ev) => {
+        this.transform.offsetX = offsetX + ev.pageX - startX
+        this.transform.offsetY = offsetY + ev.pageY - startY
+      })
+      on(document, 'mousemove', this._dragHandler)
+      on(document, 'mouseup', (ev) => {
+        off(document, 'mousemove', this._dragHandler)
+      })
+
+      e.preventDefault()
+    },
+    reset() {
+      this.transform = {
+        scale: 1,
+        deg: 0,
+        offsetX: 0,
+        offsetY: 0,
+        enableTransition: false,
+      }
+    },
+    toggleMode() {
+      if (this.loading) return
+      this.reset()
+    },
+    handleActions(action, options = {}) {
+      if (this.loading) return
+      const { zoomRate, rotateDeg, enableTransition } = {
+        zoomRate: 0.2,
+        rotateDeg: 90,
+        enableTransition: true,
+        ...options,
+      }
+      const { transform } = this
+      switch (action) {
+        case 'zoomOut':
+          if (transform.scale > 0.2) {
+            transform.scale = parseFloat(
+              (transform.scale - zoomRate).toFixed(3)
+            )
+          }
+          break
+        case 'zoomIn':
+          if (transform.scale < 5) {
+            transform.scale = parseFloat(
+              (transform.scale + zoomRate).toFixed(3)
+            )
+          }
+          break
+        case 'clocelise':
+          transform.deg += rotateDeg
+          break
+        case 'anticlocelise':
+          transform.deg -= rotateDeg
+          break
+      }
+      transform.enableTransition = enableTransition
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.image-viewer__wrapper {
+  position: relative;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.image-viewer__btn {
+  position: absolute;
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  opacity: 0.8;
+  cursor: pointer;
+  box-sizing: border-box;
+  user-select: none;
+}
+
+.image-viewer__close {
+  display: none;
+  top: 40px;
+  right: 40px;
+  width: 40px;
+  height: 40px;
+  font-size: 40px;
+}
+
+.image-viewer_desc {
+  position: absolute;
+  top: 40px;
+  left: 40px;
+  font-size: 15px;
+  padding: 5px;
+  height: 30px;
+  width: 70px;
+  line-height: 20px;
+  text-align: center;
+  color: #fff;
+  background-color: #606266;
+  border-color: #fff;
+  z-index: 1;
+  border-radius: 17px;
+  // border-radius: 2%;
+}
+
+.image-viewer__canvas {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.image-viewer__actions {
+  left: 50%;
+  bottom: 30px;
+  transform: translateX(-50%);
+  width: 282px;
+  height: 44px;
+  padding: 0 23px;
+  background-color: #606266;
+  border-color: #fff;
+  border-radius: 22px;
+}
+
+.image-viewer__actions__inner {
+  width: 100%;
+  height: 100%;
+  text-align: justify;
+  cursor: default;
+  font-size: 23px;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+
+.image-viewer__next,
+.image-viewer__prev {
+  top: 50%;
+  width: 44px;
+  height: 44px;
+  font-size: 24px;
+  color: #fff;
+  background-color: #606266;
+  border-color: #fff;
+}
+
+.image-viewer__prev {
+  transform: translateY(-50%);
+  left: 40px;
+}
+
+.image-viewer__next {
+  transform: translateY(-50%);
+  right: 40px;
+  text-indent: 2px;
+}
+
+.image-viewer__mask {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  opacity: 0.5;
+  // background:#000
+}
+
+.viewer-fade-enter-active {
+  animation: viewer-fade-in 0.3s;
+}
+
+.viewer-fade-leave-active {
+  animation: viewer-fade-out 0.3s;
+}
+
+@keyframes viewer-fade-in {
+  0% {
+    transform: translate3d(0, -20px, 0);
+    opacity: 0;
+  }
+
+  100% {
+    transform: translate3d(0, 0, 0);
+    opacity: 1;
+  }
+}
+
+@keyframes viewer-fade-out {
+  0% {
+    transform: translate3d(0, 0, 0);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translate3d(0, -20px, 0);
+    opacity: 0;
+  }
+}
+</style>

src/views/dictionary/attachment/components/SignatureTemplate/index.vue

@@ -1,81 +1,95 @@
 <template>
   <BaseContainer>
+    <template slot="title-container">
+      <el-row v-if="isSystem" style="width: 100%;">
+        <el-col :span="12">
+          <h3>{{ TITLE }}</h3>
+        </el-col>
+        <el-col :span="12" style="text-align:right;">
+          <h3>
+            <Pagination class="page" :total="total" :page.sync="searchData.pageIndex" :limit.sync="searchData.pageSize"
+              layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;"
+              @pagination="getList" />
+            <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')"
+              @click="handleReset" />
+          </h3>
+        </el-col>
+      </el-row>
+    </template>
     <template slot="search-container">
       <el-form :inline="true" size="small">
         <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
-          <el-select v-model="searchData.FileTypeId" style="width: 150px">
-            <el-option
-              v-for="item of dict.type.Sys_Document"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="searchData.FileTypeId" style="width: 150px" clearable>
+            <el-option v-for="item of $d.Sys_Document" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('dictionary:signature:search:Name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
-
+        <el-form-item :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')">
+          <el-select v-model="searchData.UserTypeId" style="width: 150px" clearable>
+            <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName"
+              :value="item.Id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('dictionary:signature:table:IsDeleted')">
+          <el-select v-model="searchData.IsDeleted" style="width: 150px" clearable>
+            <el-option v-for="item of $d.TrainingStatus" :key="item.id" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('dictionary:signature:table:DocUserSignType')">
+          <el-select v-model="searchData.DocUserSignType" style="width: 150px" clearable>
+            <el-option v-for="item of $d.ReadingYesOrNo" :key="item.id" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('dictionary:signature:table:createTime')">
+          <el-date-picker v-model="timeList" @change="changeTimeList" value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']" type="datetimerange">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <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-button type="primary" size="small" @click="handleAdd">
+            {{ $t('common:button:new') }}
+          </el-button>
+          <el-button type="primary" size="small" :disabled="multipleSelection.length <= 0"
+            @click="publishSystemDocument(multipleSelection)">
+            {{ $t('dictionary:signature:button:publish') }}
+          </el-button>
+          <el-button type="primary" size="small" :disabled="multipleSelection.length <= 0"
+            @click="handleRepeal(multipleSelection)">
+            {{ $t('common:button:revoke') }}
+          </el-button>
         </el-form-item>
       </el-form>
-      <el-button
-        type="primary"
-        icon="el-icon-plus"
-        style="margin-left: auto; margin-bottom: 10px"
-        size="small"
-        @click="handleAdd"
-      >
-        {{ $t('common:button:new') }}
-      </el-button>
+
     </template>
     <template slot="main-container">
-      <el-table
-        v-adaptive="{ bottomOffset: 60 }"
-        v-loading="loading"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-      >
-        <el-table-column type="index" width="40" />
-        <el-table-column
-          prop="FileType"
-          :label="$t('dictionary:signature:table:FileType')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          prop="Name"
-          :label="$t('dictionary:signature:table:Name')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
+        @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
+        <!-- <el-table-column type="index" width="40" /> -->
+        <el-table-column type="selection" width="55" :selectable="handleSelectable">
+        </el-table-column>
+        <el-table-column prop="FileType" :label="$t('dictionary:signature:table:FileType')" show-overflow-tooltip
+          sortable="custom" min-width="120px" />
+        <el-table-column prop="Name" :label="$t('dictionary:signature:table:Name')" show-overflow-tooltip
+          sortable="custom" min-width="120px" />
 
-        <el-table-column
-          prop="SignViewMinimumMinutes"
-          :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="110"
-        />
-        <el-table-column
-          prop="NeedConfirmedUserTypes"
-          :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="SignViewMinimumMinutes" :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
+          show-overflow-tooltip sortable="custom" min-width="200px" />
+        <el-table-column prop="CurrentStaffTrainDays" :label="$t('dictionary:signature:table:CurrentStaffTrainDays')"
+          show-overflow-tooltip sortable="custom" min-width="200px" />
+        <el-table-column prop="NewStaffTrainDays" :label="$t('dictionary:signature:table:NewStaffTrainDays')"
+          show-overflow-tooltip sortable="custom" min-width="200px" />
+        <el-table-column prop="NeedConfirmedUserTypes" :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             {{
               scope.row.NeedConfirmedUserTypes
@@ -84,12 +98,8 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="IsDeleted"
-          :label="$t('dictionary:signature:table:IsDeleted')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column prop="IsDeleted" :label="$t('dictionary:signature:table:IsDeleted')" show-overflow-tooltip
+          sortable="custom" min-width="120px">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsDeleted" type="danger">{{
               $fd('TrainingStatus', scope.row.IsDeleted)
@@ -99,25 +109,30 @@
             }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="DocUserSignType"
-          :label="$t('dictionary:signature:table:DocUserSignType')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="90"
-        >
+        <el-table-column prop="IsPublish" :label="$t('dictionary:signature:table:IsPublish')" show-overflow-tooltip
+          sortable="custom" min-width="120px">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.IsPublish ? 'primary' : 'danger'">{{
+              $fd('AttachmentPublishStatus', scope.row.IsPublish)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="DocUserSignType" :label="$t('dictionary:signature:table:DocUserSignType')"
+          show-overflow-tooltip sortable="custom" min-width="150px">
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="CreateTime"
-          :label="$t('dictionary:signature:table:CreateTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column prop="AttachmentCount" :label="$t('dictionary:signature:table:AttachmentCount')"
+          show-overflow-tooltip sortable="custom" min-width="150px">
+          <template slot-scope="scope">
+            <el-button type="text" @click.stop="openAttachment(scope.row)">{{ scope.row.AttachmentCount }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="CreateTime" :label="$t('dictionary:signature:table:CreateTime')" show-overflow-tooltip
+          sortable="custom" min-width="180px" />
 
-        <el-table-column :label="$t('common:action:action')" min-width="100">
+        <el-table-column :label="$t('common:action:action')" min-width="220px" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="handlePreview(scope.row)">
               {{ $t('common:button:preview') }}
@@ -125,11 +140,11 @@
             <el-button type="text" @click="handleEdit(scope.row)">
               {{ $t('common:button:edit') }}
             </el-button>
-            <el-button
-              :disabled="scope.row.IsDeleted"
-              type="text"
-              @click="handleRepeal(scope.row)"
-            >
+            <el-button :disabled="scope.row.IsPublish || scope.row.IsDeleted" type="text"
+              @click="publishSystemDocument([scope.row])">
+              {{ $t('dictionary:signature:button:publish') }}
+            </el-button>
+            <el-button :disabled="scope.row.IsDeleted" type="text" @click="handleRepeal([scope.row])">
               {{ $t('common:button:revoke') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
@@ -139,63 +154,43 @@
         </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" v-if="!isSystem" />
 
       <!-- 新增/编辑 -->
-      <el-dialog
-        v-if="editVisible"
-        :visible.sync="editVisible"
-        :close-on-click-modal="false"
-        :title="title"
-        width="600px"
-        custom-class="base-dialog-wrapper"
-      >
-        <TemplateForm
-          :data="currentRow"
-          @closeDialog="closeDialog"
-          @getList="getList"
-        />
+      <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title"
+        width="600px" custom-class="base-dialog-wrapper">
+        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
       </el-dialog>
-
+      <!--附件列表-->
+      <attachmentList v-if="config.visible" :config="config" :SystemDocumentId="SystemDocumentId" @getList="getList" />
       <!-- 预览文件 -->
-      <el-dialog
-        v-if="previewVisible"
-        :visible.sync="previewVisible"
-        :title="$t('common:button:preview')"
-        :fullscreen="true"
-        append-to-body
-        custom-class="base-dialog-wrapper"
-      >
-        <div
-          class="base-modal-body"
-          style="border: 2px solid #ccc; padding: 10px"
-        >
-          <PreviewFile
-            v-if="previewVisible"
-            :file-path="currentPath"
-            :file-type="currentType"
-          />
+      <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
+        :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
+        <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+          <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
         </div>
       </el-dialog>
     </template>
   </BaseContainer>
 </template>
 <script>
-import { getSystemDocumentList, deleteSystemDocument } from '@/api/dictionary'
-import { userAbandonDoc } from '@/api/trials'
+import { getSystemDocumentList, deleteSystemDocument, publishSystemDocument, outLineSystemDocument } from '@/api/dictionary'
+import { userAbandonDoc, getTrialUserTypeList } from '@/api/trials'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import TemplateForm from './TemplateForm'
+
+import attachmentList from './attachmentList'
 import PreviewFile from '@/components/PreviewFile/index'
 const searchDataDefault = () => {
   return {
     FileTypeId: '',
+    BeginCreateTime: null,
+    EndCreateTime: null,
+    IsDeleted: null,
+    DocUserSignType: null,
+    UserTypeId: null,
     Name: '',
     PageIndex: 1,
     PageSize: 20,
@@ -203,8 +198,18 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'SignatureTemplate',
-  components: { BaseContainer, Pagination, TemplateForm, PreviewFile },
+  components: { BaseContainer, Pagination, TemplateForm, PreviewFile, attachmentList },
   dicts: ['Sys_Document'],
+  props: {
+    isSystem: {
+      type: Boolean,
+      default: false
+    },
+    TITLE: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -217,12 +222,74 @@ export default {
       previewVisible: false,
       title: '',
       loading: false,
+      userTypeOptions: [],
+      timeList: [],
+      attachment_Visible: false,
+      SystemDocumentId: null,
+      config: {
+        visible: false,
+        title: this.$t('dictionary:signature:attachmentList:title'),
+        width: '800px',
+      },
+      multipleSelection: []
     }
   },
   mounted() {
     this.getList()
+    this.getUserType()
   },
   methods: {
+    handleSelectable(row) {
+      return !row.IsDeleted
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    // 发布
+    async publishSystemDocument(list) {
+      try {
+        let confirm = await this.$confirm(this.$t('dictionary:signature:confirm:publishFile'), {
+          type: 'warning',
+          distinguishCancelAndClose: true,
+        })
+        if (!confirm) return false
+        let data = {
+          ids: list.map(item => item.Id)
+        }
+        this.loading = true
+        let res = await publishSystemDocument(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.getList()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    openAttachment(row) {
+      this.SystemDocumentId = row.Id
+      this.config.visible = true
+    },
+    changeTimeList() {
+      if (this.timeList) {
+        this.searchData.BeginCreateTime = this.timeList[0]
+        this.searchData.EndCreateTime = this.timeList[1]
+      } else {
+        this.searchData.BeginCreateTime = null
+        this.searchData.EndCreateTime = null
+      }
+    },
+    // 获取用户类型下拉数据
+    getUserType() {
+      getTrialUserTypeList()
+        .then((res) => {
+          this.userTypeOptions = res.Result
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
     // 获取系统文件数据
     getList() {
       this.loading = true
@@ -247,7 +314,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.title = 'Add'
+      this.title = this.$t('common:button:new')
       this.currentRow = {}
       this.editVisible = true
     },
@@ -262,7 +329,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.title = 'Edit'
+      this.title = this.$t('common:action:edit')
       this.currentRow = { ...row }
       this.editVisible = true
     },
@@ -273,8 +340,11 @@ export default {
         distinguishCancelAndClose: true,
       })
         .then(() => {
+          let data = {
+            Ids: row.map(item => item.Id)
+          }
           this.loading = true
-          userAbandonDoc(row.Id, true)
+          outLineSystemDocument(data)
             .then((res) => {
               this.loading = false
               if (res.IsSuccess) {
@@ -288,7 +358,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 删除
     handleDelete(row) {
@@ -318,6 +388,7 @@ export default {
     // 关闭弹窗
     closeDialog() {
       this.editVisible = false
+      this.attachment_Visible = false
     },
     // 重置
     handleReset() {

src/views/dictionary/attachment/components/UploadTemplate/TemplateForm.vue

@@ -9,10 +9,10 @@
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Code" prop="Code">
+      <el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
-      <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
+      <el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
         <el-select
           v-model="form.BusinessScenarioEnum"
           style="width: 100%"
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:attachment:label:file')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -57,7 +57,7 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="文件名" prop="Name">
+      <el-form-item :label="$t('dictionary:attachment:label:name')" prop="Name">
         <el-input v-model="form.Name" />
       </el-form-item>
       <el-form-item
@@ -66,7 +66,7 @@
       >
         <el-input v-model="form.NameCN" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="是否废除: ">
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:attachment:label:isDeleted')">
         <el-radio-group v-model="form.IsDeleted">
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -76,12 +76,11 @@
           >
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="描述">
+      <el-form-item :label="$t('dictionary:attachment:label:description')">
         <el-input
           v-model="form.Description"
           type="textarea"
           :autosize="{ minRows: 2, maxRows: 4 }"
-          placeholder="请输入内容"
         />
       </el-form-item>
     </div>
@@ -93,7 +92,7 @@
           :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
           :loading="saveBtnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -132,16 +131,16 @@ export default {
       },
       rules: {
         Code: [
-          { required: true, message: 'Please specify', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
         Name: [
-          { required: true, message: 'Please specify', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
         NameCN: [
-          { required: true, message: 'Please specify', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
         BusinessScenarioEnum: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
       },
       fileList: [],
@@ -193,7 +192,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('必须是word/excel格式')
+        this.$alert(this.$t('dictionary:attachment:export:alert:formatFile'))
 
         return false
       }
@@ -220,7 +219,7 @@ export default {
       this.$refs.sysTemplateFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
-          this.$alert('Please select file.')
+          this.$alert(this.$t('dictionary:attachment:message:msg1'))
           return
         }
         this.saveBtnLoading = true
@@ -229,7 +228,7 @@ export default {
             this.saveBtnLoading = false
             this.$emit('closeDialog')
             this.$emit('getList')
-            this.$message.success('Uploaded successfully')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
           })
           .catch(() => {
             this.saveBtnLoading = false
@@ -248,7 +247,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
       var typeArr = ['xls', 'xlsx', 'doc', 'docx']

src/views/dictionary/attachment/components/UploadTemplate/index.vue

@@ -2,7 +2,8 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
             style="width: 150px"
@@ -15,7 +16,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
@@ -35,7 +37,6 @@
         </el-form-item>
         <el-button
           type="primary"
-          icon="el-icon-plus"
           style="float: right"
           size="small"
           @click="handleAdd"
@@ -56,14 +57,14 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:label:code')"
           show-overflow-tooltip
           sortable="custom"
         />
-
+        <!-- 业务场景 -->
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:label:businessScenario')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -76,10 +77,10 @@
             }}
           </template>
         </el-table-column>
-
+        <!-- 文件名称 -->
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:label:name')"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -89,14 +90,16 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 描述 -->
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:label:description')"
           show-overflow-tooltip
         />
+        <!-- 是否废除 -->
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:label:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -109,26 +112,27 @@
             }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 上传时间 -->
         <el-table-column
           prop="UpdateTime"
-          label="上传时间"
+          :label="$t('dictionary:attachment:label:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')" width="300">
           <template slot-scope="scope">
             <el-button type="text" @click="PreviewFile(scope.row)">
               {{ $t('common:button:preview') }}
             </el-button>
             <el-button type="text" @click="handleDownload(scope.row)">
-              下载
+              {{ $t('common:button:download') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -197,12 +201,13 @@ export default {
   },
   methods: {
     handleDelete(row) {
-      this.$confirm('确定删除该模版？').then(() => {
+      // 确定删除该模版？
+      this.$confirm(this.$t('dictionary:attachment:message:msg1')).then(() => {
         deleteCommonDocument(row.Id).then(() => {
-          this.$message.success('删除成功')
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.getList()
         })
-      })
+      }).catch(()=>{})
     },
     PreviewFile(row) {
       let basePath = window.location.origin
@@ -229,7 +234,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.currentRow = { FileTypeEnum: FileTypeEnum }
       this.editDialog.visible = true
     },
@@ -246,7 +251,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:button:edit')
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },

src/views/dictionary/checkConfig/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container my_menu" >
     <el-form :inline="true">
       <el-form-item label="模块">
-        <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable size="small">
+        <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable >
           <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
     <div>
@@ -66,42 +66,30 @@
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN "
-            size="mini"
             type="text"
-            icon="el-icon-top"
             @click="handleUpMove(scope.row)"
           >上移</el-button>
           <el-button
-            size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
           <el-button
             v-if="!(scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN)"
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
           >新增</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN "
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleChildren(scope.row)"
           >Children</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN "
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleCopy(scope.row)"
           >复制到</el-button>
           <el-button
-            size="mini"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
         </template>

src/views/dictionary/institutions/components/CROs.vue

@@ -1,30 +1,29 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="CRO Name:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- CRO Name -->
+        <el-form-item :label="$t('institutions:cros:label:croName')">
           <el-input v-model="searchData.CROName" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-            >Search</el-button
-          >
+          <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"
-            >Reset</el-button
           >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
         <el-button
-          size="small"
           type="primary"
-          style="margin-left: auto"
-          icon="el-icon-plus"
           @click="handleAddCro"
-          >New</el-button
+          >{{ $t('common:button:new') }}</el-button
         >
       </span>
     </div>
@@ -37,30 +36,34 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- CRO Code -->
       <el-table-column
         prop="CROCode"
-        label="CRO Code"
+        :label="$t('institutions:cros:label:croCode')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- CRO Name -->
       <el-table-column
         prop="CROName"
-        label="CRO Name"
+        :label="$t('institutions:cros:label:croName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- CRO NameCN -->
       <el-table-column
         prop="CRONameCN"
-        label="CRO NameCN"
+        :label="$t('institutions:cros:label:croNameCN')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Level -->
       <el-table-column
         prop="IsTrialLevel"
-        label="Level"
+        :label="$t('institutions:cros:label:level')"
         show-overflow-tooltip
         sortable="custom"
       >
@@ -68,20 +71,20 @@
           <span>{{ $fd("IsTrialLevel", String(scope.row.IsTrialLevel)) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="Action" min-width="200">
+      <el-table-column :label="$t('common:action:action')" min-width="200">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            :title="$t('common:button:edit')"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            :title="$t('common:button:delete')"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -160,13 +163,13 @@ export default {
     // 新增CRO
     handleAddCro() {
       this.rowData = {};
-      this.title = "Add";
+      this.title =this.$t('common:button:new');
       this.editVisible = true;
     },
     // 编辑CRO
     handleEdit(row) {
       this.rowData = row;
-      this.title = "Edit";
+      this.title = this.$t('common:action:edit');
       this.editVisible = true;
     },
     // 删除CRO

src/views/dictionary/institutions/components/CroForm.vue

@@ -5,19 +5,23 @@
     :rules="rules"
     class="demo-ruleForm"
     size="small"
-    label-width="120px"
+    label-width="140px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="CRO Name: " prop="CROName">
+      <!-- CRO Name -->
+      <el-form-item :label="$t('institutions:cros:label:croName')" prop="CROName">
         <el-input v-model="form.CROName" />
       </el-form-item>
-      <el-form-item label="CRO NameCN: " prop="CRONameCN">
+      <!-- CRO NameCN -->
+      <el-form-item :label="$t('institutions:cros:label:croNameCN')" prop="CRONameCN">
         <el-input v-model="form.CRONameCN" />
       </el-form-item>
-      <el-form-item label="CRO Code: " prop="CROCode">
+      <!-- CRO Code -->
+      <el-form-item :label="$t('institutions:cros:label:croCode')" prop="CROCode">
         <el-input v-model="form.CROCode" />
       </el-form-item>
-      <el-form-item label="Level: ">
+      <!-- Level -->
+      <el-form-item :label="$t('institutions:cros:label:level')">
         <el-switch
           :disabled="!IsTrialLevel"
           v-model="form.IsTrialLevel"
@@ -30,10 +34,10 @@
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <el-button :disabled="btnLoading" type="primary" @click="handleCancel"
-          >Cancel</el-button
+          >{{ $t('common:button:cancel') }}</el-button
         >
         <el-button type="primary" :loading="btnLoading" @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -67,16 +71,16 @@ export default {
       },
       rules: {
         CROName: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         CRONameCN: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         CROCode: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 50, message: "The maximum length is 50" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
       },
     };
@@ -95,7 +99,7 @@ export default {
           .then((res) => {
             this.btnLoading = false;
             if (res.IsSuccess) {
-              this.$message.success("Saved successfully");
+              this.$message.success(this.$t('common:message:savedSuccessfully'));
               this.$refs["CROForm"].resetFields();
               this.$emit("getList");
               this.$emit("close");

src/views/dictionary/institutions/components/HospitalForm.vue

@@ -8,7 +8,8 @@
     label-width="170px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Site: ">
+      <!-- Site -->
+      <el-form-item :label="$t('institutions:hospitals:label:site')">
         <el-select
           v-model="form.SiteId"
           style="width: 100%"
@@ -25,40 +26,50 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="Hospital CN: " prop="HospitalNameCN">
+      <!-- Hospital CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:hospitalCN')" prop="HospitalNameCN">
         <el-input v-model="form.HospitalNameCN" />
       </el-form-item>
-      <el-form-item label="Hospital EN: " prop="HospitalName">
+      <!-- Hospital EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:hospital')" prop="HospitalName">
         <el-input v-model="form.HospitalName" />
       </el-form-item>
+      <!-- Affiliated University CN -->
       <el-form-item
-        label="Affiliated University CN: "
+        :label="$t('institutions:hospitals:label:universityAffiliatedCN')"
         prop="UniversityAffiliatedCN"
       >
         <el-input v-model="form.UniversityAffiliatedCN" />
       </el-form-item>
+      <!-- Affiliated University EN -->
       <el-form-item
-        label="Affiliated University EN: "
+        :label="$t('institutions:hospitals:label:universityAffiliated')"
         prop="UniversityAffiliated"
       >
         <el-input v-model="form.UniversityAffiliated" />
       </el-form-item>
-      <el-form-item label="Country CN: " prop="CountryCN">
+      <!-- Country CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:countryCN')" prop="CountryCN">
         <el-input v-model="form.CountryCN" />
       </el-form-item>
-      <el-form-item label="Country EN: " prop="Country">
+      <!-- Country EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:country')" prop="Country">
         <el-input v-model="form.Country" />
       </el-form-item>
-      <el-form-item label="Province CN: " prop="ProvinceCN">
+      <!-- Province CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:provinceCN')" prop="ProvinceCN">
         <el-input v-model="form.ProvinceCN" />
       </el-form-item>
-      <el-form-item label="Province EN: " prop="Province">
+      <!-- Province EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:province')" prop="Province">
         <el-input v-model="form.Province" />
       </el-form-item>
-      <el-form-item label="City CN: " prop="CityCN">
+      <!-- City CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:cityCN')" prop="CityCN">
         <el-input v-model="form.CityCN" />
       </el-form-item>
-      <el-form-item label="City EN: " prop="City">
+      <!-- City EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:city')" prop="City">
         <el-input v-model="form.City" />
       </el-form-item>
     </div>
@@ -69,14 +80,14 @@
           size="small"
           type="primary"
           @click="handleCancel"
-          >Cancel</el-button
+          >{{ $t('common:button:cancel') }}</el-button
         >
         <el-button
           size="small"
           type="primary"
           :loading="btnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -121,29 +132,29 @@ export default {
       siteList: [],
       rules: {
         HospitalNameCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         UniversityAffiliated: [
-          { max: 100, message: 'The maximum length is 100' },
+          { max: 100, message: this.$t('common:ruleMessage:maxLength') + ' 100' },
         ],
         UniversityAffiliatedCN: [
-          { max: 100, message: 'The maximum length is 100' },
+          { max: 100, message: this.$t('common:ruleMessage:maxLength') + ' 100' },
         ],
-        Country: [{ max: 50, message: 'The maximum length is 50' }],
+        Country: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
         CountryCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
-        Province: [{ max: 50, message: 'The maximum length is 50' }],
+        Province: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
         ProvinceCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
-        City: [{ max: 50, message: 'The maximum length is 50' }],
+        City: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
         CityCN: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
       },
     }
@@ -184,7 +195,7 @@ export default {
           .then((res) => {
             this.btnLoading = false
             if (res.IsSuccess) {
-              this.$message.success('Saved successfully')
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
               this.$refs['hospitalForm'].resetFields()
               this.$emit('getList')
               this.$emit('close')

src/views/dictionary/institutions/components/Hospitals.vue

@@ -1,29 +1,37 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Hospital:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Hospital -->
+        <el-form-item :label="$t('institutions:hospitals:label:hospital')">
           <el-input v-model="searchData.HospitalName" style="width:100px;" />
         </el-form-item>
-        <el-form-item label="Province:">
+        <!-- Province -->
+        <el-form-item :label="$t('institutions:hospitals:label:province')">
           <el-input v-model="searchData.Province" style="width:100px;" />
         </el-form-item>
-        <el-form-item label="City:">
+        <!-- City -->
+        <el-form-item :label="$t('institutions:hospitals:label:city')">
           <el-input v-model="searchData.City" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">
         <el-button
-          size="small"
           type="primary"
-          style="margin-left:auto;"
-          icon="el-icon-plus"
           @click="handleAddHospital"
-        >New</el-button>
+        >{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
     <!-- hospital列表 -->
@@ -36,92 +44,102 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- Hospital -->
       <el-table-column
         prop="HospitalName"
-        label="Hospital"
+        :label="$t('institutions:hospitals:label:hospital')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Hospital CN -->
       <el-table-column
         prop="HospitalNameCN"
         label="Hospital CN"
+        :label="$t('institutions:hospitals:label:hospitalCN')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- University Affiliated -->
       <el-table-column
         prop="UniversityAffiliated"
-        label="University Affiliated"
+        :label="$t('institutions:hospitals:label:universityAffiliated')"
         min-width="170"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- University Affiliated CN -->
       <el-table-column
         prop="UniversityAffiliatedCN"
-        label="University Affiliated CN"
+        :label="$t('institutions:hospitals:label:universityAffiliatedCN')"
         min-width="170"
         show-overflow-tooltip
         sortable="custom"
       />
-
+      <!-- Country -->
       <el-table-column
         prop="Country"
-        label="Country"
+        :label="$t('institutions:hospitals:label:country')"
         width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Country CN -->
       <el-table-column
         prop="CountryCN"
-        label="Country CN"
+        :label="$t('institutions:hospitals:label:countryCN')"
         width="140"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Province -->
       <el-table-column
         prop="Province"
-        label="Province"
+        :label="$t('institutions:hospitals:label:province')"
         width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Province CN -->
       <el-table-column
         prop="ProvinceCN"
-        label="Province CN"
+        :label="$t('institutions:hospitals:label:provinceCN')"
         width="140"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- City -->
       <el-table-column
         prop="City"
-        label="City"
+        :label="$t('institutions:hospitals:label:city')"
         width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- City CN -->
       <el-table-column
         prop="CityCN"
-        label="City CN"
-        width="120"
+        :label="$t('institutions:hospitals:label:cityCN')"
+        width="130"
         show-overflow-tooltip
         sortable="custom"
       />
 
-      <el-table-column label="Action" width="150">
+      <el-table-column :label="$t('common:action:action')" width="150">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            :title="$t('common:button:edit')"
+            type="text"
             @click="handleEdit(scope.row)"
-          /> 
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            :title="$t('common:button:delete')"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -190,13 +208,13 @@ export default {
     // 新增医院信息
     handleAddHospital() {
       this.rowData = {}
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.editDialog.visible = true
     },
     // 修改医院信息
     handleEdit(row) {
       this.rowData = row
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:action:edit')
       this.editDialog.visible = true
     },
     // 删除医院信息

src/views/dictionary/institutions/components/SiteForm.vue

@@ -9,49 +9,50 @@
     label-width="150px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Site Code: " v-if="form.Id" prop="SiteCode">
+      <!-- Site Code -->
+      <el-form-item :label="$t('institutions:sites:label:siteCode')" v-if="form.Id" prop="SiteCode">
         <el-input v-model="form.SiteCode" disabled />
       </el-form-item>
 
       <!-- 中心名称 -->
       <el-form-item
-        :label="$t('trials:customSite:form:siteName')"
+        :label="$t('institutions:sites:label:siteName')"
         prop="SiteName"
       >
         <el-input v-model="form.SiteName" />
       </el-form-item>
       <!-- 中心名称（CN） -->
       <el-form-item
-        :label="$t('trials:customSite:form:siteName') + '（CN）'"
+        :label="$t('institutions:sites:label:siteNameCN')"
         prop="SiteNameCN"
       >
         <el-input v-model="form.SiteNameCN" />
       </el-form-item>
-
-      <el-form-item label="Alias Name: ">
+      <!-- Alias Name -->
+      <el-form-item :label="$t('institutions:sites:label:aliasName')">
         <el-input v-model="form.AliasName" />
       </el-form-item>
 
       <!-- <el-form-item label="组织机构代码: ">
         <el-input v-model="form.UniqueCode" />
       </el-form-item> -->
-
-      <el-form-item label="Country: " prop="Country">
+      <!-- Country -->
+      <el-form-item :label="$t('institutions:sites:label:country')" prop="Country">
         <el-input v-model="form.Country" />
       </el-form-item>
-
-      <el-form-item label="City: " prop="City">
+      <!-- City -->
+      <el-form-item :label="$t('institutions:sites:label:city')" prop="City">
         <el-input v-model="form.City" />
       </el-form-item>
-      <el-form-item label="Address: " prop="Address">
+      <!-- Address -->
+      <el-form-item :label="$t('institutions:sites:label:address')" prop="Address">
         <el-input v-model="form.Address" />
       </el-form-item>
-
-      <el-form-item label="Affiliated Hospital: ">
+      <!-- Affiliated Hospital -->
+      <el-form-item :label="$t('institutions:sites:label:affiliatedHospital')">
         <el-select
           v-model="form.HospitalId"
           clearable
-          placeholder="Please select"
           style="width: 100%"
         >
           <el-option
@@ -62,20 +63,20 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="Director Name: " prop="DirectorName">
+      <!-- Director Name -->
+      <el-form-item :label="$t('institutions:sites:label:directorName')" prop="DirectorName">
         <el-input v-model="form.DirectorName" />
       </el-form-item>
-
-      <el-form-item label="Director Phone: " prop="DirectorPhone">
+      <!-- Director Phone -->
+      <el-form-item :label="$t('institutions:sites:label:directorPhone')" prop="DirectorPhone">
         <el-input v-model="form.DirectorPhone" />
       </el-form-item>
-
-      <el-form-item label="Contact Name: " prop="ContactName">
+      <!-- Contact Name -->
+      <el-form-item :label="$t('institutions:sites:label:contactName')" prop="ContactName">
         <el-input v-model="form.ContactName" />
       </el-form-item>
-
-      <el-form-item label="Contact Phone: " prop="ContactPhone">
+      <!-- Contact Phone -->
+      <el-form-item :label="$t('institutions:sites:label:contactPhone')" prop="ContactPhone">
         <el-input v-model="form.ContactPhone" />
       </el-form-item>
     </div>
@@ -86,14 +87,14 @@
           size="small"
           type="primary"
           @click="handleCancel"
-          >Cancel</el-button
+          >{{ $t('common:button:cancel') }}</el-button
         >
         <el-button
           size="small"
           type="primary"
           :loading="btnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -133,35 +134,35 @@ export default {
       },
       rules: {
         SiteName: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           // { max: 50, message: 'The maximum length is 50' }
         ],
         SiteNameCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           // { max: 50, message: 'The maximum length is 50' }
         ],
         SiteCode: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         Country: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         City: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         // HospitalId: [
         //   { required: true, message: 'Please specify', trigger: 'blur' }
         // ],
         Address: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
         ],
-        DirectorName: [{ max: 50, message: 'The maximum length is 50' }],
-        DirectorPhone: [{ max: 50, message: 'The maximum length is 50' }],
-        ContactName: [{ max: 50, message: 'The maximum length is 50' }],
-        ContactPhone: [{ max: 50, message: 'The maximum length is 50' }],
+        DirectorName: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        DirectorPhone: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        ContactName: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        ContactPhone: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
       },
       loading: false,
       show: false,
@@ -180,7 +181,7 @@ export default {
           .then((res) => {
             this.btnLoading = false
             if (res.IsSuccess) {
-              this.$message.success('Saved successfully')
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
               this.$refs['siteForm'].resetFields()
               this.$emit('getList')
               this.$emit('close')

src/views/dictionary/institutions/components/Sites.vue

@@ -1,46 +1,49 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Site Name:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Site Name -->
+        <el-form-item :label="$t('institutions:sites:label:siteName')">
           <el-input v-model="searchData.SiteName" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="Alias Name:">
+        <!-- Alias Name -->
+        <el-form-item :label="$t('institutions:sites:label:aliasName')">
           <el-input v-model="searchData.AliasName" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="Country:">
+        <!-- Country -->
+        <el-form-item :label="$t('institutions:sites:label:country')">
           <el-input v-model="searchData.Country" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="City:">
+        <!-- City -->
+        <el-form-item :label="$t('institutions:sites:label:city')">
           <el-input v-model="searchData.City" style="width: 120px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-            >Search</el-button
-          >
+          <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"
-            >Reset</el-button
           >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <div style="margin-left: auto">
         <el-button
           type="primary"
-          size="small"
           icon="el-icon-plus"
           @click="handleAddSystemSite"
           >{{ $t("trial:dictionary:institutions:site:addSystemSite") }}
         </el-button>
         <el-button
           type="primary"
-          size="small"
           style="margin-left: 10px"
-          icon="el-icon-plus"
           @click="handleAddSite"
-          >New
+        >
+          {{ $t('common:button:new') }}
         </el-button>
       </div>
     </div>
@@ -53,23 +56,34 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- Site Code -->
       <el-table-column
         prop="SiteCode"
-        label="Site Code"
+        :label="$t('institutions:sites:label:siteCode')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Site Name -->
       <el-table-column
         prop="SiteName"
-        label="Site Name"
+        :label="$t('institutions:sites:label:siteName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        prop="SiteNameCN"
+        :label="$t('institutions:sites:label:siteNameCN')"
+        min-width="150"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      
+      <!-- Alias Name -->
       <el-table-column
         prop="AliasName"
-        label="Alias Name"
+        :label="$t('institutions:sites:label:aliasName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
@@ -81,83 +95,92 @@
         show-overflow-tooltip
         sortable="custom"
       /> -->
+      <!-- Country -->
       <el-table-column
         prop="Country"
-        label="Country"
+        :label="$t('institutions:sites:label:country')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- City -->
       <el-table-column
         prop="City"
-        label="City"
+        :label="$t('institutions:sites:label:city')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Address -->
       <el-table-column
         prop="Address"
-        label="Address"
+        :label="$t('institutions:sites:label:address')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Affiliated Hospital -->
       <el-table-column
         prop="HospitalName"
-        label="Affiliated Hospital"
+        :label="$t('institutions:sites:label:affiliatedHospital')"
         min-width="180"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Director Name -->
       <el-table-column
         prop="DirectorName"
-        label="Director Name"
+        :label="$t('institutions:sites:label:directorName')"
         min-width="160"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Director Phone -->
       <el-table-column
         prop="DirectorPhone"
-        label="Director Phone"
+        :label="$t('institutions:sites:label:directorPhone')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Contact Name -->
       <el-table-column
         prop="ContactName"
-        label="Contact Name"
+        :label="$t('institutions:sites:label:contactName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Contact Phone -->
       <el-table-column
         prop="ContactPhone"
-        label="Contact Phone"
+        :label="$t('institutions:sites:label:contactPhone')"
         min-width="160"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- CreateTime -->
       <el-table-column
         prop="CreateTime"
-        label="CreateTime"
+        :label="$t('institutions:sites:label:createTime')"
         min-width="160"
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column label="Action" fixed="right" width="150">
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            :title="$t('common:button:edit')"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            :title="$t('common:button:delete')"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -357,7 +380,7 @@ export default {
   data() {
     return {
       editVisible: false,
-      title: "Add",
+      title: this.$t('common:button:new'),
       searchData: searchDataDefault(),
       list: [],
       total: 0,
@@ -439,13 +462,13 @@ export default {
     // 新增Site信息
     handleAddSite() {
       this.rowData = {};
-      this.title = "Add";
+      this.title = this.$t('common:button:new');
       this.editVisible = true;
     },
     // 编辑Site信息
     handleEdit(row) {
       this.rowData = row;
-      this.title = "Edit";
+      this.title = this.$t('common:action:edit');
       this.editVisible = true;
     },
     // 删除Site

src/views/dictionary/institutions/components/SponsorForm.vue

@@ -8,16 +8,20 @@
     label-width="150px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Sponsor Name: " prop="SponsorName">
+      <!-- Sponsor Name -->
+      <el-form-item :label="$t('institutions:sponsors:label:sponsorName')" prop="SponsorName">
         <el-input v-model="form.SponsorName" />
       </el-form-item>
-      <el-form-item label="Sponsor NameCN: " prop="SponsorName">
+      <!-- Sponsor NameCN -->
+      <el-form-item :label="$t('institutions:sponsors:label:sponsorNameCN')" prop="SponsorName">
         <el-input v-model="form.SponsorNameCN" />
       </el-form-item>
-      <el-form-item label="Sponsor Code: " prop="SponsorCode">
+      <!-- Sponsor Code -->
+      <el-form-item :label="$t('institutions:sponsors:label:sponsorCode')" prop="SponsorCode">
         <el-input v-model="form.SponsorCode" />
       </el-form-item>
-      <el-form-item label="Level: ">
+      <!-- Level -->
+      <el-form-item :label="$t('institutions:sponsors:label:level')">
         <el-switch
           :disabled="!IsTrialLevel"
           v-model="form.IsTrialLevel"
@@ -34,15 +38,17 @@
           size="small"
           type="primary"
           @click="handleCancel"
-          >Cancel</el-button
         >
+          {{ $t('common:button:cancel') }}
+        </el-button>
         <el-button
           size="small"
           type="primary"
           :loading="btnLoading"
           @click="handleSave"
-          >Save</el-button
         >
+          {{ $t('common:button:save') }}
+        </el-button>
       </el-form-item>
     </div>
   </el-form>
@@ -75,16 +81,16 @@ export default {
       },
       rules: {
         SponsorName: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         SponsorNameCN: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         SponsorCode: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 50, message: "The maximum length is 50" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
       },
     };
@@ -103,7 +109,7 @@ export default {
           .then((res) => {
             this.btnLoading = false;
             if (res.IsSuccess) {
-              this.$message.success("Saved successfully");
+              this.$message.success(this.$t('common:message:savedSuccessfully'));
               this.$refs["sponsorForm"].resetFields();
               this.$emit("getList");
               this.$emit("close");

src/views/dictionary/institutions/components/Sponsors.vue

@@ -1,30 +1,30 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Sponsor Name:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Sponsor Name -->
+        <el-form-item :label="$t('institutions:sponsors:label:sponsorName')">
           <el-input v-model="searchData.SponsorName" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-            >Search</el-button
-          >
+          <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"
-            >Reset</el-button
           >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
         <el-button
-          size="small"
           type="primary"
           style="margin-left: auto"
-          icon="el-icon-plus"
           @click="handleAddSponsor"
-          >New</el-button
+          >{{ $t('common:button:new') }}</el-button
         >
       </span>
     </div>
@@ -37,30 +37,34 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- Sponsor Code -->
       <el-table-column
         prop="SponsorCode"
-        label="Sponsor Code"
+        :label="$t('institutions:sponsors:label:sponsorCode')"
         min-width="100"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Sponsor Name -->
       <el-table-column
         prop="SponsorName"
-        label="Sponsor Name"
+        :label="$t('institutions:sponsors:label:sponsorName')"
         min-width="100"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Sponsor NameCN -->
       <el-table-column
         prop="SponsorNameCN"
-        label="Sponsor NameCN"
+        :label="$t('institutions:sponsors:label:sponsorNameCN')"
         min-width="100"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Level -->
       <el-table-column
         prop="IsTrialLevel"
-        label="Level"
+        :label="$t('institutions:sponsors:label:level')"
         show-overflow-tooltip
         sortable="custom"
       >
@@ -68,20 +72,20 @@
           <span>{{ $fd("IsTrialLevel", String(scope.row.IsTrialLevel)) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="Action" min-width="150">
+      <el-table-column :label="$t('common:action:action')" min-width="150">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            :title="$t('common:button:edit')"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            :title="$t('common:button:delete')"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -160,13 +164,13 @@ export default {
     // 新增Sponsor
     handleAddSponsor() {
       this.rowData = {};
-      this.title = "Add";
+      this.title = this.$t('common:button:new');
       this.editVisible = true;
     },
     // 编辑Sponsor
     handleEdit(row) {
       this.rowData = row;
-      this.title = "Edit";
+      this.title = this.$t('common:action:edit');
       this.editVisible = true;
     },
     // 删除Sponsor

src/views/dictionary/institutions/index.vue

@@ -1,16 +1,20 @@
 <template>
   <div class="institution-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane label="Hospitals" name="Hospitals">
+      <!-- Hospitals -->
+      <el-tab-pane :label="$t('institutions:tab:hospitals')" name="Hospitals">
         <Hospitals v-if="activeTab === 'Hospitals'" />
       </el-tab-pane>
-      <el-tab-pane label="Sites" name="Sites">
+      <!-- Sites -->
+      <el-tab-pane :label="$t('institutions:tab:sites')" name="Sites">
         <Sites v-if="activeTab === 'Sites'" />
       </el-tab-pane>
-      <el-tab-pane label="CROs" name="CROs">
+      <!-- CROs -->
+      <el-tab-pane :label="$t('institutions:tab:CROs')" name="CROs">
         <CROs v-if="activeTab === 'CROs'" />
       </el-tab-pane>
-      <el-tab-pane label="Sponsors" name="Sponsors">
+      <!-- Sponsors -->
+      <el-tab-pane :label="$t('institutions:tab:sponsors')" name="Sponsors">
         <Sponsors v-if="activeTab === 'Sponsors'" />
       </el-tab-pane>
     </el-tabs>

src/views/dictionary/newdictionary/bool/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -12,12 +12,24 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
       </span>
     </div>
     <el-table
@@ -68,25 +80,22 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/components/DictionaryChild.vue

@@ -63,18 +63,16 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/enum/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -12,12 +12,24 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
       </span>
     </div>
     <el-table
@@ -68,25 +80,22 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/list/components/BatchAddForm.vue

@@ -183,16 +183,13 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="el-icon-plus"
                 @click="handleAdd"
               >{{ $t('common:button:new') }}</el-button>
             </template>
             <template slot-scope="scope">
               <!-- 删除 -->
               <el-button
-                size="mini"
                 type="text"
-                icon="el-icon-delete"
                 @click="handleDelete(scope.$index)"
               >{{ $t('common:button:delete') }}</el-button>
             </template>

src/views/dictionary/newdictionary/list/components/DictionaryChild.vue

@@ -65,15 +65,13 @@
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/list/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -15,13 +15,25 @@
           <el-input v-model="searchData.KeyInfo" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
-        <el-button type="primary" size="mini" @click="handleBatchAdd">批量新建</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleBatchAdd">批量新建</el-button>
       </span>
     </div>
     <el-table
@@ -86,22 +98,19 @@
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/select/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -12,13 +12,25 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleSetting">配置字典分组</el-button>
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleSetting">配置字典分组</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
       </span>
     </div>
     <el-table
@@ -72,22 +84,19 @@
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/setting/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="Code:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -10,12 +10,24 @@
           <el-input v-model="searchData.KeyName" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">New</el-button>
+        <el-button type="primary" @click="handleAdd">New</el-button>
       </span>
     </div>
     <el-table
@@ -50,18 +62,16 @@
       <el-table-column label="Action" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            编辑
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
-            Delete
+            删除
           </el-button>
         </template>
       </el-table-column>

src/views/dictionary/sign/index.vue

@@ -3,15 +3,25 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
+        <!-- 编号 -->
+        <el-form-item :label="$t('dictionary:sign:label:code')">
           <el-input v-model="searchData.Code" style="width:100px;" />
         </el-form-item>
-        <el-form-item label="模板:">
+        <!-- 模板 -->
+        <el-form-item :label="$t('dictionary:sign:label:name')">
           <el-input v-model="searchData.Name" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">
@@ -20,7 +30,7 @@
           size="mini"
           @click="handleAdd"
         >
-          New
+          {{ $t('common:button:new') }}
         </el-button>
       </span>
 
@@ -37,58 +47,65 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
-
+      <!-- 编号 -->
       <el-table-column
         prop="Code"
-        label="Code"
+        :label="$t('dictionary:sign:label:code')"
         sortable="custom"
         show-overflow-tooltip
       />
+      <!-- 模板 -->
       <el-table-column
         prop="Name"
-        label="模板"
+        :label="$t('dictionary:sign:label:name')"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- 签名内容(EN) -->
       <el-table-column
         prop="Value"
-        label="签名内容(EN)"
+        :label="$t('dictionary:sign:label:value')"
         show-overflow-tooltip
       />
+      <!-- 签名内容(CN) -->
       <el-table-column
         prop="ValueCN"
-        label="签名内容(CN)"
+        :label="$t('dictionary:sign:label:valueCN')"
         show-overflow-tooltip
       />
+      <!-- 更新时间 -->
       <el-table-column
         prop="UpdateTime"
-        label="更新时间"
+        :label="$t('dictionary:sign:label:updateTime')"
         show-overflow-tooltip
         sortable="custom"
       />
-
+      <!-- 创建时间 -->
       <el-table-column
         prop="CreateTime"
-        label="创建时间"
+        :label="$t('dictionary:sign:label:createTime')"
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column label="Action" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            {{ $t('common:button:edit') }}
           </el-button>
+          <!-- 场景配置 -->
           <el-button
             type="text"
             @click="handleConfig(scope.row)"
           >
-            场景配置
+            {{ $t('dictionary:sign:button:config') }}
           </el-button>
 
-          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">
+            {{ $t('common:button:delete') }}
+          </el-button>
 
         </template>
       </el-table-column>
@@ -113,7 +130,7 @@
     <el-dialog
       v-if="configVisible"
       :visible.sync="configVisible"
-      title="场景配置"
+      :title="$t('dictionary:sign:button:config')"
       :fullscreen="true"
       append-to-body
       custom-class="base-dialog-wrapper"
@@ -167,13 +184,13 @@ export default {
     // 新增
     handleAdd() {
       this.rowData = {}
-      this.title = 'Add'
+      this.title = this.$t('common:button:new')
       this.editVisible = true
     },
     // 编辑
     handleEdit(row) {
       this.rowData = { ...row }
-      this.title = 'Edit'
+      this.title = this.$t('common:button:edit')
       this.editVisible = true
     },
     // 删除

src/views/dictionary/template/browser/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item :label="$t('dictionary:browser:search:title')">
           <el-input v-model="searchData.Title" style="width: 100px" />
         </el-form-item>
@@ -23,7 +23,7 @@
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
-        <el-button type="primary" size="mini" @click="handleAdd">
+        <el-button type="primary" @click="handleAdd">
           {{ $t("dictionary:browser:button:add") }}
         </el-button>
       </span>

src/views/dictionary/template/components/AddCriterion.vue

@@ -3,7 +3,7 @@
     ref="organForm"
     v-loading="loading"
     :model="form"
-    label-width="130px"
+    label-width="170px"
     size="small"
     :rules="rules"
   >

src/views/dictionary/template/components/AddDICOMConfig.vue

@@ -8,32 +8,36 @@
         label-width="160px"
         size="small"
       >
-        <el-form-item label="Group: " prop="Group">
+        <el-form-item :label="$t('template:anonymization:label:group')" prop="Group">
           <el-input v-model="form.Group" />
         </el-form-item>
-        <el-form-item label="Element: " prop="Group">
+        <el-form-item :label="$t('template:anonymization:label:element')" prop="Group">
           <el-input v-model="form.Element" />
         </el-form-item>
-        <el-form-item label="tag Description: " prop="Group">
+        <!-- tag Description -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescription')" prop="Group">
           <el-input v-model="form.TagDescription" />
         </el-form-item>
-        <el-form-item label="Tag DescriptionCN: " prop="Group">
+        <!-- Tag DescriptionCN -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')" prop="Group">
           <el-input v-model="form.TagDescriptionCN" />
         </el-form-item>
-        <el-form-item label="Value Representation: " prop="Group">
+        <!-- Value Representation -->
+        <el-form-item :label="$t('template:anonymization:label:valueRepresentation')" prop="Group">
           <el-input v-model="form.ValueRepresentation" />
         </el-form-item>
-        <el-form-item label="Is Fixed: ">
+        <!-- Is Fixed -->
+        <el-form-item :label="$t('template:anonymization:label:isFixed')">
           <el-switch
             v-model="form.IsFixed"
             :active-value="true"
             :inactive-value="false"
           />
         </el-form-item>
-        <el-form-item label="Replace Value: ">
+        <el-form-item :label="$t('template:anonymization:label:valueReplace')">
           <el-input v-model="form.ReplaceValue" />
         </el-form-item>
-        <el-form-item label="Is Enable: ">
+        <el-form-item :label="$t('template:anonymization:label:isEnable')">
           <el-switch
             v-model="form.IsEnable"
             :active-value="true"
@@ -43,8 +47,8 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
     </template>
   </base-model>
 </template>
@@ -82,7 +86,7 @@ export default {
         IsAdd: false
       },
       rules: {
-        Group: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Group: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '' }
     }
@@ -108,7 +112,7 @@ export default {
           this.btnLoading = true
           addOrUpdateSystemAnonymization(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.model_cfg.visible = false
             this.$emit('getList')
           }).catch(() => {

src/views/dictionary/template/components/Anonymization.vue

@@ -2,17 +2,21 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="Group:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Group -->
+        <el-form-item :label="$t('template:anonymization:label:group')">
           <el-input v-model="searchData.Group" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="Element:">
+        <!-- Element -->
+        <el-form-item :label="$t('template:anonymization:label:element')">
           <el-input v-model="searchData.Element" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="Tag Description:">
+        <!-- Tag Description -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescription')">
           <el-input v-model="searchData.TagDescription" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="Tag DescriptionCN:">
+        <!-- Tag DescriptionCN -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')">
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
@@ -29,7 +33,7 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">New</el-button>
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -38,37 +42,42 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
       <el-table-column type="index" width="60" />
+      <!-- Group -->
       <el-table-column
         prop="Group"
-        label="Group"
+        :label="$t('template:anonymization:label:group')"
         show-overflow-tooltip
       />
+      <!-- Element -->
       <el-table-column
         prop="Element"
-        label="Element"
+        :label="$t('template:anonymization:label:element')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- Tag Description -->
       <el-table-column
         prop="TagDescription"
-        label="Tag Description"
+        :label="$t('template:anonymization:label:tagDescription')"
         min-width="110"
       />
+      <!-- Tag DescriptionCN -->
       <el-table-column
         prop="TagDescriptionCN"
-        label="Tag DescriptionCN"
+        :label="$t('template:anonymization:label:tagDescriptionCN')"
         min-width="110"
       />
+      <!-- Value Representation -->
       <el-table-column
         prop="ValueRepresentation"
-        label="Value Representation"
+        :label="$t('template:anonymization:label:valueRepresentation')"
         min-width="110"
       />
-      <el-table-column label="Is Fixed" width="100">
+      <!-- Is Fixed -->
+      <el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsFixed"
@@ -78,12 +87,14 @@
           />
         </template>
       </el-table-column>
+      <!-- Value Replace -->
       <el-table-column
         prop="ReplaceValue"
-        label="Value Replace"
+        :label="$t('template:anonymization:label:valueReplace')"
         min-width="110"
       />
-      <el-table-column label="Is Enable" width="100" fixed="right">
+      <!-- Is Enable -->
+      <el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -93,21 +104,19 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="Action" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            {{ $t('common:button:edit') }}
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
-            Delete
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -153,7 +162,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateSystemAnonymization(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -161,12 +170,12 @@ export default {
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['AddDICOMConfig'].openDialog('New Anonymization', {})
+        this.$refs['AddDICOMConfig'].openDialog(this.$t('common:button:new'), {})
       })
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['AddDICOMConfig'].openDialog('Edit Anonymization', row)
+        this.$refs['AddDICOMConfig'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleDelete(row) {

src/views/dictionary/template/components/ClinicalDataConfig.vue

@@ -2,11 +2,13 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="临床数据名称">
+      <el-form :inline="true" class="base-search-form">
+        <!-- 临床数据名称 -->
+        <el-form-item :label="$t('trials:processCfg:title:clinicalDataCfg')">
           <el-input v-model="searchData.ClinicalDataSetName" />
         </el-form-item>
-        <el-form-item label="数据级别">
+        <!-- 数据级别 -->
+        <el-form-item :label="$t('trials:processCfg:title:dataLevel')">
           <el-select v-model="searchData.ClinicalDataLevel" clearable style="width:120px;">
             <el-option
               v-for="(item,index) of $d.ClinicalLevel"
@@ -16,7 +18,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="传输方式">
+        <!-- 传输方式 -->
+        <el-form-item :label="$t('trials:processCfg:title:transferType')">
           <el-select v-model="searchData.ClinicalUploadType" clearable style="width:120px;">
             <el-option
               v-for="(item,index) of $d.ClinicalUploadType"
@@ -40,7 +43,8 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新增</el-button>
+        <!-- 新增 -->
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -49,132 +53,152 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
-      <el-table-column type="index" width="60" />
+      <el-table-column type="index" width="40" />
+      <!-- 临床数据名称 -->
       <el-table-column
         prop="ClinicalDataSetName"
-        label="临床数据名称"
+        :label="$t('trials:processCfg:title:clinicalDataName')"
         show-overflow-tooltip
+        min-width="160"
       />
+      <!-- 临床数据名称（EN） -->
       <el-table-column
         prop="ClinicalDataSetEnName"
-        label="临床数据名称（EN）"
+        :label="$t('dictionary:clinicalData:label:clinicalDataNameEn')"
         show-overflow-tooltip
+        min-width="190"
       />
+      <!-- 上传人 -->
       <el-table-column
         prop="UploadRole"
-        :label="$t('trials:uploadMonitor:table:uploader')"
+        :label="$t('trials:processCfg:title:uploader')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalDataUploadRole',scope.row.UploadRole) }}
         </template>
       </el-table-column>
+      <!-- 数据级别 -->
       <el-table-column
         prop="ClinicalDataLevel"
-        label="数据级别"
+        :label="$t('trials:processCfg:title:dataLevel')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalLevel',scope.row.ClinicalDataLevel) }}
         </template>
       </el-table-column>
-
+      <!-- 传输方式 -->
       <el-table-column
         prop="ClinicalUploadType"
-        label="传输方式"
+        :label="$t('trials:processCfg:title:transferType')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalUploadType',scope.row.ClinicalUploadType) }}
         </template>
       </el-table-column>
+      <!-- 匹配的阅片标准 -->
       <el-table-column
         prop="CriterionEnumList"
-        :label="$t('trials:auditRecord:table:criterion')"
+        :label="$t('trials:processCfg:label:criterion')"
         show-overflow-tooltip
+        min-width="200"
       >
         <template slot-scope="scope">
           {{ scope.row.CriterionEnumList.map(v => $fd('CriterionType', v)).toString() }}
         </template>
       </el-table-column>
+      <!-- 模板名称 -->
       <el-table-column
         prop="FileName"
-        label="模板名称"
+        :label="$t('trials:processCfg:title:module')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ scope.row.FileName }}
         </template>
       </el-table-column>
+      <!-- 模板英文名称 -->
       <el-table-column
         prop="EnFileName"
-        label="模板英文名称"
+        :label="$t('trials:processCfg:title:enModule')"
         show-overflow-tooltip
+        min-width="140"
       >
         <template slot-scope="scope">
           {{ scope.row.EnFileName }}
         </template>
       </el-table-column>
+      <!-- 状态 -->
       <el-table-column
         prop="IsEnable"
-        label="状态"
+        :label="$t('dictionary:clinicalData:label:status')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable">启用</el-tag>
-          <el-tag v-else type="danger">禁用</el-tag>
+          <!-- <el-tag v-if="scope.row.IsEnable">启用</el-tag>
+          <el-tag v-else type="danger">禁用</el-tag> -->
+          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
+          <el-tag v-else>{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
         </template>
       </el-table-column>
+      <!-- 创建时间 -->
       <el-table-column
         prop="CreateTime"
-        label="创建时间"
+        :label="$t('dictionary:clinicalData:label:CreateTime')"
         show-overflow-tooltip
+        min-width="140"
       />
 
-      <el-table-column label="操作" width="340" fixed="right">
+      <el-table-column :label="$t('common:action:action')" min-width="250" fixed="right">
         <template slot-scope="scope">
+          <!-- 问题配置 -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             :disabled="scope.row.ClinicalUploadType !== 2"
             @click="handleConfigQuestion(scope.row)"
           >
-            问题配置
+            {{ $t('dictionary:clinicalData:button:qsConfig') }}
           </el-button>
+          <!-- 下载 -->
           <el-button
             v-if="$i18n.locale === 'zh'"
-            type="primary"
-            size="mini"
+            type="text"
             :disabled="!scope.row.FileName"
             @click="handleDownloadTpl(scope.row.Path)"
           >
-            下载
+            {{ $t('common:button:download') }}
           </el-button>
+          <!-- 下载 -->
            <el-button
             v-else
-            type="primary"
-            size="mini"
+            type="text"
             :disabled="!scope.row.EnFileName"
             @click="handleDownloadTpl(scope.row.EnPath)"
           >
-            下载
+            {{ $t('common:button:download') }}
           </el-button>
+          <!-- 编辑 -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -184,11 +208,11 @@
       :visible.sync="addOrEditCD.visible"
       :close-on-click-modal="false"
       :title="addOrEditCD.title"
-      width="500px"
+      width="600px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalDataForm ref="addOrEditCD" :data="currentRow" @close="addOrEditCD.visible = false" @getList="getList" />
+      <clinical-data-form ref="addOrEditCD" :data="currentRow" @close="addOrEditCD.visible = false" @getList="getList" />
     </el-dialog>
     <el-dialog
       v-if="QuestionConfigVisible.visible"
@@ -199,7 +223,7 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalQuestionConfig ref="QuestionConfigVisible" :data="currentRow" @close="QuestionConfigVisible.visible = false" @getList="getList" />
+      <clinical-question-config ref="QuestionConfigVisible" :data="currentRow" @close="QuestionConfigVisible.visible = false" @getList="getList" />
     </el-dialog>
   </box-content>
 </template>
@@ -237,7 +261,8 @@ export default {
     handleConfigQuestion(row) {
       this.currentRow = { ...row }
       this.QuestionConfigVisible.visible = true
-      this.QuestionConfigVisible.title = '问题配置'
+      // 问题配置
+      this.QuestionConfigVisible.title = this.$t('dictionary:clinicalData:button:qsConfig')
     },
     // 获取列表信息
     getList() {
@@ -250,13 +275,13 @@ export default {
     // 新增
     handleAdd() {
       this.currentRow = {}
-      this.addOrEditCD.title = '新增'
+      this.addOrEditCD.title = this.$t('common:button:new')
       this.addOrEditCD.visible = true
     },
     // 编辑
     handleEdit(row) {
       this.currentRow = { ...row }
-      this.addOrEditCD.title = '编辑'
+      this.addOrEditCD.title = this.$t('common:action:edit')
       this.addOrEditCD.visible = true
     },
     // 删除
@@ -272,7 +297,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

src/views/dictionary/template/components/ClinicalDataForm.vue

@@ -5,12 +5,13 @@
     :model="form"
     size="small"
     :rules="rules"
-    label-width="110px"
+    label-width="200px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="临床数据名称" prop="ClinicalDataSetEnum">
+      <!-- 临床数据名称 -->
+      <el-form-item :label="$t('trials:processCfg:title:clinicalDataName')" prop="ClinicalDataSetEnum">
         <!-- <el-input v-model="form.ClinicalDataSetName" /> -->
-        <el-select v-model="form.ClinicalDataSetEnum" placeholder="请选择" style="width:100%;">
+        <el-select v-model="form.ClinicalDataSetEnum" style="width:100%;">
           <el-option
             v-for="(item,index) of $d.ClinicalDataType"
             :key="index"
@@ -19,11 +20,10 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item :label="$t('trials:studyList:table:uploader')" prop="UploadRole">
+      <!-- 上传人 -->
+      <el-form-item :label="$t('trials:processCfg:title:uploader')" prop="UploadRole">
         <el-select
           v-model="form.UploadRole"
-          placeholder="请选择"
           style="width:100%;"
           @change="handleUploadRoleChange"
         >
@@ -35,11 +35,10 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="数据级别" prop="ClinicalDataLevel">
+      <!-- 数据级别 -->
+      <el-form-item :label="$t('trials:processCfg:title:dataLevel')" prop="ClinicalDataLevel">
         <el-select
           v-model="form.ClinicalDataLevel"
-          placeholder="请选择"
           style="width:100%;"
         >
           <el-option
@@ -51,11 +50,10 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="传输方式" prop="ClinicalUploadType">
+      <!-- 传输方式 -->
+      <el-form-item :label="$t('trials:processCfg:title:transferType')" prop="ClinicalUploadType">
         <el-select
           v-model="form.ClinicalUploadType"
-          placeholder="请选择"
           style="width:100%;"
         >
           <el-option
@@ -67,13 +65,13 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 阅片标准 -->
       <el-form-item
-        :label="$t('trials:auditRecord:table:criterion')"
+        :label="$t('trials:processCfg:label:criterion')"
         prop="CriterionEnumList"
       >
         <el-select
           v-model="form.CriterionEnumList"
-          placeholder="请选择"
           multiple
           style="width:100%;"
         >
@@ -85,7 +83,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.ClinicalUploadType === 1" label="模板: ">
+      <!-- 模板 -->
+      <el-form-item v-if="form.ClinicalUploadType === 1" :label="$t('trials:processCfg:title:module')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -101,19 +100,21 @@
             :on-exceed="handleExceed"
             :disabled="form.Type === ''"
           >
-            <el-button size="small" type="primary">选择</el-button>
+            <el-button size="small" type="primary">
+              {{ $t('trials:processCfg:button:select') }}
+            </el-button>
             <span
               slot="tip"
               style="margin-left:10px;"
               class="el-upload__tip"
             >
-              (必须是doc/docx格式)
+              {{ $t('system:tip:file:docx') }}
             </span>
           </el-upload>
         </div>
       </el-form-item>
-
-      <el-form-item v-if="form.ClinicalUploadType === 1" label="英文模板: ">
+      <!-- 英文模板 -->
+      <el-form-item v-if="form.ClinicalUploadType === 1" :label="$t('trials:processCfg:title:enModule')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -129,19 +130,21 @@
             :on-exceed="handleExceed"
             :disabled="form.Type === ''"
           >
-            <el-button size="small" type="primary">选择</el-button>
+            <el-button size="small" type="primary">
+              {{ $t('trials:processCfg:button:select') }}
+            </el-button>
             <span
               slot="tip"
               style="margin-left:10px;"
               class="el-upload__tip"
             >
-              (必须是doc/docx格式)
+              {{ $t('system:tip:file:docx') }}
             </span>
           </el-upload>
         </div>
       </el-form-item>
-
-      <el-form-item v-if="form.Id !== ''" label="是否启用">
+      <!-- 是否启用 -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:clinicalData:label:IsEnable')">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
     </div>
@@ -270,7 +273,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('(必须是doc/docx格式)')
+        this.$alert(this.$t('system:tip:file:docx'))
 
         return false
       }
@@ -286,7 +289,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`只允许上传一个文件`)
+      this.$message.warning(this.$t('trials:processCfg:title:onlyOneFile'))
     },
     beforeUploadEnFile(file) {
       // 检测文件类型是否符合要求
@@ -294,7 +297,7 @@ export default {
         this.enFileList = []
         return true
       } else {
-        this.$alert('(必须是doc/docx格式)')
+        this.$alert(this.$t('system:tip:file:docx'))
 
         return false
       }

src/views/dictionary/template/components/ClinicalQuestionConfig.vue

@@ -2,39 +2,49 @@
   <div class="criterion-config">
     <div class="search-form" style="display:flex;justify-content: space-between;">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="名称">
+        <!-- 名称 -->
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:qName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-
+          <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"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <div>
+        <!-- 预览 -->
         <el-button
           :disabled="list.length === 0"
           size="mini"
           type="primary"
           @click="preview.visible = true"
         >
-          预览
+          {{ $t('common:button:preview') }}
         </el-button>
-
+        <!-- 添加 -->
         <el-button
           v-if="Object.keys(data).length > 0 && !data.IsBeUsed"
           size="mini"
           type="primary"
           @click="handleAdd"
         >
-          添加
+          {{ $t('common:button:add') }}
         </el-button>
+        <!-- 应用 -->
         <el-button
           size="mini"
           type="primary"
           @click="handleApply"
         >
-          应用
+          {{ $t('dictionary:clinicalDataQs:button:apply') }}
         </el-button>
       </div>
     </div>
@@ -52,81 +62,92 @@
         label=""
         width="50"
       />
+      <!-- 名称 -->
       <el-table-column
         prop="QuestionName"
-        label="名称"
+        :label="$t('trials:readingUnit:qsList:title:qName')"
         show-overflow-tooltip
       />
+      <!-- 名称(EN) -->
       <el-table-column
         prop="QuestionEnName"
-        label="名称(EN)"
+        :label="$t('trials:readingUnit:qsList:title:qNameEn')"
         show-overflow-tooltip
       />
+      <!-- 题型 -->
       <el-table-column
         prop="Type"
-        label="题型"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalQuestionType',scope.row.ClinicalQuestionType) }}
         </template>
       </el-table-column>
+      <!-- 选项 -->
       <el-table-column
         prop="TypeValue"
-        label="选项"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 是否显示 -->
       <el-table-column
         prop="ClinicalQuestionShowEnum"
-        label="是否显示"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('ShowQuestion',scope.row.ClinicalQuestionShowEnum) }}
         </template>
       </el-table-column>
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:qcCfg:table:isRequired')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo',scope.row.IsRequired) }}
         </template>
       </el-table-column>
+      <!-- 操作 -->
       <el-table-column
         prop=""
-        label="操作"
+        :label="$t('common:action:action')"
         width="250"
         show-overflow-tooltip
         fixed="right"
       >
         <template slot-scope="scope">
+          <!-- 编辑 -->
           <el-button
             v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('trials:readingUnit:qsList:title:edit') }}
           </el-button>
+          <!-- 查看 -->
           <el-button
             v-else
             type="primary"
             size="mini"
             @click="handleLook(scope.row)"
           >
-            查看
+            {{ $t('trials:enrolledReviews:button:view') }}
           </el-button>
+          <!-- 表格问题 -->
           <el-button
             type="primary"
             size="mini"
             :disabled="scope.row.ClinicalQuestionType !== 'table'"
             @click="handleConfig(scope.row)"
           >
-            表格问题
+            {{ $t('trials:readingUnit:qsList:title:tableQs') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
             v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
             type="danger"
@@ -134,7 +155,7 @@
             :disabled="scope.row.IsEnable"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -149,7 +170,7 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalQuestionForm
+      <clinical-question-form
         ref="addOrEdit"
         :list="this.list"
         :clinical-id="clinicalId"
@@ -254,7 +275,8 @@ export default {
       applySystemClinical({
         SystemClinicalId: this.clinicalId
       }).then(res => {
-        this.$message.success('应用成功')
+        // 应用成功！
+        this.$message.success(this.$t('dictionary:clinicalDataQs:message:msg1'))
         this.$emit('close')
       })
     },
@@ -271,19 +293,19 @@ export default {
     handleAdd() {
       this.rowData = { SystemClinicalId: this.data.Id, Id: '' }
       this.type = 'add'
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:add')
       this.addOrEdit.visible = true
     },
     handleLook(row) {
       this.rowData = { ...row }
       this.type = 'look'
-      this.addOrEdit.title = '查看'
+      this.addOrEdit.title = this.$t('trials:enrolledReviews:button:view')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.rowData = { ...row }
       this.type = 'edit'
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('trials:readingUnit:qsList:title:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -298,14 +320,14 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
     },
     handleConfig(row) {
       this.rowData = { ...row }
-      this.config.title = `表格问题`
+      this.config.title = this.$t('trials:readingUnit:qsList:title:tableQs')
       this.config.visible = true
     },
     // 查询

src/views/dictionary/template/components/ClinicalQuestionForm.vue

@@ -6,10 +6,11 @@
     size="small"
     :rules="rules"
     :disabled="type === 'look'"
-    label-width="130px"
+    label-width="180px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="类型" prop="ClinicalQuestionType">
+      <!-- 类型 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="ClinicalQuestionType">
         <el-select v-model="form.ClinicalQuestionType" clearable @change="((val)=>{typeChange(val, form)})">
           <el-option
             v-for="item of $d.ClinicalQuestionType"
@@ -19,31 +20,35 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 问题名称 -->
       <el-form-item
-        label="问题名称"
+        :label="$t('trials:readingUnit:qsList:title:qName')"
         prop="QuestionName"
       >
         <el-input v-model="form.QuestionName" />
       </el-form-item>
+      <!-- 问题名称（EN） -->
       <el-form-item
-        label="问题名称（EN）"
+        :label="$t('dictionary:template:criterionConfig:title:qsNameEn')"
         prop="QuestionEnName"
       >
         <el-input v-model="form.QuestionEnName" />
       </el-form-item>
+      <!-- 选项 -->
       <el-form-item
         v-if="form.ClinicalQuestionType === 'select' || form.ClinicalQuestionType === 'radio' || form.ClinicalQuestionType === 'checkbox'"
-        label="选项"
+        :label="$t('trials:qcCfg:table:typeValue')"
         prop="TypeValue"
       >
         <el-input
           v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
+          :placeholder="$t('trials:qcCfg:message:typeValue')"
         />
       </el-form-item>
+      <!-- 小数位数 -->
       <el-form-item
         v-if="form.ClinicalQuestionType === 'number'"
-        label="小数位数"
+        :label="$t('trials:processCfg:form:digitPlaces')"
         prop="DigitPlaces"
       >
         <el-radio-group
@@ -59,16 +64,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 单位 -->
       <el-form-item
         v-if="form.ClinicalQuestionType === 'number'"
-        label="单位"
+        :label="$t('trials:readingUnit:qsList:title:unit')"
         prop="Unit"
       >
         <el-input
           v-model="form.Unit"
         />
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType !== 'group'" label="是否显示" prop="ClinicalQuestionShowEnum">
+      <el-form-item v-if="form.ClinicalQuestionType !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ClinicalQuestionShowEnum">
         <el-radio-group
           v-model="form.ClinicalQuestionShowEnum"
           @change="((val)=>{isShowQuestionChange(val, form)})"
@@ -82,9 +88,10 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 显示依赖父问题 -->
       <el-form-item
         v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionShowEnum===1"
-        label="显示依赖父问题"
+        :label="$t('trials:readingUnit:qsList:title:parentId')"
         prop="ParentId"
       >
         <el-select
@@ -101,7 +108,7 @@
         </el-select>
       </el-form-item>
       <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ClinicalQuestionShowEnum===1" label="显示触发值" prop="ParentTriggerValue">
+      <el-form-item v-if="form.ParentId && form.ClinicalQuestionShowEnum===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValue">
         <el-select v-model="form.ParentTriggerValue" clearable>
           <el-option
             v-for="item of parentTriggerValOptions"
@@ -111,7 +118,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'table'" label="是否必填" prop="IsRequired">
+      <!-- 是否必填 -->
+      <el-form-item v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'table'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
         <el-radio-group
           v-model="form.IsRequired"
         >
@@ -124,7 +132,8 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType !== 'group'" label="问题分组">
+      <!-- 问题分组 -->
+      <el-form-item v-if="form.ClinicalQuestionType !== 'group'" :label="$t('dictionary:template:criterionConfig:title:groupNameEn')">
         <el-select v-model="form.GroupId" clearable :disabled="isParentExistGroup">
           <el-option
             v-for="group of groupOptions"
@@ -147,7 +156,8 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType !== 'table' && form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'number' && form.ClinicalQuestionType !== 'select'" label="最大长度">
+      <!-- 最大长度 -->
+      <el-form-item v-if="form.ClinicalQuestionType !== 'table' && form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'number' && form.ClinicalQuestionType !== 'select'" :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')">
         <el-input-number
           v-model="form.MaxAnswerLength"
           controls-position="right"
@@ -155,7 +165,8 @@
           :max="2000"
         />
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'table'" label="最大行数">
+      <!-- 最大行数 -->
+      <el-form-item v-if="form.ClinicalQuestionType === 'table'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
         <el-input-number
           v-model="form.MaxQuestionCount"
           controls-position="right"
@@ -163,10 +174,12 @@
           :max="10"
         />
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'upload'" label="最大上传个数">
+      <!-- 最大上传个数 -->
+      <el-form-item v-if="form.ClinicalQuestionType === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
         <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
+      <!-- 序号 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
           controls-position="right"
@@ -227,7 +240,7 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          callback(new Error(this.$t('trials:qcCfg:message:msg1')))
         } else {
           callback()
         }
@@ -264,29 +277,29 @@ export default {
       },
       rules: {
         Type: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
         LesionType: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
-        QuestionName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 300, message: '最大长度为 300' }],
-        QuestionGenre: [{ required: true, message: '请选择', trigger: 'blur' }],
-        TypeValue: [{ required: true, message: '请注明', trigger: 'blur' },
+        QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 300, message: this.$t('common:ruleMessage:maxLength') + ' 300'  }],
+        QuestionGenre: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 500, message: '最大长度为 500' }],
-        DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
-        IsCheckDate: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ClinicalQuestionShowEnum: [{ required: true, message: '请选择', trigger: 'blur' }],
-        IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500'  }],
+        DictionaryCode: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        IsCheckDate: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        ClinicalQuestionShowEnum: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValue: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
-        RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        RelevanceValue: [{ required: true, message: '请选择', trigger: 'blur' }],
-        GroupName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: '最大长度为 50' }]
+        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        RelevanceValue: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        GroupName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }]
       },
       loading: false,
       btnLoading: false,

src/views/dictionary/template/components/ClinicalQuestionTableForm.vue

@@ -9,7 +9,8 @@
     label-width="120px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="类型" prop="ClinicalTableQuestionType">
+      <!-- 类型 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="ClinicalTableQuestionType">
         <el-select
           v-model="form.ClinicalTableQuestionType"
           @change="((val)=>{qsTypeChange(val, form)})"
@@ -23,28 +24,31 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 问题名称 -->
       <el-form-item
         v-if="form.ClinicalTableQuestionType !== 'group'"
-        label="问题名称"
+        :label="$t('trials:readingUnit:qsList:title:qName')"
         prop="QuestionName"
       >
         <el-input
           v-model="form.QuestionName"
         />
       </el-form-item>
+      <!-- 选项 -->
       <el-form-item
-        label="选项"
+        :label="$t('trials:readingUnit:qsList:title:typeValue')"
         v-if="form.ClinicalTableQuestionType === 'select' || form.ClinicalTableQuestionType === 'radio'"
         prop="TypeValue"
       >
         <el-input
           v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
+          :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
         />
       </el-form-item>
+      <!-- 小数位数 -->
       <el-form-item
         v-if="form.ClinicalTableQuestionType === 'number'"
-        label="小数位数"
+        :label="$t('trials:readingUnit:qsList:title:digitPlaces')"
       >
         <el-radio-group
           v-model="form.DigitPlaces"
@@ -58,19 +62,18 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!-- 数值单位 -->
+      <!-- 单位 -->
       <el-form-item
         v-if="form.ClinicalTableQuestionType === 'number'"
-        label="单位"
+        :label="$t('trials:readingUnit:qsList:title:unit')"
       >
         <el-input
           v-model="form.Unit"
-          placeholder="请输入单位"
         />
       </el-form-item>
-      <!-- 数值单位 -->
+      <!-- 问题标记 -->
       <el-form-item
-        label="问题标记"
+        :label="$t('dictionary:clinicalDataQs:title:qsMark')"
       >
         <el-select
           v-model="form.clinicalTableQuestionMarkEnum"
@@ -84,16 +87,17 @@
           />
         </el-select>
       </el-form-item>
-      <!-- 数值单位 -->
+      <!-- 是否必填 -->
       <el-form-item
-        label="是否必填"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')"
         prop="IsRequired"
       >
         <el-radio-group v-model="form.IsRequired">
           <el-radio v-for="item of $d.QuestionRequired" :key="`IsRequired${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
+      <!-- 序号 -->
+      <el-form-item :label="$t('trials:qcCfg:table:order')" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
           controls-position="right"
@@ -156,7 +160,7 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          callback(new Error(this.$t('trials:qcCfg:message:msg1')))
         } else {
           callback()
         }
@@ -193,26 +197,26 @@ export default {
       },
       rules: {
         Type: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
-        QuestionName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 300, message: '最大长度为 300' }],
+        QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 300, message: this.$t('common:ruleMessage:maxLength') + ' 300' }],
 
-        TypeValue: [{ required: true, message: '请注明', trigger: 'blur' },
+        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: '最大长度为 200' }],
-        ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
-        IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+          { max: 200, message: this.$t('common:ruleMessage:maxLength') + ' 200' }],
+        ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValue: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
-        RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        RelevanceValue: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DataTableName: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DataTableColumn: [{ required: true, message: '请选择', trigger: 'blur' }],
+        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        RelevanceValue: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        DataTableName: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        DataTableColumn: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         // DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DependParentId: [{ required: true, message: '请选择', trigger: 'blur' }]
+        DependParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }]
       },
       loading: false,
       parentOptions: [],

src/views/dictionary/template/components/ClinicalQuestionTableQsList.vue

@@ -10,7 +10,7 @@
         type="primary"
         @click="handleAdd"
       >
-        新增
+        {{ $t('common:button:new') }}
       </el-button>
 
     </div>
@@ -20,39 +20,45 @@
       size="small"
       height="500"
     >
+      <!-- 序号 -->
       <el-table-column
         prop="ShowOrder"
-        label="序号"
+        :label="$t('trials:qcCfg:table:order')"
         min-width="70"
       />
+      <!-- 名称 -->
       <el-table-column
         prop="QuestionName"
-        label="名称"
+        :label="$t('trials:readingUnit:qsList:title:qName')"
         show-overflow-tooltip
       />
+      <!-- 名称(EN) -->
       <el-table-column
         prop="QuestionEnName"
-        label="名称(EN)"
+        :label="$t('trials:readingUnit:qsList:title:qNameEn')"
         show-overflow-tooltip
       />
+      <!-- 类型 -->
       <el-table-column
         prop="Type"
-        label="类型"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalTableQuestionType',scope.row.ClinicalTableQuestionType) }}
         </template>
       </el-table-column>
+      <!-- 选项 -->
       <el-table-column
         prop="TypeValue"
-        label="选项"
+        :label="$t('trials:readingUnit:qsList:title:typeValue')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:qcCfg:table:isRequired')"
         min-width="90"
         show-overflow-tooltip
       >
@@ -60,36 +66,40 @@
           {{ $fd('YesOrNo',scope.row.IsRequired) }}
         </template>
       </el-table-column>
+      <!-- 操作 -->
       <el-table-column
         prop=""
-        label="操作"
+        :label="$t('common:action:action')"
         width="150"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
+          <!-- 查看 -->
           <el-button
             v-if="isCompleteConfig"
             type="primary"
             size="mini"
             @click="handleLook(scope.row)"
           >
-            查看
+            {{ $t('trials:readingUnit:qsList:title:view') }}
           </el-button>
+          <!-- 编辑 -->
           <el-button
             v-if="!isCompleteConfig"
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:button:edit') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
             v-if="!isCompleteConfig"
             type="danger"
             size="mini"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -104,7 +114,7 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalQuestionTableForm
+      <clinical-question-table-form
         :clinical-id="clinicalId"
         :clinical-info="clinicalInfo"
         ref="addOrEdit"
@@ -165,7 +175,7 @@ export default {
     handleLook(row) {
       this.type = 'look'
       this.rowData = { ...row }
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     getList() {
@@ -178,13 +188,13 @@ export default {
     handleAdd() {
       this.type = 'add'
       this.rowData = {}
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:add')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.type = 'edit'
       this.rowData = { ...row }
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -199,7 +209,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

src/views/dictionary/template/components/CriterionDictionary.vue

@@ -4,6 +4,7 @@
       <div>
       </div>
       <div>
+        <!-- 配置 -->
         <el-button
           size="mini"
           type="primary"
@@ -11,7 +12,7 @@
           @click="handleAdd"
           style="margin-right: 10px;"
         >
-          配置
+          {{ $t('dictionary:template:criterionDictionary:button:config') }}
         </el-button>
       </div>
     </div>
@@ -21,55 +22,62 @@
       :data="list"
       stripe
     >
+      <!-- 序号 -->
       <el-table-column
         prop=""
-        label="序号"
+        label=""
         width="50"
       >
         <template slot-scope="scope">
           {{scope.$index + 1}}
         </template>
       </el-table-column>
+      <!-- 字典表名 -->
       <el-table-column
         prop="Code"
-        label="字典表名"
+        :label="$t('dictionary:template:criterionDictionary:table:code')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 描述 -->
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dictionary:template:criterionDictionary:table:description')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 子项数量 -->
       <el-table-column
         prop="Count"
-        label="子项数量"
+        :label="$t('dictionary:template:criterionDictionary:table:count')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 排序 -->
       <el-table-column
         prop="ShowOrder"
-        label="排序"
+        :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 操作 -->
       <el-table-column
         prop="Description"
-        label="操作"
+        :label="$t('common:action:action')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-button size="small" :disabled="isCompleteConfig" type="primary" @click="openChildren(scope.row)">
-            配置
+          <!-- 配置 -->
+          <el-button :disabled="isCompleteConfig" type="text" @click="openChildren(scope.row)">
+            {{ $t('dictionary:template:criterionDictionary:button:config') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
-            type="danger"
-            size="small"
+            type="text"
             :disabled="isCompleteConfig"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -99,7 +107,7 @@
           @click="handleSave"
           v-loading="loading"
         >
-          保存
+          {{ $t('common:button:save')}}
         </el-button>
       </div>
       <el-table
@@ -122,21 +130,24 @@
             {{ scope.$index + 1}}
           </template>
         </el-table-column>
+        <!-- 字典表名 -->
         <el-table-column
           prop="Code"
-          label="字典表名"
+          :label="$t('dictionary:template:criterionDictionary:table:code')"
           show-overflow-tooltip
         >
         </el-table-column>
+        <!-- 描述 -->
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:template:criterionDictionary:table:description')"
           show-overflow-tooltip
         >
         </el-table-column>
+        <!-- 排序 -->
         <el-table-column
           prop="ShowOrder"
-          label="排序"
+          :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -170,7 +181,6 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
       config: { visible: false, title: '全局配置' },
       drawer_cfg: { drawerChild: false, parentId: '', title: '' },
       drawer_cfg2: { drawerChild: false, parentId: '', title: '' },
@@ -216,7 +226,8 @@ export default {
       })
     },
     handleAdd() {
-      this.drawer_cfg2 = { drawerChild: true, title: '选择标准字典' }
+      // 选择标准字典
+      this.drawer_cfg2 = { drawerChild: true, title: this.$t('template:criterionDictionary:title:selectDictionary') }
       this.config.visible = true
       this.$nextTick(() => {
         var a = this.dicList.filter(v => {
@@ -251,9 +262,10 @@ export default {
     },
     handleDelete(row) {
       this.loading = true
-      this.$confirm('确定要删除该系统标准字典吗？').then(() => {
+      // 是否确认删除
+      this.$confirm(this.$t('template:criterionDictionary:message:msg1')).then(() => {
         deleteSystemCriterionDictionary({Id: row.Id}).then(res => {
-          this.$message.success('删除成功')
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.loading = false
           this.getList()
         }).catch(() => { this.loading = false })