Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

package.json

@@ -14,6 +14,7 @@
     "i18n:en": "node i18nGenerate.js lang=en keyCol=5 valCol=7"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.370.0",
     "@cornerstonejs/calculate-suv": "^1.1.0",
     "@cornerstonejs/core": "^1.27.4",
     "@cornerstonejs/dicom-image-loader": "^1.27.4",
@@ -23,11 +24,13 @@
     "@ffmpeg/ffmpeg": "^0.10.1",
     "@microsoft/signalr": "^6.0.8",
     "@riophae/vue-treeselect": "0.4.0",
+    "@vue-office/docx": "^1.6.2",
+    "@vue-office/excel": "^1.7.11",
+    "@vue/composition-api": "^1.7.2",
     "ali-oss": "^6.17.1",
     "axios": "0.18.1",
     "babel-eslint": "7.2.3",
     "copy-webpack-plugin": "^4.5.2",
-    "@aws-sdk/client-s3": "^3.370.0",
     "core-js": "^3.8.3",
     "cornerstone-core": "^2.6.1",
     "cornerstone-math": "^0.1.10",
@@ -65,6 +68,7 @@
     "vue-clipboard2": "^0.3.1",
     "vue-contextmenujs": "^1.3.13",
     "vue-count-to": "^1.0.13",
+    "vue-demi": "^0.14.6",
     "vue-i18n": "^8.7.0",
     "vue-pdf": "^4.3.0",
     "vue-puzzle-vcode": "^1.1.10",

src/App.vue

@@ -37,7 +37,7 @@
         height="100"
         style="width: 100%"
       >
-        <el-table-column prop="Code" label="标签" width="300">
+        <el-table-column prop="Code" label="标签" width="300" show-overflow-tooltip>
         </el-table-column>
         <!--        <el-table-column-->
         <!--          prop="Description"-->

src/api/admin.js

@@ -293,3 +293,19 @@ export function batchUpdateInternationalInfo(data) {
     data
   })
 }
+// 邮件事件消息列表
+export function getEventStoreRecordList(data) {
+  return request({
+    url: `/EventStoreRecord/getEventStoreRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 重新发布事件消息
+export function rePublishEvent(params) {
+  return request({
+    url: `/EventStoreRecord/rePublishEvent`,
+    method: 'get',
+    params
+  })
+}

src/api/dictionary.js

@@ -1045,4 +1045,20 @@ export function getExploreRecommentInfo(params) {
     method: 'get',
     params
   })
+}
+
+export function getSystemCalculateQuestions(params) {
+  return request({
+    url: `/ReadingQuestion/getSystemCalculateQuestions`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getSystemCalculateTableQuestions(params) {
+  return request({
+    url: `/ReadingQuestion/getSystemCalculateTableQuestions`,
+    method: 'post',
+    data: params
+  })
 }

src/api/export.js

@@ -187,3 +187,30 @@ export function qCVisitList_Export(data) {
     data
   })
 }
+// 导出下载记录
+export function getTrialDownloadList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getTrialDownloadList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出接收记录
+export function getSCPImageUploadList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSCPImageUploadList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出接收检查影像记录
+export function getPatientList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getPatientList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}

src/api/research.js

@@ -12,7 +12,8 @@ export function verifySendCode(param) {
   return request({
     url: '/TrialSiteSurvey/verifySendCode',
     method: 'post',
-    data: param
+    data: param,
+    clearToken: true
   })
 }
 

src/components/Dicom/DicomCanvas.vue

@@ -262,7 +262,13 @@ export default {
               apiTool
             )
             if (!toolAlreadyAddedToElement) {
-              cornerstoneTools.addToolForElement(element, apiTool)
+              if (toolName === 'RectangleRoi') {
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true}})
+              } else if (toolName === 'EllipticalRoi') {
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true}})
+              } else {
+                cornerstoneTools.addToolForElement(element, apiTool)
+              }
             }
           }
           // Setup button listener
@@ -322,7 +328,7 @@ export default {
       // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
       cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true)
+      cornerstone.updateImage(element, true) 
       // cornerstoneTools.stackPrefetch.setConfiguration({ maxImagesToPrefetch: Infinity,
       // preserveExistingPool: true })
       // cornerstoneTools.stackPrefetch.enable(this.canvas)

src/main.js

@@ -15,7 +15,7 @@ import '@/styles/index.scss' // global css
 import App from './App'
 import store from './store'
 import router from './router'
-
+import WHITELIST from "./utils/whiteList"
 import '@/icons' // icon
 import '@/permission' // permission control
 import md5 from 'js-md5'
@@ -324,7 +324,7 @@ async function VueInit() {
   if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
     setInterval(() => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (WHITELIST.includes(_vm.$route.path)) {
         return
       }
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
@@ -388,7 +388,7 @@ async function VueInit() {
   // window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+    if (_vm.$store.state.trials.unlock || WHITELIST.includes(_vm.$route.path)) {
       count = 0;
       localStorage.setItem('count', '0')
       return
@@ -417,7 +417,7 @@ async function VueInit() {
   } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$store.state.trials.unlock || WHITELIST.includes(_vm.$route.path)) {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {

src/router/index.js

@@ -223,6 +223,11 @@ export const constantRoutes = [
     component: () => import('@/views/reviewers/ReviewersResearch'),
     hidden: true
   },
+  {
+    path: '/curriculumVitae',
+    component: () => import('@/views/reviewers/curriculumVitae/index'),
+    hidden: true
+  },
   {
     path: '/ReviewersResearchForm',
     component: () => import('@/views/reviewers/ReviewersResearchForm'),

src/utils/whiteList.js

@@ -1,2 +1,2 @@
-const WHITELIST = ['/', 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
 export default WHITELIST

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

@@ -43,7 +43,7 @@
                       <div
                         v-show="item.instanceCount"
                         style="padding: 1px;"
-                      >{{ item.modality }} : {{ item.instanceCount }} Series
+                      >{{ item.modality }} : {{ item.instanceCount }} image
                       </div>
                     </div>
                   </div>

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

@@ -26,7 +26,7 @@
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -34,7 +34,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
         <el-button
@@ -44,7 +44,7 @@
           size="small"
           @click="handleAdd"
         >
-          {{ $t("common:button:new") }}
+          {{ $t('common:button:new') }}
         </el-button>
       </el-form>
     </template>
@@ -74,7 +74,7 @@
           <template slot-scope="scope">
             {{
               $fd(
-                "Common_File_BusinessScenario",
+                'Common_File_BusinessScenario',
                 scope.row.BusinessScenarioEnum
               )
             }}
@@ -106,10 +106,10 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-              $fd("YesOrNo", scope.row.IsDeleted)
+              $fd('YesOrNo', scope.row.IsDeleted)
             }}</el-tag>
             <el-tag v-else type="primary">{{
-              $fd("YesOrNo", scope.row.IsDeleted)
+              $fd('YesOrNo', scope.row.IsDeleted)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -122,14 +122,17 @@
 
         <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
+            <el-button type="text" @click="PreviewFile(scope.row)">
+              {{ $t('common:button:preview') }}
+            </el-button>
             <el-button type="text" @click="handleDownload(scope.row)">
-              {{ $t("common:button:download") }}
+              {{ $t('common:button:download') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              {{ $t("common:button:edit") }}
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              {{ $t("common:button:delete") }}
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -166,22 +169,22 @@ import {
   getCommonDocumentList,
   DownloadCommonDoc,
   deleteCommonDocument,
-} from "@/api/dictionary";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import TemplateForm from "./TemplateForm";
-const FileTypeEnum = 2;
+} from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import TemplateForm from './TemplateForm'
+const FileTypeEnum = 2
 const searchDataDefault = () => {
   return {
     FileTypeEnum: FileTypeEnum,
     BusinessScenarioEnum: null,
-    Name: "",
+    Name: '',
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  name: "ExportTemplate",
+  name: 'ExportTemplate',
   components: { BaseContainer, Pagination, TemplateForm },
   data() {
     return {
@@ -189,86 +192,97 @@ export default {
       list: [],
       total: 0,
       currentRow: {},
-      editDialog: { title: "", visible: false },
+      editDialog: { title: '', visible: false },
       loading: false,
-    };
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
+    PreviewFile(row) {
+      let basePath = window.location.origin
+      if (window.location.protocol !== 'https:') {
+        basePath = 'https://irc.test.extimaging.com'
+      }
+      let data = {
+        name: row.NameCN,
+        path: basePath + row.Path,
+      }
+      this.$emit('PreviewFile', data)
+    },
     handleDelete(row) {
       this.$confirm(
-        this.$t("dictionary:attachment:export:confirm:delete")
+        this.$t('dictionary:attachment:export:confirm:delete')
       ).then(() => {
         deleteCommonDocument(row.Id).then(() => {
-          this.$message.success(this.$t("common:message:deletedSuccessfully"));
-          this.getList();
-        });
-      });
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.getList()
+        })
+      })
     },
     getList() {
-      this.loading = true;
+      this.loading = true
       getCommonDocumentList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = "Add";
-      this.currentRow = { FileTypeEnum: FileTypeEnum };
-      this.editDialog.visible = true;
+      this.editDialog.title = 'Add'
+      this.currentRow = { FileTypeEnum: FileTypeEnum }
+      this.editDialog.visible = true
     },
     // 下载
     handleDownload(row) {
-      this.loading = true;
+      this.loading = true
       DownloadCommonDoc(row.Code)
         .then((data) => {
-          this.loading = false;
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = "Edit";
-      this.currentRow = { ...row };
-      this.editDialog.visible = true;
+      this.editDialog.title = 'Edit'
+      this.currentRow = { ...row }
+      this.editDialog.visible = true
     },
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     closeDialog() {
-      this.editDialog.visible = false;
+      this.editDialog.visible = false
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
-::v-deep .search{
+::v-deep .search {
   display: block;
 }
 </style>

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

@@ -118,6 +118,9 @@
 
         <el-table-column label="Action">
           <template slot-scope="scope">
+            <el-button type="text" @click="PreviewFile(scope.row)">
+              {{ $t('common:button:preview') }}
+            </el-button>
             <el-button type="text" @click="handleDownload(scope.row)">
               下载
             </el-button>
@@ -201,6 +204,17 @@ export default {
         })
       })
     },
+    PreviewFile(row) {
+      let basePath = window.location.origin
+      if (window.location.protocol !== 'https:') {
+        basePath = 'https://irc.test.extimaging.com'
+      }
+      let data = {
+        name: row.NameCN,
+        path: basePath + row.Path,
+      }
+      this.$emit('PreviewFile', data)
+    },
     getList() {
       this.loading = true
       getCommonDocumentList(this.searchData)

src/views/dictionary/attachment/index.vue

@@ -1,14 +1,54 @@
 <template>
   <div class="attachment-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane v-for="item in $d.Common_File_Type" :key="item.value" :label="item.label" :name="String(item.value)">
-        <UploadTemplate v-if="activeTab === '1'" />
-        <ExportTemplate v-if="activeTab === '2'" />
-        <EmailTemplate v-if="activeTab === '3'" />
-        <CommonTemplate v-if="activeTab === '4'" />
-        <SignatureTemplate v-if="activeTab === '5'" />
+      <el-tab-pane
+        v-for="item in $d.Common_File_Type"
+        :key="item.value"
+        :label="item.label"
+        :name="String(item.value)"
+      >
+        <UploadTemplate
+          v-if="activeTab === '1' && item.value == activeTab"
+          @PreviewFile="PreviewFile"
+        />
+        <ExportTemplate
+          v-if="activeTab === '2' && item.value == activeTab"
+          @PreviewFile="PreviewFile"
+        />
+        <EmailTemplate v-if="activeTab === '3' && item.value == activeTab" />
+        <CommonTemplate v-if="activeTab === '4' && item.value == activeTab" />
+        <SignatureTemplate
+          v-if="activeTab === '5' && item.value == activeTab"
+        />
       </el-tab-pane>
     </el-tabs>
+    <!-- 预览 -->
+    <el-dialog
+      v-if="Preview.visible"
+      :visible.sync="Preview.visible"
+      :close-on-click-modal="false"
+      :fullscreen="true"
+      :title="Preview.title"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
+      <vue-office-docx
+        v-if="docxTypes.includes(Preview.type)"
+        :src="Preview.path"
+        style="height: calc(100vh - 70px)"
+        @rendered="renderedHandler"
+        @error="errorHandler"
+      />
+      <vue-office-excel
+        v-else-if="excelTypes.includes(Preview.type)"
+        :src="Preview.path"
+        :options="options"
+        style="height: calc(100vh - 70px)"
+        @rendered="renderedHandler"
+        @error="errorHandler"
+      />
+      <PreviewFile v-else :file-path="Preview.path" :file-type="Preview.type" />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -17,6 +57,11 @@ import ExportTemplate from './components/ExportTemplate'
 import EmailTemplate from './components/EmailTemplate'
 import CommonTemplate from './components/CommonTemplate'
 import SignatureTemplate from './components/SignatureTemplate'
+import VueOfficeDocx from '@vue-office/docx'
+import '@vue-office/docx/lib/index.css'
+import VueOfficeExcel from '@vue-office/excel'
+import '@vue-office/excel/lib/index.css'
+import PreviewFile from '@/components/PreviewFile/index'
 export default {
   name: 'Attachment',
   components: {
@@ -24,11 +69,35 @@ export default {
     ExportTemplate,
     EmailTemplate,
     CommonTemplate,
-    SignatureTemplate
+    SignatureTemplate,
+    VueOfficeDocx,
+    VueOfficeExcel,
+    PreviewFile,
   },
   data() {
     return {
-      activeTab: null
+      activeTab: null,
+      Preview: {
+        visible: false,
+        title: '',
+        type: null,
+        path: null,
+      },
+      excelTypes: ['xlsx', 'xls'],
+      docxTypes: ['docx', 'doc'],
+      options: {
+        xls: false, //预览xlsx文件设为false；预览xls文件设为true
+        minColLength: 0, // excel最少渲染多少列，如果想实现xlsx文件内容有几列，就渲染几列，可以将此值设置为0.
+        minRowLength: 0, // excel最少渲染多少行，如果想实现根据xlsx实际函数渲染，可以将此值设置为0.
+        widthOffset: 10, //如果渲染出来的结果感觉单元格宽度不够，可以在默认渲染的列表宽度上再加 Npx宽
+        heightOffset: 10, //在默认渲染的列表高度上再加 Npx高
+        beforeTransformData: (workbookData) => {
+          return workbookData
+        }, //底层通过exceljs获取excel文件内容，通过该钩子函数，可以对获取的excel文件内容进行修改，比如某个单元格的数据显示不正确，可以在此自行修改每个单元格的value值。
+        transformData: (workbookData) => {
+          return workbookData
+        }, //将获取到的excel数据进行处理之后且渲染到页面之前，可通过transformData对即将渲染的数据及样式进行修改，此时每个单元格的text值就是即将渲染到页面上的内容
+      },
     }
   },
   mounted() {
@@ -40,25 +109,46 @@ export default {
   },
   methods: {
     clickTab(tab, event) {
-      this.$router.push({ path: `/dictionary/attachment?tabActive=${tab.name}` })
-    }
-  }
+      this.$router.push({
+        path: `/dictionary/attachment?tabActive=${tab.name}`,
+      })
+    },
+    PreviewFile(data) {
+      if (!data.path) return false
+      let type = data.path
+        .substring(data.path.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
+      this.Preview.path = data.path
+      this.Preview.type = type
+      this.Preview.title = data.name
+      if (this.excelTypes.includes(type)) {
+        this.options.xls = type === 'xls'
+      }
+      this.Preview.visible = true
+    },
+    renderedHandler() {
+      console.log('渲染完成')
+    },
+    errorHandler() {
+      console.log('渲染失败')
+    },
+  },
 }
 </script>
 <style lang="scss">
-.attachment-wrapper{
-  .el-tabs{
+.attachment-wrapper {
+  .el-tabs {
     height: 100%;
     display: flex;
     flex-direction: column;
   }
   .el-tabs__header {
     height: 40px;
-    margin-bottom:5px;
+    margin-bottom: 5px;
   }
-  .el-tabs__content{
+  .el-tabs__content {
     flex: 1;
-    .el-tab-pane{
+    .el-tab-pane {
       height: 100%;
     }
   }

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

@@ -13,7 +13,7 @@
       {{ question.GroupName }}
     </div>
     <div
-      v-else-if="question.Type==='table'"
+      v-else-if="question.Type==='table' || question.Type==='basicTable'"
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
     >
       {{ question.QuestionName }}
@@ -143,6 +143,12 @@
           v-if="question.Type==='number'"
           v-model="questionForm[question.Id]"
         />
+        <!-- 自动分类 -->
+        <el-input
+          v-if="question.Type==='calss'"
+          v-model="questionForm[question.Id]"
+          disabled
+        />
         <!-- 上传图像 -->
         <el-upload
           v-if="question.Type==='upload'"

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

@@ -6,9 +6,10 @@
     size="small"
     :rules="rules"
     :disabled="type === 'look'"
-    label-width="130px"
+    label-width="140px"
   >
     <div class="base-dialog-body">
+      <!-- 类型 -->
       <el-form-item label="类型" prop="Type">
         <el-select
           v-model="form.Type"
@@ -21,12 +22,14 @@
         >
           <el-option
             v-for="item of $d.Criterion_Question_Type"
+            v-show="item.value !== 'class'"
             :key="item.value"
             :value="item.value"
             :label="item.label"
           />
         </el-select>
       </el-form-item>
+      <!-- 分组名称 -->
       <el-form-item
         v-if="form.Type === 'group'"
         label="分组名称"
@@ -34,20 +37,7 @@
       >
         <el-input v-model="form.GroupName" />
       </el-form-item>
-      <el-form-item
-        label="分组标识"
-        v-if="form.Type === 'group'"
-        prop="GroupClassify"
-      >
-        <el-select v-model="form.GroupClassify" clearable>
-          <el-option
-            v-for="item of groupClassifyList"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="item.ValueCN"
-          />
-        </el-select>
-      </el-form-item>
+      
       <el-form-item
         v-if="form.Type === 'group'"
         label="分组名称（EN）"
@@ -70,185 +60,21 @@
       >
         <el-input v-model="form.QuestionEnName" />
       </el-form-item>
-      <!-- 数值类型 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="数值类型"
-        prop="ValueType"
-        :rules="[{ required: true, message: '请选择' }]"
-      >
-        <el-radio-group v-model="form.ValueType">
-          <el-radio
-            v-for="item of $d.ValueType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 数值单位 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="单位"
-      >
-        <el-radio-group v-model="form.Unit">
-          <el-radio
-            v-for="item of $d.ValueUnit"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'table'"
-        label="表格类型标识"
-        prop="LesionType"
-      >
-        <el-select v-model="form.LesionType" clearable>
-          <el-option
-            v-for="item of lesionTypes"
-            :key="item.Code"
-            :value="parseInt(item.Code)"
-            :label="$fd('LesionType', parseInt(item.Code))"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'basicTable'"
-        label="表格类型标识"
-        prop="LesionType"
-      >
-        <el-select v-model="form.LesionType" clearable>
-          <el-option
-            v-for="item of lesionTypeList"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="item.ValueCN"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio'"
-        label="选项"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
-        />
-      </el-form-item> -->
-      <!-- 选项类型 -->
-      <el-form-item
-        v-if="
-          form.Type === 'select' ||
-          form.Type === 'radio' ||
-          form.Type === 'calculation'
-        "
-        label="选项类型"
-        prop="QuestionGenre"
-        :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
-      >
-        <el-radio-group
-          v-model="form.QuestionGenre"
-          @change="
-            (val) => {
-              questionGenreChange(val, form)
-            }
-          "
-        >
-          <el-radio :label="-1"> 无 </el-radio>
-          <el-radio
-            v-for="item of $d.TableQuestionType"
-            v-show="item.value === 0 || item.value === 3"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.QuestionGenre === 0"
-        label="选项"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
-        />
-      </el-form-item>
-      <el-form-item label="问题分类" v-if="form.Type !== 'group'">
-        <!-- <el-radio-group v-model="form.QuestionClassify">
-          <el-radio v-for="item of $d.QuestionClassify" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group> -->
-        <el-select v-model="form.QuestionClassify" clearable>
-          <el-option
-            v-for="item of $d.QuestionClassify"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="转化显示类型" prop="ConvertShowType">
-        <el-radio-group v-model="form.ConvertShowType">
-          <el-radio
-            v-for="item of $d.ConvertShowType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3"
-        label="关联字典"
-        prop="DictionaryCode"
-      >
+      <el-divider content-position="left">公有属性</el-divider>
+      <el-form-item v-if="form.Type !== 'group'" label="问题分组">
         <el-select
-          v-model="form.DictionaryCode"
+          v-model="form.GroupId"
           clearable
-          @change="
-            () => {
-              form.DefaultValue = null
-            }
-          "
+          :disabled="isParentExistGroup"
         >
           <el-option
-            v-for="item of dicList"
-            :key="item.Id"
-            :label="item.Code"
-            :value="item.Code"
+            v-for="group of groupOptions"
+            :key="group.GroupId"
+            :label="group.GroupName"
+            :value="group.GroupId"
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value.toString()"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item
         v-if="form.Type !== 'group'"
         label="是否显示"
@@ -301,14 +127,6 @@
         label="显示触发值"
         prop="ParentTriggerValueList"
       >
-        <!--        <el-select v-model="form.ParentTriggerValue" clearable>-->
-        <!--          <el-option-->
-        <!--            v-for="item of parentTriggerValOptions"-->
-        <!--            :key="item.id"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value.toString()"-->
-        <!--          />-->
-        <!--        </el-select>-->
         <el-select v-model="form.ParentTriggerValueList" clearable multiple>
           <el-option
             v-for="item of parentTriggerValOptions"
@@ -319,32 +137,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="
-          form.Type === 'select' ||
-          form.Type === 'radio' ||
-          form.Type === 'calculation' ||
-          form.Type === 'number'
-        "
-        label="是否裁判问题"
-      >
-        <el-radio-group
-          v-model="form.IsJudgeQuestion"
-          @change="
-            (val) => {
-              isJudgeQuestionChange(val, form)
-            }
-          "
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="`YesOrNo${item.value}`"
-            :label="item.value"
-            >{{ item.label }}</el-radio
-          >
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group' && form.Type !== 'table'"
+        v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable'"
         label="是否必填"
         prop="IsRequired"
       >
@@ -396,14 +189,6 @@
         label="必填触发值"
         prop="RelevanceValueList"
       >
-        <!--        <el-select v-model="form.RelevanceValue" clearable>-->
-        <!--          <el-option-->
-        <!--            v-for="item of reParentTriggerValOptions"-->
-        <!--            :key="item.id"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value.toString()"-->
-        <!--          />-->
-        <!--        </el-select>-->
         <el-select v-model="form.RelevanceValueList" clearable multiple>
           <el-option
             v-for="item of reParentTriggerValOptions"
@@ -413,49 +198,60 @@
           />
         </el-select>
       </el-form-item>
-
-      <!-- 父问题 -->
-      <!-- <el-form-item v-if="form.Type !== 'group'" label="父问题">
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
+      <el-form-item
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation' ||
+          form.Type === 'number'
+        "
+        label="是否裁判问题"
+      >
+        <el-radio-group
+          v-model="form.IsJudgeQuestion"
+          @change="
+            (val) => {
+              isJudgeQuestionChange(val, form)
+            }
+          "
         >
-          <el-option
-            v-for="item of parentOptions"
-            :key="item.QuestionId"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item> -->
-      <!-- 父问题触发值 -->
-      <!-- <el-form-item v-if="form.ParentId" label="父问题触发值" prop="ParentTriggerValue">
-        <el-select v-model="form.ParentTriggerValue">
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item> -->
-
-      <el-form-item v-if="form.Type !== 'group'" label="问题分组">
-        <el-select
-          v-model="form.GroupId"
-          clearable
-          :disabled="isParentExistGroup"
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出标识" prop="ExportIdentification">
+        <el-radio-group 
+          v-model="form.ExportIdentification"
+          @change="
+            (val) => {
+              form.ExportResult = []
+            }
+          "
         >
+          <el-radio
+            v-for="item of $d.ExportIdentification"
+            :key="`ExportIdentification${item.value}`"
+            :label="item.value"
+            >{{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-select v-model="form.ExportResult" multiple>
           <el-option
-            v-for="group of groupOptions"
-            :key="group.GroupId"
-            :label="group.GroupName"
-            :value="group.GroupId"
-          />
+            v-for="item in $d.ExportResult"
+            :key="`ExportResult${item.value}`"
+            :label="item.value"
+            :value="item.label">
+          </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="限制编辑">
+      
+      <el-form-item label="限制编辑" v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'">
         <el-radio-group v-model="form.LimitEdit">
           <el-radio
             v-for="item of $d.LimitEdit"
@@ -489,20 +285,138 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item v-if="form.Type !== 'group'" label="是否必填">
-        <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion===true">
-          <el-radio :label="true">是</el-radio>
-          <el-radio :label="false">否</el-radio>
+      <el-form-item label="是否在阅片页面显示">
+        <el-radio-group v-model="form.IsShowInDicom">
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
-      </el-form-item> -->
-      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
+      </el-form-item>
+      <el-form-item
+        label="注释"
+        prop="Remark"
+      >
+        <el-input v-model="form.Remark" />
+      </el-form-item>
+      <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
-          v-model="form.ImageCount"
+          v-model="form.ShowOrder"
           controls-position="right"
-          :min="1"
-          :max="10"
+          :min="0"
         />
       </el-form-item>
+      <!-- 适用于Lugano 2014标准 -->
+      <el-form-item label="问题分类" v-if="form.Type !== 'group' && criterionType === 2">
+        <el-select v-model="form.QuestionClassify" clearable>
+          <el-option
+            v-for="item of $d.QuestionClassify"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+       <!-- 适用于iRECST标准 -->
+      <el-form-item label="转化显示类型" prop="ConvertShowType" v-if="criterionType === 3">
+        <el-radio-group v-model="form.ConvertShowType">
+          <el-radio
+            v-for="item of $d.ConvertShowType"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-divider content-position="left">私有属性</el-divider>
+      <el-form-item
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation'
+        "
+        label="选项类型"
+        prop="QuestionGenre"
+        :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
+      >
+        <el-radio-group
+          v-model="form.QuestionGenre"
+          @change="
+            (val) => {
+              questionGenreChange(val, form)
+            }
+          "
+        >
+          <el-radio :label="-1"> 无 </el-radio>
+          <el-radio
+            v-for="item of $d.TableQuestionType"
+            v-show="item.value === 0 || item.value === 3"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item
+        v-if="form.QuestionGenre === 0 || form.Type === 'class'"
+        label="选项"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          placeholder="选项请用‘|’分割多个选项"
+          @change="typeValueChange"
+        />
+      </el-form-item>
+      
+      
+      <el-form-item
+        v-if="form.QuestionGenre === 3"
+        label="关联字典"
+        prop="DictionaryCode"
+      >
+        <el-select
+          v-model="form.DictionaryCode"
+          clearable
+          @change="
+            () => {
+              form.DefaultValue = null
+            }
+          "
+        >
+          <el-option
+            v-for="item of dicList"
+            :key="item.Id"
+            :label="item.Code"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item
         v-if="form.Type === 'select' || form.Type === 'radio'"
         label="高亮标记值"
@@ -527,17 +441,26 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-        />
+      <el-form-item
+        label="分组标识"
+        v-if="form.Type === 'group'"
+        prop="GroupClassify"
+      >
+        <el-select v-model="form.GroupClassify" clearable>
+          <el-option
+            v-for="item of groupClassifyList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item v-if="form.Type === 'table'" label="自增序号前缀">
-        <el-input v-model="form.OrderMark" />
+      <el-form-item 
+        v-if="form.Type === 'input' || form.Type === 'textarea'"
+        label="最大长度">
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
       </el-form-item>
-      <el-form-item v-if="form.Type === 'table'" label="最大行数">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" label="最大行数">
         <el-input-number
           v-model="form.MaxQuestionCount"
           controls-position="right"
@@ -545,23 +468,162 @@
           :max="10"
         />
       </el-form-item>
-
-      <el-form-item label="是否在阅片页面显示">
-        <el-radio-group v-model="form.IsShowInDicom">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" label="自增序号前缀">
+        <el-input v-model="form.OrderMark" />
+      </el-form-item>
+      
+      <!-- 数值类型 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="数值类型"
+        prop="ValueType"
+        :rules="[{ required: true, message: '请选择' }]"
+      >
+        <el-radio-group v-model="form.ValueType">
           <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="`YesOrNo${item.value}`"
+            v-for="item of $d.ValueType"
+            :key="item.id"
             :label="item.value"
-            >{{ item.label }}</el-radio
           >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <!-- 数值单位 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="单位"
+      >
+        <el-radio-group v-model="form.Unit">
+          <el-radio
+            v-for="item of $d.ValueUnit"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        :label="$t('trials:readingUnit:qsList:title:Remark')"
-        prop="Remark"
+        v-if="form.Type === 'table' || form.Type === 'basicTable'"
+        label="表格类型标识"
+        prop="LesionType"
       >
-        <el-input v-model="form.Remark" />
+        <el-select v-model="form.LesionType" clearable>
+          <el-option
+            v-for="item of lesionTypes"
+            :key="item.Code"
+            :value="parseInt(item.Code)"
+            :label="$fd('LesionType', parseInt(item.Code))"
+          />
+        </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'basicTable'"
+        label="表格类型标识"
+        prop="LesionType"
+      >
+        <el-select v-model="form.LesionType" clearable>
+          <el-option
+            v-for="item of lesionTypeList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
+        <el-input-number
+          v-model="form.ImageCount"
+          controls-position="right"
+          :min="0"
+          :max="10"
+        />
+      </el-form-item>
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-if="form.Type === 'upload'" 
+        label="文件类型"
+        prop="FileType"
+        :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- 分类 -->
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类数据来源"
+        prop="ClassifyQuestionId"
+      >
+        <el-select v-model="form.ClassifyQuestionId" clearable>
+          <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
+                     :value="item.QuestionId"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类算法"
+        prop="ClassifyAlgorithms"
+      >
+        <div>
+          <el-table
+            ref="CalculateTable"
+            :data="ClassifyAlgorithmsList"
+            style="margin: 10px;width: 100%"
+            size="small"
+          >
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:label')"
+              show-overflow-tooltip
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.label }}
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:gt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.gt"></el-input-number>
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:lt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.lt"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-form-item>
+     
     </div>
 
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
@@ -596,10 +658,11 @@ import {
   getSystemGroupNameList,
   getCriterionDictionary,
   getCriterionDictionaryList,
+  getSystemCalculateQuestions
 } from '@/api/dictionary'
 import { getCriterionLesionType } from '@/api/trials'
 export default {
-  name: 'AddOrUpdateClinicalData',
+  name: 'CriterionQuestionForm',
   props: {
     data: {
       type: Object,
@@ -613,6 +676,14 @@ export default {
         return ''
       },
     },
+    criterionType: {
+      type: Number,
+      required: true
+    },
+    criterionId: {
+      type: String,
+      required: true
+    },
   },
   data() {
     var validateTypeVal = (rule, value, callback) => {
@@ -628,6 +699,7 @@ export default {
       }
     }
     return {
+      ClassifyAlgorithmsList: [],
       validateTypeVal: validateTypeVal,
       form: {
         Id: '',
@@ -651,7 +723,7 @@ export default {
         GroupEnName: '',
         GroupClassify: null,
         Remark: '',
-        ImageCount: 1,
+        ImageCount: 0,
         RelevanceId: '',
         RelevanceValue: '',
         RelevanceValueList: [],
@@ -667,6 +739,12 @@ export default {
         ConvertShowType: 0,
         QuestionClassify: null,
         HighlightAnswerList: [],
+        ExportIdentification: 0,
+        ExportResult: [],
+        MaxAnswerLength: 500,
+        FileType: [],
+        ClassifyQuestionId: null,
+        ClassifyAlgorithms: null,
       },
       rules: {
         Type: [{ required: true, message: '请选择', trigger: 'blur' }],
@@ -698,6 +776,12 @@ export default {
           { required: true, message: '请注明', trigger: 'blur' },
           { max: 50, message: '最大长度为 50' },
         ],
+        ExportIdentification: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ],
+        ExportResult: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ]
       },
       loading: false,
       btnLoading: false,
@@ -710,7 +794,8 @@ export default {
       CriterionDictionaryList: [],
       groupClassifyList: [],
       highlightAnswers: [],
-      lesionTypeList: []
+      lesionTypeList: [],
+      Questions: []
     }
   },
   watch: {
@@ -736,8 +821,32 @@ export default {
   },
   mounted() {
     this.initForm()
+    this.getCalculateQuestions('number')
   },
   methods: {
+    typeValueChange(v) {
+      this.form.DefaultValue = null
+      var list = v.split('|')
+      this.form.ClassifyAlgorithms = null
+      var arr = Object.assign([], this.ClassifyAlgorithmsList)
+      this.ClassifyAlgorithmsList = list.map((res, i) => {
+        return {
+          label: res,
+          lt: arr[i] ? arr[i].lt : 0,
+          gt: arr[i] ? arr[i].gt : 0
+        }
+      })
+    },
+    getCalculateQuestions(type) {
+      getSystemCalculateQuestions({
+        systemCriterionId: this.criterionId,
+        type: type
+      }).then(res => {
+        if (type === 'number') {
+          this.Questions = res.Result
+        }
+      })
+    },
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
@@ -770,7 +879,13 @@ export default {
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k]
+            if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+              this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+            } else if(k === 'FileType'){
+              this.form[k] = this.data[k].split(',')
+            } else {
+              this.form[k] = this.data[k]
+            }
           }
         }
         if (
@@ -826,10 +941,13 @@ export default {
       this.$refs.clinicalDataForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
+        this.form.ClassifyAlgorithms = JSON.stringify(this.ClassifyAlgorithmsList)
         if (this.form.Type !== 'upload') {
           this.form.ImageCount = 0
         }
-        addOrUpdateReadingQuestionSystem(this.form)
+        var params = Object.assign({}, this.form)
+        params.FileType = this.form.FileType.join(',')
+        addOrUpdateReadingQuestionSystem(params)
           .then((res) => {
             this.btnLoading = false
             this.$emit('getList')
@@ -905,7 +1023,7 @@ export default {
       if (val !== 'select' && val !== 'radio') {
         data.IsJudgeQuestion = false
       }
-      if (val === 'table') {
+      if (val === 'table' || val === 'basicTable') {
         data.IsRequired = 2
       } else {
         data.LesionType = null
@@ -916,7 +1034,7 @@ export default {
       data.Unit = ''
     },
     isShowQuestionChange(val, form) {
-      if (this.form.Type === 'table') return
+      if (this.form.Type === 'table' || this.form.Type === 'basicTable') return
       if (this.form.Type === 'group') {
         form.QuestionName = ''
         return

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

@@ -209,6 +209,8 @@
         ref="addOrEdit"
         :data="rowData"
         :type="type"
+        :criterionType="data.CriterionType"
+        :criterionId="data.Id"
         @close="addOrEdit.visible = false"
         @getList="getList"
       />
@@ -316,7 +318,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     handleAdd() {
-      this.rowData = { ReadingQuestionCriterionSystemId: this.criterionId, Id: '' }
+      this.rowData = { ReadingQuestionCriterionSystemId: this.criterionId, Id: ''}
       this.type = 'add'
       this.addOrEdit.title = '添加'
       this.addOrEdit.visible = true

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

@@ -6,7 +6,7 @@
     size="small"
     :disabled="type === 'look'"
     :rules="rules"
-    label-width="120px"
+    label-width="130px"
   >
     <div class="base-dialog-body">
       <el-form-item label="类型" prop="Type">
@@ -16,10 +16,11 @@
         >
           <el-option
             v-for="item of $d.Criterion_Question_Type"
+            v-show="item.value !== 'class'"
             :key="item.value"
             :value="item.value"
             :label="item.label"
-            :disabled="item.label === 'group' || item.label === 'table' || item.label === 'summary' || item.label === 'upload'"
+            :disabled="item.label === 'group' || item.label === 'table' || item.label === 'basicTable' || item.label === 'summary' || item.label === 'upload'"
           />
         </el-select>
       </el-form-item>
@@ -41,160 +42,7 @@
           v-model="form.QuestionEnName"
         />
       </el-form-item>
-      <!-- 选项类型 -->
-      <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-        label="选项类型"
-        prop="TableQuestionType"
-        :rules="[
-          { required: form.Type !== 'input', message: '请选择'}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.TableQuestionType"
-          @change="((val)=>{tableQuestionTypeChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.TableQuestionType"
-            :key="item.id"
-            :label="item.value"
-            :disabled="form.Type === 'radio' && (item.value===1 || item.value===2)"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.TableQuestionType === 0"
-        label="选项"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
-        />
-      </el-form-item>
-      <!-- 关联表 -->
-      <!-- <el-form-item
-        v-if="form.TableQuestionType === 1"
-        label="关联表"
-        prop="DataTableName"
-      >
-        <el-select
-          v-model="form.DataTableName"
-          clearable
-          @change="((val)=>{dataTableNameChange(val, form)})"
-        >
-          <el-option
-            v-for="item of tblOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="问题分类">
-        <!-- <el-radio-group v-model="form.QuestionClassify">
-          <el-radio v-for="item of $d.QuestionClassify" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group> -->
-        <el-select v-model="form.QuestionClassify" clearable>
-          <el-option
-            v-for="item of $d.QuestionClassify"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <!-- 数值类型 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="数值类型"
-        prop="ValueType"
-        :rules="[
-          { required: true, message: '请选择'}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ValueType"
-        >
-          <el-radio
-            v-for="item of $d.ValueType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 数值单位 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="单位"
-      >
-        <el-radio-group
-          v-model="form.Unit"
-        >
-          <el-radio
-            v-for="item of $d.ValueUnit"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 关联字段 -->
-
-      <el-form-item
-        v-if="form.TableQuestionType === 2"
-        label="关联问题"
-        prop="DependParentId"
-      >
-        <el-select
-          v-model="form.DependParentId"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`DependParentId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-        label="关联字段"
-        prop="DataTableColumn"
-      >
-        <el-select v-model="form.DataTableColumn">
-          <el-option
-            v-for="item of CriterionDictionaryList.OrganColumn"
-            :key="item.Id"
-            :label="item.ValueCN"
-            :value="item.Code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-        label="关联字典"
-        prop="DictionaryCode"
-        :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
-      >
-        <el-select v-model="form.DictionaryCode">
-          <el-option
-            v-for="item of dicList"
-            :key="item.Id"
-            :label="item.Code"
-            :value="item.Code"
-          />
-        </el-select>
-      </el-form-item>
-
+      <el-divider content-position="left">公有属性</el-divider>
       <el-form-item v-if="form.Type !== 'group'" label="是否显示" prop="ShowQuestion">
         <el-radio-group
           v-model="form.ShowQuestion"
@@ -240,7 +88,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table'" label="是否必填" prop="IsRequired">
+      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" label="是否必填" prop="IsRequired">
         <el-radio-group
           v-model="form.IsRequired"
           :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
@@ -289,9 +137,13 @@
           />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="限制编辑" v-if="form.Type !== 'summary'">
+        <el-radio-group v-model="form.LimitEdit">
+          <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group' && form.Type !== 'summary'"
         label="问题标识"
         prop="QuestionMark"
       >
@@ -306,15 +158,119 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
+      <el-form-item
+        label="注释"
+        prop="Remark"
+      >
+        <el-input v-model="form.Remark" />
+      </el-form-item>
+      <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
-          v-model="form.ImageCount"
+          v-model="form.ShowOrder"
           controls-position="right"
-          :min="1"
+          :min="0"
+        />
+      </el-form-item>
+      <el-form-item label="重复出现最大次数" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <el-input-number
+          v-model="form.MaxRowCount"
+          controls-position="right"
+          :min="0"
           :max="10"
         />
       </el-form-item>
+      <el-form-item label="问题分类">
+        <el-select v-model="form.QuestionClassify" clearable>
+          <el-option
+            v-for="item of $d.QuestionClassify"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      
+      <el-divider content-position="left">私有属性</el-divider>
+      <!-- 选项类型 -->
+      <el-form-item
+        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
+        label="选项类型"
+        prop="TableQuestionType"
+        :rules="[
+          { required: form.Type !== 'input', message: '请选择'}
+        ]"
+      >
+        <el-radio-group
+          v-model="form.TableQuestionType"
+          @change="((val)=>{tableQuestionTypeChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.TableQuestionType"
+            :key="item.id"
+            :label="item.value"
+            :disabled="(form.Type === 'radio' && (item.value===1 || item.value===2)) || (form.Type === 'input' && (item.value===0 || item.value===3))"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item
+        v-if="form.TableQuestionType === 0  || form.Type === 'class'"
+        label="选项"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          placeholder="选项请用‘|’分割多个选项"
+          @change="typeValueChange"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="form.TableQuestionType === 2"
+        label="关联问题"
+        prop="DependParentId"
+      >
+        <el-select
+          v-model="form.DependParentId"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`DependParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.TableQuestionType === 1 || !!form.DependParentId"
+        label="关联字段"
+        prop="DataTableColumn"
+      >
+        <el-select v-model="form.DataTableColumn">
+          <el-option
+            v-for="item of CriterionDictionaryList.OrganColumn"
+            :key="item.Id"
+            :label="item.ValueCN"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
+        label="关联字典"
+        prop="DictionaryCode"
+        :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
+      >
+        <el-select v-model="form.DictionaryCode">
+          <el-option
+            v-for="item of dicList"
+            :key="item.Id"
+            :label="item.Code"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
           <template v-if="form.TypeValue">
@@ -335,31 +291,146 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
+      <el-form-item 
+        v-if="form.Type === 'input' || form.Type === 'textarea'"
+        label="最大长度">
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
+      </el-form-item>
+      <!-- 是否复制前值 -->
+      <el-form-item label="是否复制前值" v-if="form.Type !== 'summary'">
+        <el-switch
+          v-model="form.IsCopy"
         />
       </el-form-item>
-      <el-form-item label="重复出现最大次数">
+      <!-- 数值类型 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="数值类型"
+        prop="ValueType"
+        :rules="[
+          { required: true, message: '请选择'}
+        ]"
+      >
+        <el-radio-group
+          v-model="form.ValueType"
+        >
+          <el-radio
+            v-for="item of $d.ValueType"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <!-- 数值单位 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="单位"
+      >
+        <el-radio-group
+          v-model="form.Unit"
+        >
+          <el-radio
+            v-for="item of $d.ValueUnit"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
         <el-input-number
-          v-model="form.MaxRowCount"
+          v-model="form.ImageCount"
           controls-position="right"
           :min="0"
           :max="10"
         />
       </el-form-item>
-      <el-form-item label="限制编辑">
-        <el-radio-group v-model="form.LimitEdit">
-          <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-if="form.Type === 'upload'" 
+        label="文件类型"
+        prop="FileType"
+        :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- 分类 -->
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类数据来源"
+        prop="ClassifyTableQuestionId"
+      >
+        <el-select v-model="form.ClassifyTableQuestionId" clearable>
+          <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
+                     :value="item.QuestionId"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类算法"
+        prop="ClassifyAlgorithms"
+      >
+        <div>
+          <el-table
+            ref="CalculateTable"
+            :data="ClassifyAlgorithmsList"
+            style="margin: 10px;width: 100%"
+            size="small"
+          >
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:label')"
+              show-overflow-tooltip
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.label }}
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:gt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.gt"></el-input-number>
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:lt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.lt"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </el-form-item>
-      <!-- <el-form-item label="全局阅片是否显示">
-        <el-radio-group v-model="form.GlobalReadingShowType">
-          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group> 
-      </el-form-item> -->
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
@@ -381,7 +452,7 @@
 </template>
 <script>
 import { addOrUpdateReadingTableQuestionSystem, getReadingTableOtherQuestionSystem } from '@/api/trials'
-import { getBasicConfigSelect, getCriterionDictionaryList, getCriterionDictionary } from '@/api/dictionary'
+import { getBasicConfigSelect, getCriterionDictionaryList, getCriterionDictionary, getSystemCalculateTableQuestions } from '@/api/dictionary'
 
 export default {
   name: 'AddOrUpdateTableQs',
@@ -418,6 +489,7 @@ export default {
       }
     }
     return {
+      ClassifyAlgorithmsList: [],
       form: {
         Id: '',
         ReadingQuestionId: '',
@@ -430,7 +502,7 @@ export default {
         ParentId: '',
         ParentTriggerValue: '',
         ShowOrder: 0,
-        ShowQuestion: null,
+        ShowQuestion: 0,
         IsRequired: true,
         Remark: '',
         RelevanceId: '',
@@ -447,8 +519,13 @@ export default {
         LimitEdit: 0,
         // GlobalReadingShowType: null,
         QuestionClassify: null,
-        HighlightAnswerList: []
-
+        HighlightAnswerList: [],
+        MaxAnswerLength: 500,
+        IsCopy: false,
+        FileType: [],
+        ImageCount: 0,
+        ClassifyTableQuestionId: null,
+        ClassifyAlgorithms: null,
         // IsEnable: true
       },
       rules: {
@@ -481,14 +558,39 @@ export default {
       tblOptions: [],
       colOptions: [],
       dicList: [],
-      CriterionDictionaryList: []
+      CriterionDictionaryList: [],
+      Questions: []
     }
   },
   mounted() {
     this.initForm()
     this.getCriterionDictionary()
+    this.getCalculateQuestions('number')
   },
   methods: {
+    typeValueChange(v) {
+      this.form.DefaultValue = null
+      var list = v.split('|')
+      this.form.ClassifyAlgorithms = null
+      var arr = Object.assign([], this.ClassifyAlgorithmsList)
+      this.ClassifyAlgorithmsList = list.map((res, i) => {
+        return {
+          label: res,
+          lt: arr[i] ? arr[i].lt : 0,
+          gt: arr[i] ? arr[i].gt : 0
+        }
+      })
+    },
+    getCalculateQuestions(type) {
+      getSystemCalculateTableQuestions({
+        questionId: this.readingQuestionId,
+        type: type
+      }).then(res => {
+        if (type === 'number') {
+          this.Questions = res.Result
+        }
+      })
+    },
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.criterionId,
@@ -503,7 +605,13 @@ export default {
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k]
+            if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+              this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+            } else if(k === 'FileType'){
+              this.form[k] = this.data[k].split(',')
+            } else {
+              this.form[k] = this.data[k]
+            }
           }
         }
 
@@ -546,9 +654,15 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        this.form.ClassifyAlgorithms = JSON.stringify(this.ClassifyAlgorithmsList)
         this.form.SystemCriterionId = this.criterionId
         this.form.ReadingQuestionId = this.readingQuestionId
-        addOrUpdateReadingTableQuestionSystem(this.form).then(res => {
+        var params = Object.assign({}, this.form)
+        if (this.form.Type !== 'upload') {
+          this.form.ImageCount = 0
+        }
+        params.FileType = this.form.FileType.join(',')
+        addOrUpdateReadingTableQuestionSystem(params).then(res => {
           this.$emit('getList')
           this.loading = false
           this.$emit('close')

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

@@ -99,7 +99,7 @@
             v-model="form.EmailUrgentEnum"
             @change="
               (v) => {
-                v === 1 ? (form.EmailCron = null) : null;
+                v === 1 ? (form.EmailCron = null) : null
               }
             "
             clearable
@@ -146,7 +146,7 @@
             v-model="form.IsDistinguishCriteria"
             @change="
               () => {
-                form.CriterionTypeEnum = null;
+                form.CriterionTypeEnum = null
               }
             "
           >
@@ -196,7 +196,7 @@
               size="small"
               type="primary"
               :disabled="fileListCN.length > 0"
-              >{{ $t("common:button:upload") }}</el-button
+              >{{ $t('common:button:upload') }}</el-button
             >
           </el-upload>
         </el-form-item>
@@ -218,25 +218,49 @@
               size="small"
               type="primary"
               :disabled="fileListEN.length > 0"
-              >{{ $t("common:button:upload") }}</el-button
+              >{{ $t('common:button:upload') }}</el-button
             >
           </el-upload>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-form-item label="邮件内容模版（CN）" prop="EmailHtmlContentCN">
+    <el-form-item
+      label="邮件内容模版（CN）"
+      prop="EmailHtmlContentCN"
+      style="position: relative"
+    >
       <el-input
         v-model="form.EmailHtmlContentCN"
         type="textarea"
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
+      <el-button
+        :disabled="!form.EmailHtmlContentCN"
+        type="text"
+        @click="PreviewHTML(form.EmailHtmlContentCN)"
+        style="position: absolute; left: -50px; top: 30px"
+      >
+        {{ $t('common:button:preview') }}
+      </el-button>
     </el-form-item>
-    <el-form-item label="邮件内容模版（EN）" prop="EmailHtmlContent">
+    <el-form-item
+      label="邮件内容模版（EN）"
+      prop="EmailHtmlContent"
+      style="position: relative"
+    >
       <el-input
         v-model="form.EmailHtmlContent"
         type="textarea"
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
+      <el-button
+        :disabled="!form.EmailHtmlContent"
+        type="text"
+        @click="PreviewHTML(form.EmailHtmlContent)"
+        style="position: absolute; left: -50px; top: 30px"
+      >
+        {{ $t('common:button:preview') }}
+      </el-button>
     </el-form-item>
     <div
       class="base-dialog-footer"
@@ -259,44 +283,46 @@
   </el-form>
 </template>
 <script>
-import { Upload, addOrUpdateEmailNoticeConfigList } from "@/api/dictionary";
+import { Upload, addOrUpdateEmailNoticeConfigList } from '@/api/dictionary'
+import vcrontab from 'vcrontab'
 export default {
   props: {
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
     systemLevel: {
       type: Number,
       default() {
-        return 0;
+        return 0
       },
     },
   },
+  components: { vcrontab },
   data() {
     return {
-      expression: "",
+      expression: '',
       showCron: false,
       form: {
-        Id: "",
-        Code: "",
-        EmailTopicCN: "",
-        EmailTopic: "",
-        BusinessLevelEnum: "",
-        BusinessModuleEnum: "",
-        ToUserTypeList: "",
-        CopyUserTypeList: "",
-        EmailUrgentEnum: "",
-        EmailCron: "",
+        Id: '',
+        Code: '',
+        EmailTopicCN: '',
+        EmailTopic: '',
+        BusinessLevelEnum: '',
+        BusinessModuleEnum: '',
+        ToUserTypeList: '',
+        CopyUserTypeList: '',
+        EmailUrgentEnum: '',
+        EmailCron: '',
         BusinessScenarioEnum: null,
-        EmailHtmlContentCN: "",
-        EmailHtmlContent: "",
-        AttachPath: "",
-        AttachName: "",
-        AttachNameCN: "",
-        AttachCNPath: "",
+        EmailHtmlContentCN: '',
+        EmailHtmlContent: '',
+        AttachPath: '',
+        AttachName: '',
+        AttachNameCN: '',
+        AttachCNPath: '',
         IsDistinguishCriteria: true,
         IsReturnRequired: true,
         IsUrgent: true,
@@ -305,173 +331,177 @@ export default {
         CriterionTypeEnum: null,
       },
       rules: {
-        Code: [{ required: true, message: "Please select", trigger: ["blur"] }],
+        Code: [{ required: true, message: 'Please select', trigger: ['blur'] }],
         BusinessScenarioEnum: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         EmailTopicCN: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         EmailTopic: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         BusinessLevelEnum: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         ToUserTypeList: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         EmailCron: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         EmailUrgentEnum: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         EmailHtmlContentCN: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         EmailHtmlContent: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
         CriterionTypeEnum: [
-          { required: true, message: "Please select", trigger: ["blur"] },
+          { required: true, message: 'Please select', trigger: ['blur'] },
         ],
       },
       scenarioOption: [],
       fileListCN: [],
       fileListEN: [],
       loading: false,
-    };
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
     if (this.systemLevel) {
       if (this.systemLevel === 1) {
-        this.form.ToUserTypeList = [];
+        this.form.ToUserTypeList = []
       }
-      this.form.CopyUserTypeList = [];
-      this.form.EmailUrgentEnum = "3";
-      this.form.IsReturnRequired = false;
-      this.form.IsDistinguishCriteria = false;
+      this.form.CopyUserTypeList = []
+      this.form.EmailUrgentEnum = '3'
+      this.form.IsReturnRequired = false
+      this.form.IsDistinguishCriteria = false
     }
   },
   methods: {
     showDialog() {
-      this.expression = this.form.EmailCron; //传入的 cron 表达式，可以反解析到 UI 上
-      this.showCron = true;
+      this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
+      this.showCron = true
     },
     crontabFill(value) {
-      this.form.EmailCron = value;
+      this.form.EmailCron = value
     },
     handleRemoveFileCN() {
-      this.form.AttachNameCN = null;
-      this.form.AttachCNPath = null;
-      this.fileListCN = [];
+      this.form.AttachNameCN = null
+      this.form.AttachCNPath = null
+      this.fileListCN = []
     },
     beforeUploadCN() {
       if (this.fileListCN.length > 0) {
-        this.$alert("最多只能传一个附件");
-        return;
+        this.$alert('最多只能传一个附件')
+        return
       }
     },
     handlePreviewCN(row, r2) {
       if (row.fullPath) {
-        window.open(row.fullPath, "_blank");
+        window.open(row.fullPath, '_blank')
       }
     },
     handleUploadFileCN(param) {
-      this.btnLoading = true;
-      const formData = new FormData();
-      formData.append("file", param.file);
-      this.form.AttachNameCN = param.file.name;
+      this.btnLoading = true
+      const formData = new FormData()
+      formData.append('file', param.file)
+      this.form.AttachNameCN = param.file.name
       Upload(formData, 3).then((res) => {
-        this.form.AttachCNPath = res.Result.FilePath;
-        this.btnLoading = false;
+        this.form.AttachCNPath = res.Result.FilePath
+        this.btnLoading = false
         this.fileListCN.push({
           name: param.file.name,
           path: res.Result.FilePath,
           fullPath: res.Result.FullFilePath,
           url: res.Result.FilePath,
-        });
-      });
+        })
+      })
     },
     handleUploadFileEN(param) {
-      this.btnLoading = true;
-      const formData = new FormData();
-      formData.append("file", param.file);
-      this.form.AttachName = param.file.name;
+      this.btnLoading = true
+      const formData = new FormData()
+      formData.append('file', param.file)
+      this.form.AttachName = param.file.name
       Upload(formData, 3).then((res) => {
-        this.form.AttachPath = res.Result.FilePath;
-        this.btnLoading = false;
+        this.form.AttachPath = res.Result.FilePath
+        this.btnLoading = false
         this.fileListEN.push({
           name: param.file.name,
           path: res.Result.FilePath,
           fullPath: res.Result.FullFilePath,
           url: res.Result.FilePath,
-        });
-      });
+        })
+      })
     },
     handleRemoveFileEN() {
-      this.form.AttachName = null;
-      this.form.AttachPath = null;
-      this.fileListEN = [];
+      this.form.AttachName = null
+      this.form.AttachPath = null
+      this.fileListEN = []
     },
     beforeUploadEN() {
       if (this.fileListEN.length > 0) {
-        this.$alert("最多只能传一个附件");
-        return;
+        this.$alert('最多只能传一个附件')
+        return
       }
     },
     handlePreviewEN(row, r2) {
       if (row.fullPath) {
-        window.open(row.fullPath, "_blank");
+        window.open(row.fullPath, '_blank')
       }
     },
     async initForm() {
-      this.loading = true;
+      this.loading = true
       // await this.getScenarios()
       for (const k in this.form) {
         if (this.data.hasOwnProperty(k)) {
-          this.form[k] = this.data[k];
+          this.form[k] = this.data[k]
         }
-        if (k === "AttachPath" && this.form[k]) {
+        if (k === 'AttachPath' && this.form[k]) {
           this.fileListEN.push({
             name: this.data.AttachName,
             path: this.data.AttachPath,
             fullPath: this.data.AttachPath,
             url: this.data.AttachPath,
-          });
+          })
         }
-        if (k === "AttachCNPath" && this.form[k]) {
+        if (k === 'AttachCNPath' && this.form[k]) {
           this.fileListCN.push({
             name: this.data.AttachNameCN,
             path: this.data.AttachCNPath,
             fullPath: this.data.AttachCNPath,
             url: this.data.AttachCNPath,
-          });
+          })
         }
       }
-      this.loading = false;
+      this.loading = false
     },
 
     // 保存
     handleSave() {
       this.$refs.emailForm.validate((valid) => {
-        if (!valid) return;
-        this.loading = true;
-        this.form.systemLevel = this.systemLevel;
+        if (!valid) return
+        this.loading = true
+        this.form.systemLevel = this.systemLevel
         addOrUpdateEmailNoticeConfigList(this.form)
           .then((res) => {
-            this.loading = false;
-            this.$emit("closeDialog");
-            this.$emit("getList");
-            this.$message.success("Saved successfully");
+            this.loading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success('Saved successfully')
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
+    },
+    // 预览模板
+    PreviewHTML(html) {
+      this.$emit('PreviewHTML', html)
     },
   },
-};
+}
 </script>

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

@@ -111,7 +111,7 @@
         min-width="120"
       >
         <template slot-scope="scope">
-          {{ $fd("CriterionType", scope.row.CriterionTypeEnum) }}
+          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -136,7 +136,7 @@
         min-width="100"
       >
         <template slot-scope="scope">
-          {{ $fd("BusinessLevel", scope.row.BusinessLevelEnum) }}
+          {{ $fd('BusinessLevel', scope.row.BusinessLevelEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -147,7 +147,7 @@
         min-width="100"
       >
         <template slot-scope="scope">
-          {{ $fd("BusinessModule", scope.row.BusinessModuleEnum) }}
+          {{ $fd('BusinessModule', scope.row.BusinessModuleEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -158,7 +158,7 @@
         min-width="130"
       >
         <template slot-scope="scope">
-          {{ $fd("Email_BusinessScenario", scope.row.BusinessScenarioEnum) }}
+          {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
         </template>
       </el-table-column>
       <!-- 收件人 -->
@@ -172,10 +172,10 @@
         <template slot-scope="scope">
           {{
             scope.row.ToUserTypeList.length > 0
-              ? scope.row.ToUserTypeList.map((v) => $fd("UserType", v)).join(
-                  "、"
+              ? scope.row.ToUserTypeList.map((v) => $fd('UserType', v)).join(
+                  '、'
                 )
-              : ""
+              : ''
           }}
         </template>
       </el-table-column>
@@ -190,10 +190,10 @@
         <template slot-scope="scope">
           {{
             scope.row.CopyUserTypeList.length > 0
-              ? scope.row.CopyUserTypeList.map((v) => $fd("UserType", v)).join(
-                  "、"
+              ? scope.row.CopyUserTypeList.map((v) => $fd('UserType', v)).join(
+                  '、'
                 )
-              : ""
+              : ''
           }}
         </template>
       </el-table-column>
@@ -206,7 +206,7 @@
         v-if="!systemLevel"
       >
         <template slot-scope="scope">
-          {{ $fd("EmailUrgent", scope.row.EmailUrgentEnum) }}
+          {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -246,10 +246,10 @@
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsReturnRequired" type="danger">
-            {{ $fd("YesOrNo", scope.row.IsReturnRequired) }}
+            {{ $fd('YesOrNo', scope.row.IsReturnRequired) }}
           </el-tag>
           <el-tag v-else type="primary">{{
-            $fd("YesOrNo", scope.row.IsReturnRequired)
+            $fd('YesOrNo', scope.row.IsReturnRequired)
           }}</el-tag>
         </template>
       </el-table-column>
@@ -264,10 +264,10 @@
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsAutoSend" type="danger">
-            {{ $fd("YesOrNo", scope.row.IsAutoSend) }}
+            {{ $fd('YesOrNo', scope.row.IsAutoSend) }}
           </el-tag>
           <el-tag v-else type="primary">{{
-            $fd("YesOrNo", scope.row.IsAutoSend)
+            $fd('YesOrNo', scope.row.IsAutoSend)
           }}</el-tag>
         </template>
       </el-table-column>
@@ -281,10 +281,10 @@
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" type="danger">
-            {{ $fd("YesOrNo", scope.row.IsEnable) }}
+            {{ $fd('YesOrNo', scope.row.IsEnable) }}
           </el-tag>
           <el-tag v-else type="primary">{{
-            $fd("YesOrNo", scope.row.IsEnable)
+            $fd('YesOrNo', scope.row.IsEnable)
           }}</el-tag>
         </template>
       </el-table-column>
@@ -340,6 +340,7 @@
         :system-level="systemLevel"
         @closeDialog="closeDialog"
         @getList="getList"
+        @PreviewHTML="preview"
       />
     </el-dialog>
 
@@ -359,131 +360,150 @@
         @getList="getList"
       />
     </el-dialog>
+    <!-- 预览模板 -->
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :close-on-click-modal="false"
+      title="预览"
+      fullscreen
+      custom-class="base-dialog-wrapper"
+    >
+      <div v-html="previewHTML"></div>
+    </el-dialog>
   </box-content>
 </template>
 <script>
 import {
   getEmailNoticeConfigList,
   deleteEmailNoticeConfig,
-} from "@/api/dictionary";
-import BoxContent from "@/components/BoxContent";
-import Pagination from "@/components/Pagination";
-import EmailForm from "./EmailForm";
-import AttachmentList from "./AttachmentList";
+} from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import Pagination from '@/components/Pagination'
+import EmailForm from './EmailForm'
+import AttachmentList from './AttachmentList'
 const searchDataDefault = () => {
   return {
-    IsReturnRequired: "",
-    IsUrgent: "",
-    IsEnable: "",
+    IsReturnRequired: '',
+    IsUrgent: '',
+    IsEnable: '',
     CriterionTypeEnum: null,
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+    SortField: 'Code',
+    Asc: true,
+  }
+}
 export default {
-  name: "EmailList",
+  name: 'EmailList',
   components: { BoxContent, Pagination, EmailForm, AttachmentList },
   props: {
     isDistinguishCriteria: {
       type: Boolean,
       default() {
-        return false;
+        return false
       },
     },
     systemLevel: {
       type: Number,
       default() {
-        return 0;
+        return 0
       },
     },
   },
   data() {
     return {
-      activeTab: "0",
+      activeTab: '0',
       searchData: searchDataDefault(),
       loading: false,
       list: [],
       total: 0,
       rowData: {},
-      title: "",
+      title: '',
       editVisible: false,
       attachmentVisible: false,
-    };
+      previewVisible: false,
+      previewHTML: null,
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 获取受试者列表
     getList() {
-      this.loading = true;
-      this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria;
-      this.searchData.systemLevel = this.systemLevel;
+      this.loading = true
+      this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria
+      this.searchData.systemLevel = this.systemLevel
       getEmailNoticeConfigList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 新增
     handleAdd() {
-      this.rowData = {};
-      this.title = "新增";
-      this.editVisible = true;
+      this.rowData = {}
+      this.title = '新增'
+      this.editVisible = true
     },
     // 编辑
     handleEdit(row) {
-      this.rowData = { ...row };
-      this.title = "编辑";
-      this.editVisible = true;
+      this.rowData = { ...row }
+      this.title = '编辑'
+      this.editVisible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm(this.$t("trials:staffResearch:message:confirmDel"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
         deleteEmailNoticeConfig(row.Id).then((res) => {
           if (res.IsSuccess) {
-            this.getList();
-            this.$message.success("删除成功!");
+            this.getList()
+            this.$message.success('删除成功!')
           }
-        });
-      });
+        })
+      })
     },
     handleDetail(row) {
-      this.rowData = { ...row };
-      this.attachmentVisible = true;
+      this.rowData = { ...row }
+      this.attachmentVisible = true
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 关闭新增、编辑框
     closeDialog() {
-      this.editVisible = false;
+      this.editVisible = false
+    },
+    preview(html) {
+      this.previewHTML = html
+      this.previewVisible = true
     },
   },
-};
+}
 </script>

src/views/login/index.vue

@@ -155,6 +155,14 @@
         <span style="color: #428bca">关于</span>
       </a>
     </div>
+    <div v-if="NODE_ENV === 'usa'" class="login-footer">
+      <span>
+        © {{ new Date().getFullYear() }} Elevate lmaging Inc. info@{{ host }}
+      </span>
+      <a @click="openAbout">
+        <span style="color: #428bca">About</span>
+      </a>
+    </div>
     <Vcode
       :show="isShow"
       :fail-text="$t('login:button:failText')"
@@ -179,9 +187,15 @@
           text-align: center;
         "
       >
-        <h1 style="text-align: center; margin-bottom: 20px">关于</h1>
+        <h1
+          style="text-align: center; margin-bottom: 20px"
+          v-if="NODE_ENV === 'usa'"
+        >
+          About
+        </h1>
+        <h1 style="text-align: center; margin-bottom: 20px" v-else>关于</h1>
         <p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
-          {{ $t('login:title:system_title') }}
+          {{ $t('login:title:system_title_about') }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t('login:title:system') }}</p>
         <p style="margin-bottom: 20px">
@@ -191,18 +205,24 @@
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有
         </p>
+        <p style="margin-bottom: 20px" v-else-if="NODE_ENV === 'usa'">
+          © {{ new Date().getFullYear() }} Elevate Imaging Inc.
+        </p>
         <p style="margin-bottom: 20px" v-else>
           Copyright © {{ new Date().getFullYear() }} Shanghai Extensive Imaging
           Inc.
         </p>
-        <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
+          <img style="width: 180px" src="@/assets/zzlogo-usa.png" alt="" />
+        </div>
+        <div style="margin-bottom: 20px" v-else>
           <img style="width: 180px" src="@/assets/zzlogo2.png" alt="" />
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="mini" @click="aboutVisible = false"
-          >关闭</el-button
-        >
+        <el-button type="primary" size="mini" @click="aboutVisible = false">
+          {{ $t('common:button:close') }}
+        </el-button>
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
@@ -263,6 +283,9 @@ export default {
   },
   computed: {
     ...mapGetters(['asyncRoutes', 'routes', 'language']),
+    host() {
+      return window.location.host
+    },
   },
   watch: {
     '$i18n.locale': {

src/views/reviewers/components/Agreements.vue

@@ -1,45 +1,92 @@
 <template>
   <div v-loading="loading" class="resumes-container">
     <div class="resume-content" v-if="!$route.query.ReviewStatus">
-      <p>{{$t('system:Agreements:title:Consultant Agreement')}}</p>
+      <p>{{ $t('system:Agreements:title:Consultant Agreement') }}</p>
       <div class="upload-content">
-        <upload-files ref="uploadAgreement" :disabled="$route.query.ReviewStatus === '1'" :doctor-id="doctorId" type="Consultant Agreement" accept=".pdf" @getFileList="getFileList" />
+        <upload-files
+          ref="uploadAgreement"
+          :disabled="$route.query.ReviewStatus === '1'"
+          :doctor-id="doctorId"
+          type="Consultant Agreement"
+          accept=".pdf"
+          @getFileList="getFileList"
+        />
       </div>
       <p>{{ $t('system:tip:file:pdf') }}</p>
     </div>
     <div v-if="!$route.query.ReviewStatus">
       <el-table :data="agreementList" size="small">
         <el-table-column type="index" width="40" />
-        <el-table-column prop="FileName" :label="$t('system:Agreements:table:Consultant Agreement')" width="300" />
-        <el-table-column prop="CreateTime" :label="$t('system:Agreements:table:Upload Time')" width="150" />
+        <el-table-column
+          prop="FileName"
+          :label="$t('system:Agreements:table:Consultant Agreement')"
+          width="300"
+        />
+        <el-table-column
+          prop="CreateTime"
+          :label="$t('system:Agreements:table:Upload Time')"
+          width="150"
+        />
         <el-table-column :label="$t('common:action:action')" width="400">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handlePreview(scope.row)">{{$t('trials:enrolledReviews:button:view')}}</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">{{$t('common:button:delete')}}</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="handlePreview(scope.row)"
+              >{{ $t('trials:enrolledReviews:button:view') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="$route.query.ReviewStatus === '1'"
+              @click="handleRemoveFile(scope.row)"
+              >{{ $t('common:button:delete') }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <div style="margin-top:20px">
+    <div style="margin-top: 20px">
       <span style="margin-right: 20px">
-        {{$t('trials:enrolledReviews:message:SOW')}}
+        {{ $t('trials:enrolledReviews:message:SOW') }}
       </span>
-      <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'"  @click="addCol(0, $t('trials:enrolledReviews:message:SOW'))">
-        {{ $t('common:button:upload') }}</el-button>
-      <el-button size="small" type="primary" @click="handleDownload('Reviewer_SOW_Template')">
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="$route.query.ReviewStatus === '1'"
+        @click="addCol(0, $t('trials:enrolledReviews:message:SOW'))"
+      >
+        {{ $t('common:button:upload') }}</el-button
+      >
+      <el-button
+        size="small"
+        type="primary"
+        @click="handleDownload('Reviewer_SOW_Template')"
+      >
         <i class="el-icon-view el-icon-download"></i>
         {{ $t('common:button:template') }}
       </el-button>
     </div>
     <el-table :data="sowList" size="small">
       <el-table-column type="index" width="40" />
-      <el-table-column :label="$t('system:Agreements:table:Criterion Type')" width="120">
+      <el-table-column
+        :label="$t('system:Agreements:table:Criterion Type')"
+        width="120"
+      >
         <template slot-scope="scope">
           {{ scope.row.CriterionName }}
         </template>
       </el-table-column>
-      <el-table-column prop="FileName" :label="$t('system:Agreements:table:Statement of Work')" width="400" />
-      <el-table-column prop="IsEnable" :label="$t('system:Agreements:table:Is Enable')" width="100">
+      <el-table-column
+        prop="FileName"
+        :label="$t('system:Agreements:table:Statement of Work')"
+        width="400"
+      />
+      <el-table-column
+        prop="IsEnable"
+        :label="$t('system:Agreements:table:Is Enable')"
+        width="100"
+      >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -49,32 +96,81 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="Remark" :label="$t('system:Agreements:Remark')" width="200" />
-      <el-table-column prop="CreateTime" :label="$t('system:Agreements:Upload Time')" width="150" />
+      <el-table-column
+        prop="Remark"
+        :label="$t('system:Agreements:Remark')"
+        width="200"
+      />
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('system:Agreements:Upload Time')"
+        width="150"
+      />
       <el-table-column :label="$t('common:action:action')" width="400">
         <template slot-scope="scope">
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePreview3(scope.row)">{{$t('trials:enrolledReviews:button:view')}}</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEditCol(scope.row, 0, $t('trials:enrolledReviews:message:SOW'))">
-            {{ $t('common:button:edit') }}</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile3(scope.row)">{{ $t('common:button:delete') }}</el-button>
+          <el-button
+            type="text"
+            size="small"
+            :disabled="$route.query.ReviewStatus === '1'"
+            @click="handlePreview3(scope.row)"
+            >{{ $t('trials:enrolledReviews:button:view') }}</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            :disabled="$route.query.ReviewStatus === '1'"
+            @click="
+              handleEditCol(
+                scope.row,
+                0,
+                $t('trials:enrolledReviews:message:SOW')
+              )
+            "
+          >
+            {{ $t('common:button:edit') }}</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            :disabled="$route.query.ReviewStatus === '1'"
+            @click="handleRemoveFile3(scope.row)"
+            >{{ $t('common:button:delete') }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    <div style="margin-top:20px" v-if="!$route.query.ReviewStatus">
+    <div style="margin-top: 20px" v-if="!$route.query.ReviewStatus">
       <span style="margin-right: 20px">
-          {{$t('trials:enrolledReviews:message:EQC')}}
+        {{ $t('trials:enrolledReviews:message:EQC') }}
       </span>
-      <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'" @click="addCol(1, $t('trials:enrolledReviews:message:EQC'))">{{$t('common:button:upload')}}</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="$route.query.ReviewStatus === '1'"
+        @click="addCol(1, $t('trials:enrolledReviews:message:EQC'))"
+        >{{ $t('common:button:upload') }}</el-button
+      >
     </div>
     <el-table :data="ackSowList" size="small" v-if="!$route.query.ReviewStatus">
       <el-table-column type="index" width="40" />
-      <el-table-column :label="$t('system:Agreements:table:Criterion Type')" width="120">
+      <el-table-column
+        :label="$t('system:Agreements:table:Criterion Type')"
+        width="120"
+      >
         <template slot-scope="scope">
           {{ scope.row.CriterionName }}
         </template>
       </el-table-column>
-      <el-table-column prop="FileName" :label="$t('system:Agreements:table:Acknowledgement of SOW')" width="400" />
-      <el-table-column prop="IsEnable" :label="$t('system:Agreements:table:Is Enable')" width="100">
+      <el-table-column
+        prop="FileName"
+        :label="$t('system:Agreements:table:Acknowledgement of SOW')"
+        width="400"
+      />
+      <el-table-column
+        prop="IsEnable"
+        :label="$t('system:Agreements:table:Is Enable')"
+        width="100"
+      >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -84,13 +180,45 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="Remark" :label="$t('system:Agreements:table:Remark')" width="200" />
-      <el-table-column prop="CreateTime" :label="$t('system:Agreements:table:Upload Time')" width="150" />
+      <el-table-column
+        prop="Remark"
+        :label="$t('system:Agreements:table:Remark')"
+        width="200"
+      />
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('system:Agreements:table:Upload Time')"
+        width="150"
+      />
       <el-table-column label="Action" width="400">
         <template slot-scope="scope">
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePreview3(scope.row)">{{$t('common:button:view')}}</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEditCol(scope.row, 1, $t('trials:enrolledReviews:message:EQC'))">{{$t('common:button:edit')}}</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile3(scope.row)">{{$t('common:button:delete')}}</el-button>
+          <el-button
+            type="text"
+            size="small"
+            :disabled="$route.query.ReviewStatus === '1'"
+            @click="handlePreview3(scope.row)"
+            >{{ $t('common:button:view') }}</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            :disabled="$route.query.ReviewStatus === '1'"
+            @click="
+              handleEditCol(
+                scope.row,
+                1,
+                $t('trials:enrolledReviews:message:EQC')
+              )
+            "
+            >{{ $t('common:button:edit') }}</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            :disabled="$route.query.ReviewStatus === '1'"
+            @click="handleRemoveFile3(scope.row)"
+            >{{ $t('common:button:delete') }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -103,7 +231,10 @@
           label-width="120px"
           size="small"
         >
-          <el-form-item :label="$t('system:Agreements:label:Criterion Type')" prop="CriterionType">
+          <el-form-item
+            :label="$t('system:Agreements:label:Criterion Type')"
+            prop="CriterionType"
+          >
             <el-select v-model="form.CriterionType">
               <el-option
                 v-for="item of $d.CriterionType"
@@ -113,7 +244,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('system:Agreements:label:File')" prop="FilePath">
+          <el-form-item
+            :label="$t('system:Agreements:label:File')"
+            prop="FilePath"
+          >
             <el-upload
               class="upload-demo"
               action
@@ -125,12 +259,20 @@
               :limit="1"
               :file-list="fileList"
             >
-              <el-button size="small" type="primary" :disabled="fileList.length > 0">{{$t('common:button:upload')}}</el-button>
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t('common:button:upload') }}</el-button
+              >
             </el-upload>
           </el-form-item>
           <el-form-item :label="$t('system:Agreements:label:Remark')">
-            <el-input v-model="form.Remark"  type="textarea"
-                      :autosize="{ minRows: 2, maxRows: 4}"></el-input>
+            <el-input
+              v-model="form.Remark"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 4 }"
+            ></el-input>
           </el-form-item>
           <el-form-item :label="$t('system:Agreements:label:Is Enable')">
             <el-switch
@@ -142,8 +284,20 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancle"
+          >{{ $t('common:button:cancel') }}</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+          >{{ $t('common:button:save') }}</el-button
+        >
       </template>
     </BaseModel>
   </div>
@@ -151,25 +305,43 @@
 <script>
 import { uploadFile } from '@/api/attachment'
 import UploadFiles from '@/components/UploadFiles'
-import { getDoctorSowList, getDoctorAckSowList, addDoctorCriterionFile, deleteDoctorCriterionFile, getDoctorCriterionFile } from '@/api/reviewers'
+import {
+  getDoctorSowList,
+  getDoctorAckSowList,
+  addDoctorCriterionFile,
+  deleteDoctorCriterionFile,
+  getDoctorCriterionFile,
+} from '@/api/reviewers'
 import BaseModel from '@/components/BaseModel'
 import { DownloadCommonDoc } from '@/api/dictionary'
 
 export default {
   name: 'Agreements',
   components: {
-    UploadFiles, BaseModel
+    UploadFiles,
+    BaseModel,
+  },
+  props: {
+    reviewerId: {
+      type: String,
+    },
   },
   data() {
     return {
-      doctorId: this.$route.query.Id,
+      doctorId: this.$route.query.Id || this.reviewerId,
       agreementList: [],
       sowList: [],
       ackSowList: [],
       loading: false,
       isOpen: false,
       btnLoading: false,
-      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true },
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: '',
+        appendToBody: true,
+      },
       form: {
         Remark: null,
         FileType: null,
@@ -177,24 +349,47 @@ export default {
         FilePath: null,
         DoctorId: null,
         CriterionType: null,
-        IsEnable: false
+        IsEnable: false,
       },
       rules: {
-        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
-        FilePath: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
+        CriterionType: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur'],
+          },
+        ],
+        FilePath: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur'],
+          },
+        ],
       },
-      fileList: []
+      fileList: [],
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.doctorId = this.reviewerId
+      }
+    },
+  },
   mounted() {
     this.initSowList()
   },
   methods: {
     handleDownload(code) {
       this.loading = true
-      DownloadCommonDoc(code).then(data => {
-        this.loading = false
-      }).catch(() => { this.loading = false })
+      DownloadCommonDoc(code)
+        .then((data) => {
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     handleEditCol(row, fileType, title) {
       this.model_cfg.visible = true
@@ -206,7 +401,7 @@ export default {
     handleRemoveFile3(row) {
       this.$confirm('确定删除？').then(() => {
         deleteDoctorCriterionFile({
-          Id: row.Id
+          Id: row.Id,
         }).then(() => {
           this.initSowList()
           this.$message.success('删除成功')
@@ -238,21 +433,34 @@ export default {
       this.btnLoading = true
       var fileName = param.file.name
       let file = await this.fileToBlob(param.file)
-      let res = await this.OSSclient.put(`/SystemData/reviewer/${this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'}/${this.doctorId}/${fileName}`, file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/${
+          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+        }/${this.doctorId}/${fileName}`,
+        file
+      )
       this.form.FileName = param.file.name
       this.form.FilePath = this.$getObjectName(res.url)
-      this.fileList[0] = { name: this.$getObjectName(res.url), path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url), url: res.url }
+      this.fileList[0] = {
+        name: this.$getObjectName(res.url),
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: res.url,
+      }
       this.btnLoading = false
     },
     handleCancle() {
       this.model_cfg.visible = false
     },
     handleSave() {
-      this.$refs['DictionaryTypeConfigForm'].validate(valid => {
+      this.$refs['DictionaryTypeConfigForm'].validate((valid) => {
         if (!valid) return
         this.form.DoctorId = this.doctorId
-        this.form.CriterionName = this.$fd('CriterionType', this.form.CriterionType)
-        addDoctorCriterionFile(this.form).then(res => {
+        this.form.CriterionName = this.$fd(
+          'CriterionType',
+          this.form.CriterionType
+        )
+        addDoctorCriterionFile(this.form).then((res) => {
           this.$message.success('添加成功')
           this.initSowList()
           this.handleCancle()
@@ -267,7 +475,7 @@ export default {
         FileName: null,
         FilePath: null,
         DoctorId: null,
-        CriterionType: null
+        CriterionType: null,
       }
       this.handleRemoveFile2()
       this.form.FileType = fileType
@@ -277,14 +485,14 @@ export default {
       if (!this.doctorId) return
       getDoctorCriterionFile({
         fileType: 0,
-        DoctorId: this.doctorId
-      }).then(res => {
+        DoctorId: this.doctorId,
+      }).then((res) => {
         this.sowList = res.Result
       })
       getDoctorCriterionFile({
         fileType: 1,
-        DoctorId: this.doctorId
-      }).then(res => {
+        DoctorId: this.doctorId,
+      }).then((res) => {
         this.ackSowList = res.Result
       })
     },
@@ -298,12 +506,12 @@ export default {
     },
     getFileList(fileList) {
       this.agreementList = fileList
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.resumes-container{
+.resumes-container {
   p {
     float: left;
     font-size: 13px;
@@ -314,5 +522,4 @@ export default {
     float: left;
   }
 }
-
 </style>

src/views/reviewers/components/BasicInfo.vue

@@ -15,31 +15,62 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item v-if="basicInfo.ReviewerCode" :label="$t('system:reviewer:label:Id')">
-                <el-input v-model="basicInfo.ReviewerCode" disabled size="small" />
+              <el-form-item
+                v-if="basicInfo.ReviewerCode"
+                :label="$t('system:reviewer:label:Id')"
+              >
+                <el-input
+                  v-model="basicInfo.ReviewerCode"
+                  disabled
+                  size="small"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:LastName')"  prop="LastName">
-                <el-input v-model="basicInfo.LastName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
+              <el-form-item
+                :label="$t('system:reviewer:label:LastName')"
+                prop="LastName"
+              >
+                <el-input
+                  v-model="basicInfo.LastName"
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:FirstName')"  prop="FirstName">
-                <el-input v-model="basicInfo.FirstName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
+              <el-form-item
+                :label="$t('system:reviewer:label:FirstName')"
+                prop="FirstName"
+              >
+                <el-input
+                  v-model="basicInfo.FirstName"
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:NameCN')" prop="ChineseName">
-                <el-input v-model="basicInfo.ChineseName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
+              <el-form-item
+                :label="$t('system:reviewer:label:NameCN')"
+                prop="ChineseName"
+              >
+                <el-input
+                  v-model="basicInfo.ChineseName"
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Gender')" prop="Sex">
+              <el-form-item
+                :label="$t('system:reviewer:label:Gender')"
+                prop="Sex"
+              >
                 <el-select
                   v-model="basicInfo.Sex"
                   prop="Sex"
@@ -59,12 +90,22 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Phone')" prop="Phone">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="basicInfo.Phone" size="small" />
+              <el-form-item
+                :label="$t('system:reviewer:label:Phone')"
+                prop="Phone"
+              >
+                <el-input
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  v-model="basicInfo.Phone"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Title')"  prop="TitleIds">
+              <el-form-item
+                :label="$t('system:reviewer:label:Title')"
+                prop="TitleIds"
+              >
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="basicInfo.TitleIds[0]"
@@ -89,15 +130,22 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Email')"  prop="EMail">
-                <el-input v-model="basicInfo.EMail" :disabled="$route.query.ReviewStatus === '1'" size="small" />
+              <el-form-item
+                :label="$t('system:reviewer:label:Email')"
+                prop="EMail"
+              >
+                <el-input
+                  v-model="basicInfo.EMail"
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="WeChat: " prop="WeChat">-->
-<!--                <el-input v-model="basicInfo.WeChat" :disabled="$route.query.ReviewStatus === '1'" size="small" />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <!--            <el-col :span="12">-->
+            <!--              <el-form-item label="WeChat: " prop="WeChat">-->
+            <!--                <el-input v-model="basicInfo.WeChat" :disabled="$route.query.ReviewStatus === '1'" size="small" />-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
             <el-col :span="12">
               <!-- <el-form-item label="Payment Type: " prop="Nation">
                 <el-radio-group v-model="basicInfo.Nation">
@@ -106,7 +154,10 @@
                 </el-radio-group>
               </el-form-item> -->
 
-              <el-form-item :label="$t('system:reviewer:label:Country')" prop="Nation">
+              <el-form-item
+                :label="$t('system:reviewer:label:Country')"
+                prop="Nation"
+              >
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="basicInfo.Nation"
@@ -114,13 +165,18 @@
                   clearable
                   class="mr"
                 >
-                  <el-option v-for="item of $d.AttendedReviewerType" :value="item.value" :label="item.label" :key="item.id"/>
+                  <el-option
+                    v-for="item of $d.AttendedReviewerType"
+                    :value="item.value"
+                    :label="item.label"
+                    :key="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-<!--          <el-row>-->
-<!--          </el-row>-->
+          <!--          <el-row>-->
+          <!--          </el-row>-->
           <el-row>
             <el-form-item style="margin-left: 120px">
               <el-button
@@ -129,7 +185,9 @@
                 :loading="isDisabled"
                 size="small"
                 @click="handleSave"
-              > {{ $t('common:button:save') }}</el-button>
+              >
+                {{ $t('common:button:save') }}</el-button
+              >
             </el-form-item>
           </el-row>
         </el-form>
@@ -142,6 +200,15 @@ import { getBasicInfo, addOrUpdateDoctorBasicInfo } from '@/api/reviewers'
 import { changeURLStatic } from '@/utils/history.js'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
+  props: {
+    reviewerId: {
+      type: String,
+    },
+    isSystem: {
+      type: Boolean,
+      default: true,
+    },
+  },
   data() {
     return {
       basicInfo: {
@@ -156,58 +223,58 @@ export default {
         EMail: '',
         WeChat: '',
         Introduction: '',
-        Nation: 0
+        Nation: 0,
       },
       rules: {
         FirstName: [
           {
             required: true,
             message: 'Please enter FirstName',
-            trigger: 'blur'
+            trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         LastName: [
           { required: true, message: 'Please enter LastName', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         ChineseName: [{ max: 50, message: 'The maximum length is 50' }],
         Sex: [
-          { required: true, message: 'Please select gender', trigger: 'blur' }
+          { required: true, message: 'Please select gender', trigger: 'blur' },
         ],
         TitleIds: [
-          { required: true, message: 'Please select Title', trigger: 'blur' }
+          { required: true, message: 'Please select Title', trigger: 'blur' },
         ],
         Phone: [
           {
             required: true,
             message: 'Please enter phone number',
-            trigger: 'blur'
+            trigger: 'blur',
           },
-          { max: 20, min: 7, message: 'The length is 7 to 20' }
+          { max: 20, min: 7, message: 'The length is 7 to 20' },
         ],
         EMail: [
           {
             required: true,
             message: 'Please input the email address',
-            trigger: 'blur'
+            trigger: 'blur',
           },
           {
             type: 'email',
             message: 'Please input the correct email address',
-            trigger: 'blur,change'
+            trigger: 'blur,change',
           },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
-        WeChat: [{ max: 50, message: 'The maximum length is 50' }]
+        WeChat: [{ max: 50, message: 'The maximum length is 50' }],
       },
       isDisabled: false,
       loading: false,
       genderOptions: [
         { label: 'Male', value: 0 },
-        { label: 'Female', value: 1 }
+        { label: 'Female', value: 1 },
       ],
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
   mounted() {
@@ -227,7 +294,12 @@ export default {
               this.$message.success('Saved successfully')
               if (!this.id) {
                 this.basicInfo.Id = res.Result.Id
-                changeURLStatic('Id', res.Result.Id)
+                if (this.isSystem) {
+                  changeURLStatic('Id', res.Result.Id)
+                }
+                if (!this.reviewerId) {
+                  this.$emit('update:reviewerId', res.Result.Id)
+                }
                 this.basicInfo.ReviewerCode = res.Result.ReviewerCode
               }
             })
@@ -241,27 +313,29 @@ export default {
     async initForm() {
       await this.getDicData()
 
-      const id = this.$route.query.Id
+      const id = this.$route.query.Id || this.reviewerId
       if (id) {
         this.loading = true
-        getBasicInfo(id).then((res) => {
-          // eslint-disable-next-line no-unused-vars
-          const { TitleList, ...param } = res.Result
-          this.basicInfo = param
-          this.loading = false
-        }).catch(() => {
-          this.loading = false
-        })
+        getBasicInfo(id)
+          .then((res) => {
+            // eslint-disable-next-line no-unused-vars
+            const { TitleList, ...param } = res.Result
+            this.basicInfo = param
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
       }
     },
     getDicData() {
-      getBasicDataSelects(['Title']).then(res => {
-        this.dictionaryList = { ...res.Result }
-      }).catch(() => {
-
-      })
-    }
-  }
+      getBasicDataSelects(['Title'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+        })
+        .catch(() => {})
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

src/views/reviewers/components/Credentials.vue

@@ -2,73 +2,90 @@
   <div class="credentials-container">
     <div class="clearfix">
       <el-card class="e-card">
-        <p class="title">{{$t('system:Credentials:title:Diploma of the highest medical degree')}}
+        <p class="title">
+          {{
+            $t('system:Credentials:title:Diploma of the highest medical degree')
+          }}
         </p>
-        <upload-file :doctor-id="doctorId" type="Diploma of the highest medical degree" />
-<!--        <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_DiplomaOfTheHighestMedicalDegree_Template')">-->
-<!--          <i class="el-icon-view el-icon-download"></i>-->
-<!--          Template-->
-<!--        </el-button>-->
+        <upload-file
+          :doctor-id="doctorId"
+          type="Diploma of the highest medical degree"
+        />
+        <!--        <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_DiplomaOfTheHighestMedicalDegree_Template')">-->
+        <!--          <i class="el-icon-view el-icon-download"></i>-->
+        <!--          Template-->
+        <!--        </el-button>-->
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">{{$t('system:Credentials:title:Medical Qualification Certificate')}}
-<!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_MedicalQualificationCertificate_Template')">-->
-<!--            <i class="el-icon-view el-icon-download"></i>-->
-<!--            Template-->
-<!--          </el-button>-->
+        <p class="title">
+          {{ $t('system:Credentials:title:Medical Qualification Certificate') }}
+          <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_MedicalQualificationCertificate_Template')">-->
+          <!--            <i class="el-icon-view el-icon-download"></i>-->
+          <!--            Template-->
+          <!--          </el-button>-->
         </p>
-        <upload-file :doctor-id="doctorId" type="Medical Qualification Certificate" />
+        <upload-file
+          :doctor-id="doctorId"
+          type="Medical Qualification Certificate"
+        />
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">{{$t('system:Credentials:title:Practice License')}}
-<!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_PracticeLicense_Template')">-->
-<!--            <i class="el-icon-view el-icon-download"></i>-->
-<!--            Template-->
-<!--          </el-button>-->
+        <p class="title">
+          {{ $t('system:Credentials:title:Practice License') }}
+          <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_PracticeLicense_Template')">-->
+          <!--            <i class="el-icon-view el-icon-download"></i>-->
+          <!--            Template-->
+          <!--          </el-button>-->
         </p>
         <upload-file :doctor-id="doctorId" type="Practice License" />
       </el-card>
     </div>
-    <h6 style="line-height:30px;font-size:13px;">{{$t('system:Credentials:title:Modality Certificate')}}</h6>
+    <h6 style="line-height: 30px; font-size: 13px">
+      {{ $t('system:Credentials:title:Modality Certificate') }}
+    </h6>
     <div class="clearfix">
       <el-card class="e-card">
-        <p class="title">CT
-<!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_CT_Template')">-->
-<!--            <i class="el-icon-view el-icon-download"></i>-->
-<!--            Template-->
-<!--          </el-button>-->
+        <p class="title">
+          CT
+          <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_CT_Template')">-->
+          <!--            <i class="el-icon-view el-icon-download"></i>-->
+          <!--            Template-->
+          <!--          </el-button>-->
         </p>
         <upload-file :doctor-id="doctorId" type="Modality Certificate(CT)" />
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">MRI
-<!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_MRI_Template')">-->
-<!--            <i class="el-icon-view el-icon-download"></i>-->
-<!--            Template-->
-<!--          </el-button>-->
+        <p class="title">
+          MRI
+          <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_MRI_Template')">-->
+          <!--            <i class="el-icon-view el-icon-download"></i>-->
+          <!--            Template-->
+          <!--          </el-button>-->
         </p>
         <upload-file :doctor-id="doctorId" type="Modality Certificate(MRI)" />
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">NM
-<!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_NM_Template')">-->
-<!--            <i class="el-icon-view el-icon-download"></i>-->
-<!--            Template-->
-<!--          </el-button>-->
+        <p class="title">
+          NM
+          <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_NM_Template')">-->
+          <!--            <i class="el-icon-view el-icon-download"></i>-->
+          <!--            Template-->
+          <!--          </el-button>-->
         </p>
         <upload-file :doctor-id="doctorId" type="Modality Certificate(NM)" />
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">US
-<!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_US_Template')">-->
-<!--            <i class="el-icon-view el-icon-download"></i>-->
-<!--            Template-->
-<!--          </el-button>-->
+        <p class="title">
+          US
+          <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_US_Template')">-->
+          <!--            <i class="el-icon-view el-icon-download"></i>-->
+          <!--            Template-->
+          <!--          </el-button>-->
         </p>
         <upload-file :doctor-id="doctorId" type="Modality Certificate(US)" />
       </el-card>
@@ -80,41 +97,56 @@ import UploadFile from '@/components/UploadFile'
 import { DownloadCommonDoc } from '@/api/dictionary'
 export default {
   components: {
-    UploadFile
+    UploadFile,
+  },
+  props: {
+    reviewerId: {
+      type: String,
+    },
   },
   data() {
     return {
-      doctorId: this.$route.query.Id
+      doctorId: this.$route.query.Id || this.reviewerId,
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.doctorId = this.reviewerId
+      }
+    },
+  },
   methods: {
     handleDownload(code) {
       this.loading = true
-      DownloadCommonDoc(code).then(data => {
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    }
-  }
+      DownloadCommonDoc(code)
+        .then((data) => {
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+  },
 }
 </script>
 <style lang="scss">
-.credentials-container{
+.credentials-container {
   .e-card {
-  width: 32.5%;
-  height: 180px;
-  font-size: 12px;
-  position: relative;
-  float: left;
-  margin: 0px 10px 5px 0px;
-  .title{
-    font-size: 13px;
-    margin-bottom: 15px;
-    font-weight: bold;
-
+    width: 32.5%;
+    height: 180px;
+    font-size: 12px;
+    position: relative;
+    float: left;
+    margin: 0px 10px 5px 0px;
+    .title {
+      font-size: 13px;
+      margin-bottom: 15px;
+      font-weight: bold;
     }
   }
-  h6{
-    margin:0;
+  h6 {
+    margin: 0;
   }
 }
 </style>

src/views/reviewers/components/Employment.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="form-container">
     <el-card class="box-card">
-      <div style="width:80%;">
+      <div style="width: 80%">
         <el-form
           ref="employmentForm"
           v-loading="loading"
@@ -10,20 +10,22 @@
           class="demo-ruleForm"
           label-width="150px"
         >
-
           <el-row>
             <el-col :span="14">
-              <el-form-item :label="$t('system:reviewer:label:Hospital')" prop="HospitalId">
+              <el-form-item
+                :label="$t('system:reviewer:label:Hospital')"
+                prop="HospitalId"
+              >
                 <el-select
                   v-model="employmentForm.HospitalId"
                   placeholder="select"
                   :disabled="$route.query.ReviewStatus === '1'"
-                  style="width:100%;"
+                  style="width: 100%"
                   size="small"
                   @change="handleHospitalChange"
                 >
                   <el-option
-                    v-for="(item,index) in hospitalList"
+                    v-for="(item, index) in hospitalList"
                     :key="index"
                     :label="item.HospitalName"
                     :value="item.Id"
@@ -39,7 +41,9 @@
 
           <el-row>
             <el-col :span="14">
-              <el-form-item :label="$t('system:reviewer:label:AffiliatedUniversity')">
+              <el-form-item
+                :label="$t('system:reviewer:label:AffiliatedUniversity')"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="UniversityAffiliated"
@@ -53,33 +57,48 @@
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:City')">
-                <el-input  :disabled="$route.query.ReviewStatus === '1'" v-model="City"  size="small" />
+                <el-input
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  v-model="City"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:State/Province')">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Province"  size="small" />
+                <el-input
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  v-model="Province"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:Country')">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Country"  size="small" />
+                <el-input
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  v-model="Country"
+                  size="small"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="14">
-              <el-form-item :label="$t('system:reviewer:label:Department')" prop="DepartmentId">
+              <el-form-item
+                :label="$t('system:reviewer:label:Department')"
+                prop="DepartmentId"
+              >
                 <el-select
                   v-model="employmentForm.DepartmentId"
                   placeholder="select"
                   :disabled="$route.query.ReviewStatus === '1'"
-                  style="width:100%;"
+                  style="width: 100%"
                   size="small"
                 >
                   <!-- <el-option
@@ -99,7 +118,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="5">
-              <el-form-item v-if="employmentForm.DepartmentId===otherId" class="other-item" prop="DepartmentOther">
+              <el-form-item
+                v-if="employmentForm.DepartmentId === otherId"
+                class="other-item"
+                prop="DepartmentOther"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="employmentForm.DepartmentOther"
@@ -109,7 +132,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="5">
-              <el-form-item v-if="employmentForm.DepartmentId===otherId" class="other-item" prop="DepartmentOtherCN">
+              <el-form-item
+                v-if="employmentForm.DepartmentId === otherId"
+                class="other-item"
+                prop="DepartmentOtherCN"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="employmentForm.DepartmentOtherCN"
@@ -122,13 +149,16 @@
 
           <el-row>
             <el-col :span="14">
-              <el-form-item :label="$t('system:reviewer:label:Rank')" prop="RankId">
+              <el-form-item
+                :label="$t('system:reviewer:label:Rank')"
+                prop="RankId"
+              >
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="employmentForm.RankId"
                   placeholder="select"
                   @change="RankChange"
-                  style="width:100%;"
+                  style="width: 100%"
                   size="small"
                 >
                   <!-- <el-option
@@ -143,12 +173,19 @@
                     :label="item.label"
                     :value="item.id"
                   />
-<!--                  <el-option label="Other" :value="otherId" />-->
+                  <!--                  <el-option label="Other" :value="otherId" />-->
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="5">
-              <el-form-item v-if="$fd('Rank', employmentForm.RankId, 'id') === '其它' || $fd('Rank', employmentForm.RankId, 'id') === 'Other'" class="other-item" prop="RankOther">
+              <el-form-item
+                v-if="
+                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
+                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                "
+                class="other-item"
+                prop="RankOther"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="employmentForm.RankOther"
@@ -158,7 +195,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="5">
-              <el-form-item v-if="$fd('Rank', employmentForm.RankId, 'id') === '其它' || $fd('Rank', employmentForm.RankId, 'id') === 'Other'" class="other-item" prop="RankOtherCN">
+              <el-form-item
+                v-if="
+                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
+                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                "
+                class="other-item"
+                prop="RankOtherCN"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="employmentForm.RankOtherCN"
@@ -169,98 +213,104 @@
             </el-col>
           </el-row>
 
-<!--          <el-row>-->
-<!--            <el-col :span="14">-->
-<!--              <el-form-item label="Physician: " prop="PhysicianId" >-->
-<!--                <el-select-->
-<!--                  v-model="employmentForm.PhysicianId"-->
-<!--                  placeholder="select"-->
-<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-<!--                  @change="PhysicianChange"-->
-<!--                  style="width:100%;"-->
-<!--                  size="small"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    v-for="item of $d.PhysicianOriginal"-->
-<!--                    :key="item.id"-->
-<!--                    :label="item.raw.Value"-->
-<!--                    :value="item.id"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="5">-->
-<!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="Physician">-->
-<!--                <el-input-->
-<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-<!--                  v-model="employmentForm.Physician"-->
-<!--                  placeholder="Please specify"-->
-<!--                  size="small"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="5">-->
-<!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="PhysicianCN">-->
-<!--                <el-input-->
-<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-<!--                  v-model="employmentForm.PhysicianCN"-->
-<!--                  placeholder="请用中文注明"-->
-<!--                  size="small"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--          <el-row>-->
-<!--            <el-col :span="14">-->
-<!--              <el-form-item label="Position: " prop="PositionId">-->
-<!--                <el-select-->
-<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-<!--                  v-model="employmentForm.PositionId"-->
-<!--                  placeholder="select"-->
-<!--                  style="width:100%;"-->
-<!--                  size="small"-->
-<!--                >-->
-<!--                  &lt;!&ndash; <el-option-->
-<!--                    v-for="(key,value) of dictionaryList.Position"-->
-<!--                    :key="key"-->
-<!--                    :label="key"-->
-<!--                    :value="value"-->
-<!--                  /> &ndash;&gt;-->
-<!--                  <el-option-->
-<!--                    v-for="item of dictionaryList.Position"-->
-<!--                    :key="item.Id"-->
-<!--                    :label="item.Value"-->
-<!--                    :value="item.Id"-->
-<!--                  />-->
-<!--                  <el-option label="Other" :value="otherId" />-->
-<!--                  <el-option label="None" value="f30a074b-2b47-4a92-97ec-e15086d37883" />-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="5">-->
-<!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOther">-->
-<!--                <el-input-->
-<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-<!--                  v-model="employmentForm.PositionOther"-->
-<!--                  placeholder="Please specify"-->
-<!--                  size="small"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="5">-->
-<!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOtherCN">-->
-<!--                <el-input-->
-<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-<!--                  v-model="employmentForm.PositionOtherCN"-->
-<!--                  placeholder="请用中文注明"-->
-<!--                  size="small"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
+          <!--          <el-row>-->
+          <!--            <el-col :span="14">-->
+          <!--              <el-form-item label="Physician: " prop="PhysicianId" >-->
+          <!--                <el-select-->
+          <!--                  v-model="employmentForm.PhysicianId"-->
+          <!--                  placeholder="select"-->
+          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+          <!--                  @change="PhysicianChange"-->
+          <!--                  style="width:100%;"-->
+          <!--                  size="small"-->
+          <!--                >-->
+          <!--                  <el-option-->
+          <!--                    v-for="item of $d.PhysicianOriginal"-->
+          <!--                    :key="item.id"-->
+          <!--                    :label="item.raw.Value"-->
+          <!--                    :value="item.id"-->
+          <!--                  />-->
+          <!--                </el-select>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="5">-->
+          <!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="Physician">-->
+          <!--                <el-input-->
+          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+          <!--                  v-model="employmentForm.Physician"-->
+          <!--                  placeholder="Please specify"-->
+          <!--                  size="small"-->
+          <!--                />-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="5">-->
+          <!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="PhysicianCN">-->
+          <!--                <el-input-->
+          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+          <!--                  v-model="employmentForm.PhysicianCN"-->
+          <!--                  placeholder="请用中文注明"-->
+          <!--                  size="small"-->
+          <!--                />-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
+          <!--          <el-row>-->
+          <!--            <el-col :span="14">-->
+          <!--              <el-form-item label="Position: " prop="PositionId">-->
+          <!--                <el-select-->
+          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+          <!--                  v-model="employmentForm.PositionId"-->
+          <!--                  placeholder="select"-->
+          <!--                  style="width:100%;"-->
+          <!--                  size="small"-->
+          <!--                >-->
+          <!--                  &lt;!&ndash; <el-option-->
+          <!--                    v-for="(key,value) of dictionaryList.Position"-->
+          <!--                    :key="key"-->
+          <!--                    :label="key"-->
+          <!--                    :value="value"-->
+          <!--                  /> &ndash;&gt;-->
+          <!--                  <el-option-->
+          <!--                    v-for="item of dictionaryList.Position"-->
+          <!--                    :key="item.Id"-->
+          <!--                    :label="item.Value"-->
+          <!--                    :value="item.Id"-->
+          <!--                  />-->
+          <!--                  <el-option label="Other" :value="otherId" />-->
+          <!--                  <el-option label="None" value="f30a074b-2b47-4a92-97ec-e15086d37883" />-->
+          <!--                </el-select>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="5">-->
+          <!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOther">-->
+          <!--                <el-input-->
+          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+          <!--                  v-model="employmentForm.PositionOther"-->
+          <!--                  placeholder="Please specify"-->
+          <!--                  size="small"-->
+          <!--                />-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="5">-->
+          <!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOtherCN">-->
+          <!--                <el-input-->
+          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+          <!--                  v-model="employmentForm.PositionOtherCN"-->
+          <!--                  placeholder="请用中文注明"-->
+          <!--                  size="small"-->
+          <!--                />-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
 
           <el-form-item>
-            <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+            <el-button
+              type="primary"
+              :disabled="isDisabled || $route.query.ReviewStatus === '1'"
+              size="small"
+              @click="handleSave"
+              >{{ $t('common:button:save') }}</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
@@ -274,6 +324,11 @@ import store from '@/store'
 import { mapGetters } from 'vuex'
 export default {
   name: 'Employment',
+  props: {
+    reviewerId: {
+      type: String,
+    },
+  },
   data() {
     const RankIndication = (rule, value, callback) => {
       if (value === '其它' || value === 'Other') {
@@ -293,7 +348,7 @@ export default {
     }
     return {
       employmentForm: {
-        Id: this.$route.query.Id,
+        Id: this.$route.query.Id || this.reviewerId,
         DepartmentId: '',
         DepartmentOther: '',
         DepartmentOtherCN: '',
@@ -307,46 +362,92 @@ export default {
         PhysicianId: '',
         Physician: '',
         PhysicianCN: '',
-        PhysicianOriginal: null
+        PhysicianOriginal: null,
       },
       UniversityAffiliated: '',
       City: '',
       Province: '',
       Country: '',
       employmentRules: {
-        DepartmentId: [{ required: true, message: 'Please select department', trigger: 'blur' }],
+        DepartmentId: [
+          {
+            required: true,
+            message: 'Please select department',
+            trigger: 'blur',
+          },
+        ],
         DepartmentOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         DepartmentOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
-        RankId: [{ required: true, message: 'Please select rank', trigger: 'blur' }],
-        RankOther: [{ required: true, message: 'Please select rank', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        RankOtherCN: [{ required: true, message: 'Please select rank', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        PhysicianId: [{ required: true, message: 'Please select Physician', trigger: 'blur' }],
-        Physician: [{ required: true, message: 'Please select Physician', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        PhysicianCN: [{ required: true, message: 'Please select Physician', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        PositionId: [{ required: true, message: 'Please select position', trigger: 'blur' }],
+        RankId: [
+          { required: true, message: 'Please select rank', trigger: 'blur' },
+        ],
+        RankOther: [
+          { required: true, message: 'Please select rank', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        RankOtherCN: [
+          { required: true, message: 'Please select rank', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        PhysicianId: [
+          {
+            required: true,
+            message: 'Please select Physician',
+            trigger: 'blur',
+          },
+        ],
+        Physician: [
+          {
+            required: true,
+            message: 'Please select Physician',
+            trigger: 'blur',
+          },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        PhysicianCN: [
+          {
+            required: true,
+            message: 'Please select Physician',
+            trigger: 'blur',
+          },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        PositionId: [
+          {
+            required: true,
+            message: 'Please select position',
+            trigger: 'blur',
+          },
+        ],
         PositionOther: [{ max: 50, message: 'The maximum length is 50' }],
         PositionOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
-        HospitalId: [{ required: true, message: 'Please select hospital', trigger: 'blur' }]
+        HospitalId: [
+          {
+            required: true,
+            message: 'Please select hospital',
+            trigger: 'blur',
+          },
+        ],
       },
       isDisabled: false,
       selectId: '00000000-0000-0000-0000-000000000000',
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
       loading: false,
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
   computed: {
-    ...mapGetters(['hospitalList'])
+    ...mapGetters(['hospitalList']),
   },
   mounted() {
     this.initEmployment()
   },
   methods: {
     RankChange(val) {
-      var o = this.$d.Rank.find(v => {
+      var o = this.$d.Rank.find((v) => {
         return v.id === val
       })
       if (o.label === '其它' || o.label === 'Other') {
@@ -358,7 +459,7 @@ export default {
       }
     },
     PhysicianChange(val) {
-      var o = this.$d.PhysicianOriginal.find(v => {
+      var o = this.$d.PhysicianOriginal.find((v) => {
         return v.id === val
       })
       if (o.label === '其它' || o.label === 'Other') {
@@ -370,7 +471,7 @@ export default {
       }
     },
     handleSave() {
-      this.$refs.employmentForm.validate(valid => {
+      this.$refs.employmentForm.validate((valid) => {
         if (valid) {
           this.loading = true
           this.isDisabled = true
@@ -378,62 +479,103 @@ export default {
           // var o = this.$d.PhysicianOriginal.find(v => {
           //   return v.id === this.employmentForm.PhysicianId
           // })
-          param.Id = this.$route.query.Id
+          param.Id = this.$route.query.Id || this.reviewerId
           param.DepartmentId = this.employmentForm.DepartmentId
-          param.DepartmentOther = this.employmentForm.DepartmentId === this.otherId ? this.employmentForm.DepartmentOther : ''
-          param.DepartmentOtherCN = this.employmentForm.DepartmentId === this.otherId ? this.employmentForm.DepartmentOtherCN : ''
+          param.DepartmentOther =
+            this.employmentForm.DepartmentId === this.otherId
+              ? this.employmentForm.DepartmentOther
+              : ''
+          param.DepartmentOtherCN =
+            this.employmentForm.DepartmentId === this.otherId
+              ? this.employmentForm.DepartmentOtherCN
+              : ''
           param.RankId = this.employmentForm.RankId
-          param.RankOther = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOther : ''
-          param.RankOtherCN = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOtherCN : ''
+          param.RankOther =
+            this.employmentForm.RankId === this.otherId
+              ? this.employmentForm.RankOther
+              : ''
+          param.RankOtherCN =
+            this.employmentForm.RankId === this.otherId
+              ? this.employmentForm.RankOtherCN
+              : ''
           // param.PhysicianId = this.employmentForm.PhysicianId
           // param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician
           // param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN
           param.PositionId = this.employmentForm.PositionId
-          param.PositionOther = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOther : ''
-          param.PositionOtherCN = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOtherCN : ''
+          param.PositionOther =
+            this.employmentForm.PositionId === this.otherId
+              ? this.employmentForm.PositionOther
+              : ''
+          param.PositionOtherCN =
+            this.employmentForm.PositionId === this.otherId
+              ? this.employmentForm.PositionOtherCN
+              : ''
           param.HospitalId = this.employmentForm.HospitalId
 
-          updateEmploymentInfo(param).then(res => {
-            this.isDisabled = false
-            this.loading = false
-            this.$message.success('Saved successfully')
-            if (!this.id) {
-              this.employmentForm.Id = res.Result
-            }
-          }).catch(() => {
-            this.isDisabled = false
-            this.loading = false
-          })
+          updateEmploymentInfo(param)
+            .then((res) => {
+              this.isDisabled = false
+              this.loading = false
+              this.$message.success('Saved successfully')
+              if (!this.id) {
+                this.employmentForm.Id = res.Result
+              }
+            })
+            .catch(() => {
+              this.isDisabled = false
+              this.loading = false
+            })
         }
       })
     },
     initForm() {
-      const id = this.$route.query.Id
+      const id = this.$route.query.Id || this.reviewerId
       if (id) {
         this.loading = true
-        getEmploymentInfo(id).then(res => {
-          const { PhysicianId, Physician, PhysicianCN, DepartmentId, DepartmentOther, DepartmentOtherCN, RankId, RankOther, RankOtherCN, PositionId, PositionOther, PositionOtherCN, HospitalId } = res.Result
-          this.employmentForm.Id = id
-          this.employmentForm.DepartmentId = DepartmentId === this.selectId ? '' : DepartmentId
-          this.employmentForm.DepartmentOther = DepartmentOther
-          this.employmentForm.DepartmentOtherCN = DepartmentOtherCN
-          this.employmentForm.RankId = RankId === this.selectId ? '' : RankId
-          this.employmentForm.RankOther = RankOther
-          this.employmentForm.RankOtherCN = RankOtherCN
-          this.employmentForm.PositionId = PositionId === this.selectId ? '' : PositionId
-          this.employmentForm.PositionOther = PositionOther
-          this.employmentForm.PhysicianId = PhysicianId
-          this.employmentForm.Physician = Physician
-          this.employmentForm.PhysicianCN = PhysicianCN
-          this.employmentForm.PositionOtherCN = PositionOtherCN
-          this.employmentForm.HospitalId = HospitalId === this.selectId ? '' : HospitalId
-          this.handleHospitalChange(this.employmentForm.HospitalId)
-          this.loading = false
-        }).catch(() => { this.loading = false })
+        getEmploymentInfo(id)
+          .then((res) => {
+            const {
+              PhysicianId,
+              Physician,
+              PhysicianCN,
+              DepartmentId,
+              DepartmentOther,
+              DepartmentOtherCN,
+              RankId,
+              RankOther,
+              RankOtherCN,
+              PositionId,
+              PositionOther,
+              PositionOtherCN,
+              HospitalId,
+            } = res.Result
+            this.employmentForm.Id = id
+            this.employmentForm.DepartmentId =
+              DepartmentId === this.selectId ? '' : DepartmentId
+            this.employmentForm.DepartmentOther = DepartmentOther
+            this.employmentForm.DepartmentOtherCN = DepartmentOtherCN
+            this.employmentForm.RankId = RankId === this.selectId ? '' : RankId
+            this.employmentForm.RankOther = RankOther
+            this.employmentForm.RankOtherCN = RankOtherCN
+            this.employmentForm.PositionId =
+              PositionId === this.selectId ? '' : PositionId
+            this.employmentForm.PositionOther = PositionOther
+            this.employmentForm.PhysicianId = PhysicianId
+            this.employmentForm.Physician = Physician
+            this.employmentForm.PhysicianCN = PhysicianCN
+            this.employmentForm.PositionOtherCN = PositionOtherCN
+            this.employmentForm.HospitalId =
+              HospitalId === this.selectId ? '' : HospitalId
+            this.handleHospitalChange(this.employmentForm.HospitalId)
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
       }
     },
     handleHospitalChange(value) {
-      const item = this.hospitalList.filter(item => item.Id === value)
+      const item = this.hospitalList.filter((item) => item.Id === value)
       if (item.length) {
         this.UniversityAffiliated = item[0].UniversityAffiliated
         this.City = item[0].City
@@ -447,15 +589,15 @@ export default {
       this.initForm()
     },
     getDicData() {
-      getBasicDataSelects(['Department', 'Rank', 'Position']).then(res => {
+      getBasicDataSelects(['Department', 'Rank', 'Position']).then((res) => {
         this.dictionaryList = { ...res.Result }
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-.other-item .el-form-item__content{
+.other-item .el-form-item__content {
   margin-left: 80px !important;
 }
 </style>

src/views/reviewers/components/ResearchPublication.vue

@@ -1,30 +1,71 @@
 <template>
-  <div class="form-container" style="width:80%;">
-    <el-form ref="researchForm" v-loading="loading" label-width="140px" :model="researchForm" size="small">
+  <div class="form-container" style="width: 80%">
+    <el-form
+      ref="researchForm"
+      v-loading="loading"
+      label-width="140px"
+      :model="researchForm"
+      size="small"
+    >
       <el-form-item :label="$t('system:reviewer:label:Field of Research')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.Research" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.Research"
+              type="textarea"
+              rows="5"
+              placeholder="Please specify in English"
+              size="small"
+            />
           </el-col>
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.ResearchCN" type="textarea" rows="5" placeholder="请用中文注明" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.ResearchCN"
+              type="textarea"
+              rows="5"
+              placeholder="请用中文注明"
+              size="small"
+            />
           </el-col>
         </el-row>
       </el-form-item>
       <el-form-item :label="$t('system:reviewer:label:Grants')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.Grants" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.Grants"
+              type="textarea"
+              rows="5"
+              placeholder="Please specify in English"
+              size="small"
+            />
           </el-col>
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.GrantsCN" type="textarea" rows="5" placeholder="请用中文注明" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.GrantsCN"
+              type="textarea"
+              rows="5"
+              placeholder="请用中文注明"
+              size="small"
+            />
           </el-col>
         </el-row>
       </el-form-item>
       <el-form-item :label="$t('system:reviewer:label:Publications')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.Publications" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.Publications"
+              type="textarea"
+              rows="5"
+              placeholder="Please specify in English"
+              size="small"
+            />
           </el-col>
           <el-col :span="11">
             <!-- <el-input v-model="researchForm.PublicationsCN" type="textarea" rows="5" placeholder="请用中文注明" size="small" /> -->
@@ -34,22 +75,45 @@
       <el-form-item :label="$t('system:reviewer:label:Awards & Honors')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.AwardsHonors" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.AwardsHonors"
+              type="textarea"
+              rows="5"
+              placeholder="Please specify in English"
+              size="small"
+            />
           </el-col>
           <el-col :span="11">
-            <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.AwardsHonorsCN" type="textarea" rows="5" placeholder="请用中文注明" size="small" />
+            <el-input
+              :disabled="$route.query.ReviewStatus === '1'"
+              v-model="researchForm.AwardsHonorsCN"
+              type="textarea"
+              rows="5"
+              placeholder="请用中文注明"
+              size="small"
+            />
           </el-col>
         </el-row>
       </el-form-item>
       <el-form-item>
-        <el-button :disabled="$route.query.ReviewStatus === '1'" type="primary" :loading="isDisabled" @click="handleSave">
-          {{ $t('common:button:save') }}</el-button>
+        <el-button
+          :disabled="$route.query.ReviewStatus === '1'"
+          type="primary"
+          :loading="isDisabled"
+          @click="handleSave"
+        >
+          {{ $t('common:button:save') }}</el-button
+        >
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import { getResearchPublication, addOrUpdateResearchPublication } from '@/api/reviewers'
+import {
+  getResearchPublication,
+  addOrUpdateResearchPublication,
+} from '@/api/reviewers'
 export default {
   name: 'ResearchPublication',
   props: {
@@ -57,8 +121,11 @@ export default {
       type: String,
       default() {
         return ''
-      }
-    }
+      },
+    },
+    reviewerId: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -69,10 +136,10 @@ export default {
         GrantsCN: '',
         Publications: '',
         AwardsHonors: '',
-        AwardsHonorsCN: ''
+        AwardsHonorsCN: '',
       },
       loading: false,
-      isDisabled: false
+      isDisabled: false,
     }
   },
   mounted() {
@@ -80,9 +147,9 @@ export default {
   },
   methods: {
     initForm() {
-      const id = this.$route.query.Id
+      const id = this.$route.query.Id || this.reviewerId
       if (id) {
-        getResearchPublication(id).then(res => {
+        getResearchPublication(id).then((res) => {
           if (res.Result) {
             this.researchForm.Research = res.Result.Research
             this.researchForm.ResearchCN = res.Result.ResearchCN
@@ -99,19 +166,21 @@ export default {
     handleSave() {
       this.loading = true
       this.isDisabled = true
-      this.researchForm.DoctorId = this.$route.query.Id
-      addOrUpdateResearchPublication(this.researchForm).then(res => {
-        this.loading = false
-        this.isDisabled = false
-        this.$message.success('Saved successfully')
-        if (!this.researchForm.Id) {
-          this.researchForm.Id = res.Result
-        }
-      }).catch(() => {
-        this.loading = false
-        this.isDisabled = false
-      })
-    }
-  }
+      this.researchForm.DoctorId = this.$route.query.Id || this.reviewerId
+      addOrUpdateResearchPublication(this.researchForm)
+        .then((res) => {
+          this.loading = false
+          this.isDisabled = false
+          this.$message.success('Saved successfully')
+          if (!this.researchForm.Id) {
+            this.researchForm.Id = res.Result
+          }
+        })
+        .catch(() => {
+          this.loading = false
+          this.isDisabled = false
+        })
+    },
+  },
 }
 </script>

src/views/reviewers/components/Resumes.vue

@@ -7,14 +7,19 @@
         <div class="uploadFile-container">
           <el-upload
             class="upload-demo"
-            :data="{language:2}"
+            :data="{ language: 2 }"
             action
             :show-file-list="false"
             :http-request="handleUploadFile"
             :file-list="resumeList"
             accept=".doc,.docx"
           >
-            <el-button size="small" type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="isDisabled || $route.query.ReviewStatus === '1'"
+              >{{ $t('system:GcpCertificate:upload:Upload') }}</el-button
+            >
           </el-upload>
         </div>
       </div>
@@ -24,15 +29,25 @@
     <div class="resumeTbl">
       <el-table :data="resumeListEN" size="small">
         <el-table-column type="index" width="40" />
-        <el-table-column prop="FileName" :label="$t('system:Resumes:table:Resume')" width="180" show-overflow-tooltip />
-        <el-table-column prop="CreateTime" :label="$t('system:Resumes:table:Upload Time')" width="150" show-overflow-tooltip />
+        <el-table-column
+          prop="FileName"
+          :label="$t('system:Resumes:table:Resume')"
+          width="180"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="CreateTime"
+          :label="$t('system:Resumes:table:Upload Time')"
+          width="150"
+          show-overflow-tooltip
+        />
         <el-table-column
           prop="IsOfficial"
           :label="$t('system:Resumes:table:Official')"
           width="100"
         >
           <template slot-scope="scope">
-            {{ scope.row.IsOfficial === true?'Yes':'No' }}
+            {{ scope.row.IsOfficial === true ? 'Yes' : 'No' }}
           </template>
         </el-table-column>
         <el-table-column
@@ -42,31 +57,44 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.Language===1?'中文':'English' }}
+            {{ scope.row.Language === 1 ? '中文' : 'English' }}
             <!-- <el-button size="small" type="text" @click="handleLanguageClick(scope.row)">{{ scope.row.Language===1?'CH':scope.row.Language===2?'EN':'Setting' }}</el-button> -->
           </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')" width="400">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handlePreview(scope.row)">{{ $t('common:button:download') }}</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">{{ $t('common:button:delete') }}</el-button>
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.IsOfficial || $route.query.ReviewStatus === '1'"
+              @click="handlePreview(scope.row)"
+              >{{ $t('common:button:download') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="$route.query.ReviewStatus === '1'"
+              @click="handleRemoveFile(scope.row)"
+              >{{ $t('common:button:delete') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="
+                scope.row.IsOfficial || $route.query.ReviewStatus === '1'
+              "
               @click="handleSetOfiical(scope.row)"
-            >{{ $t('system:Resumes:button:Set as Official') }}</el-button>
+              >{{ $t('system:Resumes:button:Set as Official') }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-
     </div>
-    <div class="resume-content" style="margin-top:10px;">
+    <div class="resume-content" style="margin-top: 10px">
       <p>{{ $t('system:Resumes:title:ResumeCN') }}</p>
       <div class="upload-content">
         <div class="uploadFile-container">
           <el-upload
-            :data="{language:1}"
+            :data="{ language: 1 }"
             class="upload-demo"
             action
             :show-file-list="false"
@@ -74,7 +102,12 @@
             :file-list="resumeList"
             accept=".doc, .docx"
           >
-            <el-button size="small" type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="isDisabled || $route.query.ReviewStatus === '1'"
+              >{{ $t('system:GcpCertificate:upload:Upload') }}</el-button
+            >
           </el-upload>
         </div>
       </div>
@@ -83,15 +116,25 @@
     <div class="resumeTbl">
       <el-table :data="resumeListCN" size="small">
         <el-table-column type="index" width="40" />
-        <el-table-column prop="FileName" :label="$t('system:Resumes:table:Resume')" width="180" show-overflow-tooltip />
-        <el-table-column prop="CreateTime" :label="$t('system:Resumes:table:Upload Time')" width="150" show-overflow-tooltip />
+        <el-table-column
+          prop="FileName"
+          :label="$t('system:Resumes:table:Resume')"
+          width="180"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="CreateTime"
+          :label="$t('system:Resumes:table:Upload Time')"
+          width="150"
+          show-overflow-tooltip
+        />
         <el-table-column
           prop="IsOfficial"
           :label="$t('system:Resumes:table:Official')"
           width="100"
         >
           <template slot-scope="scope">
-            {{ scope.row.IsOfficial === true?'Yes':'No' }}
+            {{ scope.row.IsOfficial === true ? 'Yes' : 'No' }}
           </template>
         </el-table-column>
         <el-table-column
@@ -101,20 +144,34 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.Language===1?'中文':'English' }}
+            {{ scope.row.Language === 1 ? '中文' : 'English' }}
             <!-- <el-button size="small" type="text" @click="handleLanguageClick(scope.row)">{{ scope.row.Language===1?'CH':scope.row.Language===2?'EN':'Setting' }}</el-button> -->
           </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')" width="400">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handlePreview(scope.row)">{{ $t('common:button:download') }}</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">{{ $t('common:button:delete') }}</el-button>
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.IsOfficial || $route.query.ReviewStatus === '1'"
+              @click="handlePreview(scope.row)"
+              >{{ $t('common:button:download') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="$route.query.ReviewStatus === '1'"
+              @click="handleRemoveFile(scope.row)"
+              >{{ $t('common:button:delete') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="
+                scope.row.IsOfficial || $route.query.ReviewStatus === '1'
+              "
               @click="handleSetOfiical(scope.row)"
-            >{{ $t('system:Resumes:button:Set as Official') }}</el-button>
+              >{{ $t('system:Resumes:button:Set as Official') }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -126,31 +183,49 @@
       size="small"
     >
       <span>Language: </span>
-      <el-radio-group :disabled="$route.query.ReviewStatus === '1'" v-model="language">
+      <el-radio-group
+        :disabled="$route.query.ReviewStatus === '1'"
+        v-model="language"
+      >
         <el-radio :label="2">English</el-radio>
         <el-radio :label="1">中文</el-radio>
       </el-radio-group>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" :disabled="$route.query.ReviewStatus === '1'" @click="dialogVisible = false">Cancel</el-button>
-        <el-button type="primary" :disabled="$route.query.ReviewStatus === '1'" size="small" @click="setResumeLanguage">Ok</el-button>
+        <el-button
+          size="small"
+          :disabled="$route.query.ReviewStatus === '1'"
+          @click="dialogVisible = false"
+          >Cancel</el-button
+        >
+        <el-button
+          type="primary"
+          :disabled="$route.query.ReviewStatus === '1'"
+          size="small"
+          @click="setResumeLanguage"
+          >Ok</el-button
+        >
       </span>
     </el-dialog>
   </div>
 </template>
 <script>
-import { getAttachmentByType, uploadFile, saveAttachments, deleteAttachment, setOfficial, setLanguageForResume } from '@/api/attachment'
+import {
+  getAttachmentByType,
+  uploadFile,
+  saveAttachments,
+  deleteAttachment,
+  setOfficial,
+  setLanguageForResume,
+} from '@/api/attachment'
 export default {
   props: {
-    id: {
+    reviewerId: {
       type: String,
-      default() {
-        return ''
-      }
-    }
+    },
   },
   data() {
     return {
-      doctorId: this.$route.query.Id,
+      doctorId: this.$route.query.Id || this.reviewerId,
       resumeList: [],
       resumeListEN: [],
       resumeListCN: [],
@@ -159,25 +234,36 @@ export default {
       currentRow: {},
       repeat: false,
       isDisabled: false,
-      loading: false
+      loading: false,
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.doctorId = this.reviewerId
+      }
+    },
+  },
   created() {
-    if(!this.doctorId) return
+    if (!this.doctorId) return
     this.getResumeList()
   },
   methods: {
     getResumeList() {
       this.loading = true
-      getAttachmentByType(this.doctorId, 'Resume').then(res => {
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) {
-            this.resumeList = res.Result
-            this.filterByLanguage()
+      getAttachmentByType(this.doctorId, 'Resume')
+        .then((res) => {
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              this.resumeList = res.Result
+              this.filterByLanguage()
+            }
           }
-        }
-        this.loading = false
-      }).catch(() => { this.loading = false })
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     handleUploadFile(param) {
       this.repeat = false
@@ -186,20 +272,22 @@ export default {
       // 检测文件后缀名
       if (this.checkFileSuffix(param.file.name) > -1) {
         // 检测是否有重名文件
-        const isRepeat = this.resumeList.some(item => item.FileName === param.file.name)
+        const isRepeat = this.resumeList.some(
+          (item) => item.FileName === param.file.name
+        )
         if (isRepeat) {
           this.$confirm('Override the existing resume?', {
             type: 'warning',
             distinguishCancelAndClose: true,
             confirmButtonText: 'OK',
-            cancelButtonText: 'Cancel'
+            cancelButtonText: 'Cancel',
           })
             .then(() => {
               // 重名覆盖
               this.repeat = true
               this.uploadFile(param.file, param.data.language)
             })
-            .catch(action => {})
+            .catch((action) => {})
         } else {
           this.uploadFile(param.file, param.data.language)
         }
@@ -212,7 +300,10 @@ export default {
       var fileName = file.name
       var files = this.resumeList
       file = await this.fileToBlob(file)
-      let res = await this.OSSclient.put(`/SystemData/reviewer/Resume/${this.doctorId}/${fileName}`, file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/Resume/${this.doctorId}/${fileName}`,
+        file
+      )
       if (this.repeat) {
         const index = files.findIndex((item, index) => {
           return item.FileName === fileName
@@ -228,26 +319,28 @@ export default {
           Path: this.$getObjectName(res.url),
           FullPath: this.$getObjectName(res.url),
           FileName: fileName,
-          Language: language
+          Language: language,
         }
         files.push(fileData)
       }
       this.saveUploadFiles(files)
     },
     saveUploadFiles(files) {
-      saveAttachments(files).then(res => {
-        this.resumeList = res.Result
-        this.filterByLanguage()
-        this.isDisabled = false
-        this.$message.success('Uploaded successfully')
-      }).catch(() => {
-        this.isDisabled = false
-      })
+      saveAttachments(files)
+        .then((res) => {
+          this.resumeList = res.Result
+          this.filterByLanguage()
+          this.isDisabled = false
+          this.$message.success('Uploaded successfully')
+        })
+        .catch(() => {
+          this.isDisabled = false
+        })
     },
     filterByLanguage() {
       this.resumeListEN = []
       this.resumeListCN = []
-      this.resumeList.map(resume => {
+      this.resumeList.map((resume) => {
         if (resume.Language === 2) {
           this.resumeListEN.push(resume)
         } else if (resume.Language === 1) {
@@ -258,7 +351,9 @@ export default {
     checkFileSuffix(fileName) {
       const accept = '.doc, .docx'
       var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, fileName.length).toLocaleLowerCase()
+      var suffix = fileName
+        .substring(index + 1, fileName.length)
+        .toLocaleLowerCase()
       return accept.search(suffix)
     },
     handlePreview(row) {
@@ -270,29 +365,31 @@ export default {
       this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-
-      }).then(() => {
-        deleteAttachment(row.Id, row.Path)
-          .then(res => {
+      })
+        .then(() => {
+          deleteAttachment(row.Id, row.Path).then((res) => {
             if (res.IsSuccess) {
-              this.resumeList.splice(this.resumeList.findIndex(item => item.Id === row.Id), 1)
+              this.resumeList.splice(
+                this.resumeList.findIndex((item) => item.Id === row.Id),
+                1
+              )
               this.filterByLanguage()
               this.$message({
                 message: this.$t('common:message:deletedSuccessfully'),
-                type: 'success'
+                type: 'success',
               })
             }
           })
-      })
-        .catch(action => {})
+        })
+        .catch((action) => {})
     },
     handleSetOfiical(row) {
-      setOfficial(this.doctorId, row.Id, row.Language).then(res => {
+      setOfficial(this.doctorId, row.Id, row.Language).then((res) => {
         if (res.IsSuccess) {
           this.getResumeList()
           this.$message({
             message: 'Saved successfully!',
-            type: 'success'
+            type: 'success',
           })
         }
       })
@@ -303,23 +400,27 @@ export default {
       this.currentRow = row
     },
     setResumeLanguage() {
-      setLanguageForResume(this.doctorId, this.currentRow.Id, this.language).then(res => {
+      setLanguageForResume(
+        this.doctorId,
+        this.currentRow.Id,
+        this.language
+      ).then((res) => {
         if (res.IsSuccess) {
           this.dialogVisible = false
           this.getResumeList()
           this.$message({
             message: 'Saved successfully!',
-            type: 'success'
+            type: 'success',
           })
         }
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-.resumes-container{
-  .resume-content{
+.resumes-container {
+  .resume-content {
     p {
       float: left;
       font-size: 13px;
@@ -341,11 +442,9 @@ export default {
     .upload-content {
       float: left;
     }
-
   }
-  .el-dialog__body{
+  .el-dialog__body {
     padding: 10px 20px;
   }
 }
-
 </style>

src/views/reviewers/components/Setting.vue

@@ -1,80 +1,144 @@
 <template>
   <div v-loading="loading" class="check-container form-container">
-    <el-form ref="checkForm" :model="checkForm" label-width="200px" size="small" :rules="rules">
+    <el-form
+      ref="checkForm"
+      :model="checkForm"
+      label-width="200px"
+      size="small"
+      :rules="rules"
+    >
       <div class="title-wrapper">
-        <p>{{$t('system:Setting:title:Blinded information') }}</p>
+        <p>{{ $t('system:Setting:title:Blinded information') }}</p>
       </div>
       <div class="check-content">
-        <el-form-item :label="$t('system:Setting:label:Blind Name')" prop="BlindName">
-          <el-input
-            v-model="checkForm.BlindName"
-            style="width:300px"
-          />
+        <el-form-item
+          :label="$t('system:Setting:label:Blind Name')"
+          prop="BlindName"
+        >
+          <el-input v-model="checkForm.BlindName" style="width: 300px" />
         </el-form-item>
-        <el-form-item :label="$t('system:Setting:label:Blind NameCN')" prop="BlindNameCN">
-          <el-input
-            v-model="checkForm.BlindNameCN"
-            style="width:300px"
-          />
+        <el-form-item
+          :label="$t('system:Setting:label:Blind NameCN')"
+          prop="BlindNameCN"
+        >
+          <el-input v-model="checkForm.BlindNameCN" style="width: 300px" />
         </el-form-item>
-        <el-form-item :label="$t('system:Setting:label:Blind Publications')" prop="BlindPublications">
-          <el-input v-model="checkForm.BlindPublications" type="textarea" rows="8" style="width:60%;" size="small" />
+        <el-form-item
+          :label="$t('system:Setting:label:Blind Publications')"
+          prop="BlindPublications"
+        >
+          <el-input
+            v-model="checkForm.BlindPublications"
+            type="textarea"
+            rows="8"
+            style="width: 60%"
+            size="small"
+          />
         </el-form-item>
       </div>
       <div class="title-wrapper">
-        <p>{{$t('system:Setting:title:Blinded Setting') }}</p>
+        <p>{{ $t('system:Setting:title:Blinded Setting') }}</p>
       </div>
       <div class="check-content">
-          <el-form-item :label="$t('system:Setting:label:Information Confirmed?')">
-            <el-radio-group v-model="checkForm.ReviewStatus" @change="handleChange">
-              <el-radio :label="1">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
-              <el-radio :label="2">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="$t('system:Setting:label:Contractor Status?')">
-            <el-radio-group v-model="checkForm.CooperateStatus" @change="handleChange">
-              <el-radio :label="1">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
-              <el-radio :label="2">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
+        <el-form-item
+          :label="$t('system:Setting:label:Information Confirmed?')"
+        >
+          <el-radio-group
+            v-model="checkForm.ReviewStatus"
+            @change="handleChange"
+          >
+            <el-radio :label="1">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="2">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item :label="$t('system:Setting:label:Contractor Status?')">
+          <el-radio-group
+            v-model="checkForm.CooperateStatus"
+            @change="handleChange"
+          >
+            <el-radio :label="1">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="2">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
-          <el-form-item :label="$t('system:Setting:label:Accepting New Trials?')">
-            <el-radio-group v-model="checkForm.AcceptingNewTrial" :disabled="radioDisabled">
-              <el-radio :label="true">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
-              <el-radio :label="false">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
+        <el-form-item :label="$t('system:Setting:label:Accepting New Trials?')">
+          <el-radio-group
+            v-model="checkForm.AcceptingNewTrial"
+            :disabled="radioDisabled"
+          >
+            <el-radio :label="true">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="false">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
-          <el-form-item :label="$t('system:Setting:label:Actively Reading?')">
-            <el-radio-group v-model="checkForm.ActivelyReading" :disabled="radioDisabled">
-              <el-radio :label="true">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
-              <el-radio :label="false">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
+        <el-form-item :label="$t('system:Setting:label:Actively Reading?')">
+          <el-radio-group
+            v-model="checkForm.ActivelyReading"
+            :disabled="radioDisabled"
+          >
+            <el-radio :label="true">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="false">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
-          <el-form-item :label="$t('system:Setting:label:Is Virtual?')">
-            <el-radio-group v-model="checkForm.IsVirtual" :disabled="radioDisabled">
-              <el-radio :label="true">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
-              <el-radio :label="false">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
+        <el-form-item :label="$t('system:Setting:label:Is Virtual?')">
+          <el-radio-group
+            v-model="checkForm.IsVirtual"
+            :disabled="radioDisabled"
+          >
+            <el-radio :label="true">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="false">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
-          <el-form-item :label="$t('system:Setting:label:On Vacation:')">
-            <span style="font-size:12px;margin-right:20px;">{{ checkForm.InHoliday }}</span>
-            <el-button type="text" @click="handleView">{{ $t('system:Setting:Planned Vacation') }}</el-button>
-          </el-form-item>
-          <el-form-item :label="$t('system:Setting:label:Comment:')" prop="AdminComment">
-            <el-input
-              v-model="checkForm.AdminComment"
-              type="textarea"
-              style="width:60%;"
-              rows="8"
-            />
-          </el-form-item>
+        <el-form-item :label="$t('system:Setting:label:On Vacation:')">
+          <span style="font-size: 12px; margin-right: 20px">{{
+            checkForm.InHoliday
+          }}</span>
+          <el-button type="text" @click="handleView">{{
+            $t('system:Setting:Planned Vacation')
+          }}</el-button>
+        </el-form-item>
+        <el-form-item
+          :label="$t('system:Setting:label:Comment:')"
+          prop="AdminComment"
+        >
+          <el-input
+            v-model="checkForm.AdminComment"
+            type="textarea"
+            style="width: 60%"
+            rows="8"
+          />
+        </el-form-item>
 
-          <el-form-item style="margin-top:20px">
-            <el-button type="primary" :disabled="isDisabled" @click="handleSave">{{ $t('common:button:save') }}</el-button>
-          </el-form-item>
+        <el-form-item style="margin-top: 20px">
+          <el-button
+            type="primary"
+            :disabled="isDisabled"
+            @click="handleSave"
+            >{{ $t('common:button:save') }}</el-button
+          >
+        </el-form-item>
       </div>
     </el-form>
     <el-dialog
@@ -96,7 +160,13 @@
           :end-placeholder="$t('system:Setting:label:End Date')"
           size="small"
         />
-        <el-button style="margin-left:10px;" type="primary" size="small" @click="handleAddHoliday">{{ $t('common:button:add') }}</el-button>
+        <el-button
+          style="margin-left: 10px"
+          type="primary"
+          size="small"
+          @click="handleAddHoliday"
+          >{{ $t('common:button:add') }}</el-button
+        >
       </div>
       <el-table v-loading="loading2" :data="gridData" size="small">
         <el-table-column type="index" />
@@ -112,13 +182,19 @@
           min-width="120"
           :formatter="endTimeFormatter"
         />
-        <el-table-column :label="$t('common:action:action')" fixed="right" min-width="200">
+        <el-table-column
+          :label="$t('common:action:action')"
+          fixed="right"
+          min-width="200"
+        >
           <template slot-scope="scope">
-            <el-button type="text" @click="handleDelete(scope.row)">{{ $t('common:button:delete') }}</el-button>
+            <el-button type="text" @click="handleDelete(scope.row)">{{
+              $t('common:button:delete')
+            }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination" style="padding: 10px 0;text-align: right">
+      <div class="pagination" style="padding: 10px 0; text-align: right">
         <el-pagination
           background
           layout="total,sizes,prev, pager, next"
@@ -134,17 +210,20 @@
   </div>
 </template>
 <script>
-import { getAuditState, updateAuditResume, getVacationList, addOrUpdateVacation, deleteVacation } from '@/api/reviewers'
+import {
+  getAuditState,
+  updateAuditResume,
+  getVacationList,
+  addOrUpdateVacation,
+  deleteVacation,
+} from '@/api/reviewers'
 import { fmtDate } from '@/utils/formatter'
 export default {
   name: 'Setting',
   props: {
-    id: {
+    reviewerId: {
       type: String,
-      default() {
-        return ''
-      }
-    }
+    },
   },
   data() {
     return {
@@ -165,9 +244,11 @@ export default {
       },
       rules: {
         AdminComment: [{ max: 500, message: 'The maximum length is 500' }],
-        BlindName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        BlindName: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+        ],
       },
-      doctorId: this.$route.query.Id,
+      doctorId: this.$route.query.Id || this.reviewerId,
       isDisabled: false,
       radioDisabled: false,
       dialogVisible: false,
@@ -176,16 +257,23 @@ export default {
       pageIndex: 1,
       pageSize: 5,
       totalItems: 0,
-      loading2: false
+      loading2: false,
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.doctorId = this.reviewerId
+      }
+    },
+  },
   mounted() {
     this.initForm()
   },
   methods: {
     initForm() {
       if (!this.doctorId) return
-      getAuditState(this.doctorId).then(res => {
+      getAuditState(this.doctorId).then((res) => {
         if (res.Result) {
           this.checkForm = res.Result
           this.checkForm.InHoliday = res.Result.InHoliday ? 'Yes' : 'No'
@@ -193,7 +281,7 @@ export default {
       })
     },
     handleSave() {
-      this.$refs.checkForm.validate(valid => {
+      this.$refs.checkForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
           const param = {}
@@ -201,11 +289,15 @@ export default {
           param.InHoliday = this.checkForm.InHoliday === 'Yes'
           param.ResumeStatus = param.ReviewStatus
           updateAuditResume(param)
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                if (res.Result) { this.checkForm.Id = res.Result }
+                if (res.Result) {
+                  this.checkForm.Id = res.Result
+                }
                 this.isDisabled = false
-                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                this.$message.success(
+                  this.$t('common:message:savedSuccessfully')
+                )
               }
             })
             .catch(() => {
@@ -221,7 +313,7 @@ export default {
     initHolidayList() {
       this.loading2 = true
       getVacationList(this.doctorId, this.pageIndex, this.pageSize)
-        .then(res => {
+        .then((res) => {
           if (res.IsSuccess) {
             this.gridData = res.Result.CurrentPageData
             this.totalItems = res.Result.TotalCount
@@ -237,11 +329,11 @@ export default {
         const param = {
           DoctorId: this.doctorId,
           StartDate: this.daterange[0],
-          EndDate: this.daterange[1]
+          EndDate: this.daterange[1],
         }
         this.loading2 = true
         addOrUpdateVacation(param)
-          .then(res => {
+          .then((res) => {
             if (res.IsSuccess) {
               param.Id = res.Result
               this.gridData.push(param)
@@ -266,14 +358,18 @@ export default {
         .then(() => {
           this.loading2 = true
           deleteVacation(row.Id)
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                var index = this.gridData.findIndex((item) => item.Id === row.Id)
+                var index = this.gridData.findIndex(
+                  (item) => item.Id === row.Id
+                )
                 if (index !== -1) {
                   this.gridData.splice(index, 1)
                   this.totalItems = this.totalItems - 1
                 }
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+                this.$message.success(
+                  this.$t('common:message:deletedSuccessfully')
+                )
               }
               this.loading2 = false
             })
@@ -281,13 +377,16 @@ export default {
               this.loading2 = false
             })
         })
-        .catch(action => {})
+        .catch((action) => {})
     },
     closeDialog() {
       this.initForm()
     },
     handleChange() {
-      if (this.checkForm.ReviewStatus === 2 || this.checkForm.cooperateStatus === 2) {
+      if (
+        this.checkForm.ReviewStatus === 2 ||
+        this.checkForm.cooperateStatus === 2
+      ) {
         this.checkForm.ActivelyReading = false
         this.checkForm.AcceptingNewTrial = false
         this.radioDisabled = true
@@ -319,8 +418,7 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val
       this.initHolidayList()
-    }
-
-  }
+    },
+  },
 }
 </script>

src/views/reviewers/components/Specialty.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="form-container">
     <el-card class="box-card">
-      <div style="width:80%;">
+      <div style="width: 80%">
         <el-form
           ref="specialtyForm"
           v-loading="loading"
@@ -12,12 +12,15 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Specialty')" prop="SpecialityId">
+              <el-form-item
+                :label="$t('system:reviewer:label:Specialty')"
+                prop="SpecialityId"
+              >
                 <el-select
                   v-model="specialtyForm.SpecialityId"
                   :disabled="$route.query.ReviewStatus === '1'"
                   placeholder="Please select"
-                  style="width:100%;"
+                  style="width: 100%"
                   size="small"
                 >
                   <!-- <el-option
@@ -37,7 +40,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item v-if="specialtyForm.SpecialityId==otherId" class="other-item" prop="SpecialityOther">
+              <el-form-item
+                v-if="specialtyForm.SpecialityId == otherId"
+                class="other-item"
+                prop="SpecialityOther"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="specialtyForm.SpecialityOther"
@@ -47,7 +54,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item v-if="specialtyForm.SpecialityId==otherId" prop="SpecialityOtherCN" class="other-item">
+              <el-form-item
+                v-if="specialtyForm.SpecialityId == otherId"
+                prop="SpecialityOtherCN"
+                class="other-item"
+              >
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="specialtyForm.SpecialityOtherCN"
@@ -59,13 +70,16 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Subspeciality')" prop="SubspecialityIds">
+              <el-form-item
+                :label="$t('system:reviewer:label:Subspeciality')"
+                prop="SubspecialityIds"
+              >
                 <el-select
                   v-model="specialtyForm.SubspecialityIds"
                   :disabled="$route.query.ReviewStatus === '1'"
                   placeholder="select"
                   multiple
-                  style="width:100%;"
+                  style="width: 100%"
                   size="small"
                 >
                   <!-- <el-option
@@ -86,7 +100,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item
-                v-if="specialtyForm.SubspecialityIds && specialtyForm.SubspecialityIds.indexOf(otherId)>-1"
+                v-if="
+                  specialtyForm.SubspecialityIds &&
+                  specialtyForm.SubspecialityIds.indexOf(otherId) > -1
+                "
                 class="other-item"
                 prop="SubspecialityOther"
               >
@@ -100,7 +117,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item
-                v-if="specialtyForm.SubspecialityIds && specialtyForm.SubspecialityIds.indexOf(otherId)>-1"
+                v-if="
+                  specialtyForm.SubspecialityIds &&
+                  specialtyForm.SubspecialityIds.indexOf(otherId) > -1
+                "
                 class="other-item"
                 prop="SubspecialityOtherCN"
               >
@@ -116,12 +136,15 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('system:reviewer:label:Modality')" prop="ReadingTypeIds">
+              <el-form-item
+                :label="$t('system:reviewer:label:Modality')"
+                prop="ReadingTypeIds"
+              >
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="specialtyForm.ReadingTypeIds"
                   placeholder="Please select"
-                  style="width:100%;"
+                  style="width: 100%"
                   multiple
                   size="small"
                 >
@@ -143,7 +166,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item
-                v-if="specialtyForm.ReadingTypeIds && specialtyForm.ReadingTypeIds.indexOf(otherId)>-1"
+                v-if="
+                  specialtyForm.ReadingTypeIds &&
+                  specialtyForm.ReadingTypeIds.indexOf(otherId) > -1
+                "
                 prop="ReadingTypeOther"
                 class="other-item"
               >
@@ -157,7 +183,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item
-                v-if="specialtyForm.ReadingTypeIds && specialtyForm.ReadingTypeIds.indexOf(otherId)>-1"
+                v-if="
+                  specialtyForm.ReadingTypeIds &&
+                  specialtyForm.ReadingTypeIds.indexOf(otherId) > -1
+                "
                 prop="ReadingTypeOtherCN"
                 class="other-item"
               >
@@ -171,8 +200,14 @@
             </el-col>
           </el-row>
           <el-form-item>
-            <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">
-              {{ $t('common:button:save') }}</el-button>
+            <el-button
+              type="primary"
+              :disabled="isDisabled || $route.query.ReviewStatus === '1'"
+              size="small"
+              @click="handleSave"
+            >
+              {{ $t('common:button:save') }}</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
@@ -184,6 +219,11 @@ import { getSpecialtyInfo, updateSpecialtyInfo } from '@/api/reviewers'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
   name: 'Specialty',
+  props: {
+    reviewerId: {
+      type: String,
+    },
+  },
   data() {
     return {
       specialtyForm: {
@@ -195,37 +235,53 @@ export default {
         SubspecialityOtherCN: '',
         SpecialityId: '',
         SpecialityOther: '',
-        SpecialityOtherCN: ''
+        SpecialityOtherCN: '',
       },
       specialtyRules: {
-        SpecialityId: [{ required: true, message: 'Please select speciality', trigger: 'blur' }],
+        SpecialityId: [
+          {
+            required: true,
+            message: 'Please select speciality',
+            trigger: 'blur',
+          },
+        ],
         SpecialityOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         SpecialityOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
-        ReadingTypeIds: [{ required: true, message: 'Please select clinical reading type', trigger: 'blur' }],
+        ReadingTypeIds: [
+          {
+            required: true,
+            message: 'Please select clinical reading type',
+            trigger: 'blur',
+          },
+        ],
         ReadingTypeOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
-        ReadingTypeOtherCN: [
-          { max: 50, message: 'The maximum length is 50' }
+        ReadingTypeOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
+        SubspecialityIds: [
+          {
+            required: true,
+            message: 'Please select subspecialty',
+            trigger: 'blur',
+          },
         ],
-        SubspecialityIds: [{ required: true, message: 'Please select subspecialty', trigger: 'blur' }],
         SubspecialityOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         SubspecialityOtherCN: [
-          { max: 50, message: 'The maximum length is 50' }
-        ]
+          { max: 50, message: 'The maximum length is 50' },
+        ],
       },
       selectId: '00000000-0000-0000-0000-000000000000',
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
       isDisabled: false,
       loading: false,
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
   mounted() {
@@ -233,25 +289,44 @@ export default {
   },
   methods: {
     handleSave() {
-      this.$refs.specialtyForm.validate(valid => {
+      this.$refs.specialtyForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
           const params = {}
           params.ReadingTypeIds = this.specialtyForm.ReadingTypeIds
-          params.ReadingTypeOther = params.ReadingTypeIds.indexOf(this.otherId) > -1 ? this.specialtyForm.ReadingTypeOther : ''
-          params.ReadingTypeOtherCN = params.ReadingTypeIds.indexOf(this.otherId) > -1 ? this.specialtyForm.ReadingTypeOtherCN : ''
+          params.ReadingTypeOther =
+            params.ReadingTypeIds.indexOf(this.otherId) > -1
+              ? this.specialtyForm.ReadingTypeOther
+              : ''
+          params.ReadingTypeOtherCN =
+            params.ReadingTypeIds.indexOf(this.otherId) > -1
+              ? this.specialtyForm.ReadingTypeOtherCN
+              : ''
           params.SubspecialityIds = this.specialtyForm.SubspecialityIds
-          params.SubspecialityOther = params.SubspecialityIds.indexOf(this.otherId) > -1 ? this.specialtyForm.SubspecialityOther : ''
-          params.SubspecialityOtherCN = params.SubspecialityIds.indexOf(this.otherId) > -1 ? this.specialtyForm.SubspecialityOtherCN : ''
+          params.SubspecialityOther =
+            params.SubspecialityIds.indexOf(this.otherId) > -1
+              ? this.specialtyForm.SubspecialityOther
+              : ''
+          params.SubspecialityOtherCN =
+            params.SubspecialityIds.indexOf(this.otherId) > -1
+              ? this.specialtyForm.SubspecialityOtherCN
+              : ''
           params.SpecialityId = this.specialtyForm.SpecialityId
-          params.SpecialityOther = params.SpecialityId === this.otherId ? this.specialtyForm.SpecialityOther : ''
-          params.SpecialityOtherCN = params.SpecialityId === this.otherId ? this.specialtyForm.SpecialityOtherCN : ''
-          params.Id = this.$route.query.Id
-          updateSpecialtyInfo(params).then(res => {
-            this.isDisabled = false
-            this.$message.success('Saved successfully')
-            this.specialtyForm.Id = res.Result
-          })
+          params.SpecialityOther =
+            params.SpecialityId === this.otherId
+              ? this.specialtyForm.SpecialityOther
+              : ''
+          params.SpecialityOtherCN =
+            params.SpecialityId === this.otherId
+              ? this.specialtyForm.SpecialityOtherCN
+              : ''
+          params.Id = this.$route.query.Id || this.reviewerId
+          updateSpecialtyInfo(params)
+            .then((res) => {
+              this.isDisabled = false
+              this.$message.success('Saved successfully')
+              this.specialtyForm.Id = res.Result
+            })
             .catch(() => {
               this.isDisabled = false
             })
@@ -260,20 +335,33 @@ export default {
     },
     initForm() {
       this.loading = true
-      const id = this.$route.query.Id
+      const id = this.$route.query.Id || this.reviewerId
       if (id) {
-        getSpecialtyInfo(id).then(res => {
-          this.specialtyForm.ReadingTypeIds = res.Result.ReadingTypeIds.length > 0 ? res.Result.ReadingTypeIds : []
-          this.specialtyForm.ReadingTypeOther = res.Result.ReadingTypeOther
-          this.specialtyForm.ReadingTypeOtherCN = res.Result.ReadingTypeOtherCN
-          this.specialtyForm.SubspecialityIds = res.Result.SubspecialityIds
-          this.specialtyForm.SubspecialityOther = res.Result.SubspecialityOther
-          this.specialtyForm.SubspecialityOtherCN = res.Result.SubspecialityOtherCN
-          this.specialtyForm.SpecialityId = res.Result.SpecialityId === this.selectId ? '' : res.Result.SpecialityId
-          this.specialtyForm.SpecialityOther = res.Result.SpecialityOther
-          this.specialtyForm.SpecialityOtherCN = res.Result.SpecialityOtherCN
-          this.loading = false
-        }).catch(() => { this.loading = false })
+        getSpecialtyInfo(id)
+          .then((res) => {
+            this.specialtyForm.ReadingTypeIds =
+              res.Result.ReadingTypeIds.length > 0
+                ? res.Result.ReadingTypeIds
+                : []
+            this.specialtyForm.ReadingTypeOther = res.Result.ReadingTypeOther
+            this.specialtyForm.ReadingTypeOtherCN =
+              res.Result.ReadingTypeOtherCN
+            this.specialtyForm.SubspecialityIds = res.Result.SubspecialityIds
+            this.specialtyForm.SubspecialityOther =
+              res.Result.SubspecialityOther
+            this.specialtyForm.SubspecialityOtherCN =
+              res.Result.SubspecialityOtherCN
+            this.specialtyForm.SpecialityId =
+              res.Result.SpecialityId === this.selectId
+                ? ''
+                : res.Result.SpecialityId
+            this.specialtyForm.SpecialityOther = res.Result.SpecialityOther
+            this.specialtyForm.SpecialityOtherCN = res.Result.SpecialityOtherCN
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
       }
     },
     async initSpecialty() {
@@ -281,15 +369,17 @@ export default {
       this.initForm()
     },
     getDicData() {
-      getBasicDataSelects(['Department', 'Subspeciality', 'ReadingType']).then(res => {
-        this.dictionaryList = { ...res.Result }
-      })
-    }
-  }
+      getBasicDataSelects(['Department', 'Subspeciality', 'ReadingType']).then(
+        (res) => {
+          this.dictionaryList = { ...res.Result }
+        }
+      )
+    },
+  },
 }
 </script>
 <style lang="scss">
-.other-item .el-form-item__content{
+.other-item .el-form-item__content {
   margin-left: 80px !important;
 }
 </style>

src/views/reviewers/components/TrialExperience.vue

@@ -1,10 +1,16 @@
 <template>
   <div class="form-container">
     <div class="title-wrapper">
-      <p>{{$t('system:TrialExperience:title:Clinical Trial Experience')}}</p>
-      <el-button :disabled="$route.query.ReviewStatus === '1'" class="add" size="small" @click="handleAddClinicalTrial">{{$t('common:button:add')}}</el-button>
+      <p>{{ $t('system:TrialExperience:title:Clinical Trial Experience') }}</p>
+      <el-button
+        :disabled="$route.query.ReviewStatus === '1'"
+        class="add"
+        size="small"
+        @click="handleAddClinicalTrial"
+        >{{ $t('common:button:add') }}</el-button
+      >
     </div>
-    <div style="padding:0 40px;">
+    <div style="padding: 0 40px">
       <el-table
         ref="clinicalTrialTbl"
         v-loading="loading"
@@ -13,39 +19,82 @@
         size="small"
       >
         <el-table-column type="index" width="40" />
-        <el-table-column prop="Phase" :label="$t('system:TrialExperience:title:Phase')" min-width="50" />
-        <el-table-column prop="EvaluationCriteriaList" :label="$t('system:TrialExperience:title:Review Criteria')" min-width="100">
+        <el-table-column
+          prop="Phase"
+          :label="$t('system:TrialExperience:title:Phase')"
+          min-width="50"
+        />
+        <el-table-column
+          prop="EvaluationCriteriaList"
+          :label="$t('system:TrialExperience:title:Review Criteria')"
+          min-width="100"
+        >
           <template slot-scope="scope">
-            {{ scope.row.EvaluationCriteriaList.length>0? scope.row.EvaluationCriteriaList.join(', '):'' }}
+            {{
+              scope.row.EvaluationCriteriaList.length > 0
+                ? scope.row.EvaluationCriteriaList.join(', ')
+                : ''
+            }}
           </template>
         </el-table-column>
-        <el-table-column prop="EvaluationCriteriaList" :label="$t('system:TrialExperience:title:Starting And Ending Date')" min-width="100">
+        <el-table-column
+          prop="EvaluationCriteriaList"
+          :label="$t('system:TrialExperience:title:Starting And Ending Date')"
+          min-width="100"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.StartTime">{{ scope.row.StartTime.split('-')[0] }}-{{scope.row.EndTime ? scope.row.EndTime.split('-')[0] : '至今'}}</span>
+            <span v-if="scope.row.StartTime"
+              >{{ scope.row.StartTime.split('-')[0] }}-{{
+                scope.row.EndTime ? scope.row.EndTime.split('-')[0] : '至今'
+              }}</span
+            >
           </template>
         </el-table-column>
-        <el-table-column prop="VisitReadingCount" :label="$t('system:TrialExperience:title:Visit Reading Count')" min-width="70" />
-        <el-table-column prop="EvaluationContent" :label="$t('system:TrialExperience:Indication')" min-width="70" />
-        <el-table-column :label="$t('system:TrialExperience:Operation')" min-width="200">
+        <el-table-column
+          prop="VisitReadingCount"
+          :label="$t('system:TrialExperience:title:Visit Reading Count')"
+          min-width="70"
+        />
+        <el-table-column
+          prop="EvaluationContent"
+          :label="$t('system:TrialExperience:Indication')"
+          min-width="70"
+        />
+        <el-table-column
+          :label="$t('system:TrialExperience:Operation')"
+          min-width="200"
+        >
           <template slot-scope="scope">
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEdit(scope.row)">
-              {{ $t('common:button:edit') }}</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleDel(scope.row)">{{ $t('common:button:delete') }}</el-button>
+            <el-button
+              type="text"
+              size="small"
+              :disabled="$route.query.ReviewStatus === '1'"
+              @click="handleEdit(scope.row)"
+            >
+              {{ $t('common:button:edit') }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="$route.query.ReviewStatus === '1'"
+              @click="handleDel(scope.row)"
+              >{{ $t('common:button:delete') }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
     </div>
 
-    <div class="title-wrapper" style="margin-top:10px;">
-      <p>{{$t('system:TrialExperience:title:GCP Certificate')}}</p>
+    <div class="title-wrapper" style="margin-top: 10px">
+      <p>{{ $t('system:TrialExperience:title:GCP Certificate') }}</p>
     </div>
-    <div style="margin-left:40px;width:40%">
+    <div style="margin-left: 40px; width: 40%">
       <gcp-certificate :doctor-id="doctorId" :gcp="GCP" :gcp-id="GCPID" />
     </div>
-    <div class="title-wrapper" style="margin-top:10px;">
-      <p>{{$t('system:TrialExperience:title:Other Relevant Experience')}}</p>
+    <div class="title-wrapper" style="margin-top: 10px">
+      <p>{{ $t('system:TrialExperience:title:Other Relevant Experience') }}</p>
     </div>
-    <div style="padding:0 40px;">
+    <div style="padding: 0 40px">
       <el-row type="flex" justify="space-between">
         <el-col :span="11">
           <el-input
@@ -57,13 +106,33 @@
           />
         </el-col>
         <el-col :span="11">
-          <el-input v-model="OtherClinicalExperienceCN" :disabled="$route.query.ReviewStatus === '1'" type="textarea" rows="5" placeholder="请用中文注明" size="small" />
+          <el-input
+            v-model="OtherClinicalExperienceCN"
+            :disabled="$route.query.ReviewStatus === '1'"
+            type="textarea"
+            rows="5"
+            placeholder="请用中文注明"
+            size="small"
+          />
         </el-col>
       </el-row>
-      <el-button type="primary" size="small" style="margin-top:20px" :disabled="isBtnDisabled || $route.query.ReviewStatus === '1'" @click="handleSaveOtherClinical">
-        {{ $t('common:button:save') }}</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        style="margin-top: 20px"
+        :disabled="isBtnDisabled || $route.query.ReviewStatus === '1'"
+        @click="handleSaveOtherClinical"
+      >
+        {{ $t('common:button:save') }}</el-button
+      >
     </div>
-    <el-dialog v-if="clinicalTrialDialogVisible" :title="clinicalTrialDialogTitle" :visible.sync="clinicalTrialDialogVisible" width="480px" :close-on-click-modal="false">
+    <el-dialog
+      v-if="clinicalTrialDialogVisible"
+      :title="clinicalTrialDialogTitle"
+      :visible.sync="clinicalTrialDialogVisible"
+      width="480px"
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="clinicalTrialForm"
         label-width="150px"
@@ -72,7 +141,10 @@
         :model="clinicalTrialForm"
         size="small"
       >
-        <el-form-item :label="$t('system:TrialExperience:label:Phase')" prop="PhaseId">
+        <el-form-item
+          :label="$t('system:TrialExperience:label:Phase')"
+          prop="PhaseId"
+        >
           <el-select v-model="clinicalTrialForm.PhaseId">
             <!-- <el-option
               v-for="(key,value) of dictionaryList.Phase"
@@ -88,7 +160,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('system:TrialExperience:label:Review Criteria')" prop="EvaluationCriteriaIdList">
+        <el-form-item
+          :label="$t('system:TrialExperience:label:Review Criteria')"
+          prop="EvaluationCriteriaIdList"
+        >
           <el-select
             v-model="clinicalTrialForm.EvaluationCriteriaIdList"
             multiple
@@ -102,38 +177,67 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('system:TrialExperience:label:Start Time')" prop="StartTime">
+        <el-form-item
+          :label="$t('system:TrialExperience:label:Start Time')"
+          prop="StartTime"
+        >
           <el-date-picker
             v-model="clinicalTrialForm.StartTime"
             type="year"
             value-format="yyyy"
-            >
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('system:TrialExperience:label:End Time')" prop="EndTime">
+        <el-form-item
+          :label="$t('system:TrialExperience:label:End Time')"
+          prop="EndTime"
+        >
           <el-date-picker
             v-model="clinicalTrialForm.EndTime"
             type="year"
             value-format="yyyy"
-            >
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('system:TrialExperience:Visit Reading Count')" prop="VisitReadingCount">
-          <el-input style="width: 100%" oninput="value=value.replace(/[^\d]/g,'')" v-model="clinicalTrialForm.VisitReadingCount" controls-position="right" :min="0" />
+        <el-form-item
+          :label="$t('system:TrialExperience:Visit Reading Count')"
+          prop="VisitReadingCount"
+        >
+          <el-input
+            style="width: 100%"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            v-model="clinicalTrialForm.VisitReadingCount"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
-        <el-form-item :label="$t('system:TrialExperience:Indication')" prop="EvaluationContent">
+        <el-form-item
+          :label="$t('system:TrialExperience:Indication')"
+          prop="EvaluationContent"
+        >
           <el-input v-model="clinicalTrialForm.EvaluationContent" />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" :loading="isDisabled" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="isDisabled"
+          @click="handleSave"
+          >{{ $t('common:button:save') }}</el-button
+        >
       </span>
     </el-dialog>
   </div>
 </template>
 <script>
 // import UploadFile from '@/components/UploadFile'
-import { getTrialExperience, addOrUpdateTrialExperience, deleteTrialExperience, updateOtherExperience } from '@/api/reviewers'
+import {
+  getTrialExperience,
+  addOrUpdateTrialExperience,
+  deleteTrialExperience,
+  updateOtherExperience,
+} from '@/api/reviewers'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 import GcpCertificate from './GcpCertificate.vue'
 import moment from 'moment'
@@ -150,6 +254,11 @@ const getClinicalTrialDefault = () => {
 export default {
   name: 'TrialExperience',
   components: { GcpCertificate },
+  props: {
+    reviewerId: {
+      type: String,
+    },
+  },
   data() {
     return {
       loading: false,
@@ -159,17 +268,25 @@ export default {
       clinicalTrialForm: getClinicalTrialDefault(),
       clinicalTrialRules: {
         PhaseId: [
-          { required: true, message: 'Please select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please select',
+            trigger: ['blur', 'change'],
+          },
         ],
         EvaluationCriteriaIdList: [
-          { required: true, message: 'Please select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please select',
+            trigger: ['blur', 'change'],
+          },
         ],
         VisitReadingCount: [
           { required: true, message: 'Please specify', trigger: 'blur' },
         ],
         EvaluationContent: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 300, message: 'The maximum length is 300' }
+          { max: 300, message: 'The maximum length is 300' },
         ],
         StartTime: [
           { required: true, message: 'Please specify', trigger: 'blur' },
@@ -180,12 +297,19 @@ export default {
       OtherClinicalExperience: '',
       OtherClinicalExperienceCN: '',
       isDisabled: false,
-      doctorId: this.$route.query.Id,
+      doctorId: this.$route.query.Id || this.reviewerId,
       isBtnDisabled: false,
       selectId: '00000000-0000-0000-0000-000000000000',
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.doctorId = this.reviewerId
+      }
+    },
+  },
   created() {
     this.initForm()
   },
@@ -195,18 +319,23 @@ export default {
       const id = this.$route.query.Id
       if (id) {
         this.loading = true
-        getTrialExperience(id).then(res => {
-          this.clinicalTrialList = res.Result.ClinicalTrialExperienceList
-          this.GCP = res.Result.GCP
-          this.GCPID = res.Result.GCPId
-          this.OtherClinicalExperience = res.Result.OtherClinicalExperience
-          this.OtherClinicalExperienceCN = res.Result.OtherClinicalExperienceCN
-          this.loading = false
-        }).catch(() => { this.loading = false })
+        getTrialExperience(id)
+          .then((res) => {
+            this.clinicalTrialList = res.Result.ClinicalTrialExperienceList
+            this.GCP = res.Result.GCP
+            this.GCPID = res.Result.GCPId
+            this.OtherClinicalExperience = res.Result.OtherClinicalExperience
+            this.OtherClinicalExperienceCN =
+              res.Result.OtherClinicalExperienceCN
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
       }
     },
     getDicData() {
-      getBasicDataSelects(['Trial_Phase', 'ReadingStandard']).then(res => {
+      getBasicDataSelects(['Trial_Phase', 'ReadingStandard']).then((res) => {
         this.dictionaryList = { ...res.Result }
       })
     },
@@ -217,7 +346,15 @@ export default {
       this.clinicalTrialForm = Object.assign({}, getClinicalTrialDefault())
     },
     handleEdit(row) {
-      const { Id, PhaseId, EvaluationCriteriaIdList, EvaluationContent, StartTime, EndTime, VisitReadingCount } = row
+      const {
+        Id,
+        PhaseId,
+        EvaluationCriteriaIdList,
+        EvaluationContent,
+        StartTime,
+        EndTime,
+        VisitReadingCount,
+      } = row
       this.clinicalTrialForm = Object.assign({}, getClinicalTrialDefault())
       this.clinicalTrialDialogTitle = 'Edit'
       this.clinicalTrialDialogVisible = true
@@ -230,35 +367,42 @@ export default {
       this.clinicalTrialForm.EvaluationContent = EvaluationContent
     },
     handleSave() {
-      this.$refs.clinicalTrialForm.validate(valid => {
+      this.$refs.clinicalTrialForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
           this.clinicalTrialForm.DoctorId = this.$route.query.Id
           var dateTime
           if (this.clinicalTrialForm.StartTime) {
             dateTime = new Date(this.clinicalTrialForm.StartTime)
-            this.clinicalTrialForm.StartTime = moment(new Date(dateTime.setDate(dateTime.getDate()+1))).format('YYYY') + "-01"
+            this.clinicalTrialForm.StartTime =
+              moment(new Date(dateTime.setDate(dateTime.getDate() + 1))).format(
+                'YYYY'
+              ) + '-01'
           }
           if (this.clinicalTrialForm.EndTime) {
             dateTime = new Date(this.clinicalTrialForm.EndTime)
-            this.clinicalTrialForm.EndTime = moment(new Date(dateTime.setDate(dateTime.getDate()+1))).format("YYYY") + "-01"
+            this.clinicalTrialForm.EndTime =
+              moment(new Date(dateTime.setDate(dateTime.getDate() + 1))).format(
+                'YYYY'
+              ) + '-01'
           }
-          addOrUpdateTrialExperience(this.clinicalTrialForm).then(res => {
-            this.isDisabled = false
-            this.initForm()
-            if (this.clinicalTrialForm.Id) {
-              this.$message({
-                message: 'Updated successfully',
-                type: 'success'
-              })
-            } else {
-              this.$message({
-                message: 'Addedd successfully',
-                type: 'success'
-              })
-            }
-            this.clinicalTrialDialogVisible = false
-          })
+          addOrUpdateTrialExperience(this.clinicalTrialForm)
+            .then((res) => {
+              this.isDisabled = false
+              this.initForm()
+              if (this.clinicalTrialForm.Id) {
+                this.$message({
+                  message: 'Updated successfully',
+                  type: 'success',
+                })
+              } else {
+                this.$message({
+                  message: 'Addedd successfully',
+                  type: 'success',
+                })
+              }
+              this.clinicalTrialDialogVisible = false
+            })
             .catch(() => {
               this.isDisabled = false
             })
@@ -269,20 +413,25 @@ export default {
       this.$confirm('Confirm to delete?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-
       })
         .then(() => {
-          deleteTrialExperience(row.Id)
-            .then(res => {
-              this.clinicalTrialList.splice(this.clinicalTrialList.findIndex(item => item.Id === row.Id), 1)
-              this.$message.success('Deleted successfully !')
-            })
+          deleteTrialExperience(row.Id).then((res) => {
+            this.clinicalTrialList.splice(
+              this.clinicalTrialList.findIndex((item) => item.Id === row.Id),
+              1
+            )
+            this.$message.success('Deleted successfully !')
+          })
         })
-        .catch(action => {})
+        .catch((action) => {})
     },
     handleSaveOtherClinical() {
-      const param = { DoctorId: this.doctorId, OtherClinicalExperience: this.OtherClinicalExperience, OtherClinicalExperienceCN: this.OtherClinicalExperienceCN }
-      updateOtherExperience(param).then(res => {
+      const param = {
+        DoctorId: this.doctorId,
+        OtherClinicalExperience: this.OtherClinicalExperience,
+        OtherClinicalExperienceCN: this.OtherClinicalExperienceCN,
+      }
+      updateOtherExperience(param).then((res) => {
         if (res.IsSuccess) {
           if (this.id) {
             this.$message.success('Updated successfully')
@@ -291,7 +440,7 @@ export default {
           }
         }
       })
-    }
-  }
+    },
+  },
 }
 </script>

src/views/reviewers/curriculumVitae/components/file/agreement.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="agreement">
+    <div class="title">{{ $t('curriculumVitae:agreement:title') }}</div>
+    <div class="fileBox">
+      <div class="file_title">
+        {{ $t('curriculumVitae:agreement:fileTitle') }}
+      </div>
+      <template v-if="true">
+        <div class="file" v-for="item in [1, 2]" :key="item">
+          <div class="name">简历1</div>
+          <i
+            class="el-icon-view"
+            :title="$t('common:button:preview')"
+            @click.stop="preview"
+          />
+          <i class="el-icon-delete" :title="$t('common:button:delete')" />
+        </div>
+      </template>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <div class="btnBox">
+        <div style="position: relative">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="loading"
+            :loading="loading"
+          >
+            {{ $t('curriculumVitae:agreement:btn:upload') }}
+          </el-button>
+          <input
+            type="file"
+            name="file"
+            multiple
+            ref="upload"
+            :title="$t('curriculumVitae:agreement:btn:upload')"
+            style="
+              position: absolute;
+              top: 0;
+              left: 0;
+              width: 100%;
+              height: 100%;
+              opacity: 0;
+              cursor: pointer;
+            "
+            :accept="faccept.join(',')"
+            @change="($event) => beginScanFiles($event)"
+          />
+        </div>
+        <el-button type="text">{{ $t('common:button:downloadTpl') }}</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'agreement',
+  data() {
+    return {
+      faccept: ['.pdf'],
+      loading: false,
+    }
+  },
+  methods: {
+    preview() {
+      this.$preview({
+        path: '',
+        type: '',
+        title: '',
+      })
+    },
+    beginScanFiles(e) {
+      let files = e.target.files
+    },
+  },
+  data() {
+    return {
+      faccept: ['.pdf'],
+      loading: false,
+    }
+  },
+  methods: {
+    preview() {
+      this.$preview({
+        path: '',
+        type: '',
+        title: '',
+      })
+    },
+    beginScanFiles(e) {
+      let files = e.target.files
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/reviewers/curriculumVitae/components/file/certificate.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="certificate">
+    <div class="title">{{ $t('curriculumVitae:certificate:title') }}</div>
+    <div class="fileBox">
+      <!--最高医学学位毕业证书-->
+      <div class="file_title">
+        {{ $t('curriculumVitae:certificate:fileTitle:diploma') }}
+      </div>
+      <div class="file" v-if="true">
+        <div class="name">简历1</div>
+        <i
+          class="el-icon-view"
+          :title="$t('common:button:preview')"
+          @click.stop="preview"
+        />
+        <i class="el-icon-delete" :title="$t('common:button:delete')" />
+      </div>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <!--医师资格证-->
+      <div class="file_title" v-if="true">
+        {{ $t('curriculumVitae:certificate:fileTitle:certificate') }}
+      </div>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <div class="file">
+        <div class="name">简历1</div>
+        <i
+          class="el-icon-view"
+          :title="$t('common:button:preview')"
+          @click.stop="preview"
+        />
+        <i class="el-icon-delete" :title="$t('common:button:delete')" />
+      </div>
+      <!--医师执业证-->
+      <div class="file_title" v-if="true">
+        {{ $t('curriculumVitae:certificate:fileTitle:license') }}
+      </div>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <div class="file">
+        <div class="name">简历1</div>
+        <i
+          class="el-icon-view"
+          :title="$t('common:button:preview')"
+          @click.stop="preview"
+        />
+        <i class="el-icon-delete" :title="$t('common:button:delete')" />
+      </div>
+      <!--大型医用设备上岗证-->
+      <div class="file_title">
+        {{ $t('curriculumVitae:certificate:fileTitle:workPermit') }}
+      </div>
+      <template v-if="true">
+        <div v-for="item in [1, 2]" :key="item">
+          <div class="file_title">
+            {{ $t('curriculumVitae:certificate:fileTitle:CT') }}
+          </div>
+          <div class="file">
+            <div class="name">简历1</div>
+            <i
+              class="el-icon-view"
+              :title="$t('common:button:preview')"
+              @click.stop="preview"
+            />
+            <i class="el-icon-delete" :title="$t('common:button:delete')" />
+          </div>
+        </div>
+      </template>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <div class="btnBox">
+        <div style="position: relative">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="loading"
+            :loading="loading"
+          >
+            {{ $t('curriculumVitae:certificate:btn:upload') }}
+          </el-button>
+          <input
+            type="file"
+            name="file"
+            multiple
+            ref="upload"
+            :title="$t('curriculumVitae:certificate:btn:upload')"
+            style="
+              position: absolute;
+              top: 0;
+              left: 0;
+              width: 100%;
+              height: 100%;
+              opacity: 0;
+              cursor: pointer;
+            "
+            :accept="faccept.join(',')"
+            @change="($event) => beginScanFiles($event)"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import PreviewFile from '@/components/PreviewFile/index'
+export default {
+  name: 'certificate',
+  components: {
+    PreviewFile,
+  },
+  data() {
+    return {
+      faccept: ['.pdf'],
+      loading: false,
+    }
+  },
+  methods: {
+    preview() {
+      this.$preview({
+        path: '',
+        type: '',
+        title: '',
+      })
+    },
+    beginScanFiles(e) {
+      let files = e.target.files
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/reviewers/curriculumVitae/components/file/curriculum.vue

@@ -0,0 +1,133 @@
+<template>
+  <div class="curriculum">
+    <div class="title">{{ $t('curriculumVitae:curriculum:title') }}</div>
+    <div class="fileBox">
+      <div class="file_title">
+        {{ $t('curriculumVitae:curriculum:fileTitle:CN') }}
+      </div>
+      <template v-if="true">
+        <div class="file" v-for="item in [1, 2]" :key="item">
+          <div class="name">简历1</div>
+          <i class="el-icon-download" :title="$t('common:button:download')" />
+          <i class="el-icon-delete" :title="$t('common:button:delete')" />
+          <i
+            class="el-icon-circle-check"
+            :title="$t('common:button:default')"
+          />
+        </div>
+      </template>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <div class="file_title">
+        {{ $t('curriculumVitae:curriculum:fileTitle:EN') }}
+      </div>
+      <template v-if="true">
+        <div class="file" v-for="item in [1, 2]" :key="item">
+          <div class="name">Resume</div>
+          <i class="el-icon-download" :title="$t('common:button:download')" />
+          <i class="el-icon-delete" :title="$t('common:button:delete')" />
+          <i
+            class="el-icon-circle-check"
+            :title="$t('common:button:default')"
+          />
+        </div>
+      </template>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+      <div class="btnBox">
+        <div style="position: relative">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="loading"
+            :loading="loading"
+          >
+            {{ $t('curriculumVitae:curriculum:btn:uploadCN') }}
+          </el-button>
+          <input
+            type="file"
+            name="file"
+            multiple
+            ref="uploadCN"
+            :title="$t('curriculumVitae:curriculum:btn:uploadCN')"
+            style="
+              position: absolute;
+              top: 0;
+              left: 0;
+              width: 100%;
+              height: 100%;
+              opacity: 0;
+              cursor: pointer;
+            "
+            :accept="faccept.join(',')"
+            @change="($event) => beginScanFiles($event)"
+          />
+        </div>
+        <el-button type="text">{{ $t('common:button:downloadTpl') }}</el-button>
+      </div>
+      <div class="btnBox">
+        <div style="position: relative">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="loading"
+            :loading="loading"
+          >
+            {{ $t('curriculumVitae:curriculum:btn:uploadEN') }}
+          </el-button>
+          <input
+            type="file"
+            name="file"
+            multiple
+            ref="uploadEN"
+            :title="$t('curriculumVitae:curriculum:btn:uploadEN')"
+            style="
+              position: absolute;
+              top: 0;
+              left: 0;
+              width: 100%;
+              height: 100%;
+              opacity: 0;
+              cursor: pointer;
+            "
+            :accept="faccept.join(',')"
+            @change="($event) => beginScanFiles($event)"
+          />
+        </div>
+        <el-button type="text">{{ $t('common:button:downloadTpl') }}</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'curriculum',
+  data() {
+    return {
+      faccept: ['.pdf'],
+      loading: false,
+    }
+  },
+  methods: {
+    beginScanFiles(e) {
+      let files = e.target.files
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.file {
+  width: 100%;
+  display: flex;
+  margin-bottom: 10px;
+  .name {
+    width: 70%;
+    white-space: nowrap; /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
+    text-overflow: ellipsis; /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+    overflow: hidden; /* 隐藏溢出容器的文本 */
+  }
+  i {
+    cursor: pointer;
+    margin: 3px;
+    color: #409eff;
+  }
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="clinicalTrials">
+    <!--临床试验-->
+    <div class="title">
+      <span>{{ $t('curriculumVitae:clinicalTrials:title') }}</span>
+      <el-button
+        type="text"
+        class="editBtn"
+        @click.stop="openEdit('', 'clinicalTrials')"
+      >
+        {{ $t('common:button:add') }}
+      </el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      :header-cell-style="{ background: '#eee', color: '#606266' }"
+    >
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:clinicalTrials:table:byStages')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:clinicalTrials:table:criterion')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:clinicalTrials:table:indication')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:clinicalTrials:table:viewingVolumeNum')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:clinicalTrials:table:year')"
+      >
+      </el-table-column>
+      <el-table-column prop="date" :label="$t('common:action:action')">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            class="editBtn"
+            @click.stop="openEdit(scope, 'clinicalTrials')"
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>
+          <el-button type="text" class="editBtn" @click.stop="openEdit">
+            {{ $t('common:button:delete') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--GCP证书-->
+    <div class="title" style="margin-top: 20px">
+      <span>{{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}</span>
+    </div>
+    <el-table
+      :data="GCPData"
+      style="width: 100%"
+      :header-cell-style="{ background: '#eee', color: '#606266' }"
+    >
+      <el-table-column
+        prop="has"
+        :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="time"
+        :label="$t('curriculumVitae:clinicalTrials:table:certificateTime')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="adress"
+        :label="$t('curriculumVitae:clinicalTrials:table:certificateHospital')"
+      >
+      </el-table-column>
+      <el-table-column :label="$t('common:action:action')">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            class="editBtn"
+            @click.stop="openEdit(scope, 'certificate')"
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--其他相关经历-->
+    <div class="title" style="margin-top: 20px">
+      <span>{{ $t('curriculumVitae:clinicalTrials:otherTitle') }}</span>
+      <el-button
+        type="text"
+        class="editBtn"
+        @click.stop="openEdit('', 'other')"
+      >
+        {{ $t('common:button:edit') }}
+      </el-button>
+    </div>
+    <template v-if="true">
+      <div class="message">三的卡上不能打卡上班打卡</div>
+    </template>
+    <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+    <!--临床试验-->
+    <base-model :config="model_cfg_clinicalTrials">
+      <template slot="dialog-body">
+        <el-form
+          ref="clinicalTrialsFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:byStages')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:criterion')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:startTime')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:endTime')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:viewingVolumeNum')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:indication')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleCancle('clinicalTrials')"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave('clinicalTrials')"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+    <!--GCP证书-->
+    <base-model :config="model_cfg_certificate">
+      <template slot="dialog-body">
+        <el-form
+          ref="certificateFrom"
+          v-loading="loading"
+          :model="certificateForm"
+          :rules="certificateRules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:hasCertificate')"
+            prop="InternationalizationType"
+          >
+            <el-radio-group v-model="certificateForm.radio">
+              <el-radio
+                v-for="item in hasOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:CertificateTime')"
+            prop="InternationalizationType"
+          >
+            <el-date-picker
+              v-model="certificateForm.time"
+              type="date"
+              placeholder=""
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="
+              $t('curriculumVitae:clinicalTrials:form:certificateHospital')
+            "
+            prop="InternationalizationType"
+          >
+            <el-input clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:attachments')"
+            prop="InternationalizationType"
+          >
+            <div class="upload-container">
+              <el-upload
+                class="upload-demo"
+                action
+                accept=".xls,.xlsx,.doc,.docx"
+                :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:upload') }}
+                </el-button>
+                <span
+                  slot="tip"
+                  style="margin-left: 10px"
+                  class="el-upload__tip"
+                >
+                  (must be in xlsx/xls/doc/docx format)
+                </span>
+              </el-upload>
+            </div>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleCancle('certificate')"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave('certificate')"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+    <!--其他相关经历-->
+    <base-model :config="model_cfg_other">
+      <template slot="dialog-body">
+        <el-form
+          ref="certificateFrom"
+          v-loading="loading"
+          :model="otherForm"
+          :rules="otherRules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:clinicalTrials:form:other')"
+            prop="InternationalizationType"
+          >
+            <el-input
+              clearable
+              type="textarea"
+              :rows="2"
+              style="margin-bottom: 20px"
+              :placeholder="
+                $t('curriculumVitae:clinicalTrials:placeholder:other')
+              "
+            ></el-input>
+            <el-input
+              clearable
+              type="textarea"
+              :rows="2"
+              :placeholder="
+                $t('curriculumVitae:clinicalTrials:placeholder:otherEN')
+              "
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle('other')">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave('other')">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'clinicalTrials',
+  components: { BaseModel },
+  data() {
+    return {
+      tableData: [],
+      model_cfg_clinicalTrials: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:clinicalTrials:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+      daterange: [],
+
+      GCPData: [
+        {
+          has: false,
+          time: '2023.06',
+          adress: 'xxxx医院',
+        },
+      ],
+      certificateForm: {},
+      certificateRules: {},
+      fileList: [],
+      btnLoading: false,
+      model_cfg_certificate: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:clinicalTrials:form:certificateTitle'),
+        appendToBody: true,
+      },
+
+      otherForm: {},
+      otherRules: {},
+      model_cfg_other: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:clinicalTrials:form:otherTitle'),
+        appendToBody: true,
+      },
+    }
+  },
+  methods: {
+    openEdit(row, key) {
+      this[`model_cfg_${key}`].visible = true
+    },
+    handleCancle(key) {
+      this[`model_cfg_${key}`].visible = false
+    },
+    handleSave(key) {
+      this[`model_cfg_${key}`].visible = false
+    },
+    beforeUpload(file) {},
+    async handleUploadFile(param) {},
+    handleRemoveFile() {
+      this.fileList = []
+      this.form.Path = ''
+      this.form.NameCN = ''
+      this.form.Name = ''
+    },
+    handlePreview(file) {},
+    handleExceed(files, fileList) {
+      this.$message.warning(`Upload is currently limited to 1 file`)
+    },
+    checkFileSuffix(fileName) {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.clinicalTrials {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+  .message {
+    margin: auto;
+    min-height: 100px;
+    background-color: #eee;
+    padding: 10px;
+    line-height: 30px;
+    border-radius: 5px;
+  }
+}
+.el-select,
+.el-date-editor {
+  width: 100%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="continuingTraining">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:continuingTraining:title') }}</span>
+      <el-button type="text" class="editBtn" @click.stop="openEdit">
+        {{ $t('common:button:add') }}
+      </el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      :header-cell-style="{ background: '#eee', color: '#606266' }"
+    >
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:continuingTraining:table:time')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:continuingTraining:table:type')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:continuingTraining:table:direction')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:continuingTraining:table:school')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:continuingTraining:table:city')"
+      >
+      </el-table-column>
+      <el-table-column prop="date" :label="$t('common:action:action')">
+        <template slot-scope="scope">
+          <el-button type="text" class="editBtn" @click.stop="openEdit(scope)">
+            {{ $t('common:button:edit') }}
+          </el-button>
+          <el-button type="text" class="editBtn" @click.stop="openEdit">
+            {{ $t('common:button:delete') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="continuingTrainingFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:time')"
+            prop="InternationalizationType"
+          >
+            <el-date-picker
+              clearable
+              v-model="daterange"
+              type="daterange"
+              :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
+              :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+              :end-placeholder="$t('curriculumVitae:daterange:endTime')"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:type')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:direction')"
+            prop="InternationalizationType"
+          >
+            <el-row>
+              <el-col :span="12" style="margin-right: 5px">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:continuingTraining:placeholder:direction'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+              <el-col :span="11">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:continuingTraining:placeholder:directionEN'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:school')"
+            prop="InternationalizationType"
+          >
+            <el-row>
+              <el-col :span="12" style="margin-right: 5px">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t('curriculumVitae:continuingTraining:placeholder:school')
+                  "
+                ></el-input>
+              </el-col>
+              <el-col :span="11">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:continuingTraining:placeholder:schoolEN'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:city')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'continuingTraining',
+  components: { BaseModel },
+  data() {
+    return {
+      tableData: [],
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:continuingTraining:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+      daterange: [],
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.continuingTraining {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+}
+.el-select,
+.el-date-editor {
+  width: 97%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue

@@ -0,0 +1,217 @@
+<template>
+  <div class="EducationalExperience">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:EducationalExperience:title') }}</span>
+      <el-button type="text" class="editBtn" @click.stop="openEdit">
+        {{ $t('common:button:add') }}
+      </el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      :header-cell-style="{ background: '#eee', color: '#606266' }"
+    >
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:EducationalExperience:table:time')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:EducationalExperience:table:specialy')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:EducationalExperience:table:degree')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:EducationalExperience:table:school')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:EducationalExperience:table:city')"
+      >
+      </el-table-column>
+      <el-table-column prop="date" :label="$t('common:action:action')">
+        <template slot-scope="scope">
+          <el-button type="text" class="editBtn" @click.stop="openEdit(scope)">
+            {{ $t('common:button:edit') }}
+          </el-button>
+          <el-button type="text" class="editBtn" @click.stop="openEdit">
+            {{ $t('common:button:delete') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="EducationalExperienceFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:time')"
+            prop="InternationalizationType"
+          >
+            <el-date-picker
+              clearable
+              v-model="daterange"
+              type="daterange"
+              :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
+              :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+              :end-placeholder="$t('curriculumVitae:daterange:endTime')"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
+            prop="InternationalizationType"
+          >
+            <el-row>
+              <el-col :span="12" style="margin-right: 5px">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:EducationalExperience:placeholder:specialy'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+              <el-col :span="11">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:EducationalExperience:placeholder:specialyEN'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:degree')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:school')"
+            prop="InternationalizationType"
+          >
+            <el-row>
+              <el-col :span="12" style="margin-right: 5px">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:EducationalExperience:placeholder:school'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+              <el-col :span="11">
+                <el-input
+                  clearable
+                  :placeholder="
+                    $t(
+                      'curriculumVitae:EducationalExperience:placeholder:schoolEN'
+                    )
+                  "
+                ></el-input>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:city')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'EducationalExperience',
+  components: { BaseModel },
+  data() {
+    return {
+      tableData: [],
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:EducationalExperience:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+      daterange: [],
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.EducationalExperience {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+}
+.el-select,
+.el-date-editor {
+  width: 97%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/info.vue

@@ -0,0 +1,315 @@
+<template>
+  <div class="info">
+    <el-button type="text" class="editBtn" @click.stop="openEdit">
+      {{ $t('common:button:edit') }}
+    </el-button>
+    <template v-if="true">
+      <div class="userInfo">
+        <span>张三</span>
+        <span>医学博士</span>
+        <span>广州医院</span>
+        <span>社会兼职中华医学会XXXXXX</span>
+      </div>
+      <div class="userTitle">
+        <span class="el-icon-first-aid-kit">放射科</span>
+        <span class="el-icon-user">主任</span>
+        <span class="el-icon-medal">副主任医师</span>
+        <span class="el-icon-trophy">副教授</span>
+      </div>
+      <div class="userTel">
+        <span class="el-icon-phone-outline">18616815282</span>
+        <span class="el-icon-message">sicauzhangye@sina.com</span>
+        <span class="el-icon-chat-dot-round">wechat666</span>
+      </div>
+    </template>
+    <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="infoFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:surname')"
+                prop="InternationalizationType"
+              >
+                <el-input v-model="form.surname" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:name')"
+                prop="InternationalizationType"
+              >
+                <el-input clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:userNameCN')"
+                prop="InternationalizationType"
+              >
+                <el-input clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:sex')"
+                prop="InternationalizationType"
+              >
+                <el-select v-model="form.Sex" clearable placeholder="">
+                  <el-option
+                    v-for="item in $d.sex"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:education')"
+                prop="InternationalizationType"
+              >
+                <el-select v-model="form.Sex" clearable placeholder="">
+                  <el-option
+                    v-for="item in $d.sex"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:phone')"
+                prop="InternationalizationType"
+              >
+                <el-input clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:email')"
+                prop="InternationalizationType"
+              >
+                <el-input clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:wechat')"
+                prop="InternationalizationType"
+              >
+                <el-input clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('curriculumVitae:info:form:payType')"
+                prop="InternationalizationType"
+              >
+                <el-select v-model="form.Sex" clearable placeholder="">
+                  <el-option
+                    v-for="item in $d.sex"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:hospital')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:department')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:rank')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:physician')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:position')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:partTimeJob')"
+            prop="InternationalizationType"
+          >
+            <el-input
+              :placeholder="
+                $t('curriculumVitae:info:form:placeholder:partTimeJob')
+              "
+              type="textarea"
+              :rows="2"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="InternationalizationType">
+            <el-input
+              :placeholder="
+                $t('curriculumVitae:info:form:placeholder:partTimeJobEN')
+              "
+              type="textarea"
+              :rows="2"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'info',
+  components: { BaseModel },
+  data() {
+    return {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:info:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.info {
+  position: relative;
+  min-height: 100px;
+  .editBtn {
+    position: absolute;
+    right: 0;
+    top: 0px;
+  }
+  .userInfo,
+  .userTitle,
+  .userTel {
+    line-height: 30px;
+    margin-bottom: 15px;
+    span {
+      margin-right: 20px;
+      &:last-child {
+        margin: 0;
+      }
+    }
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .userTitle,
+  .userTel {
+    span {
+      display: inline-block;
+      min-width: 80px;
+      border-right: 1px solid #ddd;
+      padding-right: 10px;
+      &::before {
+        margin-right: 5px;
+      }
+      &:last-child {
+        border: none;
+      }
+    }
+  }
+}
+.el-select {
+  width: 100%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/other.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="other">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:other:title') }}</span>
+      <el-button type="text" class="editBtn" @click.stop="openEdit">
+        {{ $t('common:button:edit') }}
+      </el-button>
+    </div>
+    <div class="message">
+      <div>{{ $t('curriculumVitae:other:AH') }}</div>
+      <p>a诺夫卡刷积分八九十快点把手里的v八路军那是的健康蓝色的艰苦拉萨的</p>
+    </div>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="continuingTrainingFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:other:form:AH')"
+            prop="InternationalizationType"
+          >
+            <el-input
+              clearable
+              style="margin-bottom: 10px"
+              type="textarea"
+              :rows="2"
+              :placeholder="$t('curriculumVitae:other:placeholder:AH')"
+            ></el-input>
+            <el-input
+              clearable
+              type="textarea"
+              :rows="2"
+              :placeholder="$t('curriculumVitae:other:placeholder:AHEN')"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'scientificResearchProject',
+  components: { BaseModel },
+  data() {
+    return {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.other {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+  .message {
+    margin: auto;
+    min-height: 100px;
+    background-color: #eee;
+    padding: 10px;
+    line-height: 30px;
+    border-radius: 5px;
+  }
+}
+.el-select,
+.el-date-editor {
+  width: 97%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="scientificResearchProject">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:scientificResearchProject:title') }}</span>
+      <el-button type="text" class="editBtn" @click.stop="openEdit">
+        {{ $t('common:button:edit') }}
+      </el-button>
+    </div>
+    <div class="message">
+      <el-form class="demo-form-inline">
+        <el-form-item
+          :label="$t('curriculumVitae:scientificResearchProject:direction')"
+        >
+          <div>direction</div>
+        </el-form-item>
+        <el-form-item
+          :label="$t('curriculumVitae:scientificResearchProject:subject')"
+        >
+          <div>subject</div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="continuingTrainingFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="
+              $t('curriculumVitae:scientificResearchProject:form:direction')
+            "
+            prop="InternationalizationType"
+          >
+            <el-input
+              clearable
+              style="margin-bottom: 10px"
+              :placeholder="
+                $t(
+                  'curriculumVitae:scientificResearchProject:placeholder:direction'
+                )
+              "
+            ></el-input>
+            <el-input
+              clearable
+              :placeholder="
+                $t(
+                  'curriculumVitae:scientificResearchProject:placeholder:directionEN'
+                )
+              "
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="
+              $t('curriculumVitae:scientificResearchProject:form:subject')
+            "
+            prop="InternationalizationType"
+          >
+            <el-input
+              clearable
+              style="margin-bottom: 10px"
+              type="textarea"
+              :rows="2"
+              :placeholder="
+                $t(
+                  'curriculumVitae:scientificResearchProject:placeholder:subject'
+                )
+              "
+            ></el-input>
+            <el-input
+              clearable
+              type="textarea"
+              :rows="2"
+              :placeholder="
+                $t(
+                  'curriculumVitae:scientificResearchProject:placeholder:subjectEN'
+                )
+              "
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'scientificResearchProject',
+  components: { BaseModel },
+  data() {
+    return {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.scientificResearchProject {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+  .message {
+    margin: auto;
+    min-height: 100px;
+    background-color: #eee;
+    padding: 10px;
+    line-height: 30px;
+    border-radius: 5px;
+  }
+}
+.el-select,
+.el-date-editor {
+  width: 97%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/specialty.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="specialty">
+    <el-button type="text" class="editBtn" @click.stop="openEdit">
+      {{ $t('common:button:edit') }}
+    </el-button>
+    <template v-if="true">
+      <el-form class="demo-form-inline">
+        <el-form-item :label="$t('curriculumVitae:specialty:specialty')">
+          <span>放射科</span>
+        </el-form-item>
+        <el-form-item :label="$t('curriculumVitae:specialty:submajor')">
+          <el-tag type="info" v-for="item in ['1', '2', '3']" :key="item">
+            标签三
+          </el-tag>
+        </el-form-item>
+        <el-form-item :label="$t('curriculumVitae:specialty:equipment')">
+          <el-tag type="info" v-for="item in ['1', '2', '3']" :key="item">
+            标签三
+          </el-tag>
+        </el-form-item>
+      </el-form>
+    </template>
+    <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="specialtyFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="170px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:specialty:form:specialty')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:specialty:form:submajor')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:specialty:form:equipment')"
+            prop="InternationalizationType"
+          >
+            <el-select v-model="form.Sex" clearable placeholder="">
+              <el-option
+                v-for="item in $d.sex"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'specialty',
+  components: { BaseModel },
+  data() {
+    return {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:specialty:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.specialty {
+  position: relative;
+  min-height: 100px;
+  .editBtn {
+    position: absolute;
+    right: 0;
+    top: 0px;
+    z-index: 99;
+  }
+}
+::v-deep .el-tag {
+  margin-right: 10px;
+  &:last-child {
+    margin-right: 0;
+  }
+}
+.el-select {
+  width: 100%;
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/summarize.vue

@@ -0,0 +1,109 @@
+<template>
+  <div class="summarize">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:summarize:title') }}</span>
+      <el-button type="text" class="editBtn" @click.stop="openEdit">
+        {{ $t('common:button:edit') }}
+      </el-button>
+    </div>
+    <template v-if="true">
+      <div class="message"></div>
+    </template>
+    <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="summarizeFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:summarize:form:summarize')"
+            prop="InternationalizationType"
+          >
+            <el-input
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:summarize')
+              "
+              type="textarea"
+              :rows="2"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="InternationalizationType">
+            <el-input
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:summarizeEN')
+              "
+              type="textarea"
+              :rows="2"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'summarize',
+  components: { BaseModel },
+  data() {
+    return {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:summarize:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.summarize {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+  .message {
+    margin: auto;
+    min-height: 100px;
+    background-color: #eee;
+    padding: 10px;
+    line-height: 30px;
+    border-radius: 5px;
+  }
+}
+</style>

src/views/reviewers/curriculumVitae/components/info/treatise.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="treatise">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:treatise:title') }}</span>
+      <el-button type="text" class="editBtn" @click.stop="openEdit">
+        {{ $t('common:button:add') }}
+      </el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      :header-cell-style="{ background: '#eee', color: '#606266' }"
+    >
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:treatise:table:author')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:treatise:table:name')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        :label="$t('curriculumVitae:treatise:table:publish')"
+      >
+      </el-table-column>
+      <el-table-column prop="date" :label="$t('common:action:action')">
+        <template slot-scope="scope">
+          <el-button type="text" class="editBtn" @click.stop="openEdit(scope)">
+            {{ $t('common:button:edit') }}
+          </el-button>
+          <el-button type="text" class="editBtn" @click.stop="openEdit">
+            {{ $t('common:button:delete') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="treatiseFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('curriculumVitae:treatise:form:author')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable></el-input>
+          </el-form-item>
+
+          <el-form-item
+            :label="$t('curriculumVitae:treatise:form:name')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable type="textarea" :rows="2"></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:treatise:form:publish')"
+            prop="InternationalizationType"
+          >
+            <el-input clearable type="textarea" :rows="2"></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  name: 'treatise',
+  components: { BaseModel },
+  data() {
+    return {
+      tableData: [],
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: this.$t('curriculumVitae:treatise:form:title'),
+        appendToBody: true,
+      },
+      form: {},
+      rules: {},
+      loading: false,
+      daterange: [],
+    }
+  },
+  methods: {
+    openEdit() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.model_cfg.visible = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.treatise {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+  }
+}
+.el-select,
+.el-date-editor {
+  width: 97%;
+}
+</style>

src/views/reviewers/curriculumVitae/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <div class="curriculumVitae">
+    <div class="leftMenu">
+      <div class="title">{{ $t('curriculumVitae:menu:title') }}</div>
+      <el-menu
+        :default-active="activeIndex"
+        class="el-menu-demo"
+        mode="vertical"
+        @select="handleSelect"
+        background-color="#eee"
+        active-text-color="#000"
+      >
+        <el-menu-item index="info">
+          {{ $t('curriculumVitae:menu:info') }}
+        </el-menu-item>
+        <el-menu-item index="summarize">{{
+          $t('curriculumVitae:menu:summarize')
+        }}</el-menu-item>
+        <el-menu-item index="specialty">
+          {{ $t('curriculumVitae:menu:specialty') }}
+        </el-menu-item>
+        <el-menu-item index="educationalExperience">{{
+          $t('curriculumVitae:menu:EducationalExperience')
+        }}</el-menu-item>
+        <el-menu-item index="continuingTraining">{{
+          $t('curriculumVitae:menu:ContinuingTraining')
+        }}</el-menu-item>
+        <el-menu-item index="scientificResearchProject">{{
+          $t('curriculumVitae:menu:ScientificResearchProject')
+        }}</el-menu-item>
+        <el-menu-item index="clinicalTrials">{{
+          $t('curriculumVitae:menu:clinicalTrials')
+        }}</el-menu-item>
+        <el-menu-item index="treatise">{{
+          $t('curriculumVitae:menu:treatise')
+        }}</el-menu-item>
+        <el-menu-item index="other">{{
+          $t('curriculumVitae:menu:other')
+        }}</el-menu-item>
+      </el-menu>
+    </div>
+    <div class="main">
+      <div class="content">
+        <div class="title">
+          <div>{{ $t('curriculumVitae:content:title') }}</div>
+          <div class="btnBox">
+            <el-button type="text">{{
+              $t('common:button:downloadTpl')
+            }}</el-button>
+            <el-button type="text">{{
+              $t('curriculumVitae:button:importResume')
+            }}</el-button>
+            <el-button type="text" @click.stop="openPreview">{{
+              $t('common:button:preview')
+            }}</el-button>
+          </div>
+        </div>
+        <div class="box" id="info">
+          <info />
+        </div>
+        <div class="box" id="summarize">
+          <summarize />
+        </div>
+        <div class="box" id="specialty">
+          <specialty />
+        </div>
+        <div class="box" id="educationalExperience">
+          <educationalExperience />
+        </div>
+        <div class="box" id="continuingTraining">
+          <continuingTraining />
+        </div>
+        <div class="box" id="scientificResearchProject">
+          <scientificResearchProject />
+        </div>
+        <div class="box" id="clinicalTrials">
+          <clinicalTrials />
+        </div>
+        <div class="box" id="treatise">
+          <treatise />
+        </div>
+        <div class="box" id="other">
+          <other />
+        </div>
+      </div>
+      <div class="rightFile">
+        <!--简历附件-->
+        <curriculum />
+        <!--资历证书-->
+        <certificate />
+        <!--协议-->
+        <agreement />
+      </div>
+    </div>
+    <el-dialog :visible.sync="visible" fullscreen>
+      <preview />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import curriculum from './components/file/curriculum.vue'
+import certificate from './components/file/certificate.vue'
+import agreement from './components/file/agreement.vue'
+import info from './components/info/info.vue'
+import summarize from './components/info/summarize.vue'
+import specialty from './components/info/specialty.vue'
+import educationalExperience from './components/info/educationalExperience.vue'
+import continuingTraining from './components/info/continuingTraining.vue'
+import scientificResearchProject from './components/info/scientificResearchProject.vue'
+import clinicalTrials from './components/info/clinicalTrials.vue'
+import treatise from './components/info/treatise.vue'
+import other from './components/info/other.vue'
+import preview from './preview.vue'
+export default {
+  components: {
+    curriculum,
+    certificate,
+    agreement,
+    info,
+    summarize,
+    specialty,
+    educationalExperience,
+    continuingTraining,
+    scientificResearchProject,
+    clinicalTrials,
+    treatise,
+    other,
+    preview,
+  },
+  data() {
+    return {
+      activeIndex: 'info',
+      isScrollAuto: true,
+      visible: false,
+    }
+  },
+  mounted() {
+    // 监听滚动事件
+    window.addEventListener('scroll', this.onScroll)
+  },
+  destroy() {
+    // 必须移除监听器，不然当该vue组件被销毁了，监听器还在就会出错
+    window.removeEventListener('scroll', this.onScroll)
+  },
+  methods: {
+    handleSelect(key, keyPath) {
+      const navContent = document.getElementById(key)
+      if (navContent) {
+        const scrollTop = navContent.offsetTop
+        document.body.scrollTop = scrollTop
+        document.documentElement.scrollTop = scrollTop
+      }
+    },
+    onScroll() {
+      // 获取所有锚点元素
+      const navContents = document.querySelectorAll('.content .box')
+      // 所有锚点元素的 offsetTop
+      const offsetTopArr = []
+      navContents.forEach((item) => {
+        offsetTopArr.push(item.offsetTop)
+      })
+      // 获取当前文档流的 scrollTop
+      const scrollTop =
+        document.documentElement.scrollTop || document.body.scrollTop
+      // 定义当前点亮的导航下标
+      let navItem = null
+      for (let n = 0; n < offsetTopArr.length; n++) {
+        // 如果 scrollTop 大于等于第 n 个元素的 offsetTop 则说明 n-1 的内容已经完全不可见
+        // 那么此时导航索引就应该是 n 了
+        if (scrollTop >= offsetTopArr[n]) {
+          navItem = navContents[n]
+        }
+      }
+      // 把下标赋值给 vue 的 data
+      this.activeIndex = navItem.id
+    },
+    // 预览简历
+    openPreview() {
+      this.visible = true
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.title {
+  line-height: 50px;
+  background-color: #fff;
+  text-align: center;
+}
+.leftMenu {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100px;
+  height: 100vh;
+  background-color: #eee;
+  border-right: 1px solid #eee;
+  ::v-deep .el-menu {
+    padding: 5px 5px 0;
+  }
+  ::v-deep .is-active {
+    background-color: #fff !important;
+    position: relative;
+    &::before {
+      display: block;
+      content: '';
+      width: 5px;
+      height: 15px;
+      background-color: #f00;
+      position: absolute;
+      left: 8px;
+      top: calc(50% - 8px);
+    }
+  }
+}
+.main {
+  width: calc(100% - 100px);
+  height: 100vh;
+  margin-left: 100px;
+  display: flex;
+  align-items: flex-start;
+}
+.content {
+  width: calc(100% - 300px);
+  padding: 0 50px 0 20px;
+  .title {
+    line-height: 50px;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+.box {
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  padding: 15px;
+  margin-bottom: 20px;
+}
+::v-deep .noData {
+  color: #909399;
+  text-align: center;
+}
+.rightFile {
+  width: 300px;
+  padding-right: 10px;
+  ::v-deep .title {
+    line-height: 50px;
+    background-color: #fff;
+    text-align: left;
+  }
+  ::v-deep .fileBox {
+    background-color: #eee;
+    padding: 10px;
+    font-size: 14px;
+    border-radius: 3px;
+  }
+  ::v-deep .file_title {
+    line-height: 40px;
+  }
+  ::v-deep .btnBox {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 10px;
+  }
+
+  ::v-deep .file {
+    width: 100%;
+    display: flex;
+    margin-bottom: 10px;
+    .name {
+      width: 70%;
+      white-space: nowrap; /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
+      text-overflow: ellipsis; /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+      overflow: hidden; /* 隐藏溢出容器的文本 */
+    }
+    i {
+      cursor: pointer;
+      margin: 3px;
+      color: #409eff;
+    }
+  }
+}
+</style>

src/views/reviewers/curriculumVitae/preview.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="curriculumVitaePreview">
+    <div class="title">{{ $t('curriculumVitae:preview:title') }}</div>
+    <div class="message">
+      <div class="userInfo">
+        <span>张三</span>
+        <span>医学博士</span>
+        <span>广州医院</span>
+        <span>社会兼职中华医学会XXXXXX</span>
+      </div>
+      <div class="userTitle">
+        <span class="el-icon-first-aid-kit">放射科</span>
+        <span class="el-icon-user">主任</span>
+        <span class="el-icon-medal">副主任医师</span>
+        <span class="el-icon-trophy">副教授</span>
+      </div>
+      <div class="userTel">
+        <span class="el-icon-phone-outline">18616815282</span>
+        <span class="el-icon-message">sicauzhangye@sina.com</span>
+        <span class="el-icon-chat-dot-round">wechat666</span>
+      </div>
+    </div>
+    <div class="message">
+      <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>
+      <span class="text">
+        哈斯卡基本的喀山举办的卡拉说不定就卡了奥斯本大数据量的把数据来看不打算了解到
+      </span>
+    </div>
+    <div class="message">
+      <el-form class="demo-form-inline">
+        <el-form-item :label="$t('curriculumVitae:specialty:specialty')">
+          <span>放射科</span>
+        </el-form-item>
+        <el-form-item :label="$t('curriculumVitae:specialty:submajor')">
+          <el-tag type="info" v-for="item in ['1', '2', '3']" :key="item">
+            标签三
+          </el-tag>
+        </el-form-item>
+        <el-form-item :label="$t('curriculumVitae:specialty:equipment')">
+          <el-tag type="info" v-for="item in ['1', '2', '3']" :key="item">
+            标签三
+          </el-tag>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="message">
+      <div class="title">
+        {{ $t('curriculumVitae:EducationalExperience:title') }}
+      </div>
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+        :header-cell-style="{ background: '#eee', color: '#606266' }"
+      >
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:EducationalExperience:table:time')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:EducationalExperience:table:specialy')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:EducationalExperience:table:degree')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:EducationalExperience:table:school')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:EducationalExperience:table:city')"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="message">
+      <div>{{ $t('curriculumVitae:continuingTraining:title') }}</div>
+      <el-table
+        :data="tableData2"
+        style="width: 100%"
+        :header-cell-style="{ background: '#eee', color: '#606266' }"
+      >
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:continuingTraining:table:time')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:continuingTraining:table:type')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:continuingTraining:table:direction')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:continuingTraining:table:school')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:continuingTraining:table:city')"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="message">
+      <div class="title">
+        {{ $t('curriculumVitae:scientificResearchProject:title') }}
+      </div>
+      <div class="content">
+        <el-form class="demo-form-inline">
+          <el-form-item
+            :label="$t('curriculumVitae:scientificResearchProject:direction')"
+          >
+            <div>direction</div>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:scientificResearchProject:subject')"
+          >
+            <div>subject</div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="message">
+      <!--临床试验-->
+      <div class="title">
+        {{ $t('curriculumVitae:clinicalTrials:title') }}
+      </div>
+      <el-table
+        :data="tableData3"
+        style="width: 100%"
+        :header-cell-style="{ background: '#eee', color: '#606266' }"
+      >
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:clinicalTrials:table:byStages')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:clinicalTrials:table:criterion')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:clinicalTrials:table:indication')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:clinicalTrials:table:viewingVolumeNum')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:clinicalTrials:table:year')"
+        >
+        </el-table-column>
+      </el-table>
+      <!--GCP证书-->
+      <div class="title">
+        {{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}
+      </div>
+      <el-table
+        :data="tableData4"
+        style="width: 100%"
+        :header-cell-style="{ background: '#eee', color: '#606266' }"
+      >
+        <el-table-column
+          prop="has"
+          :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="time"
+          :label="$t('curriculumVitae:clinicalTrials:table:certificateTime')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="adress"
+          :label="
+            $t('curriculumVitae:clinicalTrials:table:certificateHospital')
+          "
+        >
+        </el-table-column>
+      </el-table>
+      <!--其他相关经历-->
+      <div class="title">
+        {{ $t('curriculumVitae:clinicalTrials:otherTitle') }}
+      </div>
+      <template v-if="true">
+        <div class="message">三的卡上不能打卡上班打卡</div>
+      </template>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+    </div>
+    <div class="message">
+      <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+      <el-table
+        :data="tableData5"
+        style="width: 100%"
+        :header-cell-style="{ background: '#eee', color: '#606266' }"
+      >
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:treatise:table:author')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:treatise:table:name')"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          :label="$t('curriculumVitae:treatise:table:publish')"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="message">
+      <div class="title">{{ $t('curriculumVitae:other:title') }}</div>
+      <div class="content">
+        <div>{{ $t('curriculumVitae:other:AH') }}</div>
+        <p>a诺夫卡刷积分八九十快点把手里的v八路军那是的健康蓝色的艰苦拉萨的</p>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'curriculumVitaePreview',
+  data() {
+    return {
+      tableData: [],
+      tableData2: [],
+      tableData3: [],
+      tableData4: [],
+      tableData5: [],
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.curriculumVitaePreview {
+  max-width: 1200px;
+  margin: auto;
+  .title {
+    font-size: 18px;
+  }
+  .message {
+    padding: 20px 0;
+    border-bottom: 1px solid #eee;
+    .title {
+      font-size: 14px;
+      line-height: 30px;
+      margin-bottom: 10px;
+    }
+    .text {
+      color: #909399;
+    }
+    .content {
+      background-color: #eee;
+      padding: 10px;
+      line-height: 30px;
+      border-radius: 5px;
+    }
+  }
+  .userInfo,
+  .userTitle,
+  .userTel {
+    line-height: 30px;
+    margin-bottom: 15px;
+    span {
+      margin-right: 20px;
+      &:last-child {
+        margin: 0;
+      }
+    }
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .userTitle,
+  .userTel {
+    span {
+      display: inline-block;
+      min-width: 80px;
+      border-right: 1px solid #ddd;
+      padding-right: 10px;
+      &::before {
+        margin-right: 5px;
+      }
+      &:last-child {
+        border: none;
+      }
+    }
+  }
+}
+::v-deep .el-tag {
+  margin-right: 10px;
+  &:last-child {
+    margin-right: 0;
+  }
+}
+</style>

src/views/reviewers/edit.vue

@@ -1,41 +1,73 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="active" @tab-click="clickTab">
-      <el-tab-pane :label="$t('system:reviewer:tab:BasicInfo')" name="BasicInfo">
-        <basic-info v-if="load.BasicInfo" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:BasicInfo')"
+        name="BasicInfo"
+      >
+        <basic-info v-if="load.BasicInfo" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:Employment')" name="Employment">
-        <Employment v-if="load.Employment" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Employment')"
+        name="Employment"
+      >
+        <Employment v-if="load.Employment" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:Specialty')" name="Specialty">
-        <specialty v-if="load.Specialty" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Specialty')"
+        name="Specialty"
+      >
+        <specialty v-if="load.Specialty" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:Education&Training')" name="EducationTraining">
-        <education-training v-if="load.EducationTraining" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Education&Training')"
+        name="EducationTraining"
+      >
+        <education-training
+          v-if="load.EducationTraining"
+          :reviewerId.sync="reviewerId"
+        />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:Research&Publication')" name="ResearchPublication">
-        <research-publication v-if="load.ResearchPublication" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Research&Publication')"
+        name="ResearchPublication"
+      >
+        <research-publication
+          v-if="load.ResearchPublication"
+          :reviewerId.sync="reviewerId"
+        />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:TrialExperience')" name="TrialExperience">
-        <trial-experience v-if="load.TrialExperience" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:TrialExperience')"
+        name="TrialExperience"
+      >
+        <trial-experience
+          v-if="load.TrialExperience"
+          :reviewerId.sync="reviewerId"
+        />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:Credentials')" name="Credentials">
-        <Credentials v-if="load.Credentials" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Credentials')"
+        name="Credentials"
+      >
+        <Credentials v-if="load.Credentials" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
       <el-tab-pane :label="$t('system:reviewer:tab:Resumes')" name="Resumes">
-        <Resumes v-if="load.Resumes" />
+        <Resumes v-if="load.Resumes" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane :label="$t('system:reviewer:tab:Agreements')" name="Agreements">
-        <Agreements v-if="load.Agreements" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Agreements')"
+        name="Agreements"
+      >
+        <Agreements v-if="load.Agreements" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
       <el-tab-pane :label="$t('system:reviewer:tab:Setting')" name="Setting">
-        <Setting v-if="load.Setting" />
+        <Setting v-if="load.Setting" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script>
-
 import BasicInfo from './components/BasicInfo'
 import Employment from './components/Employment'
 import Specialty from './components/Specialty'
@@ -58,12 +90,21 @@ export default {
     Credentials,
     Resumes,
     Agreements,
-    Setting
+    Setting,
+  },
+  props: {
+    reviewerId: {
+      type: String,
+    },
+    isSystem: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
       id: this.$route.query.Id,
-      active: '',
+      active: 'BasicInfo',
       load: {
         BasicInfo: true,
         Employment: false,
@@ -74,34 +115,39 @@ export default {
         Credentials: false,
         Resumes: false,
         Agreements: false,
-        Setting: false
-      }
+        Setting: false,
+      },
     }
   },
   created() {
-    if (this.$route.query.Id === '') {
-      this.$router.push({ path: '/reviewers/reviewers-list' })
+    if (this.isSystem) {
+      if (this.$route.query.Id === '') {
+        this.$router.push({ path: '/reviewers/reviewers-list' })
+      }
+      this.active = this.$route.query.tabActive
+      this.load[this.active] = true
     }
-    this.active = this.$route.query.tabActive
-    this.load[this.active] = true
   },
   methods: {
     clickTab(tab, event) {
       if (this.load[tab.name] === false) {
         this.load[tab.name] = true
       }
+      if (!this.isSystem) return false
       changeURLStatic('tabActive', tab.name)
       const id = getQueryString('Id')
       const isEnglish = getQueryString('isEnglish')
-      this.$router.push({ path: `/reviewers/reviewers-edit?Id=${id}&isEnglish=${isEnglish}&tabActive=${tab.name}` })
-    }
-  }
+      this.$router.push({
+        path: `/reviewers/reviewers-edit?Id=${id}&isEnglish=${isEnglish}&tabActive=${tab.name}`,
+      })
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.el-tabs{
+.el-tabs {
   height: 100%;
-  .el-tabs__content{
+  .el-tabs__content {
     height: calc(100%-50px);
     overflow-y: auto;
   }

src/views/reviewers/new.vue

@@ -1,36 +1,73 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="active" :before-leave="checkLeave" @tab-click="clickTab">
-      <el-tab-pane label="Basic Info" name="BasicInfo">
-        <basic-info v-if="load.BasicInfo" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:BasicInfo')"
+        name="BasicInfo"
+      >
+        <basic-info
+          v-if="load.BasicInfo"
+          :reviewerId.sync="reviewerId"
+          :isSystem="isSystem"
+        />
       </el-tab-pane>
-      <el-tab-pane label="Employment" name="Employment">
-        <Employment v-if="load.Employment" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Employment')"
+        name="Employment"
+      >
+        <Employment v-if="load.Employment" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane label="Specialty" name="Specialty">
-        <specialty v-if="load.Specialty" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Specialty')"
+        name="Specialty"
+      >
+        <specialty v-if="load.Specialty" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
 
-      <el-tab-pane label="Education & Training" name="EducationTraining">
-        <education-training v-if="load.EducationTraining" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Education&Training')"
+        name="EducationTraining"
+      >
+        <education-training
+          v-if="load.EducationTraining"
+          :reviewerId.sync="reviewerId"
+        />
       </el-tab-pane>
-      <el-tab-pane label="Research & Publication" name="ResearchPublication">
-        <research-publication v-if="load.ResearchPublication" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Research&Publication')"
+        name="ResearchPublication"
+      >
+        <research-publication
+          v-if="load.ResearchPublication"
+          :reviewerId.sync="reviewerId"
+        />
       </el-tab-pane>
-      <el-tab-pane label="Trial Experience" name="TrialExperience">
-        <trial-experience v-if="load.TrialExperience" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:TrialExperience')"
+        name="TrialExperience"
+      >
+        <trial-experience
+          v-if="load.TrialExperience"
+          :reviewerId.sync="reviewerId"
+        />
       </el-tab-pane>
-      <el-tab-pane label="Credentials" name="Credentials">
-        <Credentials v-if="load.Credentials" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Credentials')"
+        name="Credentials"
+      >
+        <Credentials v-if="load.Credentials" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane label="Resumes" name="Resumes">
-        <Resumes v-if="load.Resumes" />
+      <el-tab-pane :label="$t('system:reviewer:tab:Resumes')" name="Resumes">
+        <Resumes v-if="load.Resumes" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane label="Agreements" name="Agreements">
-        <Agreements v-if="load.Agreements" />
+      <el-tab-pane
+        :label="$t('system:reviewer:tab:Agreements')"
+        name="Agreements"
+      >
+        <Agreements v-if="load.Agreements" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
-      <el-tab-pane label="Setting" name="Setting">
-        <Setting v-if="load.Setting" />
+      <el-tab-pane :label="$t('system:reviewer:tab:Setting')" name="Setting">
+        <Setting v-if="load.Setting" :reviewerId.sync="reviewerId" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -58,7 +95,13 @@ export default {
     Credentials,
     Resumes,
     Agreements,
-    Setting
+    Setting,
+  },
+  props: {
+    isSystem: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -73,36 +116,44 @@ export default {
         Credentials: false,
         Resumes: false,
         Agreements: false,
-        Setting: false
-      }
+        Setting: false,
+        reviewerId: null,
+      },
     }
   },
   mounted() {
-    this.active = this.$route.query.tabActive
-    if (this.$route.query.Id === '' && this.active !== 'BasicInfo') {
-      this.$router.push({ path: '/reviewers/reviewers-list' })
+    if (this.isSystem) {
+      this.active = this.$route.query.tabActive
+      if (this.$route.query.Id === '' && this.active !== 'BasicInfo') {
+        this.$router.push({ path: '/reviewers/reviewers-list' })
+      }
+      this.load[this.active] = true
     }
-    this.load[this.active] = true
   },
   methods: {
     clickTab(tab, event) {
       if (this.load[tab.name] === false) {
         this.load[tab.name] = true
       }
+      if (!this.isSystem) return false
       changeURLStatic('tabActive', tab.name)
       const id = getQueryString('Id')
       const isEnglish = getQueryString('isEnglish')
-      this.$router.push({ path: `/reviewers/reviewers-add?Id=${id}&isEnglish=${isEnglish}&tabActive=${tab.name}` })
+      this.$router.push({
+        path: `/reviewers/reviewers-add?Id=${id}&isEnglish=${isEnglish}&tabActive=${tab.name}`,
+      })
     },
     checkLeave() {
       const id = getQueryString('Id')
       if (!id) {
         this.$message({
           message: 'Please fill in the basic information first',
-          type: 'warning'
+          type: 'warning',
         })
         return false
-      } else { return true }
+      } else {
+        return true
+      }
     },
     getQueryString(name) {
       console.log(window.location.href)
@@ -113,14 +164,14 @@ export default {
       } else {
         return null
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.el-tabs{
+.el-tabs {
   height: 100%;
-  .el-tabs__content{
+  .el-tabs__content {
     height: calc(100%-50px);
     overflow-y: auto;
   }

src/views/system/event/index.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="event">
+    <div ref="leftContainer" class="left">
+      <el-form :inline="true">
+        <el-form-item :label="$t('system:event:eventTypeName')">
+          <el-select
+            v-model="searchData.EventTypeName"
+            clearable
+            filterable
+            placeholder=""
+          >
+            <el-option
+              v-for="item in $d.EventTypeName"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('system:event:eventState')">
+          <el-select
+            v-model="searchData.EventState"
+            clearable
+            filterable
+            placeholder=""
+          >
+            <el-option
+              v-for="item in $d.EventState"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </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
+            size="mini"
+            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"
+        @selection-change="handleSelectionChange"
+        ><el-table-column type="selection" width="50" />
+        <el-table-column type="index" width="50" />
+        <el-table-column
+          :label="$t('system:event:eventTypeName')"
+          prop="EventTypeName"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd('EventTypeName', scope.row.EventTypeName) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('system:event:eventState')"
+          prop="EventState"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="['info', 'success', 'primary'][scope.row.EventState]"
+            >
+              {{ $fd('EventState', scope.row.EventState) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('system:event:eventCreateTime')"
+          prop="CreateTime"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          :label="$t('common:action:action')"
+          fixed="right"
+          prop=""
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="view(scope.row)">
+              {{ $t('common:button:view') }}
+            </el-button>
+            <el-button size="mini" type="text" @click="rePublish(scope.row)">
+              {{ $t('system:event:button:rePublish') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </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"
+        />
+      </div>
+    </div>
+    <base-model v-if="model_cfg.visible" :config="model_cfg">
+      <template slot="dialog-body">
+        <div v-html="info"></div>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import { getEventStoreRecordList, rePublishEvent } from '@/api/admin'
+import Pagination from '@/components/Pagination'
+import BaseModel from '@/components/BaseModel'
+const searchDataDefault = () => {
+  return {
+    EventState: null,
+    EventTypeName: null,
+    Asc: true,
+    SortField: '',
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
+export default {
+  name: 'event',
+  components: { Pagination, BaseModel },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      loading: false,
+      PublishVersionList: [],
+      selectTableList: [],
+      model_cfg: { visible: false, title: '', width: '500px' },
+      info: null,
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      getEventStoreRecordList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    async rePublish(row) {
+      try {
+        this.loading = true
+        let res = await rePublishEvent({
+          EventId: row.Id,
+        })
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('system:event:message:rePublishSuccess')
+          )
+          this.getList()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 重置列表查询
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    // 排序
+    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()
+    },
+    // 选择
+    handleSelectionChange(val) {
+      this.selectTableList = val
+    },
+    // 查看
+    view(row) {
+      let info = JSON.parse(row.EventData)
+      let message = ''
+      if (info) {
+        Object.keys(info).forEach((key) => {
+          message += `<div style="margin-bottom:10px">
+            <span style="color:#F56C6C">${key}</span>：<span style="color:#67C23A">${info[key]}</span>
+            </div>`
+        })
+      }
+      this.info = message
+      this.model_cfg.visible = true
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.event {
+  height: 100%;
+  box-sizing: border-box;
+  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;
+    }
+  }
+}
+</style>

src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue

@@ -65,7 +65,12 @@
         </el-form-item>
         <!-- Rank -->
         <el-form-item :label="$t('trials:seletctedReviews:form:rank')">
-          <el-select v-model="listQuery.RankId" class="handle-select" style="width: 160px" clearable>
+          <el-select
+            v-model="listQuery.RankId"
+            class="handle-select"
+            style="width: 160px"
+            clearable
+          >
             <el-option
               v-for="item of $d.Rank"
               :key="item.id"
@@ -83,7 +88,7 @@
             style="width: 160px"
           >
             <el-option
-              v-for="(item,index) in hospitalList"
+              v-for="(item, index) in hospitalList"
               :key="index"
               :label="item.HospitalName"
               :value="item.Id"
@@ -91,30 +96,57 @@
           </el-select>
         </el-form-item>
         <!-- 查询 -->
-        <el-button type="primary" icon="el-icon-search" :loading="loading" @click="handleSearch">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          :loading="loading"
+          @click="handleSearch"
+        >
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button type="primary" icon="el-icon-refresh-left" :loading="loading" @click="handleReset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-left"
+          :loading="loading"
+          @click="handleReset"
+        >
           {{ $t('common:button:reset') }}
         </el-button>
         <el-button
           v-if="hasPermi(['role:pm'])"
           type="primary"
-          :disabled="selectIdArr.length==0"
+          :disabled="selectIdArr.length == 0"
           icon="el-icon-check"
           :loading="loading"
           @click="handleApply"
         >
           {{ $t('trials:seletctedReviews:button:select') }}
         </el-button>
+        <!---简历采集-->
+        <el-button
+          type="primary"
+          @click="resumeCollection"
+          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
+        >
+          {{ $t('trials:seletctedReviews:button:resumeCollection') }}
+        </el-button>
+        <!---添加阅片人-->
+        <el-button
+          icon="el-icon-plus"
+          type="primary"
+          @click="openViewer('add')"
+          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
+        >
+          {{ $t('trials:seletctedReviews:button:addViewer') }}
+        </el-button>
       </el-form>
     </template>
     <template slot="main-container">
       <el-table
         ref="selectionList"
         v-loading="listLoading"
-        v-adaptive="{bottomOffset:65}"
+        v-adaptive="{ bottomOffset: 65 }"
         height="100"
         :data="list"
         class="table"
@@ -133,16 +165,22 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
+            <span
+              style="color: #428bca; cursor: pointer"
+              @click="
+                go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)
+              "
+              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span
+            >
             <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
-<!--            <router-link-->
-<!--              style="color: #428bca;"-->
-<!--              tag="a"-->
-<!--              :to="{-->
-<!--                path: `/trialsResume?doctorId=${scope.row.Id}&token=${token}`,-->
-<!--              }"-->
-<!--              target="_blank"-->
-<!--            >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</router-link>-->
+            <!--            <router-link-->
+            <!--              style="color: #428bca;"-->
+            <!--              tag="a"-->
+            <!--              :to="{-->
+            <!--                path: `/trialsResume?doctorId=${scope.row.Id}&token=${token}`,-->
+            <!--              }"-->
+            <!--              target="_blank"-->
+            <!--            >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</router-link>-->
           </template>
         </el-table-column>
         <!-- Name CN -->
@@ -153,7 +191,7 @@
           sortable="custom"
           width="120"
         /> -->
-        
+
         <el-table-column
           prop="DoctorUserName"
           :label="$t('trials:seletctedReviews:table:doctorUserName')"
@@ -168,7 +206,9 @@
           width="120"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.DoctorTrialState === 1" type="primary">{{ $fd('DoctorTrialState', 16) }}</el-tag>
+            <el-tag v-if="scope.row.DoctorTrialState === 1" type="primary">{{
+              $fd('DoctorTrialState', 16)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- Submitted -->
@@ -202,7 +242,11 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            {{ scope.row.ReadingTypeIds.map(v => {return $fd('ReadingType', v, 'id')}).toString() }}
+            {{
+              scope.row.ReadingTypeIds.map((v) => {
+                return $fd('ReadingType', v, 'id')
+              }).toString()
+            }}
           </template>
         </el-table-column>
         <!-- Specialty -->
@@ -213,7 +257,13 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            {{ scope.row.SpecialityId === otherId?(scope.row.SpecialityOther?scope.row.SpecialityOther:'Other'): scope.row.Speciality }}
+            {{
+              scope.row.SpecialityId === otherId
+                ? scope.row.SpecialityOther
+                  ? scope.row.SpecialityOther
+                  : 'Other'
+                : scope.row.Speciality
+            }}
           </template>
         </el-table-column>
         <!-- Subspecialty -->
@@ -224,7 +274,11 @@
           min-width="150"
         >
           <template slot-scope="scope">
-            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).join(', ') }}
+            {{
+              scope.row.SubspecialityIds.map((v) => {
+                return $fd('Subspeciality', v, 'id')
+              }).join(', ')
+            }}
             <!--            {{ scope.row.SubspecialityList.length > 0 ? scope.row.SubspecialityList.join(', ') : '' }}-->
           </template>
         </el-table-column>
@@ -261,9 +315,80 @@
           :label="$t('trials:seletctedReviews:table:selectionTime')"
           width="150"
         />
+        <el-table-column
+          prop="OptTimeStr"
+          :label="$t('common:action:action')"
+          width="150"
+          v-if="hasPermi(['trials:trials-panel:attachments:enrollment:viewer'])"
+        >
+          <template slot-scope="scope">
+            <el-button
+              icon="el-icon-edit-outline"
+              :title="$t('common:button:edit')"
+              @click.stop="openViewer('edit', scope.row)"
+              v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
+              circle
+            />
+          </template>
+        </el-table-column>
       </el-table>
-      <pagination class="page" :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="listQuery.PageIndex"
+        :limit.sync="listQuery.PageSize"
+        @pagination="getList"
+      />
     </template>
+    <!--简历采集-->
+    <base-model :config="share_model">
+      <template slot="dialog-body">
+        <div>
+          <i style="color: #428bca" class="el-icon-success" />
+          <span>{{ $t('reviewers-list:message:msg1') }}</span>
+        </div>
+        <div style="margin: 10px 0">
+          <span style="">{{ $t('reviewers-list:message:msg2') }}</span
+          ><el-input
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+            v-model="shareLink"
+            readonly
+            style="width: 100%; margin-top: 10px"
+          />
+        </div>
+        <div>
+          <el-button type="primary" round @click="copyCode">{{
+            $t('reviewers-list:button:copyCode')
+          }}</el-button>
+        </div>
+        <div class="sendEmailBox">
+          <el-input
+            v-model="email"
+            clearable
+            :placeholder="$t('reviewers-list:placeholder:sendEmail')"
+          ></el-input>
+          <el-button
+            type="primary"
+            round
+            @click="sendEmail"
+            :loading="emailLoading"
+            style="margin-left: 10px"
+          >
+            {{ $t('reviewers-list:button:sendEmail') }}
+          </el-button>
+        </div>
+      </template>
+    </base-model>
+    <!--新增或修改简历-->
+    <el-dialog title="" :visible.sync="visible" fullscreen v-if="visible">
+      <reviewerAdd :isSystem="false" v-if="resumeType === 'add'" />
+      <reviewerEdit
+        :isSystem="false"
+        :reviewerId="reviewerId"
+        v-if="resumeType === 'edit'"
+      />
+    </el-dialog>
   </BaseContainer>
 </template>
 <script>
@@ -272,10 +397,13 @@ import Pagination from '@/components/Pagination'
 import store from '@/store'
 import { mapGetters } from 'vuex'
 import { getSelectionReviewerList, selectReviewers } from '@/api/trials'
+import BaseModel from '@/components/BaseModel'
+import reviewerAdd from '@/views/reviewers/new'
+import reviewerEdit from '@/views/reviewers/edit'
 const getListQueryDefault = () => {
   return {
     TrialId: '',
-    Name:'',
+    Name: '',
     ReadingTypeIds: [],
     SubspecialityIds: [],
     PageIndex: 1,
@@ -287,12 +415,18 @@ const getListQueryDefault = () => {
     SortField: '',
     AcceptingNewTrial: true,
     InformationConfirmed: true,
-    ContractorStatus: 1
+    ContractorStatus: 1,
   }
 }
 export default {
   name: 'Selection',
-  components: { BaseContainer, Pagination },
+  components: {
+    BaseContainer,
+    Pagination,
+    BaseModel,
+    reviewerAdd,
+    reviewerEdit,
+  },
   dicts: ['ReadingType', 'Subspeciality', 'Position', 'Rank'],
   data() {
     return {
@@ -303,14 +437,54 @@ export default {
       listLoading: false,
       selectIdArr: [],
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
-      token: store.getters.token
+      token: store.getters.token,
+      share_model: { visible: false, title: '', width: '500px' },
+      shareLink: null,
+      email: null,
+      emailLoading: false,
+      visible: false,
+      resumeType: 'add',
+      reviewerId: null,
     }
   },
   computed: {
-    ...mapGetters(['hospitalList'])
+    ...mapGetters(['hospitalList']),
+  },
+  created() {
+    this.initPage()
   },
-  created() { this.initPage() },
   methods: {
+    copyCode() {
+      this.$copyText(
+        `${this.$t('reviewers-list:button:copyCode')}: ${this.shareLink}`
+      )
+        .then((res) => {
+          this.$message.success(
+            this.$t('trials:researchRecord:message:copySuccessfully')
+          )
+        })
+        .catch(() => {
+          this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
+        })
+    },
+    // 简历采集
+    resumeCollection() {
+      this.shareLink = `${location.protocol}//${location.host}/ReviewersResearch?lang=${this.$store.getters.language}`
+      this.email = null
+      this.share_model.visible = true
+    },
+    // 发送邮件
+    sendEmail() {
+      this.$message.success('123')
+    },
+    // 打开新增或修改简历弹框
+    openViewer(type, row) {
+      this.resumeType = type
+      if (row) {
+        this.reviewerId = row.Id
+      }
+      this.visible = true
+    },
     go(path) {
       window.open(path)
     },
@@ -321,29 +495,35 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.TrialId = this.$route.query.trialId
-      getSelectionReviewerList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      // eslint-disable-next-line handle-callback-err
-      }).catch(() => { this.listLoading = false })
+      getSelectionReviewerList(this.listQuery)
+        .then((res) => {
+          this.listLoading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          // eslint-disable-next-line handle-callback-err
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     handleApply() {
       this.$confirm(this.$t('trials:seletctedReviews:message:msg1'), {
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         this.loading = true
         const trialId = this.$route.query.trialId
-        selectReviewers(trialId, this.selectIdArr).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.getList()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.$emit('nextStep', 'submission')
-          }
-        }).catch(() => {
-          this.loading = false
-        })
+        selectReviewers(trialId, this.selectIdArr)
+          .then((res) => {
+            this.loading = false
+            if (res.IsSuccess) {
+              this.getList()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.$emit('nextStep', 'submission')
+            }
+          })
+          .catch(() => {
+            this.loading = false
+          })
       })
     },
     handleSelectionChange(val) {
@@ -368,9 +548,13 @@ export default {
         return 'selected'
       }
     },
-    handleSelectTable(row) { return row.DoctorTrialState !== 1 },
+    handleSelectTable(row) {
+      return row.DoctorTrialState !== 1
+    },
     handleDetail(row) {
-      const { href } = this.$router.resolve({ path: `/trialsResume?doctorId=${row.Id}` })
+      const { href } = this.$router.resolve({
+        path: `/trialsResume?doctorId=${row.Id}`,
+      })
       window.open(href, '_blank')
     },
     handleSearch() {
@@ -380,8 +564,16 @@ export default {
     handleReset() {
       this.listQuery = getListQueryDefault()
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
+<style lang="scss" scoped>
+.sendEmailBox {
+  margin-top: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+</style>
 

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue

@@ -7,7 +7,7 @@
       {{ question.GroupName }}
     </div>
     <div
-      v-if=" question.Type==='table'"
+      v-if="question.Type==='table' || question.Type==='basicTable'"
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
     >
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
@@ -267,7 +267,7 @@
       </el-form-item>
     </template>
 
-    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table'">
+    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table' && question.Type !== 'basicTable'">
       <CustomizeQuestionFormItem
         v-for="(item) in question.Childrens"
         :key="item.Id"
@@ -429,7 +429,7 @@ export default {
         })
       }
     }
-    if (this.question.Type === 'table') {
+    if (this.question.Type === 'table' || this.question.Type === 'baiscTable') {
       this.getQuestionCalculateRelation()
       if (this.questionForm[this.question.Id]) {
         this.QuestionsForm = {}

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue

@@ -122,10 +122,10 @@ export default {
         DicomEvent.$emit('setReadingState', res.OtherInfo.ReadingTaskState)
         res.Result.SinglePage.map((v) => {
           if (v.Type === 'group' && v.Childrens.length === 0) return
-          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
             this.$set(this.questionForm, v.Id, v.Answer)
           }
-          if (v.Type === 'table') {
+          if (v.Type === 'table' || v.Type === 'basicTable') {
             this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
           }
           if (v.Type === 'number') {
@@ -151,8 +151,8 @@ export default {
         if (res.OtherInfo.FormType === 2) {
           if (res.Result.MultiPage.length > 0) {
             res.Result.MultiPage.map((v) => {
-              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table') return
-              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table') {
+              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table' && i.Type !== 'basicTable') return
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table' && i.Type !== 'basicTable') {
                 this.$set(this.questionForm, v.Id, '')
               }
               if (v.Childrens.length > 0) {
@@ -164,8 +164,8 @@ export default {
           }
           if (res.Result.PublicPage.length > 0) {
             res.Result.PublicPage.map((v) => {
-              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table') return
-              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table') {
+              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table' && i.Type !== 'basicTable') return
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table' && i.Type !== 'basicTable') {
                 this.$set(this.questionForm, v.Id, '')
               }
               if (v.Childrens.length > 0) {
@@ -176,11 +176,11 @@ export default {
           }
         } else {
           res.Result.SinglePage.map((v) => {
-            if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table') return
-            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+            if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table' && v.Type !== 'basicTable') return
+            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
               this.$set(this.questionForm, v.Id, v.Answer)
             }
-            if (v.Type === 'table') {
+            if (v.Type === 'table' || v.Type === 'basicTable') {
               this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
             }
             if (v.Type === 'number') {
@@ -198,10 +198,10 @@ export default {
     },
     setChild(obj) {
       obj.forEach(i => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table') {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table'  && i.Type !== 'basicTable') {
           this.$set(this.questionForm, i.Id, i.Answer)
         }
-        if (i.Type === 'table') {
+        if (i.Type === 'table' || i.Type === 'basicTable') {
           i.TableQuestions.Questions.forEach(o => {
             if (o.Type === 'number') {
               i.TableQuestions.Answers.forEach((ite, index) => {

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue

@@ -425,11 +425,11 @@ export default {
     },
     InitVisitTaskQuestionForm() {
       this.taskQuestions.map((v, i) => {
-        if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table') return
-        if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+        if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table' && v.Type !== 'basicTable') return
+        if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
           this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId])
         }
-        if (v.Type === 'table') {
+        if (v.Type === 'table' || v.Type === 'basicTable') {
           var tableAnswers = this.getTableAnswers(v.QuestionId, v.Childrens, i)
           this.$set(this.questionForm, v.QuestionId, tableAnswers)
           // this.$set(v, 'xfIndex', i)
@@ -445,17 +445,17 @@ export default {
     },
     setChild(obj) {
       obj.forEach((i, index) => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table') {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table'  && i.Type !== 'basicTable') {
           this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId])
         }
-        if (i.Type === 'table') {
+        if (i.Type === 'table' || i.Type === 'basicTable') {
           var tableAnswers = this.getTableAnswers(i.QuestionId, i.Childrens, index)
           this.$set(this.questionForm, i.QuestionId, tableAnswers)
         }
         if (i.Type === 'number') {
           this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : i.Answers[this.visitTaskId])
         }
-        if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table') {
+        if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table'  && i.Type !== 'basicTable') {
           this.setChild(i.Childrens)
         }
       })

src/views/trials/trials-panel/reading/dicoms/tools/RectangleRoi/RectangleRoiTool.js

@@ -40,7 +40,8 @@ export default class RectangleRoiTool extends cornerstoneTools.RectangleRoiTool
         drawHandles: true,
         drawHandlesOnHover: false,
         hideHandlesIfMoving: false,
-        renderDashed: false
+        renderDashed: false,
+        showStatsText: false
         // showMinMax: false,
         // showHounsfieldUnits: true
       },
@@ -531,12 +532,15 @@ function _createTextBoxContent(
         minString += ' '
       }
 
-      otherLines.push(`${minString}${maxString}`)
+      otherLines.push(`${minString}`)
+      otherLines.push(`${maxString}`)
     }
   }
-
-  // textLines.push(_formatArea(area, hasPixelSpacing))
-  // otherLines.forEach(x => textLines.push(x))
+  if (options.showStatsText) {
+    textLines.push(_formatArea(area, hasPixelSpacing))
+    otherLines.forEach(x => textLines.push(x))
+  }
+  
   if (data.hasOwnProperty('remark')) {
     if (data.hasOwnProperty('status') && data.status) {
       textLines.push(`${data.remark}(${data.status})`)
@@ -546,3 +550,11 @@ function _createTextBoxContent(
   }
   return textLines
 }
+function _formatArea(area, hasPixelSpacing) {
+  // This uses Char code 178 for a superscript 2
+  const suffix = hasPixelSpacing
+    ? ` mm${String.fromCharCode(178)}`
+    : ` px${String.fromCharCode(178)}`;
+
+  return `Area: ${numbersWithCommas(area.toFixed(2))}${suffix}`;
+}

src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue

@@ -14,18 +14,32 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopicCN')" prop="EmailTopicCN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+          prop="EmailTopicCN"
+        >
           <el-input style="width: 300px" disabled v-model="form.EmailTopicCN" />
         </el-form-item>
       </el-col>
       <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopic')" prop="EmailTopic">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailTopic')"
+          prop="EmailTopic"
+        >
           <el-input style="width: 300px" disabled v-model="form.EmailTopic" />
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
-          <el-select v-model="form.BusinessScenarioEnum" disabled clearable class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          prop="BusinessScenarioEnum"
+        >
+          <el-select
+            v-model="form.BusinessScenarioEnum"
+            disabled
+            clearable
+            class="mr"
+          >
             <el-option
               v-for="item of $d.Email_BusinessScenario"
               :key="`BusinessScenarioEnum${item.label}`"
@@ -36,8 +50,17 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:ToUserTypeList')" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" disabled clearable multiple class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:ToUserTypeList')"
+          prop="ToUserTypeList"
+        >
+          <el-select
+            v-model="form.ToUserTypeList"
+            disabled
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of $d.UserType"
               :key="`ToUserTypeList${item.label}`"
@@ -48,8 +71,17 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CopyUserTypeList')" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" disabled clearable multiple class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CopyUserTypeList')"
+          prop="CopyUserTypeList"
+        >
+          <el-select
+            v-model="form.CopyUserTypeList"
+            disabled
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of $d.UserType"
               :key="`CopyUserTypeList${item.label}`"
@@ -60,8 +92,16 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:blackUserIdList')" prop="blackUserIdList">
-          <el-select v-model="form.blackUserIdList" clearable multiple class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:blackUserIdList')"
+          prop="blackUserIdList"
+        >
+          <el-select
+            v-model="form.blackUserIdList"
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of UserList"
               :key="`blackUserIdList${item.UserName}`"
@@ -73,8 +113,16 @@
       </el-col>
       <el-col :span="24">
         <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum">
-            <el-select v-model="form.EmailUrgentEnum" disabled clearable class="mr">
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+            prop="EmailUrgentEnum"
+          >
+            <el-select
+              v-model="form.EmailUrgentEnum"
+              disabled
+              clearable
+              class="mr"
+            >
               <el-option
                 v-for="item of $d.EmailUrgent"
                 :key="`EmailUrgent${item.label}`"
@@ -85,37 +133,79 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1 && IntervalShow" prop="EmailCron">
-            <el-input-number v-model="Interval" @change="handleIntervalChange" :min="1" :max="365"></el-input-number>
-<!--            <el-input style="width: 300px" readonly v-model="form.EmailCron" />-->
-<!--            <el-button type="primary" @click="showDialog">生成 cron</el-button>-->
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailCron')"
+            v-if="form.EmailUrgentEnum !== 1 && IntervalShow"
+            prop="EmailCron"
+          >
+            <el-input-number
+              v-model="Interval"
+              @change="handleIntervalChange"
+              :min="1"
+              :max="365"
+            ></el-input-number>
+            <!--            <el-input style="width: 300px" readonly v-model="form.EmailCron" />-->
+            <!--            <el-button type="primary" @click="showDialog">生成 cron</el-button>-->
           </el-form-item>
         </el-col>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:isReturnRequired')"
+          prop="IsReturnRequired"
+        >
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{ item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsReturnRequired${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsAutoSend')"
+          prop="IsAutoSend"
+        >
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsAutoSend${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          prop="IsEnable"
+        >
           <el-radio-group v-model="form.IsEnable">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsEnable${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')" v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0" prop="CriterionTypeEnum">
-          <el-select disabled v-model="form.CriterionTypeEnum" clearable class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
+          v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0"
+          prop="CriterionTypeEnum"
+        >
+          <el-select
+            disabled
+            v-model="form.CriterionTypeEnum"
+            clearable
+            class="mr"
+          >
             <el-option
               v-for="item of $d.CriterionType"
               :key="`CriterionType${item.label}`"
@@ -126,7 +216,10 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListCN')"
+          prop="IsEnable"
+        >
           <el-upload
             class="upload-demo"
             action
@@ -143,7 +236,10 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListEN')"
+          prop="IsEnable"
+        >
           <el-upload
             class="upload-demo"
             action
@@ -160,41 +256,62 @@
         </el-form-item>
       </el-col>
     </el-row>
-<!--    <el-form-item label="邮件内容模版（CN）" prop="EmailHtmlContentCN">-->
-<!--      <el-input-->
-<!--        v-model="form.EmailHtmlContentCN"-->
-<!--        type="textarea"-->
-<!--        disabled-->
-<!--        :autosize="{ minRows: 8, maxRows: 8}"-->
-<!--      />-->
-<!--    </el-form-item>-->
-<!--    <el-form-item label="邮件内容模版（EN）" prop="EmailHtmlContent">-->
-<!--      <el-input-->
-<!--        v-model="form.EmailHtmlContent"-->
-<!--        type="textarea"-->
-<!--        disabled-->
-<!--        :autosize="{ minRows: 8, maxRows: 8}"-->
-<!--      />-->
-<!--    </el-form-item>-->
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;padding-bottom: 10px">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" @click="handleSave"> {{ $t('common:button:save') }}</el-button>
+    <!--    <el-form-item label="邮件内容模版（CN）" prop="EmailHtmlContentCN">-->
+    <!--      <el-input-->
+    <!--        v-model="form.EmailHtmlContentCN"-->
+    <!--        type="textarea"-->
+    <!--        disabled-->
+    <!--        :autosize="{ minRows: 8, maxRows: 8}"-->
+    <!--      />-->
+    <!--    </el-form-item>-->
+    <!--    <el-form-item label="邮件内容模版（EN）" prop="EmailHtmlContent">-->
+    <!--      <el-input-->
+    <!--        v-model="form.EmailHtmlContent"-->
+    <!--        type="textarea"-->
+    <!--        disabled-->
+    <!--        :autosize="{ minRows: 8, maxRows: 8}"-->
+    <!--      />-->
+    <!--    </el-form-item>-->
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
+      <el-form-item style="text-align: right">
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}</el-button
+        >
       </el-form-item>
     </div>
-    <el-dialog append-to-body :title="$t('trials:emailManageCfg:button:generate')" :visible.sync="showCron">
-      <vcrontab @hide="showCron=false" @fill="crontabFill" :expression="expression"></vcrontab>
+    <el-dialog
+      append-to-body
+      :title="$t('trials:emailManageCfg:button:generate')"
+      :visible.sync="showCron"
+    >
+      <vcrontab
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></vcrontab>
     </el-dialog>
   </el-form>
 </template>
 <script>
-import { Upload, addOrUpdateTrialEmailNoticeConfig, getTrialUserIdSelectList } from '@/api/dictionary'
+import {
+  Upload,
+  addOrUpdateTrialEmailNoticeConfig,
+  getTrialUserIdSelectList,
+} from '@/api/dictionary'
+import vcrontab from 'vcrontab'
 export default {
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {}
+      },
+    },
   },
+  components: { vcrontab },
   data() {
     return {
       expression: '',
@@ -232,14 +349,30 @@ export default {
       },
       rules: {
         Code: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        BusinessScenarioEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailTopicCN:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailTopic:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        BusinessLevelEnum:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        ToUserTypeList: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailCron: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailHtmlContentCN: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailHtmlContent: [{ required: true, message: 'Please select', trigger: ['blur'] }],
+        BusinessScenarioEnum: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailTopicCN: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailTopic: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        BusinessLevelEnum: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        ToUserTypeList: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailCron: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailHtmlContentCN: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailHtmlContent: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
       },
       scenarioOption: [],
       fileListCN: [],
@@ -248,7 +381,7 @@ export default {
       trialId: this.$route.query.trialId,
       UserList: [],
       Interval: 1,
-      IntervalShow: true
+      IntervalShow: true,
     }
   },
   mounted() {
@@ -265,11 +398,11 @@ export default {
       this.form.EmailCron = text
     },
     showDialog() {
-      this.expression = this.form.EmailCron;//传入的 cron 表达式，可以反解析到 UI 上
-      this.showCron = true;
+      this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
+      this.showCron = true
     },
     crontabFill(value) {
-      this.form.EmailCron = value;
+      this.form.EmailCron = value
     },
     handleRemoveFileCN() {
       this.form.AttachNameCN = null
@@ -292,10 +425,14 @@ export default {
       const formData = new FormData()
       formData.append('file', param.file)
       this.form.AttachNameCN = param.file.name
-      Upload(formData, 3).then(res => {
+      Upload(formData, 3).then((res) => {
         this.form.AttachCNPath = res.Result.FilePath
         this.btnLoading = false
-        this.fileListCN[0] = { name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath }
+        this.fileListCN[0] = {
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+        }
       })
     },
     handleUploadFileEN(param) {
@@ -303,10 +440,14 @@ export default {
       const formData = new FormData()
       formData.append('file', param.file)
       this.form.AttachName = param.file.name
-      Upload(formData, 3).then(res => {
+      Upload(formData, 3).then((res) => {
         this.form.AttachPath = res.Result.FilePath
         this.btnLoading = false
-        this.fileListEN[0] = { name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath }
+        this.fileListEN[0] = {
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+        }
       })
     },
     handleRemoveFileEN() {
@@ -333,10 +474,20 @@ export default {
           this.form[k] = this.data[k]
         }
         if (k === 'AttachPath' && this.form[k]) {
-          this.fileListEN.push({ name: this.data.AttachName, path: this.data.AttachPath, fullPath: this.data.AttachPath, url: this.data.AttachPath })
+          this.fileListEN.push({
+            name: this.data.AttachName,
+            path: this.data.AttachPath,
+            fullPath: this.data.AttachPath,
+            url: this.data.AttachPath,
+          })
         }
         if (k === 'AttachCNPath' && this.form[k]) {
-          this.fileListCN.push({ name: this.data.AttachNameCN, path: this.data.AttachCNPath, fullPath: this.data.AttachCNPath, url: this.data.AttachCNPath })
+          this.fileListCN.push({
+            name: this.data.AttachNameCN,
+            path: this.data.AttachCNPath,
+            fullPath: this.data.AttachCNPath,
+            url: this.data.AttachCNPath,
+          })
         }
         if (k === 'EmailCron' && this.form[k]) {
           let a = this.form[k].split(' ')
@@ -347,7 +498,7 @@ export default {
           }
         }
       }
-      getTrialUserIdSelectList(this.form.Id).then(res => {
+      getTrialUserIdSelectList(this.form.Id).then((res) => {
         this.UserList = res.Result
       })
       console.log(this.fileListEN, this.fileListCN)
@@ -356,20 +507,22 @@ export default {
 
     // 保存
     handleSave() {
-      this.$refs.emailForm.validate(valid => {
+      this.$refs.emailForm.validate((valid) => {
         if (!valid) return
         this.loading = true
         this.form.TrialId = this.trialId
-        addOrUpdateTrialEmailNoticeConfig(this.form).then(res => {
-          this.loading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }).catch(() => {
-          this.loading = false
-        })
+        addOrUpdateTrialEmailNoticeConfig(this.form)
+          .then((res) => {
+            this.loading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
+          .catch(() => {
+            this.loading = false
+          })
       })
-    }
-  }
+    },
+  },
 }
 </script>

src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue

@@ -13,7 +13,7 @@
       {{ language === "en" ? question.GroupEnName : question.GroupName }}
     </div>
     <div
-      v-if="question.Type === 'table'"
+      v-if="question.Type === 'table' || question.Type === 'basicTable'"
       style="font-weight: bold; font-size: 14px; margin: 5px 0px"
     >
       <div style="display: flex; justify-content: space-between">
@@ -23,7 +23,7 @@
           {{ $t("trials:readingUnit:qsList:title:add") }}
         </el-button>
       </div>
-      <el-table :data="questionForm[question.Id]">
+      <el-table :data="question.TableQuestions.Answers">
         <el-table-column
           v-for="item of question.TableQuestions.Questions"
           :key="item.Id"
@@ -235,7 +235,7 @@
         <el-upload
           v-if="question.Type === 'upload'"
           :action="accept"
-          :limit="question.ImageCount"
+          :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100"
           :on-preview="handlePictureCardPreview"
           :before-upload="handleBeforeUpload"
           :http-request="uploadScreenshot"
@@ -290,16 +290,16 @@
       v-if="
         question.Childrens &&
         question.Childrens.length > 0 &&
-        question.Type !== 'table'
+        (question.Type !== 'table' && question.Type !== 'basicTable') && Object.keys(questionForm).length > 0
       "
     >
       <QuestionFormItem
         v-for="item in question.Childrens"
         :key="item.Id"
+        :questionForm="questionForm"
         :question="item"
         :reading-task-state="readingTaskState"
         :is-system-criterion="isSystemCriterion"
-        :question-form="questionForm"
         :visit-task-id="visitTaskId"
         :criterion-id="criterionId"
         :calculation-list="calculationList"
@@ -328,8 +328,8 @@
           :visit-task-id="visitTaskId"
           :criterion-id="criterionId"
           @formItemTableNumberChange="formItemTableNumberChange"
-          @setFormItemData="setFormItemData"
-          @resetFormItemData="resetFormItemData"
+          @setFormItemData="setTblFormItemData"
+          @resetFormItemData="resetTblFormItemData"
         />
         <div
           class="base-dialog-footer"
@@ -369,21 +369,15 @@ export default {
   props: {
     questionForm: {
       type: Object,
-      default() {
-        return {};
-      },
+      required: true,
     },
     isSystemCriterion: {
       type: Boolean,
-      default() {
-        return false;
-      },
+      default: false
     },
     question: {
       type: Object,
-      default() {
-        return [];
-      },
+      required: true,
     },
     criterionId: {
       type: String,
@@ -505,9 +499,10 @@ export default {
         if (rules.CalculateQuestionList.length === 0) {
           return false;
         }
+        let dataArr = []
         rules.CalculateQuestionList.forEach((o, i) => {
           if (i === 0) {
-            if (rules.CustomCalculateMark > 4) {
+            if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
               switch (rules.CustomCalculateMark) {
                 case 5:
                   this.questionForm[o.QuestionId].forEach((q, qi) => {
@@ -558,6 +553,7 @@ export default {
               }
             } else {
               num = parseFloat(this.questionForm[o.TableQuestionId]);
+              dataArr.push(num)
             }
           } else {
             switch (rules.CustomCalculateMark) {
@@ -573,6 +569,26 @@ export default {
               case 4:
                 num /= parseFloat(this.questionForm[o.TableQuestionId]);
                 break;
+              case 10:
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                }
+                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
+                    return acc + (typeof curr === "number" ? curr : 0);
+                  }, 0) / dataArr.length;
+                break;
+              case 11:
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                }
+                num = Math.max(...dataArr);
+                break;
+              case 12:
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                }
+                num = Math.min(...dataArr);
+                break;
             }
           }
         });
@@ -587,8 +603,6 @@ export default {
           var find = v.CalculateQuestionList.filter((o) => {
             return o.QuestionId === questionId;
           });
-          // find的自动计算值number
-          console.log("find", find);
           if (find) {
             var num = this.logic(v);
             if (num !== false) {
@@ -613,7 +627,6 @@ export default {
       // this.$emit('formItemNumberChange')
     },
     formItemTableNumberChange() {
-      console.log(this.question.TableQuestions.Questions);
       this.question.TableQuestions.Questions.forEach((v) => {
         if (v.Type === "number" && v.DataSource === 1) {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions);
@@ -663,12 +676,16 @@ export default {
       });
     },
     openAddTableCol(row) {
-      this.addOrEdit.visible = true;
+      
       this.addOrEdit.title =
         row.QuestionName + this.$t("trials:readingUnit:qsList:title:tableQs"); // '表格问题'
       this.QuestionsList = row.TableQuestions.Questions;
       this.AnswersList = row.TableQuestions.Answers;
-      this.QuestionsForm = {};
+      row.TableQuestions.Questions.map(i=>{
+        this.$set(this.QuestionsForm, i.Id, null)
+      })
+      // this.QuestionsForm = {};
+      this.addOrEdit.visible = true;
     },
     getOrganInfoList() {
       var param = {
@@ -720,6 +737,12 @@ export default {
     setFormItemData(obj) {
       this.$emit("setFormItemData", obj);
     },
+    setTblFormItemData(obj) {
+      this.$set(this.QuestionsForm, obj.key, obj.val)
+    },
+    resetTblFormItemData(obj) {
+      this.$set(this.QuestionsForm, obj.key, null)
+    },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) {
         const loading = this.$loading({

src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue

@@ -101,6 +101,12 @@
         v-model="questionForm[question.Id]"
         disabled
       />
+      <!-- 自动计算 -->
+      <el-input
+        v-if="question.Type==='class'"
+        v-model="questionForm[question.Id]"
+        disabled
+      />
       <!-- 自增 -->
       <el-input
         v-if="question.Type==='increment'"
@@ -131,7 +137,7 @@
       <el-upload
         v-if="question.Type==='upload'"
         :action="accept"
-        :limit="question.ImageCount"
+        :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100"
         :on-preview="handlePictureCardPreview"
         :before-upload="handleBeforeUpload"
         :http-request="uploadScreenshot"
@@ -195,7 +201,7 @@ export default {
     question: {
       type: Object,
       default() {
-        return []
+        return {}
       }
     },
     criterionId: {
@@ -221,7 +227,8 @@ export default {
       urls: [],
       organList: [],
       QuestionsList: [],
-      QuestionsForm: {}
+      QuestionsForm: {},
+      timer: null
     }
   },
   computed: {
@@ -239,11 +246,31 @@ export default {
       deep: true,
       immediate: true,
       handler(v) {
-
+        // console.log(v)
       }
     }
   },
   mounted() {
+    if (this.question.Type === "class") {
+      this.ClassifyAlgorithmsList = JSON.parse(
+        this.question.ClassifyAlgorithms
+      );
+    }
+    this.timer = setInterval(() => {
+      if (this.question.Type === "class") {
+        if (this.questionForm[this.question.ClassifyTableQuestionId]) {
+          let o = this.ClassifyAlgorithmsList.find((v) => {
+            return (
+              this.questionForm[this.question.ClassifyTableQuestionId] >= v.gt &&
+              this.questionForm[this.question.ClassifyTableQuestionId] < v.lt
+            );
+          });
+          this.$emit('setFormItemData', { key: this.question.Id, val: o ? o.label : null })
+        } else {
+          this.$emit('setFormItemData', { key: this.question.Id, val: null })
+        }
+      }
+    }, 300);
     if (this.question.Type === 'upload') {
       if (this.questionForm[this.question.Id]) {
         this.urls = this.questionForm[this.question.Id].split('|')
@@ -253,15 +280,18 @@ export default {
         })
       }
     }
-    if (this.question.Type === 'number') {
-      this.$set(this.questionForm, this.question.Id, 0)
-    } else {
-      this.$set(this.questionForm, this.question.Id, '')
-    }
+    // if (this.question.Type === 'number') {
+    //   this.$set(this.questionForm, this.question.Id, 0)
+    // } else {
+    //   this.$set(this.questionForm, this.question.Id, null)
+    // }
     if (this.question.TableQuestionType === 1 && this.question.LesionType !== null) {
       this.getOrganInfoList()
     }
   },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
   methods: {
     save() {
     },
@@ -271,7 +301,6 @@ export default {
       this.QuestionsList = row.TableQuestions.Questions
       this.AnswersList = row.TableQuestions.Answers
       this.QuestionsForm = {}
-      console.log(this.QuestionsForm)
     },
     getOrganInfoList() {
       var param = {

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -16,13 +16,24 @@
           clearable
           @change="((val)=>{qsTypeChange(val, form)})"
         >
-          <el-option
-            v-for="item of $d.Criterion_Question_Type"
-            v-show="item.value !== 'calculation' && item.value !== 'increment'"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
+          <template v-if="isFromSystem">
+            <el-option
+              v-for="item of $d.Criterion_Question_Type"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="item of $d.Criterion_Question_Type"
+              v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table'"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          
         </el-select>
       </el-form-item>
       <!-- 分组名称 -->
@@ -65,53 +76,342 @@
           v-model="form.QuestionEnName"
         />
       </el-form-item>
-      <!-- 最大上传个数 -->
-      <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
-        <el-input-number
-          v-model="form.ImageCount"
-          controls-position="right"
-          :min="1"
-          :max="10"
-        />
-      </el-form-item>
-      <!-- 文件类型 -->
-      <el-form-item 
-        v-show="form.Type === 'upload'" 
-        :label="$t('trials:readingUnit:qsList:title:FileType')"
-        prop="FileType"
-        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      <!-- 公有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+      <!-- 分组 -->
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        :label="$t('trials:readingUnit:qsList:title:groupName')"
       >
-        <el-checkbox-group
-          v-model="form.FileType"
-          @change="(v) => {
-            if (v.includes('-1')) {
-              form.FileType = ['-1']
-            } else {
-            }
-          }"
+        <el-select
+          v-model="form.GroupId"
+          clearable
+          :disabled="isParentExistGroup"
         >
-          <el-checkbox
-            v-for="item of $d.fileType"
-            :key="`fileType${item.value}`"
-            :value="item.value + ''"
+          <el-option
+            v-for="group of groupOptions"
+            :key="group.GroupId"
+            :label="group.GroupName"
+            :value="group.GroupId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 是否显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion" v-if="form.Type !== 'group'">
+        <el-radio-group
+          v-model="form.ShowQuestion"
+          @change="((val)=>{isShowQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.ShowQuestion"
+            :key="`ShowQuestion${item.value}`"
             :label="item.value"
-            :disabled="form.FileType.includes('-1') && item.value !== '-1'"
           >
             {{ item.label }}
-          </el-checkbox>
-        </el-checkbox-group>
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否必填 -->
+      <el-form-item
+        v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary' || form.Type === 'class'"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+        <el-radio-group
+          v-model="form.IsRequired"
+          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+          @change="((val)=>{isRequiredChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.QuestionRequired"
+            :key="`QuestionRequired${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 显示时依赖父问题 -->
+      <el-form-item
+        v-if="form.ShowQuestion===1"
+        :label="$t('trials:readingUnit:qsList:title:parentId')"
+        prop="ParentId"
+      >
+        <el-select
+          v-model="form.ParentId"
+          clearable
+          @change="((val)=>{parentQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`ParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 显示时依赖父问题触发值 -->
+      <el-form-item v-if="form.ParentId && form.ShowQuestion===1"
+                    :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
+        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
+          <el-option
+            v-for="item of parentTriggerValOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value + ''"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 必填依赖父问题 -->
+      <el-form-item
+        v-if="form.Type !== 'group' && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
+        prop="RelevanceId"
+      >
+        <el-select
+          v-model="form.RelevanceId"
+          clearable
+          @change="((val)=>{relevanceQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`RelevanceId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 必填触发值 -->
+      <el-form-item
+        v-if="form.RelevanceId && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
+        prop="RelevanceValueList"
+      >
+        <el-select v-model="form.RelevanceValueList" clearable multiple>
+          <el-option
+            v-for="item of reParentTriggerValOptions"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value + ''"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 是否裁判问题 -->
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
+                    :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')">
+        <el-radio-group
+          v-model="form.IsJudgeQuestion"
+          @change="((val)=>{isJudgeQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'IsJudgeQuestion'+item.value"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 导出标识 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification">
+        <el-radio-group 
+          v-model="form.ExportIdentification"
+          @change="
+            (val) => {
+              form.ExportResult = []
+            }
+          "
+        >
+          <el-radio
+            v-for="item of $d.ExportIdentification"
+            :key="`ExportIdentification${item.value}`"
+            :label="item.value"
+            >{{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 导出结果 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-select v-model="form.ExportResult" multiple>
+          <el-option
+            v-for="item in $d.ExportResult"
+            :key="`ExportResult${item.value}`"
+            :label="item.value"
+            :value="item.label">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 限制显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:LimitShow')" v-if="form.Type !== 'group'">
+        <el-radio-group v-model="form.LimitShow" @change="(v) => {
+          if (v !== 0) {
+             form.LimitEdit = v
+          }
+        }">
+          <el-radio v-for="item of $d.LimitShow" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 限制编辑 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="!(form.Type === 'group' || form.Type === 'summary' || form.Type === 'table' || form.Type === 'basicTable')">
+        <el-radio-group v-model="form.LimitEdit" :disabled="form.LimitShow !== 0">
+          <el-radio v-for="item of $d.LimitEdit" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 全局阅片是否显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')">
+        <el-radio-group v-model="form.GlobalReadingShowType">
+          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{
+              item.label
+            }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否在影像页面显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" v-if="form.ShowQuestion !== 2">
+        <el-radio-group v-model="form.IsShowInDicom">
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'IsShowInDicom'+item.value"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 注释 -->
+      <el-form-item
+        :label="$t('trials:readingUnit:qsList:title:Remark')"
+        prop="Remark"
+      >
+        <el-input
+          v-model="form.Remark"
+        />
+      </el-form-item>
+      <!-- 序号 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
+        <el-input-number
+          v-model="form.ShowOrder"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        />
+      </el-form-item>
+      <!-- 私有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+      <!-- 选项类型 -->
+      <el-form-item
+        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation') && isFromSystem"
+        :label="$t('trials:readingUnit:label:QuestionGenre')"
+        prop="QuestionGenre"
+        :rules="[
+          { required: form.Type !== 'calculation', message: '请选择'}
+        ]"
+      >
+        <el-radio-group
+          v-model="form.QuestionGenre"
+          @change="((val)=>{questionGenreChange(val, form)})"
+        >
+          <el-radio
+            :label="-1"
+          >
+            {{ $i18n.locale === 'zh' ? '无' : 'None' }}
+          </el-radio>
+          <el-radio
+            v-for="item of $d.TableQuestionType"
+            v-show="item.value===0 || item.value===3"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="(!isFromSystem || (isFromSystem && form.QuestionGenre !== 3)) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class')"
+        :label="$t('trials:qcCfg:table:typeValue')"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          @change="typeValueChange"
+          :placeholder="$t('trials:qcCfg:message:typeValue')"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="form.QuestionGenre === 3 && isFromSystem"
+        :label="$t('trials:readingUnit:label:DictionaryCode')"
+        prop="DictionaryCode"
+      >
+        <el-select v-model="form.DictionaryCode" clearable @change="() => {form.DefaultValue = null}">
+          <el-option
+            v-for="item of dicList"
+            :key="item.Id"
+            :label="item.Code"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.QuestionGenre === 3 && (form.Type === 'select' || form.Type === 'radio')  && isFromSystem"
+        :label="$t('trials:qcCfg:table:typeValue')"
+      >
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+            :key="'TypeValue' + item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'number') && !isFromSystem"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-input
+          :disabled="form.DataSource === 1"
+          v-model="form.DefaultValue"
+        />
+      </el-form-item>
+      <!-- 高亮标记值 -->
+      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
       </el-form-item>
       <!-- 最大字符数 -->
       <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
                     :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')">
-        <el-input v-model="form.MaxAnswerLength"/>
-      </el-form-item>
-      <!-- 自增序号前缀 -->
-      <el-form-item v-if="form.Type === 'table'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
-        <el-input v-model="form.OrderMark"/>
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
       </el-form-item>
       <!-- 最大行数 -->
-      <el-form-item v-if="form.Type === 'table'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
         <el-input-number
           v-model="form.MaxQuestionCount"
           controls-position="right"
@@ -119,8 +419,12 @@
           :max="10"
         />
       </el-form-item>
+      <!-- 自增序号前缀 -->
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
+        <el-input v-model="form.OrderMark"/>
+      </el-form-item>
       <!-- 随访是否复制 -->
-      <el-form-item v-if="form.Type === 'table'" :label="$t('trials:readingUnit:qsList:title:isCopyLesions')">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:isCopyLesions')">
         <el-switch
           v-model="form.IsCopyLesions"
         />
@@ -214,7 +518,7 @@
             <div>
               <el-radio
                 v-for="item of $d.CustomCalculateMark"
-                v-show="item.value <= 4"
+                v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12"
                 :key="`CustomCalculateMark${item.value}`"
                 :label="item.value"
               >
@@ -224,7 +528,7 @@
             <div>
               <el-radio
                 v-for="item of $d.CustomCalculateMark"
-                v-show="item.value > 4"
+                v-show="item.value > 4 && item.value < 10"
                 :key="`CustomCalculateMark${item.value}`"
                 :label="item.value"
               >
@@ -257,13 +561,13 @@
           >
             <template slot-scope="scope">
               {{
-                scope.$index === 0 && [1, 2, 3, 4].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark)
+                scope.$index === 0 && [1, 2, 3, 4, 10, 11, 12].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark)
               }}
             </template>
           </el-table-column>
           <!-- 表格名称 -->
           <el-table-column
-            v-if="form.CustomCalculateMark > 4"
+            v-if="form.CustomCalculateMark > 4 && form.CustomCalculateMark < 10"
             :label="$t('trials:readingUnit:qsList:title:tableName')"
             prop="QuestionId"
             show-overflow-tooltip
@@ -296,7 +600,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="form.CustomCalculateMark <= 4"
+            v-if="form.CustomCalculateMark <= 4 || form.CustomCalculateMark >= 10"
             :label="$t('common:action:action')"
             prop="TableQuestionId"
             show-overflow-tooltip
@@ -325,49 +629,47 @@
         <div style="font-size: 12px;color:#666;padding: 0 15px 0;text-align: right">
           <!-- '请选择同级问题！': '请选择表格问题下的子问题！' -->
           <i class="el-icon-info"/>{{
-            [1, 2, 3, 4].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2')
+            [1, 2, 3, 4, 10, 11, 12].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2')
           }}
         </div>
       </div>
-      <!-- 选项类型 -->
-      <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation') && isFromSystem"
-        :label="$t('trials:readingUnit:label:QuestionGenre')"
-        prop="QuestionGenre"
-        :rules="[
-          { required: form.Type !== 'calculation', message: '请选择'}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.QuestionGenre"
-          @change="((val)=>{questionGenreChange(val, form)})"
-        >
-          <el-radio
-            :label="-1"
-          >
-            {{ $i18n.locale === 'zh' ? '无' : 'None' }}
-          </el-radio>
-          <el-radio
-            v-for="item of $d.TableQuestionType"
-            v-show="item.value===0 || item.value===3"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="(!isFromSystem || (isFromSystem && form.QuestionGenre !== 3)) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class')"
-        :label="$t('trials:qcCfg:table:typeValue')"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          @change="typeValueChange"
-          :placeholder="$t('trials:qcCfg:message:typeValue')"
+      <!-- 最大上传个数 -->
+      <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
+        <el-input-number
+          v-model="form.ImageCount"
+          controls-position="right"
+          :min="1"
+          :max="10"
         />
       </el-form-item>
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-show="form.Type === 'upload'" 
+        :label="$t('trials:readingUnit:qsList:title:FileType')"
+        prop="FileType"
+        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v.includes('-1')) {
+              form.FileType = ['-1']
+            } else {
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- 分类 -->
       <el-form-item
         v-if="form.Type === 'class'"
         :label="$t('trials:readingUnit:label:ClassifyQuestion')"
@@ -423,263 +725,6 @@
           </el-table>
         </div>
       </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3 && isFromSystem"
-        :label="$t('trials:readingUnit:label:DictionaryCode')"
-        prop="DictionaryCode"
-      >
-        <el-select v-model="form.DictionaryCode" clearable @change="() => {form.DefaultValue = null}">
-          <el-option
-            v-for="item of dicList"
-            :key="item.Id"
-            :label="item.Code"
-            :value="item.Code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3 && (form.Type === 'select' || form.Type === 'radio')  && isFromSystem"
-        :label="$t('trials:qcCfg:table:typeValue')"
-      >
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value.toString()"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
-      >
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-            :key="'TypeValue' + item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="(form.Type === 'number') && !isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
-      >
-        <el-input
-          :disabled="form.DataSource === 1"
-          v-model="form.DefaultValue"
-        />
-      </el-form-item>
-      <!-- 分组 -->
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        :label="$t('trials:readingUnit:qsList:title:groupName')"
-      >
-        <el-select
-          v-model="form.GroupId"
-          clearable
-          :disabled="isParentExistGroup"
-        >
-          <el-option
-            v-for="group of groupOptions"
-            :key="group.GroupId"
-            :label="group.GroupName"
-            :value="group.GroupId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 是否显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
-        <el-radio-group
-          v-model="form.ShowQuestion"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.ShowQuestion"
-            :key="`ShowQuestion${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 是否必填 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'summary' || form.Type === 'class'"
-        :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-        <el-radio-group
-          v-model="form.IsRequired"
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-          @change="((val)=>{isRequiredChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.QuestionRequired"
-            :key="`QuestionRequired${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 显示时依赖父问题 -->
-      <el-form-item
-        v-if="form.ShowQuestion===1"
-        :label="$t('trials:readingUnit:qsList:title:parentId')"
-        prop="ParentId"
-      >
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`ParentId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ShowQuestion===1"
-                    :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
-        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value + ''"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 必填依赖父问题 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-        prop="RelevanceId"
-      >
-        <el-select
-          v-model="form.RelevanceId"
-          clearable
-          @change="((val)=>{relevanceQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 必填触发值 -->
-      <el-form-item
-        v-if="form.RelevanceId && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-        prop="RelevanceValueList"
-      >
-        <el-select v-model="form.RelevanceValueList" clearable multiple>
-          <el-option
-            v-for="item of reParentTriggerValOptions"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value + ''"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 高亮标记值 -->
-      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
-        <el-select v-model="form.HighlightAnswerList" clearable multiple>
-          <template v-if="form.TypeValue">
-            <el-option
-              v-for="item of form.TypeValue.split('|')"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </template>
-          <template v-else-if="form.DictionaryCode">
-            <el-option
-              v-for="item of $d[form.DictionaryCode]"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </template>
-        </el-select>
-      </el-form-item>
-      <!-- 序号 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-          :max="1000"
-        />
-      </el-form-item>
-      <!-- 是否在影像页面显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" v-if="form.ShowQuestion !== 2">
-        <el-radio-group v-model="form.IsShowInDicom">
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="'IsShowInDicom'+item.value"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 是否裁判问题 -->
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
-                    :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')">
-        <el-radio-group
-          v-model="form.IsJudgeQuestion"
-          @change="((val)=>{isJudgeQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="'IsJudgeQuestion'+item.value"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 限制显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:LimitShow')">
-        <el-radio-group v-model="form.LimitShow" @change="(v) => {
-          if (v !== 0) {
-             form.LimitEdit = v
-          }
-        }">
-          <el-radio v-for="item of $d.LimitShow" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 限制编辑 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')">
-        <el-radio-group v-model="form.LimitEdit" :disabled="form.LimitShow !== 0">
-          <el-radio v-for="item of $d.LimitEdit" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 全局阅片是否显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')">
-        <el-radio-group v-model="form.GlobalReadingShowType">
-          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{
-              item.label
-            }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        :label="$t('trials:readingUnit:qsList:title:Remark')"
-        prop="Remark"
-      >
-        <!-- 选项请用‘|’分割多个选项 -->
-        <el-input
-          v-model="form.Remark"
-        />
-      </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item v-if="!isLook">
@@ -797,14 +842,16 @@ export default {
         OrderMark: null,
         MaxQuestionCount: null,
         IsCopyLesions: false,
-        MaxAnswerLength: null,
+        MaxAnswerLength: 500,
         FileType: [],
         DictionaryCode: null,
         GroupId: null,
         ClassifyQuestionId: null,
         ClassifyAlgorithms: null,
         LimitShow: 0,
-        HighlightAnswerList: []
+        HighlightAnswerList: [],
+        ExportIdentification: 0,
+        ExportResult: []
         // IsEnable: true
       },
       rules: {
@@ -831,7 +878,13 @@ export default {
           trigger: ['blur', 'change']
         }],
         GroupName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
-          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}]
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
+        ExportIdentification: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        ],
+        ExportResult: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        ]
       },
       loading: false,
       dicList: [],
@@ -859,6 +912,7 @@ export default {
   },
   methods: {
     typeValueChange(v) {
+      this.form.DefaultValue = null
       var list = v.split('|')
       this.form.ClassifyAlgorithms = null
       var arr = Object.assign([], this.ClassifyAlgorithmsList)
@@ -893,7 +947,8 @@ export default {
     },
     CustomCalculateMarkChange() {
       this.isShow = false
-      if (this.form.CustomCalculateMark <= 4) {
+      if (this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) {
+        console.log('1111')
         this.form.CalculateQuestions = [
           {
             IsTable: false,
@@ -931,6 +986,14 @@ export default {
       })
     },
     async initForm() {
+      // this.Questions = await getCalculateQuestions({
+      //   QuestionId: this.trialCriterionId,
+      //   type: 'number'
+      // })
+      // this.tableQuestions = await getCalculateQuestions({
+      //   QuestionId: this.trialCriterionId,
+      //   type: 'table'
+      // })
       await this.getGroupOptions()
       await this.getParentQuestions()
       await this.getLesionType()

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue

@@ -63,7 +63,6 @@ export default {
   mounted() {
     this.getQuestionCalculateRelation()
     this.getCustomTableQuestionPreview()
-    console.log('qp', this.isSystemCriterion)
   },
   methods: {
     getQuestionCalculateRelation() {

src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue

@@ -374,6 +374,7 @@
             v-for="item of $d.ImageDownloadEnum"
             :key="item.id"
             :label="item.value"
+            :disabled="(form.IsReadingTaskViewInOrder === 1 || form.IsReadingTaskViewInOrder === 0) && item.value === 1"
           >
             {{ item.label }}
           </el-radio>
@@ -395,6 +396,7 @@
             v-for="item of $d.ImageUploadEnum"
             :key="item.id"
             :label="item.value"
+            :disabled="(form.IsReadingTaskViewInOrder === 1 || form.IsReadingTaskViewInOrder === 0) && item.value === 1"
           >
             {{ item.label }}
           </el-radio>

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -6,9 +6,10 @@
     size="small"
     :rules="rules"
     :disabled="type === 'look'"
-    label-width="120px"
+    label-width="130px"
   >
     <div class="base-dialog-body">
+      <!-- 类型 -->
       <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
         <el-select
           v-model="form.Type"
@@ -17,7 +18,7 @@
         >
           <template v-for="item of $d.Criterion_Question_Type">
             <el-option
-              v-if="item.value !== 'calculation' && item.value !== 'increment'&& item.value !== 'table'&& item.value !== 'group'"
+              v-if="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group'"
               :key="item.value"
               :value="item.value"
               :label="item.label"
@@ -25,15 +26,7 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'group'"
-        :label="$t('trials:readingUnit:qsList:title:groupName')"
-        prop="GroupName"
-      >
-        <el-input
-          v-model="form.GroupName"
-        />
-      </el-form-item>
+      <!-- 问题名称 -->
       <el-form-item
         v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
@@ -43,6 +36,7 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
+      <!-- 问题名称（EN） -->
       <el-form-item
         v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
@@ -52,24 +46,145 @@
           v-model="form.QuestionEnName"
         />
       </el-form-item>
-      <!--      <el-form-item v-if="form.Type === 'number'" label="问题数据来源" prop="DataSource">-->
-      <!--        <el-radio-group-->
-      <!--          v-model="form.DataSource"-->
-      <!--        >-->
-      <!--          <el-radio-->
-      <!--            v-for="item of $d.DataSource"-->
-      <!--            :key="`DataSource${item.value}`"-->
-      <!--            :label="item.value"-->
-      <!--          >-->
-      <!--            {{ item.label }}-->
-      <!--          </el-radio>-->
-      <!--        </el-radio-group>-->
-      <!--      </el-form-item>-->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:PrecopyValue')">
+      <!-- 公有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+      <!-- 是否显示 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isEnable')" prop="ShowQuestion">
+        <el-radio-group
+          v-model="form.ShowQuestion"
+          @change="((val)=>{isShowQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.ShowQuestion"
+            :key="`ShowQuestion${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否必填 -->
+      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'summary'" :label="$t('trials:qcCfg:table:isRequired')" prop="IsRequired">
+        <el-radio-group
+          v-model="form.IsRequired"
+          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+          @change="((val)=>{isRequiredChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.QuestionRequired"
+            :key="`QuestionRequired${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 显示时依赖父问题 -->
+      <el-form-item
+        v-if="form.ShowQuestion===1"
+        :label="$t('trials:readingUnit:qsList:title:parentId')"
+        prop="ParentId"
+      >
+        <el-select
+          v-model="form.ParentId"
+          clearable
+          @change="((val)=>{parentQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`ParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 显示时依赖父问题触发值 -->
+      <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValueList">
+        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
+          <el-option
+            v-for="item of parentTriggerValOptions"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 父问题 -->
+      <el-form-item
+        v-if="form.Type !== 'group' && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
+        prop="RelevanceId"
+      >
+        <el-select
+          v-model="form.RelevanceId"
+          clearable
+          @change="((val)=>{relevanceQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`RelevanceId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 必填依赖的父问题触发值 -->
+      <el-form-item
+        v-if="form.RelevanceId && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
+        prop="RelevanceValueList"
+      >
+        <el-select v-model="form.RelevanceValueList" clearable multiple>
+          <el-option
+            v-for="item of reParentTriggerValOptions"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 限制编辑 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'">
+        <el-radio-group v-model="form.LimitEdit">
+          <el-radio v-for="item of $d.LimitEdit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否复制前值 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:PrecopyValue')" v-if="form.Type !== 'summary'">
         <el-switch
           v-model="form.IsCopy"
         />
       </el-form-item>
+      <!-- 注释 -->
+      <el-form-item
+        :label="$t('trials:readingUnit:qsList:title:Remark')"
+        prop="Remark"
+      >
+        <el-input
+          v-model="form.Remark"
+        />
+      </el-form-item>
+      <!-- 序号 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
+        <el-input-number
+          v-model="form.ShowOrder"
+          controls-position="right"
+          :min="0"
+        />
+      </el-form-item>
+      <!-- 重复出现最大次数 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:MaxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <el-input-number
+          v-model="form.MaxRowCount"
+          controls-position="right"
+          :min="0"
+          :max="10"
+        />
+      </el-form-item>
+
+
+      <!-- 私有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
       <!-- 问题数据来源 -->
       <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
                     prop="DataSource">
@@ -85,6 +200,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 数值类型 -->
       <el-form-item
         v-if="form.Type === 'number'"
         :label="$t('trials:readingUnit:qsList:title:valueType')"
@@ -107,6 +223,7 @@
         </template>
         </el-radio-group>
       </el-form-item>
+
       <el-form-item
         v-if="form.Type === 'number' && form.ValueType === 1"
         :label="$t('trials:readingUnit:qsList:title:digitPlaces')"
@@ -117,6 +234,7 @@
       >
         <el-input :value="$fd('DigitPlaces', digitPlaces).toString()" :disabled="true" />
       </el-form-item>
+      <!-- 单位 -->
       <el-form-item
         v-if="form.Type === 'number'"
         :label="$t('trials:readingUnit:qsList:title:unit')"
@@ -131,7 +249,7 @@
           <el-radio v-for="item of $d.ValueUnit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <!-- 数值单位 -->
+      <!-- 自定义单位 -->
       <el-form-item
         v-if="form.Type === 'number' && form.Unit === 4"
         :label="$t('trials:readingUnit:qsList:title:customUnit')"
@@ -259,34 +377,38 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-if="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation')"
+        v-if="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class')"
         :label="$t('trials:readingUnit:qsList:title:typeValue')"
         prop="TypeValue"
       >
         <el-input
           v-model="form.TypeValue"
           :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
+          @change="typeValueChange"
         />
       </el-form-item>
-      <!-- 关联表 -->
-      <!-- <el-form-item
-        v-if="form.TableQuestionType === 1"
-        label="关联表"
-        prop="DataTableName"
+      <el-form-item
+        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
-        <el-select
-          v-model="form.DataTableName"
-          clearable
-          @change="((val)=>{dataTableNameChange(val, form)})"
-        >
+        <el-select v-model="form.DefaultValue" clearable>
           <el-option
-            v-for="item of tblOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
+            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+            :key="'TypeValue' + item"
+            :label="item"
+            :value="item"
           />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'number') && !isFromSystem"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-input
+          :disabled="form.DataSource === 1"
+          v-model="form.DefaultValue"
+        />
+      </el-form-item>
       <el-form-item
         v-if="form.TableQuestionType === 2 && isFromSystem"
         :label="$t('trials:readingUnit:qsList:title:DependParentId')"
@@ -333,106 +455,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isEnable')" prop="ShowQuestion">
-        <el-radio-group
-          v-model="form.ShowQuestion"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.ShowQuestion"
-            :key="`ShowQuestion${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table'" :label="$t('trials:qcCfg:table:isRequired')" prop="IsRequired">
-        <el-radio-group
-          v-model="form.IsRequired"
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-          @change="((val)=>{isRequiredChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.QuestionRequired"
-            :key="`QuestionRequired${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 显示时依赖父问题 -->
-      <el-form-item
-        v-if="form.ShowQuestion===1"
-        :label="$t('trials:readingUnit:qsList:title:parentId')"
-        prop="ParentId"
-      >
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`ParentId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValueList">
-        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 父问题 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-        prop="RelevanceId"
-      >
-        <el-select
-          v-model="form.RelevanceId"
-          clearable
-          @change="((val)=>{relevanceQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 必填依赖的父问题触发值 -->
-      <el-form-item
-        v-if="form.RelevanceId && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-        prop="RelevanceValueList"
-      >
-        <el-select v-model="form.RelevanceValueList" clearable multiple>
-          <el-option
-            v-for="item of reParentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
+      
       <!-- 高亮标记值 -->
-      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
           <template v-if="form.TypeValue">
             <el-option
               v-for="item of form.TypeValue.split('|')"
-              :key="item"
+              :key="'HighlightAnswerList' + item"
               :label="item"
               :value="item"
             />
@@ -447,26 +477,97 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-        />
+      <!-- 最大字符数 -->
+      <el-form-item 
+        v-if="form.Type === 'input' || form.Type === 'textarea'"
+        :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
+      >
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:MaxRowCount')">
-        <el-input-number
-          v-model="form.MaxRowCount"
-          controls-position="right"
-          :min="0"
-          :max="10"
-        />
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-show="form.Type === 'upload'" 
+        :label="$t('trials:readingUnit:qsList:title:FileType')"
+        prop="FileType"
+        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v.includes('-1')) {
+              form.FileType = ['-1']
+            } else {
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')">
-        <el-radio-group v-model="form.LimitEdit">
-          <el-radio v-for="item of $d.LimitEdit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
-        </el-radio-group>
+      <!-- 分类 -->
+      <el-form-item
+        v-if="form.Type === 'class'"
+        :label="$t('trials:readingUnit:label:ClassifyQuestion')"
+        prop="ClassifyTableQuestionId"
+      >
+        <el-select v-model="form.ClassifyTableQuestionId" clearable>
+          <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
+                     :value="item.QuestionId"/>
+        </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'class'"
+        :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
+        prop="ClassifyAlgorithms"
+      >
+        <div>
+          <el-table
+            ref="CalculateTable"
+            :data="ClassifyAlgorithmsList"
+            style="margin: 10px;width: calc(100% - 20px)"
+            size="small"
+          >
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:label')"
+              show-overflow-tooltip
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.label }}
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:gt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.gt"></el-input-number>
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:lt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.lt"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-form-item>
+      
     </div>
     <div v-if="type !== 'look'" class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <!-- 取消 -->
@@ -534,6 +635,7 @@ export default {
       }
     }
     return {
+      ClassifyAlgorithmsList: [],
       form: {
         Id: '',
         ReadingQuestionId: '',
@@ -554,6 +656,7 @@ export default {
         DictionaryCode: '',
         TableQuestionType: null,
         MaxRowCount: null,
+        FileType: [],
         DependParentId: '',
         QuestionMark: null,
         CalculateQuestions: [],
@@ -566,7 +669,10 @@ export default {
         LimitEdit: 0,
         DefaultValue: null,
         IsCopy: false,
-        HighlightAnswerList: []
+        HighlightAnswerList: [],
+        MaxAnswerLength: 0,
+        ClassifyTableQuestionId: null,
+        ClassifyAlgorithms: null,
         // IsEnable: true
       },
       rules: {
@@ -642,6 +748,19 @@ export default {
         TableQuestionId: null
       })
     },
+    typeValueChange(v) {
+      this.form.DefaultValue = null
+      var list = v.split('|')
+      this.form.ClassifyAlgorithms = null
+      var arr = Object.assign([], this.ClassifyAlgorithmsList)
+      this.ClassifyAlgorithmsList = list.map((res, i) => {
+        return {
+          label: res,
+          lt: arr[i] ? arr[i].lt : 0,
+          gt: arr[i] ? arr[i].gt : 0
+        }
+      })
+    },
     CustomCalculateMarkChange() {
       if (this.form.CustomCalculateMark <= 4) {
         this.form.CalculateQuestions = [
@@ -684,6 +803,12 @@ export default {
           if (k === 'CalculateQuestions') {
             this.form[k] = JSON.parse(this.data[k])
             console.log('CalculateQuestions', this.form[k])
+          } else if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+            this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+          } else if(k === 'FileType'){
+            if (this.data[k]){
+              this.form[k] = this.data[k].split(',')
+            }
           } else {
             if (this.data.hasOwnProperty(k)) {
               this.form[k] = this.data[k]
@@ -740,6 +865,7 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        this.form.ClassifyAlgorithms = JSON.stringify(this.ClassifyAlgorithmsList)
         if(this.form.QuestionName && this.$i18n.locale === 'zh'){
           this.form.QuestionEnName = this.form.QuestionName;
         }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
@@ -750,6 +876,10 @@ export default {
         params.ReadingQuestionId = this.readingQuestionId
         params.TrialCriterionId = this.criterionId
         params.CalculateQuestions = JSON.stringify(this.form.CalculateQuestions)
+        if (this.form.Type !== 'upload') {
+          this.form.ImageCount = 0
+        }
+        params.FileType = this.form.FileType.join(',')
         addOrUpdateReadingTableQuestionTrial(params).then(res => {
           this.$emit('getList')
           this.loading = false

src/views/trials/trials-panel/trial-summary/download-monitor/index.vue

@@ -82,13 +82,14 @@
             {{ $t('common:button:reset') }}
           </el-button>
           <!--导出-->
-          <!-- <el-button
+          <el-button
             type="primary"
             icon="el-icon-download"
+            :disabled="list.length <= 0"
             @click="handleExport"
           >
             {{ $t('common:button:export') }}
-          </el-button> -->
+          </el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -263,6 +264,7 @@
 import { getTrialDownloadList } from '@/api/load'
 import Pagination from '@/components/Pagination'
 import BaseContainer from '@/components/BaseContainer'
+import { getTrialDownloadList_Export } from '@/api/export'
 const searchDataDefault = () => {
   return {
     SortField: 'DownloadStartTime',
@@ -352,6 +354,14 @@ export default {
         this.searchData.DownloadEndTime = ''
       }
     },
+    // 导出
+    async handleExport() {
+      try {
+        return getTrialDownloadList_Export(this.searchData)
+      } catch (err) {
+        consol.log(err)
+      }
+    },
   },
 }
 </script>

src/views/trials/trials-panel/trial-summary/image-inspect/index.vue

@@ -92,7 +92,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -100,7 +100,16 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
+          </el-button>
+          <!--导出-->
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            :disabled="list.length <= 0"
+            @click="handleExport"
+          >
+            {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -155,7 +164,7 @@
           min-width="90"
           show-overflow-tooltip
           ><template slot-scope="scope">
-            {{ scope.row.CalledAEList.join(", ") }}
+            {{ scope.row.CalledAEList.join(', ') }}
           </template>
         </el-table-column>
         <!--发送端AE-->
@@ -166,7 +175,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
+            {{ scope.row.CallingAEList.join(', ') }}
           </template>
         </el-table-column>
         <!--检查-->
@@ -240,11 +249,12 @@ import {
   getPatientList,
   getDicomCalledAEList,
   getDicomCallingAEList,
-} from "@/api/trials";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
-import viewStudy from "./components/view-study";
+} from '@/api/trials'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import moment from 'moment'
+import viewStudy from './components/view-study'
+import { getPatientList_Export } from '@/api/export'
 const searchDataDefault = () => {
   return {
     PatientIdStr: null,
@@ -258,9 +268,9 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: "LatestPushTime",
-  };
-};
+    SortField: 'LatestPushTime',
+  }
+}
 export default {
   components: { BaseContainer, Pagination, viewStudy },
   data() {
@@ -275,33 +285,33 @@ export default {
       callingAEList: [],
       visible: false,
       selectPatient: {},
-    };
+    }
   },
   created() {
-    this.getCalledAEList();
-    this.getCallingAEList();
+    this.getCalledAEList()
+    this.getCallingAEList()
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 打开弹框
     handleOpenDialog(item) {
-      this.visible = true;
-      this.selectPatient = item;
+      this.visible = true
+      this.selectPatient = item
     },
     // 获取接收端AE列表
     async getCalledAEList() {
       try {
         let params = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCalledAEList(params);
+        }
+        let res = await getDicomCalledAEList(params)
         if (res.IsSuccess) {
-          this.calledAEList = res.Result;
+          this.calledAEList = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 获取发送端端AE列表
@@ -309,60 +319,68 @@ export default {
       try {
         let params = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCallingAEList(params);
+        }
+        let res = await getDicomCallingAEList(params)
         if (res.IsSuccess) {
-          this.callingAEList = res.Result;
+          this.callingAEList = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.$route.query.trialId
       getPatientList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.BeginPushTime = val[0];
-        this.searchData.EndPushTime = val[1];
+        this.searchData.BeginPushTime = val[0]
+        this.searchData.EndPushTime = val[1]
       } else {
-        this.searchData.BeginPushTime = "";
-        this.searchData.EndPushTime = "";
+        this.searchData.BeginPushTime = ''
+        this.searchData.EndPushTime = ''
       }
     },
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 重置列表查询
     handleReset() {
-      this.datetimerange = null;
-      this.handleDatetimeChange();
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.datetimerange = null
+      this.handleDatetimeChange()
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 导出
+    async handleExport() {
+      try {
+        return getPatientList_Export(this.searchData)
+      } catch (err) {
+        consol.log(err)
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
     },
   },
-};
+}
 </script>
   

src/views/trials/trials-panel/trial-summary/push-record/index.vue

@@ -75,6 +75,15 @@
           >
             {{ $t('common:button:reset') }}
           </el-button>
+          <!--导出-->
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            :disabled="list.length <= 0"
+            @click="handleExport"
+          >
+            {{ $t('common:button:export') }}
+          </el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -208,6 +217,7 @@ import {
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import moment from 'moment'
+import { getSCPImageUploadList_Export } from '@/api/export'
 const searchDataDefault = () => {
   return {
     CallingAE: null,
@@ -315,6 +325,14 @@ export default {
       this.searchData.PageIndex = 1
       this.getList()
     },
+    // 导出
+    async handleExport() {
+      try {
+        return getSCPImageUploadList_Export(this.searchData)
+      } catch (err) {
+        consol.log(err)
+      }
+    },
   },
 }
 </script>