阅片表单数值问题可输入NE

# Conflicts:
#	src/utils/metaDataProvider.js

.env.development

@@ -5,7 +5,8 @@ NODE_ENV = 'development'
 VUE_APP_BASE_PATH = '/'
 
 VUE_APP_IS_TEST = false
-
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
 # base api
 VUE_APP_BASE_API = 'http://123.56.94.154:7000'
 

.env.prod

@@ -5,6 +5,9 @@ NODE_ENV = 'prod'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://office.extimaging.com"
+
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 

.env.production

@@ -3,6 +3,8 @@ ENV = 'production'
 NODE_ENV = 'production'
 # base public path
 VUE_APP_BASE_PATH = '/'
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
 
 VUE_APP_IS_TEST = true
 

.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
 

.env.uat

@@ -4,6 +4,9 @@ NODE_ENV = 'production'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
+
 # base public path
 VUE_APP_BASE_PATH = '/'
 

src/App.vue

@@ -252,7 +252,7 @@ export default {
       }
     },
     handleSave() {
-      this.$confirm('确定修改当前页面国际化内容？')
+      this.$confirm(this.$t("i18n:confirm:updatei18n"))
         .then(() => {
           batchAddOrUpdateFrontInternationalization(this.tableData).then(
             async (res) => {
@@ -270,7 +270,7 @@ export default {
               i18n.mergeLocaleMessage('zh', zhMessages)
               i18n.mergeLocaleMessage('en', enMessages)
               this.drawer = false
-              this.$message.success('国际化修改成功')
+              this.$message.success(this.$t("i18n:message:updatei18nSuccessfully"))
               if (this.il8nExternal) {
                 this.$EventBus.$emit('il8nUpdate')
               }

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({
@@ -1249,3 +1285,75 @@ export function getTrialDoctorList(data) {
     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/export.js

@@ -178,6 +178,15 @@ export function pMTrainingRecordList_Export(data) {
     data
   })
 }
+// 导出系统培训记录
+export function getSysDocumentConfirmList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSysDocumentConfirmList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出影像指控
 export function qCVisitList_Export(data) {
   return requestDownload({

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`,
@@ -1599,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}`,
@@ -1613,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`,
@@ -3308,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({
@@ -3995,3 +4036,91 @@ export function deleteTrialFileType(id) {
   })
 }
 
+// 工作台-获取稽查文档
+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/reading.js

@@ -346,9 +346,9 @@ export function getReReadingOrBackInfluenceTaskList(taskId, isReReading, applyId
   })
 }
 
-export function PMSetTaskBack(trialId, taskId) {
+export function PMSetTaskBack(trialId, taskId, pmBackReason) {
   return request({
-    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}`,
+    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}/${pmBackReason}`,
     method: 'put'
   })
 }
@@ -480,3 +480,11 @@ export function resetReadingRestTime() {
     method: 'post'
   })
 }
+// 设置随机排序
+export function setRandomTaskOrder(data) {
+  return request({
+    url: `/VisitTask/setRandomTaskOrder`,
+    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/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"
@@ -152,7 +152,6 @@
           <el-button
             v-else
             :type="item.type"
-            :size="item.size || size"
             :icon="item.icon || ''"
             @click="handleClick(item.emitKey)"
             >{{ item.label }}</el-button

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/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}?onlyOffice_url=${onlyOffice_url}&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,23 @@ 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,
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+    }
+  },
+  computed: {
+    documentType() {
+      console.log(DOCUMENTTYPE[`.${this.fileType}`], 'documentType')
+      return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },
   mounted() {
@@ -62,14 +73,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,46 @@
+<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}?onlyOffice_url=${onlyOffice_url}&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'),
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+    };
+  },
+  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/downloadDicomAndNonedicom/index.vue

@@ -1,39 +1,19 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :fullscreen="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :append-to-body="true"
-    v-loading="btnLoading"
-    class="downloadDicomAndNonedicom"
-  >
+  <el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
+    :append-to-body="true" v-loading="btnLoading" class="downloadDicomAndNonedicom">
     <span slot="title">{{ title }}</span>
     <div class="top">
       <span>{{ $t('download:top:title') }}</span>
       <div class="btnBox">
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="hasDicom"
-          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
-        >
+        <el-button type="primary" size="mini" v-if="hasDicom" @click.stop="getIRReadingDownloadStudyInfo('dicom')">
           {{ $t('download:button:downloadDicom') }}
         </el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
-        >
+        <el-button type="primary" size="mini" v-if="hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')">
           {{ $t('download:button:downloadNonedicom') }}
         </el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="hasDicom || hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('all')"
-        >
+        <el-button type="primary" size="mini" v-if="hasDicom || hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('all')">
           {{ $t('download:button:downloadAll') }}
         </el-button>
       </div>
@@ -43,16 +23,9 @@
       <div v-html="$t('download:tip:message')"></div>
     </div>
     <!--上传列表@selection-change="handleSelectionChange"-->
-    <el-table
-      ref="dicomFilesTable"
-      v-adaptive="{ bottomOffset: 85 }"
-      height="100"
-      :data="list"
-      :loading="loading"
-      class="dicomFiles-table"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
-    >
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
+      class="dicomFiles-table" @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!-- <el-table-column
         type="selection"
         width="55"
@@ -60,50 +33,28 @@
       /> -->
       <el-table-column type="index" width="40" />
       <!--受试者-->
-      <el-table-column
-        :label="$t('download:table:subjectCode')"
-        min-width="130"
-        prop="SubjectCode"
-        show-overflow-tooltip
-      />
+      <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
+        show-overflow-tooltip />
       <!--任务名称-->
-      <el-table-column
-        :label="$t('download:table:taskName')"
-        min-width="130"
-        show-overflow-tooltip
-        prop="TaskBlindName"
-        sortable="custom"
-      />
+      <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
+        sortable="custom" />
       <!--检查类型-->
-      <el-table-column
-        :label="$t('download:table:studyType')"
-        min-width="130"
-        show-overflow-tooltip
-        prop="IsDicom"
-        sortable="custom"
-      >
+      <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
+        sortable="custom">
         <template slot-scope="scope">
           <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('download:table:orginalStudyListNum')"
-        min-width="150"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('download:table:orginalStudyListNum')" min-width="150" show-overflow-tooltip>
         <template slot-scope="scope">
-          <el-button
-            v-if="
-              (scope.row.IsDicom &&
-                scope.row.DicomStudyList &&
-                scope.row.DicomStudyList.length >= 1) ||
-              (!scope.row.IsDicom &&
-                scope.row.NoneDicomStudyList &&
-                scope.row.NoneDicomStudyList.length >= 1)
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row)"
-          >
+          <el-button v-if="
+            (scope.row.IsDicom &&
+              scope.row.DicomStudyList &&
+              scope.row.DicomStudyList.length >= 1) ||
+            (!scope.row.IsDicom &&
+              scope.row.NoneDicomStudyList &&
+              scope.row.NoneDicomStudyList.length >= 1)
+          " type="text" @click="handleOpenDialog(scope.row)">
             <span>{{
               scope.row.IsDicom
                 ? scope.row.DicomStudyList.length
@@ -113,37 +64,19 @@
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action: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-view"
-            :title="$t('download:button:preview')"
-            @click.stop="preview(scope.row)"
-          />
+          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')"
+            @click.stop="preview(scope.row)" />
           <!--下载--->
-          <el-button
-            circle
-            icon="el-icon-download"
-            :title="$t('download:button:download')"
-            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
-          />
+          <el-button circle icon="el-icon-download" :title="$t('download:button:download')"
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)" />
         </template>
       </el-table-column>
     </el-table>
-    <study-view
-      v-if="model_cfg.visible"
-      :model_cfg="model_cfg"
-      :modelList="modelList"
-      :bodyPart="bodyPart"
-      :IsDicom="IsDicom"
-      :visitTaskId="modelTaskId"
-    />
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
+      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
   </el-dialog>
 </template>
 <script>
@@ -358,7 +291,8 @@ export default {
         name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       if (this.IsReadingTaskViewInOrder === 0) {
-        name = `${list[0].TaskBlindName}.zip`
+        // name = `${list[0].TaskBlindName}.zip`
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
@@ -370,11 +304,9 @@ export default {
                   series.InstancePathList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
                     let obj = {
-                      name: `${data.SubjectCode}/${
-                        data.TaskBlindName
-                      }/${this.$fd('IsDicom', true)}/${
-                        study.StudyCode
-                      }/${fileName}`,
+                      name: `${data.SubjectCode}/${data.TaskBlindName
+                        }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                        }/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
@@ -500,10 +432,12 @@ export default {
   justify-content: space-between;
   margin: 10px 0;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

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>
@@ -936,19 +936,19 @@ export default {
             ) {
               ++instanceIndex
             }
-            if (instanceIndex >= fileList.length) {
-              fileList.push({
-                instanceUid: instanceUid,
-                file: file,
-              })
-            }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
-            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
-              (prev, next) => {
-                return prev + next.file.size
-              },
-              0
-            )
+            // if (instanceIndex >= fileList.length) {
+            //   fileList.push({
+            //     instanceUid: instanceUid,
+            //     file: file,
+            //   })
+            // }
+            // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+            //   (prev, next) => {
+            //     return prev + next.file.size
+            //   },
+            //   0
+            // )
 
             var seriesUid = data.string('x0020000e')
             var seriesList = scope.uploadQueues[studyIndex].seriesList
@@ -1046,6 +1046,19 @@ export default {
               }
               instanceList.push(instanceItem)
             }
+            if (instanceIndex >= fileList.length) {
+              fileList.push({
+                instanceUid: instanceUid,
+                file: file,
+              })
+            }
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size
+              },
+              0
+            )
             resolve()
           } catch (error) {
             console.log(error)

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/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'
@@ -308,6 +310,11 @@ async function VueInit() {
         text = text.replace(test, item.TrialName)
       })
     }
+    let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
+    if(CompanyInfo&&CompanyInfo.SystemShortName){
+      let test = new RegExp('IRC', 'ig')
+        text = text.replace(test, CompanyInfo.SystemShortName)
+    }
     // return i18n.t(key)
     return text;
   }

src/router/index.js

@@ -61,6 +61,12 @@ export const constantRoutes = [
     name: 'Resetpassword',
     hidden: true
   },
+  {
+    path: '/trials/trials-panel/reading/readingTracking/ReadOrder',
+    component: () => import('@/views/trials/trials-panel/reading/read-order/index'),
+    name: 'ReadOrder',
+    hidden: true
+  },
   {
     path: '/recompose',
     component: () => import('@/views/recompose/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/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/styles/index.scss

@@ -68,6 +68,12 @@ body .el-table th.gutter {
   }
 }
 
+.text-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
 .el-loading-mask {
   background-color: rgba(255, 255, 255, 0.5);
 }

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/metaDataProvider.js

@@ -39,6 +39,108 @@ function getNumberValues(dataSet, tag, minimumLength) {
 
   return values;
 }
+function getLutDescriptor(dataSet, tag) {
+  if (!dataSet.elements[tag] || dataSet.elements[tag].length !== 6) {
+    return;
+  }
+
+  return [
+    dataSet.uint16(tag, 0),
+    dataSet.uint16(tag, 1),
+    dataSet.uint16(tag, 2),
+  ];
+}
+
+function getLutData(lutDataSet, tag, lutDescriptor) {
+  const lut = [];
+  const lutData = lutDataSet.elements[tag];
+
+  for (let i = 0; i < lutDescriptor[0]; i++) {
+    // Output range is always unsigned
+    if (lutDescriptor[2] === 16) {
+      lut[i] = lutDataSet.uint16(tag, i);
+    } else {
+      lut[i] = lutDataSet.byteArray[i + lutData.dataOffset];
+    }
+  }
+
+  return lut;
+}
+function populateSmallestLargestPixelValues(dataSet, imagePixelModule) {
+  const pixelRepresentation = dataSet.uint16('x00280103');
+  if (pixelRepresentation === 0) {
+    imagePixelModule.smallestPixelValue = dataSet.uint16('x00280106');
+    imagePixelModule.largestPixelValue = dataSet.uint16('x00280107');
+  } else {
+    imagePixelModule.smallestPixelValue = dataSet.int16('x00280106');
+    imagePixelModule.largestPixelValue = dataSet.int16('x00280107');
+  }
+  imagePixelModule.largestPixelValue = imagePixelModule.largestPixelValue === 0 ? undefined : imagePixelModule.largestPixelValue;
+}
+function populatePaletteColorLut(dataSet, imagePixelModule) {
+  imagePixelModule.redPaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281101'
+  );
+  imagePixelModule.greenPaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281102'
+  );
+  imagePixelModule.bluePaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281103'
+  );
+
+  // The first Palette Color Lookup Table Descriptor value is the number of entries in the lookup table.
+  // When the number of table entries is equal to 2ˆ16 then this value shall be 0.
+  // See http://dicom.nema.org/MEDICAL/DICOM/current/output/chtml/part03/sect_C.7.6.3.html#sect_C.7.6.3.1.5
+  if (imagePixelModule.redPaletteColorLookupTableDescriptor[0] === 0) {
+    imagePixelModule.redPaletteColorLookupTableDescriptor[0] = 65536;
+    imagePixelModule.greenPaletteColorLookupTableDescriptor[0] = 65536;
+    imagePixelModule.bluePaletteColorLookupTableDescriptor[0] = 65536;
+  }
+
+  // The third Palette Color Lookup Table Descriptor value specifies the number of bits for each entry in the Lookup Table Data.
+  // It shall take the value of 8 or 16.
+  // The LUT Data shall be stored in a format equivalent to 8 bits allocated when the number of bits for each entry is 8, and 16 bits allocated when the number of bits for each entry is 16, where in both cases the high bit is equal to bits allocated-1.
+  // The third value shall be identical for each of the Red, Green and Blue Palette Color Lookup Table Descriptors.
+  //
+  // Note: Some implementations have encoded 8 bit entries with 16 bits allocated, padding the high bits;
+  // this can be detected by comparing the number of entries specified in the LUT Descriptor with the actual value length of the LUT Data entry.
+  // The value length in bytes should equal the number of entries if bits allocated is 8, and be twice as long if bits allocated is 16.
+  const numLutEntries =
+    imagePixelModule.redPaletteColorLookupTableDescriptor[0];
+  const lutData = dataSet.elements.x00281201;
+  const lutBitsAllocated = lutData.length === numLutEntries ? 8 : 16;
+
+  // If the descriptors do not appear to have the correct values, correct them
+  if (
+    imagePixelModule.redPaletteColorLookupTableDescriptor[2] !==
+    lutBitsAllocated
+  ) {
+    imagePixelModule.redPaletteColorLookupTableDescriptor[2] = lutBitsAllocated;
+    imagePixelModule.greenPaletteColorLookupTableDescriptor[2] =
+      lutBitsAllocated;
+    imagePixelModule.bluePaletteColorLookupTableDescriptor[2] =
+      lutBitsAllocated;
+  }
+
+  imagePixelModule.redPaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281201',
+    imagePixelModule.redPaletteColorLookupTableDescriptor
+  );
+  imagePixelModule.greenPaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281202',
+    imagePixelModule.greenPaletteColorLookupTableDescriptor
+  );
+  imagePixelModule.bluePaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281203',
+    imagePixelModule.bluePaletteColorLookupTableDescriptor
+  );
+}
 function metaDataProvider(type, imageId) {
   const parsedImageId = parseImageId(imageId);
   const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url);
@@ -99,5 +201,52 @@ function metaDataProvider(type, imageId) {
       columnPixelSpacing,
     };
   }
+  if (type === 'imagePixelModule') {
+    const imagePixelModule = {
+      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.string('x00280034'),
+    };
+    populateSmallestLargestPixelValues(dataSet, imagePixelModule);
+
+    if (
+      imagePixelModule.photometricInterpretation === 'PALETTE COLOR' &&
+      dataSet.elements.x00281101
+    ) {
+      populatePaletteColorLut(dataSet, imagePixelModule);
+    }
+    return imagePixelModule;
+  }
+  // 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,
+  //     // smallestPixelValue: dataSet.uint16('x00280106'),
+  //     // largestPixelValue: dataSet.uint16('x00280107'),
+  //     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/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/views/dictionary/attachment/components/CommonTemplate/index.vue

@@ -39,7 +39,6 @@
       </el-form>
       <el-button
         type="primary"
-        icon="el-icon-plus"
         style="margin-left:auto;"
         size="small"
         @click="handleAdd"
@@ -105,7 +104,7 @@
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column label="Action" width="300">
           <template slot-scope="scope">
             <el-button
               type="text"

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"
@@ -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') }}

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="0" :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="0" :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>
@@ -138,9 +77,12 @@ export default {
         FileTypeId: '',
         Name: '',
         Path: '',
-        IsDeleted: false,
+        IsPublish: false,
+        IsDeleted: true,
         SignViewMinimumMinutes: null,
         DocUserSignType: 0,
+        CurrentStaffTrainDays: 1,
+        NewStaffTrainDays: 14,
       },
       rules: {
         FileTypeId: [
@@ -196,8 +138,11 @@ export default {
         this.form.Name = this.data.Name
         this.form.Path = this.data.Path
         this.form.IsDeleted = this.data.IsDeleted
+        this.form.IsPublish = this.data.IsPublish
         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 +152,7 @@ export default {
         .then((res) => {
           this.dictionaryList = { ...res.Result }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 获取用户类型下拉数据
     getUserType() {
@@ -305,13 +250,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,258 @@
+<template>
+    <div v-if="config.visible">
+        <base-model :config="config">
+            <template slot="dialog-body">
+                <el-form ref="form" :model="rowData" label-width="80px" style="width: 80%;display: inline-block;">
+                    <el-form-item :label="`${$t('dictionary:signature:table:Name')}: `">
+                        <span class="name text-ellipsis" :title="rowData.Name">{{ rowData.Name }}</span>
+                    </el-form-item>
+                </el-form>
+                <el-button size="mini" type="primary" style="float:right" @click.stop="edit({})" v-if="!isView">
+                    {{ $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" v-if="!isView">
+                        <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)" v-if="!isView">
+                                {{ $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)" v-if="!isView">
+                                {{ $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,
+        OffLine: null,
+        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',
+                }
+            }
+        },
+        isView: {
+            type: Boolean,
+            default: false
+        },
+        rowData: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
+        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.title = this.$t('dictionary:signature:attachmentForm:title:update')
+            if (!row.Id) {
+                this.title = this.$t('dictionary:signature:attachmentForm:title:add')
+            }
+            this.rowData = Object.assign({}, row)
+            this.visible = true
+        },
+        async getList() {
+            try {
+                if (!this.SystemDocumentId) return false
+                this.loading = true
+                this.searchData.SystemDocumentId = this.SystemDocumentId
+                if (this.isView) {
+                    this.searchData.OffLine = false
+                }
+                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>
+<style lang="scss" scoped>
+.name {
+    display: block;
+    width: 90%;
+}
+</style>

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

@@ -0,0 +1,312 @@
+<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: null,
+        SortField: null
+    }
+}
+export default {
+    name: 'Notice',
+    components: {
+        PreviewFile,
+        imageViewer
+    },
+    props: {
+        SystemDocumentId: {
+            type: String,
+            default: ''
+        },
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        isView: {
+            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
+                if (this.isView) {
+                    this.searchData.OffLine = false
+                }
+                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,103 @@
 <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-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 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="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, true)">
+              {{ scope.row.AttachmentCount }}
+              <i class="el-icon-upload2" />
+            </el-button>
+          </template>
+        </el-table-column>
+        <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 +106,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,103 +117,89 @@
             }}</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="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="240px" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" @click="handlePreview(scope.row)">
-              {{ $t('common:button:preview') }}
+            <el-button circle icon="el-icon-view" @click="handlePreview(scope.row)"
+              :title="$t('common:button:preview')">
             </el-button>
-            <el-button type="text" @click="handleEdit(scope.row)">
-              {{ $t('common:button:edit') }}
+            <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')"
+              @click="handleEdit(scope.row)">
             </el-button>
-            <el-button
-              :disabled="scope.row.IsDeleted"
-              type="text"
-              @click="handleRepeal(scope.row)"
-            >
-              {{ $t('common:button:revoke') }}
+            <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
+              :title="$t('dictionary:signature:button:publish')" @click="publishSystemDocument([scope.row])">
             </el-button>
-            <el-button type="text" @click="handleDelete(scope.row)">
-              {{ $t('common:button:delete') }}
+            <el-button :disabled="scope.row.IsDeleted" circle icon="el-icon-close" :title="$t('common:button:revoke')"
+              @click="handleRepeal([scope.row])">
+            </el-button>
+            <el-button circle icon="el-icon-delete" :title="$t('common:button:delete')"
+              @click="handleDelete(scope.row)">
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" 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" :rowData="currentRow" :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"
-          />
+      <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible" :isView="true"
+        v-if="perview_visible" />
+      <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
+        :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
+        <span style="position: fixed; left: 16px; top: 45px;cursor: pointer;font-size: 18px;color:#409EFF"
+          @click.stop="openAttachment(currentRow)" v-if="currentRow.AttachmentCount">{{
+            $t('trials:signRecords:table:AttachmentCount') }} ({{
+            currentRow.AttachmentCount }})</span>
+        <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, getSystemDocumentAttachmentList } 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'
+import attachmentPreview from './attachmentPreview'
 const searchDataDefault = () => {
   return {
     FileTypeId: '',
+    BeginCreateTime: null,
+    EndCreateTime: null,
+    IsDeleted: null,
+    DocUserSignType: null,
+    UserTypeId: null,
     Name: '',
     PageIndex: 1,
     PageSize: 20,
@@ -203,8 +207,18 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'SignatureTemplate',
-  components: { BaseContainer, Pagination, TemplateForm, PreviewFile },
+  components: { BaseContainer, Pagination, TemplateForm, PreviewFile, attachmentList, attachmentPreview },
   dicts: ['Sys_Document'],
+  props: {
+    isSystem: {
+      type: Boolean,
+      default: false
+    },
+    TITLE: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -217,12 +231,82 @@ 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: [],
+      perview_visible: false
     }
   },
   mounted() {
     this.getList()
+    this.getUserType()
   },
   methods: {
+    handleSelectable(row) {
+      return !row.IsDeleted || !row.IsPublish
+    },
+    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 arr = list.filter(item => !item.IsPublish)
+        if (arr.length <= 0) return this.getList()
+        let data = {
+          ids: arr.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, isList = false) {
+      this.SystemDocumentId = row.Id
+      this.currentRow = { ...row }
+      if (!isList) {
+        this.perview_visible = true
+      } else {
+        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
@@ -252,12 +336,23 @@ export default {
       this.editVisible = true
     },
     // 预览
-    handlePreview(row) {
+    async handlePreview(row) {
       const { Name, FullFilePath } = row
       this.currentPath = FullFilePath
       this.currentType = row.Name
         ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
         : ''
+      let searchData = {
+        OffLine: false,
+        PageIndex: 1,
+        PageSize: 1000,
+        Asc: false,
+        SortField: null,
+        SystemDocumentId: row.Id
+      }
+      this.currentRow = Object.assign({}, row)
+      let res = await getSystemDocumentAttachmentList(searchData)
+      this.currentRow.AttachmentCount = res.Result.CurrentPageData.length
       this.previewVisible = true
     },
     // 编辑
@@ -273,8 +368,13 @@ export default {
         distinguishCancelAndClose: true,
       })
         .then(() => {
+          let arr = row.filter(item => !item.IsDeleted)
+          if (arr.length <= 0) return this.getList()
+          let data = {
+            Ids: arr.map(item => item.Id)
+          }
           this.loading = true
-          userAbandonDoc(row.Id, true)
+          outLineSystemDocument(data)
             .then((res) => {
               this.loading = false
               if (res.IsSuccess) {
@@ -288,7 +388,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 删除
     handleDelete(row) {
@@ -318,6 +418,7 @@ export default {
     // 关闭弹窗
     closeDialog() {
       this.editVisible = false
+      this.attachment_Visible = false
     },
     // 重置
     handleReset() {

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

@@ -37,7 +37,6 @@
         </el-form-item>
         <el-button
           type="primary"
-          icon="el-icon-plus"
           style="float: right"
           size="small"
           @click="handleAdd"
@@ -121,7 +120,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') }}

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,7 +1,7 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
+      <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" />
@@ -21,10 +21,7 @@
       </el-form>
       <span style="margin-left: auto">
         <el-button
-          size="small"
           type="primary"
-          style="margin-left: auto"
-          icon="el-icon-plus"
           @click="handleAddCro"
           >{{ $t('common:button:new') }}</el-button
         >
@@ -77,17 +74,17 @@
       <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>

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

@@ -1,7 +1,7 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
+      <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;" />
@@ -29,10 +29,7 @@
       </el-form>
       <span style="margin-left:auto;">
         <el-button
-          size="small"
           type="primary"
-          style="margin-left:auto;"
-          icon="el-icon-plus"
           @click="handleAddHospital"
         >{{ $t('common:button:new') }}</el-button>
       </span>
@@ -132,17 +129,17 @@
       <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>

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

@@ -1,7 +1,7 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
+      <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" />
@@ -34,16 +34,13 @@
       <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"
         >
           {{ $t('common:button:new') }}
@@ -173,17 +170,17 @@
       <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>

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

@@ -1,7 +1,7 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
+      <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" />
@@ -21,10 +21,8 @@
       </el-form>
       <span style="margin-left: auto">
         <el-button
-          size="small"
           type="primary"
           style="margin-left: auto"
-          icon="el-icon-plus"
           @click="handleAddSponsor"
           >{{ $t('common:button:new') }}</el-button
         >
@@ -77,17 +75,17 @@
       <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>

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/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/Anonymization.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">
         <!-- Group -->
         <el-form-item :label="$t('template:anonymization:label:group')">
           <el-input v-model="searchData.Group" clearable style="width:120px;" />
@@ -33,7 +33,7 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -107,15 +107,13 @@
       <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)"
           >
             {{ $t('common:button:edit') }}
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             {{ $t('common:button:delete') }}

src/views/dictionary/template/components/ClinicalDataConfig.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('trials:processCfg:title:clinicalDataCfg')">
           <el-input v-model="searchData.ClinicalDataSetName" />
@@ -44,7 +44,7 @@
       </el-form>
       <span style="margin-left:auto">
         <!-- 新增 -->
-        <el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -158,12 +158,11 @@
         min-width="140"
       />
 
-      <el-table-column :label="$t('common:action:action')" min-width="350" 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)"
           >
@@ -172,8 +171,7 @@
           <!-- 下载 -->
           <el-button
             v-if="$i18n.locale === 'zh'"
-            type="primary"
-            size="mini"
+            type="text"
             :disabled="!scope.row.FileName"
             @click="handleDownloadTpl(scope.row.Path)"
           >
@@ -182,8 +180,7 @@
           <!-- 下载 -->
            <el-button
             v-else
-            type="primary"
-            size="mini"
+            type="text"
             :disabled="!scope.row.EnFileName"
             @click="handleDownloadTpl(scope.row.EnPath)"
           >
@@ -191,16 +188,14 @@
           </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') }}

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

@@ -68,13 +68,12 @@
       >
         <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)"
           >
@@ -108,7 +107,7 @@
           @click="handleSave"
           v-loading="loading"
         >
-          保存
+          {{ $t('common:button:save')}}
         </el-button>
       </div>
       <el-table
@@ -227,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 => {
@@ -262,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 })

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

@@ -10,7 +10,7 @@
           @click="handleAdd"
           style="margin-right: 10px;"
         >
-          配置
+          {{ $t('dictionary:template:criterionDictionary:button:config') }}
         </el-button>
       </div>
     </div>
@@ -24,39 +24,44 @@
     >
       <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
         prop="ValueCN"
-        label="中文值"
+        :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 英文值 -->
       <el-table-column
         prop="Value"
-        label="英文值"
+        :label="$t('dictionary:template:criterionDictionary:table:value')"
         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="Description"
-        label="分组"
+        :label="$t('dictionary:template:criterionDictionary:table:group')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -84,7 +89,7 @@
             @click="handleSave"
             v-loading="loading"
           >
-            保存
+            {{ $t('common:button:save')}}
           </el-button>
         </div>
         <el-table
@@ -100,27 +105,31 @@
             type="selection"
             width="55">
           </el-table-column>
+          <!-- 键值 -->
           <el-table-column
             prop="raw.Code"
-            label="键值"
+            :label="$t('dictionary:template:criterionDictionary:table:code')"
             show-overflow-tooltip
           >
           </el-table-column>
+          <!-- 中文值 -->
           <el-table-column
             prop="raw.ValueCN"
-            label="中文值"
+            :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
             show-overflow-tooltip
           >
           </el-table-column>
+          <!-- 英文值 -->
           <el-table-column
             prop="raw.Value"
-            label="英文值"
+            :label="$t('dictionary:template:criterionDictionary:table:value')"
             show-overflow-tooltip
           >
           </el-table-column>
+          <!-- 描述 -->
           <el-table-column
             prop="raw.Description"
-            label="描述"
+            :label="$t('dictionary:template:criterionDictionary:table:description')"
             show-overflow-tooltip
           >
           </el-table-column>
@@ -152,7 +161,7 @@ export default {
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
       preview: { visible: false, title: 'eCRF预览' },
-      config: { visible: false, title: '标准字典值' },
+      config: { visible: false, title: this.$t('template:criterionDictionary:message:msg2') }, //标准字典值
       selectedList: []
     }
   },
@@ -167,7 +176,7 @@ export default {
         CrterionDictionaryGroup: v
       }).then(res => {
         this.loading = false
-        this.$message.success('设置成功')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.getList()
       }).catch(() => {this.loading = false})
     },

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

@@ -206,30 +206,27 @@
           <el-table-column
             prop=""
             :label="$t('common:action:action')"
-            width="250"
+            width="200"
             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"
+                type="text"
                 @click="handleEdit(scope.row)"
               >
                 {{ $t('trials:readingUnit:qsList:title:edit') }}
               </el-button>
               <el-button
                 v-else
-                type="primary"
-                size="mini"
+                type="text"
                 @click="handleLook(scope.row)"
               >
                 {{ $t('trials:readingUnit:qsList:title:view') }}
               </el-button>
               <el-button
-                type="primary"
-                size="mini"
+                type="text"
                 :disabled="!(scope.row.Type === 'table' || scope.row.Type === 'basicTable')"
                 @click="handleConfig(scope.row)"
               >
@@ -237,8 +234,7 @@
               </el-button>
               <el-button
                 v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
-                type="danger"
-                size="mini"
+                type="text"
                 :disabled="scope.row.IsEnable"
                 @click="handleDelete(scope.row)"
               >

src/views/dictionary/template/components/CriterionsTmp.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('trials:auditRecord:table:criterion')"
         >
@@ -75,7 +75,7 @@
       </el-form>
       <span style="margin-left:auto">
         <!-- 添加 -->
-        <el-button type="primary" size="mini" @click="handleAdd">{{$t('common:button:new')}}</el-button>
+        <el-button type="primary" @click="handleAdd">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
@@ -173,36 +173,32 @@
           {{ $fd('YesOrNo', scope.row.IseCRFShowInDicomReading) }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('common:action:action')" min-width="200px">
+      <el-table-column :label="$t('common:action:action')" min-width="220px">
         <template slot-scope="scope">
           <!-- 编辑 -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             {{ $t('common:button:edit') }}
           </el-button>
           <!-- eCRF -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleConfig(scope.row)"
           >
             {{ $t('dictionary:template:criterionConfig:button:eCRF') }}
           </el-button>
           <!-- 基础数据 -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleBaseDataConfig(scope.row)"
           >
             {{ $t('dictionary:template:criterionConfig:button:basicData') }}
           </el-button>
           <!-- 删除 -->
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             :disabled="scope.row.IsCompleteConfig"
             @click="handleDelete(scope.row)"
           >

src/views/dictionary/template/components/IncreaseFields.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">
         <!-- Group -->
         <el-form-item :label="$t('template:anonymization:label:group')">
           <el-input v-model="searchData.Group" clearable style="width:120px;" />
@@ -33,7 +33,7 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -107,15 +107,13 @@
       <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)"
           >
             {{ $t('common:action:edit') }}
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
           {{ $t('common:button:delete') }}

src/views/dictionary/template/components/MedicalAudit.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('trials:MIMqcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
@@ -54,7 +54,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('common:button:new') }}
         </el-button>
       </span>
@@ -190,18 +190,16 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             {{ $t('common:button:edit') }}
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             {{ $t('common:button:delete') }}

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

@@ -216,17 +216,17 @@
         >
           <template slot-scope="scope">
             <el-button
-              circle
-              :title="$t('common:button:edit')"
-              icon="el-icon-edit-outline"
+              type="text"
               @click="handleEdit(scope.row)"
-            />
+            >
+              {{ $t('common:button:edit') }}
+            </el-button>
             <el-button
-              circle
-              :title="$t('common:button:delete')"
-              icon="el-icon-delete"
+              type="text"
               @click="handleDelete(scope.row)"
-            />
+            > 
+              {{ $t('common:button:delete') }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/dictionary/template/components/QcQuestions.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('trials:qcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
@@ -42,13 +42,12 @@
       <span style="margin-left:auto">
         <el-button
           :disabled="list.length === 0"
-          size="mini"
           type="primary"
           @click="preview.visible = true"
         >
           {{$t('common:button:preview')}}
         </el-button>
-        <el-button type="primary" size="mini" @click="handleAdd">{{$t('common:button:new')}}</el-button>
+        <el-button type="primary" @click="handleAdd">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
@@ -136,15 +135,13 @@
       <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)"
           >
             {{ $t('common:button:edit') }}
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             {{ $t('common:button:delete') }}

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

@@ -204,24 +204,21 @@
         <template slot-scope="scope">
           <el-button
             v-if="isCompleteConfig"
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleLook(scope.row)"
           >
             {{ $t('trials:readingPeriod:button:view') }}
           </el-button>
           <el-button
             v-if="!isCompleteConfig"
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             {{ $t('common:button:edit') }}
           </el-button>
           <el-button
             v-if="!isCompleteConfig"
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             {{ $t('common:button:delete') }}

src/views/dictionary/template/email/components/EmailList.vue

@@ -1,322 +1,163 @@
 <template>
   <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('trials:emailManageCfg:title:isReturnRequired')" v-if="!systemLevel">
-          <el-select
-            v-model="searchData.IsReturnRequired"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.YesOrNo"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+          <el-select v-model="searchData.IsReturnRequired" clearable style="width: 100px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
         <!-- 是否加急 -->
         <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
-          <el-select
-            v-model="searchData.IsUrgent"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.YesOrNo"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+          <el-select v-model="searchData.IsUrgent" clearable style="width: 100px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" v-if="!systemLevel">
-          <el-select
-            v-model="searchData.IsEnable"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.YesOrNo"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+          <el-select v-model="searchData.IsEnable" clearable style="width: 100px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          :label="$t('trials:auditRecord:table:criterion')"
-          v-if="isDistinguishCriteria && !systemLevel"
-        >
-          <el-select
-            v-model="searchData.CriterionTypeEnum"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.CriterionType"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="isDistinguishCriteria && !systemLevel">
+          <el-select v-model="searchData.CriterionTypeEnum" clearable style="width: 100px">
+            <el-option v-for="item of $d.CriterionType" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:emailManageCfg:form:BusinessModule')">
-          <el-select
-            v-model="searchData.BusinessModuleEnum"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.BusinessModule"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+          <el-select v-model="searchData.BusinessModuleEnum" clearable style="width: 100px">
+            <el-option v-for="item of $d.BusinessModule" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          :label="$t('trials:emailManageCfg:form:BusinessScenario')"
-        >
-          <el-select
-            v-model="searchData.BusinessScenarioEnum"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.Email_BusinessScenario"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+        <el-form-item :label="$t('trials:emailManageCfg:form:BusinessScenario')">
+          <el-select v-model="searchData.BusinessScenarioEnum" clearable style="width: 100px">
+            <el-option v-for="item of $d.Email_BusinessScenario" :value="item.value" :label="item.label"
+              :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:emailManageCfg:form:ToUserType')">
-          <el-select
-            v-model="searchData.ToUserType"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of UserTypeList"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+          <el-select v-model="searchData.ToUserType" clearable style="width: 100px">
+            <el-option v-for="item of UserTypeList" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item
-          :label="$t('trials:emailManageCfg:form:EmailUrgent')"
-          v-if="systemLevel === 1"
-        >
-          <el-select
-            v-model="searchData.EmailUrgentEnum"
-            clearable
-            style="width: 100px"
-          >
-            <el-option
-              v-for="item of $d.EmailUrgent"
-              :value="item.value"
-              :label="item.label"
-              :key="item.id"
-            />
+        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')" v-if="systemLevel === 1">
+          <el-select v-model="searchData.EmailUrgentEnum" clearable style="width: 100px">
+            <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
-      </el-form>
-      <span style="margin-left: auto">
-        <el-button type="primary" size="mini" @click="handleExport">
-          {{ $t('common:button:export') }}
-        </el-button>
-        <!-- <el-button
+        <el-form-item>
+          <el-button type="primary" @click="handleExport">
+            {{ $t('common:button:export') }}
+          </el-button>
+          <!-- <el-button
       type="primary"
       size="mini"
     >
       场景配置
     </el-button> -->
-        <el-button type="primary" size="mini" @click="handleAdd">
-          {{ $t('common:button:new') }}
-        </el-button>
-      </span>
+          <el-button type="primary" @click="handleAdd">
+            {{ $t('common:button:new') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <!-- 受试者列表 -->
-    <el-table
-      v-loading="loading"
-      v-adaptive="{ bottomOffset: 45 }"
-      :data="list"
-      stripe
-      height="100"
-      style="width: 100%"
-      @sort-change="handleSortByColumn"
-    >
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100" style="width: 100%"
+      @sort-change="handleSortByColumn">
       <el-table-column type="index" width="40" />
       <!-- Code -->
-      <el-table-column
-        prop="Code"
-        :label="$t('trials:emailManageCfg:title:code')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="100"
-      />
-      <el-table-column
-        v-if="isDistinguishCriteria"
-        prop="TrialReadingCriterionId"
-        :label="$t('trials:reviewTrack:table:criterionName')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="120"
-      >
+      <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
+        show-overflow-tooltip min-width="100" />
+      <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
+        :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
         <template slot-scope="scope">
           {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->
-      <el-table-column
-        prop="EmailTopicCN"
-        :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="160"
-      />
+      <el-table-column prop="EmailTopicCN" :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom"
+        show-overflow-tooltip min-width="160" />
       <!-- 邮件主题（英文） -->
-      <el-table-column
-        prop="EmailTopic"
-        :label="$t('trials:emailManageCfg:table:EmailTopic')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="160"
-      />
+      <el-table-column prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
+        show-overflow-tooltip min-width="160" />
       <!-- 业务层级 -->
-      <el-table-column
-        prop="BusinessLevelEnum"
-        :label="$t('dictionary:email:label:businessLevel')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="150"
-      >
+      <el-table-column prop="BusinessLevelEnum" :label="$t('dictionary:email:label:businessLevel')" sortable="custom"
+        show-overflow-tooltip min-width="150">
         <template slot-scope="scope">
           {{ $fd('BusinessLevel', scope.row.BusinessLevelEnum) }}
         </template>
       </el-table-column>
       <!-- 业务模块 -->
-      <el-table-column
-        prop="BusinessModuleEnum"
-        :label="$t('dictionary:email:label:businessModule')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="160"
-      >
+      <el-table-column prop="BusinessModuleEnum" :label="$t('dictionary:email:label:businessModule')" sortable="custom"
+        show-overflow-tooltip min-width="160">
         <template slot-scope="scope">
           {{ $fd('BusinessModule', scope.row.BusinessModuleEnum) }}
         </template>
       </el-table-column>
       <!-- 业务场景 -->
-      <el-table-column
-        prop="BusinessScenarioEnum"
-        :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="130"
-      >
+      <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+        sortable="custom" show-overflow-tooltip min-width="130">
         <template slot-scope="scope">
           {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
         </template>
       </el-table-column>
       <!-- 收件人v-if="systemLevel !== 1" -->
-      <el-table-column
-        prop="ToUserTypeList"
-        :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-        show-overflow-tooltip
-        min-width="100"
-      >
+      <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+        show-overflow-tooltip min-width="100">
         <template slot-scope="scope">
           {{
             scope.row.ToUserTypeList.length > 0
               ? scope.row.ToUserTypeList.map((v) => $fd('UserType', v)).join(
-                  '、'
-                )
+                '、'
+              )
               : ''
           }}
         </template>
       </el-table-column>
       <!-- 抄送人v-if="!systemLevel" -->
-      <el-table-column
-        prop="CopyUserTypeList"
-        :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-        show-overflow-tooltip
-        min-width="100"
-      >
+      <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
+        show-overflow-tooltip min-width="100">
         <template slot-scope="scope">
           {{
             scope.row.CopyUserTypeList.length > 0
               ? scope.row.CopyUserTypeList.map((v) => $fd('UserType', v)).join(
-                  '、'
-                )
+                '、'
+              )
               : ''
           }}
         </template>
       </el-table-column>
       <!-- 加急状态 -->
-      <el-table-column
-        prop="EmailUrgentEnum"
-        :label="$t('dictionary:email:label:IsUrgent')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="110"
-      >
+      <el-table-column prop="EmailUrgentEnum" :label="$t('dictionary:email:label:IsUrgent')" sortable="custom"
+        show-overflow-tooltip min-width="110">
         <template slot-scope="scope">
           {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
       <!-- 发送周期和时间 -->
-      <el-table-column
-        prop="EmailCron"
-        :label="$t('trials:emailManageCfg:table:EmailCron')"
-        sortable="custom"
-        show-overflow-tooltip
-        min-width="180"
-      />
+      <el-table-column prop="EmailCron" :label="$t('trials:emailManageCfg:table:EmailCron')" sortable="custom"
+        show-overflow-tooltip min-width="180" />
       <!-- 附件 -->
-      <el-table-column
-        prop="FileName"
-        :label="$t('trials:emailManageCfg:title:fileName')"
-        show-overflow-tooltip
-        min-width="100"
-        v-if="!systemLevel"
-      >
+      <el-table-column prop="FileName" :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip
+        min-width="100" v-if="!systemLevel">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.FilePath"
-            type="text"
-            @click="handlePreview(scope.row.FilePath)"
-          >
+          <el-button v-if="scope.row.FilePath" type="text" @click="handlePreview(scope.row.FilePath)">
             {{ scope.row.FileName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 是否需要回执 -->
-      <el-table-column
-        prop="IsReturnRequired"
-        :label="$t('trials:emailManageCfg:title:isReturnRequired')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="160"
-        v-if="!systemLevel"
-      >
+      <el-table-column prop="IsReturnRequired" :label="$t('trials:emailManageCfg:title:isReturnRequired')"
+        show-overflow-tooltip sortable="custom" min-width="160" v-if="!systemLevel">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsReturnRequired" type="danger">
             {{ $fd('YesOrNo', scope.row.IsReturnRequired) }}
@@ -327,14 +168,8 @@
         </template>
       </el-table-column>
       <!-- 是否自动发送 -->
-      <el-table-column
-        prop="IsAutoSend"
-        :label="$t('trials:emailManageCfg:title:isAutoSend')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="160"
-        v-if="!systemLevel"
-      >
+      <el-table-column prop="IsAutoSend" :label="$t('trials:emailManageCfg:title:isAutoSend')" show-overflow-tooltip
+        sortable="custom" min-width="160" v-if="!systemLevel">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsAutoSend" type="danger">
             {{ $fd('YesOrNo', scope.row.IsAutoSend) }}
@@ -344,14 +179,8 @@
           }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="IsEnable"
-        :label="$t('trials:emailManageCfg:table:IsEnable')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="160"
-        v-if="!systemLevel"
-      >
+      <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
+        sortable="custom" min-width="160" v-if="!systemLevel">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" type="danger">
             {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -362,22 +191,12 @@
         </template>
       </el-table-column>
       <!-- 更新时间 -->
-      <el-table-column
-        prop="UpdateTime"
-        :label="$t('trials:emailManageCfg:title:updateTime')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="160"
-      />
+      <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
+        sortable="custom" min-width="160" />
       <!-- 创建时间 -->
-      <el-table-column
-        prop="CreateTime"
-        :label="$t('trials:emailManageCfg:title:createTime')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="160"
-      />
-      <el-table-column label="Action" min-width="180" fixed="right">
+      <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
+        sortable="custom" min-width="160" />
+      <el-table-column :label="$t('common:action:action')" min-width="180" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)">
             {{ $t('common:button:edit') }}
@@ -386,77 +205,38 @@
           <el-button type="text" @click="handleDelete(scope.row)">
             {{ $t('common:button:delete') }}
           </el-button>
-          <el-button
-            type="text"
-            @click="
-              preview(scope.row.EmailHtmlContentCN, scope.row.EmailHtmlContent)
-            "
-            >{{ $t('common:button:preview') }}</el-button>
+          <el-button type="text" @click="
+            preview(scope.row.EmailHtmlContentCN, scope.row.EmailHtmlContent)
+            ">{{ $t('common:button:preview') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination
-      class="page"
-      :total="total"
-      :page.sync="searchData.PageIndex"
-      :limit.sync="searchData.PageSize"
-      @pagination="getList"
-    />
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+      @pagination="getList" />
     <!-- 搜索框 -->
     <!-- 修改受试者状态 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="700px"
-      fullscreen
-      custom-class="base-dialog-wrapper"
-    >
-      <EmailForm
-        :data="rowData"
-        :system-level="systemLevel"
-        :isDistinguishCriteria="isDistinguishCriteria"
-        @closeDialog="closeDialog"
-        @getList="getList"
-        @PreviewHTML="preview"
-      />
+    <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title" width="700px"
+      fullscreen custom-class="base-dialog-wrapper">
+      <EmailForm :data="rowData" :system-level="systemLevel" :isDistinguishCriteria="isDistinguishCriteria"
+        @closeDialog="closeDialog" @getList="getList" @PreviewHTML="preview" />
     </el-dialog>
 
     <!-- 修改受试者状态 -->
-    <el-dialog
-      v-if="attachmentVisible"
-      :visible.sync="attachmentVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:emailManageCfg:title:fileName')"
-      width="80%"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
-      <AttachmentList
-        :business-scenario-enum="rowData.BusinessScenarioEnum"
-        :is-distinguish-criteria="rowData.IsDistinguishCriteria"
-        @getList="getList"
-      />
+    <el-dialog v-if="attachmentVisible" :visible.sync="attachmentVisible" :close-on-click-modal="false"
+      :title="$t('trials:emailManageCfg:title:fileName')" width="80%" custom-class="base-dialog-wrapper" append-to-body>
+      <AttachmentList :business-scenario-enum="rowData.BusinessScenarioEnum"
+        :is-distinguish-criteria="rowData.IsDistinguishCriteria" @getList="getList" />
     </el-dialog>
     <!-- 预览模板 -->
-    <el-dialog
-      v-if="previewVisible"
-      :visible.sync="previewVisible"
-      :close-on-click-modal="false"
-      :title="$t('common:button:preview')"
-      fullscreen
-      custom-class="base-dialog-wrapper"
-    >
-      <div
-        style="
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :close-on-click-modal="false"
+      :title="$t('common:button:preview')" fullscreen custom-class="base-dialog-wrapper">
+      <div style="
           display: flex;
           align-items: flex-start;
           justify-content: space-around;
           flex-wrap: wrap;
-        "
-      >
+        ">
         <div style="min-width: 50%">
           <!-- 邮件内容模版（CN） -->
           <h3>{{ $t('dictionary:email:title:title1') }}</h3>
@@ -630,3 +410,8 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.box-body .search .base-search-form .el-form-item {
+  margin-bottom: 10px;
+}
+</style>

src/views/dictionary/template/file/fileForm.vue

@@ -1,85 +1,41 @@
 <template>
   <base-model :config="config">
     <div slot="dialog-body">
-      <el-form
-        ref="fileForm"
-        :model="form"
-        label-width="100px"
-        size="small"
-        :rules="rules"
-      >
+      <el-form ref="fileForm" :model="form" label-width="100px" size="small" :rules="rules">
         <div class="base-dialog-body">
           <el-form-item :label="$t('dictionary:file:form:name')" prop="Name">
             <el-input v-model="form.Name" />
           </el-form-item>
-          <el-form-item
-            :label="$t('dictionary:file:form:nameCN')"
-            prop="NameCN"
-          >
+          <el-form-item :label="$t('dictionary:file:form:nameCN')" prop="NameCN">
             <el-input v-model="form.NameCN" />
           </el-form-item>
-          <el-form-item
-            :label="$t('dictionary:browser:form:ArchiveTypeEnum')"
-            prop="ArchiveTypeEnum"
-          >
-            <el-select
-              v-model="form.ArchiveTypeEnum"
-              clearable
-              placeholder=""
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in $d.ArchiveType"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item :label="$t('dictionary:browser:form:ArchiveTypeEnum')" prop="ArchiveTypeEnum">
+            <el-select v-model="form.ArchiveTypeEnum" clearable placeholder="" style="width: 100%">
+              <el-option v-for="item in $d.ArchiveType" :key="item.id" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            :label="$t('dictionary:browser:form:SubIdentificationEnum')"
-            prop="SubIdentificationEnum"
-          >
-            <el-select
-              style="width: 100%"
-              v-model="form.SubIdentificationEnum"
-              clearable
-              placeholder=""
-            >
-              <el-option
-                v-for="item in $d.SubIdentification"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item :label="$t('dictionary:browser:form:SubIdentificationEnum')" prop="SubIdentificationEnum">
+            <el-select style="width: 100%" v-model="form.SubIdentificationEnum" clearable placeholder="">
+              <el-option v-for="item in $d.SubIdentification" :key="item.id" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            :label="$t('dictionary:file:form:ShowOrder')"
-            prop="ShowOrder"
-          >
-            <el-input-number
-              v-model="form.ShowOrder"
-              :step="1"
-              step-strictly
-            ></el-input-number>
+          <el-form-item :label="$t('dictionary:browser:form:SysTemplateTypeEnum')" prop="SysTemplateTypeEnum">
+            <el-select style="width: 100%" v-model="form.SysTemplateTypeEnum" clearable placeholder="">
+              <el-option v-for="item in $d.SysTemplateType" :key="item.id" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:file:form:ShowOrder')" prop="ShowOrder">
+            <el-input-number v-model="form.ShowOrder" :step="1" step-strictly></el-input-number>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:form:IsEnable')">
-            <el-switch
-              v-model="form.IsEnable"
-              :active-value="true"
-              :inactive-value="false"
-            >
+            <el-switch v-model="form.IsEnable" :active-value="true" :inactive-value="false">
             </el-switch>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:form:IsConfirmRecord')">
-            <el-switch
-              v-model="form.IsConfirmRecord"
-              :active-value="true"
-              :inactive-value="false"
-            >
+            <el-switch v-model="form.IsConfirmRecord" :active-value="true" :inactive-value="false">
             </el-switch>
           </el-form-item>
         </div>
@@ -95,7 +51,7 @@
     </div>
   </base-model>
 </template>
-  <script>
+<script>
 import baseModel from '@/components/BaseModel'
 import { addOrUpdateSysFileType } from '@/api/dictionary'
 export default {
@@ -126,6 +82,7 @@ export default {
         NameCN: null,
         SubIdentificationEnum: null,
         ShowOrder: 0,
+        SysTemplateTypeEnum: null
       },
       rules: {
         Name: [
@@ -149,6 +106,13 @@ export default {
             trigger: ['blur', 'change'],
           },
         ],
+        SysTemplateTypeEnum: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         ArchiveTypeEnum: [
           {
             required: true,

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

@@ -3,7 +3,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:file:search:Name')">
             <el-input v-model="searchData.Name" style="width: 100px" />
           </el-form-item>
@@ -11,196 +11,106 @@
             <el-input v-model="searchData.NameCN" style="width: 100px" />
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:search:archiveTypeEnum')">
-            <el-select
-              v-model="searchData.ArchiveTypeEnum"
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.ArchiveType"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="searchData.ArchiveTypeEnum" clearable placeholder="" style="width: 100px">
+              <el-option v-for="item in $d.ArchiveType" :key="item.id" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            :label="$t('dictionary:file:search:subIdentificationEnum')"
-          >
-            <el-select
-              v-model="searchData.SubIdentificationEnum"
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.SubIdentification"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item :label="$t('dictionary:file:search:subIdentificationEnum')">
+            <el-select v-model="searchData.SubIdentificationEnum" clearable placeholder="" style="width: 100px">
+              <el-option v-for="item in $d.SubIdentification" :key="item.id" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:file:search:SysTemplateTypeEnum')">
+            <el-select v-model="searchData.SysTemplateTypeEnum" clearable placeholder="" style="width: 100px">
+              <el-option v-for="item in $d.SysTemplateType" :key="item.id" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:search:isEnable')">
-            <el-select
-              v-model="searchData.IsEnable"
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="searchData.IsEnable" clearable placeholder="" style="width: 100px">
+              <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:search:isConfirmRecord')">
-            <el-select
-              v-model="searchData.IsConfirmRecord"
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="searchData.IsConfirmRecord" clearable placeholder="" style="width: 100px">
+              <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              @click="handleSearch"
-            >
+            <el-button type="primary" icon="el-icon-search" @click="handleSearch">
               {{ $t('common:button:search') }}
             </el-button>
-            <el-button
-              type="primary"
-              icon="el-icon-refresh-left"
-              @click="handleReset"
-            >
+            <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
               {{ $t('common:button:reset') }}
             </el-button>
           </el-form-item>
         </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>
       </div>
 
-      <el-table
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 45 }"
-        :data="list"
-        stripe
-        height="100"
-        style="width: 100%"
-        @sort-change="handleSortByColumn"
-      >
+      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100"
+        style="width: 100%" @sort-change="handleSortByColumn">
         <el-table-column type="index" width="40" />
 
-        <el-table-column
-          prop="Name"
-          :label="$t('dictionary:file:table:Name')"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="NameCN"
-          :label="$t('dictionary:file:table:NameCN')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          prop="ArchiveTypeEnum"
-          :label="$t('dictionary:file:table:archiveTypeEnum')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column prop="Name" :label="$t('dictionary:file:table:Name')" sortable="custom" show-overflow-tooltip
+          min-width="150px" />
+        <el-table-column prop="NameCN" :label="$t('dictionary:file:table:NameCN')" show-overflow-tooltip
+          sortable="custom" min-width="150px" />
+        <el-table-column prop="ArchiveTypeEnum" :label="$t('dictionary:file:table:archiveTypeEnum')"
+          show-overflow-tooltip sortable="custom" min-width="120px">
           <template slot-scope="scope">
             {{ $fd('ArchiveType', scope.row.ArchiveTypeEnum) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="SubIdentificationEnum"
-          :label="$t('dictionary:file:table:subIdentificationEnum')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column prop="SubIdentificationEnum" :label="$t('dictionary:file:table:subIdentificationEnum')"
+          show-overflow-tooltip sortable="custom" min-width="120px">
           <template slot-scope="scope">
             {{ $fd('SubIdentification', scope.row.SubIdentificationEnum) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="ShowOrder"
-          :label="$t('dictionary:file:table:ShowOrder')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          :label="$t('dictionary:file:table:IsEnable')"
-          prop="IsEnable"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column prop="SysTemplateTypeEnum" :label="$t('dictionary:file:table:SysTemplateTypeEnum')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{ $fd('SysTemplateType', scope.row.SysTemplateTypeEnum) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="ShowOrder" :label="$t('dictionary:file:table:ShowOrder')" show-overflow-tooltip
+          sortable="custom" />
+        <el-table-column :label="$t('dictionary:file:table:IsEnable')" prop="IsEnable" show-overflow-tooltip
+          sortable="custom" min-width="120px">
           <template slot-scope="scope">
             <el-tag :type="!scope.row.IsEnable ? 'info' : ''">
               {{ $fd('YesOrNo', scope.row.IsEnable) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          :label="$t('dictionary:file:table:isConfirmRecord')"
-          prop="IsConfirmRecord"
-          show-overflow-tooltip
-          sortable="custom"
-          width="200"
-        >
+        <el-table-column :label="$t('dictionary:file:table:isConfirmRecord')" prop="IsConfirmRecord"
+          show-overflow-tooltip sortable="custom" min-width="150px">
           <template slot-scope="scope">
             <el-tag :type="!scope.row.IsEnable ? 'info' : ''">
               {{ $fd('YesOrNo', scope.row.IsConfirmRecord) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="CreateTime"
-          :label="$t('dictionary:file:table:createTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          prop="UpdateTime"
-          :label="$t('dictionary:file:table:updateTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          :label="$t('dictionary:file:table:action')"
-          width="200"
-          fixed="right"
-        >
+        <el-table-column prop="CreateTime" :label="$t('dictionary:file:table:createTime')" show-overflow-tooltip
+          sortable="custom" min-width="180px" />
+        <el-table-column prop="UpdateTime" :label="$t('dictionary:file:table:updateTime')" show-overflow-tooltip
+          sortable="custom" min-width="180px" />
+        <el-table-column :label="$t('dictionary:file:table:action')" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)">
               {{ $t('dictionary:file:button:edit') }}
             </el-button>
-            <el-button
-              type="text"
-              @click="handleDelete(scope.row)"
-              v-if="hasPermi(['dictionary:template:file:del'])"
-            >
+            <el-button type="text" @click="handleDelete(scope.row)" v-if="hasPermi(['dictionary:template:file:del'])">
               {{ $t('dictionary:file:button:delete') }}
             </el-button>
           </template>
@@ -208,20 +118,9 @@
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
-      <File-form
-        :config="config"
-        :data="rowData"
-        v-if="config.visible"
-        @close="close"
-        @getList="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+      <File-form :config="config" :data="rowData" v-if="config.visible" @close="close" @getList="getList" />
     </box-content>
   </BoxContent>
 </template>
@@ -238,10 +137,11 @@ const searchDataDefault = () => {
     Name: null,
     NameCN: null,
     SubIdentificationEnum: null,
+    SysTemplateTypeEnum: null,
     PageIndex: 1,
     PageSize: 20,
     asc: false,
-    sortField: 'CreateTime',
+    sortField: '',
   }
 }
 export default {
@@ -344,4 +244,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.box-body .search .base-search-form .el-form-item {
+  margin-bottom: 10px;
+}
 </style>

src/views/dictionary/template/sign/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">
         <!-- Code -->
         <el-form-item :label="$t('dictionary:sign:label:code')">
           <el-input v-model="searchData.Code" style="width:100px;" />
@@ -27,7 +27,6 @@
       <span style="margin-left:auto;">
         <el-button
           type="primary"
-          size="mini"
           @click="handleAdd"
         >
           {{ $t('common:button:new') }}

src/views/feedBack/index.vue

@@ -111,14 +111,12 @@
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
           >
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
-            size="mini"
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
@@ -135,7 +133,6 @@
         </el-form-item>
         <el-button
           type="primary"
-          size="mini"
           @click="resolve"
           style="float: right"
           v-if="level > 7"
@@ -205,7 +202,7 @@
         <el-table-column
           :label="$t('feedBack:form:role')"
           prop="FeedBackUserName"
-          min-width="80"
+          min-width="100"
           show-overflow-tooltip
           sortable="custom"
           v-if="level > 7"
@@ -273,11 +270,11 @@
           :label="$t('common:action:action')"
           fixed="right"
           prop="UserTypeShortName"
-          width="80"
+          width="100"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-button size="mini" type="text" @click="getDetail(scope.row)">
+            <el-button type="text" @click="getDetail(scope.row)">
               {{ $t('common:button:view') }}
             </el-button>
           </template>

src/views/forgetpassword/index.vue

@@ -9,71 +9,36 @@
     <!-- Reset Password -->
 
     <div class="box-wrapper" v-if="active === 0">
-      <el-form
-        ref="resetForm"
-        v-loading="formLoading"
-        :model="form"
-        label-width="130px"
-        :rules="rules"
-        class="demo-ruleForm"
-        size="small"
-      >
+      <el-form ref="resetForm" v-loading="formLoading" :model="form" label-width="130px" :rules="rules"
+        class="demo-ruleForm" size="small">
         <!-- 邮箱 -->
-        <el-form-item
-          :label="$t('passwordReset:form:email')"
-          prop="EmailOrPhone"
-        >
+        <el-form-item :label="$t('passwordReset:form:email')" prop="EmailOrPhone">
           <el-col :span="18">
-            <el-input
-              v-model="form.EmailOrPhone"
-              autocomplete="off"
-              @change="handleEmailChange"
-            />
+            <el-input v-model="form.EmailOrPhone" autocomplete="off" @change="handleEmailChange" />
           </el-col>
         </el-form-item>
         <!-- 验证码 -->
-        <el-form-item
-          :label="$t('trials:researchForm:form:verifyCode')"
-          required
-        >
+        <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
           <el-col :span="18">
             <el-form-item prop="VerificationCode">
               <el-input v-model="form.VerificationCode" autocomplete="off" />
             </el-form-item>
           </el-col>
           <el-col :span="6" style="text-align: right">
-            <el-button
-              size="small"
-              type="primary"
-              style="width: 80%"
-              :disabled="sendDisabled"
-              @click="handleSendCode"
-              >{{ sendTitle }}</el-button
-            >
+            <el-button size="small" type="primary" style="width: 80%" :disabled="sendDisabled"
+              @click="handleSendCode">{{ sendTitle }}</el-button>
           </el-col>
         </el-form-item>
       </el-form>
       <!-- 校验 -->
-      <el-button
-        size="small"
-        type="primary"
-        style="width: 50%; margin: auto; display: block"
-        :disabled="form.VerificationCode === '' || form.EmailOrPhone === ''"
-        @click="verifyCode"
-      >
+      <el-button size="small" type="primary" style="width: 50%; margin: auto; display: block"
+        :disabled="form.VerificationCode === '' || form.EmailOrPhone === ''" @click="verifyCode">
         {{ $t('passwordReset:button:verify') }}
       </el-button>
     </div>
     <div class="box-wrapper" v-show="active === 1">
-      <el-form
-        ref="resetForm2"
-        v-loading="formLoading"
-        :model="form"
-        :label-width="$i18n.locale === 'en' ? '180px' : '100px'"
-        :rules="rules2"
-        class="demo-ruleForm"
-        size="small"
-      >
+      <el-form ref="resetForm2" v-loading="formLoading" :model="form"
+        :label-width="$i18n.locale === 'en' ? '180px' : '100px'" :rules="rules2" class="demo-ruleForm" size="small">
         <!-- 用户名 -->
         <el-form-item :label="$t('passwordReset:form:userName')" prop="UserId">
           <el-input v-model="form.UserName" disabled />
@@ -105,27 +70,17 @@
           <el-input v-model="form.UserType" disabled />
         </el-form-item> -->
         <!-- 新密码 -->
-        <el-form-item
-          class="my_new_pwd"
-          :label="$t('passwordReset:form:password')"
-          prop="NewPwd"
-          style="position: relative"
-        >
+        <el-form-item class="my_new_pwd" :label="$t('passwordReset:form:password')" prop="NewPwd"
+          style="position: relative">
           <el-input v-model="form.NewPwd" show-password autocomplete="off" />
           <span style="position: absolute; right: -30px">
-            <el-tooltip
-              :content="$t('passwordReset:form:passwordCentent')"
-              placement="top"
-            >
+            <el-tooltip :content="$t('passwordReset:form:passwordCentent')" placement="top">
               <i class="el-icon-question" />
             </el-tooltip>
           </span>
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item
-          :label="$t('passwordReset:form:confirmPassword')"
-          prop="CheckPass"
-        >
+        <el-form-item :label="$t('passwordReset:form:confirmPassword')" prop="CheckPass">
           <el-input v-model="form.CheckPass" show-password autocomplete="off" />
         </el-form-item>
       </el-form>
@@ -135,12 +90,7 @@
           {{ $t('passwordReset:button:cancel') }}
         </el-button>
         <!-- 提交 -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="onSubmit"
-          style="width: 46%"
-        >
+        <el-button size="small" type="primary" @click="onSubmit" style="width: 46%">
           {{ $t('passwordReset:button:submit') }}
         </el-button>
       </div>
@@ -388,10 +338,14 @@ export default {
       }
     },
     onCancel() {
-      this.$refs['resetForm'].resetFields()
+      // this.$refs['resetForm'].resetFields()
       Object.keys(this.form).forEach((key) => {
         this.form[key] = ''
       })
+      this.sendDisabled = false
+      this.sendTitle = this.$t('passwordReset:button:send')
+      countdown = 60
+      clearTimeout(timer)
       this.active = 0
     },
     goBack() {
@@ -404,12 +358,14 @@ export default {
 .reset-wrapper {
   padding: 20px;
 }
+
 .reset-wrapper .el-page-header {
   line-height: 50px;
   border: 1px solid #ebeef5;
   border-radius: 4px;
   background-color: #fff;
 }
+
 .reset-wrapper .box-wrapper {
   width: 700px;
   margin: 20px auto;
@@ -425,6 +381,7 @@ export default {
 .is-error.my_new_pwd {
   margin-bottom: 45px;
 }
+
 .flexBox {
   display: flex;
   justify-content: center;

src/views/none-dicom-show/index.vue

@@ -138,7 +138,7 @@
 <script>
 import { getNoneDicomStudyList, setNodicomStudyState } from '@/api/trials'
 import store from '@/store'
-import pdf from '@/assets/pdf.jpg'
+import pdf from '@/assets/pdf.png'
 import zip from '@/assets/zip.jpg'
 import { changeURLStatic } from '@/utils/history.js'
 import Preview from './components/preview'

src/views/system/event/index.vue

@@ -36,13 +36,11 @@
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
           >
             {{ $t('common:button:search') }}
           </el-button>
           <el-button
-            size="mini"
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
@@ -97,10 +95,10 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-button size="mini" type="text" @click="view(scope.row)">
+            <el-button type="text" @click="view(scope.row)">
               {{ $t('common:button:view') }}
             </el-button>
-            <el-button size="mini" type="text" @click="rePublish(scope.row)">
+            <el-button type="text" @click="rePublish(scope.row)">
               {{ $t('system:event:button:rePublish') }}
             </el-button>
           </template>

src/views/system/i18n/components/BatchAddForm.vue

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

src/views/system/i18n/index.vue

@@ -22,7 +22,6 @@
         <el-form-item :label="$t('system:l18n:search:Module')">
           <el-input
             v-model="searchData.Module"
-            size="small"
             clearable
             style="width: 130px"
           />
@@ -30,7 +29,6 @@
         <el-form-item :label="$t('system:l18n:search:Code')">
           <el-input
             v-model="searchData.Code"
-            size="small"
             clearable
             style="width: 130px"
           />
@@ -38,7 +36,6 @@
         <el-form-item :label="$t('system:l18n:search:ValueCN')">
           <el-input
             v-model="searchData.ValueCN"
-            size="small"
             clearable
             style="width: 130px"
           />
@@ -46,7 +43,6 @@
         <el-form-item :label="$t('system:l18n:search:Value')">
           <el-input
             v-model="searchData.Value"
-            size="small"
             style="width: 130px"
             clearable
           />
@@ -69,7 +65,6 @@
         <el-form-item :label="$t('system:l18n:search:Description')">
           <el-input
             v-model="searchData.Description"
-            size="small"
             clearable
             style="width: 130px"
           />
@@ -117,14 +112,12 @@
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
           >
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
-            size="mini"
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
@@ -133,24 +126,18 @@
           </el-button>
           <el-button
             type="primary"
-            icon="el-icon-plus"
-            size="mini"
             @click="handleAdd"
           >
             {{ $t('common:button:new') }}
           </el-button>
           <el-button
             type="primary"
-            icon="el-icon-plus"
-            size="mini"
             @click="handleBatchAdd"
           >
             {{ $t('system:l18n:button:batchAdd') }}
           </el-button>
           <el-button
             type="primary"
-            icon="el-icon-edit-outline"
-            size="mini"
             :disabled="selectTableList.length <= 0"
             @click="handleBatchUpdate"
           >
@@ -158,17 +145,13 @@
           </el-button>
           <el-button
             type="primary"
-            icon="el-icon-edit-outline"
-            size="mini"
             :disabled="selectTableList.length <= 0"
             @click="handleBatchUpdateToChange"
           >
             {{ $t('system:l18n:button:batchEdit') }}
           </el-button>
           <el-button
-            size="mini"
             type="primary"
-            icon="el-icon-download"
             @click="exportTable"
           >
             {{ $t('common:button:export') }}
@@ -275,7 +258,7 @@
         <el-table-column
           :label="$t('system:l18n:search:Description')"
           prop="Description"
-          min-width="100"
+          min-width="110"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -309,18 +292,14 @@
         >
           <template slot-scope="scope">
             <el-button
-              size="mini"
               type="text"
-              icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >
               {{ $t('common:button:edit') }}
             </el-button>
             <el-button
               :disabled="scope.row.State === 1"
-              size="mini"
               type="text"
-              icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             >
               {{ $t('common:button:delete') }}

src/views/system/log/index.vue

@@ -3,22 +3,21 @@
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
         <el-form-item :label="$t('system:log:table:version')" prop="Version">
-          <el-input v-model="searchData.Version" size="small" clearable />
+          <el-input v-model="searchData.Version" clearable />
         </el-form-item>
         <el-form-item :label="$t('system:log:table:versionUS')" prop="Version">
-          <el-input v-model="searchData.Version_US" size="small" clearable />
+          <el-input v-model="searchData.Version_US" clearable />
         </el-form-item>
         <el-form-item
           :label="$t('system:log:table:UpdateContent')"
           prop="UpdateContent"
         >
-          <el-input v-model="searchData.UpdateContent" size="small" clearable />
+          <el-input v-model="searchData.UpdateContent" clearable />
         </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
           >
             {{ $t('common:button:search') }}
@@ -26,7 +25,6 @@
           <el-button
             type="primary"
             icon="el-icon-plus"
-            size="mini"
             @click="handleAdd"
           >
             {{ $t('common:button:new') }}
@@ -102,22 +100,18 @@
           :label="$t('common:action:action')"
           fixed="right"
           prop=""
-          min-width="200"
+          min-width="150"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             <el-button
-              size="mini"
               type="text"
-              icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >
               {{ $t('common:button:edit') }}
             </el-button>
             <el-button
-              size="mini"
               type="text"
-              icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             >
               {{ $t('common:button:delete') }}

src/views/system/login-log/index.vue

@@ -2,152 +2,76 @@
   <div class="log">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item
-          :label="$t('system:loginLog:label:OptType')"
-          prop="OptType"
-        >
-          <el-select
-            v-model="searchData.OptType"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of $d.UserOptType"
-              :key="'UserOptType' + item.label"
-              :value="item.value"
-              :label="item.label"
-            />
+        <el-form-item :label="$t('system:loginLog:label:OptType')" prop="OptType">
+          <el-select v-model="searchData.OptTypeList" clearable style="width: 200px" multiple :collapse-tags="true">
+            <el-option v-for="item of $d.UserOptType" :key="'UserOptType' + item.label" :value="item.value"
+              :label="item.label" />
           </el-select>
         </el-form-item>
         <el-form-item label="IP" prop="IP">
-          <el-input
-            v-model="searchData.IP"
-            size="small"
-            clearable
-            style="width: 120px"
-          />
+          <el-input v-model="searchData.IP" size="small" clearable style="width: 120px" />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:loginLog:label:LoginFaildName')"
-          prop="LoginFaildName"
-        >
-          <el-input
-            v-model="searchData.LoginFaildName"
-            size="small"
-            clearable
-            style="width: 120px"
-          />
+        <el-form-item :label="$t('system:loginLog:label:LoginFaildName')" prop="LoginFaildName">
+          <el-input v-model="searchData.LoginFaildName" size="small" clearable style="width: 120px" />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:loginLog:table:LoginUserName')"
-          prop="LoginFaildName"
-        >
-          <el-input
-            v-model="searchData.LoginUserName"
-            size="small"
-            clearable
-            style="width: 120px"
-          />
+        <el-form-item :label="$t('system:loginLog:table:LoginUserName')" prop="LoginFaildName">
+          <el-input v-model="searchData.LoginUserName" size="small" clearable style="width: 120px" />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:loginLog:table:LoginUserType')"
-          prop="LoginUserTypeEnum"
-        >
-          <el-select
-            v-model="searchData.LoginUserTypeEnum"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of $d.UserType"
-              :key="'UserType' + item.label"
-              :value="item.value"
-              :label="item.label"
-            />
+        <!-- <el-form-item :label="$t('system:loginLog:table:LoginUserType')" prop="LoginUserTypeEnum">
+          <el-select v-model="searchData.LoginUserTypeEnum" clearable style="width: 120px">
+            <el-option v-for="item of $d.UserType" :key="'UserType' + item.label" :value="item.value"
+              :label="item.label" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item :label="$t('system:loginLog:label:IsLoginUncommonly')" prop="IsLoginUncommonly ">
+          <el-select v-model="searchData.IsLoginUncommonly" clearable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:loginLog:label:CreateTime')">
-          <el-date-picker
-            v-model="datetimerange"
-            type="datetimerange"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
-            @change="handleDatetimeChange"
-            style="width: 380px"
-          />
+          <el-date-picker v-model="datetimerange" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']" @change="handleDatetimeChange" style="width: 380px" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="getList">
             {{ $t('common:button:search') }}
           </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 45 }"
-        height="100"
-        :data="list"
-        class="table"
-        @sort-change="handleSortByColumn"
-      >
+      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" height="100" :data="list" class="table"
+        @sort-change="handleSortByColumn">
         <el-table-column type="index" width="50">
           <template slot-scope="scope">
-            <span
-              style="
+            <span style="
                 display: flex;
                 align-items: center;
                 justify-content: flex-end;
-              "
-            >
-              <el-tooltip
-                class="item"
-                effect="dark"
-                :content="$t('system:loginLog:label:IsLoginUncommonly')"
-                placement="top"
-                style="margin-right: 3px"
-                v-if="scope.row.IsLoginUncommonly"
-              >
-                <i
-                  v-if="scope.row.IsLoginUncommonly"
-                  class="el-icon-warning icon-i"
-                ></i>
+              ">
+              <el-tooltip class="item" effect="dark" :content="$t('system:loginLog:label:IsLoginUncommonly')"
+                placement="top" style="margin-right: 3px" v-if="scope.row.IsIgnoreUncommonly">
+                <i v-if="scope.row.IsLoginUncommonly" class="el-icon-warning icon-i icon-success"></i>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" :content="$t('system:loginLog:label:IsLoginUncommonly')"
+                placement="top" style="margin-right: 3px" v-else-if="scope.row.IsLoginUncommonly">
+                <i v-if="scope.row.IsLoginUncommonly" class="el-icon-warning icon-i"
+                  @click.stop="setIsIgnoreUncommonly(scope.row)"></i>
               </el-tooltip>
               <span>{{ scope.$index + 1 }}</span>
             </span>
           </template>
         </el-table-column>
-        <el-table-column
-          :label="$t('system:loginLog:table:OptType')"
-          prop="OptType"
-          min-width="150"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column :label="$t('system:loginLog:table:OptType')" prop="OptType" min-width="150"
+          show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             {{ $fd('UserOptType', scope.row.OptType) }}
           </template>
         </el-table-column>
-        <el-table-column
-          label="IP"
-          prop="IP"
-          min-width="150"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          :label="$t('trials:loginLog:table:IPRegion')"
-          prop="IPRegion"
-          min-width="120"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column label="IP" prop="IP" min-width="150" sortable="custom" show-overflow-tooltip />
+        <el-table-column :label="$t('trials:loginLog:table:IPRegion')" prop="IPRegion" min-width="120"
+          show-overflow-tooltip sortable="custom" />
         <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
@@ -155,20 +79,10 @@
           show-overflow-tooltip
           sortable="custom"
         /> -->
-        <el-table-column
-          :label="$t('system:loginLog:table:LoginUserName')"
-          prop="ActionUserName"
-          min-width="140"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          :label="$t('system:loginLog:table:Aetionlserlype')"
-          prop="ActionUserType"
-          min-width="100"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('system:loginLog:table:LoginUserName')" prop="ActionUserName" min-width="140"
+          show-overflow-tooltip sortable="custom" />
+        <el-table-column :label="$t('system:loginLog:table:Aetionlserlype')" prop="ActionUserType" min-width="100"
+          show-overflow-tooltip sortable="custom" />
         <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
@@ -180,13 +94,8 @@
             {{ $fd("UserType", scope.row.LoginUserTypeEnum) }}
           </template>
         </el-table-column> -->
-        <el-table-column
-          :label="$t('system:loginLog:table:OptUserName')"
-          prop="TargetIdentityUserName"
-          min-width="200"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column :label="$t('system:loginLog:table:OptUserName')" prop="TargetIdentityUserName" min-width="200"
+          sortable="custom" show-overflow-tooltip />
         <!-- <el-table-column
           :label="$t('system:loginLog:table:OptUserType')"
           prop="OptUserTypeEnum"
@@ -198,51 +107,36 @@
             {{ $fd("UserType", scope.row.OptUserTypeEnum) }}
           </template>
         </el-table-column> -->
-        <el-table-column
-          :label="$t('system:loginLog:table:detail')"
-          min-width="120"
-          show-overflow-tooltip
-        >
+        <el-table-column :label="$t('system:loginLog:table:detail')" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.JsonObj"
-              type="text"
-              @click="handleOpenDialog(scope.row)"
-            >
+            <el-button v-if="scope.row.JsonObj" type="text" @click="handleOpenDialog(scope.row)">
               <span>{{ $t('system:loginLog:message:detail') }}</span>
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          :label="$t('system:loginLog:table:CreateTime')"
-          prop="CreateTime"
-          min-width="180"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column :label="$t('system:loginLog:table:CreateTime')" prop="CreateTime" min-width="180"
+          sortable="custom" show-overflow-tooltip />
       </el-table>
       <div class="pagination" style="text-align: right; margin-top: 5px">
-        <pagination
-          :total="total"
-          :page.sync="searchData.PageIndex"
-          :limit.sync="searchData.PageSize"
-          @pagination="getList"
-        />
+        <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+          @pagination="getList" />
       </div>
     </div>
     <detail :config="config" :JsonObj="JsonObj" />
   </div>
 </template>
 <script>
-import { getUserLogList } from '@/api/user'
+import { getUserLogList, setIsIgnoreUncommonly } from '@/api/user'
 import Pagination from '@/components/Pagination'
 import detail from './detail.vue'
 import moment from 'moment'
 const searchDataDefault = () => {
   return {
     OptType: null,
+    OptTypeList: [],
     Ip: '',
     LoginFaildName: '',
+    IsLoginUncommonly: null,
     LoginUserName: '',
     LoginUserTypeEnum: null,
     BeginDate: '',
@@ -276,6 +170,26 @@ export default {
     this.getList()
   },
   methods: {
+    // 忽略异地登录
+    async setIsIgnoreUncommonly(row) {
+      try {
+        let confirm = await this.$confirm(this.$t("system:loginLog:confirmMessage:setIsIgnoreUncommonly"))
+        if (!confirm) return false
+        let data = {
+          IsIgnoreUncommonly: true,
+          Id: row.Id
+        }
+        this.loading = true
+        let res = await setIsIgnoreUncommonly(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.getList()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
     handleOpenDialog(row) {
       if (!row.JsonObj)
         return this.$message.warning(this.$t('system:loginLog:message:noJSON'))
@@ -334,28 +248,37 @@ export default {
   display: flex;
   padding: 10px;
   border-radius: 5px;
+
   .left {
     display: flex;
     flex-direction: column;
     width: 0;
     flex-grow: 4;
+
     // border-right: 1px solid #ccc;
     .filter-container {
       display: flex;
       align-items: center;
       margin: 5px;
     }
+
     .data-table {
       flex: 1;
       padding: 5px 0px;
     }
+
     .pagination-container {
       text-align: right;
     }
   }
+
   .icon-i {
     color: #f56c6c;
     cursor: pointer;
   }
+
+  .icon-success {
+    color: #67C23A
+  }
 }
 </style>

src/views/system/menu/index.vue

@@ -6,7 +6,6 @@
           v-model="queryParams.menuName"
           placeholder=""
           clearable
-          size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -15,21 +14,18 @@
           v-model="queryParams.visible"
           placeholder=""
           clearable
-          size="small"
         />
       </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
           icon="el-icon-search"
-          size="mini"
           @click="handleQuery"
           >{{ $t("system:menu:button:search") }}</el-button
         >
         <el-button
           type="primary"
           icon="el-icon-plus"
-          size="mini"
           @click="handleAdd"
           >{{ $t("system:menu:button:add") }}</el-button
         >
@@ -40,7 +36,6 @@
         type="info"
         plain
         icon="el-icon-sort"
-        size="mini"
         @click="toggleExpandAll"
         >{{ $t("system:menu:button:foldAndExpand") }}</el-button
       >
@@ -154,25 +149,19 @@
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['system:menu:edit']"
-            size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             >{{ $t("system:menu:button:edit") }}</el-button
           >
           <el-button
             v-hasPermi="['system:menu:add']"
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             >{{ $t("system:menu:button:add") }}</el-button
           >
           <el-button
             v-hasPermi="['system:menu:delete']"
-            size="mini"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             >{{ $t("system:menu:button:remove") }}</el-button
           >

src/views/system/notice/index.vue

@@ -3,7 +3,7 @@
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
         <el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
-          <el-select v-model="searchData.NoticeLevelEnum" clearable size="small">
+          <el-select v-model="searchData.NoticeLevelEnum" clearable>
             <el-option
               v-for="item of $d.NoteLevel"
               :key="item.value"
@@ -13,7 +13,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeType')" prop="NoticeTypeEnum">
-          <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
+          <el-select v-model="searchData.NoticeTypeEnum" clearable>
             <el-option
               v-for="item of $d.NoteType"
               :key="item.value"
@@ -23,7 +23,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:ApplicableProject')" prop="ApplicableProjectEnum">
-          <el-select v-model="searchData.ApplicableProjectEnum" clearable size="small">
+          <el-select v-model="searchData.ApplicableProjectEnum" clearable>
             <el-option
               v-for="item of $d.NoticeApplicableTrial"
               :key="item.value"
@@ -33,7 +33,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeUserTypeIdList')" prop="NoticeUserTypeIdList">
-          <el-select v-model="searchData.NoticeUserTypeIdList" multiple clearable size="small">
+          <el-select v-model="searchData.NoticeUserTypeIdList" multiple clearable>
             <el-option
               v-for="item of roleList"
               :key="item.Id"
@@ -43,7 +43,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeMode')" prop="NoticeModeEnum">
-          <el-select v-model="searchData.NoticeModeEnum" clearable size="small">
+          <el-select v-model="searchData.NoticeModeEnum" clearable>
             <el-option
               v-for="item of $d.NoticeMode"
               :key="item.value"
@@ -53,8 +53,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">{{ $t('common:button:search') }}</el-button>
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">{{ $t('common:button:add') }}</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">{{ $t('common:button:search') }}</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">{{ $t('common:button:add') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" v-adaptive="{bottomOffset:45}" height="100" :data="list" class="table">
@@ -116,23 +116,17 @@
         <el-table-column :label="$t('common:action:action')" fixed="right" prop="UserTypeShortName" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button
-              size="mini"
               type="text"
-              icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >{{$t('common:action:edit')}}</el-button>
             <el-button
               v-if="scope.row.NoticeStateEnum === 0"
-              size="mini"
               type="text"
-              icon="el-icon-s-promotion"
               @click="handlePush(scope.row)"
             >{{$t('common:action:push')}}</el-button>
             <el-button
               v-if="scope.row.NoticeStateEnum === 1"
-              size="mini"
               type="text"
-              icon="el-icon-s-release"
               @click="handleGet(scope.row)"
             >{{$t('common:action:pull')}}</el-button>
           </template>

src/views/system/role/index.vue

@@ -6,12 +6,11 @@
           <el-input
             v-model="queryParams.SearchFilter"
             clearable
-            size="small"
             @keyup.enter.native="getList"
           />
         </el-form-item>
         <el-form-item :label="$t('system:role:title:Group')">
-          <el-select v-model="queryParams.GroupId" clearable size="small">
+          <el-select v-model="queryParams.GroupId" clearable>
             <el-option
               v-for="item of dict.type.UserTypeGroup"
               :key="item.value"
@@ -24,7 +23,6 @@
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
             >{{ $t('common:button:search') }}</el-button
           >
@@ -32,7 +30,6 @@
             v-hasPermi="['system:role:add']"
             type="primary"
             icon="el-icon-plus"
-            size="mini"
             @click="handleAddRole"
             >{{ $t('common:button:add') }}</el-button
           >
@@ -111,17 +108,13 @@
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['system:role:edit']"
-              size="mini"
               type="text"
-              icon="el-icon-edit"
               @click="handleEditRole(scope.row)"
               >{{ $t('common:button:edit') }}</el-button
             >
             <el-button
               v-hasPermi="['system:role:delete']"
-              size="mini"
               type="text"
-              icon="el-icon-delete"
               @click="handleDeleteRole(scope.row)"
               >{{ $t('common:button:delete') }}</el-button
             >