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

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
   })
@@ -343,3 +343,27 @@ export function getIsVacation(param) {
     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
   })
 }
 
@@ -3906,3 +3907,11 @@ export function setTaskValid(data) {
     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/UploadFiles/index.vue

@@ -9,35 +9,49 @@
       :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
     this.initFileList()
@@ -49,9 +63,10 @@ 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 => {
+      getAttachmentByType(this.doctorId, this.type)
+        .then((res) => {
           loading.close()
           if (res.IsSuccess) {
             if (res.Result.length > 0) {
@@ -61,12 +76,15 @@ export default {
               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,20 +103,22 @@ 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'
+            cancelButtonText: 'Cancel',
           })
             .then(() => {
               // 重名覆盖
               this.repeat = true
               this.uploadFile(param.file)
             })
-            .catch(action => {})
+            .catch((action) => {})
         } else {
           this.uploadFile(param.file)
         }
@@ -110,7 +130,10 @@ export default {
       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,19 +147,21 @@ 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 => {
+      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(() => {
+        })
+        .catch(() => {
           this.isDisabled = false
         })
     },
@@ -144,28 +169,32 @@ export default {
       this.$confirm('Sure to remove?', {
         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>

src/permission.js

@@ -95,7 +95,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/views/reviewers/ReviewersResearch.vue

@@ -226,6 +226,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
@@ -242,7 +245,9 @@ export default {
                   res.Result.DoctorId ? res.Result.DoctorId : ''
                 }&tabActive=BasicInfo&ReviewStatus=${
                   res.Result.ReviewStatus
-                }&lang=${this.$route.query.lang}`,
+                }&trialId=${this.$route.query.trialId}&lang=${
+                  this.$route.query.lang
+                }`,
               })
             })
             .catch(() => {

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>
@@ -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

@@ -50,6 +50,7 @@
                   type="textarea"
                   autosize
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -61,6 +62,7 @@
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="City"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -72,6 +74,7 @@
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="Province"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -83,6 +86,7 @@
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="Country"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -128,6 +132,7 @@
                   v-model="employmentForm.DepartmentOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -142,6 +147,7 @@
                   v-model="employmentForm.DepartmentOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -191,6 +197,7 @@
                   v-model="employmentForm.RankOther"
                   placeholder="Please specify"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -208,6 +215,7 @@
                   v-model="employmentForm.RankOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -227,6 +235,7 @@
                     $t('curriculumVitae:info:form:placeholder:partTimeJob')
                   "
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -243,6 +252,7 @@
                     $t('curriculumVitae:info:form:placeholder:partTimeJobEN')
                   "
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -325,19 +335,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 +380,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 +392,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 +405,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,

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,

src/views/reviewers/components/Specialty.vue

@@ -50,6 +50,7 @@
                   v-model="specialtyForm.SpecialityOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -64,6 +65,7 @@
                   v-model="specialtyForm.SpecialityOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -112,6 +114,7 @@
                   v-model="specialtyForm.SubspecialityOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -129,6 +132,7 @@
                   v-model="specialtyForm.SubspecialityOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -178,6 +182,7 @@
                   v-model="specialtyForm.ReadingTypeOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -195,6 +200,7 @@
                   v-model="specialtyForm.ReadingTypeOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -247,9 +253,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 +275,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 +297,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:Indication')"
+            prop="Indication"
+          >
+            <el-input
+              v-model="form.Indication"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:Indication')
+              "
+              size="small"
+              :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
-                  :disabled="$route.query.ReviewStatus === '1'"
               v-model="form.Summarize"
               type="textarea"
-                  :rows="2"
+              :rows="10"
               :placeholder="
                 $t('curriculumVitae:summarize:form:placeholder:summarize')
               "
               size="small"
+              :maxlength="4000"
             />
           </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"
+              :rows="10"
               :placeholder="
                 $t('curriculumVitae:summarize:form:placeholder:summarizeEN')
               "
               size="small"
+              :maxlength="4000"
             />
           </el-form-item>
-            </el-col>
-          </el-row>
-
-          <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"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
         <el-button
-              type="primary"
-              :disabled="$route.query.ReviewStatus === '1'"
           size="small"
-              :loading="loading"
+          type="primary"
           @click="handleSave"
+          :loading="loading"
         >
           {{ $t('common:button:save') }}
         </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
+      </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,

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,6 +45,7 @@
           {{ $t('common:button:downloadTpl') }}
         </el-button>
       </div>
+      <template v-if="!isPM">
         <template v-if="CounselorFiles">
           <div class="file_title">
             {{ $t('curriculumVitae:agreement:Counselor') }}
@@ -71,6 +72,77 @@
             />
           </div>
         </template>
+      </template>
+      <template v-else>
+        <div class="file_title">
+          {{ $t('curriculumVitae:agreement:Counselor') }}
+        </div>
+        <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>
+        <div class="file_title">
+          {{ $t('curriculumVitae:agreement:confirmation') }}
+        </div>
+        <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>
     <BaseModel :config="model_cfg">
       <template slot="dialog-body">
@@ -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,
@@ -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,7 +441,9 @@ export default {
           'CriterionType',
           this.form.CriterionType
         )
+        if (!this.isPM) {
           this.form.IsIRUpload = true
+        }
         addDoctorCriterionFile(this.form).then((res) => {
           this.$message.success('添加成功')
           this.initSowList()

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,6 +227,7 @@
               :placeholder="
                 $t('curriculumVitae:clinicalTrials:placeholder:criterionOther')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -289,7 +293,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 +368,7 @@
             <el-input
               v-model="certificateForm.GCPAgencies"
               clearable
+              :maxlength="400"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -423,33 +432,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>
@@ -525,6 +541,10 @@ export default {
         }
       },
     },
+    trialId: {
+      type: String,
+      default: '',
+    },
     reviewerId: {
       type: String,
       default: '',
@@ -549,43 +569,65 @@ 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',
+          },
         ],
         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 +635,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,11 +668,26 @@ 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,
       },
@@ -773,6 +837,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 +864,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
@@ -985,6 +1055,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -992,6 +1063,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

@@ -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')
@@ -160,40 +165,38 @@
               </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"
+            v-if="isEN"
           >
             <el-input
               v-model="form.School"
               clearable
               :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:schoolEN'
-                    )
+                $t('curriculumVitae:continuingTraining:placeholder:schoolEN')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="SchoolCN" label-width="10px">
+          <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-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:city')"
             prop="City"
+            v-if="isEN"
           >
             <el-input
               v-model="form.City"
@@ -201,26 +204,27 @@
               :placeholder="
                 $t('curriculumVitae:continuingTraining:placeholder:City')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CityCN" label-width="10px">
+          <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-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:Country')"
             prop="Country"
+            v-if="isEN"
           >
             <el-input
               v-model="form.Country"
@@ -228,23 +232,23 @@
               :placeholder="
                 $t('curriculumVitae:continuingTraining:placeholder:Country')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CountryCN" label-width="10px">
+          <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'
-                    )
+                $t('curriculumVitae:continuingTraining:placeholder:CountryCN')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-          </el-row>
         </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

@@ -112,13 +112,10 @@
             </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')
-                "
+            :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
             prop="Major"
+            v-if="isEN"
           >
             <el-input
               clearable
@@ -128,24 +125,23 @@
                 )
               "
               v-model="form.Major"
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-
-            <el-col :span="11">
-              <el-form-item prop="MajorCN" label-width="10px">
+          <el-form-item
+            :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
+            prop="MajorCN"
+            v-else
+          >
             <el-input
               clearable
               :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:specialy'
-                    )
+                $t('curriculumVitae:EducationalExperience:placeholder:specialy')
               "
               v-model="form.MajorCN"
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-          </el-row>
 
           <el-form-item
             :label="$t('curriculumVitae:EducationalExperience:form:degree')"
@@ -161,42 +157,38 @@
             </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"
+            v-if="isEN"
           >
             <el-input
               v-model="form.Organization"
               clearable
               :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:schoolEN'
-                    )
+                $t('curriculumVitae:EducationalExperience:placeholder:schoolEN')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item label-width="10px" prop="OrganizationCN">
+          <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'
-                    )
+                $t('curriculumVitae:EducationalExperience:placeholder:school')
               "
+              :maxlength="400"
             ></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"
+            v-if="isEN"
           >
             <el-input
               v-model="form.City"
@@ -204,44 +196,42 @@
               :placeholder="
                 $t('curriculumVitae:EducationalExperience:placeholder:City')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CityCN" label-width="10px">
+          <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'
-                    )
+                $t('curriculumVitae:EducationalExperience:placeholder:CityCN')
               "
+              :maxlength="400"
             ></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')
-                "
+            :label="$t('curriculumVitae:EducationalExperience:form:Country')"
             prop="Country"
+            v-if="isEN"
           >
             <el-input
               v-model="form.Country"
               clearable
               :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:Country'
-                    )
+                $t('curriculumVitae:EducationalExperience:placeholder:Country')
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CountryCN" label-width="10px">
+          <el-form-item
+            prop="CountryCN"
+            :label="$t('curriculumVitae:EducationalExperience:form:Country')"
+            v-else
+          >
             <el-input
               v-model="form.CountryCN"
               clearable
@@ -250,10 +240,9 @@
                   'curriculumVitae:EducationalExperience:placeholder:CountryCN'
                 )
               "
+              :maxlength="400"
             ></el-input>
           </el-form-item>
-            </el-col>
-          </el-row>
         </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

@@ -64,7 +64,7 @@
           v-loading="loading"
           :model="form"
           :rules="rules"
-          label-width="80px"
+          label-width="100px"
           size="small"
         >
           <div class="form_title">
@@ -76,7 +76,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 +88,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 +146,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 +168,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>
@@ -200,6 +220,7 @@
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:AffiliatedUniversity')"
+            prop="UniversityAffiliated"
           >
             <el-input
               disabled
@@ -207,6 +228,7 @@
               type="textarea"
               autosize
               size="small"
+              :maxlength="4000"
             />
           </el-form-item>
           <el-form-item :label="$t('curriculumVitae:info:form:City')">
@@ -237,6 +259,7 @@
                 $t('curriculumVitae:info:form:placeholder:DepartmentOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -250,6 +273,7 @@
                 $t('curriculumVitae:info:form:placeholder:DepartmentOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -279,6 +303,7 @@
                 $t('curriculumVitae:info:form:placeholder:RankOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -295,11 +320,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 +334,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>
@@ -398,33 +431,49 @@ 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 +481,101 @@ 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',
           },
         ],

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;

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> -->
+        <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-item>
       </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,418 @@
+<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: #606266">{{
+            $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: #606266">{{
+            $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"
+      :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;
+  }
+}
+</style>

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

@@ -102,6 +102,7 @@
                 $t('curriculumVitae:specialty:placeholder:SpecialityOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -115,6 +116,7 @@
                 $t('curriculumVitae:specialty:placeholder:SpecialityOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -149,6 +151,7 @@
                 $t('curriculumVitae:specialty:placeholder:SubspecialityOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -165,6 +168,7 @@
                 $t('curriculumVitae:specialty:placeholder:SubspecialityOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -198,6 +202,7 @@
                 $t('curriculumVitae:specialty:placeholder:ReadingTypeOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -213,6 +218,7 @@
                 $t('curriculumVitae:specialty:placeholder:ReadingTypeOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
         </el-form>
@@ -291,44 +297,70 @@ 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,

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

@@ -11,9 +11,12 @@
         {{ $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">
@@ -25,9 +28,50 @@
           label-width="80px"
           size="small"
         >
+          <template v-if="isPM && IndicationList.length > 0">
+            <el-form-item
+              :label="$t('curriculumVitae:summarize:form:Indication')"
+              prop="Indication"
+              v-if="!isEN"
+            >
+              <el-select
+                v-model="form.Indication"
+                placeholder=""
+                @change="handleChange"
+              >
+                <el-option
+                  v-for="item in IndicationList"
+                  :key="item.Id"
+                  :label="item.Indication"
+                  :value="item.Indication"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              :label="$t('curriculumVitae:summarize:form:Indication')"
+              prop="IndicationEn"
+              v-else
+            >
+              <el-select
+                v-model="form.IndicationEn"
+                placeholder=""
+                @change="handleChange"
+              >
+                <el-option
+                  v-for="item in IndicationList"
+                  :key="item.Id"
+                  :label="item.IndicationEn"
+                  :value="item.IndicationEn"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </template>
           <el-form-item
             :label="$t('curriculumVitae:summarize:form:summarize')"
             prop="Summarize"
+            v-if="!isEN"
           >
             <el-input
               :placeholder="
@@ -35,19 +79,25 @@
               "
               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>
@@ -70,11 +120,17 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
-import { updateGneralSituation } from '@/api/reviewers'
+import { addOrUpdateGneralSituation } 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,32 +148,72 @@ export default {
       type: String,
       default: '',
     },
+    trialId: {
+      type: String,
+      default: '',
+    },
     isEN: {
       type: Boolean,
       default: false,
     },
+    isPM: {
+      type: Boolean,
+      default: false,
+    },
+    IndicationList: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
   },
   data() {
     return {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:summarize:form:title'),
         appendToBody: true,
       },
       form: defaultForm(),
-      rules: {},
+      rules: {
+        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,
     }
   },
+  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() {
+    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.model_cfg.visible = true
     },
@@ -130,10 +226,13 @@ export default {
         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 +243,16 @@ export default {
         console.log(err)
       }
     },
+    handleChange(value) {
+      let data = this.IndicationList.find(
+        (item) => item.Indication === value || item.IndicationEn === value
+      )
+      Object.keys(this.form).forEach((key) => {
+        if (key !== 'Id') {
+          this.form[key] = data[key]
+        }
+      })
+    },
   },
 }
 </script>
@@ -155,6 +264,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     width: 100%;

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>
@@ -78,7 +84,10 @@
               ...reviewerData.SummarizeInfo,
             }"
             :reviewerId.sync="reviewerId"
+            :trialId="trialId"
             :isEN="isEN"
+            :isPM="isPM"
+            :IndicationList="IndicationList"
             @getInfo="getDetail"
           />
         </div>
@@ -121,6 +130,7 @@
             :DATA="{ ...reviewerData.TrialExperienceView }"
             :isEN="isEN"
             :reviewerId.sync="reviewerId"
+            :trialId="trialId"
             @getInfo="getDetail"
           />
         </div>
@@ -148,6 +158,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 +176,20 @@
         <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"
+          v-if="visible"
+        />
       </div>
     </el-dialog>
     <holiday
@@ -178,6 +197,11 @@
       :reviewerId.sync="reviewerId"
       :visible.sync="holidayVisible"
     />
+    <!-- <setting
+      v-if="settingVisible"
+      :reviewerId.sync="reviewerId"
+      :visible.sync="settingVisible"
+    /> -->
   </div>
 </template>
 <script>
@@ -195,8 +219,9 @@ 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 { getDetail, getSummarizeInfo } from '@/api/reviewers'
 import { mapMutations } from 'vuex'
 export default {
   components: {
@@ -215,6 +240,7 @@ export default {
     pay,
     holiday,
     preview,
+    setting,
   },
   data() {
     return {
@@ -222,7 +248,8 @@ export default {
       isScrollAuto: true,
       visible: false,
       loading: false,
-      reviewerId: null,
+      reviewerId: '',
+      trialId: '',
       reviewerData: {
         BasicInfoView: {},
         EmploymentView: {},
@@ -242,16 +269,28 @@ export default {
       dom: null,
 
       holidayVisible: false,
+
+      // settingVisible: false,
+
+      IndicationList: [],
     }
   },
   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,15 +312,34 @@ export default {
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    // 获取系统模板
+    async getIndicationList() {
+      try {
+        let id = this.reviewerId
+        if (!id) return false
+        let res = await getSummarizeInfo({
+          DoctorId: id,
+        })
+        if (res.IsSuccess) {
+          this.IndicationList = res.Result.SummarizeList
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     // 获取详情
     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
+          if (this.isPM) {
+            this.getIndicationList()
+          }
         }
       } catch (err) {
         this.loading = false
@@ -328,6 +386,10 @@ export default {
     openHoliday() {
       this.holidayVisible = true
     },
+    // 设置
+    // openSetting() {
+    //   this.settingVisible = true
+    // },
   },
 }
 </script>
@@ -340,13 +402,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 +431,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 +466,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -412,6 +476,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 }}
@@ -80,21 +80,15 @@
           }}</span>
         </div>
       </div>
-      <div
-        class="message break-word"
-        v-if="
-          reviewerData.SummarizeInfo.SummarizeEn ||
-          reviewerData.SummarizeInfo.Summarize
-        "
-      >
+      <div class="message break-word">
         <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>
-        <span class="">
-          {{
-            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 +211,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 +282,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 +296,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')"
+            </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 v-if="isEN">{{
-                reviewerData.ResearchPublicationView.Grants
-              }}</span>
-              <span v-else>{{
-                reviewerData.ResearchPublicationView.GrantsCN
-              }}</span>
-            </el-form-item>
+              <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,6 +416,7 @@
           </el-table-column>
         </el-table>
         <!--GCP证书-->
+        <template v-if="isAll">
           <div class="title">
             {{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}
           </div>
@@ -417,7 +436,9 @@
             </el-table-column>
             <el-table-column
               prop="GCPTime"
-            :label="$t('curriculumVitae:clinicalTrials:table:certificateTime')"
+              :label="
+                $t('curriculumVitae:clinicalTrials:table:certificateTime')
+              "
               v-if="true"
             >
             </el-table-column>
@@ -430,14 +451,9 @@
             >
             </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 +462,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"
-      >
+      <template v-if="isAll">
+        <div class="message">
           <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
           <div
-          class="message"
+            class="message break-word"
             style="white-space: pre-wrap"
+            v-html="reviewerData.ResearchPublicationView.Publications"
             v-if="reviewerData.ResearchPublicationView.Publications"
-        >
-          {{ reviewerData.ResearchPublicationView.Publications }}
-        </div>
+          ></div>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
+      </template>
+      <template v-else>
+        <div class="message">
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
           <div
-        class="message"
-        v-if="
-          (reviewerData.ResearchPublicationView.AwardsHonors ||
-            reviewerData.ResearchPublicationView.AwardsHonorsCN) &&
-          isAll
-        "
-      >
+            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="message">
-          <span v-if="isEN">{{
-            reviewerData.ResearchPublicationView.AwardsHonors
-          }}</span>
-          <span v-else>{{
+          <span
+            style="white-space: pre-wrap"
+            v-html="
+              isEN
+                ? reviewerData.ResearchPublicationView.AwardsHonors
+                : reviewerData.ResearchPublicationView.AwardsHonorsCN
+            "
+            v-if="
+              reviewerData.ResearchPublicationView.AwardsHonors ||
               reviewerData.ResearchPublicationView.AwardsHonorsCN
-          }}</span>
+            "
+          ></span>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
       </div>
       <div class="message" v-if="isAll">
@@ -765,6 +795,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,6 +1005,7 @@ export default {
 .curriculumVitaePreview {
   display: flex;
   padding: 0 100px;
+  justify-content: space-between;
   .title {
     font-size: 18px;
     border: none;
@@ -968,10 +1015,12 @@ export default {
   .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;
@@ -1028,7 +1077,7 @@ export default {
   width: 100%;
 }
 .allInfo {
-  flex: 1;
+  width: calc(100% - 300px);
 }
 .file {
   width: 300px;
@@ -1037,6 +1086,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -1046,6 +1096,7 @@ export default {
   }
   ::v-deep .file_title {
     line-height: 40px;
+    font-weight: bold;
   }
   ::v-deep .btnBox {
     display: flex;
@@ -1072,7 +1123,12 @@ export default {
   }
 }
 break-word {
+  display: inline-block;
   width: 100%;
   word-wrap: break-word;
 }
+.noData {
+  color: #909399;
+  text-align: center;
+}
 </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() {
+      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(this.email))
-        return this.$message.warning(this.$t('rules:email'))
+        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/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
+        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,15 +140,15 @@ 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>
@@ -131,7 +168,6 @@ export default {
     text-align: right;
   }
 }
-
 </style>
 <style>
 .el-dialog__body .sign-form-body h4 {

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,61 @@
     </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
+      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 +452,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 +478,7 @@ export default {
     BaseContainer,
     Pagination,
     BaseModel,
-    reviewerAdd,
-    reviewerEdit,
+    curriculumVitae,
   },
   dicts: ['ReadingType', 'Subspeciality', 'Position', 'Rank'],
   data() {
@@ -449,13 +491,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 +534,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 +578,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() {
+      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(this.email))
-        return this.$message.warning(this.$t('rules:email'))
+        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 +609,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,188 +424,188 @@ 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 {

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/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/setting/email-manage/components/EmailList.vue

@@ -203,7 +203,7 @@
         <!--          width="160"-->
         <!--        />-->
         <!-- 附件 -->
-        <!-- <el-table-column
+        <el-table-column
           v-if="$i18n.locale === 'zh' && isDistinguishCriteria"
           prop="AttachNameCN"
           :label="$t('trials:emailManageCfg:title:fileName')"
@@ -220,7 +220,7 @@
           </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
@@ -234,7 +234,7 @@
               >{{ scope.row.AttachName }}</span
             >
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <!-- 是否需要回执 -->
         <!-- <el-table-column
           prop="IsReturnRequired"

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

@@ -37,7 +37,7 @@
       >
         <el-select
           v-model="form.UploadRole"
-          style="width:100%;"
+          style="width: 100%"
           @change="handleUploadRoleChange"
         >
           <el-option
@@ -55,8 +55,12 @@
       >
         <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"
@@ -73,16 +77,21 @@
         :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"
             :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 || form.ClinicalDataLevel !== 1)) ||
+              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,7 +103,7 @@
         <el-select
           v-model="form.TrialCriterionIdList"
           multiple
-          style="width:100%;"
+          style="width: 100%"
         >
           <el-option
             v-for="(item, index) of criterionList"
@@ -125,24 +134,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 +170,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 +203,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 +265,17 @@ export default {
       getReadingQuestionCriterionTrialList({
         TrialId: this.trialId,
         PageIndex: 1,
-        PageSize: 500
-      }).then(res => {
+        PageSize: 500,
+      })
+        .then((res) => {
           this.criterionList = res.Result.CurrentPageData
-      }).catch(() => { this.listLoading = false })
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     getTrialCriterionSelectList() {
-      getTrialCriterionSelectList({ TrialId: this.trialId }).then(res => {
+      getTrialCriterionSelectList({ TrialId: this.trialId }).then((res) => {
         this.trialCriterionSelectList = res.Result
       })
     },
@@ -240,17 +290,18 @@ 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 => {
+        addOrUpdateClinicalDataTrialSet(this.form)
+          .then((res) => {
             this.btnLoading = false
             this.$emit('getList', true)
             this.$emit('close')
@@ -265,9 +316,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 +357,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,9 +372,8 @@ export default {
     },
     close() {
       this.$emit('close')
-    }
-
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

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

@@ -1356,9 +1356,8 @@ export default {
           .replaceAll(',', ' | ')
         // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
         this.initialForm = { ...this.form }
-        this.initialForm.TrialObjectNameList = JSON.parse(
-          JSON.stringify(this.form.TrialObjectNameList)
-        )
+        this.initialForm.TrialObjectNameList =
+          JSON.parse(JSON.stringify(this.form.TrialObjectNameList)) || []
         if (
           !this.form.TrialObjectNameList ||
           (Array.isArray(this.form.TrialObjectNameList) &&

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']"
@@ -49,10 +48,10 @@
     <template slot="main-container">
       <el-table
         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(() => {
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
           this.confirmLoading = true
-        confirmTrialVisitPlan(this.trialId).then((res) => {
+          confirmTrialVisitPlan(this.trialId)
+            .then((res) => {
               this.confirmLoading = false
               if (res.IsSuccess) {
                 this.getList()
               }
-        }).catch(() => { this.confirmLoading = false })
-      }).catch(() => {})
+            })
+            .catch(() => {
+              this.confirmLoading = false
+            })
+        })
+        .catch(() => {})
     },
     closeDialog() {
       this.visit_model.visible = false
@@ -336,11 +458,13 @@ export default {
         if (valid) {
           this.formLoading = true
           this.form.TrialId = this.trialId
-          updateVisitBlindName(this.form).then((res) => {
+          updateVisitBlindName(this.form)
+            .then((res) => {
               this.formLoading = false
               this.config_model.visible = false
               this.$message.success(this.$t('common:message:savedSuccessfully'))
-          }).catch(() => {
+            })
+            .catch(() => {
               this.formLoading = false
             })
         }
@@ -348,7 +472,7 @@ export default {
     },
     handleConfig() {
       this.config_model.visible = true
-    }
-  }
+    },
+  },
 }
 </script>

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

@@ -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

@@ -333,6 +333,7 @@
           :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">{{

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>
@@ -349,24 +349,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 +380,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/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
+                    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-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,10 +21,13 @@
         </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"
@@ -34,16 +42,17 @@
             >
               <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"
               :key="index"
@@ -51,7 +60,14 @@
               :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>
@@ -60,20 +76,47 @@
 
         <!-- 是否超限 -->
         <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>
         <!--导出-->
@@ -118,7 +165,6 @@
               {{ 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"
@@ -345,8 +439,12 @@
             ]"
           >
             <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>
@@ -369,10 +467,20 @@
         </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 => {
+      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 })
+        })
+        .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 => {
+      getQCChallengeDialogList(row.Id)
+        .then((res) => {
           this.loading = false
           if (res.IsSuccess) {
-          if (res.Result.length > 0) { Object.assign(row, res.Result[0]) }
+            if (res.Result.length > 0) {
+              Object.assign(row, res.Result[0])
+            }
             this.currentQCRow = { ...row }
             this.chatVisible = true
           }
-      }).catch(() => { this.loading = false })
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     getDialogList() {
       this.loading = true
-      getQCChallengeDialogList(this.currentQCRow.Id).then(res => {
+      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)
+            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) => {
+      getTrialVisitStageSelect(this.trialId).then((res) => {
         this.visitPlanOptions = res.Result
       })
     },
     // 获取发起人下拉框数据
     getCreatorOptions() {
-      getQCChallengeCreatorList(this.trialId)
-        .then((res) => {
+      getQCChallengeCreatorList(this.trialId).then((res) => {
         this.creatorOptions = res.Result
       })
-    }
-  }
+    },
+  },
 }
 </script>