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

src/api/reviewers.js

@@ -304,9 +304,9 @@ export function addOrUpdateDoctorBasicInfoAndEmployment(param) {
   })
 }
 // 新增或编辑概述
-export function updateGneralSituation(param) {
+export function addOrUpdateGneralSituation(param) {
   return request({
-    url: `/Doctor/updateGneralSituation`,
+    url: `/Doctor/addOrUpdateGneralSituation`,
     method: 'post',
     data: param
   })
@@ -342,4 +342,28 @@ export function getIsVacation(param) {
     method: 'post',
     data: param
   })
+}
+// 获取概述
+export function getSummarizeInfo(param) {
+  return request({
+    url: `/Doctor/getSummarizeInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除概述
+export function deleteSummarizeInfo(param) {
+  return request({
+    url: `/Doctor/deleteSummarizeInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// pm通过邮箱新建或查询简历
+export function useEmialGetDoctorInfo(param) {
+  return request({
+    url: `/TrialSiteSurvey/useEmialGetDoctorInfo`,
+    method: 'post',
+    data: param
+  })
 }

src/api/trials.js

@@ -286,10 +286,11 @@ export function trialSiteUserSummaryListExport(param) {
   })
 }
 
-export function getVisitStageList(trialId) {
+export function getVisitStageList(data) {
   return request({
-    url: `/visitPlan/getVisitStageList/${trialId}`,
-    method: 'get'
+    url: `/visitPlan/getVisitStageList`,
+    method: 'post',
+    data
   })
 }
 
@@ -3905,4 +3906,12 @@ export function setTaskValid(data) {
     method: 'post',
     data
   })
+}
+//  一致性分析临床数据设置任务为有效
+export function getVisitClinicalDataName(data) {
+  return request({
+    url: `/ReadingClinicalData/getVisitClinicalDataName`,
+    method: 'post',
+    data
+  })
 }

src/components/BaseModel/index.vue

@@ -8,10 +8,11 @@
       :visible.sync="config.visible"
       :close-on-click-modal="false"
       :show-close="config.showClose"
+      :top="config.top"
       :width="config.width"
       :fullscreen="config.fullscreen"
     >
-      <div class="base-modal-body">
+      <div class="base-modal-body" :style="config.bodyStyle">
         <slot name="dialog-body" />
       </div>
       <div slot="footer" class="base-modal-footer">
@@ -22,24 +23,26 @@
 </template>
 <script>
 export default {
-  name: "BaseDialog",
+  name: 'BaseDialog',
   props: {
     config: {
       type: Object,
       default: () => {
         return {
           visible: false,
-          title: "",
+          title: '',
           closeOnClickModal: false,
           showClose: true,
           appendToBody: false,
-          width: "100px",
+          width: '100px',
           fullscreen: false,
-        };
+          top: '15vh',
+          bodyStyle: '',
+        }
       },
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .base-model-wrapper {

src/components/Dicom/DicomTags.vue

@@ -108,7 +108,7 @@ export default {
     dumpDataSet(dataSet, output) {
       try {
         for (const propertyName in dataSet.elements) {
-          const elementObject = {}
+          const elementObject = {} 
           const element = dataSet.elements[propertyName]
           const tag = this.getTag(element.tag)
           elementObject.id = `${this.idx++}${new Date().getTime()}`
@@ -181,9 +181,10 @@ export default {
                       elementObject.value = str
                     }
                   } else {
-                    if (element.length !== 2 && element.length !== 4) {
-                      // elementObject.value = 'binary data'
-                    }
+                    elementObject.value = dataSet.string(propertyName)
+                    // if (element.length !== 2 && element.length !== 4) {
+                    //   // elementObject.value = 'binary data'
+                    // }
                   }
                 } else if (vr === 'US') {
                   let text = dataSet.uint16(propertyName)

src/components/TrialsSelect/index.vue

@@ -124,7 +124,7 @@ export default {
     inputChange(v) {
       this.resultFilter = this.options.filter((o) => {
         var reg = new RegExp(v, 'ig')
-        return reg.test(o.ResearchProgramNo) || reg.test(o.Indication)
+        return reg.test(o.ResearchProgramNo) || reg.test(o.Indication) || reg.test(o.ExperimentName)
       })
     },
     getTrialList() {

src/components/UploadFile/index.vue

@@ -99,7 +99,7 @@ export default {
         this.btnDisabled = false
         if (res.IsSuccess) {
           this.fileList[0].id = res.Result[0].Id
-          this.$message.success('Uploaded successfully')
+          this.$message.success(this.$t('trials:uploadDicomList:table:Uploaded'))
           this.$emit('getFileList', res.Result[0].Id, res.Result[0].Path)
         }
       })
@@ -113,13 +113,13 @@ export default {
       if (isValidFile) {
         this.fileList = []
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('upload:rule:MUSTPDF'))
         return false
       }
     },
     beforeRemove(file, fileList) {
       if (file && file.status === 'success') {
-        return this.$confirm(`Sure to remove ${file.name}?`)
+        return this.$confirm(this.$t('system:reviewer:confirm:delete'))
       }
     },
     handleRemoveFile(file, fileList) {
@@ -146,7 +146,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     fileValid(fileName, typeArr) {
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()

src/components/UploadFiles/index.vue

@@ -9,37 +9,51 @@
       :file-list="fileList"
       :accept="accept"
     >
-      <el-button size="small" type="primary" :disabled="isDisabled">{{ $t('common:button:upload') }}</el-button>
+      <el-button size="small" type="primary" :disabled="isDisabled">{{
+        $t('common:button:upload')
+      }}</el-button>
     </el-upload>
   </div>
 </template>
 <script>
-import { getAttachmentByType, uploadFile, saveAttachments, deleteAttachment } from '@/api/attachment'
+import {
+  getAttachmentByType,
+  uploadFile,
+  saveAttachments,
+  deleteAttachment,
+} from '@/api/attachment'
 export default {
   name: 'UploadFiles',
   props: {
     type: {
       type: String,
-      required: true
+      required: true,
     },
     doctorId: {
       type: String,
-      required: true
+      required: true,
     },
     accept: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
   data() {
     return {
       fileList: [],
       repeat: false,
-      isDisabled: false
+      isDisabled: false,
     }
   },
+  watch: {
+    doctorId() {
+      if (this.doctorId) {
+        this.initFileList()
+      }
+    },
+  },
   mounted() {
-    if(!this.doctorId) return
+    if (!this.doctorId) return
     this.initFileList()
   },
   methods: {
@@ -49,24 +63,28 @@ export default {
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.07)'
+        background: 'rgba(0, 0, 0, 0.07)',
       })
-      getAttachmentByType(this.doctorId, this.type).then(res => {
-        loading.close()
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) {
-            this.fileList = this.formatterFileList(res.Result)
-            this.$emit('getFileList', this.fileList)
-          } else {
-            this.fileList = []
+      getAttachmentByType(this.doctorId, this.type)
+        .then((res) => {
+          loading.close()
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              this.fileList = this.formatterFileList(res.Result)
+              this.$emit('getFileList', this.fileList)
+            } else {
+              this.fileList = []
+            }
           }
-        }
-      }).catch(() => { loading.close() })
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
 
     formatterFileList(list) {
       var arr = []
-      list.forEach(item => {
+      list.forEach((item) => {
         const data = {
           DoctorId: item.DoctorId,
           Type: item.Type,
@@ -74,7 +92,7 @@ export default {
           FullPath: item.FullPath,
           FileName: item.FileName,
           CreateTime: item.CreateTime,
-          Id: item.Id
+          Id: item.Id,
         }
         arr.push(data)
       })
@@ -85,32 +103,42 @@ export default {
       // 检测文件后缀名
       if (this.checkFileSuffix(param.file.name)) {
         // 检测是否有重名文件
-        const isRepeat = this.fileList.some(item => item.FileName === param.file.name)
+        const isRepeat = this.fileList.some(
+          (item) => item.FileName === param.file.name
+        )
         if (isRepeat) {
-          this.$confirm('Override the existing resume?', {
-            type: 'warning',
-            distinguishCancelAndClose: true,
-            confirmButtonText: 'OK',
-            cancelButtonText: 'Cancel'
-          })
+          this.$confirm(
+            this.$t('curriculumVitae:resume:message:existingResume'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true,
+            }
+          )
             .then(() => {
               // 重名覆盖
               this.repeat = true
               this.uploadFile(param.file)
             })
-            .catch(action => {})
+            .catch((action) => {})
         } else {
           this.uploadFile(param.file)
         }
       } else {
-        this.$alert(`Must be in ${this.accept} format`)
+        let str = this.accept.join(', ')
+        let message = this.$t(
+          'trials:readingUnit:qsList:message:imageFormat'
+        ).replace('xxx', str)
+        this.$alert(message)
       }
     },
     async uploadFile(file) {
       this.isDisabled = true
       var fileName = file.name
       file = await this.fileToBlob(file)
-      let res = await this.OSSclient.put(`/SystemData/reviewer/Agreements/${this.doctorId}/${fileName}`, file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/Agreements/${this.doctorId}/${fileName}`,
+        file
+      )
       if (this.repeat) {
         const index = this.fileList.findIndex((item, index) => {
           return item.FileName === fileName
@@ -124,52 +152,60 @@ export default {
           Type: this.type,
           Path: this.$getObjectName(res.url),
           FullPath: this.$getObjectName(res.url),
-          FileName: fileName
+          FileName: fileName,
         }
         this.fileList.push(fileData)
       }
       this.saveUploadFiles()
     },
     saveUploadFiles() {
-      saveAttachments(this.fileList).then(res => {
-        this.fileList = this.formatterFileList(res.Result)
-        this.isDisabled = false
-        this.$message.success('Uploaded successfully')
-        this.$emit('getFileList', this.fileList)
-      }).catch(() => {
-        this.isDisabled = false
-      })
+      saveAttachments(this.fileList)
+        .then((res) => {
+          this.fileList = this.formatterFileList(res.Result)
+          this.isDisabled = false
+          this.$message.success(
+            this.$t('trials:uploadDicomList:table:Uploaded')
+          )
+          this.$emit('getFileList', this.fileList)
+        })
+        .catch(() => {
+          this.isDisabled = false
+        })
     },
     handleDeleteFile(file) {
-      this.$confirm('Sure to remove?', {
+      this.$confirm(this.$t('system:reviewer:confirm:delete'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-
-      }).then(() => {
-        deleteAttachment(file.Id, file.Path)
-          .then(res => {
+      })
+        .then(() => {
+          deleteAttachment(file.Id, file.Path).then((res) => {
             if (res.IsSuccess) {
-              this.fileList.splice(this.fileList.findIndex(item => item.Id === file.Id), 1)
+              this.fileList.splice(
+                this.fileList.findIndex((item) => item.Id === file.Id),
+                1
+              )
               this.$emit('getFileList', this.fileList)
               this.$message({
                 message: this.$t('common:message:deletedSuccessfully'),
-                type: 'success'
+                type: 'success',
               })
             }
           })
-      })
-        .catch(action => {})
+        })
+        .catch((action) => {})
     },
     checkFileSuffix(fileName) {
       var index = fileName.lastIndexOf('.')
       var suffix = fileName.substring(index + 1, fileName.length)
-      return this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
-    }
-  }
+      return (
+        this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
+      )
+    },
+  },
 }
 </script>
 <style>
-.uploadFiles-container{
+.uploadFiles-container {
   margin: 0 5px;
 }
 .uploadFiles-container .el-upload--text {

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -180,10 +180,10 @@
           <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
         </el-input>
         <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] <= questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
         </span>
         <span v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
         </span>
         <!-- 生日不能大于截止日期 -->
         <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] > questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px;font-size: 12px;color:#f66">

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -27,7 +27,7 @@
           size="small"
           type="primary"
           @click="close"
-          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'"
+          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'&&$route.path!=='/trials/trials-panel/visit/crc-question'"
         >
           {{ $t('common:button:cancel') }}
         </el-button>

src/main.js

@@ -446,11 +446,11 @@ async function VueInit() {
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
@@ -596,3 +596,4 @@ VueInit()
 // });
 
 
+export default _vm

src/permission.js

@@ -17,15 +17,14 @@ store.state.trials.whiteList = whiteList;
 router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
-  // document.title = getPageTitle(to.meta.title)
+  // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
   if (!to.query.trialId) {
     store.dispatch('trials/setConfig', {})
   }
   if (
     to.query.trialId &&
     to.query.trialId !==
-    store.state.trials.config.trialId &&
-    store.state.trials.whiteList.indexOf(to.path) === -1
+    store.state.trials.config.trialId
   ) {
     console.log(to.query.path)
     let res = await getTrialExtralConfig({
@@ -37,14 +36,14 @@ router.beforeEach(async (to, from, next) => {
         ...res.Result,
       })
     }
-  } if (!to.query.trialId) {
+  }
+  if (!to.query.trialId) {
     store.dispatch('trials/setConfig', {})
   }
   if (
     to.query.trialId &&
     to.query.trialId !==
-    store.state.trials.config.trialId &&
-    store.state.trials.whiteList.indexOf(to.path) === -1
+    store.state.trials.config.trialId
   ) {
     let res = await getTrialExtralConfig({
       TrialId: to.query.trialId,
@@ -63,8 +62,8 @@ router.beforeEach(async (to, from, next) => {
   if (hasToken) {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
-        await store.dispatch('user/logout')
         await OSSclient()
+        await store.dispatch('user/logout')
       }
       if (to.path === '/ReviewersResearchForm') {
         await OSSclient()
@@ -95,7 +94,6 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
-        console.log(to)
         const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
         if (flag) {
           next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)

src/utils/metaDataProvider.js

@@ -0,0 +1,103 @@
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+function parseImageId(imageId) {
+  // build a url by parsing out the url scheme and frame index from the imageId
+  const firstColonIndex = imageId.indexOf(':');
+
+  let url = imageId.substring(firstColonIndex + 1);
+  const frameIndex = url.indexOf('frame=');
+
+  let frame;
+
+  if (frameIndex !== -1) {
+    const frameStr = url.substr(frameIndex + 6);
+
+    frame = parseInt(frameStr, 10);
+    url = url.substr(0, frameIndex - 1);
+  }
+
+  return {
+    scheme: imageId.substr(0, firstColonIndex),
+    url,
+    frame,
+  };
+}
+function getNumberValues(dataSet, tag, minimumLength) {
+  const values = [];
+  const valueAsString = dataSet.string(tag);
+
+  if (!valueAsString) {
+    return;
+  }
+  const split = valueAsString.split('\\');
+
+  if (minimumLength && split.length < minimumLength) {
+    return;
+  }
+  for (let i = 0; i < split.length; i++) {
+    values.push(parseFloat(split[i]));
+  }
+
+  return values;
+}
+function metaDataProvider(type, imageId) {
+  const parsedImageId = parseImageId(imageId);
+  const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url);
+
+  if (!dataSet) {
+    return;
+  }
+  if (type === 'imagePlaneModule') {
+    const imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
+    const imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
+    const pixelSpacing = getNumberValues(dataSet, 'x00280030', 2);
+    const imagePixelSpacing = getNumberValues(dataSet, 'x00181164', 2);
+    const estimatedRadiographicMagnificationFactor = getNumberValues(dataSet, 'x00181114', 2);
+    let columnPixelSpacing = null;
+
+    let rowPixelSpacing = null;
+
+    if (pixelSpacing) {
+      rowPixelSpacing = pixelSpacing[0];
+      columnPixelSpacing = pixelSpacing[1];
+    } else if (imagePixelSpacing && estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0] / estimatedRadiographicMagnificationFactor[0];
+      columnPixelSpacing = imagePixelSpacing[1] / estimatedRadiographicMagnificationFactor[1];
+    } else if (imagePixelSpacing && !estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0];
+      columnPixelSpacing = imagePixelSpacing[1];
+    }
+
+    let rowCosines = null;
+
+    let columnCosines = null;
+
+    if (imageOrientationPatient) {
+      rowCosines = [
+        parseFloat(imageOrientationPatient[0]),
+        parseFloat(imageOrientationPatient[1]),
+        parseFloat(imageOrientationPatient[2]),
+      ];
+      columnCosines = [
+        parseFloat(imageOrientationPatient[3]),
+        parseFloat(imageOrientationPatient[4]),
+        parseFloat(imageOrientationPatient[5]),
+      ];
+    }
+
+    return {
+      frameOfReferenceUID: dataSet.string('x00200052'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      imageOrientationPatient,
+      rowCosines,
+      columnCosines,
+      imagePositionPatient,
+      sliceThickness: dataSet.floatString('x00180050'),
+      sliceLocation: dataSet.floatString('x00201041'),
+      pixelSpacing,
+      rowPixelSpacing,
+      columnPixelSpacing,
+    };
+  }
+}
+export default metaDataProvider;

src/utils/request.js

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import _vm from '@/main'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
@@ -90,6 +91,9 @@ service.interceptors.response.use(
       const status = error.response.status
       if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
         store.dispatch('user/logout').then(() => {
+          if (_vm.$msgbox) {
+            _vm.$msgbox.close();
+          }
           router.push(`/login`)
           this.$i18n.locale = 'zh'
           this.setLanguage('zh')

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

@@ -67,6 +67,8 @@ import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 // import dicomStore from '@/utils/dicom-store'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import dicomPreview from '@/components/Dicom/DicomPreview'
+import metaDataProvider from '@/utils/metaDataProvider'
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,

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

@@ -143,6 +143,8 @@ import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/tr
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+import metaDataProvider from '@/utils/metaDataProvider'
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,

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

@@ -265,6 +265,8 @@ import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+import metaDataProvider from '@/utils/metaDataProvider'
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 // import * as cornerstoneTools from 'cornerstone-tools'
 var config = {
   maxWebWorkers: 4,

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

@@ -362,12 +362,12 @@ export default {
         BusinessLevelEnum: [
           { required: true, message: 'Please select', trigger: ['blur'] },
         ],
-        ToUserTypeList: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
-        ],
-        EmailCron: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
-        ],
+        // ToUserTypeList: [
+        //   { required: true, message: 'Please select', trigger: ['blur'] },
+        // ],
+        // EmailCron: [
+        //   { required: true, message: 'Please select', trigger: ['blur'] },
+        // ],
         EmailUrgentEnum: [
           { required: true, message: 'Please select', trigger: ['blur'] },
         ],

src/views/reviewers/ReviewersResearch.vue

@@ -48,7 +48,8 @@
                 style="width: 100%"
                 :disabled="sendDisabled"
                 @click="handleSendCode"
-                >{{ sendTitle }}</el-button
+                >{{ this.$t('trials:researchForm:button:send')
+                }}{{ count || count === 0 ? `(${count}s)` : '' }}</el-button
               >
             </el-col>
           </el-form-item>
@@ -226,6 +227,9 @@ export default {
             emailOrPhone: this.form.EmailOrPhone,
             verificationCode: this.form.VerificationCode,
           }
+          if (this.$route.query.trialId) {
+            param.TrialId = this.$route.query.trialId
+          }
           verifyEmialGetDoctorInfo(param)
             .then(async (res) => {
               this.btnLoading = false
@@ -237,13 +241,25 @@ export default {
               store.dispatch('user/setTree', menuTree.Result)
               store.dispatch('user/setPermissions', permissions.Result)
               // this.$router.push({ path: `/researchForm?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
-              this.$router.push({
-                path: `/curriculumVitae?Id=${
-                  res.Result.DoctorId ? res.Result.DoctorId : ''
-                }&tabActive=BasicInfo&ReviewStatus=${
-                  res.Result.ReviewStatus
-                }&lang=${this.$route.query.lang}`,
-              })
+              if (this.$route.query.trialId) {
+                this.$router.push({
+                  path: `/curriculumVitae?Id=${
+                    res.Result.DoctorId ? res.Result.DoctorId : ''
+                  }&tabActive=BasicInfo&ReviewStatus=${
+                    res.Result.ReviewStatus
+                  }&trialId=${this.$route.query.trialId}&lang=${
+                    this.$route.query.lang
+                  }`,
+                })
+              } else {
+                this.$router.push({
+                  path: `/curriculumVitae?Id=${
+                    res.Result.DoctorId ? res.Result.DoctorId : ''
+                  }&tabActive=BasicInfo&ReviewStatus=${
+                    res.Result.ReviewStatus
+                  }&lang=${this.$route.query.lang}`,
+                })
+              }
             })
             .catch(() => {
               this.btnLoading = false
@@ -299,6 +315,7 @@ export default {
             this.sendTitle = this.$t('trials:researchForm:button:send')
             clearInterval(this.timer)
             this.timer = null
+            this.count = null
           }
         }, 1000)
       }

src/views/reviewers/components/Agreements.vue

@@ -274,6 +274,7 @@
               v-model="form.Remark"
               type="textarea"
               :autosize="{ minRows: 2, maxRows: 4 }"
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
           <el-form-item :label="$t('system:Agreements:label:Is Enable')">
@@ -354,6 +355,13 @@ export default {
         IsEnable: false,
       },
       rules: {
+        Remark: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
         CriterionType: [
           {
             required: true,

src/views/reviewers/components/BasicInfo.vue

@@ -37,6 +37,7 @@
                   v-model="basicInfo.LastName"
                   :disabled="$route.query.ReviewStatus === '1'"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -49,6 +50,7 @@
                   v-model="basicInfo.FirstName"
                   :disabled="$route.query.ReviewStatus === '1'"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -63,6 +65,7 @@
                   v-model="basicInfo.ChineseName"
                   :disabled="$route.query.ReviewStatus === '1'"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -98,6 +101,7 @@
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="basicInfo.Phone"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -138,6 +142,7 @@
                   v-model="basicInfo.EMail"
                   :disabled="$route.query.ReviewStatus === '1'"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -232,13 +237,27 @@ export default {
             message: 'Please enter FirstName',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         LastName: [
           { required: true, message: 'Please enter LastName', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ChineseName: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        ChineseName: [{ max: 50, message: 'The maximum length is 50' }],
         Sex: [
           { required: true, message: 'Please select gender', trigger: 'blur' },
         ],
@@ -251,7 +270,11 @@ export default {
             message: 'Please enter phone number',
             trigger: 'blur',
           },
-          { max: 20, min: 7, message: 'The length is 7 to 20' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         EMail: [
           {
@@ -264,9 +287,19 @@ export default {
             message: 'Please input the correct email address',
             trigger: 'blur,change',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        WeChat: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        WeChat: [{ max: 50, message: 'The maximum length is 50' }],
       },
       isDisabled: false,
       loading: false,

src/views/reviewers/components/EducationTraining.vue

@@ -364,6 +364,7 @@
                 v-model="educationForm.Major"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -371,6 +372,7 @@
                 v-model="educationForm.MajorCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -385,6 +387,7 @@
                 v-model="educationForm.Organization"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -392,6 +395,7 @@
                 v-model="educationForm.OrganizationCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -406,6 +410,7 @@
                 v-model="educationForm.City"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -413,6 +418,7 @@
                 v-model="educationForm.CityCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -427,6 +433,7 @@
                 v-model="educationForm.Province"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -434,6 +441,7 @@
                 v-model="educationForm.ProvinceCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -448,6 +456,7 @@
                 v-model="educationForm.Country"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -455,6 +464,7 @@
                 v-model="educationForm.CountryCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -542,6 +552,7 @@
                 v-model="postgraduateForm.Major"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -549,6 +560,7 @@
                 v-model="postgraduateForm.MajorCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -565,11 +577,11 @@
             <el-option
               v-for="(item, index) in hospitalList"
               :key="index"
-              :label="item.HospitalName"
+              :label="isEN ? item.HospitalName : item.HospitalNameCN"
               :value="item.Id"
             >
               <span>
-                {{ item.HospitalName }}
+                {{ isEN ? item.HospitalName : item.HospitalNameCN }}
               </span>
             </el-option>
           </el-select>
@@ -584,6 +596,7 @@
                 v-model="postgraduateForm.School"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -591,6 +604,7 @@
                 v-model="postgraduateForm.SchoolCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -606,6 +620,7 @@
                 v-model="postgraduateForm.City"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -613,6 +628,7 @@
                 v-model="postgraduateForm.CityCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -627,6 +643,7 @@
                 v-model="postgraduateForm.Province"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -634,6 +651,7 @@
                 v-model="postgraduateForm.ProvinceCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -648,6 +666,7 @@
                 v-model="postgraduateForm.Country"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -655,6 +674,7 @@
                 v-model="postgraduateForm.CountryCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -764,7 +784,18 @@ export default {
             message: 'Please enter the major',
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        MajorCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Organization: [
           {
@@ -772,11 +803,33 @@ export default {
             message: 'Please enter the institution',
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        OrganizationCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         City: [
           { required: true, message: 'Please enter the city', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        CityCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Province: [
           {
@@ -784,7 +837,18 @@ export default {
             message: 'Please enter the state/province',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ProvinceCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Country: [
           {
@@ -792,7 +856,18 @@ export default {
             message: 'Please enter the country',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        CountryCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       educationDialogVisible: false,
@@ -861,11 +936,47 @@ export default {
             message: 'Please enter the major',
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        MajorCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        School: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        SchoolCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         City: [
           { required: true, message: 'Please enter the city', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        CityCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Province: [
           {
@@ -873,7 +984,18 @@ export default {
             message: 'Please enter the state/province',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ProvinceCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Country: [
           {
@@ -881,7 +1003,18 @@ export default {
             message: 'Please enter the country',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        CountryCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       postgraduateBeginPickerOption: {

src/views/reviewers/components/Employment.vue

@@ -27,11 +27,11 @@
                   <el-option
                     v-for="(item, index) in hospitalList"
                     :key="index"
-                    :label="item.HospitalName"
+                    :label="isEN ? item.HospitalName : item.HospitalNameCN"
                     :value="item.Id"
                   >
                     <span>
-                      {{ item.HospitalName }}
+                      {{ isEN ? item.HospitalName : item.HospitalNameCN }}
                     </span>
                   </el-option>
                 </el-select>
@@ -45,11 +45,12 @@
                 :label="$t('system:reviewer:label:AffiliatedUniversity')"
               >
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  disabled
                   v-model="UniversityAffiliated"
                   type="textarea"
                   autosize
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -58,9 +59,10 @@
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:City')">
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  disabled
                   v-model="City"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -69,9 +71,10 @@
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:State/Province')">
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  disabled
                   v-model="Province"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -80,9 +83,10 @@
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:Country')">
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  disabled
                   v-model="Country"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -113,7 +117,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -128,6 +135,7 @@
                   v-model="employmentForm.DepartmentOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -142,6 +150,7 @@
                   v-model="employmentForm.DepartmentOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -180,8 +189,8 @@
             <el-col :span="5">
               <el-form-item
                 v-if="
-                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
-                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                  $fd('Rank', employmentForm.RankId, 'id') ===
+                  $t('curriculumVitae:selectLabel:Other')
                 "
                 class="other-item"
                 prop="RankOther"
@@ -191,14 +200,15 @@
                   v-model="employmentForm.RankOther"
                   placeholder="Please specify"
                   size="small"
+                  :maxlength="400"
                 />
               </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'
+                  $fd('Rank', employmentForm.RankId, 'id') ===
+                  $t('curriculumVitae:selectLabel:Other')
                 "
                 class="other-item"
                 prop="RankOtherCN"
@@ -208,6 +218,7 @@
                   v-model="employmentForm.RankOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -227,6 +238,7 @@
                     $t('curriculumVitae:info:form:placeholder:partTimeJob')
                   "
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -243,6 +255,7 @@
                     $t('curriculumVitae:info:form:placeholder:partTimeJobEN')
                   "
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -276,7 +289,7 @@ export default {
   },
   data() {
     const RankIndication = (rule, value, callback) => {
-      if (value === '其它' || value === 'Other') {
+      if (value === this.$t('curriculumVitae:selectLabel:Other')) {
         if (!this.trialForm.IndicationOther) {
           return callback(new Error('请输入适应症'))
         }
@@ -284,7 +297,7 @@ export default {
       callback()
     }
     const PhysicianIndication = (rule, value, callback) => {
-      if (value === '其它' || value === 'Other') {
+      if (value === this.$t('curriculumVitae:selectLabel:Other')) {
         if (!this.trialForm.IndicationOther) {
           return callback(new Error('请输入适应症'))
         }
@@ -325,19 +338,37 @@ export default {
         ],
         DepartmentOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        DepartmentOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        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' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         RankOtherCN: [
           { required: true, message: 'Please select rank', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         PhysicianId: [
           {
@@ -352,7 +383,11 @@ export default {
             message: 'Please select Physician',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         PhysicianCN: [
           {
@@ -360,7 +395,11 @@ export default {
             message: 'Please select Physician',
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         PositionId: [
           {
@@ -369,8 +408,20 @@ export default {
             trigger: 'blur',
           },
         ],
-        PositionOther: [{ max: 50, message: 'The maximum length is 50' }],
-        PositionOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
+        PositionOther: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        PositionOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
         HospitalId: [
           {
             required: true,
@@ -388,6 +439,9 @@ export default {
   },
   computed: {
     ...mapGetters(['hospitalList']),
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
   },
   mounted() {
     this.initEmployment()
@@ -397,7 +451,7 @@ export default {
       var o = this.$d.Rank.find((v) => {
         return v.id === val
       })
-      if (o.label === '其它' || o.label === 'Other') {
+      if (o.label === this.$t('curriculumVitae:selectLabel:Other')) {
         this.employmentForm.RankOther = ''
         this.employmentForm.RankOtherCN = ''
       } else {
@@ -409,7 +463,7 @@ export default {
       var o = this.$d.PhysicianOriginal.find((v) => {
         return v.id === val
       })
-      if (o.label === '其它' || o.label === 'Other') {
+      if (o.label === this.$t('curriculumVitae:selectLabel:Other')) {
         this.employmentForm.Physician = ''
         this.employmentForm.PhysicianCN = ''
       } else {
@@ -530,10 +584,12 @@ export default {
     handleHospitalChange(value) {
       const item = this.hospitalList.filter((item) => item.Id === value)
       if (item.length) {
-        this.UniversityAffiliated = item[0].UniversityAffiliated
-        this.City = item[0].City
-        this.Province = item[0].Province
-        this.Country = item[0].Country
+        this.UniversityAffiliated = this.isEN
+          ? item[0].UniversityAffiliated
+          : item[0].UniversityAffiliatedCN
+        this.City = this.isEN ? item[0].City : item[0].CityCN
+        this.Province = this.isEN ? item[0].Province : item[0].ProvinceCN
+        this.Country = this.isEN ? item[0].Country : item[0].CountryCN
       }
     },
     async initEmployment() {

src/views/reviewers/components/GcpCertificate.vue

@@ -33,7 +33,11 @@
         prop="GCPAgencies"
         v-if="GCP"
       >
-        <el-input v-model="certificateForm.GCPAgencies" clearable></el-input>
+        <el-input
+          v-model="certificateForm.GCPAgencies"
+          clearable
+          :maxlength="400"
+        ></el-input>
       </el-form-item>
     </el-form>
     <div v-if="GCP" class="upload-container">
@@ -121,7 +125,15 @@ export default {
       GCP: 0,
       GCPID: '',
       certificateForm: defaultCertificateForm(),
-      certificateRules: {},
+      certificateRules: {
+        GCPAgencies: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
     }
   },
   watch: {

src/views/reviewers/components/Pay.vue

@@ -20,7 +20,12 @@
                 :label="$t('system:reviewer:label:BankNum')"
                 prop="BankNum"
               >
-                <el-input v-model="form.BankNum" clearable size="small" />
+                <el-input
+                  v-model="form.BankNum"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -28,7 +33,12 @@
                 :label="$t('system:reviewer:label:BankName')"
                 prop="BankName"
               >
-                <el-input v-model="form.BankName" clearable size="small" />
+                <el-input
+                  v-model="form.BankName"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -38,7 +48,12 @@
                 :label="$t('system:reviewer:label:OpeningBank')"
                 prop="OpeningBank"
               >
-                <el-input v-model="form.OpeningBank" clearable size="small" />
+                <el-input
+                  v-model="form.OpeningBank"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -46,7 +61,12 @@
                 :label="$t('system:reviewer:label:IdCard')"
                 prop="IdCard"
               >
-                <el-input v-model="form.IdCard" clearable size="small" />
+                <el-input
+                  v-model="form.IdCard"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,7 +76,12 @@
                 :label="$t('system:reviewer:label:BankPhoneNum')"
                 prop="BankPhoneNum"
               >
-                <el-input v-model="form.BankPhoneNum" clearable size="small" />
+                <el-input
+                  v-model="form.BankPhoneNum"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -109,6 +134,25 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BankName: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        OpeningBank: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         IdCard: [
           {
@@ -122,6 +166,11 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         BankPhoneNum: [
           {
@@ -135,6 +184,11 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
     }

src/views/reviewers/components/ResearchPublication.vue

@@ -5,6 +5,7 @@
       v-loading="loading"
       label-width="140px"
       :model="researchForm"
+      :rules="rule"
       size="small"
     >
       <div class="title">{{ $t('system:reviewer:title:Research') }}</div>
@@ -18,6 +19,7 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
           <el-col :span="11">
@@ -28,6 +30,7 @@
               rows="5"
               placeholder="请用中文注明"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
         </el-row>
@@ -42,6 +45,7 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
           <el-col :span="11">
@@ -52,6 +56,7 @@
               rows="5"
               placeholder="请用中文注明"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
         </el-row>
@@ -67,6 +72,7 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
         </el-row>
@@ -82,6 +88,7 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
           <el-col :span="11">
@@ -92,6 +99,7 @@
               rows="5"
               placeholder="请用中文注明"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
         </el-row>
@@ -138,6 +146,57 @@ export default {
         AwardsHonors: '',
         AwardsHonorsCN: '',
       },
+      rule: {
+        Research: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ResearchCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Grants: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        GrantsCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Publications: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        AwardsHonors: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        AwardsHonorsCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
       isDisabled: false,
     }

src/views/reviewers/components/Setting.vue

@@ -15,13 +15,21 @@
           :label="$t('system:Setting:label:Blind Name')"
           prop="BlindName"
         >
-          <el-input v-model="checkForm.BlindName" style="width: 300px" />
+          <el-input
+            v-model="checkForm.BlindName"
+            style="width: 300px"
+            :maxlength="400"
+          />
         </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-input
+            v-model="checkForm.BlindNameCN"
+            style="width: 300px"
+            :maxlength="400"
+          />
         </el-form-item>
         <el-form-item
           :label="$t('system:Setting:label:Blind Publications')"
@@ -33,6 +41,7 @@
             rows="8"
             style="width: 60%"
             size="small"
+            :maxlength="4000"
           />
         </el-form-item>
       </div>
@@ -128,6 +137,7 @@
             type="textarea"
             style="width: 60%"
             rows="8"
+            :maxlength="4000"
           />
         </el-form-item>
 
@@ -245,9 +255,34 @@ export default {
         BlindPublications: '',
       },
       rules: {
-        AdminComment: [{ max: 500, message: 'The maximum length is 500' }],
+        AdminComment: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
         BlindName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BlindNameCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BlindPublications: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
         ],
       },
       doctorId: this.$route.query.Id || this.reviewerId,
@@ -267,6 +302,8 @@ export default {
     reviewerId() {
       if (this.reviewerId) {
         this.doctorId = this.reviewerId
+        this.initForm()
+        this.getIsVacation()
       }
     },
   },
@@ -277,6 +314,7 @@ export default {
   methods: {
     // 获取是否休假
     async getIsVacation() {
+      if (!this.doctorId) return false
       try {
         let data = {
           DoctorId: this.doctorId,

src/views/reviewers/components/Specialty.vue

@@ -35,7 +35,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -50,6 +53,7 @@
                   v-model="specialtyForm.SpecialityOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -64,6 +68,7 @@
                   v-model="specialtyForm.SpecialityOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -94,7 +99,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -112,6 +120,7 @@
                   v-model="specialtyForm.SubspecialityOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -129,6 +138,7 @@
                   v-model="specialtyForm.SubspecialityOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -160,7 +170,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -178,6 +191,7 @@
                   v-model="specialtyForm.ReadingTypeOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -195,6 +209,7 @@
                   v-model="specialtyForm.ReadingTypeOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -247,9 +262,19 @@ export default {
         ],
         SpecialityOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        SpecialityOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        SpecialityOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
         ReadingTypeIds: [
           {
             required: true,
@@ -259,9 +284,19 @@ export default {
         ],
         ReadingTypeOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ReadingTypeOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        ReadingTypeOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
         SubspecialityIds: [
           {
             required: true,
@@ -271,10 +306,18 @@ export default {
         ],
         SubspecialityOther: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         SubspecialityOtherCN: [
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       selectId: '00000000-0000-0000-0000-000000000000',

src/views/reviewers/components/Summarize.vue

@@ -2,82 +2,245 @@
   <div class="form-container">
     <el-card class="box-card">
       <div style="width: 80%">
+        <div class="top">
+          <span>{{ $t('system:reviewer:tab:Summarize') }}</span>
+          <el-button
+            size="small"
+            type="primary"
+            v-if="$route.query.ReviewStatus !== '1'"
+            @click="handleAdd()"
+          >
+            {{ $t('common:button:add') }}
+          </el-button>
+        </div>
+        <el-table
+          ref="educationTbl"
+          :data="list"
+          border
+          class="table"
+          :loading="loading"
+          size="small"
+        >
+          <el-table-column type="index" width="30" />
+          <el-table-column
+            prop="Indication"
+            :label="$t('system:reviewer:label:Indication')"
+            min-width="55"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="Summarize"
+            :label="$t('system:reviewer:label:SummarizeZH')"
+            min-width="55"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="SummarizeEn"
+            :label="$t('system:reviewer:label:SummarizeEN')"
+            min-width="70"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="IsMain"
+            :label="$t('system:reviewer:label:IsMain')"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.IsMain) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('system:EducationTraining:table:Operation')"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                :disabled="$route.query.ReviewStatus === '1'"
+                @click="handleAdd(scope.row)"
+              >
+                {{ $t('common:button:edit') }}
+              </el-button>
+              <el-button
+                type="text"
+                size="small"
+                :disabled="$route.query.ReviewStatus === '1'"
+                @click="handleDelete(scope.row)"
+              >
+                {{ $t('common:button:delete') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
         <el-form
           ref="summarizeFrom"
           v-loading="loading"
           :rules="rules"
           :model="form"
           class="demo-ruleForm"
-          label-width="150px"
+          label-width="100px"
         >
-          <el-row>
-            <el-col :span="14">
-              <el-form-item
-                :label="$t('system:reviewer:label:Summarize')"
-                prop="Summarize"
-              >
-                <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="form.Summarize"
-                  type="textarea"
-                  :rows="2"
-                  :placeholder="
-                    $t('curriculumVitae:summarize:form:placeholder:summarize')
-                  "
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="14">
-              <el-form-item prop="SummarizeEn">
-                <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="form.SummarizeEn"
-                  type="textarea"
-                  :rows="2"
-                  :placeholder="
-                    $t('curriculumVitae:summarize:form:placeholder:summarizeEN')
-                  "
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              :disabled="$route.query.ReviewStatus === '1'"
+          <el-form-item
+            :label="$t('system:reviewer:label:Indication')"
+            prop="Indication"
+          >
+            <el-input
+              v-model="form.Indication"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:Indication')
+              "
               size="small"
-              :loading="loading"
-              @click="handleSave"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item prop="IndicationEn">
+            <el-input
+              v-model="form.IndicationEn"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:IndicationEn')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item
+            :label="$t('system:reviewer:label:Summarize')"
+            prop="Summarize"
+          >
+            <el-input
+              v-model="form.Summarize"
+              type="textarea"
+              :rows="10"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:summarize')
+              "
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <el-form-item prop="SummarizeEn">
+            <el-input
+              v-model="form.SummarizeEn"
+              type="textarea"
+              :rows="10"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:summarizeEN')
+              "
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <el-form-item
+            prop="IsMain"
+            :label="$t('system:reviewer:label:IsMain')"
+          >
+            <el-switch
+              v-model="form.IsMain"
+              :disabled="list.length <= 0 || ISMAIN"
             >
-              {{ $t('common:button:save') }}
-            </el-button>
+            </el-switch>
           </el-form-item>
         </el-form>
-      </div>
-    </el-card>
+      </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"
+          :loading="loading"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
   </div>
 </template>
 <script>
-import { getDetail, updateGneralSituation } from '@/api/reviewers'
+import {
+  addOrUpdateGneralSituation,
+  getSummarizeInfo,
+  deleteSummarizeInfo,
+} from '@/api/reviewers'
+import BaseModel from '@/components/BaseModel'
+const defaultForm = () => {
+  return {
+    Id: null,
+    DoctorId: null,
+    Summarize: null,
+    SummarizeEn: null,
+    IsMain: false,
+    Indication: null,
+    IndicationEn: null,
+  }
+}
 export default {
   props: {
     reviewerId: {
       type: String,
     },
   },
+  components: { BaseModel },
   data() {
     return {
+      list: [],
       loading: false,
-      form: {
-        Summarize: null,
-        SummarizeEn: null,
+      ISMAIN: false,
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '800px',
+        title: this.$t('system:reviewer:form:SummarizeTitle'),
+        appendToBody: false,
+        top: '8vh',
+      },
+      form: defaultForm(),
+      rules: {
+        Indication: [
+          {
+            required: true,
+            message: 'Please enter Indication',
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        IndicationEn: [
+          {
+            required: true,
+            message: 'Please enter Indication',
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Summarize: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        SummarizeEn: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
       },
-      rules: {},
     }
   },
   mounted() {
@@ -88,15 +251,20 @@ export default {
       try {
         let validate = await this.$refs.summarizeFrom.validate()
         if (!validate) return false
-        this.form.Id = this.$route.query.Id || this.reviewerId
+        this.form.DoctorId = this.$route.query.Id || this.reviewerId
         this.loading = true
         if (this.$route.query.trialId) {
           this.form.TrialId = this.$route.query.trialId
         }
-        let res = await updateGneralSituation(this.form)
+        if (this.list.length <= 0) {
+          this.form.IsMain = true
+        }
+        let res = await addOrUpdateGneralSituation(this.form)
         this.loading = false
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.model_cfg.visible = false
+          this.getDetail()
         }
       } catch (err) {
         this.loading = false
@@ -109,18 +277,64 @@ export default {
         let id = this.$route.query.Id || this.reviewerId
         if (!id) return false
         this.loading = true
-        let res = await getDetail(id, this.$route.query.trialId)
+        let res = await getSummarizeInfo({
+          DoctorId: id,
+        })
         this.loading = false
         if (res.IsSuccess) {
-          Object.keys(this.form).forEach((key) => {
-            this.form[key] = res.Result.SummarizeInfo[key]
-          })
+          this.list = res.Result.SummarizeList
         }
       } catch (err) {
         this.loading = false
         console.log(err)
       }
     },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleAdd(row) {
+      this.form = defaultForm()
+      this.ISMAIN = false
+      if (row) {
+        Object.keys(this.form).forEach((key) => {
+          this.form[key] = row[key]
+        })
+        this.form.Id = row.Id
+        if (this.form.IsMain) {
+          this.ISMAIN = true
+        }
+      }
+      if (this.list.length <= 0) {
+        this.form.IsMain = true
+      }
+      this.model_cfg.visible = true
+    },
+    async handleDelete(row) {
+      try {
+        if (row.IsMain) {
+          return this.$message.warning(
+            this.$t('system:reviewer:message:deletedSuccessfully')
+          )
+        }
+        let confirm = await this.$confirm(
+          this.$t('system:reviewer:confirm:delete')
+        )
+        if (!confirm) return false
+        let data = {
+          Id: row.Id,
+        }
+        this.loading = true
+        let res = await deleteSummarizeInfo(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.getDetail()
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+      }
+    },
   },
 }
 </script>
@@ -133,4 +347,11 @@ export default {
     width: 220px !important;
   }
 }
+.top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  margin-bottom: 10px;
+}
 </style>

src/views/reviewers/components/TrialExperience.vue

@@ -57,7 +57,8 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.StartTime"
-              >{{ scope.row.StartTime.split('-')[0] }} ~ {{
+              >{{ scope.row.StartTime.split('-')[0] }} ~
+              {{
                 scope.row.EndTime ? scope.row.EndTime.split('-')[0] : '至今'
               }}</span
             >
@@ -128,9 +129,10 @@
           <el-input
             v-model="OtherClinicalExperience"
             type="textarea"
-            rows="5"
+            rows="8"
             placeholder="Please specify in English"
             size="small"
+            :maxlength="4000"
           />
         </el-col>
         <el-col :span="11">
@@ -138,9 +140,10 @@
             v-model="OtherClinicalExperienceCN"
             :disabled="$route.query.ReviewStatus === '1'"
             type="textarea"
-            rows="5"
+            rows="8"
             placeholder="请用中文注明"
             size="small"
+            :maxlength="4000"
           />
         </el-col>
       </el-row>
@@ -194,6 +197,7 @@
             :placeholder="
               $t('curriculumVitae:clinicalTrials:placeholder:byStagesOther')
             "
+            :maxlength="400"
           ></el-input>
         </el-form-item>
         <el-form-item
@@ -220,6 +224,7 @@
             :placeholder="
               $t('curriculumVitae:clinicalTrials:placeholder:criterionOther')
             "
+            :maxlength="400"
           ></el-input>
         </el-form-item>
         <el-form-item
@@ -293,6 +298,7 @@
           <el-input
             v-model="clinicalTrialForm.EvaluationContent"
             clearable
+            :maxlength="400"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -368,13 +374,55 @@ export default {
         ],
         EvaluationContent: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 300, message: 'The maximum length is 300' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         IndicationEnum: [
           { required: true, message: 'Please select', trigger: 'blur' },
         ],
         StartTime: [
           { required: true, message: 'Please specify', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.clinicalTrialForm.EndTime &&
+                moment(value).isAfter(moment(this.clinicalTrialForm.EndTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:startBeforeEnd')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+        EndTime: [
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.clinicalTrialForm.StartTime &&
+                moment(value).isBefore(moment(this.clinicalTrialForm.StartTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:endBeforeStart')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
         ],
         OtherStages: [
           {
@@ -382,6 +430,11 @@ export default {
             message: 'Please input',
             trigger: ['blur', 'change'],
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         OtherCriterion: [
           {
@@ -389,6 +442,11 @@ export default {
             message: 'Please input',
             trigger: ['blur', 'change'],
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       GCP: 0,
@@ -400,7 +458,8 @@ export default {
       isBtnDisabled: false,
       selectId: '00000000-0000-0000-0000-000000000000',
       dictionaryList: {},
-      otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      // otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      otherId: '00000000-0000-0000-0000-000000000000',
       GCPData: {},
     }
   },
@@ -432,14 +491,14 @@ export default {
       let value = this.$d.Indication.find(
         (item) => item.value === this.clinicalTrialForm.IndicationEnum
       ).label
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     Trial_Phase_isOther() {
       if (!this.clinicalTrialForm.PhaseId) return false
       let value = this.dictionaryList.Trial_Phase.find(
         (item) => item.Id === this.clinicalTrialForm.PhaseId
       ).Value
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     ReadingStandard_isOther() {
       if (
@@ -457,7 +516,7 @@ export default {
         ...this.dictionaryList.CriterionType,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },

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

@@ -16,14 +16,14 @@
           <i
             class="el-icon-edit"
             :title="$t('common:button:edit')"
-            v-if="item.IsIRUpload"
+            v-if="item.IsIRUpload || isPM"
             @click="
               handleEditCol(item, 0, $t('trials:enrolledReviews:message:SOW'))
             "
           />
           <i
             class="el-icon-delete"
-            v-if="item.IsIRUpload"
+            v-if="item.IsIRUpload || isPM"
             :title="$t('common:button:delete')"
             @click="handleRemoveFile3(item)"
           />
@@ -45,30 +45,102 @@
           {{ $t('common:button:downloadTpl') }}
         </el-button>
       </div>
-      <template v-if="CounselorFiles">
+      <template v-if="!isPM">
+        <template v-if="CounselorFiles">
+          <div class="file_title">
+            {{ $t('curriculumVitae:agreement:Counselor') }}
+          </div>
+          <div class="file" v-for="item in CounselorFiles" :key="item.Id">
+            <div class="name" :title="item.FileName">{{ item.FileName }}</div>
+            <i
+              class="el-icon-view"
+              :title="$t('common:button:preview')"
+              @click.stop="preview(item)"
+            />
+          </div>
+        </template>
+        <template v-if="ackSowList && ackSowList.length > 0">
+          <div class="file_title">
+            {{ $t('curriculumVitae:agreement:confirmation') }}
+          </div>
+          <div class="file" v-for="item in ackSowList" :key="item.Id">
+            <div class="name" :title="item.FileName">{{ item.FileName }}</div>
+            <i
+              class="el-icon-view"
+              :title="$t('common:button:preview')"
+              @click.stop="handlePreview3(item)"
+            />
+          </div>
+        </template>
+      </template>
+      <template v-else>
         <div class="file_title">
           {{ $t('curriculumVitae:agreement:Counselor') }}
         </div>
-        <div class="file" v-for="item in CounselorFiles" :key="item.Id">
-          <div class="name" :title="item.FileName">{{ item.FileName }}</div>
-          <i
-            class="el-icon-view"
-            :title="$t('common:button:preview')"
-            @click.stop="preview(item)"
-          />
+        <template v-if="agreementList && agreementList.length > 0">
+          <div class="file" v-for="item in agreementList" :key="item.Id">
+            <div class="name" :title="item.FileName">{{ item.FileName }}</div>
+            <i
+              class="el-icon-view"
+              :title="$t('common:button:preview')"
+              @click.stop="handlePreview3(item)"
+            />
+            <i
+              class="el-icon-delete"
+              :title="$t('common:button:delete')"
+              @click="handleRemoveFile(item)"
+            />
+          </div>
+        </template>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+        <div class="btnBox" style="margin-top: 10px">
+          <div class="resume-content">
+            <div class="upload-content">
+              <upload-files
+                ref="uploadAgreement"
+                :doctor-id="reviewerId"
+                type="Consultant Agreement"
+                accept=".pdf"
+                @getFileList="getFileList"
+              />
+            </div>
+            <!-- <p>{{ $t('system:tip:file:pdf') }}</p> -->
+          </div>
         </div>
-      </template>
-      <template v-if="ackSowList && ackSowList.length > 0">
         <div class="file_title">
           {{ $t('curriculumVitae:agreement:confirmation') }}
         </div>
-        <div class="file" v-for="item in ackSowList" :key="item.Id">
-          <div class="name" :title="item.FileName">{{ item.FileName }}</div>
-          <i
-            class="el-icon-view"
-            :title="$t('common:button:preview')"
-            @click.stop="handlePreview3(item)"
-          />
+        <template v-if="ackSowList && ackSowList.length > 0">
+          <div class="file" v-for="item in ackSowList" :key="item.Id">
+            <div class="name" :title="item.FileName">{{ item.FileName }}</div>
+            <i
+              class="el-icon-view"
+              :title="$t('common:button:preview')"
+              @click.stop="handlePreview3(item)"
+            />
+            <i
+              class="el-icon-edit"
+              :title="$t('common:button:edit')"
+              @click="
+                handleEditCol(item, 1, $t('trials:enrolledReviews:message:SOW'))
+              "
+            />
+            <i
+              class="el-icon-delete"
+              :title="$t('common:button:delete')"
+              @click="handleRemoveFile3(item)"
+            />
+          </div>
+        </template>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+        <div class="btnBox" style="margin-top: 10px">
+          <el-button
+            type="primary"
+            size="small"
+            @click.stop="addCol(1, $t('trials:enrolledReviews:message:SOW'))"
+          >
+            {{ $t('curriculumVitae:agreement:btn:uploadconfirmation') }}
+          </el-button>
         </div>
       </template>
     </div>
@@ -164,10 +236,12 @@ import {
   getDoctorCriterionFile,
 } from '@/api/reviewers'
 import BaseModel from '@/components/BaseModel'
+import UploadFiles from '@/components/UploadFiles'
 export default {
   name: 'agreement',
   components: {
     BaseModel,
+    UploadFiles,
   },
   props: {
     DATA: {
@@ -184,6 +258,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isPM: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -247,6 +325,12 @@ export default {
     },
   },
   methods: {
+    handleRemoveFile(row) {
+      this.$refs.uploadAgreement.handleDeleteFile(row)
+    },
+    getFileList(fileList) {
+      this.agreementList = fileList
+    },
     preview(row) {
       this.$preview({
         path: row.FullPath,
@@ -295,7 +379,7 @@ export default {
         return
       }
       if (!this.checkFileSuffix(row.name)) {
-        this.$message.warning(`Must be in .pdf format`)
+        this.$message.warning(this.$t('upload:rule:MUSTPDF'))
         return false
       }
     },
@@ -308,7 +392,7 @@ export default {
     },
     handlePreview3(row) {
       return this.$preview({
-        path: row.FilePath,
+        path: row.FilePath || row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -357,9 +441,11 @@ export default {
           'CriterionType',
           this.form.CriterionType
         )
-        this.form.IsIRUpload = true
+        if (!this.isPM) {
+          this.form.IsIRUpload = true
+        }
         addDoctorCriterionFile(this.form).then((res) => {
-          this.$message.success('添加成功')
+          this.$message.success(this.$t('common:message:addedSuccessfully'))
           this.initSowList()
           this.handleCancle()
         })

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

@@ -173,12 +173,13 @@ export default {
           (item) => item.FileName === param.file.name
         )
         if (isRepeat) {
-          this.$confirm('Override the existing resume?', {
-            type: 'warning',
-            distinguishCancelAndClose: true,
-            confirmButtonText: 'OK',
-            cancelButtonText: 'Cancel',
-          })
+          this.$confirm(
+            this.$t('curriculumVitae:resume:message:existingResume'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true,
+            }
+          )
             .then(() => {
               // 重名覆盖
               this.repeat = true
@@ -189,7 +190,7 @@ export default {
           this.uploadFile(param.file, param.data.language)
         }
       } else {
-        this.$alert(`Must be in ${this.accept} format`)
+        this.$alert(this.$t('upload:rule:MUSTPDF'))
       }
     },
     async uploadFile(file, language) {
@@ -228,7 +229,9 @@ export default {
           this.resumeList = res.Result
           this.filterByLanguage()
           this.isDisabled = false
-          this.$message.success('Uploaded successfully')
+          this.$message.success(
+            this.$t('trials:uploadDicomList:table:Uploaded')
+          )
         })
         .catch(() => {
           this.isDisabled = false
@@ -286,7 +289,7 @@ export default {
         if (res.IsSuccess) {
           this.getResumeList()
           this.$message({
-            message: 'Saved successfully!',
+            message: this.$t('common:message:savedSuccessfully'),
             type: 'success',
           })
         }
@@ -307,7 +310,7 @@ export default {
           this.dialogVisible = false
           this.getResumeList()
           this.$message({
-            message: 'Saved successfully!',
+            message: this.$t('common:message:savedSuccessfully'),
             type: 'success',
           })
         }

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

@@ -156,11 +156,13 @@
     <template
       v-if="DATA.OtherClinicalExperience || DATA.OtherClinicalExperienceCN"
     >
-      <div class="message">
-        {{
+      <div
+        class="message"
+        style="white-space: pre-wrap"
+        v-html="
           isEN ? DATA.OtherClinicalExperience : DATA.OtherClinicalExperienceCN
-        }}
-      </div>
+        "
+      ></div>
     </template>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <!--临床试验-->
@@ -197,6 +199,7 @@
               :placeholder="
                 $t('curriculumVitae:clinicalTrials:placeholder:byStagesOther')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -224,25 +227,48 @@
               :placeholder="
                 $t('curriculumVitae:clinicalTrials:placeholder:criterionOther')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             :label="$t('curriculumVitae:clinicalTrials:form:time')"
             prop="BeginDate"
           >
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
               @change="changeTimeList"
             >
             </el-date-picker
-          ></el-form-item>
+          ></el-form-item> -->
+          <el-form-item
+            :label="$t('system:TrialExperience:label:Start Time')"
+            prop="StartTime"
+          >
+            <el-date-picker
+              v-model="form.StartTime"
+              type="year"
+              value-format="yyyy-MM-DD"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="$t('system:TrialExperience:label:End Time')"
+            prop="EndTime"
+          >
+            <el-date-picker
+              v-model="form.EndTime"
+              type="year"
+              value-format="yyyy-MM-DD"
+            >
+            </el-date-picker>
+          </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:clinicalTrials:form:viewingVolumeNum')"
             prop="VisitReadingCount"
@@ -289,7 +315,11 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="EvaluationContent" v-if="IndicationEnum_isOther">
-            <el-input v-model="form.EvaluationContent" clearable></el-input>
+            <el-input
+              v-model="form.EvaluationContent"
+              clearable
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
         </el-form>
       </template>
@@ -360,6 +390,7 @@
             <el-input
               v-model="certificateForm.GCPAgencies"
               clearable
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -423,33 +454,40 @@
           v-loading="loading"
           :model="otherForm"
           :rules="otherRules"
-          label-width="100px"
+          label-width="120px"
           size="small"
         >
           <el-form-item
             :label="$t('curriculumVitae:clinicalTrials:form:other')"
             prop="OtherClinicalExperienceCN"
+            v-if="!isEN"
           >
             <el-input
               v-model="otherForm.OtherClinicalExperienceCN"
               clearable
               type="textarea"
-              :rows="2"
+              :rows="5"
               style="margin-bottom: 20px"
               :placeholder="
                 $t('curriculumVitae:clinicalTrials:placeholder:other')
               "
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
-          <el-form-item prop="OtherClinicalExperience">
+          <el-form-item
+            prop="OtherClinicalExperience"
+            :label="$t('curriculumVitae:clinicalTrials:form:other')"
+            v-else
+          >
             <el-input
               v-model="otherForm.OtherClinicalExperience"
               clearable
               type="textarea"
-              :rows="2"
+              :rows="5"
               :placeholder="
                 $t('curriculumVitae:clinicalTrials:placeholder:otherEN')
               "
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -484,6 +522,7 @@ import {
   saveAttachments,
   getAttachmentByType,
 } from '@/api/attachment'
+import moment from 'moment'
 const defaultForm = () => {
   return {
     PhaseId: '',
@@ -525,6 +564,10 @@ export default {
         }
       },
     },
+    trialId: {
+      type: String,
+      default: '',
+    },
     reviewerId: {
       type: String,
       default: '',
@@ -549,43 +592,111 @@ export default {
         PhaseId: [
           {
             required: true,
-            message: 'Please select',
+            message: this.$t('common:ruleMessage:select'),
             trigger: ['blur', 'change'],
           },
         ],
         EvaluationCriteriaIdList: [
           {
             required: true,
-            message: 'Please select',
+            message: this.$t('common:ruleMessage:select'),
             trigger: ['blur', 'change'],
           },
         ],
         VisitReadingCount: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
         ],
         EvaluationContent: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 300, message: 'The maximum length is 300' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         IndicationEnum: [
-          { required: true, message: 'Please select', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         StartTime: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.form.EndTime &&
+                moment(value).isAfter(moment(this.form.EndTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:startBeforeEnd')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+        EndTime: [
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.form.StartTime &&
+                moment(value).isBefore(moment(this.form.StartTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:endBeforeStart')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
         ],
         OtherStages: [
           {
             required: true,
-            message: 'Please input',
+            message: this.$t('common:ruleMessage:specify'),
             trigger: ['blur', 'change'],
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         OtherCriterion: [
           {
             required: true,
-            message: 'Please input',
+            message: this.$t('common:ruleMessage:specify'),
             trigger: ['blur', 'change'],
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       loading: false,
@@ -593,17 +704,24 @@ export default {
 
       certificateForm: defaultCertificateForm(),
       certificateRules: {
+        GCPAgencies: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
         GCP: [
           {
             required: true,
-            message: 'Please select',
+            message: this.$t('common:ruleMessage:select'),
             trigger: ['blur', 'change'],
           },
         ],
         GCPId: [
           {
             required: true,
-            message: 'Please upload File',
+            message: this.$t('trials:readingPeriod:cd:message:uploadFile'),
             trigger: ['blur', 'change'],
           },
         ],
@@ -619,16 +737,32 @@ export default {
       },
 
       otherForm: defaultOtherForm(),
-      otherRules: {},
+      otherRules: {
+        OtherClinicalExperienceCN: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        OtherClinicalExperience: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+      },
       model_cfg_other: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:clinicalTrials:form:otherTitle'),
         appendToBody: true,
       },
       dictionaryList: {},
-      otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      // otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      otherId: '00000000-0000-0000-0000-000000000000',
     }
   },
   watch: {
@@ -688,14 +822,14 @@ export default {
       let value = this.$d.Indication.find(
         (item) => item.value === this.form.IndicationEnum
       ).label
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     Trial_Phase_isOther() {
       if (!this.form.PhaseId) return false
       let value = this.dictionaryList.Trial_Phase.find(
         (item) => item.Id === this.form.PhaseId
       ).Value
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     ReadingStandard_isOther() {
       if (
@@ -711,7 +845,7 @@ export default {
         ...this.dictionaryList.CriterionType,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },
@@ -773,6 +907,9 @@ export default {
           console.log(validate, 'validate')
           if (!validate) return false
           this.form.DoctorId = this.reviewerId
+          if (this.trialId) {
+            this.form.TrialId = this.trialId
+          }
           this.loading = true
           let res = await addOrUpdateTrialExperience(this.form)
           this.loading = false
@@ -797,6 +934,9 @@ export default {
           let validate = await this.$refs.otherAboutFrom.validate()
           if (!validate) return false
           this.otherForm.DoctorId = this.reviewerId
+          if (this.trialId) {
+            this.otherForm.TrialId = this.trialId
+          }
           this.loading = true
           let res = await updateOtherExperience(this.otherForm)
           this.loading = false
@@ -923,7 +1063,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     initFileList() {
       if (!this.reviewerId) return
@@ -985,6 +1125,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -992,6 +1133,7 @@ export default {
     background-color: #eee;
     padding: 10px;
     line-height: 30px;
+    word-wrap: break-word;
     border-radius: 5px;
   }
 }

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

@@ -93,9 +93,9 @@
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy-MM"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
@@ -119,24 +119,29 @@
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:direction')"
             prop="Major"
+            v-if="isEN"
           >
             <el-input
-              style="width: 97%"
               v-model="form.Major"
               type="textarea"
               :rows="2"
+              :maxlength="4000"
               clearable
               :placeholder="
                 $t('curriculumVitae:continuingTraining:placeholder:directionEN')
               "
             ></el-input>
           </el-form-item>
-          <el-form-item prop="MajorCN">
+          <el-form-item
+            prop="MajorCN"
+            :label="$t('curriculumVitae:continuingTraining:form:direction')"
+            v-else
+          >
             <el-input
-              style="width: 97%"
               type="textarea"
               :rows="2"
               v-model="form.MajorCN"
+              :maxlength="4000"
               clearable
               :placeholder="
                 $t('curriculumVitae:continuingTraining:placeholder:direction')
@@ -151,100 +156,99 @@
               <el-option
                 v-for="(item, index) in hospitalList"
                 :key="index"
-                :label="item.HospitalName"
+                :label="isEN ? item.HospitalName : item.HospitalNameCN"
                 :value="item.Id"
               >
                 <span>
-                  {{ item.HospitalName }}
+                  {{ isEN ? item.HospitalName : item.HospitalNameCN }}
                 </span>
               </el-option>
             </el-select>
           </el-form-item>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:continuingTraining:form:school')"
-                prop="School"
-              >
-                <el-input
-                  v-model="form.School"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:schoolEN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="SchoolCN" label-width="10px">
-                <el-input
-                  v-model="form.SchoolCN"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:school')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:continuingTraining:form:city')"
-                prop="City"
-              >
-                <el-input
-                  v-model="form.City"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:City')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CityCN" label-width="10px">
-                <el-input
-                  v-model="form.CityCN"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:CityCN')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:continuingTraining:form:Country')"
-                prop="Country"
-              >
-                <el-input
-                  v-model="form.Country"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:Country')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CountryCN" label-width="10px">
-                <el-input
-                  v-model="form.CountryCN"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:CountryCN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:school')"
+            prop="School"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.School"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:schoolEN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="SchoolCN"
+            :label="$t('curriculumVitae:continuingTraining:form:school')"
+            v-else
+          >
+            <el-input
+              v-model="form.SchoolCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:school')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:city')"
+            prop="City"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.City"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:City')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CityCN"
+            :label="$t('curriculumVitae:continuingTraining:form:city')"
+            v-else
+          >
+            <el-input
+              v-model="form.CityCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:CityCN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:Country')"
+            prop="Country"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.Country"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:Country')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CountryCN"
+            :label="$t('curriculumVitae:continuingTraining:form:Country')"
+            v-else
+          >
+            <el-input
+              v-model="form.CountryCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:CountryCN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
@@ -321,63 +325,95 @@ export default {
         BeginDate: [
           {
             required: true,
-            message: 'Please select a start date',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         EndDate: [
           {
             required: true,
-            message: 'Please select a valid date',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         Training: [
           {
             required: true,
-            message: 'Please select  degree',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         Major: [
           {
             required: true,
-            message: 'Please enter the major',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         MajorCN: [
           {
             required: true,
-            message: 'Please enter the major',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         City: [
-          { required: true, message: 'Please enter the city', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         CityCN: [
-          { required: true, message: 'Please enter the city', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Country: [
           {
             required: true,
-            message: 'Please enter the country',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
         ],
         CountryCN: [
           {
             required: true,
-            message: 'Please enter the country',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
         ],
       },
       loading: false,
@@ -472,10 +508,11 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,
 .el-date-editor {
-  width: 97%;
+  width: 100%;
 }
 </style>

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

@@ -101,9 +101,9 @@
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy-MM"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
@@ -112,40 +112,36 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="
-                  $t('curriculumVitae:EducationalExperience:form:specialy')
-                "
-                prop="Major"
-              >
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:specialyEN'
-                    )
-                  "
-                  v-model="form.Major"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="11">
-              <el-form-item prop="MajorCN" label-width="10px">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:specialy'
-                    )
-                  "
-                  v-model="form.MajorCN"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
+            prop="Major"
+            v-if="isEN"
+          >
+            <el-input
+              clearable
+              :placeholder="
+                $t(
+                  'curriculumVitae:EducationalExperience:placeholder:specialyEN'
+                )
+              "
+              v-model="form.Major"
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
+            prop="MajorCN"
+            v-else
+          >
+            <el-input
+              clearable
+              :placeholder="
+                $t('curriculumVitae:EducationalExperience:placeholder:specialy')
+              "
+              v-model="form.MajorCN"
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
 
           <el-form-item
             :label="$t('curriculumVitae:EducationalExperience:form:degree')"
@@ -161,99 +157,92 @@
             </el-select>
           </el-form-item>
 
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:EducationalExperience:form:school')"
-                prop="Organization"
-              >
-                <el-input
-                  v-model="form.Organization"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:schoolEN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item label-width="10px" prop="OrganizationCN">
-                <el-input
-                  v-model="form.OrganizationCN"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:school'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:EducationalExperience:form:city')"
-                prop="City"
-              >
-                <el-input
-                  v-model="form.City"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:EducationalExperience:placeholder:City')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CityCN" label-width="10px">
-                <el-input
-                  v-model="form.CityCN"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:CityCN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="
-                  $t('curriculumVitae:EducationalExperience:form:Country')
-                "
-                prop="Country"
-              >
-                <el-input
-                  v-model="form.Country"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:Country'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CountryCN" label-width="10px">
-                <el-input
-                  v-model="form.CountryCN"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:CountryCN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:school')"
+            prop="Organization"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.Organization"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:EducationalExperience:placeholder:schoolEN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:school')"
+            prop="OrganizationCN"
+            v-else
+          >
+            <el-input
+              v-model="form.OrganizationCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:EducationalExperience:placeholder:school')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:city')"
+            prop="City"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.City"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:EducationalExperience:placeholder:City')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:city')"
+            prop="CityCN"
+            v-else
+          >
+            <el-input
+              v-model="form.CityCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:EducationalExperience:placeholder:CityCN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:Country')"
+            prop="Country"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.Country"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:EducationalExperience:placeholder:Country')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CountryCN"
+            :label="$t('curriculumVitae:EducationalExperience:form:Country')"
+            v-else
+          >
+            <el-input
+              v-model="form.CountryCN"
+              clearable
+              :placeholder="
+                $t(
+                  'curriculumVitae:EducationalExperience:placeholder:CountryCN'
+                )
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
@@ -324,79 +313,111 @@ export default {
         BeginDate: [
           {
             required: true,
-            message: 'Please select a start date',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         EndDate: [
           {
             required: true,
-            message: 'Please select a valid date',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         Degree: [
           {
             required: true,
-            message: 'Please enter the degree',
+            message: this.$t('common:ruleMessage:specify'),
             trigger: 'blur',
           },
         ],
         Major: [
           {
             required: true,
-            message: 'Please enter the major',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         MajorCN: [
           {
             required: true,
-            message: 'Please enter the major',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         Organization: [
           {
             required: true,
-            message: 'Please enter the institution',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         OrganizationCN: [
           {
             required: true,
-            message: 'Please enter the institution',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         City: [
-          { required: true, message: 'Please enter the city', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message:this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         CityCN: [
-          { required: true, message: 'Please enter the city', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         Country: [
           {
             required: true,
-            message: 'Please enter the country',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
         ],
         CountryCN: [
           {
             required: true,
-            message: 'Please enter the country',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
         ],
       },
       loading: false,
@@ -485,10 +506,11 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,
 .el-date-editor {
-  width: 97%;
+  width: 100%;
 }
 </style>

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

@@ -107,7 +107,6 @@ export default {
   },
   methods: {
     closeDialog() {
-      console.log(111111111)
       this.$emit('update:visible', false)
     },
     handleAddHoliday() {

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

@@ -34,17 +34,14 @@
           <span v-if="isEN">{{ DATA.Department }}</span>
           <span v-else>{{ DATA.DepartmentCN }}</span>
         </span>
+        <span class="el-icon-first-aid-kit" v-else>
+          <span v-if="isEN">{{ DATA.DepartmentOther }}</span>
+          <span v-else>{{ DATA.DepartmentOtherCN }}</span>
+        </span>
         <span class="el-icon-user" v-if="DATA.Rank || DATA.RankCN">
           <span v-if="isEN">{{ DATA.Rank }}</span>
           <span v-else>{{ DATA.RankCN }}</span>
         </span>
-        <span
-          class="el-icon-medal"
-          v-if="DATA.WorkPartTimeEn || DATA.WorkPartTime"
-        >
-          <span v-if="isEN">{{ DATA.WorkPartTimeEn }}</span>
-          <span v-else>{{ DATA.WorkPartTime }}</span>
-        </span>
       </div>
       <div class="userTel">
         <span class="el-icon-phone-outline">
@@ -55,6 +52,20 @@
           DATA.WeChat
         }}</span>
       </div>
+      <div style="display: flex; font-size: 14px">
+        <span style="display: inline-block; width: 70px; color: #606266">{{
+          $t('curriculumVitae:info:meessage:partTimeJob')
+        }}</span>
+        <span
+          class="break-word"
+          style="
+            white-space: pre-wrap;
+            width: calc(100% - 80px);
+            word-wrap: break-word;
+          "
+          v-html="isEN ? DATA.WorkPartTimeEn : DATA.WorkPartTime"
+        ></span>
+      </div>
     </template>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
@@ -64,7 +75,7 @@
           v-loading="loading"
           :model="form"
           :rules="rules"
-          label-width="80px"
+          label-width="100px"
           size="small"
         >
           <div class="form_title">
@@ -76,7 +87,11 @@
                 :label="$t('curriculumVitae:info:form:surname')"
                 prop="FirstName"
               >
-                <el-input v-model="form.FirstName" clearable></el-input>
+                <el-input
+                  v-model="form.FirstName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -84,17 +99,25 @@
                 :label="$t('curriculumVitae:info:form:name')"
                 prop="LastName"
               >
-                <el-input v-model="form.LastName" clearable></el-input>
+                <el-input
+                  v-model="form.LastName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="12" v-if="!isEN">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:userNameCN')"
                 prop="ChineseName"
               >
-                <el-input v-model="form.ChineseName" clearable></el-input>
+                <el-input
+                  v-model="form.ChineseName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -134,7 +157,11 @@
                 :label="$t('curriculumVitae:info:form:phone')"
                 prop="Phone"
               >
-                <el-input v-model="form.Phone" clearable></el-input>
+                <el-input
+                  v-model="form.Phone"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -152,7 +179,11 @@
                 :label="$t('curriculumVitae:info:form:wechat')"
                 prop="WeChat"
               >
-                <el-input v-model="form.WeChat" clearable></el-input>
+                <el-input
+                  v-model="form.WeChat"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -189,17 +220,19 @@
               <el-option
                 v-for="(item, index) in hospitalList"
                 :key="index"
-                :label="item.HospitalName"
+                :label="isEN ? item.HospitalName : item.HospitalNameCN"
                 :value="item.Id"
               >
                 <span>
-                  {{ item.HospitalName }}
+                  {{ isEN ? item.HospitalName : item.HospitalNameCN }}
                 </span>
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:AffiliatedUniversity')"
+            prop="UniversityAffiliated"
+            v-if="isEN"
           >
             <el-input
               disabled
@@ -207,11 +240,32 @@
               type="textarea"
               autosize
               size="small"
+              :maxlength="4000"
             />
           </el-form-item>
-          <el-form-item :label="$t('curriculumVitae:info:form:City')">
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:AffiliatedUniversity')"
+            prop="UniversityAffiliated"
+            v-else
+          >
+            <el-input
+              disabled
+              v-model="form.UniversityAffiliatedCN"
+              type="textarea"
+              autosize
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:City')"
+            v-if="isEN"
+          >
             <el-input disabled v-model="form.City" size="small" />
           </el-form-item>
+          <el-form-item :label="$t('curriculumVitae:info:form:City')" v-else>
+            <el-input disabled v-model="form.CityCN" size="small" />
+          </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:department')"
             prop="DepartmentId"
@@ -223,11 +277,14 @@
                 :label="item.Value"
                 :value="item.Id"
               />
-              <el-option label="Other" :value="otherId" />
+              <el-option
+                :label="$t('curriculumVitae:selectLabel:Other')"
+                :value="otherId"
+              />
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="form.DepartmentId === otherId"
+            v-if="form.DepartmentId === otherId && isEN"
             class="other-item"
             prop="DepartmentOther"
           >
@@ -237,10 +294,11 @@
                 $t('curriculumVitae:info:form:placeholder:DepartmentOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
-            v-if="form.DepartmentId === otherId"
+            v-if="form.DepartmentId === otherId && !isEN"
             class="other-item"
             prop="DepartmentOtherCN"
           >
@@ -250,6 +308,7 @@
                 $t('curriculumVitae:info:form:placeholder:DepartmentOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -267,8 +326,8 @@
           </el-form-item>
           <el-form-item
             v-if="
-              $fd('Rank', form.RankId, 'id') === '其它' ||
-              $fd('Rank', form.RankId, 'id') === 'Other'
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && isEN
             "
             class="other-item"
             prop="RankOther"
@@ -279,12 +338,13 @@
                 $t('curriculumVitae:info:form:placeholder:RankOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
             v-if="
-              $fd('Rank', form.RankId, 'id') === '其它' ||
-              $fd('Rank', form.RankId, 'id') === 'Other'
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && !isEN
             "
             class="other-item"
             prop="RankOtherCN"
@@ -295,11 +355,13 @@
                 $t('curriculumVitae:info:form:placeholder:RankOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:partTimeJob')"
             prop="WorkPartTime"
+            v-if="!isEN"
           >
             <el-input
               :placeholder="
@@ -307,18 +369,24 @@
               "
               v-model="form.WorkPartTime"
               type="textarea"
-              :rows="2"
+              :rows="10"
               clearable
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
-          <el-form-item prop="WorkPartTimeEn">
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:partTimeJob')"
+            prop="WorkPartTimeEn"
+            v-else
+          >
             <el-input
               :placeholder="
                 $t('curriculumVitae:info:form:placeholder:partTimeJobEN')
               "
               v-model="form.WorkPartTimeEn"
               type="textarea"
-              :rows="2"
+              :rows="10"
+              :maxlength="4000"
               clearable
             ></el-input>
           </el-form-item>
@@ -368,7 +436,9 @@ const defaultForm = () => {
     WorkPartTime: null,
     WorkPartTimeEn: null,
     UniversityAffiliated: null,
+    UniversityAffiliatedCN: null,
     City: null,
+    CityCN: null,
   }
 }
 export default {
@@ -398,33 +468,61 @@ export default {
         showClose: true,
         width: '800px',
         title: this.$t('curriculumVitae:info:form:title'),
-        appendToBody: false,
+        appendToBody: true,
+        top: '8vh',
+        bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
       },
       form: defaultForm(),
       rules: {
         FirstName: [
           {
             required: true,
-            message: 'Please enter FirstName',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { 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' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ChineseName: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        ChineseName: [{ max: 50, message: 'The maximum length is 50' }],
         Sex: [
-          { required: true, message: 'Please select gender', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         TitleIds: [
-          { required: true, message: 'Please select Title', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         Phone: [
           {
             required: true,
-            message: 'Please enter phone number',
+            message: this.$t('common:ruleMessage:specify'),
             trigger: 'blur',
           },
           { max: 20, min: 7, message: 'The length is 7 to 20' },
@@ -432,51 +530,117 @@ export default {
         EMail: [
           {
             required: true,
-            message: 'Please input the email address',
+            message: this.$t('common:ruleMessage:specify'),
             trigger: 'blur',
           },
           {
             type: 'email',
-            message: 'Please input the correct email address',
+            message: this.$t('rules:email'),
             trigger: 'blur,change',
           },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        WeChat: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        WeChat: [{ max: 50, message: 'The maximum length is 50' }],
         Nation: [
           {
             required: true,
-            message: 'Please select the Nation',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         DepartmentId: [
           {
             required: true,
-            message: 'Please select department',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         DepartmentOther: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+          ,
+        ],
+        DepartmentOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        DepartmentOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
         RankId: [
-          { required: true, message: 'Please select rank', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         RankOther: [
-          { required: true, message: 'Please select rank', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         RankOtherCN: [
-          { required: true, message: 'Please select rank', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         HospitalId: [
           {
             required: true,
-            message: 'Please select hospital',
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        UniversityAffiliated: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        WorkPartTime: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        WorkPartTimeEn: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
             trigger: 'blur',
           },
         ],
@@ -542,6 +706,8 @@ export default {
       if (item.length) {
         this.form.UniversityAffiliated = item[0].UniversityAffiliated
         this.form.City = item[0].City
+        this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN
+        this.form.CityCN = item[0].CityCN
       }
     },
   },

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

@@ -12,8 +12,10 @@
       </el-button>
     </div>
     <div class="message" v-if="DATA.AwardsHonors || DATA.AwardsHonorsCN">
-      <span v-if="isEN">{{ DATA.AwardsHonors }}</span>
-      <span v-else>{{ DATA.AwardsHonorsCN }}</span>
+      <span
+        style="white-space: pre-wrap"
+        v-html="isEN ? DATA.AwardsHonors : DATA.AwardsHonorsCN"
+      ></span>
     </div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
@@ -23,29 +25,36 @@
           v-loading="loading"
           :model="form"
           :rules="rules"
-          label-width="80px"
+          label-width="100px"
           size="small"
         >
           <el-form-item
             :label="$t('curriculumVitae:other:form:AH')"
             prop="AwardsHonors"
+            v-if="isEN"
           >
             <el-input
               clearable
               v-model="form.AwardsHonors"
               style="margin-bottom: 10px"
               type="textarea"
-              :rows="2"
+              :rows="10"
+              :maxlength="4000"
               :placeholder="$t('curriculumVitae:other:placeholder:AHEN')"
             ></el-input>
           </el-form-item>
-          <el-form-item prop="AwardsHonorsCN">
+          <el-form-item
+            prop="AwardsHonorsCN"
+            :label="$t('curriculumVitae:other:form:AH')"
+            v-else
+          >
             <el-input
               clearable
               v-model="form.AwardsHonorsCN"
               style="margin-bottom: 10px"
               type="textarea"
-              :rows="2"
+              :rows="10"
+              :maxlength="4000"
               :placeholder="$t('curriculumVitae:other:placeholder:AH')"
             ></el-input>
           </el-form-item>
@@ -102,12 +111,27 @@ export default {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
         appendToBody: true,
       },
       form: defaultForm(),
-      rules: {},
+      rules: {
+        AwardsHonors: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        AwardsHonorsCN: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
     }
   },
@@ -155,6 +179,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -163,6 +188,7 @@ export default {
     padding: 10px;
     line-height: 30px;
     border-radius: 5px;
+    word-wrap: break-word;
   }
 }
 .el-select,

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

@@ -66,6 +66,7 @@
               clearable
               placeholder=""
               v-model="form.BankNum"
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -77,6 +78,7 @@
               clearable
               placeholder=""
               v-model="form.BankName"
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -88,6 +90,7 @@
               clearable
               placeholder=""
               v-model="form.OpeningBank"
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -95,7 +98,12 @@
             :label="$t('curriculumVitae:pay:form:idCard')"
             prop="IdCard"
           >
-            <el-input clearable placeholder="" v-model="form.IdCard"></el-input>
+            <el-input
+              clearable
+              placeholder=""
+              v-model="form.IdCard"
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
           <el-form-item
             style="width: 45%"
@@ -106,6 +114,7 @@
               clearable
               placeholder=""
               v-model="form.BankPhoneNum"
+              :maxlength="400"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -181,6 +190,25 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BankName: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        OpeningBank: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         IdCard: [
           {
@@ -194,6 +222,11 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         BankPhoneNum: [
           {
@@ -207,6 +240,11 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       loading: false,
@@ -256,6 +294,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -265,5 +304,8 @@ export default {
     line-height: 30px;
     border-radius: 5px;
   }
+  ::v-deep .el-form-item__label {
+    color: #000;
+  }
 }
 </style>

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

@@ -16,22 +16,44 @@
       v-if="DATA.Research || DATA.ResearchCN || DATA.Grants || DATA.GrantsCN"
     >
       <el-form class="demo-form-inline">
-        <el-form-item
+        <!-- <el-form-item
           :label="$t('curriculumVitae:scientificResearchProject:direction')"
         >
           <div>
             <span v-if="isEN">{{ DATA.Research }}</span>
             <span v-else>{{ DATA.ResearchCN }}</span>
           </div>
-        </el-form-item>
-        <el-form-item
+        </el-form-item> -->
+        <div style="display: flex; font-size: 14px">
+          <span style="display: inline-block; width: 80px; color: #606266">{{
+            $t('curriculumVitae:scientificResearchProject:direction')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 80px)"
+            v-html="isEN ? DATA.Research : DATA.ResearchCN"
+          ></span>
+        </div>
+        <!-- <el-form-item
           :label="$t('curriculumVitae:scientificResearchProject:subject')"
         >
           <div>
-            <span v-if="isEN">{{ DATA.Grants }}</span>
-            <span v-else>{{ DATA.GrantsCN }}</span>
+            <span
+              style="white-space: pre-wrap"
+              v-html="isEN ? DATA.Grants : DATA.GrantsCN"
+            ></span>
           </div>
-        </el-form-item>
+        </el-form-item> -->
+        <div style="display: flex; font-size: 14px">
+          <span style="display: inline-block; width: 80px; color: #606266">{{
+            $t('curriculumVitae:scientificResearchProject:subject')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 80px)"
+            v-html="isEN ? DATA.Grants : DATA.GrantsCN"
+          ></span>
+        </div>
       </el-form>
     </div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
@@ -50,6 +72,7 @@
               $t('curriculumVitae:scientificResearchProject:form:direction')
             "
             prop="Research"
+            v-if="isEN"
           >
             <el-input
               clearable
@@ -60,9 +83,18 @@
                   'curriculumVitae:scientificResearchProject:placeholder:directionEN'
                 )
               "
+              type="textarea"
+              :rows="2"
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
-          <el-form-item prop="ResearchCN">
+          <el-form-item
+            prop="ResearchCN"
+            :label="
+              $t('curriculumVitae:scientificResearchProject:form:direction')
+            "
+            v-else
+          >
             <el-input
               v-model="form.ResearchCN"
               clearable
@@ -71,6 +103,9 @@
                   'curriculumVitae:scientificResearchProject:placeholder:direction'
                 )
               "
+              type="textarea"
+              :rows="2"
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -78,13 +113,15 @@
               $t('curriculumVitae:scientificResearchProject:form:subject')
             "
             prop="Grants"
+            v-if="isEN"
           >
             <el-input
               v-model="form.Grants"
               clearable
               style="margin-bottom: 10px"
               type="textarea"
-              :rows="2"
+              :rows="5"
+              :maxlength="4000"
               :placeholder="
                 $t(
                   'curriculumVitae:scientificResearchProject:placeholder:subjectEN'
@@ -92,12 +129,19 @@
               "
             ></el-input>
           </el-form-item>
-          <el-form-item prop="GrantsCN">
+          <el-form-item
+            prop="GrantsCN"
+            :label="
+              $t('curriculumVitae:scientificResearchProject:form:subject')
+            "
+            v-else
+          >
             <el-input
               clearable
               v-model="form.GrantsCN"
               type="textarea"
-              :rows="2"
+              :rows="5"
+              :maxlength="4000"
               :placeholder="
                 $t(
                   'curriculumVitae:scientificResearchProject:placeholder:subject'
@@ -165,7 +209,36 @@ export default {
         appendToBody: true,
       },
       form: defaultForm(),
-      rules: {},
+      rules: {
+        Research: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        ResearchCN: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        Grants: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        GrantsCN: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
     }
   },
@@ -213,6 +286,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -221,6 +295,7 @@ export default {
     padding: 10px;
     line-height: 30px;
     border-radius: 5px;
+    word-wrap: break-word;
   }
 }
 .el-select,

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

@@ -0,0 +1,422 @@
+<template>
+  <div class="setting">
+    <div class="title">
+      <span>{{ $t('curriculumVitae:setting:title') }}</span>
+      <el-button
+        type="text"
+        class="editBtn"
+        :disabled="!reviewerId"
+        @click.stop="openEdit"
+      >
+        {{ $t('common:button:edit') }}
+      </el-button>
+    </div>
+    <div class="message">
+      <el-form :inline="true" class="demo-form-inline">
+        <el-form-item
+          :label="$t('system:Setting:label:Blind Name')"
+          style="width: 45%"
+        >
+          {{ DATA.BlindName }}
+        </el-form-item>
+        <el-form-item
+          :label="$t('system:Setting:label:Blind NameCN')"
+          style="width: 45%"
+        >
+          {{ DATA.BlindNameCN }}
+        </el-form-item>
+        <div style="display: flex; font-size: 14px; margin-bottom: 22px">
+          <span style="display: inline-block; width: 120px; color: #000">{{
+            $t('system:Setting:label:Blind Publications')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 120px)"
+            v-html="DATA.BlindPublications"
+          ></span>
+        </div>
+        <el-form-item
+          :label="$t('system:Setting:label:Information Confirmed?')"
+          style="width: 24%"
+        >
+          {{
+            DATA.ReviewStatus === 1
+              ? $t('system:Setting:label:Information Confirmed?:Yes')
+              : $t('system:Setting:label:Information Confirmed?:No')
+          }}
+        </el-form-item>
+        <el-form-item
+          :label="$t('system:Setting:label:Contractor Status?')"
+          style="width: 24%"
+        >
+          {{
+            DATA.CooperateStatus === 1
+              ? $t('system:Setting:label:Information Confirmed?:Yes')
+              : $t('system:Setting:label:Information Confirmed?:No')
+          }}
+        </el-form-item>
+        <el-form-item
+          :label="$t('system:Setting:label:Accepting New Trials?')"
+          style="width: 24%"
+        >
+          {{
+            DATA.AcceptingNewTrial
+              ? $t('system:Setting:label:Information Confirmed?:Yes')
+              : $t('system:Setting:label:Information Confirmed?:No')
+          }}
+        </el-form-item>
+        <el-form-item
+          :label="$t('system:Setting:label:Actively Reading?')"
+          style="width: 24%"
+        >
+          {{
+            DATA.ActivelyReading
+              ? $t('system:Setting:label:Information Confirmed?:Yes')
+              : $t('system:Setting:label:Information Confirmed?:No')
+          }}
+        </el-form-item>
+        <div style="display: flex; font-size: 14px; margin-bottom: 22px">
+          <span style="display: inline-block; width: 80px; color: #000">{{
+            $t('system:Setting:label:Comment:')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 80px)"
+            v-html="DATA.AdminComment"
+          ></span>
+        </div>
+      </el-form>
+    </div>
+    <el-dialog
+      :title="$t('system:Setting:title:Blinded Setting')"
+      :visible.sync="visible"
+      width="50%"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      :before-close="closeDialog"
+      top="8vh"
+      append-to-body
+    >
+      <div class="base-modal-body">
+        <el-form
+          ref="settingFrom"
+          v-loading="loading"
+          :model="form"
+          :rules="rules"
+          label-width="120px"
+          size="small"
+        >
+          <div class="form_title">
+            {{ $t('system:Setting:title:Blinded information') }}
+          </div>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:Setting:label:Blind Name')"
+                prop="BlindName"
+              >
+                <el-input
+                  v-model="form.BlindName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:Setting:label:Blind NameCN')"
+                prop="BlindNameCN"
+              >
+                <el-input
+                  v-model="form.BlindNameCN"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item
+            :label="$t('system:Setting:label:Blind Publications')"
+            prop="BlindPublications"
+          >
+            <el-input
+              v-model="form.BlindPublications"
+              type="textarea"
+              rows="8"
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <div class="form_title">
+            {{ $t('system:Setting:title:Blinded Setting') }}
+          </div>
+          <el-form-item
+            :label="$t('system:Setting:label:Information Confirmed?')"
+          >
+            <el-radio-group v-model="form.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="form.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="form.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="form.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:Comment:')"
+            prop="AdminComment"
+          >
+            <el-input
+              v-model="form.AdminComment"
+              type="textarea"
+              rows="8"
+              :maxlength="4000"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="closeDialog">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave"
+          :loading="loading"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getAuditState, updateAuditResume } from '@/api/reviewers'
+const defaultForm = () => {
+  return {
+    CooperateStatus: 2,
+    ResumeStatus: 2,
+    ReviewStatus: 2,
+    AcceptingNewTrial: false,
+    ActivelyReading: false,
+    IsVirtual: false,
+    BlindName: '',
+    AdminComment: '',
+    InHoliday: '',
+    BlindNameCN: '',
+    BlindPublications: '',
+  }
+}
+export default {
+  name: 'setting',
+  props: {
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      DATA: defaultForm(),
+      form: defaultForm(),
+      loading: false,
+      rules: {
+        AdminComment: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        BlindName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BlindNameCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BlindPublications: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+      },
+      radioDisabled: false,
+      visible: false,
+    }
+  },
+  created() {
+    // this.getData()
+    this.handleChange()
+  },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.getData()
+      }
+    },
+  },
+  methods: {
+    openEdit() {
+      this.visible = true
+    },
+    handleChange() {
+      if (this.form.ReviewStatus === 2 || this.form.CooperateStatus === 2) {
+        this.form.ActivelyReading = false
+        this.form.AcceptingNewTrial = false
+        this.radioDisabled = true
+      } else {
+        this.radioDisabled = false
+      }
+    },
+    closeDialog() {
+      this.visible = false
+    },
+    async handleSave() {
+      try {
+        let validate = await this.$refs.settingFrom.validate()
+        if (!validate) return false
+        const param = {}
+        Object.assign(param, this.form)
+        param.ResumeStatus = param.ReviewStatus
+        this.loading = true
+        let res = await updateAuditResume(param)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.closeDialog()
+          this.getData()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    async getData() {
+      try {
+        let res = await getAuditState(this.reviewerId)
+        if (res.IsSuccess) {
+          Object.keys(this.form).forEach((key) => {
+            this.form[key] = res.Result[key]
+          })
+          Object.keys(this.DATA).forEach((key) => {
+            this.DATA[key] = res.Result[key]
+          })
+          if (res.Result.Id) {
+            this.form.Id = res.Result.Id
+          }
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding: 10px 10px 10px 10px;
+  .base-modal-body {
+    min-height: 100px;
+    max-height: 650px;
+    overflow-y: auto;
+    padding: 10px;
+    border: 1px solid #e0e0e0;
+  }
+}
+::v-deep .el-dialog__footer {
+  padding: 10px;
+}
+.form_title {
+  margin: 10px 0;
+  display: flex;
+  align-items: center;
+  &::after {
+    margin-left: 20px;
+    display: block;
+    content: '';
+    border-top: 1px solid #eee;
+    flex: 1;
+  }
+}
+.setting {
+  min-height: 100px;
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    font-weight: bold;
+  }
+  .message {
+    margin: auto;
+    min-height: 100px;
+    background-color: #eee;
+    padding: 10px;
+    line-height: 30px;
+    border-radius: 5px;
+  }
+  ::v-deep .el-form-item__label {
+    color: #000;
+  }
+}
+</style>

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

@@ -88,11 +88,14 @@
                 :label="item.Value"
                 :value="item.Id"
               />
-              <el-option label="Other" :value="otherId" />
+              <el-option
+                :label="$t('curriculumVitae:selectLabel:Other')"
+                :value="otherId"
+              />
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="form.SpecialityId == otherId"
+            v-if="form.SpecialityId == otherId && isEN"
             class="other-item"
             prop="SpecialityOther"
           >
@@ -102,10 +105,11 @@
                 $t('curriculumVitae:specialty:placeholder:SpecialityOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
-            v-if="form.SpecialityId == otherId"
+            v-if="form.SpecialityId == otherId && !isEN"
             prop="SpecialityOtherCN"
             class="other-item"
           >
@@ -115,6 +119,7 @@
                 $t('curriculumVitae:specialty:placeholder:SpecialityOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -138,7 +143,8 @@
           <el-form-item
             v-if="
               form.SubspecialityIds &&
-              form.SubspecialityIds.indexOf(otherId) > -1
+              form.SubspecialityIds.indexOf(otherId) > -1 &&
+              isEN
             "
             class="other-item"
             prop="SubspecialityOther"
@@ -149,12 +155,14 @@
                 $t('curriculumVitae:specialty:placeholder:SubspecialityOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
             v-if="
               form.SubspecialityIds &&
-              form.SubspecialityIds.indexOf(otherId) > -1
+              form.SubspecialityIds.indexOf(otherId) > -1 &&
+              !isEN
             "
             class="other-item"
             prop="SubspecialityOtherCN"
@@ -165,6 +173,7 @@
                 $t('curriculumVitae:specialty:placeholder:SubspecialityOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -187,7 +196,9 @@
           </el-form-item>
           <el-form-item
             v-if="
-              form.ReadingTypeIds && form.ReadingTypeIds.indexOf(otherId) > -1
+              form.ReadingTypeIds &&
+              form.ReadingTypeIds.indexOf(otherId) > -1 &&
+              isEN
             "
             prop="ReadingTypeOther"
             class="other-item"
@@ -198,11 +209,14 @@
                 $t('curriculumVitae:specialty:placeholder:ReadingTypeOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
             v-if="
-              form.ReadingTypeIds && form.ReadingTypeIds.indexOf(otherId) > -1
+              form.ReadingTypeIds &&
+              form.ReadingTypeIds.indexOf(otherId) > -1 &&
+              !isEN
             "
             prop="ReadingTypeOtherCN"
             class="other-item"
@@ -213,6 +227,7 @@
                 $t('curriculumVitae:specialty:placeholder:ReadingTypeOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
         </el-form>
@@ -291,44 +306,90 @@ export default {
         SpecialityId: [
           {
             required: true,
-            message: 'Please select speciality',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         SpecialityOther: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        SpecialityOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        SpecialityOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
         ReadingTypeIds: [
           {
             required: true,
-            message: 'Please select clinical reading type',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         ReadingTypeOther: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         ReadingTypeOtherCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         SubspecialityIds: [
           {
             required: true,
-            message: 'Please select subspecialty',
+            message: this.$t('common:ruleMessage:select'),
             trigger: 'blur',
           },
         ],
         SubspecialityOther: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
         SubspecialityOtherCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       loading: false,
@@ -349,7 +410,7 @@ export default {
         ...this.dictionaryList.Subspeciality,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },
@@ -358,7 +419,7 @@ export default {
         ...this.dictionaryList.ReadingType,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },

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

@@ -11,12 +11,96 @@
         {{ $t('common:button:edit') }}
       </el-button>
     </div>
-    <div class="message" v-if="DATA.SummarizeEn || DATA.Summarize">
-      {{ isEN ? DATA.SummarizeEn : DATA.Summarize }}
-    </div>
+    <div
+      class="message"
+      v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
+      style="white-space: pre-wrap"
+      v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
+    ></div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
       <template slot="dialog-body">
+        <div class="form_title">
+          {{ $t('curriculumVitae:summarize:form:tableTitle') }}
+        </div>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleAdd()"
+          style="float: right; margin-bottom: 5px"
+        >
+          {{ $t('common:button:add') }}
+        </el-button>
+        <el-table
+          ref="summarizeTable"
+          :data="list"
+          border
+          class="table"
+          :loading="loading"
+          size="small"
+          :row-style="tableRowClassName"
+        >
+          <el-table-column type="index" width="30" />
+          <el-table-column
+            prop="Indication"
+            :label="$t('system:reviewer:label:Indication')"
+            show-overflow-tooltip
+            v-if="!isEN"
+          />
+          <el-table-column
+            prop="IndicationEn"
+            :label="$t('system:reviewer:label:Indication')"
+            show-overflow-tooltip
+            v-else
+          />
+          <el-table-column
+            prop="Summarize"
+            :label="$t('system:reviewer:label:SummarizeZH')"
+            show-overflow-tooltip
+            v-if="!isEN"
+          />
+          <el-table-column
+            prop="SummarizeEn"
+            :label="$t('system:reviewer:label:SummarizeEN')"
+            show-overflow-tooltip
+            v-else
+          />
+          <el-table-column
+            prop="IsMain"
+            :label="$t('system:reviewer:label:IsMain')"
+            show-overflow-tooltip
+            width="100px"
+          >
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.IsMain) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('system:EducationTraining:table:Operation')"
+            width="120px"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="handleAdd(scope.row)">
+                {{ $t('common:button:edit') }}
+              </el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click="handleDelete(scope.row, scope.$index)"
+              >
+                {{ $t('common:button:delete') }}
+              </el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click="setCurrent(scope.row)"
+                v-if="trialId"
+              >
+                {{ $t('common:button:check') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
         <el-form
           ref="summarizeFrom"
           v-loading="loading"
@@ -24,10 +108,32 @@
           :rules="rules"
           label-width="80px"
           size="small"
+          v-if="trialId"
         >
+          <div class="form_title">
+            {{ $t('curriculumVitae:summarize:form:formTitle') }}
+          </div>
+          <template>
+            <el-form-item>
+              <div style="float: right">
+                <!-- <el-button
+                  type="text"
+                  size="small"
+                  @click="cover"
+                  :disabled="!currentRow.Id"
+                >
+                  {{ $t('curriculumVitae:summarize:button:cover') }}
+                </el-button> -->
+                <el-button type="text" size="small" @click="addNew">
+                  {{ $t('curriculumVitae:summarize:button:addNew') }}
+                </el-button>
+              </div>
+            </el-form-item>
+          </template>
           <el-form-item
             :label="$t('curriculumVitae:summarize:form:summarize')"
             prop="Summarize"
+            v-if="!isEN"
           >
             <el-input
               :placeholder="
@@ -35,24 +141,30 @@
               "
               v-model="form.Summarize"
               type="textarea"
-              :rows="2"
+              :rows="10"
               clearable
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
-          <el-form-item prop="SummarizeEn">
+          <el-form-item
+            :label="$t('curriculumVitae:summarize:form:summarize')"
+            prop="SummarizeEn"
+            v-else
+          >
             <el-input
               v-model="form.SummarizeEn"
               :placeholder="
                 $t('curriculumVitae:summarize:form:placeholder:summarizeEN')
               "
               type="textarea"
-              :rows="2"
+              :rows="10"
               clearable
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
         </el-form>
       </template>
-      <template slot="dialog-footer">
+      <template slot="dialog-footer" v-if="trialId">
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
@@ -66,15 +178,121 @@
         </el-button>
       </template>
     </base-model>
+    <base-model :config="model_cfg_table">
+      <template slot="dialog-body">
+        <el-form
+          ref="summarizeFrom2"
+          v-loading="loading"
+          :rules="rules"
+          :model="tableForm"
+          class="demo-ruleForm"
+          label-width="100px"
+        >
+          <el-form-item
+            :label="$t('system:reviewer:label:Indication')"
+            prop="Indication"
+            v-if="!isEN"
+          >
+            <el-input
+              v-model="tableForm.Indication"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:Indication')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item
+            prop="IndicationEn"
+            :label="$t('system:reviewer:label:Indication')"
+            v-else
+          >
+            <el-input
+              v-model="tableForm.IndicationEn"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:IndicationEn')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item
+            :label="$t('system:reviewer:label:Summarize')"
+            prop="Summarize"
+            v-if="!isEN"
+          >
+            <el-input
+              v-model="tableForm.Summarize"
+              type="textarea"
+              :rows="10"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:summarize')
+              "
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <el-form-item
+            prop="SummarizeEn"
+            :label="$t('system:reviewer:label:Summarize')"
+            v-else
+          >
+            <el-input
+              v-model="tableForm.SummarizeEn"
+              type="textarea"
+              :rows="10"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:summarizeEN')
+              "
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <el-form-item
+            prop="IsMain"
+            :label="$t('system:reviewer:label:IsMain')"
+          >
+            <el-switch
+              v-model="tableForm.IsMain"
+              :disabled="list.length <= 0 || ISMAIN"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle2">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave2"
+          :loading="loading"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
   </div>
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
-import { updateGneralSituation } from '@/api/reviewers'
+import {
+  addOrUpdateGneralSituation,
+  getSummarizeInfo,
+  deleteSummarizeInfo,
+} from '@/api/reviewers'
 const defaultForm = () => {
   return {
-    SummarizeEn: '',
-    Summarize: '',
+    Id: null,
+    DoctorId: null,
+    Summarize: null,
+    SummarizeEn: null,
+    IsMain: false,
+    Indication: null,
+    IndicationEn: null,
+    TrialId: null,
   }
 }
 export default {
@@ -92,6 +310,10 @@ export default {
       type: String,
       default: '',
     },
+    trialId: {
+      type: String,
+      default: '',
+    },
     isEN: {
       type: Boolean,
       default: false,
@@ -102,38 +324,189 @@ export default {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:summarize:form:title'),
         appendToBody: true,
       },
+      model_cfg_table: {
+        visible: false,
+        showClose: true,
+        width: '800px',
+        title: this.$t('system:reviewer:form:SummarizeTitle'),
+        appendToBody: true,
+        top: '8vh',
+      },
+      tableForm: defaultForm(),
       form: defaultForm(),
-      rules: {},
+      rules: {
+        Indication: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        IndicationEn: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Summarize: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        SummarizeEn: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
+      list: [],
+      currentRow: {},
+      ISMAIN: false,
+      SaveSummarizeInfoType: 0,
     }
   },
+  computed: {
+    mainSummarize() {
+      if (Array.isArray(this.DATA.SummarizeList) && this.trialId) {
+        return this.DATA.SummarizeList[0] || {}
+      }
+      if (Array.isArray(this.DATA.SummarizeList)) {
+        return this.DATA.SummarizeList.find((item) => item.IsMain) || {}
+      }
+      return {}
+    },
+  },
   methods: {
-    openEdit() {
+    cover() {},
+    addNew() {
+      this.SaveSummarizeInfoType = 2
+      this.tableForm = defaultForm()
+      this.tableForm.Summarize = this.form.Summarize
+      this.tableForm.SummarizeEn = this.form.SummarizeEn
+      // this.tableForm.Indication = this.form.Indication
+      // this.tableForm.IndicationEn = this.form.IndicationEn
+      this.model_cfg_table.visible = true
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.Id === this.currentRow.Id) {
+        return {
+          background: '#d9ecff',
+        }
+      }
+      return {}
+    },
+    handleAdd(row) {
+      this.tableForm = defaultForm()
+      this.ISMAIN = false
+      this.SaveSummarizeInfoType = 0
+      if (row) {
+        Object.keys(this.tableForm).forEach((key) => {
+          this.tableForm[key] = row[key]
+        })
+        this.tableForm.Id = row.Id
+        if (this.tableForm.IsMain) {
+          this.ISMAIN = true
+        }
+      }
+      if (this.list.length <= 0) {
+        this.tableForm.IsMain = true
+      }
+      this.model_cfg_table.visible = true
+    },
+    async handleDelete(row, index) {
+      try {
+        if (row.IsMain) {
+          return this.$message.warning(
+            this.$t('system:reviewer:message:deletedSuccessfully')
+          )
+        }
+        let confirm = await this.$confirm(
+          this.$t('system:reviewer:confirm:delete')
+        )
+        if (!confirm) return false
+        let data = {
+          Id: row.Id,
+        }
+        this.loading = true
+        let res = await deleteSummarizeInfo(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          // this.getDetail()
+          this.list.splice(index, 1)
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+      }
+    },
+    // 获取系统模板
+    async getIndicationList() {
+      try {
+        let id = this.reviewerId
+        if (!id) return false
+        let res = await getSummarizeInfo({
+          DoctorId: id,
+        })
+        if (res.IsSuccess) {
+          this.list = res.Result.SummarizeList
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async openEdit() {
       this.form = defaultForm()
       Object.keys(this.form).forEach((key) => {
-        if (this.DATA[key]) {
-          this.form[key] = this.DATA[key]
-        }
+        // if (!this.isPM) {
+        this.form[key] = this.mainSummarize[key]
+        // }
       })
+      this.getIndicationList()
+      this.currentRow = {}
       this.model_cfg.visible = true
     },
     handleCancle() {
       this.form = defaultForm()
+      this.currentRow = {}
       this.model_cfg.visible = false
     },
+    handleCancle2() {
+      this.tableForm = defaultForm()
+      this.model_cfg_table.visible = false
+    },
     async handleSave() {
       try {
         let validate = await this.$refs.summarizeFrom.validate()
         if (!validate) return false
         if (this.reviewerId) {
-          this.form.Id = this.reviewerId
+          this.form.DoctorId = this.reviewerId
+        }
+        if (this.trialId) {
+          this.form.TrialId = this.trialId
         }
         this.loading = true
-        let res = await updateGneralSituation(this.form)
+        let res = await addOrUpdateGneralSituation(this.form)
         this.loading = false
         if (res.IsSuccess) {
           this.$emit('getInfo')
@@ -144,6 +517,48 @@ export default {
         console.log(err)
       }
     },
+    async handleSave2() {
+      try {
+        let validate = await this.$refs.summarizeFrom2.validate()
+        if (!validate) return false
+        this.tableForm.DoctorId = this.reviewerId
+        this.loading = true
+        if (this.trialId && this.SaveSummarizeInfoType > 0) {
+          this.tableForm.TrialId = this.trialId
+          this.tableForm.SaveSummarizeInfoType = this.SaveSummarizeInfoType
+        }
+        if (this.list.length <= 0) {
+          this.tableForm.IsMain = true
+        }
+        let res = await addOrUpdateGneralSituation(this.tableForm)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.model_cfg_table.visible = false
+          if (this.SaveSummarizeInfoType > 0) {
+            this.$emit('getInfo')
+            this.model_cfg.visible = false
+            return false
+          }
+          this.getIndicationList()
+          // this.getDetail()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    handleCurrentChange(val) {
+      this.currentRow = val
+      this.form.Summarize = this.currentRow.Summarize
+      this.form.SummarizeEn = this.currentRow.SummarizeEn
+      this.form.Indication = this.currentRow.Indication
+      this.form.IndicationEn = this.currentRow.IndicationEn
+    },
+    setCurrent(row) {
+      // this.$refs.summarizeTable.setCurrentRow(row)
+      this.handleCurrentChange(row)
+    },
   },
 }
 </script>
@@ -155,14 +570,29 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
+    width: 100%;
     margin: auto;
     min-height: 100px;
     background-color: #eee;
     padding: 10px;
     line-height: 30px;
     border-radius: 5px;
+    word-wrap: break-word;
+  }
+}
+.form_title {
+  margin: 10px 0;
+  display: flex;
+  align-items: center;
+  &::after {
+    margin-left: 20px;
+    display: block;
+    content: '';
+    border-top: 1px solid #eee;
+    flex: 1;
   }
 }
 </style>

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

@@ -11,9 +11,11 @@
         {{ $t('common:button:edit') }}
       </el-button>
     </div>
-    <div class="message" v-if="DATA.Publications">
-      {{ DATA.Publications }}
-    </div>
+    <div
+      class="message"
+      v-if="DATA.Publications"
+      v-html="DATA.Publications"
+    ></div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
       <template slot="dialog-body">
@@ -33,7 +35,8 @@
               v-model="form.Publications"
               clearable
               type="textarea"
-              :rows="6"
+              :rows="10"
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -88,12 +91,20 @@ export default {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:treatise:form:title'),
         appendToBody: true,
       },
       form: defaultForm(),
-      rules: {},
+      rules: {
+        Publications: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
       daterange: [],
     }
@@ -142,6 +153,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,
@@ -156,5 +168,6 @@ export default {
   line-height: 30px;
   border-radius: 5px;
   white-space: pre-wrap;
+  word-wrap: break-word;
 }
 </style>

src/views/reviewers/curriculumVitae/index.vue

@@ -40,6 +40,9 @@
         <el-menu-item index="pay">{{
           $t('curriculumVitae:menu:pay')
         }}</el-menu-item>
+        <el-menu-item index="setting" v-if="isPM">{{
+          $t('curriculumVitae:button:seeting')
+        }}</el-menu-item>
       </el-menu>
     </div>
     <div class="main" id="main">
@@ -47,6 +50,9 @@
         <div class="title">
           <div>{{ $t('curriculumVitae:content:title') }}</div>
           <div class="btnBox">
+            <!-- <el-button type="text" @click.stop="openSetting" v-if="isPM">
+              {{ $t('curriculumVitae:button:seeting') }}
+            </el-button> -->
             <el-button type="text" @click.stop="openHoliday">
               {{ $t('curriculumVitae:button:holiday') }}
             </el-button>
@@ -57,7 +63,10 @@
               $t('curriculumVitae:button:importResume')
             }}</el-button> -->
             <el-button type="text" @click.stop="openPreview">
-              {{ $t('common:button:preview') }}
+              {{ $t('curriculumVitae:button:preview') }}
+            </el-button>
+            <el-button type="text" @click.stop="openPreview(false)">
+              {{ $t('common:button:previewBlindState') }}
             </el-button>
           </div>
         </div>
@@ -78,6 +87,7 @@
               ...reviewerData.SummarizeInfo,
             }"
             :reviewerId.sync="reviewerId"
+            :trialId="trialId"
             :isEN="isEN"
             @getInfo="getDetail"
           />
@@ -121,6 +131,7 @@
             :DATA="{ ...reviewerData.TrialExperienceView }"
             :isEN="isEN"
             :reviewerId.sync="reviewerId"
+            :trialId="trialId"
             @getInfo="getDetail"
           />
         </div>
@@ -148,6 +159,9 @@
             @getInfo="getDetail"
           />
         </div>
+        <div class="box" id="setting" v-if="isPM">
+          <setting :isEN="isEN" :reviewerId.sync="reviewerId" />
+        </div>
       </div>
       <div class="rightFile">
         <!--简历附件-->
@@ -163,14 +177,21 @@
         <agreement
           :DATA="reviewerData.AttachmentList"
           :isEN="isEN"
+          :isPM="isPM"
           :reviewerId.sync="reviewerId"
           @getInfo="getDetail"
         />
       </div>
     </div>
-    <el-dialog :visible.sync="visible" fullscreen>
+    <el-dialog :visible.sync="visible" fullscreen append-to-body>
       <div style="height: 100%; overflow: auto">
-        <preview :isEN="isEN" :reviewerId.sync="reviewerId" v-if="visible" />
+        <preview
+          :isEN="isEN"
+          :reviewerId.sync="reviewerId"
+          :trialId="trialId"
+          :isAll="isAll"
+          v-if="visible"
+        />
       </div>
     </el-dialog>
     <holiday
@@ -178,6 +199,11 @@
       :reviewerId.sync="reviewerId"
       :visible.sync="holidayVisible"
     />
+    <!-- <setting
+      v-if="settingVisible"
+      :reviewerId.sync="reviewerId"
+      :visible.sync="settingVisible"
+    /> -->
   </div>
 </template>
 <script>
@@ -195,6 +221,7 @@ import treatise from './components/info/treatise.vue'
 import other from './components/info/other.vue'
 import pay from './components/info/pay.vue'
 import holiday from './components/info/holiday.vue'
+import setting from './components/info/setting.vue'
 import preview from './preview.vue'
 import { getDetail } from '@/api/reviewers'
 import { mapMutations } from 'vuex'
@@ -215,6 +242,7 @@ export default {
     pay,
     holiday,
     preview,
+    setting,
   },
   data() {
     return {
@@ -222,7 +250,8 @@ export default {
       isScrollAuto: true,
       visible: false,
       loading: false,
-      reviewerId: null,
+      reviewerId: '',
+      trialId: '',
       reviewerData: {
         BasicInfoView: {},
         EmploymentView: {},
@@ -242,16 +271,27 @@ export default {
       dom: null,
 
       holidayVisible: false,
+      isAll: true,
+
+      // settingVisible: false,
     }
   },
   computed: {
     isEN() {
       return this.$i18n.locale !== 'zh'
     },
+    isPM() {
+      // return true
+      return this.hasPermi(['role:pm'])
+    },
   },
   async created() {
-    this.$i18n.locale = this.$route.query.lang
-    await this.setLanguage(this.$route.query.lang)
+    this.$i18n.locale =
+      this.$route.query.lang || zzSessionStorage.getItem('lang')
+    this.trialId =
+      this.$route.query.trialId || zzSessionStorage.getItem('trialId')
+    await this.setLanguage(this.$i18n.locale)
+    this.$updateDictionary()
     if (sessionStorage.getItem('reviewerId')) {
       this.reviewerId = sessionStorage.getItem('reviewerId')
       this.getDetail()
@@ -273,12 +313,14 @@ export default {
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+
     // 获取详情
     async getDetail() {
       try {
         let id = this.reviewerId
+        let trialId = this.trialId
         this.loading = true
-        let res = await getDetail(id)
+        let res = await getDetail(id, trialId)
         this.loading = false
         if (res.IsSuccess) {
           this.reviewerData = res.Result
@@ -316,18 +358,23 @@ export default {
         }
       }
       // 把下标赋值给 vue 的 data
-      if (navItem) {
+      if (navItem && navItem.id) {
         this.activeIndex = navItem.id
       }
     },
     // 预览简历
-    openPreview() {
+    openPreview(isAll = true) {
+      this.isAll = isAll
       this.visible = true
     },
     // 假期计划
     openHoliday() {
       this.holidayVisible = true
     },
+    // 设置
+    // openSetting() {
+    //   this.settingVisible = true
+    // },
   },
 }
 </script>
@@ -340,13 +387,14 @@ export default {
   line-height: 50px;
   background-color: #fff;
   text-align: center;
+  font-weight: bold;
 }
 .leftMenu {
   position: absolute;
   left: 0;
   top: 0;
-  width: 100px;
-  height: 100vh;
+  width: 300px;
+  height: 100%;
   background-color: #eee;
   border-right: 1px solid #eee;
   ::v-deep .el-menu {
@@ -368,10 +416,10 @@ export default {
   }
 }
 .main {
-  width: calc(100% - 100px);
+  width: calc(100% - 300px);
   height: 100%;
   overflow: auto;
-  margin-left: 100px;
+  margin-left: 300px;
   display: flex;
   align-items: flex-start;
 }
@@ -403,6 +451,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -412,6 +461,7 @@ export default {
   }
   ::v-deep .file_title {
     line-height: 40px;
+    font-weight: bold;
   }
   ::v-deep .btnBox {
     display: flex;

src/views/reviewers/curriculumVitae/preview.vue

@@ -40,7 +40,7 @@
             }}</span>
             <span v-else>{{ reviewerData.BasicInfoView.HospitalNameCN }}</span>
           </span>
-          <span>
+          <span v-if="isAll">
             <span>
               {{ $t('system:Setting:title:Vacation') }}
               {{ InHoliday }}
@@ -51,22 +51,30 @@
           </span>
         </div>
         <div class="userTitle">
-          <span class="el-icon-first-aid-kit">
+          <span
+            class="el-icon-first-aid-kit"
+            v-if="
+              reviewerData.EmploymentView.Department ||
+              reviewerData.EmploymentView.DepartmentCN
+            "
+          >
             <span v-if="isEN">{{
               reviewerData.EmploymentView.Department
             }}</span>
             <span v-else>{{ reviewerData.EmploymentView.DepartmentCN }}</span>
           </span>
+          <span class="el-icon-first-aid-kit" v-else>
+            <span v-if="isEN">{{
+              reviewerData.EmploymentView.DepartmentOther
+            }}</span>
+            <span v-else>{{
+              reviewerData.EmploymentView.DepartmentOtherCN
+            }}</span>
+          </span>
           <span class="el-icon-user"
             ><span v-if="isEN">{{ reviewerData.EmploymentView.Rank }}</span>
             <span v-else>{{ reviewerData.EmploymentView.RankCN }}</span></span
           >
-          <span class="el-icon-medal" v-if="isAll">
-            <span v-if="isEN">{{
-              reviewerData.EmploymentView.WorkPartTimeEn
-            }}</span>
-            <span v-else>{{ reviewerData.EmploymentView.WorkPartTime }}</span>
-          </span>
         </div>
         <div class="userTel" v-if="isAll">
           <span class="el-icon-phone-outline">{{
@@ -79,22 +87,34 @@
             reviewerData.BasicInfoView.WeChat
           }}</span>
         </div>
+        <div style="display: flex; font-size: 14px" v-if="isAll">
+          <span style="display: inline-block; width: 70px; color: #606266">{{
+            $t('curriculumVitae:info:meessage:partTimeJob')
+          }}</span>
+          <span
+            class="break-word"
+            style="
+              white-space: pre-wrap;
+              width: calc(100% - 80px);
+              word-wrap: break-word;
+            "
+            v-html="
+              isEN
+                ? reviewerData.EmploymentView.WorkPartTimeEn
+                : reviewerData.EmploymentView.WorkPartTime
+            "
+          ></span>
+        </div>
       </div>
-      <div
-        class="message"
-        v-if="
-          reviewerData.SummarizeInfo.SummarizeEn ||
-          reviewerData.SummarizeInfo.Summarize
-        "
-      >
+      <div class="message break-word">
         <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>
-        <span class="text">
-          {{
-            isEN
-              ? reviewerData.SummarizeInfo.SummarizeEn
-              : reviewerData.SummarizeInfo.Summarize
-          }}
-        </span>
+        <span
+          class=""
+          style="white-space: pre-wrap"
+          v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
+          v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
+        ></span>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       </div>
       <div class="message" v-if="isAll">
         <el-form class="demo-form-inline">
@@ -217,7 +237,7 @@
           <el-table-column
             prop="date"
             :label="$t('curriculumVitae:EducationalExperience:table:school')"
-            v-if="isAll"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>
@@ -288,7 +308,7 @@
           <el-table-column
             prop="City"
             :label="$t('curriculumVitae:continuingTraining:table:city')"
-            v-if="true"
+            v-if="isAll"
           >
             <template slot-scope="scope">
               <span>{{ isEN ? scope.row.City : scope.row.CityCN }}</span>
@@ -302,26 +322,50 @@
         </div>
         <div class="content">
           <el-form class="demo-form-inline">
-            <el-form-item
+            <!-- <el-form-item
               :label="$t('curriculumVitae:scientificResearchProject:direction')"
             >
-              <span v-if="isEN">{{
+              <span v-if="isEN" class="break-word">{{
                 reviewerData.ResearchPublicationView.Research
               }}</span>
-              <span v-else>{{
+              <span v-else class="break-word">{{
                 reviewerData.ResearchPublicationView.ResearchCN
               }}</span>
-            </el-form-item>
-            <el-form-item
-              :label="$t('curriculumVitae:scientificResearchProject:subject')"
-            >
-              <span v-if="isEN">{{
-                reviewerData.ResearchPublicationView.Grants
-              }}</span>
-              <span v-else>{{
-                reviewerData.ResearchPublicationView.GrantsCN
-              }}</span>
-            </el-form-item>
+            </el-form-item> -->
+            <div style="display: flex; font-size: 14px">
+              <span
+                style="display: inline-block; width: 80px; color: #606266"
+                >{{
+                  $t('curriculumVitae:scientificResearchProject:direction')
+                }}</span
+              >
+              <span
+                class="break-word"
+                style="white-space: pre-wrap; width: calc(100% - 80px)"
+                v-html="
+                  isEN
+                    ? reviewerData.ResearchPublicationView.Research
+                    : reviewerData.ResearchPublicationView.ResearchCN
+                "
+              ></span>
+            </div>
+            <div style="display: flex; font-size: 14px">
+              <span
+                style="display: inline-block; width: 80px; color: #606266"
+                >{{
+                  $t('curriculumVitae:scientificResearchProject:subject')
+                }}</span
+              >
+              <span
+                class="break-word"
+                style="white-space: pre-wrap; width: calc(100% - 80px)"
+                v-html="
+                  isEN
+                    ? reviewerData.ResearchPublicationView.Grants
+                    : reviewerData.ResearchPublicationView.GrantsCN
+                "
+              ></span>
+            </div>
           </el-form>
         </div>
       </div>
@@ -398,46 +442,44 @@
           </el-table-column>
         </el-table>
         <!--GCP证书-->
-        <div class="title">
-          {{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}
-        </div>
-        <el-table
-          :data="GCPData"
-          style="width: 100%"
-          :header-cell-style="{ background: '#eee', color: '#606266' }"
-        >
-          <el-table-column
-            prop="GCP"
-            :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
-            v-if="true"
+        <template v-if="isAll">
+          <div class="title">
+            {{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}
+          </div>
+          <el-table
+            :data="GCPData"
+            style="width: 100%"
+            :header-cell-style="{ background: '#eee', color: '#606266' }"
           >
-            <template slot-scope="scope">
-              <span>{{ $fd('hasOrNo', scope.row.GCP) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="GCPTime"
-            :label="$t('curriculumVitae:clinicalTrials:table:certificateTime')"
-            v-if="true"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="GCPAgencies"
-            v-if="true"
-            :label="
-              $t('curriculumVitae:clinicalTrials:table:certificateHospital')
-            "
-          >
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              prop="GCP"
+              :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
+              v-if="true"
+            >
+              <template slot-scope="scope">
+                <span>{{ $fd('hasOrNo', scope.row.GCP) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="GCPTime"
+              :label="
+                $t('curriculumVitae:clinicalTrials:table:certificateTime')
+              "
+              v-if="true"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="GCPAgencies"
+              v-if="true"
+              :label="
+                $t('curriculumVitae:clinicalTrials:table:certificateHospital')
+              "
+            >
+            </el-table-column>
+          </el-table>
+        </template>
         <!--其他相关经历-->
-        <div
-          class="title"
-          v-if="
-            reviewerData.TrialExperienceView.OtherClinicalExperience ||
-            reviewerData.TrialExperienceView.OtherClinicalExperienceCN
-          "
-        >
+        <div class="title">
           {{ $t('curriculumVitae:clinicalTrials:otherTitle') }}
         </div>
         <template
@@ -446,44 +488,58 @@
             reviewerData.TrialExperienceView.OtherClinicalExperienceCN
           "
         >
-          <div class="message">
-            {{
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="
               isEN
                 ? reviewerData.TrialExperienceView.OtherClinicalExperience
                 : reviewerData.TrialExperienceView.OtherClinicalExperienceCN
-            }}
-          </div>
+            "
+          ></div>
         </template>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       </div>
-      <div
-        class="message"
-        v-if="reviewerData.ResearchPublicationView.Publications"
-      >
-        <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
-        <div
-          class="message"
-          style="white-space: pre-wrap"
-          v-if="reviewerData.ResearchPublicationView.Publications"
-        >
-          {{ reviewerData.ResearchPublicationView.Publications }}
+      <template v-if="isAll">
+        <div class="message">
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="reviewerData.ResearchPublicationView.Publications"
+            v-if="reviewerData.ResearchPublicationView.Publications"
+          ></div>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
-      </div>
-      <div
-        class="message"
-        v-if="
-          (reviewerData.ResearchPublicationView.AwardsHonors ||
-            reviewerData.ResearchPublicationView.AwardsHonorsCN) &&
-          isAll
-        "
-      >
+      </template>
+      <template v-else>
+        <div class="message">
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="reviewerData.BasicInfoView.BlindPublications"
+            v-if="reviewerData.BasicInfoView.BlindPublications"
+          ></div>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+        </div>
+      </template>
+      <div class="message break-word" v-if="isAll">
         <div class="title">{{ $t('curriculumVitae:other:AH') }}</div>
-        <div class="content">
-          <span v-if="isEN">{{
-            reviewerData.ResearchPublicationView.AwardsHonors
-          }}</span>
-          <span v-else>{{
-            reviewerData.ResearchPublicationView.AwardsHonorsCN
-          }}</span>
+        <div class="message">
+          <span
+            style="white-space: pre-wrap"
+            v-html="
+              isEN
+                ? reviewerData.ResearchPublicationView.AwardsHonors
+                : reviewerData.ResearchPublicationView.AwardsHonorsCN
+            "
+            v-if="
+              reviewerData.ResearchPublicationView.AwardsHonors ||
+              reviewerData.ResearchPublicationView.AwardsHonorsCN
+            "
+          ></span>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
       </div>
       <div class="message" v-if="isAll">
@@ -765,6 +821,22 @@ export default {
     }
   },
   computed: {
+    mainSummarize() {
+      if (
+        Array.isArray(this.reviewerData.SummarizeInfo.SummarizeList) &&
+        this.trialId
+      ) {
+        return this.reviewerData.SummarizeInfo.SummarizeList[0] || {}
+      }
+      if (Array.isArray(this.reviewerData.SummarizeInfo.SummarizeList)) {
+        return (
+          this.reviewerData.SummarizeInfo.SummarizeList.find(
+            (item) => item.IsMain
+          ) || {}
+        )
+      }
+      return {}
+    },
     hasFile() {
       return (
         (this.sowList && this.sowList.length > 0) ||
@@ -959,18 +1031,22 @@ export default {
 .curriculumVitaePreview {
   display: flex;
   padding: 0 100px;
+  justify-content: space-between;
   .title {
     font-size: 18px;
     border: none;
     background-color: transparent;
+    font-weight: bold;
   }
   .message {
     padding: 20px 0;
     border-bottom: 1px solid #eee;
+    word-wrap: break-word;
     .title {
       font-size: 14px;
       line-height: 30px;
       margin-bottom: 10px;
+      font-weight: bold;
     }
     .text {
       color: #909399;
@@ -1027,7 +1103,7 @@ export default {
   width: 100%;
 }
 .allInfo {
-  flex: 1;
+  width: calc(100% - 300px);
 }
 .file {
   width: 300px;
@@ -1036,6 +1112,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -1045,6 +1122,7 @@ export default {
   }
   ::v-deep .file_title {
     line-height: 40px;
+    font-weight: bold;
   }
   ::v-deep .btnBox {
     display: flex;
@@ -1070,4 +1148,14 @@ export default {
     }
   }
 }
+break-word {
+  display: inline-block;
+  width: 100%;
+  word-wrap: break-word;
+}
+.noData {
+  color: #909399;
+  text-align: center;
+  font-size: 14px;
+}
 </style>

src/views/reviewers/index.vue

@@ -479,7 +479,11 @@ export default {
         showClose: true,
       },
       tokenKey: getToken(),
-      share_model: { visible: false, title: '', width: '500px' },
+      share_model: {
+        title: this.$t('curriculumVitae:share:title'),
+        visible: false,
+        width: '500px',
+      },
       shareLink: null,
       isEnglish: false,
 
@@ -521,13 +525,19 @@ export default {
     },
     // 发送邮件
     async sendEmail() {
-      var pattern =
-        /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
-      if (!pattern.test(this.email))
-        return this.$message.warning(this.$t('rules:email'))
+      let emailList = this.email.split('|')
+      let isError = false
+      emailList.forEach((item) => {
+        var pattern =
+          /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
+        if (!pattern.test(item)) {
+          isError = true
+        }
+      })
+      if (isError) return this.$message.warning(this.$t('rules:email'))
       this.emailLoading = true
       let res = await doctorSendEmail({
-        Email: this.email,
+        Email: emailList,
         Url: `ReviewersResearch?lang=${this.$store.getters.language}`,
       })
       this.emailLoading = false

src/views/system/user/list/index.vue

@@ -26,7 +26,7 @@
       <!-- 选择自定义slot -->
       <template slot="tip-slot" slot-scope="{ scope }">
         <i
-          v-if="diffTime(scope.row.LastLoginTime) >= 6"
+          v-if="diffTime(scope.row.LastLoginTime) >= 90"
           class="el-icon-warning"
           style="color: #f56c6c"
           :title="$t('system:userlist:tip:overTime')"
@@ -208,11 +208,11 @@ export default {
               type: 'primary',
               emitKey: 'editCb',
             },
-            {
-              name: this.$t('common:button:delete'),
-              type: 'danger',
-              emitKey: 'deleteCb',
-            },
+            // {
+            //   name: this.$t('common:button:delete'),
+            //   type: 'danger',
+            //   emitKey: 'deleteCb',
+            // },
           ],
         },
       ],
@@ -363,7 +363,7 @@ export default {
   },
   methods: {
     diffTime(time) {
-      return moment(new Date()).diff(time, 'months')
+      return moment(new Date()).diff(time, 'days')
     },
     // 获取用户信息
     getList() {

src/views/trials/components/newSignForm.vue

@@ -1,7 +1,9 @@
 <template>
   <div v-loading="loading" class="sign-form-wrapper">
     <div class="sign-form-body">
-      <h4 v-if="signText" style="color:red;white-space: pre-line;">* {{ signText }}</h4>
+      <h4 v-if="signText" style="color: red; white-space: pre-line">
+        * {{ signText }}
+      </h4>
       <el-form
         ref="signForm"
         :model="signForm"
@@ -13,7 +15,11 @@
           :label="$t('common:form:sign:userName')"
           prop="userName"
           :rules="[
-            { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+            {
+              required: true,
+              message: $t('common:ruleMessage:specify'),
+              trigger: 'blur',
+            },
           ]"
         >
           <el-input v-model="signForm.userName" />
@@ -23,18 +29,37 @@
           :label="$t('common:form:sign:password')"
           prop="password"
           :rules="[
-            { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+            {
+              required: true,
+              message: $t('common:ruleMessage:specify'),
+              trigger: 'blur',
+            },
           ]"
         >
-          <el-input v-model="signForm.password" show-password auto-complete="new-password" />
+          <el-input
+            v-model="signForm.password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
       </el-form>
     </div>
     <div slot="footer" class="dialog-footer sign-form-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleclose">
+      <el-button
+        :disabled="btnLoading"
+        size="small"
+        type="primary"
+        @click="handleclose"
+      >
         {{ $t('common:button:cancel') }}
       </el-button>
-      <el-button :loading="btnLoading" :disabled="unsigned" size="small" type="primary" @click="handleVerifySignature">
+      <el-button
+        :loading="btnLoading"
+        :disabled="unsigned"
+        size="small"
+        type="primary"
+        @click="handleVerifySignature"
+      >
         {{ $t('common:button:sign') }}
       </el-button>
     </div>
@@ -49,44 +74,56 @@ export default {
   props: {
     signCodeEnum: {
       type: Number,
-      required: true
+      required: true,
     },
     subjectVisitId: {
       type: String,
-      default: ''
-    }
+      default: '',
+    },
+    signReplaceText: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
       signForm: {
         userName: '',
-        password: ''
+        password: '',
       },
       signText: '',
       signCodeId: '',
       signCode: '',
       btnLoading: false,
       loading: false,
-      unsigned: false
+      unsigned: false,
     }
   },
   mounted() {
     this.loading = true
-    this.$store.dispatch('trials/getSignInfo', { signCode: this.signCodeEnum })
+    this.$store
+      .dispatch('trials/getSignInfo', { signCode: this.signCodeEnum })
       .then((res) => {
         this.unsigned = false
         this.loading = false
-        this.signText = res.SignText
+        if (this.signReplaceText) {
+          this.signText = res.SignText.replace('xxx', this.signReplaceText)
+        } else {
+          this.signText = res.SignText
+        }
         this.signCode = res.SignCode
         this.signCodeId = res.SignCodeId
-      }).catch(() => {
+      })
+      .catch(() => {
         this.loading = false
         this.unsigned = true
       })
   },
   methods: {
     handleVerifySignature() {
-      const currentUser = zzSessionStorage.getItem('userName').toLocaleLowerCase()
+      const currentUser = zzSessionStorage
+        .getItem('userName')
+        .toLocaleLowerCase()
       this.$refs.signForm.validate((valid) => {
         if (!valid) return
         if (this.signForm.userName.trim().toLocaleLowerCase() !== currentUser) {
@@ -103,38 +140,37 @@ export default {
           SignCode: this.signCode,
           SignText: this.signText,
           SignCodeId: this.signCodeId,
-          SubjectVisitId: this.subjectVisitId
+          SubjectVisitId: this.subjectVisitId,
         }
         this.$emit('closeDialog', true, param)
       })
     },
     handleclose() {
       this.$emit('closeDialog', false)
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-  .sign-form-wrapper{
-    .sign-form-body{
-      padding:5px 10px 10px 10px;
-      // border: 1px solid #e0e0e0;
-      max-height:650px;
-      overflow-y: auto;
-      // /deep/ .el-form-item__label{
-      //   color: #fff;
-      // }
-    }
-    .sign-form-footer{
-      padding:10px;
-      margin-top: 10px;
-      text-align: right;
-    }
+.sign-form-wrapper {
+  .sign-form-body {
+    padding: 5px 10px 10px 10px;
+    // border: 1px solid #e0e0e0;
+    max-height: 650px;
+    overflow-y: auto;
+    // /deep/ .el-form-item__label{
+    //   color: #fff;
+    // }
+  }
+  .sign-form-footer {
+    padding: 10px;
+    margin-top: 10px;
+    text-align: right;
   }
-
-</style>
-<style>
-.el-dialog__body .sign-form-body h4{
-  word-break: normal!important;
+}
+</style>
+<style>
+.el-dialog__body .sign-form-body h4 {
+  word-break: normal !important;
 }
 </style>

src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue

@@ -1,14 +1,16 @@
 <template>
   <BaseContainer>
     <template slot="search-container">
-      <div style="margin-left:auto;">
+      <div style="margin-left: auto">
         <!-- Approve -->
         <el-button
           icon="el-icon-check"
           type="primary"
-          :disabled="approveIdArr.length==0"
+          :disabled="approveIdArr.length == 0"
           @click="handleApprove()"
-          v-hasPermi="['trials:trials-panel:attachments:SPMEnrollment:button-agree']"
+          v-hasPermi="[
+            'trials:trials-panel:attachments:SPMEnrollment:button-agree',
+          ]"
         >
           {{ $t('trials:seletctedReviews:button:approve') }}
         </el-button>
@@ -17,7 +19,7 @@
     <template slot="main-container">
       <el-table
         v-loading="listLoading"
-        v-adaptive="{bottomOffset:65}"
+        v-adaptive="{ bottomOffset: 65 }"
         height="100"
         :data="list"
         class="table"
@@ -51,7 +53,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>
         <!-- 亚专业 -->
@@ -62,7 +70,11 @@
           min-width="120"
         >
           <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(', ')
+            }}
           </template>
         </el-table-column>
         <el-table-column
@@ -111,7 +123,9 @@
             />
             <!-- 同意 -->
             <el-button
-              v-hasPermi="['trials:trials-panel:attachments:SPMEnrollment:button-agree']"
+              v-hasPermi="[
+                'trials:trials-panel:attachments:SPMEnrollment:button-agree',
+              ]"
               :disabled="scope.row.DoctorTrialState === 8"
               icon="el-icon-check"
               circle
@@ -121,14 +135,23 @@
           </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>
   </BaseContainer>
 </template>
 <script>
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
-import { getSubmissionOrApprovalReviewerList, approveReviewer } from '@/api/trials'
+import {
+  getSubmissionOrApprovalReviewerList,
+  approveReviewer,
+} from '@/api/trials'
 import store from '@/store'
 const enrollState = 4
 export default {
@@ -143,16 +166,18 @@ export default {
         PageIndex: 1,
         PageSize: 20,
         Asc: false,
-        SortField: ''
+        SortField: '',
       },
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
       total: 0,
       listLoading: false,
       approveIdArr: [],
-      token: store.getters.token
+      token: store.getters.token,
     }
   },
-  created() { this.initPage() },
+  created() {
+    this.initPage()
+  },
   methods: {
     lookResumeInfo(row) {
       console.log(row)
@@ -164,12 +189,16 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.TrialId = this.$route.query.trialId
-      getSubmissionOrApprovalReviewerList(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 })
+      getSubmissionOrApprovalReviewerList(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
+        })
     },
     handleApprove(row) {
       // Confirm the approval?
@@ -181,18 +210,22 @@ export default {
       }
       // '是否确认审核?'
       this.$confirm(this.$t('trials:spmEnroll:title:msg1'), {
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         this.listLoading = true
         const trialId = this.$route.query.trialId
-        approveReviewer(trialId, params, 1).then(res => {
-          if (res.IsSuccess) {
-            this.getList()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            // this.$emit('nextStep', 'confirmation')
-          }
-          this.listLoading = false
-        }).catch(() => { this.listLoading = false })
+        approveReviewer(trialId, params, 1)
+          .then((res) => {
+            if (res.IsSuccess) {
+              this.getList()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              // this.$emit('nextStep', 'confirmation')
+            }
+            this.listLoading = false
+          })
+          .catch(() => {
+            this.listLoading = false
+          })
       })
     },
     handleSelectionChange(val) {
@@ -217,14 +250,16 @@ export default {
         return 'selected'
       }
     },
-    handleSelectTable(row) { return row.DoctorTrialState !== 8 },
+    handleSelectTable(row) {
+      return row.DoctorTrialState !== 8
+    },
     handleDetail(row) {
       const { href } = this.$router.resolve({
-        path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}`,
+        path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}&blindState=1`,
       })
       window.open(href, '_blank')
     },
-  }
+  },
 }
 </script>
 

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

@@ -330,6 +330,7 @@
               :title="$t('common:button:edit')"
               @click.stop="openViewer('edit', scope.row)"
               v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
+              :disabled="scope.row.IsEnroll"
               circle
             />
           </template>
@@ -386,18 +387,63 @@
     </base-model>
     <!--新增或修改简历-->
     <el-dialog
-      title=""
+      :title="$t('curriculumVitae:content:title')"
       :visible.sync="visible"
       fullscreen
       v-if="visible"
+      appendToBody
       :before-close="beforeClose"
     >
-      <reviewerAdd :isSystem="false" v-if="resumeType === 'add'" />
-      <reviewerEdit
-        :isSystem="false"
-        :reviewerId="reviewerId"
-        v-if="resumeType === 'edit'"
-      />
+      <curriculumVitae :reviewerId="reviewerId" />
+    </el-dialog>
+    <!--新增阅片人输入邮箱--->
+    <el-dialog
+      :title="$t('curriculumVitae:content:title')"
+      :visible.sync="emailVisible"
+      v-if="emailVisible"
+      appendToBody
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="400px"
+    >
+      <el-form
+        v-if="emailVisible"
+        ref="emailForm"
+        :model="emailForm"
+        :rules="emailRule"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item
+          :label="$t('trials:trials-panel:attachments:enrollment:form:email')"
+          prop="EmailOrPhone"
+        >
+          <el-input
+            v-model="emailForm.EmailOrPhone"
+            clearable
+            :maxlength="400"
+          ></el-input>
+          <el-input
+            style="display: none"
+            v-model="emailForm.EmailOrPhone"
+            clearable
+            :maxlength="400"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave"
+          :loading="emailLoading"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </span>
     </el-dialog>
   </BaseContainer>
 </template>
@@ -408,9 +454,8 @@ 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'
-import { doctorSendEmail } from '@/api/reviewers'
+import curriculumVitae from '@/views/reviewers/curriculumVitae'
+import { doctorSendEmail, useEmialGetDoctorInfo } from '@/api/reviewers'
 const getListQueryDefault = () => {
   return {
     TrialId: '',
@@ -435,8 +480,7 @@ export default {
     BaseContainer,
     Pagination,
     BaseModel,
-    reviewerAdd,
-    reviewerEdit,
+    curriculumVitae,
   },
   dicts: ['ReadingType', 'Subspeciality', 'Position', 'Rank'],
   data() {
@@ -449,13 +493,40 @@ export default {
       selectIdArr: [],
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
       token: store.getters.token,
-      share_model: { visible: false, title: '', width: '500px' },
+      share_model: {
+        visible: false,
+        title: this.$t('curriculumVitae:share:title'),
+        width: '500px',
+      },
       shareLink: null,
       email: null,
-      emailLoading: false,
       visible: false,
-      resumeType: 'add',
       reviewerId: null,
+
+      emailVisible: false,
+      emailLoading: false,
+      emailForm: {
+        EmailOrPhone: null,
+      },
+      emailRule: {
+        EmailOrPhone: [
+          {
+            required: true,
+            message: this.$t('passwordReset:formRule:email'),
+            trigger: 'blur',
+          },
+          {
+            type: 'email',
+            message: this.$t('rules:email'),
+            trigger: 'blur,change',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
     }
   },
   computed: {
@@ -465,6 +536,31 @@ export default {
     this.initPage()
   },
   methods: {
+    handleCancle() {
+      Object.keys(this.emailForm).forEach((key) => {
+        this.emailForm[key] = null
+      })
+      this.emailVisible = false
+    },
+    async handleSave() {
+      try {
+        let validate = await this.$refs.emailForm.validate()
+        if (!validate) return false
+        this.emailLoading = true
+        this.emailForm.trialId = this.$route.query.trialId
+        let res = await useEmialGetDoctorInfo(this.emailForm)
+        this.emailLoading = false
+        if (res.IsSuccess) {
+          this.handleCancle()
+          sessionStorage.setItem('reviewerId', res.Result.DoctorId)
+          zzSessionStorage.setItem('trialId', this.$route.query.trialId)
+          this.visible = true
+        }
+      } catch (err) {
+        this.emailLoading = false
+        console.log(err)
+      }
+    },
     copyCode() {
       this.$copyText(
         `${this.$t('reviewers-list:button:copyCode')}: ${this.shareLink}`
@@ -484,20 +580,26 @@ export default {
     },
     // 简历采集
     resumeCollection() {
-      this.shareLink = `${location.protocol}//${location.host}/ReviewersResearch?lang=${this.$store.getters.language}`
+      this.shareLink = `${location.protocol}//${location.host}/ReviewersResearch?lang=${this.$store.getters.language}&trialId=${this.$route.query.trialId}`
       this.email = null
       this.share_model.visible = true
     },
     // 发送邮件
     async sendEmail() {
-      var pattern =
-        /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
-      if (!pattern.test(this.email))
-        return this.$message.warning(this.$t('rules:email'))
+      let emailList = this.email.split('|')
+      let isError = false
+      emailList.forEach((item) => {
+        var pattern =
+          /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
+        if (!pattern.test(item)) {
+          isError = true
+        }
+      })
+      if (isError) return this.$message.warning(this.$t('rules:email'))
       this.emailLoading = true
       let res = await doctorSendEmail({
-        Email: this.email,
-        Url: `ReviewersResearch?lang=${this.$store.getters.language}`,
+        Email: emailList,
+        Url: `ReviewersResearch?lang=${this.$store.getters.language}&trialId=${this.$route.query.trialId}`,
       })
       this.emailLoading = false
       if (res.IsSuccess) {
@@ -509,10 +611,13 @@ export default {
     },
     // 打开新增或修改简历弹框
     openViewer(type, row) {
-      this.resumeType = type
-      if (row) {
-        this.reviewerId = row.Id
+      if (type === 'add') {
+        return (this.emailVisible = true)
       }
+      if (row) {
+        sessionStorage.setItem('reviewerId', row.Id)
+      }
+      zzSessionStorage.setItem('trialId', this.$route.query.trialId)
       this.visible = true
     },
     go(path) {

src/views/trials/trials-panel/attachments/site-research/index.vue

@@ -96,7 +96,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
@@ -104,7 +104,7 @@
           icon="el-icon-refresh-left"
           @click="handleReset"
         >
-          {{ $t("common:button:reset") }}
+          {{ $t('common:button:reset') }}
         </el-button>
         <!-- 中心人员 -->
         <el-button
@@ -115,7 +115,7 @@
           icon="el-icon-info"
           @click="showResearchUser"
         >
-          {{ $t("trials:researchRecord:button:questionStaffs") }}
+          {{ $t('trials:researchRecord:button:questionStaffs') }}
         </el-button>
         <!-- 调查表链接 -->
         <el-button
@@ -126,7 +126,7 @@
           icon="el-icon-link"
           @click="showResearchLink"
         >
-          {{ $t("trials:researchRecord:button:questionLink") }}
+          {{ $t('trials:researchRecord:button:questionLink') }}
         </el-button>
       </el-form>
     </template>
@@ -148,6 +148,7 @@
           prop="TrialSiteCode"
           :label="$t('trials:researchRecord:table:siteId')"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         />
         <!-- 中心名称 -->
@@ -155,6 +156,7 @@
           prop="SiteName"
           :label="$t('trials:researchRecord:table:siteName')"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         />
         <!-- 联系人 -->
@@ -162,6 +164,7 @@
           prop="UserName"
           :label="$t('trials:researchRecord:table:contactor')"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         />
         <!-- 联系电话 -->
@@ -189,7 +192,7 @@
             {{
               scope.row.PreliminaryUser
                 ? scope.row.PreliminaryUser.RealName
-                : ""
+                : ''
             }}
           </template>
         </el-table-column>
@@ -201,7 +204,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : "" }}
+            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : '' }}
           </template>
         </el-table-column>
         <!-- 状态 -->
@@ -209,20 +212,21 @@
           prop="State"
           :label="$t('trials:researchRecord:table:status')"
           min-width="150"
+          sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.State === 0" type="primary">{{
-              $fd("ResearchRecord", scope.row.State)
+              $fd('ResearchRecord', scope.row.State)
             }}</el-tag>
             <el-tag v-if="scope.row.State === 1" type="info">{{
-              $fd("ResearchRecord", scope.row.State)
+              $fd('ResearchRecord', scope.row.State)
             }}</el-tag>
             <el-tag v-if="scope.row.State === 2" type="warning">{{
-              $fd("ResearchRecord", scope.row.State)
+              $fd('ResearchRecord', scope.row.State)
             }}</el-tag>
             <el-tag v-if="scope.row.State === 3" type="danger">{{
-              $fd("ResearchRecord", scope.row.State)
+              $fd('ResearchRecord', scope.row.State)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -231,14 +235,15 @@
           prop="IsDeleted"
           :label="$t('trials:researchRecord:table:isDeleted')"
           min-width="100"
+          sortable="custom"
           show-overflow-tooltip
         >
           <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>
@@ -248,6 +253,7 @@
           :label="$t('trials:researchRecord:table:updateTime')"
           min-width="150"
           show-overflow-tooltip
+          sortable="custom"
         />
         <el-table-column width="150">
           <template slot-scope="scope">
@@ -330,12 +336,12 @@
               <i style="color: #428bca" class="el-icon-success" />
               <!-- 成功创建调查表链接 -->
               <span>{{
-                $t("trials:researchRecord:message:createLinkSuccessfully")
+                $t('trials:researchRecord:message:createLinkSuccessfully')
               }}</span>
             </div>
             <div style="margin: 10px 0">
               <!-- 链接： -->
-              {{ $t("trials:researchRecord:label:link") }}
+              {{ $t('trials:researchRecord:label:link') }}
               <el-input
                 ref="shareLink"
                 v-model="shareLink"
@@ -352,7 +358,7 @@
                 @click="copyLink"
                 class="shareLinkBtn"
               >
-                {{ $t("trials:researchRecord:button:copyLink") }}
+                {{ $t('trials:researchRecord:button:copyLink') }}
               </el-button>
             </div>
           </div>
@@ -362,10 +368,10 @@
             </div>
             <div class="codeBtnBox">
               <el-button @click="handleCopyImg" type="primary" round>{{
-                $t("trials:researchRecord:button:copyCode")
+                $t('trials:researchRecord:button:copyCode')
               }}</el-button>
               <el-button @click="savePic" round>{{
-                $t("trials:researchRecord:button:savePic")
+                $t('trials:researchRecord:button:savePic')
               }}</el-button>
             </div>
           </div>
@@ -379,32 +385,32 @@ import {
   getTrialSiteSurveyList,
   getTrialSiteSelect,
   abandonSiteSurvey,
-} from "@/api/trials";
-import { changeURLStatic } from "@/utils/history.js";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import Users from "./components/users";
-import ResearchForm from "@/views/research/form";
-import BaseModel from "@/components/BaseModel";
-import QRCode from "qrcodejs2";
+} from '@/api/trials'
+import { changeURLStatic } from '@/utils/history.js'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import Users from './components/users'
+import ResearchForm from '@/views/research/form'
+import BaseModel from '@/components/BaseModel'
+import QRCode from 'qrcodejs2'
 
 const searchDataDefault = () => {
   return {
-    SortField: "",
+    SortField: '',
     Asc: true,
     PageIndex: 1,
     PageSize: 20,
-    TrialSiteId: "",
-    UserKeyInfo: "",
+    TrialSiteId: '',
+    UserKeyInfo: '',
     State: null,
-    IsDeleted: "",
+    IsDeleted: '',
     DateRange: [],
     PreliminaryUserName: null,
     ReviewerUserName: null,
-  };
-};
+  }
+}
 export default {
-  name: "SiteResearchList",
+  name: 'SiteResearchList',
   components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel },
   data() {
     return {
@@ -418,195 +424,195 @@ export default {
       researchInfoVisible: false,
       share_model: {
         visible: false,
-        title: this.$t("trials:researchRecord:title:shark"),
-        width: "800px",
+        title: this.$t('trials:researchRecord:title:shark'),
+        width: '800px',
       },
-      shareLink: "",
+      shareLink: '',
       researchState: this.$d.ResearchRecord,
       qrcode: null,
-    };
+    }
   },
   mounted() {
-    this.getList();
-    this.getSite();
+    this.getList()
+    this.getSite()
   },
   methods: {
     // 获取系统文件数据
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0];
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1];
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
       } else {
-        this.searchData.UpdateTimeBegin = "";
-        this.searchData.updateTimeEnd = "";
+        this.searchData.UpdateTimeBegin = ''
+        this.searchData.updateTimeEnd = ''
       }
       getTrialSiteSurveyList(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
+        })
     },
     // 查看调查表记录详情
     handleViewResearchList(row) {
-      changeURLStatic("trialSiteSurveyId", row.Id);
-      this.researchInfoVisible = true;
+      changeURLStatic('trialSiteSurveyId', row.Id)
+      this.researchInfoVisible = true
     },
     // 废除待提交的调查表
     handleRepealResearch(row) {
       // 是否确认废除？
-      this.$confirm(this.$t("trials:researchRecord:message:abolish"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:researchRecord:message:abolish'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
         abandonSiteSurvey(this.trialId, row.Id).then((res) => {
           if (res.IsSuccess) {
-            this.getList();
+            this.getList()
             // 废除成功
             this.$message.success(
-              this.$t("trials:researchRecord:message:abolishSuccessfully")
-            );
+              this.$t('trials:researchRecord:message:abolishSuccessfully')
+            )
           }
-        });
-      });
+        })
+      })
     },
     // 展示当前项目下所有调查表需生成账户的用户信息
     showResearchUser() {
-      this.researchUserVisible = true;
+      this.researchUserVisible = true
     },
     // 复制链接
     copyLink() {
       // 中心调研表链接
       this.$copyText(
-        `${this.$t("trials:researchRecord:message:researchFormLink")}: ${
+        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${
           this.shareLink
         }`
       )
         .then((res) => {
           // 复制成功
           this.$message.success(
-            this.$t("trials:researchRecord:message:copySuccessfully")
-          );
+            this.$t('trials:researchRecord:message:copySuccessfully')
+          )
         })
         .catch(() => {
           // 复制失败
-          this.$alert(this.$t("trials:researchRecord:message:copyFailed"));
-        });
+          this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
+        })
     },
     // 创建二维码
     creatQrCode() {
-      this.$refs.qrcode.innerHTML = ""; //清除二维码方法一
-      let text = this.shareLink;
+      this.$refs.qrcode.innerHTML = '' //清除二维码方法一
+      let text = this.shareLink
       this.qrcode = new QRCode(this.$refs.qrcode, {
         text: text, //页面地址 ,如果页面需要参数传递请注意哈希模式#
         width: 200,
         height: 200,
-        colorDark: "#000000",
-        colorLight: "#ffffff",
+        colorDark: '#000000',
+        colorLight: '#ffffff',
         correctLevel: QRCode.CorrectLevel.H,
-      });
+      })
       // qrcode.clear(); // 清除二维码方法二
     },
     // 下载二维码
     savePic() {
       let qrCodeCanvas = document
-        .getElementById("qrcode")
-        .getElementsByTagName("canvas");
-      let a = document.createElement("a");
-      a.href = qrCodeCanvas[0].toDataURL("image/url");
-      a.download = `${this.$t("trials:researchRecord:title:code")}.png`;
-      a.click();
+        .getElementById('qrcode')
+        .getElementsByTagName('canvas')
+      let a = document.createElement('a')
+      a.href = qrCodeCanvas[0].toDataURL('image/url')
+      a.download = `${this.$t('trials:researchRecord:title:code')}.png`
+      a.click()
     },
     // 复制二维码
     handleCopyImg() {
       let qrCodeCanvas = document
-        .getElementById("qrcode")
-        .getElementsByTagName("canvas");
+        .getElementById('qrcode')
+        .getElementsByTagName('canvas')
       qrCodeCanvas[0].toBlob(async (blob) => {
-        console.log(blob);
+        console.log(blob)
         const data = [
           new ClipboardItem({
             [blob.type]: blob,
           }),
-        ]; // https://w3c.github.io/clipboard-apis/#dom-clipboard-write
+        ] // https://w3c.github.io/clipboard-apis/#dom-clipboard-write
         await navigator.clipboard.write(data).then(
           () => {
             this.$message.success(
-              this.$t("trials:researchRecord:message:copySuccess")
-            );
+              this.$t('trials:researchRecord:message:copySuccess')
+            )
           },
           () => {
             this.$message.error(
-              this.$t("trials:researchRecord:message:UnableWrite")
-            );
+              this.$t('trials:researchRecord:message:UnableWrite')
+            )
           }
-        );
-      });
+        )
+      })
     },
     // 获取site下拉框数据
     getSite() {
       getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
+        this.siteOptions = res.Result
+      })
     },
     // 展示调查表链接
     showResearchLink() {
-      const trialId = this.trialId;
-      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`;
-      this.share_model.visible = true;
+      const trialId = this.trialId
+      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
+      this.share_model.visible = true
       this.$nextTick(() => {
-        this.creatQrCode();
-      });
+        this.creatQrCode()
+      })
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.searchData.DateRange = [];
+      this.searchData = searchDataDefault()
+      this.searchData.DateRange = []
       if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0];
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1];
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
       } else {
-        this.searchData.UpdateTimeBegin = "";
-        this.searchData.updateTimeEnd = "";
+        this.searchData.UpdateTimeBegin = ''
+        this.searchData.updateTimeEnd = ''
       }
-      this.getList();
+      this.getList()
       this.$nextTick(() => {
-        this.$refs.siteResearchList.clearSort();
-      });
+        this.$refs.siteResearchList.clearSort()
+      })
     },
     // 查询
     handleSearch() {
-      this.getList();
+      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.getList();
+      this.searchData.SortField = column.prop
+      this.getList()
     },
   },
   beforeDestroy() {
     if (this.qrcode) {
-      this.qrcode = null;
+      this.qrcode = null
     }
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .shareLink {
   padding-right: 20px;
   width: 50%;
   position: relative;
-  .shareLinkBtn{
+  .shareLinkBtn {
     position: absolute;
     bottom: 0px;
     left: 0px;

src/views/trials/trials-panel/clinical-data/index.vue

@@ -33,7 +33,7 @@
             </template>
             <div v-else class="cd-item" :class="{activeBtn:item.Id === selected.id}" @click.prevent="preview(item,0)">
               <!-- 表格 -->
-              {{ $t('trials:uploadClinicalData:title:table') }}{{item.ClinicalUploadType}}
+              {{ $t('trials:uploadClinicalData:title:table') }}
             </div>
           </div>
         </div>

src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <!-- <resume-info v-if="isInit" /> -->
     <preview
+      v-if="isInit"
       :isEN="isEN"
       :isAll="isAll"
       :reviewerId.sync="reviewerId"
@@ -14,6 +15,7 @@ import ResumeInfo from '@/views/resumeInfo'
 import { changeURLStatic, getQueryString } from '@/utils/history.js'
 import preview from '@/views/reviewers/curriculumVitae/preview.vue'
 import store from '@/store'
+import { mapMutations } from 'vuex'
 export default {
   components: {
     ResumeInfo,
@@ -24,6 +26,7 @@ export default {
       isInit: false,
       reviewerId: '',
       trialId: null,
+      isAll: true,
     }
   },
   created() {
@@ -34,18 +37,26 @@ export default {
     isEN() {
       return this.$i18n.locale !== 'zh'
     },
-    isAll() {
-      return this.hasPermi(['role:pm', 'role:admin', 'role:apm', 'role:ir'])
-    },
+    // isAll() {
+    //   return this.hasPermi(['role:pm', 'role:admin', 'role:apm', 'role:ir'])
+    // },
   },
-  mounted() {
+  async mounted() {
+    this.isAll = !this.$route.query.blindState
     const token = getQueryString('token')
     if (token) {
       store.dispatch('user/setToken', token)
       changeURLStatic('token', '')
+      this.$i18n.locale =
+        this.$route.query.lang || zzSessionStorage.getItem('lang')
+      this.setLanguage(this.$i18n.locale)
+      this.$updateDictionary()
     }
     this.isInit = true
   },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+  },
 }
 </script>
 <style lang="scss" scoped>

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -136,6 +136,8 @@ import { mapGetters } from 'vuex'
 import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
+import metaDataProvider from '@/utils/metaDataProvider'
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -561,6 +563,7 @@ export default {
         e.stopPropagation()
         e.preventDefault()
       } else if (this.activeToolName === 'Length' || this.activeToolName === 'Bidirectional' && this.readingTaskState < 2) {
+        console.log(e.detail.image)
         if (!e.detail.image.columnPixelSpacing || !e.detail.image.rowPixelSpacing) {
           // '该影像不具备测量长度所需的必要数据，不能进行长度测量。请选择其他工具进行标注。'
           this.$confirm(this.$t('trials:reading:warnning:msg56'), '', {

src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue

@@ -76,6 +76,8 @@ import { mapGetters } from 'vuex'
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+// import metaDataProvider from '@/utils/metaDataProvider'
+// cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,

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

@@ -136,6 +136,8 @@ import { mapGetters } from 'vuex'
 import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
+import metaDataProvider from '@/utils/metaDataProvider'
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')

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

@@ -18,7 +18,7 @@
       </div>
       <QuestionsPreview
         ref="QuestionsPreview"
-        v-if="ecrfShow"
+        v-if="ecrfShow && TrialReadingCriterionId"
         :visitTaskId="visitTaskId"
         :criterionId="TrialReadingCriterionId">
       </QuestionsPreview>
@@ -260,7 +260,7 @@ export default {
     },
     handleMeasuredDataCancel() {
       this.measuredDataVisible = false
-      DicomEvent.$emit('updateImage')
+      // DicomEvent.$emit('updateImage')
     },
     handleMeasuredDataSave() {
      this.$refs.measuredDataForm.validate(valid => {

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

@@ -77,6 +77,8 @@ import { mapGetters } from "vuex";
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+// import metaDataProvider from '@/utils/metaDataProvider'
+// cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,

src/views/trials/trials-panel/reading/dicoms/index.vue

@@ -112,19 +112,20 @@
           <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="dialogVisible = false" />
         </div>
       </span>
-      <div style="height: 100%;margin:0;">
+      <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
         <ClinicalData
           v-if="dialogVisible"
+          style="flex: 1"
           :trial-id="trialId"
           :subject-id="subjectId"
           :visit-task-id="cdVisitTaskId"
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
         />
+        <div v-if="!closeCDVisible" style="text-align:right">
+          <!-- 确认 -->
+          <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
+        </div>
       </div>
-      <span v-if="!closeCDVisible" slot="footer" class="dialog-footer">
-        <!-- 确认 -->
-        <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
-      </span>
     </el-dialog>
 
     <el-dialog
@@ -580,7 +581,7 @@ export default {
   }
   /deep/.el-dialog__body{
       padding: 20px;
-      height: calc(100% - 120px);
+      height: calc(100% - 70px);
     }
   .el-dialog__header{
     position: relative;
@@ -589,7 +590,7 @@ export default {
 
 .full-dialog-container{
   /deep/.is-fullscreen .el-dialog__body{
-    height: calc(100% - 120px);
+    height: calc(100% - 70px);
   }
 }
 

src/views/trials/trials-panel/reading/none-dicoms/components/Criterions.vue

@@ -1,9 +1,15 @@
 <template>
   <div style="min-height:500px">
-    <h3 v-if="isReadingShowSubjectInfo" style="padding: 5px 0px;margin: 0;">
-      <span v-if="subjectCode">{{ subjectCode }} </span>
-      <span style="margin-left:5px;">{{ taskBlindName }}</span>
-    </h3>
+    <div v-if="isReadingShowSubjectInfo" style="display:flex;align-items: center;
+    justify-content: space-between;">
+      <h3>
+        <span v-if="subjectCode">{{ subjectCode }}</span>
+        <span style="margin-left:5px;">{{ taskBlindName }}</span>
+      </h3>
+      <div>
+        <el-button v-if="isExistsClinicalData" type="text" @click="previewCD">{{ $t('trials:reading:button:clinicalData') }}</el-button>
+      </div>
+    </div>
     <ECRF
       :trial-id="trialId"
       :subject-id="subjectId"
@@ -57,7 +63,11 @@ export default {
     iseCRFShowInDicomReading: {
       type: Boolean,
       required: true
-    }
+    },
+    isExistsClinicalData: {
+      type: Boolean,
+      required: true
+    },
   },
   data() {
     return {
@@ -80,7 +90,10 @@ export default {
         this.activeName = this.criterions[0].ReadingQuestionCriterionTrialId
         this.loading = false
       }).catch(() => { this.loading = false })
-    }
+    },
+    previewCD() {
+      this.$emit('previewCD')
+    },
 
   }
 }

src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue

@@ -91,7 +91,7 @@
     </el-card>
 
     <el-card class="box-card" style="width:400px;height:100%;padding: 10px;margin-left:10px;overflow-y: auto;">
-      <div style="text-align:right;">
+      <!-- <div style="text-align:right;">
         <el-button
           v-if="otherInfo && otherInfo.IsExistsClinicalData"
           type="text"
@@ -99,7 +99,7 @@
         >
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </el-button>
-      </div>
+      </div> -->
       <Criterions
         v-if="otherInfo && visitTaskId!== '' && subjectId!== '' && readingCategory!==null && readingCategory!==4"
         :trial-id="trialId"
@@ -110,6 +110,8 @@
         :task-blind-name="taskBlindName"
         :is-reading-show-subject-info="isReadingShowSubjectInfo"
         :ise-c-r-f-show-in-dicom-reading="iseCRFShowInDicomReading"
+        :isExistsClinicalData="isExistsClinicalData"
+        @previewCD="previewCD"
       />
     </el-card>
   </div>
@@ -171,6 +173,10 @@ export default {
     iseCRFShowInDicomReading: {
       type: Boolean,
       required: true
+    },
+    isExistsClinicalData: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -314,11 +320,12 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     previewCD() {
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/clinicalData?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${this.visitTaskId}&TokenKey=${token}`
-      })
-      window.open(routeData.href, '_blank')
+      // var token = getToken()
+      // const routeData = this.$router.resolve({
+      //   path: `/clinicalData?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${this.visitTaskId}&TokenKey=${token}`
+      // })
+      // window.open(routeData.href, '_blank')
+      this.$emit('previewCD', this.visitTaskId)
     },
     getBodyPart(bodyPart) {
       if (!bodyPart) return ''

src/views/trials/trials-panel/reading/none-dicoms/index.vue

@@ -14,9 +14,11 @@
             :reading-category="readingCategory"
             :readingTool="readingTool"
             :criterionType="criterionType"
+            :isExistsClinicalData="isExistsClinicalData"
             :isReadingShowSubjectInfo="isReadingShowSubjectInfo"
             :is-reading-task-view-in-order="isReadingTaskViewInOrder"
             :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
+            @previewCD="previewCD"
           />
         </el-tab-pane>
         <!-- 报告 -->
@@ -77,26 +79,34 @@
     />
 
     <el-dialog
-      width="75%"
       :visible.sync="dialogVisible"
-      style="margin:0px"
-      custom-class="dialog-container"
+      :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
       :show-close="false"
+      :close-on-click-modal="false"
+      :fullscreen="isFullscreen"
     >
       <span slot="title" class="dialog-footer">
-        {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
+        <!-- 当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” -->
+        <span v-if="!closeCDVisible">{{ $t('trials:reading:dagTitle:msg1') }}</span>
+        <div style="position: absolute;right: 20px;top: 10px;">
+          <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isFullscreen=!isFullscreen" />
+          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="dialogVisible = false" />
+        </div>
       </span>
-      <div :style="{'height':dialogH,'margin':0}">
+      <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
         <ClinicalData
+          v-if="dialogVisible"
+          style="flex: 1"
           :trial-id="trialId"
           :subject-id="subjectId"
-          :visit-task-id="visitTaskId"
+          :visit-task-id="cdVisitTaskId"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo"
         />
+        <div v-if="!closeCDVisible" style="text-align:right">
+          <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
+        </div>
       </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">{{ $t("common:button:confirm") }}</el-button>
-      </span>
+     
     </el-dialog>
 
   </div>
@@ -145,7 +155,10 @@ export default {
       readingTool: null,
       isNewSubject: null,
       dialogVisible: false,
-      dialogH: 0,
+      closeCDVisible: false,
+      cdVisitTaskId: '',
+      isFullscreen: false,
+      // dialogH: 0,
       isShow: false,
       activeName:'',
       tabs: []
@@ -154,7 +167,7 @@ export default {
   mounted() {
     DicomEvent.$on('getNextTask', () => {
       this.getTaskInfo()
-    }) 
+    })
     this.trialId = this.$router.currentRoute.query.trialId
     this.subjectCode = this.$router.currentRoute.query.subjectCode
     this.subjectId = this.$router.currentRoute.query.subjectId
@@ -218,13 +231,22 @@ export default {
         localStorage.setItem('digitPlaces', 2)
         this.$nextTick(() => {
           if (this.isExistsClinicalData && this.isNeedReadClinicalData && !this.isReadClinicalData) {
+            this.isFullscreen = false
             this.dialogVisible = true
+            this.cdVisitTaskId = this.visitTaskId
           }
         })
         this.isShow = true
         this.loading = false
       }).catch(() => { this.loading = false })
     },
+    previewCD(taskId) {
+      this.closeCDVisible = true
+      this.isFullscreen = false
+      this.dialogVisible = true
+      this.cdVisitTaskId = taskId
+      this.dialogVisible = true
+    },
     async handleConfirmCD() {
       this.loading = true
       var visitTaskId = this.visitTaskId
@@ -302,13 +324,24 @@ export default {
 
     }
   }
-/deep/ .dialog-container{
+  /deep/.dialog-container{
     margin-top: 50px !important;
-
+    width:75%;
+    height:80%;
   }
-  /deep/ .el-dialog__body{
-      padding: 10px;
+  /deep/.el-dialog__body{
+      padding: 20px 20px 0 20px;
+      height: calc(100% - 70px);
     }
+  .el-dialog__header{
+    position: relative;
+  }
 }
 
+.full-dialog-container{
+  /deep/.is-fullscreen .el-dialog__body{
+    height: calc(100% - 70px);
+  }
+}
+ 
 </style>

src/views/trials/trials-panel/reading/read-task-allocation/index.vue

@@ -78,6 +78,7 @@
               stripe
               height="100"
               @selection-change="handleSubjectAssignListSelectChange"
+              @sort-change="handleSortChange"
             >
               <el-table-column type="selection" align="left" width="45" />
               <!-- 中心编号 -->
@@ -86,6 +87,7 @@
                 :label="$t('trials:reviewAssign:table:siteCode')"
                 width="140"
                 show-overflow-tooltip
+                sortable="custom"
               />
               <!-- 受试者编号 -->
               <el-table-column
@@ -93,6 +95,7 @@
                 :label="$t('trials:reviewAssign:table:subjectCode')"
                 width="140"
                 show-overflow-tooltip
+                sortable="custom"
               />
               <!-- 访视 -->
               <el-table-column
@@ -100,6 +103,7 @@
                 :label="$t('trials:reviewAssign:table:visit')"
                 width="140"
                 show-overflow-tooltip
+                sortable="custom"
               >
                 <template slot-scope="scope">
                   <span @click="openAllocation('task', 1, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.VisitTaskTypeCount}}</span>
@@ -112,6 +116,7 @@
                 width="140"
                 show-overflow-tooltip
                 v-if="OtherInfo && OtherInfo.IsGlobalReading"
+                sortable="custom"
               >
                 <template slot-scope="scope">
                   <span @click="openAllocation('task', 2, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.GlobalTaskTypeCount}}</span>
@@ -124,6 +129,7 @@
                 width="140"
                 show-overflow-tooltip
                 v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+                sortable="custom"
               >
                 <template slot-scope="scope">
                   <span @click="openAllocation('referee', 4, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.JudgeTaskTypeCount}}</span>
@@ -136,6 +142,7 @@
                 width="140"
                 show-overflow-tooltip
                 v-if="OtherInfo && OtherInfo.IsOncologyReading"
+                sortable="custom"
               >
                 <template slot-scope="scope">
                   <span @click="openAllocation('task', 5, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.OncologyTaskTypeCount}}</span>

src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue

@@ -165,6 +165,22 @@ export default {
               this.loading = false
             })
           break
+        case 17:
+          searchData.ReadingExportType = 17
+          getCommonJudgeRatioList_Export(searchData)
+            .then((res) => {})
+            .catch(() => {
+              this.loading = false
+            })
+          break
+        case 18:
+          searchData.ReadingExportType = 18
+          getCommonJudgeRatioList_Export(searchData)
+            .then((res) => {})
+            .catch(() => {
+              this.loading = false
+            })
+          break
       }
     },
     getTrialCriterionList() {

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

@@ -220,16 +220,13 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-else
+          v-if="$i18n.locale === 'en' && isDistinguishCriteria"
           prop="AttachName"
           :label="$t('trials:emailManageCfg:title:fileName')"
           show-overflow-tooltip
           min-width="140"
         >
           <template slot-scope="scope">
-            <!-- <el-button v-if="scope.row.AttachPath" type="text" @click="handlePreview(scope.row.AttachPath)">
-              {{ scope.row.AttachName }}
-            </el-button> -->
             <span
               v-if="scope.row.AttachPath"
               @click="handlePreview(scope.row.AttachPath)"

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

@@ -22,13 +22,24 @@
             !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
-          <el-radio
-            v-for="item of $d.ImagePlatform"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
+          <template v-if="isUSA">
+            <el-radio
+              v-for="item of $d.ImagePlatformUSA"
+              :key="item.id"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else>
+            <el-radio
+              v-for="item of $d.ImagePlatform"
+              :key="item.id"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
         </el-radio-group>
       </el-form-item>
       <!-- 阅片工具 -->
@@ -374,7 +385,11 @@
             v-for="item of $d.ImageDownloadEnum"
             :key="item.id"
             :label="item.value"
-            :disabled="(form.IsReadingTaskViewInOrder === 1 || form.IsReadingTaskViewInOrder === 0) && item.value === 1"
+            :disabled="
+              (form.IsReadingTaskViewInOrder === 1 ||
+                form.IsReadingTaskViewInOrder === 0) &&
+              item.value === 1
+            "
           >
             {{ item.label }}
           </el-radio>
@@ -396,7 +411,11 @@
             v-for="item of $d.ImageUploadEnum"
             :key="item.id"
             :label="item.value"
-            :disabled="(form.IsReadingTaskViewInOrder === 1 || form.IsReadingTaskViewInOrder === 0) && item.value === 1"
+            :disabled="
+              (form.IsReadingTaskViewInOrder === 1 ||
+                form.IsReadingTaskViewInOrder === 0) &&
+              item.value === 1
+            "
           >
             {{ item.label }}
           </el-radio>
@@ -793,6 +812,11 @@ export default {
   mounted() {
     this.initPage()
   },
+  computed: {
+    isUSA() {
+      return process.env.NODE_ENV === 'usa'
+    },
+  },
   watch: {
     CriterionModalitys: {
       handler() {

src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue

@@ -10,7 +10,7 @@
     <div class="base-dialog-body">
       <!-- 临床数据名称 -->
       <el-form-item
-        :label="$t('trials:processCfg:title:clinicalDataName') "
+        :label="$t('trials:processCfg:title:clinicalDataName')"
         prop="ClinicalDataSetEnName"
       >
         <el-input
@@ -37,11 +37,11 @@
       >
         <el-select
           v-model="form.UploadRole"
-          style="width:100%;"
+          style="width: 100%"
           @change="handleUploadRoleChange"
         >
           <el-option
-            v-for="(item,index) of $d.ClinicalDataUploadRole"
+            v-for="(item, index) of $d.ClinicalDataUploadRole"
             :key="index"
             :label="item.label"
             :value="item.value"
@@ -55,11 +55,15 @@
       >
         <el-select
           v-model="form.ClinicalDataLevel"
-          style="width:100%;"
-          @change="() => {form.ClinicalUploadType = null}"
+          style="width: 100%"
+          @change="
+            () => {
+              form.ClinicalUploadType = null
+            }
+          "
         >
           <el-option
-            v-for="(item,index) of $d.ClinicalLevel"
+            v-for="(item, index) of $d.ClinicalLevel"
             v-show="!(form.UploadRole === 1 && item.value === 4)"
             :key="index"
             :label="item.label"
@@ -73,16 +77,22 @@
         :label="$t('trials:processCfg:title:transferType')"
         prop="ClinicalUploadType"
       >
-        <el-select
-          v-model="form.ClinicalUploadType"
-          style="width:100%;"
-        >
+        <el-select v-model="form.ClinicalUploadType" style="width: 100%">
           <el-option
-            v-for="(item,index) of $d.ClinicalUploadType"
+            v-for="(item, index) of $d.ClinicalUploadType"
             :key="index"
             :label="item.label"
             :value="item.value"
-            :disabled="item.value === 0 || item.value === 2 && form.UploadRole === 1 || (form.UploadRole === 0 && [2, 3].includes(form.ClinicalDataLevel) && item.value === 1)"
+            :disabled="
+              (item.value === 2 &&
+                (form.UploadRole !== 0 ||
+                  ![0, 1].includes(form.ClinicalDataLevel))) ||
+              item.value === 0 ||
+              (item.value === 2 && form.UploadRole === 1) ||
+              (form.UploadRole === 0 &&
+                [2, 3].includes(form.ClinicalDataLevel) &&
+                item.value === 1)
+            "
           />
         </el-select>
       </el-form-item>
@@ -94,10 +104,10 @@
         <el-select
           v-model="form.TrialCriterionIdList"
           multiple
-          style="width:100%;"
+          style="width: 100%"
         >
           <el-option
-            v-for="(item,index) of criterionList"
+            v-for="(item, index) of criterionList"
             :key="index"
             :label="item.CriterionName"
             :value="item.Id"
@@ -125,24 +135,18 @@
             :disabled="form.Type === ''"
           >
             <!-- 选择 -->
-            <el-button size="small" type="primary">{{ $t('trials:processCfg:button:select') }}</el-button>
-            <span
-              slot="tip"
-              style="margin-left:10px;"
-              class="el-upload__tip"
-            >
+            <el-button size="small" type="primary">{{
+              $t('trials:processCfg:button:select')
+            }}</el-button>
+            <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
               <!-- (必须是doc/docx格式) -->
               {{ $t('system:tip:file:docx') }}
             </span>
           </el-upload>
         </div>
       </el-form-item>
-
     </div>
-    <div
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -167,18 +171,25 @@
   </el-form>
 </template>
 <script>
-import { addOrUpdateClinicalDataTrialSet, uploadClinicalTemplate, getTrialCriterionSelectList, getReadingQuestionCriterionTrialList } from '@/api/trials'
+import {
+  addOrUpdateClinicalDataTrialSet,
+  uploadClinicalTemplate,
+  getTrialCriterionSelectList,
+  getReadingQuestionCriterionTrialList,
+} from '@/api/trials'
 export default {
   name: 'AddOrUpdateClinicalData',
   props: {
     data: {
       type: Object,
-      default() { return {} }
+      default() {
+        return {}
+      },
     },
     trialId: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
 
   data() {
@@ -193,21 +204,57 @@ export default {
         UploadRole: null,
         FileName: '',
         Path: '',
-        TrialCriterionIdList: []
+        TrialCriterionIdList: [],
       },
       rules: {
-        ClinicalDataSetName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }],
-        ClinicalDataSetEnName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }],
-        ClinicalDataLevel: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        ClinicalUploadType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        UploadRole: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        TrialCriterionIdList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }]
+        ClinicalDataSetName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        ClinicalDataSetEnName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        ClinicalDataLevel: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        ClinicalUploadType: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        UploadRole: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        TrialCriterionIdList: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
       },
       loading: false,
       btnLoading: false,
       fileList: [],
       trialCriterionSelectList: [],
-      criterionList: []
+      criterionList: [],
     }
   },
   mounted() {
@@ -219,13 +266,17 @@ export default {
       getReadingQuestionCriterionTrialList({
         TrialId: this.trialId,
         PageIndex: 1,
-        PageSize: 500
-      }).then(res => {
-        this.criterionList = res.Result.CurrentPageData
-      }).catch(() => { this.listLoading = false })
+        PageSize: 500,
+      })
+        .then((res) => {
+          this.criterionList = res.Result.CurrentPageData
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     getTrialCriterionSelectList() {
-      getTrialCriterionSelectList({ TrialId: this.trialId }).then(res => {
+      getTrialCriterionSelectList({ TrialId: this.trialId }).then((res) => {
         this.trialCriterionSelectList = res.Result
       })
     },
@@ -240,22 +291,23 @@ export default {
         this.fileList = [
           {
             name: this.data.FileName,
-            path: this.data.Path
-          }
+            path: this.data.Path,
+          },
         ]
       }
     },
     save() {
-      this.$refs.clinicalDataForm.validate(valid => {
+      this.$refs.clinicalDataForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         this.form.TrialId = this.trialId
-        addOrUpdateClinicalDataTrialSet(this.form).then(res => {
-          this.btnLoading = false
-          this.$emit('getList', true)
-          this.$emit('close')
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-        })
+        addOrUpdateClinicalDataTrialSet(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            this.$emit('getList', true)
+            this.$emit('close')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
           .catch(() => {
             this.btnLoading = false
           })
@@ -265,9 +317,16 @@ export default {
     async handleUploadFile(param) {
       this.loading = true
       const file = await this.fileToBlob(param.file)
-      const res = await this.OSSclient.put(`/TrialConfig/${this.trialId}/ClinicalData/${param.file.name}`, file)
+      const res = await this.OSSclient.put(
+        `/TrialConfig/${this.trialId}/ClinicalData/${param.file.name}`,
+        file
+      )
       // console.log(res)
-      const file1 = { name: param.file.name, path: this.form.Path, url: this.$getObjectName(res.url) }
+      const file1 = {
+        name: param.file.name,
+        path: this.form.Path,
+        url: this.$getObjectName(res.url),
+      }
       this.fileList.push(file1)
       this.form.Path = this.$getObjectName(res.url)
       this.form.FileName = param.file.name
@@ -299,7 +358,9 @@ export default {
     },
     checkFileSuffix(fileName) {
       var typeArr = ['doc', 'docx']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true
       } else {
@@ -312,13 +373,12 @@ export default {
     },
     close() {
       this.$emit('close')
-    }
-
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.upload-container{
+.upload-container {
   /deep/ .el-upload {
     width: 100%;
     text-align: left;

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -1307,6 +1307,18 @@ export default {
         //   OldVal: this.initialForm.ClinicalDataSetNames.join(', ')
         // }
       ]
+      this.form.TrialObjectNameList.forEach((item) => {
+        let old =
+          this.initialForm.TrialObjectNameList.find(
+            (d) => d.Name === item.Name
+          ) || {}
+        let obj = {
+          Name: item.Name,
+          NewVal: item.TrialName,
+          OldVal: old.TrialName,
+        }
+        this.confirmData.push(obj)
+      })
     },
     // 筛选号规则提醒
     subjectCodeRuleChange(val) {
@@ -1323,35 +1335,6 @@ export default {
           this.form[k] = res[k]
         }
       }
-      if (
-        !this.form.TrialObjectNameList ||
-        (Array.isArray(this.form.TrialObjectNameList) &&
-          this.form.TrialObjectNameList.length <= 0)
-      ) {
-        this.form.TrialObjectNameList = this.$d.Terminology.map((item) => {
-          return {
-            Name: item.label,
-            TrialName: item.label,
-            IsDefault: true,
-          }
-        })
-      } else if (
-        Array.isArray(this.form.TrialObjectNameList) &&
-        this.form.TrialObjectNameList.length > 0
-      ) {
-        this.$d.Terminology.forEach((item) => {
-          if (
-            !this.form.TrialObjectNameList.find((d) => d.Name === item.label)
-          ) {
-            this.form.TrialObjectNameList.push({
-              Name: item.label,
-              TrialName: item.label,
-              IsDefault: true,
-            })
-          }
-        })
-      }
-
       let Modalitys = this.form.ModalityList.map((item) => {
         return this.$fd('Modality', item.trim())
       })
@@ -1373,6 +1356,36 @@ export default {
           .replaceAll(',', ' | ')
         // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
         this.initialForm = { ...this.form }
+        this.initialForm.TrialObjectNameList =
+          JSON.parse(JSON.stringify(this.form.TrialObjectNameList)) || []
+        if (
+          !this.form.TrialObjectNameList ||
+          (Array.isArray(this.form.TrialObjectNameList) &&
+            this.form.TrialObjectNameList.length <= 0)
+        ) {
+          this.form.TrialObjectNameList = this.$d.Terminology.map((item) => {
+            return {
+              Name: item.label,
+              TrialName: item.label,
+              IsDefault: true,
+            }
+          })
+        } else if (
+          Array.isArray(this.form.TrialObjectNameList) &&
+          this.form.TrialObjectNameList.length > 0
+        ) {
+          this.$d.Terminology.forEach((item) => {
+            if (
+              !this.form.TrialObjectNameList.find((d) => d.Name === item.label)
+            ) {
+              this.form.TrialObjectNameList.push({
+                Name: item.label,
+                TrialName: item.label,
+                IsDefault: true,
+              })
+            }
+          })
+        }
         this.loading = false
       }
     },

src/views/trials/trials-panel/setting/visit-plan/index.vue

@@ -1,8 +1,7 @@
 <template>
   <BaseContainer v-loading="listLoading">
     <template slot="search-container">
-
-      <span style="margin-left:auto;">
+      <span style="margin-left: auto">
         <!-- Add -->
         <el-button
           v-hasPermi="['trials:trials-panel:setting:visit-plan:add']"
@@ -48,11 +47,11 @@
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
-
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         height="100"
         stripe
+        @sort-change="handleSortByColumn"
       >
         <!-- Visit Name -->
         <el-table-column
@@ -60,6 +59,7 @@
           :label="$t('trials:visitPlan:table:visitName')"
           show-overflow-tooltip
           min-width="60"
+          sortable="custom"
         />
         <!-- 是否基线 -->
         <el-table-column
@@ -67,6 +67,7 @@
           :label="$t('trials:visitPlan:table:isBaseLine')"
           show-overflow-tooltip
           min-width="60"
+          sortable="custom"
         >
           <template slot-scope="scope">
             {{ $fd('YesOrNo', scope.row.IsBaseLine) }}
@@ -85,6 +86,7 @@
           :label="$t('trials:visitPlan:table:viistNum')"
           show-overflow-tooltip
           min-width="60"
+          sortable="custom"
         />
         <!-- 访视间隔 -->
         <el-table-column
@@ -92,6 +94,7 @@
           :label="$t('trials:visitPlan:table:viistDay')"
           show-overflow-tooltip
           min-width="60"
+          sortable="custom"
         />
         <!-- 窗口 -->
         <el-table-column
@@ -102,8 +105,19 @@
           min-width="60"
         >
           <template slot-scope="scope">
-            <span v-show="scope.row.VisitWindowLeft!==0 || scope.row.VisitWindowRight!==0">
-              {{ `${scope.row.VisitWindowLeft} ${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight} ${$t('trials:visitPlan:table:day')}` }}
+            <span
+              v-show="
+                scope.row.VisitWindowLeft !== 0 ||
+                scope.row.VisitWindowRight !== 0
+              "
+            >
+              {{
+                `${scope.row.VisitWindowLeft} ${$t(
+                  'trials:visitPlan:table:day'
+                )} ~ ${scope.row.VisitWindowRight} ${$t(
+                  'trials:visitPlan:table:day'
+                )}`
+              }}
             </span>
           </template>
         </el-table-column>
@@ -115,9 +129,12 @@
           min-width="80"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
-
+            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{
+              $fd('YesOrNo', scope.row.IsConfirmed)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd('YesOrNo', scope.row.IsConfirmed)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 是否废除 -->
@@ -128,8 +145,12 @@
           min-width="80"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-if="scope.row.IsDeleted">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- Description -->
@@ -163,11 +184,24 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- 分页组件 -->
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
 
     <base-model v-if="visit_model.visible" :config="visit_model">
       <template slot="dialog-body">
-        <VisitPlanForm :row="row" :is-have-first-give-medicine-date="isHaveFirstGiveMedicineDate" @closeDialog="closeDialog" @getList="getList" />
+        <VisitPlanForm
+          :row="row"
+          :is-have-first-give-medicine-date="isHaveFirstGiveMedicineDate"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </template>
     </base-model>
     <!-- 调整记录 -->
@@ -200,23 +234,37 @@
       >
         <div class="base-dialog-body">
           <!-- 基线盲态标识 -->
-          <el-form-item :label="$t('trials:visitPlan:button:bsBlindFlag')" prop="BlindBaseLineName">
+          <el-form-item
+            :label="$t('trials:visitPlan:button:bsBlindFlag')"
+            prop="BlindBaseLineName"
+          >
             <el-input
               v-model="form.BlindBaseLineName"
               :disabled="isHaveGeneratedTask"
             />
           </el-form-item>
           <!-- 随访盲态标识前缀 -->
-          <el-form-item :label="$t('trials:visitPlan:button:visitBlindFlag')" prop="BlindFollowUpPrefix">
+          <el-form-item
+            :label="$t('trials:visitPlan:button:visitBlindFlag')"
+            prop="BlindFollowUpPrefix"
+          >
             <el-input
               v-model="form.BlindFollowUpPrefix"
               :disabled="isHaveGeneratedTask"
             />
           </el-form-item>
         </div>
-        <div v-if="!isHaveGeneratedTask" class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+        <div
+          v-if="!isHaveGeneratedTask"
+          class="base-dialog-footer"
+          style="text-align: right; margin-top: 10px"
+        >
           <el-form-item>
-            <el-button v-hasPermi="['trials:trials-panel:setting:visit-plan:add']" type="primary" @click="handleSaveBlindName">
+            <el-button
+              v-hasPermi="['trials:trials-panel:setting:visit-plan:add']"
+              type="primary"
+              @click="handleSaveBlindName"
+            >
               {{ $t('common:button:save') }}
             </el-button>
           </el-form-item>
@@ -226,17 +274,37 @@
   </BaseContainer>
 </template>
 <script>
-import { getVisitStageList, confirmTrialVisitPlan, updateVisitBlindName } from '@/api/trials'
+import {
+  getVisitStageList,
+  confirmTrialVisitPlan,
+  updateVisitBlindName,
+} from '@/api/trials'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import VisitPlanForm from './components/visitPlanForm'
 import VisitPlanAdjust from './components/visitPlanAdjust'
-
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+  return {
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: true,
+    SortField: '',
+  }
+}
 export default {
   name: 'VisitPlan',
-  components: { BaseContainer, BaseModel, VisitPlanForm, VisitPlanAdjust },
+  components: {
+    BaseContainer,
+    BaseModel,
+    VisitPlanForm,
+    VisitPlanAdjust,
+    Pagination,
+  },
   data() {
     return {
+      searchData: searchDataDefault(),
+      total: 0,
       list: [],
       trialId: '',
       listLoading: false,
@@ -252,15 +320,26 @@ export default {
       form: { TrialId: '', BlindBaseLineName: '', BlindFollowUpPrefix: '' },
       rules: {
         BlindBaseLineName: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
         ],
         BlindFollowUpPrefix: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-        ]
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
       },
-      config_model: { visible: false, title: this.$t('trials:visitPlan:button:blindFlag') }, // '盲态标识'
+      config_model: {
+        visible: false,
+        title: this.$t('trials:visitPlan:button:blindFlag'),
+      }, // '盲态标识'
       formLoading: false,
-      isHaveGeneratedTask: false
+      isHaveGeneratedTask: false,
     }
   },
   mounted() {
@@ -270,23 +349,49 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      getVisitStageList(this.trialId)
+      this.searchData.TrialId = this.trialId
+      getVisitStageList(this.searchData)
         .then((res) => {
           this.listLoading = false
-          this.list = res.Result.VisitPlanList
+          this.list = res.Result.VisitPlanList.CurrentPageData
+          this.total = res.Result.VisitPlanList.TotalCount
           this.visitPlanConfirmed = res.Result.VisitPlanConfirmed
-          this.isHaveFirstGiveMedicineDate = res.Result.IsHaveFirstGiveMedicineDate
+          this.isHaveFirstGiveMedicineDate =
+            res.Result.IsHaveFirstGiveMedicineDate
           this.isHaveGeneratedTask = res.Result.IsHaveGeneratedTask
           this.form.BlindBaseLineName = res.Result.BlindBaseLineName
           this.form.BlindFollowUpPrefix = res.Result.BlindFollowUpPrefix
-          this.isConfirm = res.Result.VisitPlanList.some(item => { return item.IsConfirmed === false })
+          this.isConfirm = res.Result.VisitPlanList.CurrentPageData.some(
+            (item) => {
+              return item.IsConfirmed === false
+            }
+          )
         })
         .catch(() => {
           this.listLoading = false
         })
     },
+    // 排序
+    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()
+    },
     handleAdd() {
-      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -5, VisitWindowRight: 5, Description: '' }
+      this.row = {
+        TrialId: this.trialId,
+        Id: '',
+        IsBaseLine: false,
+        BlindName: '',
+        VisitWindowLeft: -5,
+        VisitWindowRight: 5,
+        Description: '',
+      }
       this.timer = new Date().getTime()
       if (this.list.length === 0) {
         this.row.VisitName = 'Baseline'
@@ -297,12 +402,23 @@ export default {
         this.row.VisitNum = this.list[0].VisitNum + 1
       } else {
         console.log(1)
-        this.row.VisitName = this.list[this.list.length - 1].VisitName.split(' ')[0] + ' ' + (this.list[this.list.length - 1].VisitNum + 1)
+        this.row.VisitName =
+          this.list[this.list.length - 1].VisitName.split(' ')[0] +
+          ' ' +
+          (this.list[this.list.length - 1].VisitNum + 1)
         this.row.VisitNum = this.list[this.list.length - 1].VisitNum + 1
-        this.row.VisitDay = this.list[this.list.length - 1].VisitDay - this.list[this.list.length - 2].VisitDay + this.list[this.list.length - 1].VisitDay
-        if (this.list[this.list.length - 1].VisitWindowLeft && this.list[this.list.length - 1].VisitWindowRight) {
-          this.row.VisitWindowLeft = this.list[this.list.length - 1].VisitWindowLeft
-          this.row.VisitWindowRight = this.list[this.list.length - 1].VisitWindowRight
+        this.row.VisitDay =
+          this.list[this.list.length - 1].VisitDay -
+          this.list[this.list.length - 2].VisitDay +
+          this.list[this.list.length - 1].VisitDay
+        if (
+          this.list[this.list.length - 1].VisitWindowLeft &&
+          this.list[this.list.length - 1].VisitWindowRight
+        ) {
+          this.row.VisitWindowLeft =
+            this.list[this.list.length - 1].VisitWindowLeft
+          this.row.VisitWindowRight =
+            this.list[this.list.length - 1].VisitWindowRight
         }
       }
       this.visit_model.title = this.$t('common:button:add')
@@ -317,16 +433,22 @@ export default {
       const msg = this.$t('trials:adjustRecord:message:confirm')
       this.$confirm(msg, {
         type: 'warning',
-        distinguishCancelAndClose: true
-      }).then(() => {
-        this.confirmLoading = true
-        confirmTrialVisitPlan(this.trialId).then((res) => {
-          this.confirmLoading = false
-          if (res.IsSuccess) {
-            this.getList()
-          }
-        }).catch(() => { this.confirmLoading = false })
-      }).catch(() => {})
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.confirmLoading = true
+          confirmTrialVisitPlan(this.trialId)
+            .then((res) => {
+              this.confirmLoading = false
+              if (res.IsSuccess) {
+                this.getList()
+              }
+            })
+            .catch(() => {
+              this.confirmLoading = false
+            })
+        })
+        .catch(() => {})
     },
     closeDialog() {
       this.visit_model.visible = false
@@ -336,19 +458,21 @@ export default {
         if (valid) {
           this.formLoading = true
           this.form.TrialId = this.trialId
-          updateVisitBlindName(this.form).then((res) => {
-            this.formLoading = false
-            this.config_model.visible = false
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          }).catch(() => {
-            this.formLoading = false
-          })
+          updateVisitBlindName(this.form)
+            .then((res) => {
+              this.formLoading = false
+              this.config_model.visible = false
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            })
+            .catch(() => {
+              this.formLoading = false
+            })
         }
       })
     },
     handleConfig() {
       this.config_model.visible = true
-    }
-  }
+    },
+  },
 }
 </script>

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

@@ -1052,7 +1052,7 @@ export default {
         if (v.DataType === 'Array' || v.DataType === 'array') {
           if (obj[v.Code] && obj[v.Code].length > 0) {
             obj[v.Code].forEach((o) => {
-              var uo = upObj ? upObj[v.Code].find(u => u[v.ChildDataLabel] == o[v.ChildDataLabel]) : null
+              var uo = upObj && upObj[v.Code] ? upObj[v.Code].find(u => u[v.ChildDataLabel] == o[v.ChildDataLabel]) : null
               if (row.OptType === 'Add' || row.OptType === 'Init') {
                 item = {
                   key: o[v.ChildDataLabel],
@@ -1089,7 +1089,7 @@ export default {
                   a = getToken()
                 }
                 return v.UrlParameterName + '=' + a + '&'
-              }).toString().replaceAll(',', '') + 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
+              }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
             newValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
               v.UrlConfig.ParameterList.map((v) => {
                 let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
@@ -1097,7 +1097,7 @@ export default {
                   a = getToken()
                 }
                 return v.UrlParameterName + '=' + a + '&'
-              }).toString().replaceAll(',', '') + 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath
+              }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath
           }
           console.log(item)
           item.IsTableFiled = v.IsTableFiled

src/views/trials/trials-panel/visit/consistency-check/index.vue

@@ -62,7 +62,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
@@ -70,7 +70,7 @@
           icon="el-icon-refresh-left"
           @click="handleReset"
         >
-          {{ $t("common:button:reset") }}
+          {{ $t('common:button:reset') }}
         </el-button>
         <!--导出一致性核查表-->
         <el-button
@@ -78,7 +78,7 @@
           icon="el-icon-download"
           @click="handleExport(1)"
         >
-          {{ $t("trials:consistencyCheck:button:export1") }}
+          {{ $t('trials:consistencyCheck:button:export1') }}
         </el-button>
         <!-- 导出一致性核查记录表 -->
         <el-button
@@ -86,7 +86,7 @@
           icon="el-icon-download"
           @click="handleExport(2)"
         >
-          {{ $t("trials:consistencyCheck:button:export2") }}
+          {{ $t('trials:consistencyCheck:button:export2') }}
         </el-button>
         <!-- 下载模板 -->
         <el-button
@@ -95,7 +95,7 @@
           icon="el-icon-download"
           @click="handleDownload"
         >
-          {{ $t("trials:consistencyCheck:button:download") }}
+          {{ $t('trials:consistencyCheck:button:download') }}
         </el-button>
       </el-form>
       <!-- 上传 -->
@@ -106,7 +106,7 @@
           icon="el-icon-upload2"
           @click="handleOpenUploadDialog"
         >
-          {{ $t("trials:consistencyCheck:button:upload") }}
+          {{ $t('trials:consistencyCheck:button:upload') }}
         </el-button>
       </span>
     </template>
@@ -133,10 +133,10 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsUrgent" type="danger">{{
-              $fd("YesOrNo", scope.row.IsUrgent)
+              $fd('YesOrNo', scope.row.IsUrgent)
             }}</el-tag>
             <el-tag v-else type="primary">{{
-              $fd("YesOrNo", scope.row.IsUrgent)
+              $fd('YesOrNo', scope.row.IsUrgent)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -156,8 +156,8 @@
             >
               {{
                 userTypeEnumInt === 2
-                  ? $fd("CheckChallengeState", 1)
-                  : $fd("CheckChallengeState", 2)
+                  ? $fd('CheckChallengeState', 1)
+                  : $fd('CheckChallengeState', 2)
               }}
             </el-tag>
             <el-tag
@@ -166,12 +166,12 @@
             >
               {{
                 userTypeEnumInt === 2
-                  ? $fd("CheckChallengeState", 2)
-                  : $fd("CheckChallengeState", 1)
+                  ? $fd('CheckChallengeState', 2)
+                  : $fd('CheckChallengeState', 1)
               }}
             </el-tag>
             <el-tag v-else-if="scope.row.CheckChallengeState === 3">{{
-              $fd("CheckChallengeState", scope.row.CheckChallengeState)
+              $fd('CheckChallengeState', scope.row.CheckChallengeState)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -202,7 +202,7 @@
           <template slot-scope="scope">
             <span>{{ scope.row.VisitName }}</span>
             <span v-if="scope.row.IsCheckBack" class="status-primary-circle">{{
-              $t("trials:consistencyCheck:table:back")
+              $t('trials:consistencyCheck:table:back')
             }}</span>
           </template>
         </el-table-column>
@@ -227,8 +227,32 @@
           width="140"
           sortable="custom"
         >
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.LatestScanDate.split(" ")[0] }}</span>
+          </template> -->
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="`${
+                scope.row.EarliestScanDate
+                  ? moment(scope.row.EarliestScanDate).format('YYYY-MM-DD')
+                  : ''
+              } ~ ${
+                scope.row.LatestScanDate
+                  ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                  : ''
+              }`"
+              placement="top"
+            >
+              <span>
+                {{
+                  scope.row.LatestScanDate
+                    ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                    : ''
+                }}
+              </span>
+            </el-tooltip>
           </template>
         </el-table-column>
 
@@ -270,13 +294,13 @@
           <template slot-scope="scope">
             <span v-if="scope.row.CheckState === 0"> -- </span>
             <el-tag v-else-if="scope.row.CheckState === 9" type="danger">{{
-              $fd("CheckState", scope.row.CheckState)
+              $fd('CheckState', scope.row.CheckState)
             }}</el-tag>
             <el-tag v-else-if="scope.row.CheckState === 10" type="danger">{{
-              $fd("CheckState", scope.row.CheckState)
+              $fd('CheckState', scope.row.CheckState)
             }}</el-tag>
             <el-tag v-else-if="scope.row.CheckState === 11">{{
-              $fd("CheckState", scope.row.CheckState)
+              $fd('CheckState', scope.row.CheckState)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -309,26 +333,27 @@
           :label="$t('trials:consistencyCheck:table:requestBackState')"
           show-overflow-tooltip
           min-width="120"
+          sortable="custom"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.RequestBackState * 1 === 0">{{
-              $fd("RequestBackState", scope.row.RequestBackState * 1)
+              $fd('RequestBackState', scope.row.RequestBackState * 1)
             }}</span>
             <el-tag v-else-if="scope.row.RequestBackState * 1 === 1">{{
-              $fd("RequestBackState", scope.row.RequestBackState * 1)
+              $fd('RequestBackState', scope.row.RequestBackState * 1)
             }}</el-tag>
             <el-tag
               v-else-if="scope.row.RequestBackState * 1 === 2"
               type="warning"
               >{{
-                $fd("RequestBackState", scope.row.RequestBackState * 1)
+                $fd('RequestBackState', scope.row.RequestBackState * 1)
               }}</el-tag
             >
             <el-tag
               v-else-if="scope.row.RequestBackState * 1 === 3"
               type="danger"
               >{{
-                $fd("RequestBackState", scope.row.RequestBackState * 1)
+                $fd('RequestBackState', scope.row.RequestBackState * 1)
               }}</el-tag
             >
           </template>
@@ -396,9 +421,9 @@
       <div class="remark">
         <span class="status-primary-circle">
           <!-- 回退 -->
-          {{ $t("trials:consistencyCheck:table:back") }}
+          {{ $t('trials:consistencyCheck:table:back') }}
         </span>
-        <span>: {{ $t("trials:consistencyCheck:title:back") }}</span>
+        <span>: {{ $t('trials:consistencyCheck:title:back') }}</span>
       </div>
     </template>
 
@@ -435,9 +460,9 @@
       width="600px"
     >
       <div slot="title">
-        <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
-          `(${$t("common:label:sign")}${currentUser})`
+          `(${$t('common:label:sign')}${currentUser})`
         }}</span>
       </div>
       <SignForm
@@ -539,11 +564,11 @@
           size="small"
           type="primary"
           @click="
-            ReasonVisible = false;
-            QuestionForm = { Type: null, Reason: null };
+            ReasonVisible = false
+            QuestionForm = { Type: null, Reason: null }
           "
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
         <el-button
@@ -552,7 +577,7 @@
           type="primary"
           @click="passOrCloes"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </div>
     </el-dialog>
@@ -573,32 +598,33 @@ import {
   closeCheckChallenge,
   setCheckPass,
   getCheckChallengeDialogList,
-} from "@/api/trials";
-import { DownloadCommonDoc } from "@/api/dictionary";
+} from '@/api/trials'
+import { DownloadCommonDoc } from '@/api/dictionary'
 import {
   getDicomAndNoneDicomStudyList_Export,
   getConsistencyVerificationList_Export,
-} from "@/api/export";
-import { checkBack } from "@/api/trials/visit";
-import BaseContainer from "@/components/BaseContainer";
-import BaseModel from "@/components/BaseModel";
-import ConsistencyCheckForm from "./components/consistencyCheckForm";
-import UploadExcel from "./components/uploadExcel";
-import SignForm from "@/views/trials/components/newSignForm";
-import Pagination from "@/components/Pagination";
-import const_ from "@/const/sign-code";
+} from '@/api/export'
+import { checkBack } from '@/api/trials/visit'
+import BaseContainer from '@/components/BaseContainer'
+import BaseModel from '@/components/BaseModel'
+import ConsistencyCheckForm from './components/consistencyCheckForm'
+import UploadExcel from './components/uploadExcel'
+import SignForm from '@/views/trials/components/newSignForm'
+import Pagination from '@/components/Pagination'
+import const_ from '@/const/sign-code'
+import moment from 'moment'
 const searchDataDefault = () => {
   return {
-    TrialSiteId: "",
-    SubjectInfo: "",
+    TrialSiteId: '',
+    SubjectInfo: '',
     VisitPlanArray: [],
     CheckState: null,
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  name: "ConsistencyCheck",
+  name: 'ConsistencyCheck',
   components: {
     BaseContainer,
     Pagination,
@@ -614,6 +640,7 @@ export default {
         Reason: null,
         Remake: null,
       },
+      moment,
       searchData: searchDataDefault(),
       ReasonVisible: false,
       total: 0,
@@ -625,170 +652,170 @@ export default {
       currentDialogList: [],
       siteOptions: [],
       visitPlanOptions: [],
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       upload_cfg: {
         visible: false,
-        title: this.$t("trials:consistencyCheck:button:upload"),
-        width: "500px",
+        title: this.$t('trials:consistencyCheck:button:upload'),
+        width: '500px',
         showClose: true,
       },
       rules: {
         Type: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
         ],
         Remake: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
         ],
       },
       signVisible: false,
       signType: 0, // 0代表申请，1代表回退,2通过
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       OtherInfo: {},
-      signCode: "",
+      signCode: '',
       trialId: this.$route.query.trialId,
       isReply: false,
       ReasonTitle: null,
-    };
+    }
   },
   mounted() {
-    this.getList();
-    this.getSite();
-    this.getVisitPlanOptions();
+    this.getList()
+    this.getSite()
+    this.getVisitPlanOptions()
   },
   watch: {
     chatVisible() {
       if (!this.chatVisible) {
-        this.$store.state.trials.checkTaskId = null;
+        this.$store.state.trials.checkTaskId = null
       }
     },
   },
   methods: {
     beforeClose() {
-      this.chatVisible = false;
-      this.$store.state.trials.checkTaskId = null;
+      this.chatVisible = false
+      this.$store.state.trials.checkTaskId = null
     },
     handleExport(type) {
       if (type === 1) {
         getDicomAndNoneDicomStudyList_Export(this.searchData)
           .then((res) => {})
           .catch(() => {
-            this.loading = false;
-          });
+            this.loading = false
+          })
       } else {
         getConsistencyVerificationList_Export(this.searchData)
           .then((res) => {})
           .catch(() => {
-            this.loading = false;
-          });
+            this.loading = false
+          })
       }
     },
     typeChange(v) {
-      if (v === (this.currentRow.type === "pass" ? 4 : 2)) {
-        this.QuestionForm.Reason = null;
-        this.QuestionForm.Remake = null;
+      if (v === (this.currentRow.type === 'pass' ? 4 : 2)) {
+        this.QuestionForm.Reason = null
+        this.QuestionForm.Remake = null
       } else {
         this.QuestionForm.Reason = this.$t(
           `trials:check:radio:${this.currentRow.type}reason${v}`
-        );
+        )
       }
     },
     passOrCloes() {
-      if (this.currentRow.type === "pass") {
-        this.pass();
+      if (this.currentRow.type === 'pass') {
+        this.pass()
       } else {
-        this.handleClose(this.currentRow);
+        this.handleClose(this.currentRow)
       }
     },
     handleOpenReason(row, type) {
-      if (type === "pass") {
+      if (type === 'pass') {
         // 手动通过一次性核查原因
         this.ReasonTitle = this.$t(
-          "trials:consistencyCheck:dialogTitle:xfpassManually"
-        );
+          'trials:consistencyCheck:dialogTitle:xfpassManually'
+        )
       } else {
         // 关闭一致性核查原因
         this.ReasonTitle = this.$t(
-          "trials:consistencyCheck:dialogTitle:xfclose"
-        );
+          'trials:consistencyCheck:dialogTitle:xfclose'
+        )
       }
-      this.currentRow = { ...row, Reason: null };
-      this.currentRow.type = type;
+      this.currentRow = { ...row, Reason: null }
+      this.currentRow.type = type
       this.QuestionForm = {
         Type: null,
         Reason: null,
         Remake: null,
-      };
-      this.ReasonVisible = true;
+      }
+      this.ReasonVisible = true
     },
     // 获取质疑列表
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       getConsistencyVerificationList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-          this.OtherInfo = res.OtherInfo;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.OtherInfo = res.OtherInfo
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 回复质疑
     handleReply(row) {
-      this.loading = true;
+      this.loading = true
       getCheckChallengeDialogList(row.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            Object.assign(row, res.Result.SubjectVisitCheck);
-            this.currentRow = { ...row };
-            this.$store.state.trials.checkTaskId = row.Id;
-            this.currentDialogList = res.Result.DialogList;
-            this.isReply = true;
-            this.chatVisible = true;
+            Object.assign(row, res.Result.SubjectVisitCheck)
+            this.currentRow = { ...row }
+            this.$store.state.trials.checkTaskId = row.Id
+            this.currentDialogList = res.Result.DialogList
+            this.isReply = true
+            this.chatVisible = true
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     getDialogList() {
-      this.loading = true;
-      this.$refs["chatForm"].loading = true;
+      this.loading = true
+      this.$refs['chatForm'].loading = true
       getCheckChallengeDialogList(this.currentRow.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
             var i = this.list.findIndex(
               (item) => item.Id === this.currentRow.Id
-            );
+            )
             if (i > -1) {
               this.currentRow = Object.assign(
                 this.list[i],
                 res.Result.SubjectVisitCheck
-              );
-              this.currentDialogList = res.Result.DialogList;
-              this.$refs["chatForm"].addMessage(
+              )
+              this.currentDialogList = res.Result.DialogList
+              this.$refs['chatForm'].addMessage(
                 res.Result.DialogList[res.Result.DialogList.length - 1]
-              );
+              )
               // this.$refs['chatForm'].getMessageList(res.Result.DialogList)
             }
           }
         })
         .catch(() => {
-          this.loading = false;
-          this.$refs["chatForm"].loading = false;
-        });
+          this.loading = false
+          this.$refs['chatForm'].loading = false
+        })
     },
     // 回退
     // handleBack(row) {
@@ -799,127 +826,125 @@ export default {
     //   this.signVisible = true
     // },
     handleBack() {
-      this.signType = 1;
-      const { DataFallback } = const_.processSignature;
-      this.signCode = DataFallback;
-      this.signVisible = true;
+      this.signType = 1
+      const { DataFallback } = const_.processSignature
+      this.signCode = DataFallback
+      this.signVisible = true
     },
     pass() {
       this.$refs.reasonForm.validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
+        if (!valid) return
+        this.btnLoading = true
         if (this.QuestionForm.Type === 4) {
           // 问题无法解决强制关闭质疑，已提醒中心下次注意
-          this.QuestionForm.Reason = `${this.QuestionForm.Remake}`;
+          this.QuestionForm.Reason = `${this.QuestionForm.Remake}`
         }
         var params = {
           Id: this.currentRow.Id,
           ManualPassReason: this.QuestionForm.Reason,
-        };
+        }
         setCheckPass(this.trialId, params)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.getList();
-              this.QuestionForm.Type = null;
-              this.ReasonVisible = false;
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
+              this.getList()
+              this.QuestionForm.Type = null
+              this.ReasonVisible = false
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     back(signInfo) {
-      this.loading = true;
+      this.loading = true
       var params = {
         data: { id: this.currentRow.Id },
         signInfo: signInfo,
-      };
+      }
       checkBack(params)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (signInfo) {
-            this.$refs["signForm"].btnLoading = false;
-            this.signVisible = false;
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
           }
           if (res.IsSuccess) {
-            this.getList();
+            this.getList()
             // this.getDialogList()
-            this.chatVisible = false;
+            this.chatVisible = false
             // 回退成功
             this.$message.success(
-              this.$t("trials:consistencyCheck:message:fallbackSuccessfully")
-            );
+              this.$t('trials:consistencyCheck:message:fallbackSuccessfully')
+            )
           }
         })
         .catch(() => {
-          this.loading = false;
+          this.loading = false
           if (signInfo) {
-            this.$refs["signForm"].btnLoading = false;
+            this.$refs['signForm'].btnLoading = false
           }
-        });
+        })
     },
     // 关闭质疑
     handleClose(row) {
       this.$refs.reasonForm.validate((valid) => {
-        if (!valid) return;
-        var item = Object.assign({}, row);
-        item.CheckChallengeState = 3;
-        this.btnLoading = true;
+        if (!valid) return
+        var item = Object.assign({}, row)
+        item.CheckChallengeState = 3
+        this.btnLoading = true
         if (this.QuestionForm.Type === 2) {
           // 问题无法解决强制关闭质疑，已提醒中心下次注意
           this.QuestionForm.Reason = `${this.$t(
-            "trials:qcQuality:message:problemNotSolved"
-          )}<br/><br/>${this.$t("trials:consistencyCheck:title:note")}${
+            'trials:qcQuality:message:problemNotSolved'
+          )}<br/><br/>${this.$t('trials:consistencyCheck:title:note')}${
             this.QuestionForm.Remake
-          }`;
+          }`
         }
         var params = {
           SubjectVisitId: row.Id,
           CloseCheckChallenge: this.QuestionForm.Reason,
-        };
+        }
         closeCheckChallenge(this.trialId, params)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.getList();
-              this.ReasonVisible = false;
-              this.QuestionForm.Type = null;
+              this.getList()
+              this.ReasonVisible = false
+              this.QuestionForm.Type = null
               // 关闭成功
               this.$message.success(
-                this.$t("trials:consistencyCheck:message:closedSuccessfully")
-              );
+                this.$t('trials:consistencyCheck:message:closedSuccessfully')
+              )
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     handleDownload() {
-      this.loading = true;
-      DownloadCommonDoc("VisitCheck_Template")
+      this.loading = true
+      DownloadCommonDoc('VisitCheck_Template')
         .then((data) => {
-          this.loading = false;
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 打开上传excel弹窗
     handleOpenUploadDialog() {
-      this.upload_cfg.visible = true;
-      this.upload_cfg.title = this.$t("common:button:upload");
+      this.upload_cfg.visible = true
+      this.upload_cfg.title = this.$t('common:button:upload')
     },
     // 查看
     handleView(row) {
-      this.currentRow = { ...row };
-      this.isReply = false;
-      this.chatVisible = true;
+      this.currentRow = { ...row }
+      this.isReply = false
+      this.chatVisible = true
     },
     // crc申请回退
     // handleApplyBack(row) {
@@ -933,92 +958,92 @@ export default {
     //     }).catch(() => {})
     // },
     handleApplyBack() {
-      this.$confirm(this.$t("trials:consistencyCheck:message:apply"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:consistencyCheck:message:apply'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.apply();
+          this.apply()
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     apply() {
-      this.loading = true;
+      this.loading = true
       cRCRequstCheckBack(this.trialId, this.currentRow.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
             // this.getList()
-            this.getDialogList();
+            this.getDialogList()
             // 申请成功
             // this.$message.success(this.$t('trials:consistencyCheck:message:appledSuccessfully'))
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 关闭签名弹窗
     closeSignDialog(isRefresh, signInfo) {
       if (!isRefresh) {
-        this.signVisible = false;
+        this.signVisible = false
       } else {
         // 1代表回退,2通过
         if (this.signType === 1) {
-          this.back(signInfo);
+          this.back(signInfo)
         }
       }
     },
     // 通过一致性核查
     handlePassCheck(row) {
-      this.signType = 2;
-      this.currentRow = { ...row };
-      const { ConsistencyCheckPassed } = const_.processSignature;
-      this.signCode = ConsistencyCheckPassed;
-      this.signVisible = true;
+      this.signType = 2
+      this.currentRow = { ...row }
+      const { ConsistencyCheckPassed } = const_.processSignature
+      this.signCode = ConsistencyCheckPassed
+      this.signVisible = true
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
       this.$nextTick(() => {
-        this.$refs.consistencyTable.clearSort();
-      });
+        this.$refs.consistencyTable.clearSort()
+      })
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      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()
     },
     refreshTable() {
-      this.upload_cfg.visible = false;
-      this.getList();
+      this.upload_cfg.visible = false
+      this.getList()
     },
     // 获取site下拉框数据
     getSite() {
       getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
+        this.siteOptions = res.Result
+      })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
       getTrialVisitStageSelect(this.trialId).then((res) => {
-        this.visitPlanOptions = res.Result;
-      });
+        this.visitPlanOptions = res.Result
+      })
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .consistency-list {

src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue

@@ -1,35 +1,76 @@
 <template>
   <div v-loading="loading" class="chat-wrapper">
     <div class="chat-content">
-      <div v-for="(record,index) in recordContent" :key="`${record.CreateTime}${index}`">
+      <div
+        v-for="(record, index) in recordContent"
+        :key="`${record.CreateTime}${index}`"
+      >
         <div v-if="!record.IsCurrentUser" class="word">
           <!-- <img :src="record.headUrl"> -->
-          <img v-if="record.UserTypeEnum*1 === 8" :src="adminAvatar" alt="Admin">
-          <img v-else-if="record.UserTypeEnum*1 === 1" :src="pmAvatar" alt="PM">
-          <img v-else-if="record.UserTypeEnum*1 === 2" :src="crcAvatar" alt="CRC">
-          <img v-else-if="record.UserTypeEnum*1 === 3" :src="qcAvatar" alt="QC">
+          <img
+            v-if="record.UserTypeEnum * 1 === 8"
+            :src="adminAvatar"
+            alt="Admin"
+          />
+          <img
+            v-else-if="record.UserTypeEnum * 1 === 1"
+            :src="pmAvatar"
+            alt="PM"
+          />
+          <img
+            v-else-if="record.UserTypeEnum * 1 === 2"
+            :src="crcAvatar"
+            alt="CRC"
+          />
+          <img
+            v-else-if="record.UserTypeEnum * 1 === 3"
+            :src="qcAvatar"
+            alt="QC"
+          />
           <div class="info">
             <p class="user-info">
-              <span style="font-weight:700;">{{ record.CreateUserName }} </span>
+              <span style="font-weight: 700">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="formattedText(record.TalkContent)" />
+            <div
+              class="info-content"
+              v-html="formattedText(record.TalkContent)"
+            />
           </div>
         </div>
 
         <div v-else class="word-my">
           <div class="info">
             <p class="user-info">
-              <span style="font-weight:700;">{{ record.CreateUserName }} </span>
+              <span style="font-weight: 700">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="formattedText(record.TalkContent)" />
+            <div
+              class="info-content"
+              v-html="formattedText(record.TalkContent)"
+            />
           </div>
           <!-- <img :src="record.headUrl"> -->
-          <img v-if="record.UserTypeEnum*1 === 8" :src="adminAvatar" alt="Admin">
-          <img v-else-if="record.UserTypeEnum*1 === 1" :src="pmAvatar" alt="PM">
-          <img v-else-if="record.UserTypeEnum*1 === 2" :src="crcAvatar" alt="CRC">
-          <img v-else-if="record.UserTypeEnum*1 === 3" :src="qcAvatar" alt="QC">
+          <img
+            v-if="record.UserTypeEnum * 1 === 8"
+            :src="adminAvatar"
+            alt="Admin"
+          />
+          <img
+            v-else-if="record.UserTypeEnum * 1 === 1"
+            :src="pmAvatar"
+            alt="PM"
+          />
+          <img
+            v-else-if="record.UserTypeEnum * 1 === 2"
+            :src="crcAvatar"
+            alt="CRC"
+          />
+          <img
+            v-else-if="record.UserTypeEnum * 1 === 3"
+            :src="qcAvatar"
+            alt="QC"
+          />
         </div>
       </div>
     </div>
@@ -39,11 +80,7 @@
       class="chat-message"
     >
       <div class="message">
-        <el-input
-          v-model="newMessage"
-          type="textarea"
-          :rows="2"
-        />
+        <el-input v-model="newMessage" type="textarea" :rows="2" />
       </div>
       <div class="function">
         <!-- 申请重传 -->
@@ -67,8 +104,10 @@
         </el-button>
         <!-- 确认重传完成 -->
         <el-button
-          v-show=" ReuploadEnum === 2"
-          v-hasPermi="['trials:trials-panel:visit:crc-upload:set-reupload-finished']"
+          v-show="ReuploadEnum === 2"
+          v-hasPermi="[
+            'trials:trials-panel:visit:crc-upload:set-reupload-finished',
+          ]"
           type="primary"
           @click="handleSetUploadFinished"
         >
@@ -77,7 +116,7 @@
         <!-- 发送 -->
         <el-button
           v-hasPermi="['trials:trials-panel:visit:crc-upload:send']"
-          :disabled="newMessage===''"
+          :disabled="newMessage === ''"
           type="primary"
           :loading="btnLoading"
           @click="handleReply"
@@ -85,11 +124,7 @@
           {{ $t('trials:crcQuestion:button:send') }}
         </el-button>
         <!-- 关闭 -->
-        <el-button
-          type="primary"
-          :loading="btnLoading"
-          @click="close"
-        >
+        <el-button type="primary" :loading="btnLoading" @click="close">
           {{ $t('trials:crcQuestion:button:close') }}
         </el-button>
         <!-- 下一任务 -->
@@ -113,26 +148,71 @@
     >
       <span slot="title">
         <el-breadcrumb separator-class="el-icon-arrow-right">
-          <label style="float: left;margin-right:10px;">Upload: </label>
-          <el-breadcrumb-item v-show="trialCode">{{ trialCode }}</el-breadcrumb-item>
-          <el-breadcrumb-item v-show="data.TrialSiteCode">{{ data.TrialSiteCode }}</el-breadcrumb-item>
-          <el-breadcrumb-item v-show="data.SubjectCode">{{ data.SubjectCode }}</el-breadcrumb-item>
-          <el-breadcrumb-item v-show="data.VisitName">{{ `${data.VisitName} (${data.VisitNum})` }}</el-breadcrumb-item>
+          <label style="float: left; margin-right: 10px">Upload: </label>
+          <el-breadcrumb-item v-show="trialCode">{{
+            trialCode
+          }}</el-breadcrumb-item>
+          <el-breadcrumb-item v-show="data.TrialSiteCode">{{
+            data.TrialSiteCode
+          }}</el-breadcrumb-item>
+          <el-breadcrumb-item v-show="data.SubjectCode">{{
+            data.SubjectCode
+          }}</el-breadcrumb-item>
+          <el-breadcrumb-item v-show="data.VisitName">{{
+            `${data.VisitName} (${data.VisitNum})`
+          }}</el-breadcrumb-item>
         </el-breadcrumb>
       </span>
       <div>
         <el-tabs v-model="activeName" type="border-card">
           <!-- DICOM影像上传 -->
-          <el-tab-pane :label="$t('trials:uploadedDicoms:tab:uploadDicoms')" name="dicom">
-            <upload-dicom-files v-if="uploadVisible" :data="data" :subject-id="data.SubjectId" :subject-visit-id="data.SubjectVisitId" @close="closeUpload" @getList="reFreshList" />
+          <el-tab-pane
+            :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
+            name="dicom"
+          >
+            <upload-dicom-files
+              v-if="uploadVisible"
+              :data="data"
+              :subject-id="data.SubjectId"
+              :subject-visit-id="data.SubjectVisitId"
+              @close="closeUpload"
+              @getList="reFreshList"
+            />
           </el-tab-pane>
           <!-- 非DICOM影像上传 -->
-          <el-tab-pane :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')" name="non-dicom">
-            <upload-non-dicom-files v-if="activeName==='non-dicom'" :data="data" :site-id="data.TrialSiteId" :subject-id="data.SubjectId" :allow-add-or-edit="true" :body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.SubjectVisitId" @getList="reFreshList" />
+          <el-tab-pane
+            :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
+            name="non-dicom"
+          >
+            <upload-non-dicom-files
+              v-if="activeName === 'non-dicom'"
+              :data="data"
+              :site-id="data.TrialSiteId"
+              :subject-id="data.SubjectId"
+              :allow-add-or-edit="true"
+              :body-parts="bodyParts"
+              :modalities="modalities"
+              :subject-visit-id="data.SubjectVisitId"
+              @getList="reFreshList"
+            />
           </el-tab-pane>
           <!-- 临床数据采集 -->
-          <el-tab-pane v-if="data.IsBaseLine && clinicalEnum>0" :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data">
-            <upload-clinical-data v-if="activeName==='clinical-data'" :allow-add-or-edit="true" :data="data" :subject-visit-id="data.SubjectVisitId" :enum-type="clinicalEnum" @getList="reFreshList" />
+          <el-tab-pane
+            v-if="
+              (data.IsBaseLine && clinicalEnum > 0) ||
+              (!data.IsBaseLine && IsHaveVisitClinicalData)
+            "
+            :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
+            name="clinical-data"
+          >
+            <upload-clinical-data
+              v-if="activeName === 'clinical-data'"
+              :allow-add-or-edit="true"
+              :data="data"
+              :subject-visit-id="data.SubjectVisitId"
+              :enum-type="clinicalEnum"
+              @getList="reFreshList"
+            />
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -148,15 +228,27 @@
       custom-class="base-dialog-wrapper"
     >
       <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
+        <span style="font-size: 12px; margin-left: 5px">{{
+          `(${$t('common:label:sign')}${currentUser})`
+        }}</span>
       </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" :subject-visit-id="data.SubjectVisitId" @closeDialog="closeReuploadFinishedDialog" />
+      <SignForm
+        ref="signForm"
+        :sign-code-enum="signCode"
+        :subject-visit-id="data.SubjectVisitId"
+        @closeDialog="closeReuploadFinishedDialog"
+      />
     </el-dialog>
   </div>
 </template>
 <script>
-import { getQCChallengeDialogList, addQCChallengeReply, cRCRequestReUpload, verifyReuploadIsCanJump } from '@/api/trials'
+import {
+  getQCChallengeDialogList,
+  addQCChallengeReply,
+  cRCRequestReUpload,
+  verifyReuploadIsCanJump,
+} from '@/api/trials'
 import { setReuploadFinished } from '@/api/trials/visit'
 import adminAvatar from '@/assets/Admin.png'
 import pmAvatar from '@/assets/PM.png'
@@ -170,30 +262,39 @@ import dicomStore from '@/utils/dicom-store'
 import const_ from '@/const/sign-code'
 export default {
   name: 'ChatForm',
-  components: { UploadDicomFiles, UploadNonDicomFiles, UploadClinicalData, SignForm },
+  components: {
+    UploadDicomFiles,
+    UploadNonDicomFiles,
+    UploadClinicalData,
+    SignForm,
+  },
   props: {
     data: {
       type: Object,
       default() {
         return {}
-      }
+      },
     },
     bodyParts: {
       type: String,
-      default: ''
+      default: '',
     },
     modalities: {
       type: String,
-      default: ''
+      default: '',
     },
     signText: {
       type: String,
-      default: ''
+      default: '',
     },
     clinicalEnum: {
       type: Number,
-      default: 0
-    }
+      default: 0,
+    },
+    IsHaveVisitClinicalData: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -218,8 +319,7 @@ export default {
       signCode: '',
       ReuploadEnum: 0,
       trialId: '',
-      uploadBtnLoading: false
-
+      uploadBtnLoading: false,
     }
   },
   mounted() {
@@ -244,7 +344,9 @@ export default {
         contents.push(this.data.Content)
       }
 
-      var li = contents.map(content => { return `<li>${content}</li>` })
+      var li = contents.map((content) => {
+        return `<li>${content}</li>`
+      })
       const content = `
                         <div>${this.$t('trials:qcQuality:dialog:qcContent')}
                         <ol>
@@ -254,20 +356,24 @@ export default {
                         <p>
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
-                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
+                        <p style='color:red'>${this.$t(
+                          'trials:qcQuality:dialog:deadline'
+                        )}: ${
+        this.data.DeadlineTime
+          ? this.data.DeadlineTime
+          : this.$t('trials:qcQuality:dialog:none')
+      }</p>`
       const userId = zzSessionStorage.getItem('userId')
-      recordContent.push(
-        {
-          IsCurrentUser: this.data.CreateUserId === userId,
-          TalkContent: content,
-          CreateTime: this.data.CreateTime,
-          CreateUserName: this.data.CreateUserName,
-          CreateUserId: this.data.CreateUserId,
-          UserTypeEnum: this.data.UserTypeEnum
-        }
-      )
+      recordContent.push({
+        IsCurrentUser: this.data.CreateUserId === userId,
+        TalkContent: content,
+        CreateTime: this.data.CreateTime,
+        CreateUserName: this.data.CreateUserName,
+        CreateUserId: this.data.CreateUserId,
+        UserTypeEnum: this.data.UserTypeEnum,
+      })
       if (this.data.DialogList && this.data.DialogList.length > 0) {
-        this.data.DialogList.forEach(element => {
+        this.data.DialogList.forEach((element) => {
           recordContent.push(element)
         })
       }
@@ -288,7 +394,9 @@ export default {
         contents.push(this.data.Content)
       }
 
-      var li = contents.map(content => { return `<li>${content}</li>` })
+      var li = contents.map((content) => {
+        return `<li>${content}</li>`
+      })
       const content = `
                         <div>${this.$t('trials:qcQuality:dialog:qcContent')}
                         <ol>
@@ -298,28 +406,34 @@ export default {
                         <p>
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
-                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}}</p>`
+                        <p style='color:red'>${this.$t(
+                          'trials:qcQuality:dialog:deadline'
+                        )}: ${
+        this.data.DeadlineTime
+          ? this.data.DeadlineTime
+          : this.$t('trials:qcQuality:dialog:none')
+      }}</p>`
       const userId = zzSessionStorage.getItem('userId')
-      recordContent.push(
-        {
-          IsCurrentUser: this.data.CreateUserId === userId,
-          TalkContent: content,
-          CreateTime: this.data.CreateTime,
-          CreateUserName: this.data.CreateUserName,
-          CreateUserId: this.data.CreateUserId,
-          UserTypeEnum: this.data.UserTypeEnum
-        }
-      )
-      getQCChallengeDialogList(this.data.Id).then(res => {
-        this.loading = false
-        res.Result.forEach(element => {
-          recordContent.push(element)
-        })
-        this.recordContent = recordContent
-        this.setScrollHeight()
-      }).catch(() => {
-        this.loading = false
+      recordContent.push({
+        IsCurrentUser: this.data.CreateUserId === userId,
+        TalkContent: content,
+        CreateTime: this.data.CreateTime,
+        CreateUserName: this.data.CreateUserName,
+        CreateUserId: this.data.CreateUserId,
+        UserTypeEnum: this.data.UserTypeEnum,
       })
+      getQCChallengeDialogList(this.data.Id)
+        .then((res) => {
+          this.loading = false
+          res.Result.forEach((element) => {
+            recordContent.push(element)
+          })
+          this.recordContent = recordContent
+          this.setScrollHeight()
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     setScrollHeight() {
       setTimeout(() => {
@@ -334,34 +448,40 @@ export default {
       var params = {
         talkContent: this.newMessage,
         qcChallengeId: this.data.Id,
-        subjectVisitId: this.data.SubjectVisitId
+        subjectVisitId: this.data.SubjectVisitId,
       }
-      addQCChallengeReply(this.trialId, params).then(res => {
-        this.btnLoading = false
-        if (res.IsSuccess) {
-          // this.getMessageList()
-          this.newMessage = ''
-          this.reFreshList()
-        }
-      }).catch(() => { this.btnLoading = false })
+      addQCChallengeReply(this.trialId, params)
+        .then((res) => {
+          this.btnLoading = false
+          if (res.IsSuccess) {
+            // this.getMessageList()
+            this.newMessage = ''
+            this.reFreshList()
+          }
+        })
+        .catch(() => {
+          this.btnLoading = false
+        })
     },
     // 打开重传框
     openUploadDialog() {
       const qcChallengeId = this.data.Id
       if (!qcChallengeId) return
       this.uploadBtnLoading = true
-      verifyReuploadIsCanJump(this.trialId, qcChallengeId).then(res => {
-        this.uploadBtnLoading = false
-        if (res.IsSuccess) {
-          dicomStore.studyList = []
-          this.uploadVisible = true
-        }
-      }).catch(() => {
-        // this.getMessageList()
+      verifyReuploadIsCanJump(this.trialId, qcChallengeId)
+        .then((res) => {
+          this.uploadBtnLoading = false
+          if (res.IsSuccess) {
+            dicomStore.studyList = []
+            this.uploadVisible = true
+          }
+        })
+        .catch(() => {
+          // this.getMessageList()
 
-        this.$emit('getDialogList')
-        this.uploadBtnLoading = false
-      })
+          this.$emit('getDialogList')
+          this.uploadBtnLoading = false
+        })
     },
     // 获取下一任务
     getNextTask() {
@@ -383,21 +503,31 @@ export default {
     handleCRCApplyReupload() {
       this.$confirm(this.$t('trials:crcQuestion:message:applyReupload'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       })
         .then(() => {
           this.loading = true
-          cRCRequestReUpload(this.trialId, this.data.SubjectVisitId, this.data.Id)
-            .then(res => {
+          cRCRequestReUpload(
+            this.trialId,
+            this.data.SubjectVisitId,
+            this.data.Id
+          )
+            .then((res) => {
               if (res.IsSuccess) {
                 this.ReuploadEnum = 1
-                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                this.$message.success(
+                  this.$t('common:message:savedSuccessfully')
+                )
                 // this.getMessageList()
                 this.reFreshList()
               }
               this.loading = false
-            }).catch(() => { this.loading = false })
-        }).catch(() => {})
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => {})
     },
     // 设置重传完成
     handleSetUploadFinished() {
@@ -409,11 +539,12 @@ export default {
       } else {
         this.$confirm(this.$t('trials:crcQuestion:message:reuploadConfirm'), {
           type: 'warning',
-          distinguishCancelAndClose: true
+          distinguishCancelAndClose: true,
         })
           .then(() => {
             this.setReuploadFinished()
-          }).catch(() => {})
+          })
+          .catch(() => {})
       }
     },
     setReuploadFinished(signInfo) {
@@ -422,12 +553,12 @@ export default {
         data: {
           QcChallengeId: this.data.Id,
           TrialId: this.trialId,
-          SetOrCancel: true
+          SetOrCancel: true,
         },
-        signInfo: signInfo
+        signInfo: signInfo,
       }
       setReuploadFinished(params)
-        .then(res => {
+        .then((res) => {
           if (signInfo) {
             this.$refs['signForm'].btnLoading = false
             this.signVisible = false
@@ -440,7 +571,8 @@ export default {
             // this.getMessageList()
             this.reFreshList()
           }
-        }).catch(() => {
+        })
+        .catch(() => {
           this.loading = false
           this.$refs['signForm'].btnLoading = false
         })
@@ -452,15 +584,13 @@ export default {
       } else {
         this.signVisible = false
       }
-    }
-  }
-
+    },
+  },
 }
-
 </script>
 <style lang="scss">
-.chat-wrapper{
-::-webkit-scrollbar {
+.chat-wrapper {
+  ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
@@ -468,37 +598,37 @@ export default {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .chat-content{
-    width:100%;
+  .chat-content {
+    width: 100%;
     padding: 20px;
     height: 500px;
     overflow-y: auto;
-    .word{
+    .word {
       display: flex;
       margin-bottom: 20px;
-      img{
-        width:40px;
+      img {
+        width: 40px;
         height: 40px;
         border-radius: 50%;
       }
-      .info{
+      .info {
         margin-left: 10px;
-        .user-info{
+        .user-info {
           font-size: 12px;
-          color:rgba(51,51,51,0.8);
-          margin:0;
+          color: rgba(51, 51, 51, 0.8);
+          margin: 0;
           height: 20px;
           line-height: 20px;
           margin-top: -5px;
         }
-        .info-content{
+        .info-content {
           padding: 10px;
           font-size: 14px;
           background-color: #ebeef5;
           position: relative;
           margin-top: 8px;
         }
-        .info-content::before{
+        .info-content::before {
           position: absolute;
           left: -8px;
           top: 8px;
@@ -509,29 +639,29 @@ export default {
         }
       }
     }
-    .word-my{
+    .word-my {
       display: flex;
       justify-content: flex-end;
       margin-bottom: 20px;
-      img{
+      img {
         width: 40px;
         height: 40px;
         border-radius: 50%;
       }
-      .info{
+      .info {
         width: 90%;
         margin-left: 10px;
         text-align: right;
-        .user-info{
+        .user-info {
           font-size: 12px;
-          color: rgba(51,51,51,0.8);
+          color: rgba(51, 51, 51, 0.8);
           margin: 0;
           height: 20px;
           line-height: 20px;
           margin-top: -5px;
           margin-right: 10px;
         }
-        .info-content{
+        .info-content {
           position: relative;
           max-width: 70%;
           padding: 10px;
@@ -543,7 +673,7 @@ export default {
           color: #fff;
           text-align: left;
         }
-        .info-content::after{
+        .info-content::after {
           position: absolute;
           right: -8px;
           top: 8px;
@@ -555,14 +685,14 @@ export default {
       }
     }
   }
-  .chat-message{
+  .chat-message {
     padding: 0 50px;
-    .function{
+    .function {
       margin-top: 10px;
       text-align: right;
     }
   }
-  ol{
+  ol {
     margin: 5px;
     padding: 0px 10px;
   }

src/views/trials/trials-panel/visit/crc-question/index.vue

@@ -90,14 +90,14 @@
         </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
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
           <!--导出-->
           <el-button
@@ -105,7 +105,7 @@
             icon="el-icon-download"
             @click="handleExport"
           >
-            {{ $t("common:button:export") }}
+            {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -174,19 +174,19 @@
             <div v-if="otherInfo.QCProcessEnum === 1">
               <!-- {{ scope.row.CurrentQCEnum === 1?'审核':'--' }} -->
               <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{
-                $fd("CurrentQCType", 0)
+                $fd('CurrentQCType', 0)
               }}</el-tag>
               <span v-else>--</span>
             </div>
             <div v-else-if="otherInfo.QCProcessEnum === 2">
               <!-- {{ scope.row.CurrentQCEnum === 1?'初审':scope.row.CurrentQCEnum === 2?'复审':'--' }} -->
               <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{
-                $fd("CurrentQCType", scope.row.CurrentQCEnum)
+                $fd('CurrentQCType', scope.row.CurrentQCEnum)
               }}</el-tag>
               <el-tag
                 v-else-if="scope.row.CurrentQCEnum === 2"
                 type="warning"
-                >{{ $fd("CurrentQCType", scope.row.CurrentQCEnum) }}</el-tag
+                >{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}</el-tag
               >
               <span v-else>--</span>
             </div>
@@ -217,9 +217,9 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsOverTime" type="danger">{{
-              $fd("YesOrNo", scope.row.IsOverTime)
+              $fd('YesOrNo', scope.row.IsOverTime)
             }}</el-tag>
-            <el-tag v-else>{{ $fd("YesOrNo", scope.row.IsOverTime) }}</el-tag>
+            <el-tag v-else>{{ $fd('YesOrNo', scope.row.IsOverTime) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 最新回复时间 -->
@@ -240,10 +240,10 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsClosed">{{
-              $fd("YesOrNo", scope.row.IsClosed)
+              $fd('YesOrNo', scope.row.IsClosed)
             }}</el-tag>
             <el-tag v-else type="danger">{{
-              $fd("YesOrNo", scope.row.IsClosed)
+              $fd('YesOrNo', scope.row.IsClosed)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -266,13 +266,13 @@
           <template slot-scope="scope">
             <span v-if="scope.row.ReuploadEnum === 0">--</span>
             <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{
-              $fd("ReuploadEnum", scope.row.ReuploadEnum)
+              $fd('ReuploadEnum', scope.row.ReuploadEnum)
             }}</el-tag>
             <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{
-              $fd("ReuploadEnum", scope.row.ReuploadEnum)
+              $fd('ReuploadEnum', scope.row.ReuploadEnum)
             }}</el-tag>
             <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{
-              $fd("ReuploadEnum", scope.row.ReuploadEnum)
+              $fd('ReuploadEnum', scope.row.ReuploadEnum)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -335,6 +335,7 @@
         :modalities="otherInfo.Modalitys"
         :subject-visit-id="currentQCRow.Id"
         :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum"
+        :IsHaveVisitClinicalData="otherInfo.IsHaveVisitClinicalData"
         @close="beforeClose"
         @getDialogList="getDialogList"
         @getNextTask="getNextTask"
@@ -349,24 +350,24 @@ import {
   getTrialVisitStageSelect,
   getQCChallengeDialogList,
   getNextCRCChallenge,
-} from "@/api/trials";
-import { getQCChallengeList_Export } from "@/api/export";
-import ChatForm from "./components/chatForm";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
+} from '@/api/trials'
+import { getQCChallengeList_Export } from '@/api/export'
+import ChatForm from './components/chatForm'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
 const searchDataDefault = () => {
   return {
     IsOverTime: null,
-    SubjectCode: "",
-    TrialSiteId: "",
+    SubjectCode: '',
+    TrialSiteId: '',
     VisitPlanArray: [],
     IsClosed: null,
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  name: "CrcQusetion",
+  name: 'CrcQusetion',
   components: { BaseContainer, Pagination, ChatForm },
   data() {
     return {
@@ -380,143 +381,143 @@ export default {
       visitPlanOptions: [],
       otherInfo: {},
       trialId: this.$route.query.trialId,
-    };
+    }
   },
   mounted() {
-    this.getList();
-    this.getSite();
-    this.getVisitPlanOptions();
+    this.getList()
+    this.getSite()
+    this.getVisitPlanOptions()
   },
   watch: {
     chatVisible() {
       if (!this.chatVisible) {
-        this.$store.state.trials.checkTaskId = null;
+        this.$store.state.trials.checkTaskId = null
       }
     },
   },
   methods: {
     beforeClose() {
-      this.chatVisible = false;
-      this.$store.state.trials.checkTaskId = null;
+      this.chatVisible = false
+      this.$store.state.trials.checkTaskId = null
     },
     handleExport() {
       getQCChallengeList_Export(this.searchData)
         .then((res) => {})
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 获取质疑列表
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       getCRCChallengeList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-          this.otherInfo = res.OtherInfo;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.otherInfo = res.OtherInfo
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 回复质疑
     handleReplay(row) {
-      this.loading = true;
+      this.loading = true
       getQCChallengeDialogList(row.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
             if (res.Result.length > 0) {
-              Object.assign(row, res.Result[0]);
+              Object.assign(row, res.Result[0])
             }
-            this.currentQCRow = { ...row };
-            this.$store.state.trials.checkTaskId = row.SubjectVisitId;
-            this.chatVisible = true;
+            this.currentQCRow = { ...row }
+            this.$store.state.trials.checkTaskId = row.SubjectVisitId
+            this.chatVisible = true
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     async getNextTask(qcChallengeId) {
       try {
         const params = {
           trialId: this.trialId,
           qcChallengeId: qcChallengeId,
-        };
-        const res = await getNextCRCChallenge(params);
+        }
+        const res = await getNextCRCChallenge(params)
         if (res.IsSuccess) {
-          const res2 = await getQCChallengeDialogList(res.Result.Id);
+          const res2 = await getQCChallengeDialogList(res.Result.Id)
           if (res2.IsSuccess) {
-            Object.assign(res.Result, res2.Result[0]);
-            this.chatVisible = false;
-            this.currentQCRow = res.Result;
+            Object.assign(res.Result, res2.Result[0])
+            this.chatVisible = false
+            this.currentQCRow = res.Result
             this.$nextTick(() => {
-              this.chatVisible = true;
-            });
+              this.chatVisible = true
+            })
           }
         }
       } catch (e) {
-        this.chatVisible = false;
-        console.log(e);
+        this.chatVisible = false
+        console.log(e)
       }
     },
     getDialogList() {
-      this.loading = true;
+      this.loading = true
       getQCChallengeDialogList(this.currentQCRow.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess && res.Result.length > 0) {
             var i = this.list.findIndex(
               (item) => item.Id === this.currentQCRow.Id
-            );
+            )
             if (i > -1) {
-              this.currentQCRow = Object.assign(this.list[i], res.Result[0]);
-              this.$refs["chatForm"].addMessage(
+              this.currentQCRow = Object.assign(this.list[i], res.Result[0])
+              this.$refs['chatForm'].addMessage(
                 res.Result[0].DialogList[res.Result[0].DialogList.length - 1]
-              );
+              )
             }
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      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()
     },
     // 获取site下拉框数据
     getSite() {
       getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
+        this.siteOptions = res.Result
+      })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
       getTrialVisitStageSelect(this.trialId).then((res) => {
-        this.visitPlanOptions = res.Result;
-      });
+        this.visitPlanOptions = res.Result
+      })
     },
   },
-};
+}
 </script>

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -250,7 +250,7 @@
           <el-table-column type="index" width="40" />
           <el-table-column min-width="200" show-overflow-tooltip>
             <template slot="header">
-              <el-tooltip placement="top">
+              <el-tooltip placement="top-start">
                 <div slot="content">
                   {{ $t('trials:uploadDicomList:table:studyDetail1') }}<br />
                   {{ $t('trials:uploadDicomList:table:studyDetail2') }}<br />

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -1085,6 +1085,7 @@
       <SignForm
         ref="signForm"
         :sign-code-enum="signCode"
+        :sign-replace-text="signReplaceText"
         :subject-visit-id="rowData.Id"
         @closeDialog="closeSignDialog"
       />
@@ -1496,6 +1497,7 @@ import {
   cRCCancelConfirmClinical,
   getClinicalTableList,
   getClinicalDateList,
+  getVisitClinicalDataName,
 } from '@/api/trials'
 import { cRCRequestToQC } from '@/api/trials/visit'
 import { cRCVisitList_Export } from '@/api/export'
@@ -1578,6 +1580,7 @@ export default {
       selectArr: [],
       signVisible: false,
       signCode: null,
+      signReplaceText: null,
       currentUser: zzSessionStorage.getItem('userName'),
       pickerOption: {
         disabledDate: (time) => {
@@ -1970,9 +1973,17 @@ export default {
               .then(() => {
                 if (this.rowData.IsBaseLine) {
                   if (this.otherInfo.ClinicalInformationTransmissionEnum > 0) {
-                    const { ClinicalDataConfirmation } = const_.processSignature
-                    this.signCode = ClinicalDataConfirmation
-                    this.signVisible = true
+                    getVisitClinicalDataName({ id: this.rowData.Id })
+                      .then((res) => {
+                        this.signReplaceText = res.Result.ClinicalDataName
+                        const { ClinicalDataConfirmation } =
+                          const_.processSignature
+                        this.signCode = ClinicalDataConfirmation
+                        this.signVisible = true
+                      })
+                      .catch((err) => {
+                        console.log(err)
+                      })
                   } else {
                     this.submit()
                   }

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -144,7 +144,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
@@ -152,7 +152,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
           <!-- 导出 -->
           <el-button
@@ -161,7 +161,7 @@
             :loading="exportLoading"
             @click="handleExport"
           >
-            {{ $t("common:button:export") }}
+            {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -229,7 +229,7 @@
               :disabled="!(userTypeEnumInt === 1 || userTypeEnumInt === 3)"
               @click="handleUrgentStatus(scope.row)"
             >
-              {{ $fd("YesOrNo", scope.row.IsUrgent) }}
+              {{ $fd('YesOrNo', scope.row.IsUrgent) }}
             </el-button>
             <el-button
               v-else-if="
@@ -241,14 +241,14 @@
               :disabled="!(userTypeEnumInt === 1 || userTypeEnumInt === 3)"
               @click="handleUrgentStatus(scope.row)"
             >
-              {{ $fd("YesOrNo", scope.row.IsUrgent) }}
+              {{ $fd('YesOrNo', scope.row.IsUrgent) }}
             </el-button>
             <span v-else>
               <el-tag v-if="scope.row.IsUrgent" type="danger">
-                {{ $fd("YesOrNo", scope.row.IsUrgent) }}
+                {{ $fd('YesOrNo', scope.row.IsUrgent) }}
               </el-tag>
               <el-tag v-else type="primary">
-                {{ $fd("YesOrNo", scope.row.IsUrgent) }}
+                {{ $fd('YesOrNo', scope.row.IsUrgent) }}
               </el-tag>
             </span>
           </template>
@@ -290,22 +290,22 @@
             </span>
             <!-- PD -->
             <span v-if="scope.row.PDState" class="status-primary-circle">
-              {{ $t("trials:crcUpload:label:pd") }}
+              {{ $t('trials:crcUpload:label:pd') }}
             </span>
             <!-- 失 -->
             <span v-if="scope.row.IsLostVisit" class="status-primary-circle">
-              {{ $t("trials:crcUpload:label:lostVisit") }}
+              {{ $t('trials:crcUpload:label:lostVisit') }}
             </span>
             <!-- 末 -->
             <span v-if="scope.row.IsFinalVisit" class="status-primary-circle">
-              {{ $t("trials:crcUpload:label:finalVisit") }}
+              {{ $t('trials:crcUpload:label:finalVisit') }}
             </span>
             <!-- 入 -->
             <span
               v-if="scope.row.IsEnrollmentConfirm"
               class="status-primary-circle"
             >
-              {{ $t("trials:crcUpload:label:enrollmentConfirm") }}
+              {{ $t('trials:crcUpload:label:enrollmentConfirm') }}
             </span>
           </template>
         </el-table-column>
@@ -320,7 +320,7 @@
             <el-tooltip placement="bottom">
               <div slot="content">
                 <span
-                  >{{ $t("trials:crcUpload:label:dicom") }}:
+                  >{{ $t('trials:crcUpload:label:dicom') }}:
                   {{ scope.row.DicomStudyCount }},
                 </span>
                 <span
@@ -330,16 +330,16 @@
                   "
                 >
                   <span
-                    >{{ $t("trials:crcUpload:label:noneDicom") }}:
+                    >{{ $t('trials:crcUpload:label:noneDicom') }}:
                     {{ scope.row.NoneDicomStudyCount }},
                   </span>
                   <span
-                    >{{ $t("trials:crcUpload:label:clinicalData") }}:
-                    {{ scope.row.IsHaveClinicalData ? "w/" : "w/o" }}</span
+                    >{{ $t('trials:crcUpload:label:clinicalData') }}:
+                    {{ scope.row.IsHaveClinicalData ? 'w/' : 'w/o' }}</span
                   >
                 </span>
                 <span v-else
-                  >{{ $t("trials:crcUpload:label:noneDicom") }}:
+                  >{{ $t('trials:crcUpload:label:noneDicom') }}:
                   {{ scope.row.NoneDicomStudyCount }}</span
                 >
               </div>
@@ -350,19 +350,19 @@
                     ? [
                         scope.row.DicomStudyCount,
                         scope.row.NoneDicomStudyCount,
-                        scope.row.IsHaveClinicalData ? "w/" : "w/o",
-                      ].join(", ")
+                        scope.row.IsHaveClinicalData ? 'w/' : 'w/o',
+                      ].join(', ')
                     : [
                         scope.row.DicomStudyCount,
                         scope.row.NoneDicomStudyCount,
-                      ].join(", ")
+                      ].join(', ')
                 }}
               </span>
             </el-tooltip>
           </template>
         </el-table-column>
         <!-- 最早拍片日期 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="EarliestScanDate"
           :label="$t('trials:qcCheck:table:eScanDate')"
           show-overflow-tooltip
@@ -376,7 +376,7 @@
                 : ""
             }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- 最晚拍片日期 -->
         <el-table-column
           prop="LatestScanDate"
@@ -386,11 +386,28 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{
-              scope.row.LatestScanDate
-                ? moment(scope.row.LatestScanDate).format("YYYY-MM-DD")
-                : ""
-            }}
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="`${
+                scope.row.EarliestScanDate
+                  ? moment(scope.row.EarliestScanDate).format('YYYY-MM-DD')
+                  : ''
+              } ~ ${
+                scope.row.LatestScanDate
+                  ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                  : ''
+              }`"
+              placement="top"
+            >
+              <span>
+                {{
+                  scope.row.LatestScanDate
+                    ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                    : ''
+                }}
+              </span>
+            </el-tooltip>
           </template>
         </el-table-column>
         <!-- 提交时间 -->
@@ -420,7 +437,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.AuditState * 1 === 0">--</span>
             <el-tag v-else-if="scope.row.AuditState * 1 === 3" type="warning">{{
-              $fd("AuditStatePE", scope.row.AuditState * 1)
+              $fd('AuditStatePE', scope.row.AuditState * 1)
             }}</el-tag>
             <el-tag
               v-else-if="
@@ -428,7 +445,7 @@
               "
               type="warning"
             >
-              {{ $fd("AuditStatePE", scope.row.AuditState * 1) }}
+              {{ $fd('AuditStatePE', scope.row.AuditState * 1) }}
             </el-tag>
             <el-tag
               v-else-if="
@@ -436,7 +453,7 @@
               "
               type="warning"
             >
-              {{ $fd("AuditStateRC", scope.row.AuditState * 1) }}
+              {{ $fd('AuditStateRC', scope.row.AuditState * 1) }}
             </el-tag>
             <el-tag
               v-else-if="
@@ -444,7 +461,7 @@
               "
               type="warning"
             >
-              {{ $fd("AuditStateRC", scope.row.AuditState * 1) }}
+              {{ $fd('AuditStateRC', scope.row.AuditState * 1) }}
             </el-tag>
             <el-tag
               v-else-if="
@@ -452,13 +469,13 @@
               "
               type="warning"
             >
-              {{ $fd("AuditStateRC", scope.row.AuditState * 1) }}
+              {{ $fd('AuditStateRC', scope.row.AuditState * 1) }}
             </el-tag>
             <el-tag v-else-if="scope.row.AuditState * 1 === 7" type="danger">
-              {{ $fd("AuditStateRC", scope.row.AuditState * 1) }}</el-tag
+              {{ $fd('AuditStateRC', scope.row.AuditState * 1) }}</el-tag
             >
             <el-tag v-else-if="scope.row.AuditState * 1 === 8" type="primary">
-              {{ $fd("AuditStateRC", scope.row.AuditState * 1) }}</el-tag
+              {{ $fd('AuditStateRC', scope.row.AuditState * 1) }}</el-tag
             >
           </template>
         </el-table-column>
@@ -503,7 +520,7 @@
               "
               class="status-primary-circle"
             >
-              {{ $t("trials:qcCheck:label:preliminary") }}
+              {{ $t('trials:qcCheck:label:preliminary') }}
             </span>
             <span v-if="scope.row.ReviewAuditUserName"> , </span>
             <!-- <span>{{ scope.row.ReviewAuditUserName }}</span> -->
@@ -520,7 +537,7 @@
               "
               class="status-primary-circle"
             >
-              {{ $t("trials:qcCheck:label:review") }}
+              {{ $t('trials:qcCheck:label:review') }}
             </span>
           </template>
         </el-table-column>
@@ -662,33 +679,33 @@
     </template>
     <div class="remark">
       <span class="status-primary-circle">
-        {{ $t("trials:crcUpload:label:finalVisit") }}
+        {{ $t('trials:crcUpload:label:finalVisit') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:finalVisitDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:finalVisitDetail') }}</span>
 
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:lostVisit") }}
+        {{ $t('trials:crcUpload:label:lostVisit') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:lostVisitDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:lostVisitDetail') }}</span>
 
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:pd") }}
+        {{ $t('trials:crcUpload:label:pd') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:pdDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:pdDetail') }}</span>
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:enrollmentConfirm") }}
+        {{ $t('trials:crcUpload:label:enrollmentConfirm') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:enrollmentConfirmDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:enrollmentConfirmDetail') }}</span>
 
       <span
         v-if="OtherInfo.QCProcessEnum === 2"
         class="status-primary-circle"
         style="margin-left: 10px"
       >
-        {{ $t("trials:qcCheck:label:preliminary") }}
+        {{ $t('trials:qcCheck:label:preliminary') }}
       </span>
       <span v-if="OtherInfo.QCProcessEnum === 2"
-        >: {{ $t("trials:qcCheck:label:preliminaryAudit") }}</span
+        >: {{ $t('trials:qcCheck:label:preliminaryAudit') }}</span
       >
 
       <span
@@ -696,10 +713,10 @@
         class="status-primary-circle"
         style="margin-left: 10px"
       >
-        {{ $t("trials:qcCheck:label:review") }}
+        {{ $t('trials:qcCheck:label:review') }}
       </span>
       <span v-if="OtherInfo.QCProcessEnum === 2"
-        >: {{ $t("trials:qcCheck:label:reviewAudit") }}</span
+        >: {{ $t('trials:qcCheck:label:reviewAudit') }}</span
       >
     </div>
     <!-- 指控 -->
@@ -753,7 +770,7 @@
       :fullscreen="isFullscreen"
     >
       <span slot="title" class="dialog-footer">
-        <span>{{ $t("trials:reading:button:handbooks") }}</span>
+        <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute; right: 20px">
           <svg-icon
             :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
@@ -843,7 +860,7 @@
         </el-form>
         <div>
           <!-- DICOM影像 -->
-          <h4 class="box-title">{{ $t("trials:audit:tab:dicoms") }}</h4>
+          <h4 class="box-title">{{ $t('trials:audit:tab:dicoms') }}</h4>
           <el-card class="box-card">
             <DicomFiles v-if="rowData.Id" :data="rowData" />
           </el-card>
@@ -852,7 +869,7 @@
         <div>
           <!-- 非DICOM影像 -->
           <h4 class="box-title" style="margin-top: 10px">
-            {{ $t("trials:audit:tab:nonDicoms") }}
+            {{ $t('trials:audit:tab:nonDicoms') }}
           </h4>
           <el-card class="box-card">
             <UploadNonDicomFiles
@@ -869,7 +886,7 @@
         <div>
           <!-- 临床数据 -->
           <h4 class="box-title" style="margin-top: 10px">
-            {{ $t("trials:audit:tab:clinicalData") }}
+            {{ $t('trials:audit:tab:clinicalData') }}
           </h4>
           <el-card class="box-card">
             <UploadClinicalData
@@ -920,7 +937,7 @@
               type="primary"
               @click="urgentVisible = false"
             >
-              {{ $t("common:button:cancel") }}
+              {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
             <el-button
@@ -929,7 +946,7 @@
               :loading="loading"
               @click="setUrgentStatus"
             >
-              {{ $t("common:button:save") }}
+              {{ $t('common:button:save') }}
             </el-button>
           </el-form-item>
         </div>
@@ -948,39 +965,39 @@ import {
   setSubjectVisitUrgent,
   isQCCanOpt,
   getNextQCInfo,
-} from "@/api/trials";
-import { qCVisitList_Export } from "@/api/export";
-import BaseContainer from "@/components/BaseContainer";
-import QualityAssurance from "./components/qualityAssurance";
-import Manuals from "./components/manuals";
-import DicomFiles from "./components/dicomFiles";
-import UploadNonDicomFiles from "@/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles";
-import UploadClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData";
+} from '@/api/trials'
+import { qCVisitList_Export } from '@/api/export'
+import BaseContainer from '@/components/BaseContainer'
+import QualityAssurance from './components/qualityAssurance'
+import Manuals from './components/manuals'
+import DicomFiles from './components/dicomFiles'
+import UploadNonDicomFiles from '@/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles'
+import UploadClinicalData from '@/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData'
 
-import Pagination from "@/components/Pagination";
-import moment from "moment";
-import { changeURLStatic } from "@/utils/history.js";
-import { getToken } from "@/utils/auth";
+import Pagination from '@/components/Pagination'
+import moment from 'moment'
+import { changeURLStatic } from '@/utils/history.js'
+import { getToken } from '@/utils/auth'
 
 const searchDataDefault = () => {
   return {
-    TrialId: "",
-    TrialSiteId: "",
-    SubjectInfo: "",
+    TrialId: '',
+    TrialSiteId: '',
+    SubjectInfo: '',
     VisitPlanArray: [],
     IsUrgent: null,
     AuditStateArray: [],
-    HandleUserId: "",
+    HandleUserId: '',
     BeginAuditTime: null,
     EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20,
     // SortField: '',
     // Asc: false
-  };
-};
+  }
+}
 export default {
-  name: "QcCheck",
+  name: 'QcCheck',
   components: {
     BaseContainer,
     Pagination,
@@ -998,13 +1015,13 @@ export default {
       loading: false,
       qcVisible: false,
       rowData: {
-        TrialSiteCode: "",
-        SubjectCode: "",
-        VisitName: "",
-        VisitNum: "",
+        TrialSiteCode: '',
+        SubjectCode: '',
+        VisitName: '',
+        VisitNum: '',
       },
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
-      userId: zzSessionStorage.getItem("userId"),
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      userId: zzSessionStorage.getItem('userId'),
       moment,
       siteOptions: [],
       visitPlanOptions: [],
@@ -1012,7 +1029,7 @@ export default {
       participantOptions: [],
       studyVisible: false,
       urgentVisible: false,
-      urgentForm: { id: "", isUrgent: null },
+      urgentForm: { id: '', isUrgent: null },
       trialId: this.$route.query.trialId,
       trialCode: this.$route.query.trialCode,
       query: null,
@@ -1020,225 +1037,225 @@ export default {
       isFullscreen: false,
       timeList: [],
       exportLoading: false,
-    };
+    }
   },
   watch: {
     list(val) {
-      this.doLayout();
+      this.doLayout()
     },
   },
   mounted() {
-    this.query = this.$route.query;
+    this.query = this.$route.query
     if (this.$route.query.subjectCode) {
-      this.searchData.SubjectInfo = this.$route.query.subjectCode;
+      this.searchData.SubjectInfo = this.$route.query.subjectCode
     }
-    changeURLStatic("subjectCode", "");
-    this.getList();
-    this.getSite();
-    this.getParticipantList();
-    this.getVisitPlanOptions();
+    changeURLStatic('subjectCode', '')
+    this.getList()
+    this.getSite()
+    this.getParticipantList()
+    this.getVisitPlanOptions()
   },
   methods: {
     handleExport() {
-      this.exportLoading = true;
+      this.exportLoading = true
       qCVisitList_Export(this.searchData)
         .then(() => {
-          this.exportLoading = false;
+          this.exportLoading = false
         })
         .catch((err) => {
-          this.exportLoading = false;
-        });
+          this.exportLoading = false
+        })
     },
     // 获取qc审核列表
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       getQCVisitList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-          this.OtherInfo = res.OtherInfo;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.OtherInfo = res.OtherInfo
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     doLayout() {
-      const scope = this;
+      const scope = this
       this.$nextTick(() => {
-        scope.$refs.qcCheckList.doLayout();
-      });
+        scope.$refs.qcCheckList.doLayout()
+      })
     },
     // 领取任务
     handleReciveTask(row, state) {
-      let message = "";
+      let message = ''
       if (state) {
         // 是否确认领取？
-        message = this.$t("trials:qcCheck:message:receive");
+        message = this.$t('trials:qcCheck:message:receive')
       } else {
         // 是否确认释放？
-        message = this.$t("trials:qcCheck:message:release");
+        message = this.$t('trials:qcCheck:message:release')
       }
       this.$confirm(message, {
-        type: "warning",
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.loading = true;
+          this.loading = true
           takeOrReleaseQCTask(row.TrialId, row.Id, state)
             .then((res) => {
-              this.loading = false;
+              this.loading = false
               if (res.IsSuccess) {
-                this.getList();
+                this.getList()
                 if (state) {
                   // 领取成功
                   this.$message.success(
-                    this.$t("trials:qcCheck:message:receivedSuccessfully")
-                  );
+                    this.$t('trials:qcCheck:message:receivedSuccessfully')
+                  )
                 } else {
                   // 释放成功
                   this.$message.success(
-                    this.$t("trials:qcCheck:message:releasedSuccessfully")
-                  );
+                    this.$t('trials:qcCheck:message:releasedSuccessfully')
+                  )
                 }
               }
             })
             .catch((res) => {
-              this.loading = false;
+              this.loading = false
               if (res.Code === 5 && res.ErrorMessage) {
                 this.$confirm(res.ErrorMessage, {
-                  type: "warning",
+                  type: 'warning',
                   showCancelButton: false,
                   callback: (action) => {},
-                });
-                this.getList();
+                })
+                this.getList()
               }
-            });
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 初审
     handlePrimaryQC(row) {
-      this.loading = true;
+      this.loading = true
       isQCCanOpt(row.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            this.rowData = { ...row };
-            this.qcVisible = true;
+            this.rowData = { ...row }
+            this.qcVisible = true
           }
         })
         .catch((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.Code === 2) {
-            this.getList();
+            this.getList()
           }
-        });
+        })
     },
     // 复审
     handleSecondaryQC(row) {
-      this.loading = true;
+      this.loading = true
       isQCCanOpt(row.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            this.rowData = { ...row };
-            this.qcVisible = true;
+            this.rowData = { ...row }
+            this.qcVisible = true
           }
         })
         .catch((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.Code === 2) {
-            this.getList();
+            this.getList()
           }
-        });
+        })
     },
     handleViewPrimaryQC(row) {
-      this.rowData = { ...row };
-      this.rowData.disabled = true;
-      this.rowData.qcType = 1;
-      this.qcVisible = true;
+      this.rowData = { ...row }
+      this.rowData.disabled = true
+      this.rowData.qcType = 1
+      this.qcVisible = true
     },
     handleViewReviewQC(row) {
-      this.rowData = { ...row };
-      this.rowData.disabled = true;
-      this.rowData.qcType = 2;
-      this.qcVisible = true;
+      this.rowData = { ...row }
+      this.rowData.disabled = true
+      this.rowData.qcType = 2
+      this.qcVisible = true
     },
     // 预览影像
     handleViewImages() {
-      var tokenKey = getToken();
+      var tokenKey = getToken()
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?trialId=${this.rowData.TrialId}&visitInfo=${this.rowData.VisitName}(${this.rowData.VisitNum})&subjectVisitId=${this.rowData.Id}&TokenKey=${tokenKey}`,
-      });
-      window.open(routeData.href, "_blank");
+      })
+      window.open(routeData.href, '_blank')
     },
     // 查看检查信息
     handleViewStudyInfo(row) {
-      this.studyVisible = true;
-      this.rowData = { ...row };
+      this.studyVisible = true
+      this.rowData = { ...row }
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.timeList = [];
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.timeList = []
+      this.getList()
       this.$nextTick(() => {
-        this.$refs.qcCheckList.clearSort();
-      });
+        this.$refs.qcCheckList.clearSort()
+      })
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      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()
     },
     // 获取site下拉框数据
     getSite() {
       getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
+        this.siteOptions = res.Result
+      })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
       getTrialVisitStageSelect(this.trialId).then((res) => {
-        this.visitPlanOptions = res.Result;
-      });
+        this.visitPlanOptions = res.Result
+      })
     },
     // 获取质询参与者下拉框数据
     getParticipantList() {
       getQCParticipantList(this.trialId).then((res) => {
-        this.participantOptions = res.Result;
-      });
+        this.participantOptions = res.Result
+      })
     },
     // 打开设置紧急状态弹窗
     handleUrgentStatus(row) {
-      this.urgentForm = Object.assign({}, { ...row });
-      this.urgentVisible = true;
+      this.urgentForm = Object.assign({}, { ...row })
+      this.urgentVisible = true
     },
     // 设置访视加急/不加急
     setUrgentStatus() {
       // 是否确认将当前访视设置为加急？
       // 是否确认将当前访视设置为不加急？
       var message = this.urgentForm.IsUrgent
-        ? this.$t("trials:qcCheck:message:isUrgent")
-        : this.$t("trials:qcCheck:message:isNotUrgent");
+        ? this.$t('trials:qcCheck:message:isUrgent')
+        : this.$t('trials:qcCheck:message:isNotUrgent')
       this.$confirm(message, {
-        type: "warning",
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
 
         setSubjectVisitUrgent(
           this.urgentForm.TrialId,
@@ -1246,102 +1263,100 @@ export default {
           this.urgentForm.IsUrgent
         )
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.urgentVisible = false;
-              this.getList();
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
+              this.urgentVisible = false
+              this.getList()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     handleChallengeState(subjectCode, state) {
       this.$router.push({
         path: `/trials/trials-panel/visit/qc-question?trialId=${this.trialId}&trialCode=${this.query.trialCode}&researchProgramNo=${this.query.researchProgramNo}&subjectCode=${subjectCode}&challengeState=${state}`,
-      });
+      })
     },
     // 替换
     handleReplaceTask(row) {
-      var message = this.$t("trials:crcQuestion:message:replaceTask");
-      message = message.replace("xxx", row.CurrentActionUserName);
+      var message = this.$t('trials:crcQuestion:message:replaceTask')
+      message = message.replace('xxx', row.CurrentActionUserName)
       this.$confirm(message, {
-        type: "warning",
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
           // 替换并刷新列表
-          this.loading = true;
+          this.loading = true
           replaceQCTaskActionUser(row.TrialId, row.Id)
             .then((res) => {
-              this.loading = false;
+              this.loading = false
               if (res.IsSuccess) {
                 // 替换成功
                 this.$message.success(
-                  this.$t("trials:crcQuestion:message:replaceTaskSuccessfully")
-                );
-                this.getList();
+                  this.$t('trials:crcQuestion:message:replaceTaskSuccessfully')
+                )
+                this.getList()
               }
             })
             .catch((res) => {
-              this.loading = false;
-              this.getList();
+              this.loading = false
+              this.getList()
               if (res.ErrorMessage) {
                 this.$confirm(res.ErrorMessage, {
-                  type: "warning",
+                  type: 'warning',
                   showCancelButton: false,
                   callback: (action) => {},
-                });
+                })
               }
-            });
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     nextTask(visitId = null) {
-      this.loading = true;
+      this.loading = true
       let obj = {
         trialId: this.trialId,
-      };
+      }
       if (visitId) {
-        obj.visitId = visitId;
+        obj.visitId = visitId
       }
       getNextQCInfo(obj)
         .then((res) => {
-          this.loading = false;
-          this.qcVisible = false;
+          this.loading = false
+          this.qcVisible = false
           if (res.Result) {
             this.$nextTick(() => {
-              this.rowData = { ...res.Result };
-              this.qcVisible = true;
-            });
+              this.rowData = { ...res.Result }
+              this.qcVisible = true
+            })
           } else {
-            this.$message.success(this.$t("trials:qcQuality:title:title3")); // '当前领取的质控任务已全部完成！'
-            this.qcVisible = false;
+            this.$message.success(this.$t('trials:qcQuality:title:title3')) // '当前领取的质控任务已全部完成！'
+            this.qcVisible = false
           }
         })
         .catch(() => {
-          this.loading = false;
-          this.qcVisible = false;
-        });
+          this.loading = false
+          this.qcVisible = false
+        })
     },
     changeTimeList() {
       if (this.timeList) {
-        this.searchData.BeginAuditTime = this.timeList[0];
-        this.searchData.EndAuditTime = this.timeList[1];
+        this.searchData.BeginAuditTime = this.timeList[0]
+        this.searchData.EndAuditTime = this.timeList[1]
       } else {
-        this.searchData.BeginAuditTime = null;
-        this.searchData.EndAuditTime = null;
+        this.searchData.BeginAuditTime = null
+        this.searchData.EndAuditTime = null
       }
     },
     openManuals() {
-      this.manualsDialog.visible = true;
+      this.manualsDialog.visible = true
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .qc-check-wrapper {

src/views/trials/trials-panel/visit/qc-question/index.vue

@@ -5,7 +5,12 @@
       <el-form :inline="true">
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:qcQuality:table:siteId')">
-          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.TrialSiteId"
+            clearable
+            filterable
+            style="width: 120px"
+          >
             <el-option
               v-for="item of siteOptions"
               :key="item.Id"
@@ -16,13 +21,16 @@
         </el-form-item>
         <!-- 受试者编号 -->
         <el-form-item :label="$t('trials:qcQuality:table:subjectId')">
-          <el-input v-model="searchData.SubjectCode" style="width:100px;" />
+          <el-input v-model="searchData.SubjectCode" style="width: 100px" />
         </el-form-item>
         <!-- 访视名称 -->
-        <el-form-item class="my_multiple" :label="$t('trials:qcQuality:table:visitName')">
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:qcQuality:table:visitName')"
+        >
           <el-select
             v-model="searchData.VisitPlanArray"
-            style="width:140px"
+            style="width: 140px"
             clearable
             multiple
           >
@@ -34,46 +42,81 @@
             >
               <span style="float: left">{{ item.VisitName }}</span>
             </el-option>
-            <el-option
-              key="Other"
-              label="Out of Plan"
-              value="1.11"
-            />
+            <el-option key="Other" label="Out of Plan" value="1.11" />
           </el-select>
         </el-form-item>
         <!-- 发起人 -->
         <el-form-item :label="$t('trials:qcQuality:table:organizer')">
-          <el-select v-model="searchData.CreateUserId" clearable filterable style="width:150px;">
+          <el-select
+            v-model="searchData.CreateUserId"
+            clearable
+            filterable
+            style="width: 150px"
+          >
             <el-option
-              v-for="(item,index) of creatorOptions"
+              v-for="(item, index) of creatorOptions"
               :key="index"
               :label="item.Creator"
               :value="item.CreateUserId"
             >
               <span style="float: left">{{ item.Creator }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px;margin-left:5px;">
+              <span
+                style="
+                  float: right;
+                  color: #8492a6;
+                  font-size: 13px;
+                  margin-left: 5px;
+                "
+              >
                 {{ item.CreatorRealName }}
               </span>
             </el-option>
           </el-select>
         </el-form-item>
-       
+
         <!-- 是否超限 -->
         <el-form-item :label="$t('trials:qcQuality:table:isOverTime')">
-          <el-select v-model="searchData.IsOverTime" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
+          <el-select
+            v-model="searchData.IsOverTime"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <!-- 是否关闭 -->
         <el-form-item :label="$t('trials:qcQuality:table:isClosed')">
-          <el-select v-model="searchData.IsClosed" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
+          <el-select
+            v-model="searchData.IsClosed"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
-         <!-- 是否重传 -->
+        <!-- 是否重传 -->
         <el-form-item :label="$t('trials:qcQuality:table:ReuploadEnum')">
-          <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
-            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" :key="item.id"/>
+          <el-select
+            v-model="searchData.ReuploadEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.ReuploadEnum"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <!-- 查询 -->
@@ -81,7 +124,11 @@
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="handleReset"
+        >
           {{ $t('common:button:reset') }}
         </el-button>
         <!--导出-->
@@ -96,7 +143,7 @@
       <el-table
         ref="qcQsTable"
         v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         stripe
         height="100"
@@ -112,13 +159,12 @@
           <template slot-scope="scope">
             <el-button
               type="text"
-              :style="{color:scope.row.IsClosed?'':'red'}"
-              @click="handleReply(scope.row,scope.$index)"
+              :style="{ color: scope.row.IsClosed ? '' : 'red' }"
+              @click="handleReply(scope.row, scope.$index)"
             >
               {{ scope.row.ChallengeCode }}
             </el-button>
           </template>
-
         </el-table-column>
         <!-- 中心编号 -->
         <el-table-column
@@ -154,12 +200,20 @@
           <template slot-scope="scope">
             <div v-if="otherInfo.QCProcessEnum === 1">
               <!-- {{ scope.row.CurrentQCEnum === 1?'审核':'--' }} -->
-              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{ $fd('CurrentQCType', 0) }}</el-tag>
+              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{
+                $fd('CurrentQCType', 0)
+              }}</el-tag>
               <span v-else>--</span>
             </div>
             <div v-else-if="otherInfo.QCProcessEnum === 2">
-              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}</el-tag>
-              <el-tag v-else-if="scope.row.CurrentQCEnum === 2" type="warning">{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}</el-tag>
+              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{
+                $fd('CurrentQCType', scope.row.CurrentQCEnum)
+              }}</el-tag>
+              <el-tag
+                v-else-if="scope.row.CurrentQCEnum === 2"
+                type="warning"
+                >{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}</el-tag
+              >
               <span v-else>--</span>
             </div>
           </template>
@@ -227,7 +281,9 @@
           width="100"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsOverTime" type="danger">{{ $fd('YesOrNo', scope.row.IsOverTime) }}</el-tag>
+            <el-tag v-if="scope.row.IsOverTime" type="danger">{{
+              $fd('YesOrNo', scope.row.IsOverTime)
+            }}</el-tag>
             <el-tag v-else>{{ $fd('YesOrNo', scope.row.IsOverTime) }}</el-tag>
           </template>
         </el-table-column>
@@ -240,7 +296,9 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsClosed" type="danger">{{ $fd('YesOrNo', scope.row.IsClosed) }}</el-tag>
+            <el-tag v-if="scope.row.IsClosed" type="danger">{{
+              $fd('YesOrNo', scope.row.IsClosed)
+            }}</el-tag>
             <el-tag v-else>{{ $fd('YesOrNo', scope.row.IsClosed) }}</el-tag>
           </template>
         </el-table-column>
@@ -262,9 +320,15 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.ReuploadEnum === 0">--</span>
-            <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
-            <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
-            <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
+            <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{
+              $fd('ReuploadEnum', scope.row.ReuploadEnum)
+            }}</el-tag>
+            <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{
+              $fd('ReuploadEnum', scope.row.ReuploadEnum)
+            }}</el-tag>
+            <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{
+              $fd('ReuploadEnum', scope.row.ReuploadEnum)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 重传完成时间 -->
@@ -276,7 +340,12 @@
           sortable="custom"
         />
         <el-table-column
-          v-if="hasPermi(['trials:trials-panel:visit:qc-question:send', 'trials:trials-panel:visit:qc-question:close'])"
+          v-if="
+            hasPermi([
+              'trials:trials-panel:visit:qc-question:send',
+              'trials:trials-panel:visit:qc-question:close',
+            ])
+          "
           :label="$t('common:action:action')"
           min-width="150"
           fixed="right"
@@ -297,7 +366,10 @@
               icon="el-icon-error"
               circle
               :title="$t('trials:qcQuality:action:close')"
-              :disabled="scope.row.IsClosed || currentUserId !== scope.row.CurrentActionUserId"
+              :disabled="
+                scope.row.IsClosed ||
+                currentUserId !== scope.row.CurrentActionUserId
+              "
               @click="handleCloseQC(scope.row)"
             />
           </template>
@@ -305,7 +377,13 @@
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
 
     <!--  回复质疑 -->
@@ -314,10 +392,19 @@
       :visible.sync="chatVisible"
       :close-on-click-modal="false"
       width="800px"
-      :title="$t('trials:qcQuality:dialogTitle:reply') + `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`"
+      :title="
+        $t('trials:qcQuality:dialogTitle:reply') +
+        `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`
+      "
       @getList="getList"
     >
-      <chat-form :data="currentQCRow" user-type="qc" :sign-text="otherInfo.ImageQCSignText" @close="chatVisible = false" @getDialogList="getDialogList" />
+      <chat-form
+        :data="currentQCRow"
+        user-type="qc"
+        :sign-text="otherInfo.ImageQCSignText"
+        @close="chatVisible = false"
+        @getDialogList="getDialogList"
+      />
     </el-dialog>
     <!-- 关闭质疑 -->
     <el-dialog
@@ -329,7 +416,14 @@
       width="600px"
       :title="$t('trials:qcQuality:dialogTitle:closeQuestion')"
     >
-      <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
+      <div
+        style="
+          padding: 10px;
+          border: 1px solid #e0e0e0;
+          max-height: 650px;
+          overflow-y: auto;
+        "
+      >
         <el-form
           ref="closeQuestionForm"
           :model="closeQuestionForm"
@@ -341,12 +435,16 @@
             :label="$t('trials:qcQuality:label:closeReason')"
             prop="Type"
             :rules="[
-              { required: true, message: $t('common:ruleMessage:select')},
+              { required: true, message: $t('common:ruleMessage:select') },
             ]"
           >
             <el-radio-group v-model="closeQuestionForm.Type">
-              <el-radio :label="1">{{ $t('trials:qcQuality:radio:reason1') }}</el-radio>
-              <el-radio :label="2">{{ $t('trials:qcQuality:radio:reason2') }}</el-radio>
+              <el-radio :label="1">{{
+                $t('trials:qcQuality:radio:reason1')
+              }}</el-radio>
+              <el-radio :label="2">{{
+                $t('trials:qcQuality:radio:reason2')
+              }}</el-radio>
               <!--              <el-radio :label="3">{{ $t('trials:qcQuality:radio:reason3') }}</el-radio>-->
             </el-radio-group>
           </el-form-item>
@@ -356,23 +454,33 @@
             :label="$t('trials:consistencyCheck:label:closereason')"
             prop="Remake"
             :rules="[
-              { required: true, message: $t('common:ruleMessage:specify')},
+              { required: true, message: $t('common:ruleMessage:specify') },
             ]"
           >
             <el-input
               v-model="closeQuestionForm.Remake"
               type="textarea"
-              :autosize="{ minRows: 2, maxRows: 4}"
+              :autosize="{ minRows: 2, maxRows: 4 }"
               :placeholder="$t('common:ruleMessage:specify')"
             />
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button :disabled="closeBtnLoading" size="small" type="primary" @click="closeQuestionVisible = false">
+        <el-button
+          :disabled="closeBtnLoading"
+          size="small"
+          type="primary"
+          @click="closeQuestionVisible = false"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button :loading="closeBtnLoading" size="small" type="primary" @click="handleCloseQuestion">
+        <el-button
+          :loading="closeBtnLoading"
+          size="small"
+          type="primary"
+          @click="handleCloseQuestion"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </div>
@@ -380,7 +488,14 @@
   </BaseContainer>
 </template>
 <script>
-import { getQCChallengeList, getTrialSiteSelect, getTrialVisitStageSelect, getQCChallengeCreatorList, closeQCChallenge, getQCChallengeDialogList } from '@/api/trials'
+import {
+  getQCChallengeList,
+  getTrialSiteSelect,
+  getTrialVisitStageSelect,
+  getQCChallengeCreatorList,
+  closeQCChallenge,
+  getQCChallengeDialogList,
+} from '@/api/trials'
 import { getQCChallengeList_Export } from '@/api/export'
 import BaseContainer from '@/components/BaseContainer'
 import ChatForm from '@/views/trials/trials-panel/visit/qc-check/components/chatForm'
@@ -397,7 +512,7 @@ const searchDataDefault = () => {
     IsClosed: null,
     PageIndex: 1,
     PageSize: 20,
-    ReuploadEnum: null
+    ReuploadEnum: null,
   }
 }
 export default {
@@ -418,19 +533,31 @@ export default {
       creatorOptions: [],
       otherInfo: {},
       closeQuestionVisible: false,
-      closeQuestionForm: { Id: '', SubjectVisitId: '', Type: null, Reason: '', Remake: '' },
+      closeQuestionForm: {
+        Id: '',
+        SubjectVisitId: '',
+        Type: null,
+        Reason: '',
+        Remake: '',
+      },
       closeBtnLoading: false,
       trialId: this.$route.query.trialId,
       /* eslint-disable */
-      currentUserId: zzSessionStorage.getItem('userId')
+      currentUserId: zzSessionStorage.getItem('userId'),
     }
   },
   mounted() {
-    if (this.$route.query.challengeState && this.$route.query.challengeState * 1 === 1) {
+    if (
+      this.$route.query.challengeState &&
+      this.$route.query.challengeState * 1 === 1
+    ) {
       // ChallengeState:1 关闭；
       this.searchData.IsClosed = true
     }
-    if (this.$route.query.challengeState && this.$route.query.challengeState * 1 === 2) {
+    if (
+      this.$route.query.challengeState &&
+      this.$route.query.challengeState * 1 === 2
+    ) {
       // ChallengeState:2 未关闭；
       this.searchData.IsClosed = false
     }
@@ -449,40 +576,57 @@ export default {
     getList() {
       this.loading = true
       this.searchData.TrialId = this.trialId
-      getQCChallengeList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-        this.otherInfo = res.OtherInfo
-      }).catch(() => { this.loading = false })
+      getQCChallengeList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.otherInfo = res.OtherInfo
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     handleExport() {
-      getQCChallengeList_Export(this.searchData).then(res => {
-      }).catch(() => {})
+      getQCChallengeList_Export(this.searchData)
+        .then((res) => {})
+        .catch(() => {})
     },
     // 回复质疑
     handleReply(row) {
       this.loading = true
-      getQCChallengeDialogList(row.Id).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) { Object.assign(row, res.Result[0]) }
-          this.currentQCRow = { ...row }
-          this.chatVisible = true
-        }
-      }).catch(() => { this.loading = false })
+      getQCChallengeDialogList(row.Id)
+        .then((res) => {
+          this.loading = false
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              Object.assign(row, res.Result[0])
+            }
+            this.currentQCRow = { ...row }
+            this.chatVisible = true
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     getDialogList() {
       this.loading = true
-      getQCChallengeDialogList(this.currentQCRow.Id).then(res => {
-        this.loading = false
-        if (res.IsSuccess && res.Result.length > 0) {
-          var i = this.list.findIndex(item => item.Id === this.currentQCRow.Id)
-          if (i > -1) {
-            this.currentQCRow = Object.assign(this.list[i], res.Result[0])
+      getQCChallengeDialogList(this.currentQCRow.Id)
+        .then((res) => {
+          this.loading = false
+          if (res.IsSuccess && res.Result.length > 0) {
+            var i = this.list.findIndex(
+              (item) => item.Id === this.currentQCRow.Id
+            )
+            if (i > -1) {
+              this.currentQCRow = Object.assign(this.list[i], res.Result[0])
+            }
           }
-        }
-      }).catch(() => { this.loading = false })
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     // 打开关闭质疑框并初始化
     handleCloseQC(row) {
@@ -501,28 +645,37 @@ export default {
         this.closeBtnLoading = true
         if (this.closeQuestionForm.Type === 1) {
           // 问题已解决
-          this.closeQuestionForm.Reason = this.$t('trials:qcQuality:message:problemSolved')
+          this.closeQuestionForm.Reason = this.$t(
+            'trials:qcQuality:message:problemSolved'
+          )
         } else if (this.closeQuestionForm.Type === 2) {
           // 问题无法解决强制关闭质疑，已提醒中心下次注意
-          this.closeQuestionForm.Reason = `${this.$t('trials:qcQuality:message:problemNotSolved')}<br/><br/>${this.$t('trials:consistencyCheck:label:closereason')}:${this.closeQuestionForm.Remake}`
+          this.closeQuestionForm.Reason = `${this.$t(
+            'trials:qcQuality:message:problemNotSolved'
+          )}<br/><br/>${this.$t('trials:consistencyCheck:label:closereason')}:${
+            this.closeQuestionForm.Remake
+          }`
         }
         var params = {
           TrialId: this.trialId,
           QcChallengeId: this.closeQuestionForm.Id,
           SubjectVisitId: this.closeQuestionForm.SubjectVisitId,
           CloseEnum: this.closeQuestionForm.Type,
-          CloseReason: this.closeQuestionForm.Reason
+          CloseReason: this.closeQuestionForm.Reason,
         }
         closeQCChallenge(params)
-          .then(res => {
+          .then((res) => {
             this.closeBtnLoading = false
             if (res.IsSuccess) {
               this.getList()
               // 关闭成功!
-              this.$message.success(this.$t('trials:qcQuality:message:closedSuccessfully'))
+              this.$message.success(
+                this.$t('trials:qcQuality:message:closedSuccessfully')
+              )
               this.closeQuestionVisible = false
             }
-          }).catch(() => {
+          })
+          .catch(() => {
             this.closeBtnLoading = false
           })
       })
@@ -553,24 +706,22 @@ export default {
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
+      getTrialSiteSelect(this.trialId).then((res) => {
         this.siteOptions = res.Result
       })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
-      getTrialVisitStageSelect(this.trialId)
-        .then((res) => {
-          this.visitPlanOptions = res.Result
-        })
+      getTrialVisitStageSelect(this.trialId).then((res) => {
+        this.visitPlanOptions = res.Result
+      })
     },
     // 获取发起人下拉框数据
     getCreatorOptions() {
-      getQCChallengeCreatorList(this.trialId)
-        .then((res) => {
-          this.creatorOptions = res.Result
-        })
-    }
-  }
+      getQCChallengeCreatorList(this.trialId).then((res) => {
+        this.creatorOptions = res.Result
+      })
+    },
+  },
 }
 </script>