国际化修改

README-zh.md

@@ -5,3 +5,6 @@ npm install
 # 启动服务
 npm run dev
 
+# v1.9.0修改
+1. 角色修改，全局userId实际意义修改为userRoleId（用户角色id），新增identityUserId（新的用户id）
+

public/index.html

@@ -30,7 +30,6 @@
     </script>
     <% } else { %>
     <script>
-      console.log(2)
       window.zzSessionStorage = {
         setItem: (item, value) => {
           return sessionStorage.setItem(item, value)

src/App.vue

@@ -23,12 +23,38 @@
     >
       i18n
     </div>
-    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
-      <div style="width: 320px">
-        <el-form label-width="100px" @submit.native.prevent size="small">
-          <el-form-item label="关键字">
+    <el-drawer
+      :title="$t('il8n:title')"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="80%"
+    >
+      <div style="width: 620px">
+        <el-form
+          label-width="100px"
+          @submit.native.prevent
+          size="small"
+          :inline="true"
+          class="demo-form-inline"
+        >
+          <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')" v-if="il8nExternal">
+            <el-select
+              v-model="State"
+              clearable
+              filterable
+              @change="handleStateChange"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
@@ -39,7 +65,7 @@
       >
         <el-table-column
           prop="Code"
-          label="标签"
+          :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
         >
@@ -53,7 +79,7 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column prop="Value" :label="$t('il8n:table:en')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -66,7 +92,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" label="中文">
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -79,6 +105,27 @@
             ></el-input>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          v-if="il8nExternal"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.State"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
         <el-button size="mini" @click="drawer = false">取消 </el-button>
@@ -110,10 +157,13 @@ export default {
       show: false,
       key: null,
       arr: [],
+      il8nExternal: false,
+      State: null,
     }
   },
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    Vue.prototype.$openI18n = this.openI18n
   },
   // watch: {
   //   '$route.query': {
@@ -145,6 +195,11 @@ export default {
   //   },
   // },
   methods: {
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
     changeValue(target, attr, e) {
       this.$set(target, attr, e)
     },
@@ -154,9 +209,9 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.indexOf(this.key) ||
-              ~v.Value.indexOf(this.key) ||
-              ~v.ValueCN.indexOf(this.key)
+              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
+              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
+              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
           )
         )
       } else {
@@ -181,22 +236,50 @@ export default {
             i18n.mergeLocaleMessage('en', enMessages)
             this.drawer = false
             this.$message.success('国际化修改成功')
+            if (this.il8nExternal) {
+              this.$EventBus.$emit('il8nUpdate')
+            }
           }
         )
       })
     },
-    openI18n() {
+    openI18n(ARRAY) {
       this.tableData = []
+      this.il8nExternal = false
       this.key = null
       this.drawer = true
       let arr = []
-      let tableData = this.$tl.map((v) => {
-        let a = { ...v }
-        // if (!a.Description) {
-        //   a.Description = this.$route.path
-        // }
-        return a
-      })
+      let tableData = []
+      if (ARRAY && Array.isArray(ARRAY)) {
+        this.il8nExternal = true
+        let data = ARRAY.map((v) => {
+          let a = { ...v }
+
+          return a
+        })
+        tableData = data.map((item) => {
+          return {
+            Code: item.Code,
+            Description: item.Description,
+            FrontType: item.FrontType,
+            Module: item.Module,
+            Value: item.Value,
+            ValueCN: item.ValueCN,
+            State: item.State,
+          }
+        })
+        this.tableData = Object.assign([], tableData)
+        this.arr = Object.assign([], tableData)
+        return false
+      } else {
+        tableData = this.$tl.map((v) => {
+          let a = { ...v }
+          // if (!a.Description) {
+          //   a.Description = this.$route.path
+          // }
+          return a
+        })
+      }
       tableData = tableData.filter((v) => {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
         return ~this.$path.indexOf(v.Code)

src/api/admin.js

@@ -44,11 +44,19 @@ export function updateUser(param) {
     data: param
   })
 }
-
-export function getUser(userId) {
+export function updateUserBasicInfo(param) {
   return request({
-    url: `/user/getUser/${userId}`,
-    method: 'get'
+    url: `/user/updateUserBasicInfo`,
+    method: 'put',
+    data: param
+  })
+}
+
+export function getUser(params) {
+  return request({
+    url: `/user/getUser`,
+    method: 'get',
+    params
   })
 }
 
@@ -317,3 +325,20 @@ export function useUserIDGetDoctorID(data) {
     data
   })
 }
+
+// 管理端修改用户角色
+export function updateUserRoleInfo(data) {
+  return request({
+    url: `/User/updateUserRoleInfo`,
+    method: 'put',
+    data
+  })
+}
+// 管理端新增用户发送邮件
+export function addNewUserSendEmail(data) {
+  return request({
+    url: `/User/addNewUserSendEmail`,
+    method: 'post',
+    data
+  })
+}

src/api/reading.js

@@ -251,3 +251,37 @@ export function uploadOCTLipidAngleTemplate(param) {
     data: param
   })
 }
+
+export function saveTableQuestionMark(param, type) {
+  return request({
+    url: `/saveTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteTableQuestionMark(param, type) {
+  return request({
+    url: `/deleteTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function submitTaskRowInfo(param, type) {
+  return request({
+    url: `/SubmitTaskRowInfo/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteSingleTableQuestionMark(param, type) {
+  return request({
+    url: `/DeleteSingleTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+

src/api/reviewers.js

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

src/api/trials.js

@@ -286,10 +286,11 @@ export function trialSiteUserSummaryListExport(param) {
   })
 }
 
-export function getVisitStageList(trialId) {
+export function getVisitStageList(data) {
   return request({
-    url: `/visitPlan/getVisitStageList/${trialId}`,
-    method: 'get'
+    url: `/visitPlan/getVisitStageList`,
+    method: 'post',
+    data
   })
 }
 
@@ -3905,4 +3906,56 @@ export function setTaskValid(data) {
     method: 'post',
     data
   })
+}
+//  一致性分析临床数据设置任务为有效
+export function getVisitClinicalDataName(data) {
+  return request({
+    url: `/ReadingClinicalData/getVisitClinicalDataName`,
+    method: 'post',
+    data
+  })
+}
+//  修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+  return request({
+    url: `/TrialConfig/configTrialSPMInfo`,
+    method: 'post',
+    data
+  })
+}
+
+//  项目添加角色修改权限
+export function updateTrialUserRole(data) {
+  return request({
+    url: `/TrialMaintenance/updateTrialUserRole`,
+    method: 'put',
+    data
+  })
+}
+
+
+
+// 获取报表配置
+export function getTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 修改报表配置
+export function setTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/SetTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 项目加入人员发送邮件
+export function trialUserSendJoinEmail(data) {
+  return request({
+    url: `/TrialMaintenance/trialUserSendJoinEmail`,
+    method: 'post',
+    data
+  })
 }

src/api/user.js

@@ -179,11 +179,11 @@ export function verifyMFACode(params) {
 }
 
 // 发送MFA邮件
-export function sendMFAEmail(params) {
+export function sendMFAEmail(data) {
   return request({
     url: `/User/sendMFAEmail`,
     method: 'post',
-    params
+    data
   })
 }
 // 获取公钥
@@ -193,3 +193,19 @@ export function getPublicKey() {
     method: 'get',
   })
 }
+// 登陆获取角色
+export function getUserLoginRoleList(data) {
+  return request({
+    url: `/User/getUserLoginRoleList`,
+    method: 'post',
+    data,
+  })
+}
+// 登陆角色id获取token
+export function loginSelectUserRole(params) {
+  return request({
+    url: `/User/loginSelectUserRole`,
+    method: 'get',
+    params,
+  })
+}

src/components/BaseForm/search-form.vue

@@ -13,6 +13,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           :readonly="item.readonly"
         />
@@ -22,6 +23,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -37,6 +39,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -96,6 +99,7 @@
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           :picker-options="item.pickerOption"
+          clearable
         />
         <!-- 时间 -->
         <el-time-select
@@ -104,6 +108,7 @@
           :placeholder="item.placeholder"
           type=""
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间 -->
         <el-date-picker
@@ -114,12 +119,14 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           :disabled="item.disable && item.disable(searchData[item.prop])"
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间段 -->
         <el-date-picker
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
+          :default-time="['00:00:00', '23:59:59']"
           :range-separator="$t('baseForm:daterange:rangeSeparator')"
           :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
           :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"

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/BaseTable/index.vue

@@ -48,6 +48,7 @@
             :show-overflow-tooltip="column.showOverflowTooltip || false"
             :sortable="column.sortable || false"
             :prop="column.prop"
+            :fixed="column.fixed"
           >
             <template slot-scope="scope">
               <!-- 仅仅显示文字 -->
@@ -63,6 +64,10 @@
                     <el-button
                       :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
+                      v-if="
+                        (operate.show && scope.row[operate.show]) ||
+                        !operate.show
+                      "
                       style="margin-right: 5px"
                       @click="handleClick(operate, scope.row)"
                       >{{ operate.name }}</el-button

src/components/Dicom/DicomTags.vue

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

src/components/MFA/index.vue

@@ -21,7 +21,7 @@
       label-width="100px"
     >
       <!-- 邮箱 -->
-      <p class="tip">
+      <p class="tip_mfa">
         <i class="el-icon-warning" style="color: #409eff"></i>
         <span>{{ tip }}</span>
       </p>
@@ -83,7 +83,7 @@ export default {
       second: 60,
       form: {
         Code: null,
-        UserId: null,
+        IdentityUserId: null,
         EMail: null,
         username: null,
       },
@@ -115,7 +115,7 @@ export default {
   methods: {
     open(data) {
       let { UserId, status, username, EMail } = data;
-      this.form.UserId = UserId;
+      this.form.IdentityUserId = UserId;
       this.status = status ? status : "login";
       this.form.username = username;
       this.form.EMail = EMail;
@@ -134,10 +134,10 @@ export default {
         let res = await verifyMFACode(this.form);
         this.loading = false;
         if (res.IsSuccess) {
-          if (this.status === "login") {
-            this.$message.success(this.$t("mfa:message:verifySuccess"));
-          }
-          this.$emit("success", this.form.UserId);
+          // if (this.status === "login") {
+          //   this.$message.success(this.$t("mfa:message:verifySuccess"));
+          // }
+          this.$emit("success", this.form.IdentityUserId);
           this.cancel();
         }
       } catch (err) {
@@ -154,7 +154,7 @@ export default {
           this.timer = null;
         }
         let data = {
-          UserId: this.form.UserId,
+          IdentityUserId: this.form.IdentityUserId,
         };
         if (this.status === "lock") {
           data.MfaType = 1;
@@ -189,7 +189,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.tip {
+.tip_mfa {
   width: 86%;
   margin: auto;
   margin-bottom: 20px;

src/components/TrialsSelect/index.vue

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

src/components/TrialsTab/index.vue

@@ -3,7 +3,7 @@
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
       <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab">
+        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
           <template v-for="item1 of item.children">
             <el-tab-pane
               v-if="TrialConfig && isShow(item1.path)"
@@ -22,11 +22,14 @@
         <i class="iconfont" style="font-size: 30px;color:#ccc">&#xe680;</i>
       </div>
       <!-- 返回项目列表 -->
-      <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+      <el-button type="primary" size="small" @click="goBack">
         <i class="iconfont">&#xe670;</i>
-        <!-- 返回 -->
         <span>{{ $t('trials:trials:title:back') }}</span>
-      </div>
+      </el-button>
+      <!-- <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+        <i class="iconfont">&#xe670;</i>
+        <span>{{ $t('trials:trials:title:back') }}</span>
+      </div> -->
     </div>
   </div>
 </template>
@@ -221,6 +224,9 @@ export default {
     .el-tabs__header{
       margin-bottom: 3px;
     }
+    .el-tabs__item.is-active{
+      font-weight: bold;
+    }
     position: relative;
     .el-input--medium .el-input__inner{
       height: 44px;line-height: 44px;width: 280px;

src/components/UploadFile/index.vue

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

src/components/UploadFiles/index.vue

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

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

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

src/components/clinicalDataQuestions/components/QuestionsForm.vue

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

src/components/toggleRole/index.vue

@@ -0,0 +1,125 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    v-dialogDrag
+    width="540px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    append-to-body
+    :title="$t('toggleRole:tip:title')"
+    center
+    top="30vh"
+    :show-close="false"
+    :before-close="cancel"
+  >
+    <template v-if="hasRole">
+      <el-radio-group v-model="form.userRoleId" class="roles">
+        <el-radio
+          v-for="item in roles"
+          :key="item.Id"
+          :label="item.Id"
+          :disabled="item.IsUserRoleDisabled"
+          style="margin-bottom: 10px"
+        >
+          {{ item.UserTypeShortName }}
+        </el-radio>
+      </el-radio-group>
+    </template>
+
+    <div v-else style="text-align: center">
+      {{ $t('toggleRole:tip:noRole') }}
+    </div>
+    <div slot="footer">
+      <!-- 取消 -->
+      <el-button size="small" @click="cancel()">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <!-- 保存 -->
+      <el-button
+        type="primary"
+        size="small"
+        @click="save"
+        :disabled="saveDisabled"
+        :loading="loading"
+        v-if="hasRole"
+      >
+        {{ $t('common:button:confirm') }}
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: 'toggleRole',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      form: {
+        userRoleId: null,
+      },
+    }
+  },
+  created() {
+    this.form.userRoleId = zzSessionStorage.getItem('userId')
+  },
+  computed: {
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 0
+    },
+    saveDisabled() {
+      return this.form.userRoleId === zzSessionStorage.getItem('userId')
+    },
+  },
+  methods: {
+    cancel() {
+      this.$emit('update:visible', false)
+      this.$emit('cancel')
+    },
+    async save() {
+      try {
+        if (!this.form.userRoleId)
+          return this.$message.warning(this.$t('toggleRole:ruleMessage:select'))
+        this.$emit('save', this.form.userRoleId)
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.roles {
+  max-width: 365px;
+  width: fit-content;
+  display: flex;
+  align-content: center;
+  // justify-content: center;
+  flex-wrap: wrap;
+  margin: auto;
+}
+
+/deep/ .el-radio__original {
+  display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
+}
+
+/deep/.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+  .el-radio__inner {
+  box-shadow: none !important;
+}
+.el-radio {
+  width: 60px;
+}
+</style>

src/const/check/index.js

@@ -1,6 +1,5 @@
 import { SubjectCheckConfig } from './module/Subject'
 
-console.log(SubjectCheckConfig.moduleType)
 export const checkConfig = {
   ModuleType: {
     ...SubjectCheckConfig.ModuleType

src/directive/dialogDrag.js

@@ -10,7 +10,7 @@ const dialogDrag = Vue.directive('dialogDrag', {
     dragDom.style.cssText += ';top:0px;'
 
     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = (function() {
+    const sty = (function () {
       if (window.document.currentStyle) {
         return (dom, attr) => dom.currentStyle[attr]
       } else {
@@ -47,8 +47,10 @@ const dialogDrag = Vue.directive('dialogDrag', {
         styL = +styL.replace(/\px/g, '')
         styT = +styT.replace(/\px/g, '')
       }
+      const oldMousemove = document.onmousemove
 
-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
+        oldMousemove(e)
         // 通过事件委托，计算移动的距离
         let left = e.clientX - disX
         const top = e.clientY - disY
@@ -70,8 +72,8 @@ const dialogDrag = Vue.directive('dialogDrag', {
         dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
       }
 
-      document.onmouseup = function(e) {
-        document.onmousemove = null
+      document.onmouseup = function (e) {
+        document.onmousemove = oldMousemove
         document.onmouseup = null
       }
     }

src/layout/components/Navbar.vue

@@ -14,13 +14,13 @@
 
     <div class="right-menu">
       <div class="navbar-flex-wrapper">
-        <template v-if="device!=='mobile'">
+        <template v-if="device !== 'mobile'">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </template>
         <!-- <div class="avatar-container">
         <img src="@/assets/avatar.png" class="user-avatar">
       </div> -->
-        <div style="margin-left:20px;">
+        <div style="margin-left: 20px">
           <el-dropdown class="dropdown-container" trigger="click">
             <span class="el-dropdown-link">
               {{ `${name} (${userTypeShortName})` }}
@@ -30,10 +30,20 @@
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
               <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
+                <span style="display: block" @click="editInfo">{{
+                  $t('system:navbar:button:Profile')
+                }}</span>
+              </el-dropdown-item>
+              <!-- 切换角色 -->
+              <el-dropdown-item divided v-if="hasRole">
+                <span style="display: block" @click="openToggleRole">{{
+                  $t('system:navbar:button:toggleRole')
+                }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
+                <span style="display: block" @click="logout">{{
+                  $t('system:navbar:button:Log Out')
+                }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -41,38 +51,119 @@
         <TopLang></TopLang>
       </div>
     </div>
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+    />
   </div>
 </template>
 
 <script>
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import TopLang from './topLang'
-
-
+import toggleRole from '@/components/toggleRole'
+import { resetRouter } from '@/router'
 export default {
   components: {
     Breadcrumb,
     Hamburger,
     Screenfull,
-    TopLang
+    TopLang,
+    toggleRole,
   },
   data() {
     return {
       isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem('userTypeShortName')
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'name', 'device'])
+    ...mapGetters(['sidebar', 'name', 'device', 'userTypeShortName']),
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 1
+    },
   },
   created() {
-    this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
+    // this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    openToggleRole() {
+      this.$store.dispatch('user/getUserInfo').then((res) => {
+        this.toggleRoleVisible = true
+      })
+    },
+    loginByRole(userRoleId) {
+      if (this.$store.state.user.userId === userRoleId) {
+        this.toggleRoleVisible = false
+        this.toggleRoleLoading = false
+        return false
+      }
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then(async (res) => {
+                if (res && res.length > 0) {
+                  resetRouter()
+                  await this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  this.toggleRoleLoading = false
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    history.replaceState(null, null, '/trials/trials-list')
+                    history.go(0)
+                  } else {
+                    history.replaceState(null, null, '/trials/trials-workbench')
+                    history.go(0)
+                  }
+                  this.toggleRoleVisible = false
+                  this.toggleRoleLoading = false
+                  this.$EventBus.$emit('reload')
+                } else {
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.toggleRoleLoading = false
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                console.log(err)
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -84,23 +175,23 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      // //this.$i18n.locale = 'zh'
+      // //this.setLanguage('zh')
       this.$updateDictionary()
     },
     editInfo() {
       this.$router.push({ name: 'BaiscInfo' })
     },
-  }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.navbar-flex-wrapper{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
+.navbar-flex-wrapper {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
 .navbar {
   height: 50px;
   overflow: hidden;

src/main.js

@@ -293,6 +293,7 @@ async function VueInit() {
     }()
     _vm.$forceUpdate()
   }
+  Vue.prototype.$EventBus = new Vue()
   Vue.prototype.$path = []
   var t = function (key) {
     if (!~Vue.prototype.$path.indexOf(key)) {
@@ -402,8 +403,12 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if (_vm.$msgbox) {
-        _vm.$msgbox.close();
+      try {
+        if (_vm.$msgbox && _vm.$msgbox.close) {
+          _vm.$msgbox.close();
+        }
+      } catch (err) {
+        console.log(err)
       }
       _vm.$FB.close();
       _vm.$FBT.close();
@@ -446,11 +451,11 @@ async function VueInit() {
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
@@ -596,3 +601,4 @@ VueInit()
 // });
 
 
+export default _vm

src/permission.js

@@ -1,9 +1,10 @@
 import router from './router'
+import { resetRouter } from '@/router'
 import store from './store'
 // import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
 import WHITELIST from "./utils/whiteList"
@@ -17,17 +18,15 @@ store.state.trials.whiteList = whiteList;
 router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
-  // document.title = getPageTitle(to.meta.title)
+  // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
   if (!to.query.trialId) {
     store.dispatch('trials/setConfig', {})
   }
   if (
     to.query.trialId &&
     to.query.trialId !==
-    store.state.trials.config.trialId &&
-    store.state.trials.whiteList.indexOf(to.path) === -1
+    store.state.trials.config.trialId
   ) {
-    console.log(to.query.path)
     let res = await getTrialExtralConfig({
       TrialId: to.query.trialId,
     })
@@ -37,14 +36,14 @@ router.beforeEach(async (to, from, next) => {
         ...res.Result,
       })
     }
-  } if (!to.query.trialId) {
+  }
+  if (!to.query.trialId) {
     store.dispatch('trials/setConfig', {})
   }
   if (
     to.query.trialId &&
     to.query.trialId !==
-    store.state.trials.config.trialId &&
-    store.state.trials.whiteList.indexOf(to.path) === -1
+    store.state.trials.config.trialId
   ) {
     let res = await getTrialExtralConfig({
       TrialId: to.query.trialId,
@@ -63,14 +62,24 @@ router.beforeEach(async (to, from, next) => {
   if (hasToken) {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
-        await store.dispatch('user/logout')
         await OSSclient()
+        await store.dispatch('user/logout')
       }
       if (to.path === '/ReviewersResearchForm') {
         await OSSclient()
       }
       next()
       NProgress.done()
+    } else if (from.path === '/researchForm') {
+      removeToken()
+      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
+    } else if (from.path === '/researchDetail_m') {
+      removeToken()
+      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
     } else {
       await OSSclient()
       const hasGetUserInfo = store.getters.userId
@@ -80,10 +89,13 @@ router.beforeEach(async (to, from, next) => {
         try {
           // 获取用户信息
           await store.dispatch('user/getInfo')
+          await store.dispatch('user/getUserInfo')
           const accessRoutes = await store.dispatch('permission/generateRoutes')
+          resetRouter()
           router.addRoutes(accessRoutes)
           next({ ...to, replace: true })
         } catch (error) {
+          console.log(error)
           // 删除token并进入登录页面以重新登录
           await store.dispatch('user/resetToken')
           next(`/login?redirect=${to.path}`)
@@ -95,10 +107,10 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
-        console.log(to)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
         const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
         if (flag) {
-          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)
+          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         } else {
           next()
         }
@@ -111,10 +123,12 @@ router.beforeEach(async (to, from, next) => {
       }
     } else {
       if (to.path === '/researchForm') {
-        next(`/researchLogin?`)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/researchDetail_m') {
-        next(`/researchLogin_m?`)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)

src/store/getters.js

@@ -3,10 +3,12 @@ const getters = {
   device: state => state.app.device,
   token: state => state.user.token,
   name: state => state.user.name,
+  userTypeShortName: state => state.user.userTypeShortName,
   permissions: state => state.user.permissions,
   tree: state => state.user.tree,
   userName: state => state.user.userName,
   userId: state => state.user.userId,
+  identityUserId: state => state.user.identityUserId,
   routes: state => state.permission.routes,
   asyncRoutes: state => state.permission.addRoutes,
   visitedViews: state => state.tagsView.visitedViews,
@@ -45,6 +47,7 @@ const getters = {
   language: state => state.lang.language,
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
+  IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
   TrialStatusStr: state => state.user.TrialStatusStr
 }
 export default getters

src/store/modules/reading.js

@@ -70,6 +70,12 @@ function getQuestions(questions) {
               answerObj.angle = angle
               answerObj.saveTypeEnum = isNaN(parseFloat(angle)) ? 1 : 2
             }
+          } else if (criterionType === 21) {
+            // MRI-PDFF
+            let isMeasurable = getQuestionAnswer(item.TableQuestions.Questions, 1105, answerObj)
+            answerObj.isMeasurable = isMeasurable
+            answerObj.mean = getQuestionAnswer(item.TableQuestions.Questions, 1104, answerObj)
+            answerObj.saveTypeEnum = parseInt(isMeasurable) === 1 && isNaN(parseFloat(answerObj.mean)) ? 1 : 2
           } else {
             answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
             answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
@@ -507,6 +513,7 @@ const actions = {
     })
   },
   getMeasuredData({ state }, visitTaskId) {
+    console.log('getMeasuredData')
     return new Promise(resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
       if (state.visitTaskList[index].measureDataInit) {
@@ -523,6 +530,13 @@ const actions = {
               el.OtherMeasureData = JSON.parse(el.OtherMeasureData)
               el.OtherMeasureData.data.remark = el.OrderMarkName
             }
+            // if (el.TableQuestionMarkList.length > 0) {
+            //   let list = el.TableQuestionMarkList.map(i=>{
+            //     i.MeasureData = i.MeasureData ? JSON.parse(i.MeasureData) : ''
+            //     return i
+            //   })
+            //   el.TableQuestionMarkList = list
+            // }
             arr.push(el)
           })
           state.visitTaskList[index].MeasureData = arr
@@ -606,6 +620,13 @@ const actions = {
             el.MeasureData = JSON.parse(el.MeasureData)
             el.MeasureData.data.remark = el.OrderMarkName
           }
+          // if (el.TableQuestionMarkList.length > 0) {
+          //   let list = el.TableQuestionMarkList.map(i=>{
+          //     i.MeasureData = i.MeasureData ? JSON.parse(i.MeasureData) : ''
+          //     return i
+          //   })
+          //   el.TableQuestionMarkList = list
+          // }
           arr.push(el)
         })
         state.visitTaskList[index].MeasureData = arr
@@ -623,27 +644,40 @@ const actions = {
       resolve(noneDicomMeasureData)
     })
   },
-  addMeasuredData({ state }, obj) {
+  addMeasuredData({ state }, obj) { 
     return new Promise(resolve => {
+      const criterionType = parseInt(localStorage.getItem('CriterionType'))
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
       // var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
-      var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.RowIndex === obj.data.RowIndex)
-      if (idx > -1) {
-        for (const k in state.visitTaskList[index].MeasureData[idx]) {
-          if (k !== 'Id' && obj.data[k]) {
-            state.visitTaskList[index].MeasureData[idx][k] = obj.data[k]
+      
+      if (criterionType === 21) {
+        let i = measureData.findIndex(i=>i.TableQuestionId === obj.data.TableQuestionId)
+        if (i > -1) {
+          for (const k in state.visitTaskList[index].MeasureData[i]) {
+            if (k !== 'Id' && obj.data[k]) {
+              state.visitTaskList[index].MeasureData[i][k] = obj.data[k]
+            }
           }
+        } else {
+          state.visitTaskList[index].MeasureData.push(obj.data)
         }
-
-        // state.visitTaskList[index].MeasureData[idx].MeasureData = obj.data.MeasureData
-        console.log('更新标记成功', idx)
       } else {
-        state.visitTaskList[index].MeasureData.push(obj.data)
-        console.log('新增标记成功')
+        var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.RowIndex === obj.data.RowIndex)
+        if (idx > -1) {
+          for (const k in state.visitTaskList[index].MeasureData[idx]) {
+            if (k !== 'Id' && obj.data[k]) {
+              state.visitTaskList[index].MeasureData[idx][k] = obj.data[k]
+            }
+          }
+          console.log('更新标记成功', idx)
+        } else {
+          state.visitTaskList[index].MeasureData.push(obj.data)
+          console.log('新增标记成功')
+        }
       }
+      
       // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
-      console.log(state.visitTaskList)
       resolve()
     })
   },
@@ -738,32 +772,45 @@ const actions = {
     return new Promise(resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
-
-      // var uuid = obj.measureData.data.uuid
-      // var idx = measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
-      var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
-      if (idx > -1) {
-        if (measureData[idx].FristAddTaskId) {
-          measureData[idx].MeasureData = ''
-          console.log('清除标记成功', idx)
-        } else {
-          measureData.splice(idx, 1)
-          console.log('移除标记成功', idx)
-        }
-        state.visitTaskList[index].MeasureData = measureData
-      } else if (obj.orderMarkName) {
+      const criterionType = parseInt(localStorage.getItem('CriterionType'))
+      if (criterionType === 21) {
         const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
-        if (i > -1) {
-          if (measureData[i].FristAddTaskId) {
-            measureData[i].MeasureData = ''
-            console.log('清除标记成功', i)
-          } else {
-            measureData.splice(i, 1)
-            console.log('移除标记成功', i)
+          if (i > -1) {
+            if (measureData[i].FristAddTaskId) {
+              measureData[i].MeasureData = ''
+              console.log('清除标记成功', i)
+            } else {
+              measureData.splice(i, 1)
+              console.log('移除标记成功', i)
+            }
           }
-        }
         state.visitTaskList[index].MeasureData = measureData
+      } else {
+        var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
+        if (idx > -1) {
+          if (measureData[idx].FristAddTaskId) {
+            measureData[idx].MeasureData = ''
+            console.log('清除标记成功', idx)
+          } else {
+            measureData.splice(idx, 1)
+            console.log('移除标记成功', idx)
+          }
+          state.visitTaskList[index].MeasureData = measureData
+        } else if (obj.orderMarkName) {
+          const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
+          if (i > -1) {
+            if (measureData[i].FristAddTaskId) {
+              measureData[i].MeasureData = ''
+              console.log('清除标记成功', i)
+            } else {
+              measureData.splice(i, 1)
+              console.log('移除标记成功', i)
+            }
+          }
+          state.visitTaskList[index].MeasureData = measureData
+        }
       }
+      
       // if (idx > -1) {
       //   measureData.splice(idx, 1)
 
@@ -840,6 +887,12 @@ const actions = {
                       const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                       imageIds.push(imageId)
                     })
+                  } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
+                    // 兼容保存标记数据未存NumberOfFrames的情况，按序列展示
+                    for (let i = 0; i < instance.NumberOfFrames; i++) {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    }
                   } else {
                     for (let i = 0; i < instance.NumberOfFrames; i++) {
                       const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
@@ -1034,7 +1087,7 @@ const actions = {
     }
   },
   setImageloadedInfo({ state }, obj) {
-    console.log('setImageloadedInfo', obj)
+    // console.log('setImageloadedInfo', obj)
     // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
     // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
     // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount

src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login, loginOut, getUserMenuTree, getUserPermissions, getUserLoginRoleList, loginSelectUserRole } from '@/api/user'
+import { getUser } from '@/api/admin'
 
 import { resetRouter } from '@/router'
 import md5 from 'js-md5'
@@ -7,22 +8,29 @@ const getDefaultState = () => {
   return {
     token: getToken(),
     name: '',
+    userTypeShortName: "",
     userName: '',
     userId: '',
+    identityUserId: '',
     avatar: '',
     permissions: [],
     tree: [],
     /* eslint-disable */
     TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
     TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
+    IsFirstSysDocNeedSign: false,
     TrialStatusStr: null,
-    isTestUser: false
+    isTestUser: false,
+    roles: []
   }
 }
 
 const state = getDefaultState()
 
 const mutations = {
+  SET_ROLES: (state, roles) => {
+    state.roles = roles
+  },
   RESET_STATE: (state) => {
     Object.assign(state, getDefaultState())
   },
@@ -34,6 +42,9 @@ const mutations = {
   SET_NAME: (state, name) => {
     state.name = name
   },
+  SET_USERTYPESHORTNAME: (state, userTypeShortName) => {
+    state.userTypeShortName = userTypeShortName
+  },
   SET_USERNAME: (state, name) => {
     state.userName = name
   },
@@ -49,9 +60,16 @@ const mutations = {
   SET_USERID: (state, id) => {
     state.userId = id
   },
+  SET_IDENTITYUSERID: (state, id) => {
+    state.identityUserId = id
+  },
   SET_ISTESTUSER: (state, isTestUser) => {
     state.isTestUser = eval(isTestUser)
   },
+  SET_IS_FIRST_SYSTEM_DOC_SIGN: (state, IsFirstSysDocNeedSign) => {
+    zzSessionStorage.setItem('IsFirstSysDocNeedSign', IsFirstSysDocNeedSign)
+    state.IsFirstSysDocNeedSign = IsFirstSysDocNeedSign
+  },
   SET_NEED_SIGN_SYSTEM_DOC_COUNT: (state, TotalNeedSignSystemDocCount) => {
     /* eslint-disable */
     if (eval(process.env.VUE_APP_WORD_FOR_PERMISSION) && !state.isTestUser) {
@@ -78,6 +96,9 @@ const mutations = {
 }
 
 const actions = {
+  setRoles({ commit }, roles) {
+    commit('SET_ROLES', roles)
+  },
   changeUserName({ commit }, userName) {
     commit('SET_USERNAME', userName)
   },
@@ -91,7 +112,7 @@ const actions = {
       if (UserId) {
         data.UserId = UserId;
       }
-      login(data).then(async response => {
+      getUserLoginRoleList(data).then(async response => {
         if (response.IsSuccess) {
           zzSessionStorage.removeItem('lastWorkbench')
           zzSessionStorage.setItem('my_username', username.trim())
@@ -99,6 +120,7 @@ const actions = {
           zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
           localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
           const data = response.Result
+          commit('SET_ROLES', data.BasicInfo.AccountList)
           if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
             try {
               zzSessionStorage.setItem('userId', data.BasicInfo.Id)
@@ -114,25 +136,24 @@ const actions = {
               zzSessionStorage.setItem('IsReviewer', data.BasicInfo.IsReviewer)
               zzSessionStorage.setItem('userName', data.BasicInfo.UserName)
               commit('SET_TOKEN', data.JWTStr)
-              commit('SET_NAME', data.BasicInfo.RealName)
-              zzSessionStorage.setItem('realName', data.BasicInfo.RealName)
+              // commit('SET_NAME', data.BasicInfo.UserName)
               zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
               commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
               commit('SET_USERNAME', data.BasicInfo.UserName)
-              commit('SET_USERID', data.BasicInfo.Id)
               setToken(data.JWTStr)
-              setName(data.BasicInfo.RealName)
-              const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
-              const user = JSON.parse(userString)
-              zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
-              zzSessionStorage.setItem('userId', user.id)
-              zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
-              var permissions = await getUserPermissions()
-              var menuTree = await getUserMenuTree()
-              commit('SET_TREE', menuTree.Result)
-              commit('SET_PERMISSIONS', permissions.Result)
-              zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
-              zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+              // setName(data.BasicInfo.RealName)
+              // const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+              // const user = JSON.parse(userString)
+              // zzSessionStorage.setItem('userId', user.identityUserId)
+              // commit('SET_IDENTITYUSERID', user.identityUserId)
+              // zzSessionStorage.setItem('identityUserId', user.identityUserId)
+              // zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+              // var permissions = await getUserPermissions()
+              // var menuTree = await getUserMenuTree()
+              // commit('SET_TREE', menuTree.Result)
+              // commit('SET_PERMISSIONS', permissions.Result)
+              // zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+              // zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
             } catch (e) {
               console.log(e)
             }
@@ -146,6 +167,51 @@ const actions = {
       })
     })
   },
+  loginByRole({ commit }, userInfo) {
+    const { userRoleId } = userInfo
+    let params = {
+      userRoleId
+    }
+    return new Promise((resolve, reject) => {
+
+      loginSelectUserRole(params).then(async response => {
+        if (response.IsSuccess) {
+          const data = response.Result
+
+          try {
+            commit('SET_TOKEN', data)
+            setToken(data)
+            commit('SET_USERID', userRoleId)
+            zzSessionStorage.setItem('userId', userRoleId)
+            const userString = decodeURIComponent(escape(window.atob(data.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+            const user = JSON.parse(userString)
+            zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
+            commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
+            commit('SET_NAME', user.fullName)
+            setName(user.fullName)
+            commit('SET_IDENTITYUSERID', user.identityUserId)
+            zzSessionStorage.setItem('identityUserId', user.identityUserId)
+            zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+            var permissions = await getUserPermissions()
+            var menuTree = await getUserMenuTree()
+            commit('SET_TREE', menuTree.Result)
+            commit('SET_PERMISSIONS', permissions.Result)
+            zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+            zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+            zzSessionStorage.removeItem('lastWorkbench')
+          } catch (e) {
+            console.log(e)
+          }
+          resolve(response.Result)
+
+        } else {
+          reject(response.ErrorMessage)
+        }
+      }).catch(() => {
+        reject()
+      })
+    })
+  },
   setTree({ commit }, tree) {
     commit('SET_TREE', tree)
   },
@@ -155,6 +221,9 @@ const actions = {
   setTotalNeedSignSystemDocCount({ commit }, TotalNeedSignSystemDocCount) {
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', TotalNeedSignSystemDocCount)
   },
+  setIsFirstSysDocNeedSign({ commit }, IsFirstSysDocNeedSign) {
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', IsFirstSysDocNeedSign)
+  },
   setTotalNeedSignTrialDocCount({ commit }, TotalNeedSignTrialDocCount) {
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', TotalNeedSignTrialDocCount)
   },
@@ -170,32 +239,69 @@ const actions = {
     commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
     commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
     const user = JSON.parse(userString)
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
-    commit('SET_USERID', user.id)
+    commit('SET_NAME', zzSessionStorage.getItem('Name'))
+    commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
+    commit('SET_IDENTITYUSERID', user.identityUserId)
+    commit('SET_USERID', user.userRoleId)
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
-    console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
-    console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', zzSessionStorage.getItem('IsFirstSysDocNeedSign'))
+    // console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
+    // console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
     zzSessionStorage.setItem('userName', user.name)
-    zzSessionStorage.setItem('userId', user.id)
+    zzSessionStorage.setItem('userId', user.userRoleId)
+    zzSessionStorage.setItem('identityUserId', user.identityUserId)
     zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
     zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
     return user
   },
   updateInfo({ commit, state }) {
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
+    commit('SET_NAME', zzSessionStorage.getItem('Name'))
+  },
+  // 获取用户信息
+  getUserInfo({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getUser().then(res => {
+        if (res.Result) {
+          commit('SET_ROLES', res.Result.AccountList)
+        }
+        resolve(res.Result)
+      }).catch(err => {
+        reject(err)
+      })
+    })
   },
   // user logout
   async logout({ commit, state }) {
     try {
       removeToken() // must remove  token  first
       await loginOut({
-        Userd: zzSessionStorage.getItem('userId')
+        UserRoleId: zzSessionStorage.getItem('userId'),
+        IdentityUserId: zzSessionStorage.getItem('identityUserId'),
       })
       resetRouter()
       removeName()
+      let lang = zzSessionStorage.getItem('lang')
       zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
+      commit('RESET_STATE')
+    } catch (e) {
+      console.log(e)
+    }
+  },
+  async resetData({ commit, state }) {
+    try {
+      removeToken() // must remove  token  first
+      // await loginOut({
+      //   UserRoleId: zzSessionStorage.getItem('userId'),
+      //   IdentityUserId: zzSessionStorage.getItem('identityUserId'),
+      // })
+      resetRouter()
+      removeName()
+      let lang = zzSessionStorage.getItem('lang')
+      zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
       commit('RESET_STATE')
     } catch (e) {
       console.log(e)

src/styles/element-ui.scss

@@ -47,3 +47,6 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+.el-select-dropdown__wrap{
+  max-height: 350px;
+}

src/utils/dialog.js

@@ -40,8 +40,9 @@ Vue.directive('dialogDrag', {
         styL = +styL.replace(/\px/g, '')
         styT = +styT.replace(/\px/g, '')
       }
-
+      const oldMousemove = document.onmousemove
       document.onmousemove = function(e) {
+        oldMousemove(e)
         // 通过事件委托，计算移动的距离
         let left = e.clientX - disX
         let top = e.clientY - disY
@@ -63,7 +64,7 @@ Vue.directive('dialogDrag', {
       }
 
       document.onmouseup = function(e) {
-        document.onmousemove = null
+        document.onmousemove = oldMousemove
         document.onmouseup = null
       }
       return false

src/utils/metaDataProvider.js

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

src/utils/request-download.js

@@ -89,9 +89,9 @@ service.interceptors.response.use(
           })
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            //this.$i18n.locale = 'zh'
+            //this.setLanguage('zh')
+            // this.$updateDictionary()
           })
         }
       } else {

src/utils/request.js

@@ -5,6 +5,7 @@ import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
@@ -90,10 +91,20 @@ service.interceptors.response.use(
       const status = error.response.status
       if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
         store.dispatch('user/logout').then(() => {
+          let _vm = ROUTER.default.app
+          try {
+            if (_vm.$msgbox && _vm.$msgbox.close) {
+              _vm.$msgbox.close();
+            }
+          } catch (err) {
+            console.log(err)
+          }
           router.push(`/login`)
-          this.$i18n.locale = 'zh'
-          this.setLanguage('zh')
-          this.$updateDictionary()
+          // if (!this.$i18n.locale) {
+          //   //this.$i18n.locale = 'zh'
+          //   //this.setLanguage('zh')
+          // }
+          // this.$updateDictionary()
         })
       }
       switch (status) {
@@ -123,9 +134,9 @@ service.interceptors.response.use(
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            // //this.$i18n.locale = 'zh'
+            // //this.setLanguage('zh')
+            // this.$updateDictionary()
           })
         } else {
           setTimer({
@@ -139,6 +150,7 @@ service.interceptors.response.use(
           setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
+            confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
             callback: action => { }
           }], 'confirm')
         }
@@ -149,6 +161,7 @@ service.interceptors.response.use(
         [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
           type: 'warning',
           showCancelButton: false,
+          confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
           callback: action => { }
         }], "confirm"
       )
@@ -167,6 +180,8 @@ const setTimer = (obj, type) => {
       Message(obj)
     }
     if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
       MessageBox.confirm(...obj)
     }
     clearTimeout(timer);

src/views/admin/user/components/UserInfo.vue

@@ -5,7 +5,7 @@
     :model="user"
     :rules="userFormRules"
     label-width="150px"
-    style="width:800px;"
+    style="width: 800px"
   >
     <el-card class="Basic" shadow="never" size="small">
       <div slot="header" class="clearfix">
@@ -25,7 +25,7 @@
       <el-form-item label="Given Name: " prop="FirstName">
         <el-input v-model="user.FirstName" />
       </el-form-item>
-      <el-form-item label="Gender: " prop="Sex" style="margin-right:40px;">
+      <el-form-item label="Gender: " prop="Sex" style="margin-right: 40px">
         <el-radio-group v-model="user.Sex">
           <el-radio :label="1">Male</el-radio>
           <el-radio :label="0">Female</el-radio>
@@ -37,13 +37,24 @@
       <el-form-item label="Phone: " prop="Phone">
         <el-input v-model="user.Phone" />
       </el-form-item>
-      <el-form-item v-if="type==1" label="Disable:">
-        <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" />
+      <el-form-item v-if="type == 1" label="Disable:">
+        <el-switch
+          v-model="user.Status"
+          :active-value="0"
+          :inactive-value="1"
+        />
       </el-form-item>
       <el-form-item label="User Type: " prop="UserTypeId">
-        <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
+        <el-select
+          ref="userType"
+          v-model="user.UserTypeId"
+          size="small"
+          placeholder="Please select"
+          style="width: 100%"
+          :disabled="user.CanEditUserType === false"
+        >
           <el-option
-            v-for="(userType,key) of userTypeOptions"
+            v-for="(userType, key) of userTypeOptions"
             :key="key"
             :label="userType.UserType"
             :value="userType.Id"
@@ -52,17 +63,28 @@
       </el-form-item>
     </el-card>
 
-    <el-card class="Affiliation" shadow="never" style="margin-top:10px;" size="small">
+    <el-card
+      class="Affiliation"
+      shadow="never"
+      style="margin-top: 10px"
+      size="small"
+    >
       <div slot="header" class="clearfix">
         <span>Affiliation</span>
       </div>
       <el-form-item prop="IsZhiZhun">
-        <el-radio-group v-model="user.IsZhiZhun" @change="OrgnizationTypeChanged">
+        <el-radio-group
+          v-model="user.IsZhiZhun"
+          @change="OrgnizationTypeChanged"
+        >
           <el-radio :label="true">Internal</el-radio>
           <el-radio :label="false">External</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="user.IsZhiZhun === false" label="Organization Name: ">
+      <el-form-item
+        v-show="user.IsZhiZhun === false"
+        label="Organization Name: "
+      >
         <el-input v-model="user.OrganizationName" />
       </el-form-item>
 
@@ -78,19 +100,24 @@
         type="primary"
         size="small"
         :disabled="isDisabled"
-        style="margin:10px 15px"
+        style="margin: 10px 15px"
         @click="handleSave"
-      >Save</el-button>
+        >Save</el-button
+      >
     </el-form-item>
-
   </el-form>
 </template>
 <script>
-import { getUser, addUser, updateUser, getUserTypeListByUserType } from '@/api/admin.js'
+import {
+  getUser,
+  addUser,
+  updateUser,
+  getUserTypeListByUserType,
+} from '@/api/admin.js'
 export default {
   name: 'UserInfo',
   props: {
-    userId: { type: String, default: '' }
+    userId: { type: String, default: '' },
   },
   data() {
     return {
@@ -105,60 +132,69 @@ export default {
         IsZhiZhun: '',
         OrganizationName: '',
         DepartmentName: '',
-        PositionName: ''
+        PositionName: '',
       },
       userFormRules: {
         UserName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         UserTypeId: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         IsZhiZhun: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         OrganizationName: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
         LastName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         FirstName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         Phone: [
-          { max: 20, min: 7, message: 'The length is 7 to 20', trigger: ['blur'] }
+          {
+            max: 20,
+            min: 7,
+            message: 'The length is 7 to 20',
+            trigger: ['blur'],
+          },
         ],
         EMail: [
           {
             required: true,
             message: 'Please input the email address',
-            trigger: 'blur'
+            trigger: 'blur',
           },
           {
             type: 'email',
             message: 'Please input the correct email address',
-            trigger: ['blur']
+            trigger: ['blur'],
           },
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        Sex: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
+        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
         Status: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
-        DepartmentName: [
-          { max: 50, message: 'The maximum length is 50' }],
-        PositionName: [{ max: 50, message: 'The maximum length is 50' }
-        ]
+        DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
+        PositionName: [{ max: 50, message: 'The maximum length is 50' }],
       },
       userTypeOptions: [],
       isDisabled: false,
-      type: 0 // 1为编辑，0为新增
+      type: 0, // 1为编辑，0为新增
     }
   },
   created() {
@@ -172,46 +208,58 @@ export default {
   },
   methods: {
     handleSave() {
-      this.$refs.userForm.validate(valid => {
+      this.$refs.userForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
-          const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId)
+          const selectedUserType = this.userTypeOptions.filter(
+            (item) => item.Id === this.user.UserTypeId
+          )
           if (selectedUserType.length > 0) {
             this.user.UserTypeEnum = selectedUserType[0].UserTypeEnum
           }
           if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success('Updated successfully')
-            }).catch(() => { this.isDisabled = false })
+            updateUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.$message.success('Updated successfully')
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           } else {
-            addUser(this.user).then(res => {
-              this.isDisabled = false
-              this.user.Id = res.Result.Id
-              this.user.UserCode = res.Result.UserCode
-              this.$emit('getUserId', res.Result.Id)
-              this.$message.success('Added successfully')
-              this.$router.push({ path: '/system/user/list' })
-            }).catch(() => { this.isDisabled = false })
+            addUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.user.Id = res.Result.Id
+                this.user.UserCode = res.Result.UserCode
+                this.$emit('getUserId', res.Result.Id)
+                this.$message.success('Added successfully')
+                this.$router.push({ path: '/system/user/list' })
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           }
         }
       })
     },
     getUserTypeList() {
-      getUserTypeListByUserType(0).then(res => {
+      getUserTypeListByUserType(0).then((res) => {
         if (res.IsSuccess) {
           this.userTypeOptions = res.Result
         }
       })
     },
     getUserInfo() {
-      getUser(this.userId).then(res => {
+      getUser({
+        IdentityUserId: this.userId,
+      }).then((res) => {
         this.user = res.Result
       })
     },
     OrgnizationTypeChanged(val) {
       this.user.OrganizationName = ''
-    }
-  }
+    },
+  },
 }
 </script>

src/views/dashboard/bigdata.vue

@@ -131,8 +131,8 @@ export default {
         .then(() => {
           this.$store.dispatch('user/logout').then(res => {
             this.$router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            //this.$i18n.locale = 'zh'
+            //this.setLanguage('zh')
             this.$updateDictionary()
           })
         })

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

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

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

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

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

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

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

@@ -98,7 +98,7 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="更新时间"
+          label="上传时间"
           show-overflow-tooltip
           sortable="custom"
         />

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

@@ -108,7 +108,7 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="更新时间"
+          label="上传时间"
           show-overflow-tooltip
           sortable="custom"
         />

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

@@ -3,13 +3,16 @@
     ref="sysAttachmentFrom"
     v-loading="loading"
     :model="form"
-    label-width="170px"
+    label-width="190px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="文件类型: " prop="FileTypeId">
+      <el-form-item
+        :label="$t('dictionary:signature:form:FileTypeId')"
+        prop="FileTypeId"
+      >
         <el-select
           v-model="form.FileTypeId"
           style="width: 100%"
@@ -25,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -46,16 +49,16 @@
               type="primary"
               :disabled="form.FileTypeId === ''"
               :loading="btnLoading"
-              >Select</el-button
+              >{{ $t('common:button:check') }}</el-button
             >
             <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-              (must be in pdf format)
+              ({{ $t('trials:signature:label:mustBepdf') }})
             </span>
           </el-upload>
         </div>
       </el-form-item>
       <el-form-item
-        label="需要签署的用户类型: "
+        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
         prop="NeedConfirmedUserTypeIdList"
       >
         <el-select
@@ -71,7 +74,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否仅内部签署: " prop="DocUserSignType">
+      <el-form-item
+        :label="$t('dictionary:signature:form:DocUserSignType')"
+        prop="DocUserSignType"
+      >
         <el-switch
           v-model="form.DocUserSignType"
           :active-value="1"
@@ -80,7 +86,7 @@
         </el-switch>
       </el-form-item>
       <el-form-item
-        label="查看最短时间（分钟）: "
+        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
         prop="SignViewMinimumMinutes"
       >
         <el-input-number
@@ -105,7 +111,7 @@
           :disabled="form.FileTypeId === '' || form.Name === ''"
           :loading="saveBtnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -138,13 +144,25 @@ export default {
       },
       rules: {
         FileTypeId: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
         ],
         SignViewMinimumMinutes: [
-          { required: true, message: 'Please specify', trigger: ['change'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['change'],
+          },
         ],
         NeedConfirmedUserTypeIdList: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
         ],
       },
       fileList: [],
@@ -211,7 +229,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('trials:signature:label:mustBepdf'))
 
         return false
       }
@@ -236,7 +254,7 @@ export default {
       this.$refs.sysAttachmentFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
-          this.$alert('Please select file.')
+          this.$alert(this.$t('trials:signature:message:selectFile'))
           return
         }
         this.saveBtnLoading = true
@@ -245,7 +263,7 @@ export default {
             this.saveBtnLoading = false
             this.$emit('closeDialog')
             this.$emit('getList')
-            this.$message.success('Uploaded successfully')
+            this.$message.success(this.$t('common:message:updatedSuccessfully'))
           })
           .catch(() => {
             this.saveBtnLoading = false
@@ -263,7 +281,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
       var typeArr = ['pdf']

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

@@ -2,7 +2,7 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="文件类型:">
+        <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
           <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of dict.type.Sys_Document"
@@ -12,7 +12,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <el-form-item :label="$t('dictionary:signature:search:Name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
@@ -34,7 +34,7 @@
       <el-button
         type="primary"
         icon="el-icon-plus"
-        style="margin-left: auto"
+        style="margin-left: auto; margin-bottom: 10px"
         size="small"
         @click="handleAdd"
       >
@@ -53,26 +53,27 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="FileType"
-          label="文件类型"
+          :label="$t('dictionary:signature:table:FileType')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:signature:table:Name')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="SignViewMinimumMinutes"
-          label="查看最短时间(分钟)"
+          :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="110"
         />
         <el-table-column
           prop="NeedConfirmedUserTypes"
-          label="需要签署的用户类型"
+          :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -85,48 +86,54 @@
         </el-table-column>
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:signature:table:IsDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.IsDeleted ? 'Yes' : 'No' }}
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
           prop="DocUserSignType"
-          label="是否仅内部签署"
+          :label="$t('dictionary:signature:table:DocUserSignType')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="90"
         >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="UpdateTime"
-          label="更新时间"
+          prop="CreateTime"
+          :label="$t('dictionary:signature:table:CreateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')" min-width="100">
           <template slot-scope="scope">
             <el-button type="text" @click="handlePreview(scope.row)">
-              预览
+              {{ $t('common:button:preview') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button
               :disabled="scope.row.IsDeleted"
               type="text"
               @click="handleRepeal(scope.row)"
             >
-              废除
+              {{ $t('common:button:revoke') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -261,7 +268,7 @@ export default {
     },
     // 废除
     handleRepeal(row) {
-      this.$confirm('是否确认废除此文件?', {
+      this.$confirm(this.$t('dictionary:signature:confirm:delFile'), {
         type: 'warning',
         distinguishCancelAndClose: true,
       })
@@ -298,7 +305,9 @@ export default {
                 this.list.findIndex((item) => item.Id === row.Id),
                 1
               )
-              this.$message.success('删除成功！')
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
             }
           })
           .catch(() => {

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

@@ -111,7 +111,7 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="更新时间"
+          label="上传时间"
           show-overflow-tooltip
           sortable="custom"
         />

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

@@ -9,8 +9,19 @@
   >
     <div class="base-dialog-body">
       <el-form-item label="Site: ">
-        <el-select v-model="form.SiteId" style="width: 100%" clearable filterable @change="siteChange">
-          <el-option v-for="item of siteList" :value="item.Id" :key="item.Id" :label="item.SiteName">
+        <el-select
+          v-model="form.SiteId"
+          style="width: 100%"
+          clearable
+          filterable
+          @change="siteChange"
+        >
+          <el-option
+            v-for="item of siteList"
+            :value="item.Id"
+            :key="item.Id"
+            :label="item.SiteName"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -20,10 +31,16 @@
       <el-form-item label="Hospital EN: " prop="HospitalName">
         <el-input v-model="form.HospitalName" />
       </el-form-item>
-      <el-form-item label="Affiliated University CN: " prop="UniversityAffiliatedCN">
+      <el-form-item
+        label="Affiliated University CN: "
+        prop="UniversityAffiliatedCN"
+      >
         <el-input v-model="form.UniversityAffiliatedCN" />
       </el-form-item>
-      <el-form-item label="Affiliated University EN: " prop="UniversityAffiliated">
+      <el-form-item
+        label="Affiliated University EN: "
+        prop="UniversityAffiliated"
+      >
         <el-input v-model="form.UniversityAffiliated" />
       </el-form-item>
       <el-form-item label="Country CN: " prop="CountryCN">
@@ -45,10 +62,22 @@
         <el-input v-model="form.City" />
       </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 :disabled="btnLoading" size="small" type="primary" @click="handleCancel">Cancel</el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancel"
+          >Cancel</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+          >Save</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
@@ -63,14 +92,14 @@ export default {
       type: Object,
       default() {
         return {}
-      }
+      },
     },
     model: {
       type: Object,
       default() {
         return {}
-      }
-    }
+      },
+    },
   },
   data() {
     return {
@@ -87,23 +116,36 @@ export default {
         Province: '',
         ProvinceCN: '',
         City: '',
-        CityCN: ''
+        CityCN: '',
       },
       siteList: [],
       rules: {
-        HospitalNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        UniversityAffiliated: [{ max: 100, message: 'The maximum length is 100' }],
-        UniversityAffiliatedCN: [{ max: 100, message: 'The maximum length is 100' }],
-        Country: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        CountryCN: [{ max: 50, message: 'The maximum length is 50' }],
-        Province: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        ProvinceCN: [{ max: 50, message: 'The maximum length is 50' }],
-        City: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        CityCN: [{ max: 50, message: 'The maximum length is 50' }]
-      }
+        HospitalNameCN: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        UniversityAffiliated: [
+          { max: 100, message: 'The maximum length is 100' },
+        ],
+        UniversityAffiliatedCN: [
+          { max: 100, message: 'The maximum length is 100' },
+        ],
+        Country: [{ max: 50, message: 'The maximum length is 50' }],
+        CountryCN: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        Province: [{ max: 50, message: 'The maximum length is 50' }],
+        ProvinceCN: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+        City: [{ max: 50, message: 'The maximum length is 50' }],
+        CityCN: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' },
+        ],
+      },
     }
   },
   mounted() {
@@ -114,7 +156,7 @@ export default {
   },
   methods: {
     siteChange(v) {
-      this.siteList.forEach(o => {
+      this.siteList.forEach((o) => {
         if (o.Id === v) {
           this.form.CityCN = o.City
           this.form.HospitalNameCN = o.SiteNameCN
@@ -125,34 +167,37 @@ export default {
       })
     },
     getAllSiteList() {
-      getAllSiteList().then(res => {
-        this.siteList = res.Result
-        console.log(this.siteList)
-      }).catch(() => {
-        reject()
-      })
+      getAllSiteList()
+        .then((res) => {
+          this.siteList = res.Result
+          console.log(this.siteList)
+        })
+        .catch(() => {
+          reject()
+        })
     },
     handleSave() {
-      this.$refs.hospitalForm.validate(valid => {
+      this.$refs.hospitalForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
-        addOrUpdateHospital(this.form).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.$message.success('Saved successfully')
-            this.$refs['hospitalForm'].resetFields()
-            this.$emit('getList')
-            this.$emit('close')
-          }
-        }).catch(() => {
-          this.btnLoading = false
-        })
+        addOrUpdateHospital(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            if (res.IsSuccess) {
+              this.$message.success('Saved successfully')
+              this.$refs['hospitalForm'].resetFields()
+              this.$emit('getList')
+              this.$emit('close')
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false
+          })
       })
     },
     handleCancel() {
       this.$emit('close')
-    }
-  }
-
+    },
+  },
 }
 </script>

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

@@ -10,12 +10,16 @@
           <el-input v-model="searchData.Version" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">{{
-            $t("dictionary:browser:button:reset")
-          }}</el-button>
-          <el-button type="primary" @click="handleSearch">{{
-            $t("dictionary:browser:button:search")
-          }}</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">

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

@@ -24,6 +24,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="标准分组" prop="CriterionGroup">
+        <el-select v-model="form.CriterionGroup">
+          <el-option
+            v-for="item of $d.CriterionGroup"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </el-select>
+      </el-form-item>
 
       <el-form-item v-if="form.Id !== ''" label="是否配置完成">
         <el-switch v-model="form.IsCompleteConfig" />
@@ -40,7 +50,7 @@
       <el-form-item v-if="form.Id !== ''" label="是否启用">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="eCRF是否显示在影像阅片页面">
+      <el-form-item v-if="form.Id !== ''" label="eICRF仅展示阅片Tab">
         <el-switch v-model="form.IseCRFShowInDicomReading" />
       </el-form-item>
     </div>
@@ -72,6 +82,7 @@ export default {
         Id: '',
         CriterionName: '',
         CriterionType: null,
+        CriterionGroup: null,
         IsEnable: true,
         IsCompleteConfig: false,
         ShowOrder: null,
@@ -80,7 +91,8 @@ export default {
       },
       rules: {
         CriterionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
-        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
+        CriterionGroup: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
       },
 
       loading: false,

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

@@ -16,8 +16,16 @@
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

@@ -27,8 +27,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

@@ -243,7 +243,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="导出标识" 
+        <!-- <el-form-item label="导出标识" 
           prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -262,8 +262,11 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
+        </el-form-item> -->
+        <el-form-item 
+          label="导出结果"
+           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -446,13 +449,14 @@
             />
           </el-select>
         </el-form-item>
+        
         <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
-              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value.toString()"
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :value="item.Code"
             />
           </el-select>
         </el-form-item>
@@ -598,6 +602,27 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item
+          v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          label="关联字典"
+        >
+          <el-select
+            v-model="form.DictionaryCode"
+            clearable
+            @change="
+              () => {
+                form.DefaultValue = null
+              }
+            "
+          >
+            <el-option
+              v-for="item of dicList"
+              :key="item.Id"
+              :label="item.Code"
+              :value="item.Code"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item 
           v-if="form.Type === 'upload'" 
           label="最大上传个数"
@@ -807,7 +832,7 @@ export default {
         ConvertShowType: 0,
         QuestionClassify: null,
         HighlightAnswerList: [],
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         MaxAnswerLength: null,
         FileType: [],
@@ -844,17 +869,18 @@ export default {
           { required: true, message: '请注明', trigger: 'blur' },
           { max: 50, message: '最大长度为 50' },
         ],
-        ExportIdentification: [
-          { required: true, message: '请选择', trigger: 'blur' },
-        ],
-        ExportResult: [
-          { required: true, message: '请选择', trigger: 'blur' },
-        ]
+        // ExportIdentification: [
+        //   { required: true, message: '请选择', trigger: 'blur' },
+        // ],
+        // ExportResult: [
+        //   { required: true, message: '请选择', trigger: 'blur' },
+        // ]
       },
       loading: false,
       btnLoading: false,
       parentOptions: [],
       parentTriggerValOptions: [],
+      reParentTriggerValOptions: [],
       groupOptions: [],
       isParentExistGroup: false,
       lesionTypes: [],
@@ -890,6 +916,7 @@ export default {
   mounted() {
     this.initForm()
     this.getCalculateQuestions('number')
+    
   },
   methods: {
     typeValueChange(v) {
@@ -905,6 +932,14 @@ export default {
         }
       })
     },
+    getBasicConfigSelect() {
+      getCriterionDictionaryList({
+        CriterionId: this.criterionId,
+        SystemCriterionId: this.criterionId
+      }).then(res => {
+        this.dicList = res.Result
+      })
+    }, 
     getCalculateQuestions(type) {
       getSystemCalculateQuestions({
         systemCriterionId: this.criterionId,
@@ -944,6 +979,7 @@ export default {
       await this.getParentQuestions()
       await this.getLesionTypeDictionary()
       await this.getLesionType()
+      await this.getBasicConfigSelect()
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
@@ -969,8 +1005,15 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.parentTriggerValOptions =
-                this.$d[this.parentOptions[index].DictionaryCode]
+              // this.parentTriggerValOptions =
+              //   this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
+
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach(
@@ -988,8 +1031,13 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.reParentTriggerValOptions =
-                this.$d[this.parentOptions[index].DictionaryCode]
+              // this.reParentTriggerValOptions =
+              //   this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1114,7 +1162,7 @@ export default {
       data.ConvertShowType = 0
       data.QuestionClassify = null
       data.HighlightAnswerList = []
-      data.ExportIdentification = 0
+      // data.ExportIdentification = 0
       data.ExportResult = []
       data.FileType = []
       data.ClassifyQuestionId = null
@@ -1180,15 +1228,21 @@ export default {
       }
       form.ParentTriggerValue = ''
     },
-    relevanceQuestionChange(val, form) {
+    async relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.reParentTriggerValOptions =
-              this.$d[this.parentOptions[index].DictionaryCode]
+            // this.reParentTriggerValOptions =
+            //   this.$d[this.parentOptions[index].DictionaryCode]
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+              
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
           } else {
             var options = []
             this.parentOptions[index].TypeValue.split('|').forEach(

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

@@ -8,9 +8,16 @@
               <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="handleReset">重置</el-button>
-              <el-button type="primary" @click="handleSearch">查询</el-button>
-
+              <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                {{ $t('common:button:search') }}
+              </el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh-left"
+                @click="handleReset"
+              >
+                {{ $t('common:button:reset') }}
+              </el-button>
             </el-form-item>
           </el-form>
           <div>

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

@@ -8,9 +8,65 @@
         >
           <el-input v-model="searchData.CriterionName" clearable style="width:120px;" />
         </el-form-item>
+        <el-form-item
+          label="标准类型"
+        >
+          <el-select v-model="searchData.CriterionType" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="标准分组"
+        >
+          <el-select v-model="searchData.CriterionGroup" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.CriterionGroup"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="是否配置完成"
+        >
+          <el-select v-model="searchData.IsCompleteConfig" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="是否启用"
+        >
+          <el-select v-model="searchData.IsEnable" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
@@ -25,6 +81,8 @@
       stripe
       size="small"
       height="100"
+      @sort-change="handleSortByColumn"
+      ref="criterionsTbl"
     >
       <el-table-column type="index" width="60" />
 
@@ -32,20 +90,33 @@
         prop="CriterionName"
         label="标准名称"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         prop="CriterionType"
         label="标准类型"
         show-overflow-tooltip
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('CriterionType',scope.row.CriterionType) }}
         </template>
       </el-table-column>
+      <el-table-column
+        prop="CriterionGroup"
+        label="标准分组"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          {{ $fd('CriterionGroup',scope.row.CriterionGroup) }}
+        </template>
+      </el-table-column>
 
       <el-table-column
         prop="IsCompleteConfig"
         label="是否配置完成"
+        sortable="custom"
       >
         <template slot-scope="scope">
 
@@ -62,22 +133,32 @@
         label="描述"
         show-overflow-tooltip
       />
-
-      <el-table-column
-        prop="ShowOrder"
-        label="显示序号"
-        show-overflow-tooltip
-      />
-
       <el-table-column
         prop="IsEnable"
         label="是否启用"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}
         </template>
       </el-table-column>
-
+      <el-table-column
+        prop="ShowOrder"
+        label="显示序号"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="IseCRFShowInDicomReading"
+        label="eICRF仅展示阅片Tab"
+        show-overflow-tooltip
+        sortable="custom"
+        width="210"
+      >
+        <template slot-scope="scope">
+          {{ $fd('YesOrNo', scope.row.IseCRFShowInDicomReading) }}
+        </template>
+      </el-table-column>
       <el-table-column label="Action" min-width="200px">
         <template slot-scope="scope">
           <el-button
@@ -172,8 +253,14 @@ import AddCriterion from './AddCriterion'
 const searchDataDefault = () => {
   return {
     CriterionName: '',
+    CriterionType: null,
+    CriterionGroup: null,
+    IsCompleteConfig: null,
+    IsEnable: null,
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    Asc: true,
+    SortField: ''
   }
 }
 export default {
@@ -271,6 +358,18 @@ export default {
     // 重置
     handleReset() {
       this.searchData = searchDataDefault()
+      this.$refs['criterionsTbl'].clearSort()
+      this.getList()
+    },
+    // 指定排序字段，对列表进行排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
       this.getList()
     }
   }

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

@@ -16,8 +16,16 @@
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

@@ -38,8 +38,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

@@ -26,8 +26,16 @@
           <el-input v-model="searchData.Type" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

@@ -147,7 +147,7 @@
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
-        <el-form-item 
+        <!-- <el-form-item 
           :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -166,9 +166,12 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -327,6 +330,32 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item v-if="form.TableQuestionType === 3" label="默认值">
+          <el-select v-model="form.DefaultValue" clearable>
+            <!-- <el-option
+              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            /> -->
+            <el-option
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :value="item.Code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.TableQuestionType === 0" label="默认值">
+          <el-select v-model="form.DefaultValue" clearable>
+            <el-option
+              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
@@ -338,11 +367,17 @@
               />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
+              <!-- <el-option
                 v-for="item of $d[form.DictionaryCode]"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value.toString()"
+              /> -->
+              <el-option
+                v-for="item of highlightAnswers"
+                :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+                :value="item.Code"
               />
             </template>
           </el-select>
@@ -607,8 +642,9 @@ export default {
         ImageCount: 0,
         ClassifyTableQuestionId: null,
         ClassifyAlgorithms: null,
-        ExportIdentification: 0,
-        ExportResult: []
+        // ExportIdentification: 0,
+        ExportResult: [],
+        DefaultValue:null
         // IsEnable: true
       },
       rules: {
@@ -633,12 +669,12 @@ export default {
         DataTableColumn: [{ required: true, message: '请选择', trigger: 'blur' }],
         // DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
         DependParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ExportIdentification: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ],
-        ExportResult: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ]
+        // ExportIdentification: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ],
+        // ExportResult: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ]
       },
       loading: false,
       parentOptions: [],
@@ -648,9 +684,31 @@ export default {
       colOptions: [],
       dicList: [],
       CriterionDictionaryList: [],
-      Questions: []
+      Questions: [],
+      highlightAnswers: []
     }
   },
+  watch: {
+    'form.DictionaryCode': {
+      deep: true,
+      immediate: true,
+      async handler(v, oldv) {
+        try {
+          if (!v) {
+            this.highlightAnswers = []
+            return
+          }
+          let res = await getCriterionDictionary({
+            ReadingCriterionId: this.criterionId,
+            DictionaryCode: this.form.DictionaryCode,
+          })
+          this.highlightAnswers = res.Result[this.form.DictionaryCode]
+        } catch (e) {
+          console.log(e)
+        }
+      },
+    },
+  },
   mounted() {
     this.initForm()
     this.getCriterionDictionary()
@@ -710,7 +768,13 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -726,8 +790,12 @@ export default {
           })
           if (i !== -1) {
             if (this.parentOptions[i].QuestionGenre === 3) {
-              console.log(this.$d[this.parentOptions[i].DictionaryCode])
-              this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+              // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+              let dicCode = this.parentOptions[i].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
             } else {
               const options = []
               this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
@@ -805,14 +873,20 @@ export default {
         form.RelevanceValue = ''
       }
     },
-    parentQuestionChange(val, form) {
+    async parentQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+             let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -824,16 +898,20 @@ export default {
       }
       form.ParentTriggerValue = ''
     },
-    relevanceQuestionChange(val, form) {
+    async relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
-        console.log(this.$d[this.parentOptions[index].DictionaryCode], this.parentOptions[index].QuestionGenre)
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            console.log(this.$d[this.parentOptions[index].DictionaryCode])
-            this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -890,8 +968,9 @@ export default {
       form.ImageCount = null
       form.ClassifyTableQuestionId = null
       form.ClassifyAlgorithms = null
-      form.ExportIdentification = 0
+      // form.ExportIdentification = 0
       form.ExportResult = []
+      form.DefaultValue = null
     },
     close() {
       this.$emit('close')

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

@@ -246,9 +246,9 @@
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
       <el-button
-        :disabled="!form.EmailHtmlContentCN"
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
         type="text"
-        @click="PreviewHTML(form.EmailHtmlContentCN)"
+        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
         style="position: absolute; left: -50px; top: 30px"
       >
         {{ $t('common:button:preview') }}
@@ -265,9 +265,9 @@
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
       <el-button
-        :disabled="!form.EmailHtmlContent"
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
         type="text"
-        @click="PreviewHTML(form.EmailHtmlContent)"
+        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
         style="position: absolute; left: -50px; top: 30px"
       >
         {{ $t('common:button:preview') }}
@@ -362,12 +362,12 @@ export default {
         BusinessLevelEnum: [
           { required: true, message: 'Please select', trigger: ['blur'] },
         ],
-        ToUserTypeList: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
-        ],
-        EmailCron: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
-        ],
+        // ToUserTypeList: [
+        //   { required: true, message: 'Please select', trigger: ['blur'] },
+        // ],
+        // EmailCron: [
+        //   { required: true, message: 'Please select', trigger: ['blur'] },
+        // ],
         EmailUrgentEnum: [
           { required: true, message: 'Please select', trigger: ['blur'] },
         ],
@@ -519,8 +519,8 @@ export default {
       })
     },
     // 预览模板
-    PreviewHTML(html) {
-      this.$emit('PreviewHTML', html)
+    PreviewHTML(html, htmlEn) {
+      this.$emit('PreviewHTML', html, htmlEn)
     },
   },
 }

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

@@ -123,8 +123,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
@@ -370,6 +378,13 @@
           <el-button type="text" @click="handleDelete(scope.row)"
             >删除</el-button
           >
+          <el-button
+            type="text"
+            @click="
+              preview(scope.row.EmailHtmlContentCN, scope.row.EmailHtmlContent)
+            "
+            >{{ $t('common:button:preview') }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -427,7 +442,23 @@
       fullscreen
       custom-class="base-dialog-wrapper"
     >
-      <div v-html="previewHTML"></div>
+      <div
+        style="
+          display: flex;
+          align-items: flex-start;
+          justify-content: space-around;
+          flex-wrap: wrap;
+        "
+      >
+        <div>
+          <h3>邮件内容模版（CN）</h3>
+          <div v-html="previewHTML"></div>
+        </div>
+        <div>
+          <h3>邮件内容模版（EN）</h3>
+          <div v-html="previewHTMLEN"></div>
+        </div>
+      </div>
     </el-dialog>
   </box-content>
 </template>
@@ -487,6 +518,7 @@ export default {
       attachmentVisible: false,
       previewVisible: false,
       previewHTML: null,
+      previewHTMLEN: null,
     }
   },
   computed: {
@@ -574,8 +606,9 @@ export default {
     closeDialog() {
       this.editVisible = false
     },
-    preview(html) {
+    preview(html, htmlEN) {
       this.previewHTML = html
+      this.previewHTMLEN = htmlEN
       this.previewVisible = true
     },
     // 导出

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

@@ -3,15 +3,23 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
+        <el-form-item label="Code:">
           <el-input v-model="searchData.Code" style="width:100px;" />
         </el-form-item>
         <el-form-item label="模板:">
           <el-input v-model="searchData.Name" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">

src/views/email-recompose/index.vue

@@ -29,15 +29,16 @@
           <el-input v-model="password.Email" disabled />
         </el-form-item>
         <!-- 用户名 -->
-        <el-form-item :label="$t('recompose:form:role')" prop="UserType">
+        <!-- <el-form-item :label="$t('recompose:form:role')" prop="UserType">
           <el-input v-model="password.UserType" disabled />
-        </el-form-item>
+        </el-form-item> -->
         <!-- 用户名 -->
         <el-form-item :label="$t('recompose:form:userName')" prop="NewUserName">
           <el-input v-model="password.NewUserName" />
         </el-form-item>
         <!-- 新密码 -->
         <el-form-item
+          class="my_new_pwd"
           :label="$t('recompose:form:newPassword')"
           prop="NewPassWord"
         >
@@ -84,6 +85,11 @@ export default {
       password: {
         NewUserName: null,
         UserId: null,
+        ConfirmPassWord: null,
+        NewPassWord: null,
+        Email: null,
+        UserType: null,
+        access_token: null,
       },
       passwordFormRules: {
         NewUserName: [
@@ -95,7 +101,6 @@ export default {
                 : 'zh'
               /* eslint-disable */
               var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
-              console.log(!reg1.test(value))
               if (!reg1.test(value)) {
                 callback(
                   lang === 'zh'
@@ -176,9 +181,9 @@ export default {
     this.$i18n.locale = this.$route.query.lang
     this.setLanguage(this.$route.query.lang)
     this.$updateDictionary()
-    if (!this.password.NewUserName) {
-      this.$alert(this.$t('recompose:message:warning'))
-    }
+    // if (!this.password.NewUserName) {
+    //   this.$alert(this.$t('recompose:message:warning'))
+    // }
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
@@ -190,8 +195,10 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      if (!this.$i18n.locale) {
+        //this.$i18n.locale = 'zh'
+        //this.setLanguage('zh')
+      }
       this.$updateDictionary()
     },
     save() {
@@ -229,7 +236,10 @@ export default {
       })
     },
     cancel() {
-      this.$refs['passwordForm'].resetFields()
+      // this.$refs['passwordForm'].resetFields()
+      this.password.NewPassWord = null
+      this.password.NewUserName = null
+      this.password.ConfirmPassWord = null
     },
   },
 }
@@ -263,7 +273,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
-.el-form-item {
-  margin-bottom: 30px;
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
 }
 </style>

src/views/error.vue

@@ -2,7 +2,8 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404" style="display: flex;align-items: center">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/login-bg.png" alt="404">
+        <!-- <img class="pic-404__parent" src="@/assets/login-bg.png" alt="404"> -->
+        <svg-icon icon-class="login-bg" style="width: 100%; height: 100%" />
         <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
         <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
         <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
@@ -56,8 +57,10 @@ export default {
   .pic-404 {
     position: relative;
     float: left;
-    width: 400px;
+    width: 500px;
+    height: 300px;
     overflow: hidden;
+    margin-right: 10px;
     &__parent {
       width: 100%;
     }

src/views/forgetpassword/index.vue

@@ -76,7 +76,8 @@
       >
         <!-- 用户名 -->
         <el-form-item :label="$t('passwordReset:form:userName')" prop="UserId">
-          <el-select
+          <el-input v-model="form.UserName" disabled />
+          <!-- <el-select
             v-model="form.UserId"
             clearable
             filterable
@@ -94,15 +95,15 @@
                 item.UserType
               }}</span>
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- 用户类型 -->
-        <el-form-item
+        <!-- <el-form-item
           v-if="form.UserId"
           :label="$t('passwordReset:form:userType')"
         >
           <el-input v-model="form.UserType" disabled />
-        </el-form-item>
+        </el-form-item> -->
         <!-- 新密码 -->
         <el-form-item
           class="my_new_pwd"
@@ -338,11 +339,13 @@ export default {
       )
         .then((res) => {
           this.formLoading = false
-          this.users = res.Result
-          if (this.users.length === 1) {
-            this.form.UserId = this.users[0].UserId
-            this.form.UserType = this.users[0].UserType
-          }
+          this.form.UserId = res.Result.Id
+          this.form.UserName = res.Result.UserName
+          // this.users = res.Result
+          // if (this.users.length === 1) {
+          //   this.form.UserId = this.users[0].UserId
+          //   this.form.UserType = this.users[0].UserType
+          // }
           // 验证成功
           this.$message.success(
             this.$t('passwordReset:message:verifiedSuccessfully')
@@ -420,7 +423,7 @@ export default {
 /*  margin-bottom: 40px;*/
 /*}*/
 .is-error.my_new_pwd {
-  margin-bottom: 40px;
+  margin-bottom: 45px;
 }
 .flexBox {
   display: flex;

src/views/login/index.vue

@@ -83,7 +83,7 @@
               <svg-icon icon-class="password" />
             </span>
             <!-- password -->
-            <!-- <el-input
+            <el-input
               :key="passwordType"
               ref="password"
               v-model="loginForm.password"
@@ -100,8 +100,8 @@
               <svg-icon
                 :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
               />
-            </span> -->
-            <el-input
+            </span>
+            <!-- <el-input
               :key="passwordType"
               ref="password"
               v-model="pwdCover"
@@ -115,7 +115,7 @@
             />
             <span class="show-pwd" @click="hidePassword">
               <svg-icon :icon-class="!isShowPassword ? 'eye' : 'eye-open'" />
-            </span>
+            </span> -->
           </el-form-item>
           <!-- Login -->
           <el-button
@@ -205,17 +205,21 @@
         "
       >
         <h1
-          style="text-align: center; margin-bottom: 20px"
+          style="text-align: center; margin-bottom: 30px"
           v-if="NODE_ENV === 'usa'"
         >
           About
         </h1>
-        <h1 style="text-align: center; margin-bottom: 20px" v-else>关于</h1>
-        <p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
-          {{ $t('login:title:system_title_about') }}
+        <h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
+        <p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
+          <!-- {{ $t('login:title:system_title_about') }} -->
+          <svg-icon
+            icon-class="login-logo"
+            style="width: 250px; height: 71px"
+          />
         </p>
-        <p style="margin-bottom: 20px" v-else>{{ $t('login:title:system') }}</p>
-        <p style="margin-bottom: 20px">
+        <p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
+        <p style="margin-bottom: 20px; margin-top: 0">
           V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
         </p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
@@ -243,6 +247,13 @@
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+      @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -253,9 +264,10 @@ import TopLang from './topLang'
 import Vcode from 'vue-puzzle-vcode'
 import browserTip from '@/views/dictionary/template/browser/tip.vue'
 import Img1 from '@/assets/pic-2.png'
+import toggleRole from '@/components/toggleRole'
 export default {
   name: 'Login',
-  components: { TopLang, Vcode, browserTip },
+  components: { TopLang, Vcode, browserTip, toggleRole },
   data() {
     return {
       NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
@@ -298,12 +310,15 @@ export default {
       isShow: false,
       showCode: false,
       Img1,
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
     }
   },
   computed: {
     ...mapGetters(['asyncRoutes', 'routes', 'language']),
     host() {
-      return window.location.host
+      // return window.location.host
+      return 'elevateimaging.ai '
     },
   },
   watch: {
@@ -318,6 +333,8 @@ export default {
     },
   },
   mounted() {
+    let lang = zzSessionStorage.getItem('lang') || 'zh'
+    // zzSessionStorage.clear()
     this.loginType = this.$route.query.loginType
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
@@ -332,9 +349,9 @@ export default {
         this.setLanguage('en')
         this.$updateDictionary()
       } else {
-        // this.$i18n.locale = 'zh'
-        // this.setLanguage('zh')
-        // this.$updateDictionary()
+        this.$i18n.locale = lang
+        this.setLanguage(lang)
+        this.$updateDictionary()
       }
     }
     this.$refs.browserTip.open()
@@ -376,6 +393,9 @@ export default {
       this.$store
         .dispatch('user/login', this.loginForm)
         .then((res) => {
+          if (res.BasicInfo.LoginState === 2) {
+            this.$message.warning(this.$t('login:message:login4'))
+          }
           if (res.BasicInfo.IsFirstAdd) {
             // 当前用户为首次登录,请先修改密码之后再次登录
             this.$message.success(this.$t('login:message:login1'))
@@ -385,7 +405,7 @@ export default {
               })
             }, 500)
             return
-          } else if (res.BasicInfo.LoginState === 1) {
+          } else if (res.BasicInfo.NeedChangePassWord) {
             // 请先修改密码后再登录！
             this.$alert(
               this.$t('login:message:login3'),
@@ -401,52 +421,117 @@ export default {
             )
             return
           } else if (res.IsMFA) {
+            zzSessionStorage.removeItem('userId')
+            zzSessionStorage.removeItem('identityUserId')
             this.$MFA({
-              UserId: res.BasicInfo.Id,
+              UserId: res.BasicInfo.IdentityUserId,
               EMail: res.BasicInfo.EMail,
               username: this.loginForm.username,
-              callBack: this.loginIn,
+              callBack: this.changeRoleLogin,
               cancelBack: () => {
                 this.loading = false
               },
             })
             return
-          } else if (res.BasicInfo.LoginState === 2) {
-            // 本次登录的IP或设备与上次不一致，请确认'
-            // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
-            this.$message.warning(this.$t('login:message:login4'))
           }
-          this.$store.dispatch('permission/generateRoutes').then((res) => {
-            this.loading = false
-            if (res && res.length > 0) {
-              this.$store.dispatch('global/getNoticeList')
-              this.$router.addRoutes(res)
-              if (this.loginType === 'DevOps') {
-                this.$router.replace({ path: res[0].path })
-                return
-              }
-              if (this.hasPermi(['role:radmin'])) {
-                this.$router.replace({ path: res[0].path })
-                return
-              }
-              if (
-                this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])
-              ) {
-                this.$router.replace({ path: '/trials/trials-list' })
-              } else {
-                this.$router.replace({ path: '/trials' })
-              }
-            } else {
-              // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
-              this.$message.warning(this.$t('login:message:login2'))
-            }
-          })
+          // else if (res.BasicInfo.LoginState === 2) {
+          //   // 本次登录的IP或设备与上次不一致，请确认'
+          //   // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+          //   this.$message.warning(this.$t('login:message:login4'))
+          // }
+          zzSessionStorage.removeItem('userId')
+          zzSessionStorage.removeItem('identityUserId')
+          this.changeRoleLogin()
         })
         .catch(() => {
           this.showCode = true
           this.loading = false
         })
     },
+    loginByRole(userRoleId) {
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          this.toggleRoleLoading = false
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then((res) => {
+                this.loading = false
+                if (res && res.length > 0) {
+                  this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  // if (this.LoginState === 2) {
+                  //   this.$message.warning(this.$t('login:message:login4'))
+                  // }
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    this.$router.replace({ path: '/trials/trials-list' })
+                  } else {
+                    this.$router.replace({ path: '/trials' })
+                  }
+                } else {
+                  this.toggleRoleLoading = false
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.showCode = true
+          this.loading = false
+          this.toggleRoleLoading = false
+        })
+    },
+    changeRoleLogin() {
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.length === 1
+      ) {
+        this.loginByRole(this.$store.state.user.roles[0].Id)
+        return
+      }
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
+          .length ===
+          this.$store.state.user.roles.length - 1
+      ) {
+        let role = this.$store.state.user.roles.find(
+          (item) => !item.IsUserRoleDisabled
+        )
+        this.loginByRole(role.Id)
+        return
+      }
+      return (this.toggleRoleVisible = true)
+    },
+    cancel() {
+      this.showCode = true
+      this.loading = false
+      this.toggleRoleLoading = false
+      // this.toggleRoleVisible = false
+    },
     onSuccess() {
       this.isShow = false
       this.loginIn()
@@ -456,7 +541,6 @@ export default {
     },
     // 输入框输入事件
     setPassword(val) {
-      console.log(val)
       if (this.isShowPassword) {
         this.loginForm.password = val
       } else {

src/views/recompose/index.vue

@@ -42,6 +42,7 @@
         </el-form-item>
         <!-- 新密码 -->
         <el-form-item
+          class="my_new_pwd"
           :label="$t('recompose:form:newPassword')"
           prop="NewPassWord"
         >
@@ -138,14 +139,16 @@ export default {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     async logout() {
       var loginType = zzSessionStorage.getItem('loginType')
-      await this.$store.dispatch('user/logout')
+      await this.$store.dispatch('user/resetData')
       if (loginType) {
         this.$router.push(`/login?loginType=${loginType}`)
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      if (!this.$i18n.locale) {
+        //this.$i18n.locale = 'zh'
+        //this.setLanguage('zh')
+      }
       this.$updateDictionary()
     },
     save() {
@@ -219,4 +222,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
+}
 </style>

src/views/research/form.vue

@@ -117,7 +117,7 @@
       :title="$t('trials:researchForm:dialogTitle:reject')"
       width="600px"
       custom-class="base-dialog-wrapper"
-      :append-to-body="userTypeEnumInt !== 0"
+      append-to-body
     >
       <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
         <div class="base-dialog-body">

src/views/reviewers/ReviewersResearch.vue

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

src/views/reviewers/components/Agreements.vue

@@ -274,6 +274,7 @@
               v-model="form.Remark"
               type="textarea"
               :autosize="{ minRows: 2, maxRows: 4 }"
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
           <el-form-item :label="$t('system:Agreements:label:Is Enable')">
@@ -354,6 +355,13 @@ export default {
         IsEnable: false,
       },
       rules: {
+        Remark: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
         CriterionType: [
           {
             required: true,
@@ -429,7 +437,7 @@ export default {
     },
     handlePreview3(row) {
       return this.$preview({
-        path: row.FilePath,
+        path: row.Path || row.FilePath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -439,7 +447,7 @@ export default {
     },
     handlePreview2(row, r2) {
       return this.$preview({
-        path: row.fullPath,
+        path: row.Path || row.fullPath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -529,7 +537,7 @@ export default {
     handlePreview(row) {
       console.log(row)
       return this.$preview({
-        path: row.FullPath,
+        path: row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })

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>
@@ -557,22 +569,30 @@
           :label="$t('system:EducationTraining:table:Hospital')"
           prop="Hospital"
         >
-          <el-select
-            v-model="postgraduateForm.HospitalId"
-            filterable
-            placeholder=""
-          >
-            <el-option
-              v-for="(item, index) in hospitalList"
-              :key="index"
-              :label="item.HospitalName"
-              :value="item.Id"
-            >
-              <span>
-                {{ item.HospitalName }}
-              </span>
-            </el-option>
-          </el-select>
+          <el-row type="flex" justify="space-between">
+            <el-col :span="11">
+              <el-autocomplete
+                clearable
+                class="inline-input"
+                style="width: 100%"
+                v-model="postgraduateForm.Hospital"
+                :fetch-suggestions="querySearch"
+                @select="handleSelect"
+                placeholder="Please specify in English"
+              ></el-autocomplete>
+            </el-col>
+            <el-col :span="11">
+              <el-autocomplete
+                clearable
+                class="inline-input"
+                style="width: 100%"
+                v-model="postgraduateForm.HospitalCN"
+                :fetch-suggestions="querySearchCN"
+                @select="handleSelect"
+                placeholder="请用中文注明"
+              ></el-autocomplete>
+            </el-col>
+          </el-row>
         </el-form-item>
         <el-form-item
           :label="$t('system:EducationTraining:table:University')"
@@ -584,6 +604,7 @@
                 v-model="postgraduateForm.School"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -591,6 +612,7 @@
                 v-model="postgraduateForm.SchoolCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -606,6 +628,7 @@
                 v-model="postgraduateForm.City"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -613,6 +636,7 @@
                 v-model="postgraduateForm.CityCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -627,6 +651,7 @@
                 v-model="postgraduateForm.Province"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -634,6 +659,7 @@
                 v-model="postgraduateForm.ProvinceCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -648,6 +674,7 @@
                 v-model="postgraduateForm.Country"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -655,6 +682,7 @@
                 v-model="postgraduateForm.CountryCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -764,7 +792,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 +811,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 +845,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 +864,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 +944,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 +992,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 +1011,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: {
@@ -910,6 +1051,8 @@ export default {
       },
       isDisabled: false,
       loading: false,
+      hospitalSelectList: [],
+      hospitalSelectListCN: [],
     }
   },
   computed: {
@@ -918,11 +1061,71 @@ export default {
       return this.$i18n.locale !== 'zh'
     },
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          this.hospitalSelectList.push({
+            value: item.HospitalName,
+            ...item,
+          })
+          this.hospitalSelectListCN.push({
+            value: item.HospitalNameCN,
+            ...item,
+          })
+        })
+      },
+      deep: true,
+    },
+  },
   mounted() {
     this.initPage()
     store.dispatch('global/getHospital')
   },
   methods: {
+    handleSelect(value) {
+      const item = value
+      if (item) {
+        this.postgraduateForm.Hospital = item.HospitalName
+        this.postgraduateForm.HospitalCN = item.HospitalNameCN
+      }
+    },
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    querySearchCN(queryString, cb) {
+      var hospitalList = this.hospitalSelectListCN
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString, false))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString, isEN = true) {
+      return (hospitalList) => {
+        if (isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     initPage() {
       const id = this.$route.query.Id || this.reviewerId
       if (id) {

src/views/reviewers/components/Employment.vue

@@ -14,27 +14,32 @@
             <el-col :span="14">
               <el-form-item
                 :label="$t('system:reviewer:label:Hospital')"
-                prop="HospitalId"
+                prop="HospitalName"
               >
-                <el-select
-                  v-model="employmentForm.HospitalId"
-                  placeholder="select"
-                  :disabled="$route.query.ReviewStatus === '1'"
+                <el-autocomplete
+                  clearable
+                  class="inline-input"
                   style="width: 100%"
-                  size="small"
-                  @change="handleHospitalChange"
-                >
-                  <el-option
-                    v-for="(item, index) in hospitalList"
-                    :key="index"
-                    :label="item.HospitalName"
-                    :value="item.Id"
-                  >
-                    <span>
-                      {{ item.HospitalName }}
-                    </span>
-                  </el-option>
-                </el-select>
+                  v-model="employmentForm.HospitalName"
+                  :fetch-suggestions="querySearch"
+                  @select="handleSelect"
+                  placeholder="Please specify in English"
+                  @change="handleChange"
+                ></el-autocomplete>
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item prop="HospitalNameCN">
+                <el-autocomplete
+                  clearable
+                  class="inline-input"
+                  style="width: 100%"
+                  v-model="employmentForm.HospitalNameCN"
+                  :fetch-suggestions="querySearchCN"
+                  @select="handleSelect"
+                  placeholder="请用中文注明"
+                  @change="handleChange"
+                ></el-autocomplete>
               </el-form-item>
             </el-col>
           </el-row>
@@ -43,13 +48,27 @@
             <el-col :span="14">
               <el-form-item
                 :label="$t('system:reviewer:label:AffiliatedUniversity')"
+                prop="UniversityAffiliated"
               >
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="UniversityAffiliated"
+                  v-model="employmentForm.UniversityAffiliated"
                   type="textarea"
                   autosize
+                  placeholder="Please specify in English"
                   size="small"
+                  :maxlength="4000"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item prop="UniversityAffiliated">
+                <el-input
+                  v-model="employmentForm.UniversityAffiliatedCN"
+                  type="textarea"
+                  autosize
+                  placeholder="请用中文注明"
+                  size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -58,20 +77,30 @@
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:City')">
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="City"
+                  v-model="employmentForm.City"
                   size="small"
+                  placeholder="Please specify in English"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item>
+                <el-input
+                  v-model="employmentForm.CityCN"
+                  size="small"
+                  placeholder="请用中文注明"
                 />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:State/Province')">
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  disabled
                   v-model="Province"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -80,13 +109,14 @@
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:Country')">
                 <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  disabled
                   v-model="Country"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <el-row>
             <el-col :span="14">
@@ -113,7 +143,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -128,6 +161,7 @@
                   v-model="employmentForm.DepartmentOther"
                   placeholder="Please specify (required)"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -142,6 +176,7 @@
                   v-model="employmentForm.DepartmentOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -180,8 +215,8 @@
             <el-col :span="5">
               <el-form-item
                 v-if="
-                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
-                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                  $fd('Rank', employmentForm.RankId, 'id') ===
+                  $t('curriculumVitae:selectLabel:Other')
                 "
                 class="other-item"
                 prop="RankOther"
@@ -191,14 +226,15 @@
                   v-model="employmentForm.RankOther"
                   placeholder="Please specify"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="5">
               <el-form-item
                 v-if="
-                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
-                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                  $fd('Rank', employmentForm.RankId, 'id') ===
+                  $t('curriculumVitae:selectLabel:Other')
                 "
                 class="other-item"
                 prop="RankOtherCN"
@@ -208,6 +244,7 @@
                   v-model="employmentForm.RankOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
                 />
               </el-form-item>
             </el-col>
@@ -227,6 +264,7 @@
                     $t('curriculumVitae:info:form:placeholder:partTimeJob')
                   "
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -243,6 +281,7 @@
                     $t('curriculumVitae:info:form:placeholder:partTimeJobEN')
                   "
                   size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
@@ -276,7 +315,7 @@ export default {
   },
   data() {
     const RankIndication = (rule, value, callback) => {
-      if (value === '其它' || value === 'Other') {
+      if (value === this.$t('curriculumVitae:selectLabel:Other')) {
         if (!this.trialForm.IndicationOther) {
           return callback(new Error('请输入适应症'))
         }
@@ -284,7 +323,7 @@ export default {
       callback()
     }
     const PhysicianIndication = (rule, value, callback) => {
-      if (value === '其它' || value === 'Other') {
+      if (value === this.$t('curriculumVitae:selectLabel:Other')) {
         if (!this.trialForm.IndicationOther) {
           return callback(new Error('请输入适应症'))
         }
@@ -308,14 +347,34 @@ export default {
         Physician: '',
         PhysicianCN: '',
         PhysicianOriginal: null,
+        HospitalName: '',
+        HospitalNameCN: '',
         WorkPartTime: null,
         WorkPartTimeEn: null,
+        UniversityAffiliated: null,
+        UniversityAffiliatedCN: null,
+        City: null,
+        CityCN: null,
       },
       UniversityAffiliated: '',
       City: '',
       Province: '',
       Country: '',
       employmentRules: {
+        HospitalName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        HospitalNameCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         DepartmentId: [
           {
             required: true,
@@ -325,19 +384,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 +429,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 +441,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 +454,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,
@@ -384,20 +481,101 @@ export default {
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
       loading: false,
       dictionaryList: {},
+      hospitalSelectList: [],
+      hospitalSelectListCN: [],
     }
   },
   computed: {
     ...mapGetters(['hospitalList']),
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
   },
   mounted() {
     this.initEmployment()
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          this.hospitalSelectList.push({
+            value: item.HospitalName,
+            ...item,
+          })
+          this.hospitalSelectListCN.push({
+            value: item.HospitalNameCN,
+            ...item,
+          })
+        })
+      },
+      deep: true,
+    },
+  },
   methods: {
+    handleSelect(value) {
+      const item = value
+      if (item) {
+        this.employmentForm.HospitalName = item.HospitalName
+        this.employmentForm.HospitalNameCN = item.HospitalNameCN
+        this.employmentForm.UniversityAffiliated = item.UniversityAffiliated
+        this.employmentForm.City = item.City
+        this.employmentForm.UniversityAffiliatedCN = item.UniversityAffiliatedCN
+        this.employmentForm.CityCN = item.CityCN
+      } else {
+        this.employmentForm.UniversityAffiliated = null
+        this.employmentForm.City = null
+        this.employmentForm.UniversityAffiliatedCN = null
+        this.employmentForm.CityCN = null
+      }
+    },
+    handleChange(v) {
+      if (v) return
+      this.employmentForm.UniversityAffiliated = null
+      this.employmentForm.City = null
+      this.employmentForm.UniversityAffiliatedCN = null
+      this.employmentForm.CityCN = null
+    },
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    querySearchCN(queryString, cb) {
+      var hospitalList = this.hospitalSelectListCN
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString, false))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString, isEN = true) {
+      return (hospitalList) => {
+        if (isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     RankChange(val) {
       var o = this.$d.Rank.find((v) => {
         return v.id === val
       })
-      if (o.label === '其它' || o.label === 'Other') {
+      if (o.label === this.$t('curriculumVitae:selectLabel:Other')) {
         this.employmentForm.RankOther = ''
         this.employmentForm.RankOtherCN = ''
       } else {
@@ -409,7 +587,7 @@ export default {
       var o = this.$d.PhysicianOriginal.find((v) => {
         return v.id === val
       })
-      if (o.label === '其它' || o.label === 'Other') {
+      if (o.label === this.$t('curriculumVitae:selectLabel:Other')) {
         this.employmentForm.Physician = ''
         this.employmentForm.PhysicianCN = ''
       } else {
@@ -461,6 +639,14 @@ export default {
               : ''
           param.HospitalId = this.employmentForm.HospitalId
 
+          param.HospitalName = this.employmentForm.HospitalName
+          param.HospitalNameCN = this.employmentForm.HospitalNameCN
+          param.UniversityAffiliated = this.employmentForm.UniversityAffiliated
+          param.UniversityAffiliatedCN =
+            this.employmentForm.UniversityAffiliatedCN
+          param.City = this.employmentForm.City
+          param.CityCN = this.employmentForm.CityCN
+
           updateEmploymentInfo(param)
             .then((res) => {
               this.isDisabled = false
@@ -497,9 +683,22 @@ export default {
               PositionOther,
               PositionOtherCN,
               HospitalId,
+              HospitalName,
+              HospitalNameCN,
               WorkPartTime,
               WorkPartTimeEn,
+              UniversityAffiliated,
+              UniversityAffiliatedCN,
+              City,
+              CityCN,
             } = res.Result
+            this.employmentForm.HospitalName = HospitalName
+            this.employmentForm.HospitalNameCN = HospitalNameCN
+            this.employmentForm.UniversityAffiliated = UniversityAffiliated
+            this.employmentForm.UniversityAffiliatedCN = UniversityAffiliatedCN
+            this.employmentForm.City = City
+            this.employmentForm.CityCN = CityCN
+
             this.employmentForm.WorkPartTime = WorkPartTime
             this.employmentForm.WorkPartTimeEn = WorkPartTimeEn
             this.employmentForm.Id = id
@@ -530,10 +729,12 @@ export default {
     handleHospitalChange(value) {
       const item = this.hospitalList.filter((item) => item.Id === value)
       if (item.length) {
-        this.UniversityAffiliated = item[0].UniversityAffiliated
-        this.City = item[0].City
-        this.Province = item[0].Province
-        this.Country = item[0].Country
+        this.UniversityAffiliated = this.isEN
+          ? item[0].UniversityAffiliated
+          : item[0].UniversityAffiliatedCN
+        this.City = this.isEN ? item[0].City : item[0].CityCN
+        this.Province = this.isEN ? item[0].Province : item[0].ProvinceCN
+        this.Country = this.isEN ? item[0].Country : item[0].CountryCN
       }
     },
     async initEmployment() {

src/views/reviewers/components/GcpCertificate.vue

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

src/views/reviewers/components/Pay.vue

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

src/views/reviewers/components/ResearchPublication.vue

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

src/views/reviewers/components/Setting.vue

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

src/views/reviewers/components/Specialty.vue

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

src/views/reviewers/components/Summarize.vue

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

src/views/reviewers/components/TrialExperience.vue

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

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

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

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

@@ -292,7 +292,7 @@ export default {
     },
     preview(row) {
       this.$preview({
-        path: row.FullPath,
+        path: row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })

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

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

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

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

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

@@ -93,9 +93,9 @@
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy-MM"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
@@ -119,24 +119,29 @@
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:direction')"
             prop="Major"
+            v-if="isEN"
           >
             <el-input
-              style="width: 97%"
               v-model="form.Major"
               type="textarea"
               :rows="2"
+              :maxlength="4000"
               clearable
               :placeholder="
                 $t('curriculumVitae:continuingTraining:placeholder:directionEN')
               "
             ></el-input>
           </el-form-item>
-          <el-form-item prop="MajorCN">
+          <el-form-item
+            prop="MajorCN"
+            :label="$t('curriculumVitae:continuingTraining:form:direction')"
+            v-else
+          >
             <el-input
-              style="width: 97%"
               type="textarea"
               :rows="2"
               v-model="form.MajorCN"
+              :maxlength="4000"
               clearable
               :placeholder="
                 $t('curriculumVitae:continuingTraining:placeholder:direction')
@@ -145,106 +150,116 @@
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:hospital')"
-            prop="HospitalId"
+            prop="Hospital"
+            v-if="isEN"
           >
-            <el-select v-model="form.HospitalId" filterable placeholder="">
-              <el-option
-                v-for="(item, index) in hospitalList"
-                :key="index"
-                :label="item.HospitalName"
-                :value="item.Id"
-              >
-                <span>
-                  {{ item.HospitalName }}
-                </span>
-              </el-option>
-            </el-select>
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.Hospital"
+              :fetch-suggestions="querySearch"
+              placeholder=""
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:hospital')"
+            prop="Hospital"
+            v-else
+          >
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalCN"
+              :fetch-suggestions="querySearch"
+              placeholder=""
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:school')"
+            prop="School"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.School"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:schoolEN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="SchoolCN"
+            :label="$t('curriculumVitae:continuingTraining:form:school')"
+            v-else
+          >
+            <el-input
+              v-model="form.SchoolCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:school')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:city')"
+            prop="City"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.City"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:City')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CityCN"
+            :label="$t('curriculumVitae:continuingTraining:form:city')"
+            v-else
+          >
+            <el-input
+              v-model="form.CityCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:CityCN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:Country')"
+            prop="Country"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.Country"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:Country')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CountryCN"
+            :label="$t('curriculumVitae:continuingTraining:form:Country')"
+            v-else
+          >
+            <el-input
+              v-model="form.CountryCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:CountryCN')
+              "
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:continuingTraining:form:school')"
-                prop="School"
-              >
-                <el-input
-                  v-model="form.School"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:schoolEN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="SchoolCN" label-width="10px">
-                <el-input
-                  v-model="form.SchoolCN"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:school')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:continuingTraining:form:city')"
-                prop="City"
-              >
-                <el-input
-                  v-model="form.City"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:City')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CityCN" label-width="10px">
-                <el-input
-                  v-model="form.CityCN"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:CityCN')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12" style="margin-right: 5px">
-              <el-form-item
-                :label="$t('curriculumVitae:continuingTraining:form:Country')"
-                prop="Country"
-              >
-                <el-input
-                  v-model="form.Country"
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:Country')
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item prop="CountryCN" label-width="10px">
-                <el-input
-                  v-model="form.CountryCN"
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:CountryCN'
-                    )
-                  "
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
         </el-form>
       </template>
       <template slot="dialog-footer">
@@ -279,6 +294,8 @@ const defaultForm = () => {
     Major: '',
     MajorCN: '',
     HospitalId: null,
+    HospitalCN: null,
+    Hospital: null,
     School: '',
     SchoolCN: '',
     City: '',
@@ -321,67 +338,100 @@ 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,
       daterange: [],
+      hospitalSelectList: [],
     }
   },
   computed: {
@@ -390,7 +440,55 @@ export default {
   mounted() {
     store.dispatch('global/getHospital')
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          if (this.isEN) {
+            this.hospitalSelectList.push({
+              value: item.HospitalName,
+              ...item,
+            })
+          } else {
+            this.hospitalSelectList.push({
+              value: item.HospitalNameCN,
+              ...item,
+            })
+          }
+        })
+      },
+      deep: true,
+    },
+  },
   methods: {
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (hospitalList) => {
+        if (this.isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     openEdit(row) {
       this.form = defaultForm()
       this.daterange = []
@@ -422,6 +520,11 @@ export default {
         if (this.reviewerId) {
           this.form.DoctorId = this.reviewerId
         }
+        let data = Object.assign({}, this.form)
+        if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+          data.Hospital = data.HospitalId
+          data.HospitalId = null
+        }
         this.loading = true
         let res = await addOrUpdatePostgraduateInfo(this.form)
         this.loading = false
@@ -472,10 +575,11 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,
 .el-date-editor {
-  width: 97%;
+  width: 100%;
 }
 </style>

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

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

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

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

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

@@ -6,7 +6,7 @@
     <template v-if="DATA.FirstName && DATA.LastName">
       <div class="userInfo">
         <span>{{
-          isEN ? DATA.FirstName + DATA.LastName : DATA.ChineseName
+          isEN ? DATA.LastName + ' / ' + DATA.FirstName : DATA.ChineseName
         }}</span>
         <span>{{ $fd('Sex', DATA.Sex) }}</span>
         <span v-if="isEN">
@@ -34,17 +34,14 @@
           <span v-if="isEN">{{ DATA.Department }}</span>
           <span v-else>{{ DATA.DepartmentCN }}</span>
         </span>
+        <span class="el-icon-first-aid-kit" v-else>
+          <span v-if="isEN">{{ DATA.DepartmentOther }}</span>
+          <span v-else>{{ DATA.DepartmentOtherCN }}</span>
+        </span>
         <span class="el-icon-user" v-if="DATA.Rank || DATA.RankCN">
           <span v-if="isEN">{{ DATA.Rank }}</span>
           <span v-else>{{ DATA.RankCN }}</span>
         </span>
-        <span
-          class="el-icon-medal"
-          v-if="DATA.WorkPartTimeEn || DATA.WorkPartTime"
-        >
-          <span v-if="isEN">{{ DATA.WorkPartTimeEn }}</span>
-          <span v-else>{{ DATA.WorkPartTime }}</span>
-        </span>
       </div>
       <div class="userTel">
         <span class="el-icon-phone-outline">
@@ -55,6 +52,20 @@
           DATA.WeChat
         }}</span>
       </div>
+      <div style="display: flex; font-size: 14px">
+        <span style="display: inline-block; width: 70px; color: #606266">{{
+          $t('curriculumVitae:info:meessage:partTimeJob')
+        }}</span>
+        <span
+          class="break-word"
+          style="
+            white-space: pre-wrap;
+            width: calc(100% - 80px);
+            word-wrap: break-word;
+          "
+          v-html="isEN ? DATA.WorkPartTimeEn : DATA.WorkPartTime"
+        ></span>
+      </div>
     </template>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
@@ -64,7 +75,7 @@
           v-loading="loading"
           :model="form"
           :rules="rules"
-          label-width="80px"
+          label-width="100px"
           size="small"
         >
           <div class="form_title">
@@ -76,7 +87,11 @@
                 :label="$t('curriculumVitae:info:form:surname')"
                 prop="FirstName"
               >
-                <el-input v-model="form.FirstName" clearable></el-input>
+                <el-input
+                  v-model="form.FirstName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -84,17 +99,25 @@
                 :label="$t('curriculumVitae:info:form:name')"
                 prop="LastName"
               >
-                <el-input v-model="form.LastName" clearable></el-input>
+                <el-input
+                  v-model="form.LastName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="12" v-if="!isEN">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:userNameCN')"
                 prop="ChineseName"
               >
-                <el-input v-model="form.ChineseName" clearable></el-input>
+                <el-input
+                  v-model="form.ChineseName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -134,7 +157,11 @@
                 :label="$t('curriculumVitae:info:form:phone')"
                 prop="Phone"
               >
-                <el-input v-model="form.Phone" clearable></el-input>
+                <el-input
+                  v-model="form.Phone"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -152,7 +179,11 @@
                 :label="$t('curriculumVitae:info:form:wechat')"
                 prop="WeChat"
               >
-                <el-input v-model="form.WeChat" clearable></el-input>
+                <el-input
+                  v-model="form.WeChat"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -178,39 +209,70 @@
           </div>
           <el-form-item
             :label="$t('curriculumVitae:info:form:hospital')"
-            prop="HospitalId"
+            prop="HospitalName"
+            v-if="isEN"
           >
-            <el-select
-              v-model="form.HospitalId"
-              filterable
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalName"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
               placeholder=""
-              @change="handleHospitalChange"
-            >
-              <el-option
-                v-for="(item, index) in hospitalList"
-                :key="index"
-                :label="item.HospitalName"
-                :value="item.Id"
-              >
-                <span>
-                  {{ item.HospitalName }}
-                </span>
-              </el-option>
-            </el-select>
+              @change="handleChange"
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:hospital')"
+            prop="HospitalNameCN"
+            v-else
+          >
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalNameCN"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
+              placeholder=""
+              @change="handleChange"
+            ></el-autocomplete>
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:AffiliatedUniversity')"
+            prop="UniversityAffiliated"
+            v-if="isEN"
           >
             <el-input
-              disabled
               v-model="form.UniversityAffiliated"
               type="textarea"
               autosize
               size="small"
+              :maxlength="4000"
             />
           </el-form-item>
-          <el-form-item :label="$t('curriculumVitae:info:form:City')">
-            <el-input disabled v-model="form.City" size="small" />
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:AffiliatedUniversity')"
+            prop="UniversityAffiliated"
+            v-else
+          >
+            <el-input
+              v-model="form.UniversityAffiliatedCN"
+              type="textarea"
+              autosize
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:City')"
+            v-if="isEN"
+          >
+            <el-input v-model="form.City" size="small" />
+          </el-form-item>
+          <el-form-item :label="$t('curriculumVitae:info:form:City')" v-else>
+            <el-input v-model="form.CityCN" size="small" />
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:department')"
@@ -223,11 +285,14 @@
                 :label="item.Value"
                 :value="item.Id"
               />
-              <el-option label="Other" :value="otherId" />
+              <el-option
+                :label="$t('curriculumVitae:selectLabel:Other')"
+                :value="otherId"
+              />
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="form.DepartmentId === otherId"
+            v-if="form.DepartmentId === otherId && isEN"
             class="other-item"
             prop="DepartmentOther"
           >
@@ -237,10 +302,11 @@
                 $t('curriculumVitae:info:form:placeholder:DepartmentOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
-            v-if="form.DepartmentId === otherId"
+            v-if="form.DepartmentId === otherId && !isEN"
             class="other-item"
             prop="DepartmentOtherCN"
           >
@@ -250,6 +316,7 @@
                 $t('curriculumVitae:info:form:placeholder:DepartmentOtherCN')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
@@ -267,8 +334,8 @@
           </el-form-item>
           <el-form-item
             v-if="
-              $fd('Rank', form.RankId, 'id') === '其它' ||
-              $fd('Rank', form.RankId, 'id') === 'Other'
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && isEN
             "
             class="other-item"
             prop="RankOther"
@@ -279,12 +346,13 @@
                 $t('curriculumVitae:info:form:placeholder:RankOther')
               "
               size="small"
+              :maxlength="400"
             />
           </el-form-item>
           <el-form-item
             v-if="
-              $fd('Rank', form.RankId, 'id') === '其它' ||
-              $fd('Rank', form.RankId, 'id') === 'Other'
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && !isEN
             "
             class="other-item"
             prop="RankOtherCN"
@@ -295,11 +363,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 +377,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>
@@ -365,10 +441,14 @@ const defaultForm = () => {
     RankOther: '',
     RankOtherCN: '',
     HospitalId: '',
+    HospitalName: null,
+    HospitalNameCN: null,
     WorkPartTime: null,
     WorkPartTimeEn: null,
     UniversityAffiliated: null,
+    UniversityAffiliatedCN: null,
     City: null,
+    CityCN: null,
   }
 }
 export default {
@@ -398,33 +478,61 @@ export default {
         showClose: true,
         width: '800px',
         title: this.$t('curriculumVitae:info:form:title'),
-        appendToBody: false,
+        appendToBody: true,
+        top: '8vh',
+        bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
       },
       form: defaultForm(),
       rules: {
         FirstName: [
           {
             required: true,
-            message: 'Please enter FirstName',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
             trigger: 'blur',
           },
-          { max: 50, message: 'The maximum length is 50' },
         ],
         LastName: [
-          { required: true, message: 'Please enter LastName', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        ChineseName: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
-        ChineseName: [{ max: 50, message: 'The maximum length is 50' }],
         Sex: [
-          { required: true, message: 'Please select gender', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         TitleIds: [
-          { required: true, message: 'Please select Title', trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         Phone: [
           {
             required: true,
-            message: 'Please enter phone number',
+            message: this.$t('common:ruleMessage:specify'),
             trigger: 'blur',
           },
           { max: 20, min: 7, message: 'The length is 7 to 20' },
@@ -432,51 +540,124 @@ 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' },
-        ],
-        DepartmentOtherCN: [{ max: 50, message: 'The maximum length is 50' }],
-        RankId: [
-          { required: true, message: 'Please select rank', trigger: 'blur' },
-        ],
-        RankOther: [
-          { required: true, message: 'Please select rank', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
-        ],
-        RankOtherCN: [
-          { required: true, message: 'Please select rank', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
-        ],
-        HospitalId: [
           {
             required: true,
-            message: 'Please select hospital',
+            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',
+          },
+        ],
+        RankId: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        RankOther: [
+          {
+            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: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        HospitalName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        HospitalNameCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        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',
           },
         ],
@@ -484,16 +665,72 @@ export default {
       loading: false,
       dictionaryList: {},
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      hospitalSelectList: [],
     }
   },
   computed: {
     ...mapGetters(['hospitalList']),
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          if (this.isEN) {
+            this.hospitalSelectList.push({
+              value: item.HospitalName,
+              ...item,
+            })
+          } else {
+            this.hospitalSelectList.push({
+              value: item.HospitalNameCN,
+              ...item,
+            })
+          }
+        })
+      },
+      deep: true,
+    },
+  },
   mounted() {
     this.getDicData()
     store.dispatch('global/getHospital')
   },
   methods: {
+    handleChange(v) {
+      if (v) return
+      this.form.UniversityAffiliated = null
+      this.form.City = null
+      this.form.UniversityAffiliatedCN = null
+      this.form.CityCN = null
+    },
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (hospitalList) => {
+        if (this.isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     openEdit() {
       this.form = defaultForm()
       Object.keys(this.form).forEach((key) => {
@@ -502,8 +739,6 @@ export default {
         }
       })
       this.model_cfg.visible = true
-      console.log(this.form)
-      console.log(this.DATA)
     },
     handleCancle() {
       this.form = defaultForm()
@@ -516,8 +751,14 @@ export default {
         if (this.reviewerId) {
           this.form.Id = this.reviewerId
         }
+        // console.log(this.form)
+        let data = Object.assign({}, this.form)
+        // if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+        //   data.HospitalName = data.HospitalId
+        //   data.HospitalId = null
+        // }
         this.loading = true
-        let res = await addOrUpdateDoctorBasicInfoAndEmployment(this.form)
+        let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
         this.loading = false
         if (res.IsSuccess) {
           this.$emit('update:reviewerId', res.Result.Id)
@@ -537,11 +778,18 @@ export default {
         })
         .catch(() => {})
     },
-    handleHospitalChange(value) {
-      const item = this.hospitalList.filter((item) => item.Id === value)
-      if (item.length) {
-        this.form.UniversityAffiliated = item[0].UniversityAffiliated
-        this.form.City = item[0].City
+    handleSelect(value) {
+      const item = value
+      if (item) {
+        this.form.UniversityAffiliated = item.UniversityAffiliated
+        this.form.City = item.City
+        this.form.UniversityAffiliatedCN = item.UniversityAffiliatedCN
+        this.form.CityCN = item.CityCN
+      } else {
+        this.form.UniversityAffiliated = null
+        this.form.City = null
+        this.form.UniversityAffiliatedCN = null
+        this.form.CityCN = null
       }
     },
   },

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/views/reviewers/curriculumVitae/index.vue

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

src/views/reviewers/curriculumVitae/preview.vue

@@ -7,8 +7,9 @@
           <span v-if="isAll">
             {{
               isEN
-                ? reviewerData.BasicInfoView.FirstName +
-                  reviewerData.BasicInfoView.LastName
+                ? reviewerData.BasicInfoView.LastName +
+                  ' / ' +
+                  reviewerData.BasicInfoView.FirstName
                 : reviewerData.BasicInfoView.ChineseName
             }}
           </span>
@@ -40,7 +41,7 @@
             }}</span>
             <span v-else>{{ reviewerData.BasicInfoView.HospitalNameCN }}</span>
           </span>
-          <span>
+          <span v-if="isAll">
             <span>
               {{ $t('system:Setting:title:Vacation') }}
               {{ InHoliday }}
@@ -51,22 +52,30 @@
           </span>
         </div>
         <div class="userTitle">
-          <span class="el-icon-first-aid-kit">
+          <span
+            class="el-icon-first-aid-kit"
+            v-if="
+              reviewerData.EmploymentView.Department ||
+              reviewerData.EmploymentView.DepartmentCN
+            "
+          >
             <span v-if="isEN">{{
               reviewerData.EmploymentView.Department
             }}</span>
             <span v-else>{{ reviewerData.EmploymentView.DepartmentCN }}</span>
           </span>
+          <span class="el-icon-first-aid-kit" v-else>
+            <span v-if="isEN">{{
+              reviewerData.EmploymentView.DepartmentOther
+            }}</span>
+            <span v-else>{{
+              reviewerData.EmploymentView.DepartmentOtherCN
+            }}</span>
+          </span>
           <span class="el-icon-user"
             ><span v-if="isEN">{{ reviewerData.EmploymentView.Rank }}</span>
             <span v-else>{{ reviewerData.EmploymentView.RankCN }}</span></span
           >
-          <span class="el-icon-medal" v-if="isAll">
-            <span v-if="isEN">{{
-              reviewerData.EmploymentView.WorkPartTimeEn
-            }}</span>
-            <span v-else>{{ reviewerData.EmploymentView.WorkPartTime }}</span>
-          </span>
         </div>
         <div class="userTel" v-if="isAll">
           <span class="el-icon-phone-outline">{{
@@ -79,22 +88,34 @@
             reviewerData.BasicInfoView.WeChat
           }}</span>
         </div>
+        <div style="display: flex; font-size: 14px" v-if="isAll">
+          <span style="display: inline-block; width: 70px; color: #606266">{{
+            $t('curriculumVitae:info:meessage:partTimeJob')
+          }}</span>
+          <span
+            class="break-word"
+            style="
+              white-space: pre-wrap;
+              width: calc(100% - 80px);
+              word-wrap: break-word;
+            "
+            v-html="
+              isEN
+                ? reviewerData.EmploymentView.WorkPartTimeEn
+                : reviewerData.EmploymentView.WorkPartTime
+            "
+          ></span>
+        </div>
       </div>
-      <div
-        class="message"
-        v-if="
-          reviewerData.SummarizeInfo.SummarizeEn ||
-          reviewerData.SummarizeInfo.Summarize
-        "
-      >
+      <div class="message break-word">
         <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>
-        <span class="text">
-          {{
-            isEN
-              ? reviewerData.SummarizeInfo.SummarizeEn
-              : reviewerData.SummarizeInfo.Summarize
-          }}
-        </span>
+        <span
+          class=""
+          style="white-space: pre-wrap"
+          v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
+          v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
+        ></span>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       </div>
       <div class="message" v-if="isAll">
         <el-form class="demo-form-inline">
@@ -217,7 +238,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 +309,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 +323,50 @@
         </div>
         <div class="content">
           <el-form class="demo-form-inline">
-            <el-form-item
+            <!-- <el-form-item
               :label="$t('curriculumVitae:scientificResearchProject:direction')"
             >
-              <span v-if="isEN">{{
+              <span v-if="isEN" class="break-word">{{
                 reviewerData.ResearchPublicationView.Research
               }}</span>
-              <span v-else>{{
+              <span v-else class="break-word">{{
                 reviewerData.ResearchPublicationView.ResearchCN
               }}</span>
-            </el-form-item>
-            <el-form-item
-              :label="$t('curriculumVitae:scientificResearchProject:subject')"
-            >
-              <span v-if="isEN">{{
-                reviewerData.ResearchPublicationView.Grants
-              }}</span>
-              <span v-else>{{
-                reviewerData.ResearchPublicationView.GrantsCN
-              }}</span>
-            </el-form-item>
+            </el-form-item> -->
+            <div style="display: flex; font-size: 14px">
+              <span
+                style="display: inline-block; width: 80px; color: #606266"
+                >{{
+                  $t('curriculumVitae:scientificResearchProject:direction')
+                }}</span
+              >
+              <span
+                class="break-word"
+                style="white-space: pre-wrap; width: calc(100% - 80px)"
+                v-html="
+                  isEN
+                    ? reviewerData.ResearchPublicationView.Research
+                    : reviewerData.ResearchPublicationView.ResearchCN
+                "
+              ></span>
+            </div>
+            <div style="display: flex; font-size: 14px">
+              <span
+                style="display: inline-block; width: 80px; color: #606266"
+                >{{
+                  $t('curriculumVitae:scientificResearchProject:subject')
+                }}</span
+              >
+              <span
+                class="break-word"
+                style="white-space: pre-wrap; width: calc(100% - 80px)"
+                v-html="
+                  isEN
+                    ? reviewerData.ResearchPublicationView.Grants
+                    : reviewerData.ResearchPublicationView.GrantsCN
+                "
+              ></span>
+            </div>
           </el-form>
         </div>
       </div>
@@ -398,46 +443,44 @@
           </el-table-column>
         </el-table>
         <!--GCP证书-->
-        <div class="title">
-          {{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}
-        </div>
-        <el-table
-          :data="GCPData"
-          style="width: 100%"
-          :header-cell-style="{ background: '#eee', color: '#606266' }"
-        >
-          <el-table-column
-            prop="GCP"
-            :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
-            v-if="true"
+        <template v-if="isAll">
+          <div class="title">
+            {{ $t('curriculumVitae:clinicalTrials:GCPtitle') }}
+          </div>
+          <el-table
+            :data="GCPData"
+            style="width: 100%"
+            :header-cell-style="{ background: '#eee', color: '#606266' }"
           >
-            <template slot-scope="scope">
-              <span>{{ $fd('hasOrNo', scope.row.GCP) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="GCPTime"
-            :label="$t('curriculumVitae:clinicalTrials:table:certificateTime')"
-            v-if="true"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="GCPAgencies"
-            v-if="true"
-            :label="
-              $t('curriculumVitae:clinicalTrials:table:certificateHospital')
-            "
-          >
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              prop="GCP"
+              :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
+              v-if="true"
+            >
+              <template slot-scope="scope">
+                <span>{{ $fd('hasOrNo', scope.row.GCP) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="GCPTime"
+              :label="
+                $t('curriculumVitae:clinicalTrials:table:certificateTime')
+              "
+              v-if="true"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="GCPAgencies"
+              v-if="true"
+              :label="
+                $t('curriculumVitae:clinicalTrials:table:certificateHospital')
+              "
+            >
+            </el-table-column>
+          </el-table>
+        </template>
         <!--其他相关经历-->
-        <div
-          class="title"
-          v-if="
-            reviewerData.TrialExperienceView.OtherClinicalExperience ||
-            reviewerData.TrialExperienceView.OtherClinicalExperienceCN
-          "
-        >
+        <div class="title">
           {{ $t('curriculumVitae:clinicalTrials:otherTitle') }}
         </div>
         <template
@@ -446,44 +489,58 @@
             reviewerData.TrialExperienceView.OtherClinicalExperienceCN
           "
         >
-          <div class="message">
-            {{
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="
               isEN
                 ? reviewerData.TrialExperienceView.OtherClinicalExperience
                 : reviewerData.TrialExperienceView.OtherClinicalExperienceCN
-            }}
-          </div>
+            "
+          ></div>
         </template>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       </div>
-      <div
-        class="message"
-        v-if="reviewerData.ResearchPublicationView.Publications"
-      >
-        <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
-        <div
-          class="message"
-          style="white-space: pre-wrap"
-          v-if="reviewerData.ResearchPublicationView.Publications"
-        >
-          {{ reviewerData.ResearchPublicationView.Publications }}
+      <template v-if="isAll">
+        <div class="message">
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="reviewerData.ResearchPublicationView.Publications"
+            v-if="reviewerData.ResearchPublicationView.Publications"
+          ></div>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
-      </div>
-      <div
-        class="message"
-        v-if="
-          (reviewerData.ResearchPublicationView.AwardsHonors ||
-            reviewerData.ResearchPublicationView.AwardsHonorsCN) &&
-          isAll
-        "
-      >
+      </template>
+      <template v-else>
+        <div class="message">
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="reviewerData.BasicInfoView.BlindPublications"
+            v-if="reviewerData.BasicInfoView.BlindPublications"
+          ></div>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+        </div>
+      </template>
+      <div class="message break-word" v-if="isAll">
         <div class="title">{{ $t('curriculumVitae:other:AH') }}</div>
-        <div class="content">
-          <span v-if="isEN">{{
-            reviewerData.ResearchPublicationView.AwardsHonors
-          }}</span>
-          <span v-else>{{
-            reviewerData.ResearchPublicationView.AwardsHonorsCN
-          }}</span>
+        <div class="message">
+          <span
+            style="white-space: pre-wrap"
+            v-html="
+              isEN
+                ? reviewerData.ResearchPublicationView.AwardsHonors
+                : reviewerData.ResearchPublicationView.AwardsHonorsCN
+            "
+            v-if="
+              reviewerData.ResearchPublicationView.AwardsHonors ||
+              reviewerData.ResearchPublicationView.AwardsHonorsCN
+            "
+          ></span>
+          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
       </div>
       <div class="message" v-if="isAll">
@@ -765,6 +822,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) ||
@@ -942,7 +1015,7 @@ export default {
       }
     },
     preview(row) {
-      let path = row.FullPath || row.FilePath
+      let path = row.Path || row.FullPath || row.FilePath
       this.$preview({
         path: path,
         type: 'pdf',
@@ -959,18 +1032,22 @@ export default {
 .curriculumVitaePreview {
   display: flex;
   padding: 0 100px;
+  justify-content: space-between;
   .title {
     font-size: 18px;
     border: none;
     background-color: transparent;
+    font-weight: bold;
   }
   .message {
     padding: 20px 0;
     border-bottom: 1px solid #eee;
+    word-wrap: break-word;
     .title {
       font-size: 14px;
       line-height: 30px;
       margin-bottom: 10px;
+      font-weight: bold;
     }
     .text {
       color: #909399;
@@ -1027,7 +1104,7 @@ export default {
   width: 100%;
 }
 .allInfo {
-  flex: 1;
+  width: calc(100% - 300px);
 }
 .file {
   width: 300px;
@@ -1036,6 +1113,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -1045,6 +1123,7 @@ export default {
   }
   ::v-deep .file_title {
     line-height: 40px;
+    font-weight: bold;
   }
   ::v-deep .btnBox {
     display: flex;
@@ -1070,4 +1149,14 @@ export default {
     }
   }
 }
+break-word {
+  display: inline-block;
+  width: 100%;
+  word-wrap: break-word;
+}
+.noData {
+  color: #909399;
+  text-align: center;
+  font-size: 14px;
+}
 </style>

src/views/reviewers/index.vue

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

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

@@ -179,6 +179,7 @@ export default {
   methods: {
     openDialog(title, data, options = [], status) {
       this.PublishVersionList = options;
+      this.loading = false
       this.status = status;
       this.model_cfg.visible = true;
       this.model_cfg.title = title;

src/views/system/i18n/index.vue

@@ -154,6 +154,15 @@
           >
             批量更新
           </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-edit-outline"
+            size="mini"
+            :disabled="selectTableList.length <= 0"
+            @click="handleBatchUpdateToChange"
+          >
+            批量编辑
+          </el-button>
           <el-button
             size="mini"
             type="primary"
@@ -380,6 +389,9 @@ export default {
   mounted() {
     this.getList()
     this.getPublishVersionSelect()
+    this.$EventBus.$on('il8nUpdate', (data) => {
+      this.getList()
+    })
   },
   methods: {
     // 获取迭代
@@ -416,6 +428,10 @@ export default {
         )
       })
     },
+    // 批量编辑国际化内容
+    handleBatchUpdateToChange() {
+      this.$openI18n(this.selectTableList)
+    },
     async batch(row) {
       let { PublishLogId, State } = row
       let data = {

src/views/system/log/components/LogForm.vue

@@ -12,7 +12,7 @@
         <el-form-item :label="$t('system:log:form:version')" prop="Version">
           <el-input v-model="form.Version" />
         </el-form-item>
-        <el-form-item :label="$t('system:log:form:versionUS')" prop="Version">
+        <el-form-item :label="$t('system:log:form:versionUS')" prop="Version_US">
           <el-input v-model="form.Version_US" />
         </el-form-item>
         <el-form-item
@@ -100,6 +100,9 @@ export default {
           },
           { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
         ],
+        Version_US:[
+        { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }
+        ],
         // PublishTime: [
         //   { required: true, message: '请注明', trigger: 'blur' }
         // ],

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

@@ -0,0 +1,107 @@
+<template>
+  <base-model v-if="config.visible" :config="config">
+    <template slot="dialog-body">
+      <el-table :data="curData" border style="width: 100%" size="small">
+        <el-table-column
+          prop="key"
+          :label="$t('system:loginLog:table:cfgItem')"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="value"
+          :label="$t('system:loginLog:table:cfgVal')"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.prop !== 'UserRoleList'">{{
+              scope.row.value
+            }}</span>
+            <template v-else>
+              <div
+                v-for="item in scope.row.value"
+                :key="item.UserTypeEnum"
+                style="margin: 0"
+              >
+                {{ item.UserTypeShortName
+                }}{{ $t('system:loginLog:form:symbol')
+                }}{{ $fd('IsEnable', !item.IsUserRoleDisabled) }}
+              </div>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <template slot="dialog-footer">
+      <el-button type="primary" @click="config.visible = false">
+        {{ $t('common:button:confirm') }}
+      </el-button>
+    </template>
+  </base-model>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  components: { BaseModel },
+  props: {
+    JsonObj: {
+      type: String,
+      default: '',
+    },
+    config: {
+      type: Object,
+      default: () => {
+        return {
+          visible: false,
+          title: this.$t('system:loginLog:dialog:title'),
+          width: '500px',
+          top: '10vh',
+          appendToBody: true,
+          bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      curKeys: [
+        'UserName',
+        'FirstName',
+        'LastName',
+        'EMail',
+        'Phone',
+        'OrganizationName',
+        'PositionName',
+        'DepartmentName',
+        'UserRoleList',
+      ],
+    }
+  },
+  computed: {
+    curDataArr() {
+      if (!this.curData) return []
+      return Object.keys(this.curData)
+    },
+    curData() {
+      if (!this.JsonObj) return []
+      let obj = JSON.parse(this.JsonObj)
+      let curData = []
+      Object.keys(obj).forEach((key) => {
+        if (this.curKeys.includes(key)) {
+          let o = {
+            key: this.$t(`system:loginLog:form:${key}`),
+            value: obj[key],
+            prop: key,
+          }
+          curData.push(o)
+        }
+      })
+      return curData
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-form-item__label {
+  font-weight: bold;
+}
+</style>

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

@@ -50,7 +50,7 @@
           />
         </el-form-item>
         <el-form-item
-          :label=" $t('system:loginLog:table:LoginUserType')"
+          :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
         >
           <el-select
@@ -77,19 +77,15 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            @click="getList"
-          >
-            {{ $t("common:button:search") }}
+          <el-button type="primary" icon="el-icon-search" @click="getList">
+            {{ $t('common:button:search') }}
           </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -101,7 +97,32 @@
         class="table"
         @sort-change="handleSortByColumn"
       >
-        <el-table-column type="index" width="50" />
+        <el-table-column type="index" width="50">
+          <template slot-scope="scope">
+            <span
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+              "
+            >
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('system:loginLog:label:IsLoginUncommonly')"
+                placement="top"
+                style="margin-right: 3px"
+                v-if="scope.row.IsLoginUncommonly"
+              >
+                <i
+                  v-if="scope.row.IsLoginUncommonly"
+                  class="el-icon-warning icon-i"
+                ></i>
+              </el-tooltip>
+              <span>{{ scope.$index + 1 }}</span>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('system:loginLog:table:OptType')"
           prop="OptType"
@@ -110,7 +131,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd("UserOptType", scope.row.OptType) }}
+            {{ $fd('UserOptType', scope.row.OptType) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -127,21 +148,28 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
           min-width="180"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginUserName')"
-          prop="LoginUserName"
+          prop="ActionUserName"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
+          :label="$t('system:loginLog:table:Aetionlserlype')"
+          prop="ActionUserType"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
           min-width="120"
@@ -151,15 +179,15 @@
           <template slot-scope="scope">
             {{ $fd("UserType", scope.row.LoginUserTypeEnum) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           :label="$t('system:loginLog:table:OptUserName')"
-          prop="OptUserName"
+          prop="TargetIdentityUserName"
           min-width="200"
           sortable="custom"
           show-overflow-tooltip
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:OptUserType')"
           prop="OptUserTypeEnum"
           min-width="200"
@@ -169,6 +197,21 @@
           <template slot-scope="scope">
             {{ $fd("UserType", scope.row.OptUserTypeEnum) }}
           </template>
+        </el-table-column> -->
+        <el-table-column
+          :label="$t('system:loginLog:table:detail')"
+          min-width="120"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.JsonObj"
+              type="text"
+              @click="handleOpenDialog(scope.row)"
+            >
+              <span>{{ $t('system:loginLog:message:detail') }}</span>
+            </el-button>
+          </template>
         </el-table-column>
         <el-table-column
           :label="$t('system:loginLog:table:CreateTime')"
@@ -187,29 +230,31 @@
         />
       </div>
     </div>
+    <detail :config="config" :JsonObj="JsonObj" />
   </div>
 </template>
 <script>
-import { getUserLogList } from "@/api/user";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
+import { getUserLogList } from '@/api/user'
+import Pagination from '@/components/Pagination'
+import detail from './detail.vue'
+import moment from 'moment'
 const searchDataDefault = () => {
   return {
     OptType: null,
-    Ip: "",
-    LoginFaildName: "",
+    Ip: '',
+    LoginFaildName: '',
     LoginUserName: '',
     LoginUserTypeEnum: null,
-    BeginDate: "",
-    EndDate: "",
+    BeginDate: '',
+    EndDate: '',
     Asc: false,
-    SortField: "CreateTime",
+    SortField: 'CreateTime',
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  components: { Pagination },
+  components: { Pagination, detail },
   data() {
     return {
       moment,
@@ -218,52 +263,69 @@ export default {
       total: 0,
       loading: false,
       datetimerange: [],
-    };
+      config: {
+        visible: false,
+        title: this.$t('system:loginLog:dialog:title'),
+        width: '500px',
+        top: '10vh',
+      },
+      JsonObj: null,
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
+    handleOpenDialog(row) {
+      if (!row.JsonObj)
+        return this.$message.warning(this.$t('system:loginLog:message:noJSON'))
+      this.config.title = this.$t('system:loginLog:dialog:title').replace(
+        'xxx',
+        this.$fd('UserOptType', row.OptType)
+      )
+      this.JsonObj = row.JsonObj
+      this.config.visible = true
+    },
     getList() {
-      this.loading = true;
+      this.loading = true
       getUserLogList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.BeginDate = val[0];
-        this.searchData.EndDate = val[1];
+        this.searchData.BeginDate = val[0]
+        this.searchData.EndDate = val[1]
       } else {
-        this.searchData.BeginDate = "";
-        this.searchData.EndDate = "";
+        this.searchData.BeginDate = ''
+        this.searchData.EndDate = ''
       }
     },
     // 重置列表查询
     handleReset() {
       this.datetimerange = []
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .log {
@@ -291,5 +353,9 @@ export default {
       text-align: right;
     }
   }
+  .icon-i {
+    color: #f56c6c;
+    cursor: pointer;
+  }
 }
 </style>

src/views/system/user/components/UserInfo.vue

@@ -5,24 +5,38 @@
     :model="user"
     :rules="userFormRules"
     label-width="150px"
-    style="width:800px;"
+    style="width: 800px"
   >
     <el-card class="Basic" shadow="never" size="small">
       <div slot="header" class="clearfix">
         <span>{{ $t('system:userlist:title:Information') }}</span>
       </div>
-      <el-form-item  v-if="user.UserCode" :label="$t('system:userlist:table:S/N')" prop="UserCode">
+      <el-form-item
+        v-if="user.UserCode"
+        :label="$t('system:userlist:table:S/N')"
+        prop="UserCode"
+      >
         <el-input v-model="user.UserCode" disabled />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:UserName')" class="my_new_pwd" prop="UserName">
+      <el-form-item
+        :label="$t('system:userlist:table:UserName')"
+        class="my_new_pwd"
+        prop="UserName"
+      >
         <el-input v-model="user.UserName" />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:LastName')" prop="LastName">
+      <el-form-item
+        :label="$t('system:userlist:table:LastName')"
+        prop="LastName"
+      >
         <el-input v-model="user.LastName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
+      <el-form-item
+        :label="$t('system:userlist:table:FirstName')"
+        prop="FirstName"
+      >
         <el-input v-model="user.FirstName" />
       </el-form-item>
       <!-- <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
@@ -32,49 +46,134 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item :label="$t('system:userlist:table:Email')" prop="EMail">
-        <el-input v-model="user.EMail" />
+        <el-input v-model="user.EMail" :disabled="!!user.UserCode" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:Phone')" prop="Phone">
         <el-input v-model="user.Phone" />
       </el-form-item>
-      <el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')">
-        <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
+      <el-form-item
+        v-if="type == 1"
+        :label="$t('system:userlist:table:Disable')"
+      >
+        <el-switch
+          v-model="user.Status"
+          :active-value="1"
+          :inactive-value="0"
+        />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
         <el-radio-group v-model="user.IsTestUser">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="item.id"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">
-        <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
-          <el-option
-            v-for="(userType,key) of userTypeOptions"
-            v-if="userType.UserTypeEnum !== 20"
-            :key="key"
-            :label="userType.UserType"
-            :value="userType.Id"
-          />
-        </el-select>
+      <el-form-item
+        :label="$t('system:userlist:table:UserType')"
+        prop="Roles"
+        v-if="type === 0"
+      >
+        <div style="display: flex; align-items: center">
+          <el-select
+            ref="userType"
+            v-model="user.Roles"
+            size="small"
+            placeholder="Please select"
+            multiple
+            style="width: 100%"
+            :disabled="user.CanEditUserType === false || type === 1"
+            @change="handleChange"
+          >
+            <template v-for="userType of userTypeOptions">
+              <el-option
+                v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
+                :key="userType.Id"
+                :label="userType.UserType"
+                :value="userType.Id"
+              />
+            </template>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item
+        :label="$t('system:userlist:table:UserType')"
+        prop="userTypeId"
+        v-else
+      >
+        <div style="display: flex; align-items: center">
+          <el-select
+            ref="userType"
+            v-model="Roles"
+            size="small"
+            placeholder="Please select"
+            multiple
+            style="width: 100%"
+            :disabled="user.CanEditUserType === false || type === 1"
+            @change="handleChange"
+          >
+            <template v-for="userType of userTypeOptions">
+              <el-option
+                v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
+                :key="userType.Id"
+                :label="userType.UserType"
+                :value="userType.Id"
+              />
+            </template>
+          </el-select>
+          <el-button
+            type="primary"
+            size="small"
+            style="margin-left: 5px"
+            v-if="type === 1"
+            @click.stop="openRoleList"
+          >
+            {{ $t('system:userlist:button:roles') }}
+          </el-button>
+        </div>
       </el-form-item>
     </el-card>
 
-    <el-card class="Affiliation" shadow="never" style="margin-top:10px;" size="small">
+    <el-card
+      class="Affiliation"
+      shadow="never"
+      style="margin-top: 10px"
+      size="small"
+    >
       <div slot="header" class="clearfix">
         <span>{{ $t('system:userlist:title:Affiliation') }}</span>
       </div>
       <el-form-item prop="IsZhiZhun">
-        <el-radio-group v-model="user.IsZhiZhun" @change="OrgnizationTypeChanged">
-          <el-radio :label="true">{{ $t('system:userlist:title:Internal') }}</el-radio>
-          <el-radio :label="false">{{ $t('system:userlist:title:External') }}</el-radio>
+        <el-radio-group
+          v-model="user.IsZhiZhun"
+          @change="OrgnizationTypeChanged"
+        >
+          <el-radio :label="true">{{
+            $t('system:userlist:title:Internal')
+          }}</el-radio>
+          <el-radio :label="false">{{
+            $t('system:userlist:title:External')
+          }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="user.IsZhiZhun === false" :label="$t('system:userlist:table:OrganizationName')">
+      <el-form-item
+        v-show="user.IsZhiZhun === false"
+        :label="$t('system:userlist:table:OrganizationName')"
+      >
         <el-input v-model="user.OrganizationName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Department')" prop="DepartmentName">
+      <el-form-item
+        :label="$t('system:userlist:table:Department')"
+        prop="DepartmentName"
+      >
         <el-input v-model="user.DepartmentName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Position')" prop="PositionName">
+      <el-form-item
+        :label="$t('system:userlist:table:Position')"
+        prop="PositionName"
+      >
         <el-input v-model="user.PositionName" />
       </el-form-item>
     </el-card>
@@ -83,20 +182,35 @@
         type="primary"
         size="small"
         :disabled="isDisabled"
-        style="margin:10px 15px"
+        style="margin: 10px 15px"
         @click="handleSave"
-      >Save</el-button>
+        >Save</el-button
+      >
     </el-form-item>
-
+    <roleList
+      v-if="visible"
+      :visible.sync="visible"
+      :userId="userId"
+      :list="userRoleList"
+      :userTypeOptions="userTypeOptions"
+      @getRoleList="getRoleList"
+    />
   </el-form>
 </template>
 <script>
-import { getUser, addUser, updateUser, getUserTypeListByUserType } from '@/api/admin.js'
+import {
+  getUser,
+  addUser,
+  updateUser,
+  getUserTypeListByUserType,
+} from '@/api/admin.js'
+import roleList from './roleList.vue'
 export default {
   name: 'UserInfo',
   props: {
-    userId: { type: String, default: '' }
+    userId: { type: String, default: '' },
   },
+  components: { roleList },
   created() {
     this.getUserTypeList()
     if (this.userId !== '') {
@@ -107,26 +221,46 @@ export default {
     }
   },
   methods: {
-    updateQueryParam(param, newValue,wurl) {
+    openRoleList() {
+      this.userRoleList = []
+      this.user.UserRoleList.forEach((item) => {
+        this.userRoleList.push(Object.assign({}, item))
+      })
+      this.visible = true
+    },
+    handleChange(val) {
+      this.user.UserRoleList = []
+      val.forEach((item) => {
+        let data = this.userTypeOptions.find((d) => d.Id === item)
+        this.user.UserRoleList.push({
+          UserTypeEnum: data.UserTypeEnum,
+          UserTypeId: data.Id,
+          IsUserRoleDisabled: false,
+        })
+      })
+    },
+    updateQueryParam(param, newValue, wurl) {
       // 获取当前URL
-      let url = wurl || window.location.href;
+      let url = wurl || window.location.href
 
       // 正则表达式匹配参数
-      let regex = new RegExp('([?&])' + param + '=.*?(&|$)');
-      let separator = url.indexOf('?') !== -1 ? '&' : '?';
+      let regex = new RegExp('([?&])' + param + '=.*?(&|$)')
+      let separator = url.indexOf('?') !== -1 ? '&' : '?'
 
       // 如果参数存在，替换它，如果不存在，添加它
       if (regex.test(url)) {
-        return url.replace(regex, '$1' + param + '=' + newValue + '$2');
+        return url.replace(regex, '$1' + param + '=' + newValue + '$2')
       } else {
-        return url + separator + param + '=' + newValue;
+        return url + separator + param + '=' + newValue
       }
     },
     handleSave() {
-      this.$refs.userForm.validate(valid => {
+      this.$refs.userForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
-          const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId)
+          const selectedUserType = this.userTypeOptions.filter(
+            (item) => item.Id === this.user.UserTypeId
+          )
           let newUrl = this.updateQueryParam('userName', this.user.UserName)
           newUrl = this.updateQueryParam('email', this.user.EMail, newUrl)
           window.history.pushState({ path: newUrl }, '', newUrl)
@@ -136,53 +270,117 @@ export default {
           this.user.BaseUrl = `${location.protocol}//${location.host}/login`
           this.user.RouteUrl = `${location.protocol}//${location.host}/email-recompose`
           if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success('Updated successfully')
-            }).catch(() => { this.isDisabled = false })
+            updateUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.$message.success('Updated successfully')
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           } else {
-            addUser(this.user).then(res => {
-              this.isDisabled = false
-              this.user.Id = res.Result.Id
-              this.user.UserCode = res.Result.UserCode
-              this.$emit('getUserId', res.Result.Id)
-              this.$message.success('Added successfully')
-              this.$router.push({ path: '/system/user/list' })
-            }).catch(() => { this.isDisabled = false })
+            addUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.user.Id = res.Result.Id
+                this.user.UserCode = res.Result.UserCode
+                this.$emit('getUserId', res.Result.Id)
+                this.$message.success('Added successfully')
+                this.$router.push({ path: '/system/user/list' })
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           }
         }
       })
     },
     getUserTypeList() {
-      getUserTypeListByUserType(0).then(res => {
+      getUserTypeListByUserType(0).then((res) => {
         if (res.IsSuccess) {
-          this.userTypeOptions = res.Result
+          this.userTypeOptions = []
+          res.Result.forEach((item) => {
+            if (item.UserTypeEnum !== 21) {
+              this.userTypeOptions.push(item)
+            }
+          })
         }
       })
     },
     getUserInfo() {
-      getUser(this.userId).then(res => {
+      getUser({
+        IdentityUserId: this.userId,
+      }).then((res) => {
         this.user = res.Result
+        this.Roles = []
+        this.user.Roles = []
+        this.user.UserRoleList = []
+        res.Result.AccountList.forEach((item) => {
+          if (!item.IsUserRoleDisabled) {
+            this.Roles.push(item.UserTypeId)
+            this.user.Roles.push(item.UserTypeId)
+          }
+          this.user.UserRoleList.push({
+            UserTypeEnum: item.UserTypeEnum,
+            UserTypeId: item.UserTypeId,
+            IsUserRoleDisabled: item.IsUserRoleDisabled,
+            UserTypeShortName: item.UserTypeShortName,
+          })
+        })
+      })
+    },
+    getRoleList() {
+      getUser({
+        IdentityUserId: this.userId,
+      }).then((res) => {
+        this.Roles = []
+        this.user.Roles = []
+        this.user.UserRoleList = []
+        res.Result.AccountList.forEach((item) => {
+          if (!item.IsUserRoleDisabled) {
+            this.Roles.push(item.UserTypeId)
+            this.user.Roles.push(item.UserTypeId)
+          }
+          this.user.UserRoleList.push({
+            UserTypeEnum: item.UserTypeEnum,
+            UserTypeId: item.UserTypeId,
+            IsUserRoleDisabled: item.IsUserRoleDisabled,
+            UserTypeShortName: item.UserTypeShortName,
+          })
+        })
       })
     },
     OrgnizationTypeChanged(val) {
       this.user.OrganizationName = ''
-    }
+    },
   },
   data() {
     var validatePassword = (rule, value, callback) => {
-      var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
+      var lang = zzSessionStorage.getItem('lang')
+        ? zzSessionStorage.getItem('lang')
+        : 'zh'
       /* eslint-disable */
-      var reg1 = /^[a-zA-Z0-9_]{4,16}$/; //密码必须是8位以上、必须含有字母、数字、特殊符号
-      console.log(!reg1.test(value))
+      var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
       if (!reg1.test(value)) {
-        callback(lang==='zh' ? new Error("1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；") : new Error('For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'))
+        callback(
+          lang === 'zh'
+            ? new Error(
+                '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+              )
+            : new Error(
+                'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+              )
+        )
       } else {
-        callback();
+        callback()
       }
     }
     return {
+      userRoleList: [],
+      Roles: [],
       user: {
+        Roles: [],
+        UserRoleList: [],
         UserName: '',
         LastName: '',
         FirstName: '',
@@ -194,65 +392,75 @@ export default {
         OrganizationName: '',
         DepartmentName: '',
         PositionName: '',
-        IsTestUser: false
+        IsTestUser: false,
       },
+      visible: false,
       userFormRules: {
         UserName: [
-          { required: true, validator: validatePassword, trigger: 'blur' }
+          { required: true, validator: validatePassword, trigger: 'blur' },
         ],
-        UserTypeId: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+        Roles: [
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         IsZhiZhun: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         OrganizationName: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
         LastName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         FirstName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         Phone: [
-          { max: 20, min: 7, message: 'The length is 7 to 20', trigger: ['blur'] }
+          {
+            max: 20,
+            min: 7,
+            message: 'The length is 7 to 20',
+            trigger: ['blur'],
+          },
         ],
         EMail: [
           {
             required: true,
             message: 'Please input the email address',
-            trigger: 'blur'
+            trigger: 'blur',
           },
           {
             type: 'email',
             message: 'Please input the correct email address',
-            trigger: ['blur']
+            trigger: ['blur'],
           },
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        Sex: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
+        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
         Status: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
-        DepartmentName: [
-          { max: 50, message: 'The maximum length is 50' }],
-        PositionName: [{ max: 50, message: 'The maximum length is 50' }
-        ]
+        DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
+        PositionName: [{ max: 50, message: 'The maximum length is 50' }],
       },
       userTypeOptions: [],
       isDisabled: false,
-      type: 0 // 1为编辑，0为新增
+      type: 0, // 1为编辑，0为新增
     }
-  }
+  },
 }
 </script>
 <style scoped>
-/deep/ .is-error.my_new_pwd{
+::v-deep .is-error.my_new_pwd {
   margin-bottom: 40px;
 }
 </style>