国际化修改

README-zh.md

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

public/error.html

@@ -23,8 +23,8 @@
               <img src="./error_assets/zzlogo2.png" alt="">
               <img v-show="false" src="./error_assets/zzlogo3.png" alt="">
             </div>
-            <div class="login-image">
-              <img src="./error_assets/login-bg.png">
+            <div class="login-image login-image-usa">
+              <img src="./error_assets/login-bg.svg" style="max-width: 500px;max-height: 300px;">
             </div>
           </div>
           <div class="login-r">
@@ -148,7 +148,7 @@
     left: 50%;
     top: 50%;
     transform: translate(-50%,-50%);
-    width: 1200px;
+    width: 1100px;
     height: 600px;
     box-sizing: border-box;
     background: rgb(255, 255, 255);
@@ -179,7 +179,12 @@
   .login-container .login-body .login-l .login-image img{
     height: 100%;
   }
-
+  .login-container .login-body .login-l .login-image-usa {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+  }
   .login-container .login-body .login-r{
     position: relative;
     float: left;

public/errorEN.html

@@ -23,8 +23,8 @@
           <img src="./error_assets/zzlogo3.png" alt="">
           <img v-show="false" src="./error_assets/zzlogo3.png" alt="">
         </div>
-        <div class="login-image">
-          <img src="./error_assets/login-bg.png">
+        <div class="login-image login-image-usa">
+          <img src="./error_assets/login-bg.svg" style="max-width: 500px;max-height: 300px;">
         </div>
       </div>
       <div class="login-r">
@@ -104,7 +104,7 @@
     left: 50%;
     top: 50%;
     transform: translate(-50%,-50%);
-    width: 1200px;
+    width: 1100px;
     height: 600px;
     box-sizing: border-box;
     background: rgb(255, 255, 255);
@@ -135,7 +135,12 @@
   .login-container .login-body .login-l .login-image img{
     height: 100%;
   }
-
+  .login-container .login-body .login-l .login-image-usa {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+  }
   .login-container .login-body .login-r{
     position: relative;
     float: left;

public/index.html

@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta http-equiv="pragram" content="no-cache">
+    <meta name="autocomplete" content="off">
     <meta http-equiv="Expires" content="0">
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
@@ -29,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
@@ -37,7 +63,12 @@
         height="100"
         style="width: 100%"
       >
-        <el-table-column prop="Code" label="标签" width="300" show-overflow-tooltip>
+        <el-table-column
+          prop="Code"
+          :label="$t('il8n:table:label')"
+          width="300"
+          show-overflow-tooltip
+        >
         </el-table-column>
         <!--        <el-table-column-->
         <!--          prop="Description"-->
@@ -48,32 +79,53 @@
         <!--            {{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"
               @input="
                 (e) => {
-                  $set(scope.row, 'Value', e);
+                  $set(scope.row, 'Value', e)
                 }
               "
               size="mini"
             ></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"
               @input="
                 (e) => {
-                  $set(scope.row, 'ValueCN', e);
+                  $set(scope.row, 'ValueCN', e)
                 }
               "
               size="mini"
             ></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>
@@ -90,13 +142,13 @@
 import {
   batchAddOrUpdateFrontInternationalization,
   getFrontInternationalizationList,
-} from "@/api/dictionary/dictionary";
-import { getTrialExtralConfig } from "@/api/trials";
-import feedBack from "@/views/trials/trials-layout/components/feedBack";
-import Vue from "vue";
-import i18n from "./lang";
+} from '@/api/dictionary/dictionary'
+import { getTrialExtralConfig } from '@/api/trials'
+import feedBack from '@/views/trials/trials-layout/components/feedBack'
+import Vue from 'vue'
+import i18n from './lang'
 export default {
-  name: "App",
+  name: 'App',
   components: { feedBack },
   data() {
     return {
@@ -105,38 +157,51 @@ export default {
       show: false,
       key: null,
       arr: [],
-    };
+      il8nExternal: false,
+      State: null,
+    }
   },
   mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === "/test/dist";
-  },
-  watch: {
-    "$route.query": {
-      async handler() {
-        if (
-          this.$route.query.trialId &&
-          this.$route.query.trialId !==
-            this.$store.state.trials.config.trialId &&
-          this.$store.state.trials.whiteList.indexOf(this.$route.path) === -1
-        ) {
-          let res = await getTrialExtralConfig({
-            TrialId: this.$route.query.trialId,
-          });
-          if (res.IsSuccess) {
-            this.$store.dispatch("trials/setConfig", {
-              trialId: this.$route.query.trialId,
-              ...res.Result,
-            });
-          }
-        }
-      },
-      immediate: true,
-      deep: true,
-    },
+    this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    Vue.prototype.$openI18n = this.openI18n
   },
+  // watch: {
+  //   '$route.query': {
+  //     async handler() {
+  //       if (!this.$route.query.trialId) {
+  //         this.$store.dispatch('trials/setConfig', {})
+  //       }
+  //       if (
+  //         this.$route.query.trialId &&
+  //         this.$route.query.trialId !==
+  //           this.$store.state.trials.config.trialId &&
+  //         this.$store.state.trials.whiteList.indexOf(this.$route.path) === -1
+  //       ) {
+  //         let res = await getTrialExtralConfig({
+  //           TrialId: this.$route.query.trialId,
+  //         })
+  //         console.log(222222222222)
+  //         res.Result.aa = { 阅片人: '采集人', 申办方: 'aaa' }
+  //         if (res.IsSuccess) {
+  //           this.$store.dispatch('trials/setConfig', {
+  //             trialId: this.$route.query.trialId,
+  //             ...res.Result,
+  //           })
+  //         }
+  //       }
+  //     },
+  //     immediate: true,
+  //     deep: true,
+  //   },
+  // },
   methods: {
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
     changeValue(target, attr, e) {
-      this.$set(target, attr, e);
+      this.$set(target, attr, e)
     },
     keyChange(v) {
       if (this.key) {
@@ -144,69 +209,97 @@ 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 {
-        this.tableData = Object.assign([], this.arr);
+        this.tableData = Object.assign([], this.arr)
       }
     },
     handleSave() {
-      this.$confirm("确定修改当前页面国际化内容？").then(() => {
+      this.$confirm('确定修改当前页面国际化内容？').then(() => {
         batchAddOrUpdateFrontInternationalization(this.tableData).then(
           async (res) => {
             var zhMessages = {},
-              enMessages = {};
-            var Internationalization = await getFrontInternationalizationList();
-            Vue.prototype.$tl = Internationalization.Result;
+              enMessages = {}
+            var Internationalization = await getFrontInternationalizationList()
+            Vue.prototype.$tl = Internationalization.Result
             this.tableData.forEach((v) => {
               // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
               // enMessages[v.Description + '_' + v.Code] = v.Value
-              zhMessages[v.Code] = v.ValueCN;
-              enMessages[v.Code] = v.Value;
-            });
-            i18n.mergeLocaleMessage("zh", zhMessages);
-            i18n.mergeLocaleMessage("en", enMessages);
-            this.drawer = false;
-            this.$message.success("国际化修改成功");
+              zhMessages[v.Code] = v.ValueCN
+              enMessages[v.Code] = v.Value
+            })
+            i18n.mergeLocaleMessage('zh', zhMessages)
+            i18n.mergeLocaleMessage('en', enMessages)
+            this.drawer = false
+            this.$message.success('国际化修改成功')
+            if (this.il8nExternal) {
+              this.$EventBus.$emit('il8nUpdate')
+            }
           }
-        );
-      });
+        )
+      })
     },
-    openI18n() {
-      this.tableData = [];
-      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;
-      });
+    openI18n(ARRAY) {
+      this.tableData = []
+      this.il8nExternal = false
+      this.key = null
+      this.drawer = true
+      let arr = []
+      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);
-      });
+        return ~this.$path.indexOf(v.Code)
+      })
       this.$path.forEach((v) => {
         let o = tableData.find((a) => {
-          return a.Code === v;
-        });
+          return a.Code === v
+        })
         if (o) {
-          arr.push(o);
+          arr.push(o)
         } else {
           arr.push({
             Code: v,
             Description: null,
             Value: null,
             ValueCN: null,
-          });
+          })
         }
-      });
-      this.arr = arr;
+      })
+      this.arr = arr
       if (this.key) {
         this.tableData = Object.assign(
           [],
@@ -216,15 +309,15 @@ export default {
               ~v.Value.indexOf(this.key) ||
               ~v.ValueCN.indexOf(this.key)
           )
-        );
+        )
       } else {
-        this.tableData = Object.assign([], this.arr);
+        this.tableData = Object.assign([], this.arr)
       }
       // console.log(JSON.stringify(this.$path))
       // console.log(JSON.stringify(this.tableData))
     },
   },
-};
+}
 </script>
 
 <style lang="scss">
@@ -249,7 +342,7 @@ input::-webkit-inner-spin-button {
   -webkit-appearance: none !important;
 }
 
-input[type="number"] {
+input[type='number'] {
   -moz-appearance: textfield !important;
 }
 
@@ -275,7 +368,7 @@ textarea {
   color: $light_gray;
   text-align: center;
   font-weight: bold;
-  font-family: "Times New Roman";
+  font-family: 'Times New Roman';
   text-shadow: 1px 0.5px 1.5px #666;
 }
 .title-logo {

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
   })
 }
 
@@ -309,3 +317,28 @@ export function rePublishEvent(params) {
     params
   })
 }
+// userId获取doctorId
+export function useUserIDGetDoctorID(data) {
+  return request({
+    url: `/TrialSiteSurvey/useUserIDGetDoctorID`,
+    method: 'post',
+    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/dictionary.js

@@ -1061,4 +1061,12 @@ export function getSystemCalculateTableQuestions(params) {
     method: 'post',
     data: params
   })
+}
+// 添加pd/入组默认邮件
+export function batchAddEnrollOrPdEmailConfig(params) {
+  return request({
+    url: `/TrialEmailNoticeConfig/batchAddEnrollOrPdEmailConfig`,
+    method: 'post',
+    params
+  })
 }

src/api/export.js

@@ -214,3 +214,46 @@ export function getPatientList_Export(data) {
     data
   })
 }
+export function getCommonEvaluationList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getCommonEvaluationList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+export function getCommonJudgeRatioList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getCommonJudgeRatioList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出国际化列表
+export function GetInternationalizationList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetInternationalizationList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出一致性分析
+export function GetAnalysisTaskList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetAnalysisTaskList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出邮件配置
+export function GetEmailNoticeConfigList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetEmailNoticeConfigList_Export`,
+    responseType: 'blob',
+    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

@@ -138,10 +138,11 @@ export function addOrUpdateResearchPublication(param) {
   })
 }
 
-export function getTrialExperience(doctorId) {
+export function getTrialExperience(data) {
   return request({
-    url: `/trialExperience/getTrialExperience/${doctorId}`,
-    method: 'get'
+    url: `/trialExperience/getTrialExperience`,
+    method: 'post',
+    data
   })
 }
 
@@ -236,10 +237,14 @@ export function downloadByAttachmentId(doctorId, attachmentIds) {
   })
 }
 
-export function getDetail(doctorId) {
+export function getDetail(doctorId, TrialId) {
   return request({
-    url: `/doctor/getDetail/${doctorId}`,
-    method: 'get'
+    url: `/doctor/getDetail`,
+    method: 'post',
+    data: {
+      DoctorId: doctorId,
+      TrialId
+    }
   })
 }
 
@@ -290,3 +295,75 @@ export function verifyEmialGetDoctorInfo(param) {
     data: param
   })
 }
+// 新增或编辑基本信息
+export function addOrUpdateDoctorBasicInfoAndEmployment(param) {
+  return request({
+    url: `/Doctor/addOrUpdateDoctorBasicInfoAndEmployment`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或编辑概述
+export function addOrUpdateGneralSituation(param) {
+  return request({
+    url: `/Doctor/addOrUpdateGneralSituation`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或编辑支付方式
+export function updatePaymentMode(param) {
+  return request({
+    url: `/Doctor/updatePaymentMode`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或编辑Publication
+export function addOrUpdateResearchPublicationInfo(param) {
+  return request({
+    url: `/ResearchPublication/addOrUpdateResearchPublicationInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// 发送简历采集邮件
+export function doctorSendEmail(param) {
+  return request({
+    url: `/Doctor/sendEmail`,
+    method: 'post',
+    data: param
+  })
+}
+// 获取医生是否休假
+export function getIsVacation(param) {
+  return request({
+    url: `/Vacation/getIsVacation`,
+    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

@@ -2,7 +2,7 @@
   <el-row>
     <el-col class="m-b-10" :span="24">
       <el-table
-        v-adaptive="{bottomOffset}"
+        v-adaptive="{ bottomOffset }"
         :data="list"
         :height="tableHeight"
         v-bind="$attrs"
@@ -15,15 +15,45 @@
       >
         <template v-for="(column, index) in columns">
           <slot name="front-slot" />
+          <el-table-column v-if="column.type === 'tip'" :key="index" width="35">
+            <template slot-scope="scope">
+              <span v-if="column.slot">
+                <!-- 具名slot -->
+                <slot v-if="column.slot" :name="column.slot" :scope="scope" />
+              </span>
+            </template>
+          </el-table-column>
           <!-- 序号 -->
-          <el-table-column v-if="column.type === 'selection'" :key="index" type="selection" width="55" />
+          <el-table-column
+            v-else-if="column.type === 'selection'"
+            :key="index"
+            type="selection"
+            width="55"
+          />
           <!-- 复选框 -->
-          <el-table-column v-else-if="column.type === 'index'" :key="index" type="index" width="50" />
+          <el-table-column
+            v-else-if="column.type === 'index'"
+            :key="index"
+            type="index"
+            width="50"
+          />
           <!-- 具体内容 -->
-          <el-table-column v-else :key="index" align="left" :label="column.label" :width="column.width" :min-width="column.minWidth" :show-overflow-tooltip="column.showOverflowTooltip || false" :sortable="column.sortable || false" :prop="column.prop">
+          <el-table-column
+            v-else
+            :key="index"
+            align="left"
+            :label="column.label"
+            :width="column.width"
+            :min-width="column.minWidth"
+            :show-overflow-tooltip="column.showOverflowTooltip || false"
+            :sortable="column.sortable || false"
+            :prop="column.prop"
+            :fixed="column.fixed"
+          >
             <template slot-scope="scope">
               <!-- 仅仅显示文字 -->
-              <span v-if="!column.hidden"> <!-- 如果hidden为true的时候 那么当前格可以不显示，可以选择显示自定义的slot-->
+              <span v-if="!column.hidden">
+                <!-- 如果hidden为true的时候 那么当前格可以不显示，可以选择显示自定义的slot-->
                 <!-- 操作按钮 -->
                 <span v-if="column.type === 'operate'">
                   <!-- <a v-for="(operate, i) in column.operates" :key="i" href="javascript:void(0)" class="operate-button" @click="handleClick(operate, scope.row)">
@@ -31,7 +61,17 @@
                     &nbsp;&nbsp;
                   </a> -->
                   <span v-for="(operate, i) in column.operates" :key="i">
-                    <el-button :size="operate.size || 'mini'" :type="operate.type || 'primary'" style="margin-right:5px;" @click="handleClick(operate, scope.row)">{{ operate.name }}</el-button>
+                    <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
+                    >
                   </span>
                 </span>
                 <span v-else>
@@ -52,7 +92,12 @@
     </el-col>
     <!-- 分页部分 -->
     <el-col v-if="!hiddenPage" :span="24" class="page">
-      <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="pagination" />
+      <pagination
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="pagination"
+      />
     </el-col>
   </el-row>
 </template>
@@ -96,45 +141,44 @@ export default {
     // 核心数据
     list: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
 
     // columns
     columns: {
       type: Array,
       required: true,
-      default: () => []
+      default: () => [],
     },
     // is hidden page for table
     hiddenPage: {
       type: Boolean,
-      default: false
+      default: false,
     },
     bottomOffset: {
       type: Number,
-      default: 45
+      default: 45,
     },
     searchData: {
       type: Object,
-      default: () => {}
+      default: () => {},
     },
     total: {
       type: Number,
-      default: 0
+      default: 0,
     },
     highlightCurrentRow: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
-    return {
-    }
+    return {}
   },
   computed: {
     tableHeight() {
       return 100
-    }
+    },
   },
   methods: {
     // 处理点击事件
@@ -157,12 +201,12 @@ export default {
     },
     pagination() {
       this.$emit('getList')
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.page{
+.page {
   padding-top: 3px;
   text-align: right;
 }

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,15 +293,23 @@ async function VueInit() {
     }()
     _vm.$forceUpdate()
   }
+  Vue.prototype.$EventBus = new Vue()
   Vue.prototype.$path = []
   var t = function (key) {
-    // if (![Vue.prototype.toPath + '_' + key].includes(Vue.prototype.$path)) {
     if (!~Vue.prototype.$path.indexOf(key)) {
-      // Vue.prototype.$path.push(Vue.prototype.toPath + '_' + key)
       Vue.prototype.$path.push(key)
     }
-    // return i18n.t(Vue.prototype.toPath + '_' + key)
-    return i18n.t(key)
+    let text = i18n.t(key)
+    if (Array.isArray(store.state.trials.config.TrialObjectNameList) && store.state.trials.config.TrialObjectNameList.length > 0) {
+      let arr = JSON.parse(JSON.stringify(store.state.trials.config.TrialObjectNameList))
+      arr.sort((a, b) => b.Name.length - a.Name.length)
+      arr.forEach(item => {
+        let test = new RegExp(item.Name, 'ig')
+        text = text.replace(test, item.TrialName)
+      })
+    }
+    // return i18n.t(key)
+    return text;
   }
   Vue.prototype.$t = t
   _vm = new Vue({
@@ -395,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();
@@ -439,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')
@@ -589,3 +601,4 @@ VueInit()
 // });
 
 
+export default _vm

src/permission.js

@@ -1,12 +1,14 @@
 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"
+import { getTrialExtralConfig } from '@/api/trials'
 // import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
@@ -16,8 +18,43 @@ 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
+  ) {
+    let res = await getTrialExtralConfig({
+      TrialId: to.query.trialId,
+    })
+    if (res.IsSuccess) {
+      store.dispatch('trials/setConfig', {
+        trialId: to.query.trialId,
+        ...res.Result,
+      })
+    }
+  }
+  if (!to.query.trialId) {
+    store.dispatch('trials/setConfig', {})
+  }
+  if (
+    to.query.trialId &&
+    to.query.trialId !==
+    store.state.trials.config.trialId
+  ) {
+    let res = await getTrialExtralConfig({
+      TrialId: to.query.trialId,
+    })
+    if (res.IsSuccess) {
+      store.dispatch('trials/setConfig', {
+        trialId: to.query.trialId,
+        ...res.Result,
+      })
+    }
+  }
   // 确定用户是否已登录
   const hasToken = getToken()
   Vue.prototype.toPath = to.path
@@ -25,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 this.$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
@@ -42,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}`)
@@ -57,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()
         }
@@ -73,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/styles/index.scss

@@ -149,6 +149,7 @@ body .el-table th.gutter {
   }
 
   .el-dialog__body {
+    margin-top: 15px;
     height: calc(100% - 70px);
     padding: 0 20px;
 
@@ -347,6 +348,7 @@ body .el-table th.gutter {
   background: #000;
   z-index: 3999;
 }
-.el-message-box__wrapper{
+
+.el-message-box__wrapper {
   z-index: 9999 !important;
 }

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

@@ -14,8 +14,7 @@ service.interceptors.request.use(
   config => {
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     var language = zzSessionStorage.getItem('lang')
-    config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9'
-    console.log(config.headers)
+    config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9'    
     if (store.getters.token) {
       config.headers.Authorization = `Bearer ${store.getters.token}`
     }
@@ -90,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,16 +3,19 @@
     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%;"
+          style="width: 100%"
           size="small"
           filterable
         >
@@ -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"
@@ -41,21 +44,26 @@
             :on-exceed="handleExceed"
             :disabled="form.Type === ''"
           >
-            <el-button size="small" type="primary" :disabled="form.FileTypeId === ''" :loading="btnLoading">Select</el-button>
-            <span
-              slot="tip"
-              style="margin-left:10px;"
-              class="el-upload__tip"
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="form.FileTypeId === ''"
+              :loading="btnLoading"
+              >{{ $t('common:button:check') }}</el-button
             >
-              (must be in pdf format)
+            <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
+              ({{ $t('trials:signature:label:mustBepdf') }})
             </span>
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="需要签署的用户类型: " prop="NeedConfirmedUserTypeIdList">
+      <el-form-item
+        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
+        prop="NeedConfirmedUserTypeIdList"
+      >
         <el-select
           v-model="form.NeedConfirmedUserTypeIdList"
-          style="width:100%;"
+          style="width: 100%"
           multiple
         >
           <el-option
@@ -66,7 +74,21 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="查看最短时间（分钟）: " prop="SignViewMinimumMinutes">
+      <el-form-item
+        :label="$t('dictionary:signature:form:DocUserSignType')"
+        prop="DocUserSignType"
+      >
+        <el-switch
+          v-model="form.DocUserSignType"
+          :active-value="1"
+          :inactive-value="0"
+        >
+        </el-switch>
+      </el-form-item>
+      <el-form-item
+        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
+        prop="SignViewMinimumMinutes"
+      >
         <el-input-number
           v-model="form.SignViewMinimumMinutes"
           controls-position="right"
@@ -81,9 +103,16 @@
         </el-radio-group>
       </el-form-item> -->
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''" :loading="saveBtnLoading" @click="handleSave">Save</el-button>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="form.FileTypeId === '' || form.Name === ''"
+          :loading="saveBtnLoading"
+          @click="handleSave"
+          >{{ $t('common:button:save') }}</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
@@ -96,8 +125,10 @@ export default {
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {}
+      },
+    },
   },
 
   data() {
@@ -108,19 +139,38 @@ export default {
         Name: '',
         Path: '',
         IsDeleted: false,
-        SignViewMinimumMinutes: null
+        SignViewMinimumMinutes: null,
+        DocUserSignType: 0,
       },
       rules: {
-        FileTypeId: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        SignViewMinimumMinutes: [{ required: true, message: 'Please specify', trigger: ['change'] }],
-        NeedConfirmedUserTypeIdList: [{ required: true, message: 'Please select', trigger: ['blur'] }]
+        FileTypeId: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
+        ],
+        SignViewMinimumMinutes: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['change'],
+          },
+        ],
+        NeedConfirmedUserTypeIdList: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
+        ],
       },
       fileList: [],
       userTypeOptions: [],
       btnLoading: false,
       saveBtnLoading: false,
       loading: false,
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
   mounted() {
@@ -137,8 +187,8 @@ export default {
             {
               name: this.data.Name,
               url: this.data.Path,
-              path: this.data.Path
-            }
+              path: this.data.Path,
+            },
           ]
         }
         this.form.Id = this.data.Id
@@ -147,25 +197,31 @@ export default {
         this.form.Path = this.data.Path
         this.form.IsDeleted = this.data.IsDeleted
         this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
+        this.form.DocUserSignType = this.data.DocUserSignType
       }
       this.loading = false
     },
     // 获取文件类型下拉框
     getDicData() {
-      getBasicDataSelects(['Sys_Document']).then(res => {
-        this.dictionaryList = { ...res.Result }
-      }).catch(() => {
-
-      })
+      getBasicDataSelects(['Sys_Document'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+        })
+        .catch(() => {})
     },
     // 获取用户类型下拉数据
     getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-        if (this.form.Id) {
-          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeIds
-        }
-      }).catch(() => { this.loading = false })
+      getTrialUserTypeList()
+        .then((res) => {
+          this.userTypeOptions = res.Result
+          if (this.form.Id) {
+            this.form.NeedConfirmedUserTypeIdList =
+              this.data.NeedConfirmedUserTypeIds
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     beforeUpload(file) {
       // 检测文件类型是否符合要求
@@ -173,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
       }
@@ -181,28 +237,37 @@ export default {
     async handleUploadFile(param) {
       this.loading = true
       var file = await this.fileToBlob(param.file)
-      const res = await this.OSSclient.put(`/System/DocumentToSign/${param.file.name}${new Date().getTime()}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
+      const res = await this.OSSclient.put(
+        `/System/DocumentToSign/${param.file.name}${new Date().getTime()}`,
+        file
+      )
+      this.fileList.push({
+        name: param.file.name,
+        path: this.$getObjectName(res.url),
+        url: this.$getObjectName(res.url),
+      })
       this.form.Path = this.$getObjectName(res.url)
       this.form.Name = param.file.name
       this.loading = false
     },
     handleSave() {
-      this.$refs.sysAttachmentFrom.validate(valid => {
+      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
-        addOrUpdateSystemDocument(this.form).then(res => {
-          this.saveBtnLoading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          this.$message.success('Uploaded successfully')
-        }).catch(() => {
-          this.saveBtnLoading = false
-        })
+        addOrUpdateSystemDocument(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success(this.$t('common:message:updatedSuccessfully'))
+          })
+          .catch(() => {
+            this.saveBtnLoading = false
+          })
       })
     },
     handleRemoveFile() {
@@ -216,23 +281,25 @@ 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']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true
       } else {
         return false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss">
-.upload-temporary-file{
+.upload-temporary-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
@@ -245,8 +312,8 @@ export default {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }

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

@@ -2,27 +2,18 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-
-        <el-form-item label="文件类型:">
-          <el-select
-            v-model="searchData.FileTypeId"
-            style="width:150px;"
-          >
+        <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
+          <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of dict.type.Sys_Document"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             />
-
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
-          <el-input
-            v-model="searchData.Name"
-            style="width:130px;"
-            clearable
-          />
+        <el-form-item :label="$t('dictionary:signature:search:Name')">
+          <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
         <el-form-item>
@@ -31,7 +22,11 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
@@ -39,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"
       >
@@ -48,7 +43,7 @@
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="loading"
         :data="list"
         stripe
@@ -58,81 +53,99 @@
         <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">
-            {{ scope.row.NeedConfirmedUserTypes?scope.row.NeedConfirmedUserTypes.join(', '):'' }}
+            {{
+              scope.row.NeedConfirmedUserTypes
+                ? scope.row.NeedConfirmedUserTypes.join(', ')
+                : ''
+            }}
           </template>
         </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="UpdateTime"
-          label="更新时间"
+          prop="DocUserSignType"
+          :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="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)"
-            >
-              预览
+            <el-button type="text" @click="handlePreview(scope.row)">
+              {{ $t('common:button:preview') }}
             </el-button>
-            <el-button
-              type="text"
-              @click="handleEdit(scope.row)"
-            >
-              编辑
+            <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)"
-            >
-              删除
+            <el-button type="text" @click="handleDelete(scope.row)">
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
 
       <!-- 新增/编辑 -->
       <el-dialog
@@ -143,7 +156,11 @@
         width="600px"
         custom-class="base-dialog-wrapper"
       >
-        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+        <TemplateForm
+          :data="currentRow"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </el-dialog>
 
       <!-- 预览文件 -->
@@ -155,10 +172,16 @@
         append-to-body
         custom-class="base-dialog-wrapper"
       >
-        <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
-          <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+        <div
+          class="base-modal-body"
+          style="border: 2px solid #ccc; padding: 10px"
+        >
+          <PreviewFile
+            v-if="previewVisible"
+            :file-path="currentPath"
+            :file-type="currentType"
+          />
         </div>
-
       </el-dialog>
     </template>
   </BaseContainer>
@@ -175,7 +198,7 @@ const searchDataDefault = () => {
     FileTypeId: '',
     Name: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
@@ -193,7 +216,7 @@ export default {
       editVisible: false,
       previewVisible: false,
       title: '',
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -203,22 +226,24 @@ export default {
     // 获取系统文件数据
     getList() {
       this.loading = true
-      getSystemDocumentList(this.searchData).then(res => {
-        this.loading = false
-        const { CurrentPageData, TotalCount } = res.Result
-        CurrentPageData.forEach(item => {
-          item.NeedConfirmedUserTypes = []
-          item.NeedConfirmedUserTypeIds = []
-          item.NeedConfirmedUserTypeList.forEach((i) => {
-            item.NeedConfirmedUserTypes.push(i.UserTypeShortName)
-            item.NeedConfirmedUserTypeIds.push(i.NeedConfirmUserTypeId)
+      getSystemDocumentList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          const { CurrentPageData, TotalCount } = res.Result
+          CurrentPageData.forEach((item) => {
+            item.NeedConfirmedUserTypes = []
+            item.NeedConfirmedUserTypeIds = []
+            item.NeedConfirmedUserTypeList.forEach((i) => {
+              item.NeedConfirmedUserTypes.push(i.UserTypeShortName)
+              item.NeedConfirmedUserTypeIds.push(i.NeedConfirmUserTypeId)
+            })
           })
+          this.list = CurrentPageData
+          this.total = TotalCount
+        })
+        .catch(() => {
+          this.loading = false
         })
-        this.list = CurrentPageData
-        this.total = TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
     },
     // 新增
     handleAdd() {
@@ -230,7 +255,9 @@ export default {
     handlePreview(row) {
       const { Name, FullFilePath } = row
       this.currentPath = FullFilePath
-      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentType = row.Name
+        ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
+        : ''
       this.previewVisible = true
     },
     // 编辑
@@ -241,42 +268,52 @@ export default {
     },
     // 废除
     handleRepeal(row) {
-      this.$confirm('是否确认废除此文件?', {
+      this.$confirm(this.$t('dictionary:signature:confirm:delFile'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-
       })
         .then(() => {
           this.loading = true
           userAbandonDoc(row.Id, true)
-            .then(res => {
+            .then((res) => {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                this.$message.success(
+                  this.$t('common:message:savedSuccessfully')
+                )
               }
-            }).catch(() => { this.loading = false })
-        }).catch(() => {})
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => {})
     },
     // 删除
     handleDelete(row) {
       this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true
+        deleteSystemDocument(row.Id)
+          .then((res) => {
+            this.loading = false
+            if (res.IsSuccess) {
+              this.list.splice(
+                this.list.findIndex((item) => item.Id === row.Id),
+                1
+              )
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
+            }
+          })
+          .catch(() => {
+            this.loading = false
+          })
       })
-        .then(() => {
-          this.loading = true
-          deleteSystemDocument(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('删除成功！')
-              }
-            }).catch(() => {
-              this.loading = false
-            })
-        })
     },
     // 关闭弹窗
     closeDialog() {
@@ -305,7 +342,7 @@ export default {
       this.searchData.SortField = column.prop
       this.searchData.PageIndex = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>

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/institutions/components/SiteForm.vue

@@ -14,11 +14,17 @@
       </el-form-item>
 
       <!-- 中心名称 -->
-      <el-form-item :label="$t('trials:customSite:form:siteName')" prop="SiteName">
+      <el-form-item
+        :label="$t('trials:customSite:form:siteName')"
+        prop="SiteName"
+      >
         <el-input v-model="form.SiteName" />
       </el-form-item>
       <!-- 中心名称（CN） -->
-      <el-form-item :label="$t('trials:customSite:form:siteName') + '（CN）'"  prop="SiteNameCN">
+      <el-form-item
+        :label="$t('trials:customSite:form:siteName') + '（CN）'"
+        prop="SiteNameCN"
+      >
         <el-input v-model="form.SiteNameCN" />
       </el-form-item>
 
@@ -46,7 +52,7 @@
           v-model="form.HospitalId"
           clearable
           placeholder="Please select"
-          style="width:100%;"
+          style="width: 100%"
         >
           <el-option
             v-for="item in hospitalList"
@@ -73,10 +79,22 @@
         <el-input v-model="form.ContactPhone" />
       </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>
@@ -91,8 +109,8 @@ export default {
       type: Object,
       default() {
         return {}
-      }
-    }
+      },
+    },
   },
   data() {
     return {
@@ -111,50 +129,42 @@ export default {
         ContactName: '',
         ContactPhone: '',
         UniqueCode: '',
-        Address: ''
+        Address: '',
       },
       rules: {
         SiteName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          // { max: 50, message: 'The maximum length is 50' }
         ],
         SiteNameCN: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          // { max: 50, message: 'The maximum length is 50' }
         ],
         SiteCode: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         Country: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         City: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         // HospitalId: [
         //   { required: true, message: 'Please specify', trigger: 'blur' }
         // ],
         Address: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
-        DirectorName: [
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        DirectorPhone: [
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        ContactName: [
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        ContactPhone: [
-          { max: 50, message: 'The maximum length is 50' }
-        ]
+        DirectorName: [{ max: 50, message: 'The maximum length is 50' }],
+        DirectorPhone: [{ max: 50, message: 'The maximum length is 50' }],
+        ContactName: [{ max: 50, message: 'The maximum length is 50' }],
+        ContactPhone: [{ max: 50, message: 'The maximum length is 50' }],
       },
       loading: false,
-      show: false
+      show: false,
     }
   },
   mounted() {
@@ -163,20 +173,22 @@ export default {
   },
   methods: {
     handleSave() {
-      this.$refs.siteForm.validate(valid => {
+      this.$refs.siteForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
-        addOrUpdateSite(this.form).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.$message.success('Saved successfully')
-            this.$refs['siteForm'].resetFields()
-            this.$emit('getList')
-            this.$emit('close')
-          }
-        }).catch(() => {
-          this.btnLoading = false
-        })
+        addOrUpdateSite(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            if (res.IsSuccess) {
+              this.$message.success('Saved successfully')
+              this.$refs['siteForm'].resetFields()
+              this.$emit('getList')
+              this.$emit('close')
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false
+          })
       })
     },
     handleCancel() {
@@ -189,8 +201,7 @@ export default {
       if (Object.keys(this.data).length && this.data.Id) {
         this.form = { ...this.data }
       }
-    }
-  }
-
+    },
+  },
 }
 </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/CriterionFormItem.vue

@@ -17,10 +17,10 @@
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
     >
       {{ question.QuestionName }}
-    </div>
+    </div> 
     <template v-else>
       <el-form-item
-        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion===0"
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
         :label="`${question.QuestionName}`"
         :prop="question.Id"
         :rules="[
@@ -139,10 +139,18 @@
         />
         <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input-number
+        <!-- <el-input-number
           v-if="question.Type==='number'"
           v-model="questionForm[question.Id]"
-        />
+        />  -->
+        <el-input
+          v-if="question.Type==='number'"
+          v-model="questionForm[question.Id]"
+          type="number"
+          :disabled="question.DataSource === 1"
+        >
+          <template v-if="question.Unit" slot="append">{{$fd('ValueUnit', question.Unit)}}</template>
+        </el-input>
         <!-- 自动分类 -->
         <el-input
           v-if="question.Type==='calss'"
@@ -152,7 +160,8 @@
         <!-- 上传图像 -->
         <el-upload
           v-if="question.Type==='upload'"
-          :action="accept"
+          action
+          :accept="question.FileType"
           :limit="question.ImageCount"
           :on-preview="handlePictureCardPreview"
           :before-upload="handleBeforeUpload"

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>
@@ -107,7 +114,7 @@
           <el-table-column
             prop="IsShowInDicom"
             label="是否在阅片页面显示"
-            width="140"
+            width="150"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -115,13 +122,13 @@
             </template>
           </el-table-column>
           <!-- 注释 -->
-          <el-table-column
+          <!-- <el-table-column
             prop="Remark"
             :label="$t('trials:readingUnit:qsList:title:Remark')"
             width="140"
             show-overflow-tooltip
           >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="GlobalReadingShowType"
             label="是否在全局阅片显示"
@@ -132,6 +139,39 @@
               {{ $fd('GlobalReadingShowType', scope.row.GlobalReadingShowType) }}
             </template>
           </el-table-column>
+          <!-- 导出标识 --> 
+          <!-- <el-table-column
+            prop="ExportIdentification"
+            :label="$t('trials:readingUnit:qsList:title:ExportIdentification')"
+            width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('ExportIdentification', scope.row.ExportIdentification) }}
+            </template>
+          </el-table-column> -->
+          <!-- 问题标识 -->
+          <el-table-column
+            prop="QuestionType"
+            label="问题标识"
+            width="140"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('QuestionType', scope.row.QuestionType) }}
+            </template>
+          </el-table-column>
+          <!-- 导出目标表格 -->
+          <el-table-column
+            prop="ExportResult"
+            :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+            width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ getStringResult(scope.row.ExportResult, 'ExportResult') }}
+            </template>
+          </el-table-column>
           <!-- 限制编辑 -->
           <el-table-column
             prop="LimitEdit"
@@ -201,7 +241,7 @@
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
       :title="`${addOrEdit.title}`"
-      width="600px"
+      width="650px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
@@ -243,6 +283,7 @@
     >
       <TableQsList
         :criterion-id="criterionId"
+        :criterionType="data.CriterionType"
         :reading-question-id="rowData.Id"
         :is-complete-config="data.IsCompleteConfig"
         :lesion-type="rowData.LesionType"
@@ -357,6 +398,11 @@ export default {
       this.config.title = `${this.$fd('LesionType', row.LesionType)}：${this.$t('trials:readingUnit:qsList:title:tableQs')}`
       this.config.visible = true
     },
+    getStringResult(arr, dictionaryCode) {
+      let newArr = arr.map(i => this.$fd(dictionaryCode, i))
+      let delimiter = this.$i18n.locale === 'zh' ? '，' : ', '
+      return newArr.join(delimiter)
+    },
     // 查询
     handleSearch() {
       this.getList()

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/ECRF.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" style="min-height:400px;">
+  <div v-loading="loading" style="min-height:400px;padding:20px">
     <el-form
       v-if="isRender"
       ref="questions"

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/TableQsList.vue

@@ -27,12 +27,12 @@
       />
       <el-table-column
         prop="QuestionName"
-        label="名称"
+        label="问题名称"
         show-overflow-tooltip
       />
       <el-table-column
         prop="QuestionEnName"
-        label="名称(EN)"
+        label="问题名称(EN)"
         show-overflow-tooltip
       />
       <el-table-column
@@ -44,7 +44,7 @@
           {{ $fd('Criterion_Question_Type',scope.row.Type) }}
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="TableQuestionType"
         label="选项类型"
         show-overflow-tooltip
@@ -60,20 +60,7 @@
         show-overflow-tooltip
         min-width="110"
       />
-      <el-table-column
-        prop="DependShowOrder"
-        label="关联问题"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="DataTableColumn"
-        label="关联字段"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('OrganColumn',scope.row.DataTableColumn) }}
-        </template>
-      </el-table-column>
+       -->
       <el-table-column
         prop="ShowQuestion"
         label="是否显示"
@@ -94,7 +81,7 @@
           {{ $fd('QuestionRequired',scope.row.IsRequired) }}
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="IsJudgeQuestion"
         label="是否裁判问题"
         show-overflow-tooltip
@@ -102,8 +89,8 @@
         <template slot-scope="scope">
           {{ $fd('YesOrNo',scope.row.IsJudgeQuestion) }}
         </template>
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+      <!-- <el-table-column
         prop="ParentQuestionShowOrder"
         label="显示依赖父问题"
         min-width="90"
@@ -124,8 +111,64 @@
         prop="RelevanceValue"
         label="必填触发值"
         show-overflow-tooltip
+      /> -->
+      <!-- 导出标识 -->
+      <!-- <el-table-column
+        prop="ExportIdentification"
+        :label="$t('trials:readingUnit:qsList:title:ExportIdentification')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('ExportIdentification', scope.row.ExportIdentification) }}
+        </template>
+      </el-table-column> -->
+      <!-- 问题标识 -->
+      <el-table-column
+        prop="QuestionMark"
+        label="问题标识"
+        width="140"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('QuestionMark', scope.row.QuestionMark) }}
+        </template>
+      </el-table-column>
+      <!-- 导出目标表格 -->
+      <el-table-column
+        prop="ExportResult"
+        :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ getStringResult(scope.row.ExportResult, 'ExportResult') }}
+        </template>
+      </el-table-column>
+      <!-- 限制编辑 -->
+      <el-table-column
+        prop="LimitEdit"
+        :label="$t('trials:readingUnit:qsList:title:limitEdit')"
+        width="160"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('LimitEdit', scope.row.LimitEdit) }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        prop="DependShowOrder"
+        label="关联问题"
+        show-overflow-tooltip
       />
       <el-table-column
+        prop="DataTableColumn"
+        label="关联字段"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('OrganColumn',scope.row.DataTableColumn) }}
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column
         prop="ImageCount"
         label="最大上传个数"
         show-overflow-tooltip
@@ -134,6 +177,7 @@
           {{ scope.row.Type === 'upload'?scope.row.ImageCount:'' }}
         </template>
       </el-table-column>
+       -->
       <el-table-column
         prop="MaxRowCount"
         label="最大行数"
@@ -184,7 +228,7 @@
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
       :title="addOrEdit.title"
-      width="600px"
+      width="650px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
@@ -194,6 +238,7 @@
         :type="type"
         :reading-question-id="readingQuestionId"
         :criterion-id="criterionId"
+        :criterionType="criterionType"
         @close="addOrEdit.visible = false"
         @getList="getList"
       />
@@ -225,7 +270,11 @@ export default {
     criterionId: {
       type: String,
       required: true
-    }
+    },
+    criterionType: {
+      type: Number,
+      required: true
+    },
 
   },
   data() {
@@ -285,6 +334,11 @@ export default {
             }).catch(() => { this.loading = false })
         })
     },
+    getStringResult(arr, dictionaryCode) {
+      let newArr = arr.map(i => this.$fd(dictionaryCode, i))
+      let delimiter = this.$i18n.locale === 'zh' ? '，' : ', '
+      return newArr.join(delimiter)
+    },
     // 查询
     handleSearch() {
       this.getList()

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

@@ -23,6 +23,17 @@
           <el-input style="width: 300px" v-model="form.EmailTopic" />
         </el-form-item>
       </el-col>
+      <el-col :span="12">
+        <el-form-item label="邮件延时发送s数" prop="EmailDelaySeconds">
+          <el-input
+            v-model.number="form.EmailDelaySeconds"
+            style="width: 300px"
+            type="number"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="业务层级" prop="BusinessLevelEnum">
           <el-select v-model="form.BusinessLevelEnum" clearable class="mr">
@@ -59,7 +70,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="systemLevel !== 1">
+      <el-col :span="12">
         <el-form-item label="收件人" prop="ToUserTypeList">
           <el-select
             v-model="form.ToUserTypeList"
@@ -76,7 +87,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="抄送人" prop="CopyUserTypeList">
           <el-select
             v-model="form.CopyUserTypeList"
@@ -93,7 +104,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="加急状态" prop="EmailUrgentEnum">
           <el-select
             v-model="form.EmailUrgentEnum"
@@ -114,7 +125,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item
           label="发送周期和时间"
           v-if="form.EmailUrgentEnum !== 1"
@@ -124,7 +135,7 @@
           <el-button type="primary" @click="showDialog">生成 cron</el-button>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="是否需要回执" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
             <el-radio :label="true">是</el-radio>
@@ -132,7 +143,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="是否自动发送" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
             <el-radio :label="true">是</el-radio>
@@ -140,7 +151,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12" v-if="systemLevel">
         <el-form-item label="是否区分标准" prop="IsDistinguishCriteria">
           <el-radio-group
             v-model="form.IsDistinguishCriteria"
@@ -155,7 +166,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
           v-if="form.IsDistinguishCriteria"
@@ -171,7 +182,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="是否启用" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
             <el-radio :label="true">是</el-radio>
@@ -179,7 +190,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="附件（CN）" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -201,7 +212,7 @@
           </el-upload>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!systemLevel">
+      <el-col :span="12">
         <el-form-item label="附件（EN）" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -235,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') }}
@@ -254,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') }}
@@ -299,6 +310,12 @@ export default {
         return 0
       },
     },
+    isDistinguishCriteria: {
+      type: Boolean,
+      default() {
+        return false
+      },
+    },
   },
   components: { vcrontab },
   data() {
@@ -329,6 +346,7 @@ export default {
         IsEnable: true,
         IsAutoSend: true,
         CriterionTypeEnum: null,
+        EmailDelaySeconds: null,
       },
       rules: {
         Code: [{ required: true, message: 'Please select', trigger: ['blur'] }],
@@ -344,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'] },
         ],
@@ -376,9 +394,11 @@ export default {
         this.form.ToUserTypeList = []
       }
       this.form.CopyUserTypeList = []
-      this.form.EmailUrgentEnum = '3'
+      this.form.EmailUrgentEnum = 3
       this.form.IsReturnRequired = false
       this.form.IsDistinguishCriteria = false
+    } else {
+      this.form.IsDistinguishCriteria = this.isDistinguishCriteria
     }
   },
   methods: {
@@ -499,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

@@ -1,13 +1,8 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form
-        v-if="!systemLevel"
-        :inline="true"
-        size="mini"
-        class="base-search-form"
-      >
-        <el-form-item label="是否需要回执:">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item label="是否需要回执:" v-if="!systemLevel">
           <el-select
             v-model="searchData.IsReturnRequired"
             clearable
@@ -21,7 +16,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否加急:">
+        <el-form-item label="是否加急:" v-if="!systemLevel">
           <el-select
             v-model="searchData.IsUrgent"
             clearable
@@ -35,7 +30,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否启用:">
+        <el-form-item label="是否启用:" v-if="!systemLevel">
           <el-select
             v-model="searchData.IsEnable"
             clearable
@@ -51,7 +46,7 @@
         </el-form-item>
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
-          v-if="isDistinguishCriteria"
+          v-if="isDistinguishCriteria && !systemLevel"
         >
           <el-select
             v-model="searchData.CriterionTypeEnum"
@@ -66,12 +61,84 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('trials:emailManageCfg:form:BusinessModule')">
+          <el-select
+            v-model="searchData.BusinessModuleEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.BusinessModule"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:emailManageCfg:form:BusinessScenario')"
+        >
+          <el-select
+            v-model="searchData.BusinessScenarioEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('trials:emailManageCfg:form:ToUserType')">
+          <el-select
+            v-model="searchData.ToUserType"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of UserTypeList"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:emailManageCfg:form:EmailUrgent')"
+          v-if="systemLevel === 1"
+        >
+          <el-select
+            v-model="searchData.EmailUrgentEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.EmailUrgent"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
+          </el-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">
+        <el-button type="primary" size="mini" @click="handleExport">
+          {{ $t('common:button:export') }}
+        </el-button>
         <!-- <el-button
       type="primary"
       size="mini"
@@ -161,13 +228,12 @@
           {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
         </template>
       </el-table-column>
-      <!-- 收件人 -->
+      <!-- 收件人v-if="systemLevel !== 1" -->
       <el-table-column
         prop="ToUserTypeList"
         :label="$t('trials:emailManageCfg:title:toUserTypeList')"
         show-overflow-tooltip
         min-width="100"
-        v-if="systemLevel !== 1"
       >
         <template slot-scope="scope">
           {{
@@ -179,13 +245,12 @@
           }}
         </template>
       </el-table-column>
-      <!-- 抄送人 -->
+      <!-- 抄送人v-if="!systemLevel" -->
       <el-table-column
         prop="CopyUserTypeList"
         :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
         show-overflow-tooltip
         min-width="100"
-        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           {{
@@ -197,25 +262,25 @@
           }}
         </template>
       </el-table-column>
+      <!---v-if="!systemLevel"-->
       <el-table-column
         prop="EmailUrgentEnum"
         label="加急状态"
         sortable="custom"
         show-overflow-tooltip
         min-width="100"
-        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
+      <!---v-if="!systemLevel"-->
       <el-table-column
         prop="EmailCron"
         label="发送周期和时间"
         sortable="custom"
         show-overflow-tooltip
         min-width="160"
-        v-if="!systemLevel"
       />
       <!-- 附件 -->
       <el-table-column
@@ -313,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>
@@ -338,6 +410,7 @@
       <EmailForm
         :data="rowData"
         :system-level="systemLevel"
+        :isDistinguishCriteria="isDistinguishCriteria"
         @closeDialog="closeDialog"
         @getList="getList"
         @PreviewHTML="preview"
@@ -369,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>
@@ -378,6 +467,7 @@ import {
   getEmailNoticeConfigList,
   deleteEmailNoticeConfig,
 } from '@/api/dictionary'
+import { GetEmailNoticeConfigList_Export } from '@/api/export'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
 import EmailForm from './EmailForm'
@@ -388,6 +478,10 @@ const searchDataDefault = () => {
     IsUrgent: '',
     IsEnable: '',
     CriterionTypeEnum: null,
+    BusinessModuleEnum: null,
+    BusinessScenarioEnum: null,
+    EmailUrgentEnum: null,
+    ToUserType: null,
     PageIndex: 1,
     PageSize: 20,
     SortField: 'Code',
@@ -424,8 +518,20 @@ export default {
       attachmentVisible: false,
       previewVisible: false,
       previewHTML: null,
+      previewHTMLEN: null,
     }
   },
+  computed: {
+    UserTypeList() {
+      if (this.systemLevel === 1) {
+        return this.$d.UserType
+      } else {
+        return this.$d.UserType.filter(
+          (item) => ![7, 31, 32, 21, 26, 27].includes(item.value)
+        )
+      }
+    },
+  },
   mounted() {
     this.getList()
   },
@@ -500,10 +606,18 @@ export default {
     closeDialog() {
       this.editVisible = false
     },
-    preview(html) {
+    preview(html, htmlEN) {
       this.previewHTML = html
+      this.previewHTMLEN = htmlEN
       this.previewVisible = true
     },
+    // 导出
+    handleExport() {
+      // this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria
+      // this.searchData.systemLevel = this.systemLevel
+      // return GetEmailNoticeConfigList_Export(this.searchData)
+      return GetEmailNoticeConfigList_Export(this.searchData)
+    },
   },
 }
 </script>

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

@@ -29,13 +29,13 @@
         ></EmailList>
       </el-tab-pane>
       <!-- 系统相关-分角色 -->
-      <el-tab-pane :label="$t('trials:emailManageCfg:title:systemDisRole')" name="3">
+      <!-- <el-tab-pane :label="$t('trials:emailManageCfg:title:systemDisRole')" name="3">
         <EmailList
           v-if="activeTab === '3'"
           :is-distinguish-criteria="false"
           :system-level="2"
         ></EmailList>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
   </box-content>
 </template>
@@ -43,107 +43,107 @@
 import {
   getEmailNoticeConfigList,
   deleteEmailNoticeConfig,
-} from "@/api/dictionary";
-import BoxContent from "@/components/BoxContent";
-import Pagination from "@/components/Pagination";
-import EmailList from "./components/EmailList";
+} from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import Pagination from '@/components/Pagination'
+import EmailList from './components/EmailList'
 const searchDataDefault = () => {
   return {
-    IsReturnRequired: "",
-    IsUrgent: "",
-    IsEnable: "",
+    IsReturnRequired: '',
+    IsUrgent: '',
+    IsEnable: '',
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  name: "EmailListIndex",
+  name: 'EmailListIndex',
   components: { BoxContent, Pagination, EmailList },
   data() {
     return {
-      activeTab: "0",
+      activeTab: '0',
       searchData: searchDataDefault(),
       loading: false,
       list: [],
       total: 0,
       rowData: {},
-      title: "",
+      title: '',
       editVisible: false,
       attachmentVisible: false,
-    };
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 获取受试者列表
     getList() {
-      this.loading = true;
+      this.loading = true
       getEmailNoticeConfigList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 新增
     handleAdd() {
-      this.rowData = {};
-      this.title = "新增";
-      this.editVisible = true;
+      this.rowData = {}
+      this.title = '新增'
+      this.editVisible = true
     },
     // 编辑
     handleEdit(row) {
-      this.rowData = { ...row };
-      this.title = "编辑";
-      this.editVisible = true;
+      this.rowData = { ...row }
+      this.title = '编辑'
+      this.editVisible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm(this.$t("trials:staffResearch:message:confirmDel"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
         deleteEmailNoticeConfig(row.Id).then((res) => {
           if (res.IsSuccess) {
-            this.getList();
-            this.$message.success("删除成功!");
+            this.getList()
+            this.$message.success('删除成功!')
           }
-        });
-      });
+        })
+      })
     },
     handleDetail(row) {
-      this.rowData = { ...row };
-      this.attachmentVisible = true;
+      this.rowData = { ...row }
+      this.attachmentVisible = true
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 关闭新增、编辑框
     closeDialog() {
-      this.editVisible = false;
+      this.editVisible = false
     },
   },
-};
+}
 </script>

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

@@ -91,6 +91,8 @@
               :type="passwordType"
               :placeholder="$t('login:form:password')"
               name="password"
+              auto-complete="new-password"
+              autocomplete="new-password"
               tabindex="2"
               @keyup.enter.native="handleLogin"
             />
@@ -99,6 +101,21 @@
                 :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
               />
             </span>
+            <!-- <el-input
+              :key="passwordType"
+              ref="password"
+              v-model="pwdCover"
+              size="small"
+              type="text"
+              :placeholder="$t('login:form:password')"
+              name="password"
+              @input="setPassword"
+              tabindex="2"
+              @keyup.enter.native="handleLogin"
+            />
+            <span class="show-pwd" @click="hidePassword">
+              <svg-icon :icon-class="!isShowPassword ? 'eye' : 'eye-open'" />
+            </span> -->
           </el-form-item>
           <!-- Login -->
           <el-button
@@ -188,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'">
@@ -226,6 +247,13 @@
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+      @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -236,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
@@ -274,17 +303,22 @@ export default {
       },
       loading: false,
       passwordType: 'password',
+      pwdCover: null,
+      isShowPassword: false,
       loginType: null,
       location: null,
       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: {
@@ -299,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)
@@ -313,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()
@@ -357,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'))
@@ -366,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'),
@@ -382,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()
@@ -435,6 +539,67 @@ export default {
     handleResetPwd() {
       this.$router.push({ name: 'Resetpassword' })
     },
+    // 输入框输入事件
+    setPassword(val) {
+      if (this.isShowPassword) {
+        this.loginForm.password = val
+      } else {
+        let reg =
+          /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$/g // 只允许输入字母和数字
+        let nDot = /[^●]/g // 非圆点字符
+        let index = -1 // 新输入的字符位置
+        let lastChar = void 0 // 新输入的字符
+        let realArr = this.loginForm.password.split('') // 真实密码数组
+        let coverArr = val.split('') // 文本框显示密码数组
+        let coverLen = val.length // 文本框字符串长度
+        let realLen = this.loginForm.password.length // 真实密码长度
+        // 找到新输入的字符及位置
+        coverArr.forEach((el, idx) => {
+          if (nDot.test(el)) {
+            index = idx
+            lastChar = el
+          }
+        })
+        // 判断输入的字符是否符合规范，不符合的话去掉该字符
+        // if (lastChar && !reg.test(lastChar)) {
+        //   coverArr.splice(index, 1)
+        //   this.pwdCover = coverArr.join('')
+        //   console.log(111111111111111, lastChar)
+        //   // return
+        // }
+        if (coverLen - realLen <= 2) {
+          if (realLen < coverLen) {
+            // 新增字符
+            realArr.splice(index, 0, lastChar)
+          } else if (coverLen <= realLen && index !== -1) {
+            // 替换字符（选取一个或多个字符直接替换）
+            realArr.splice(index, realLen - (coverLen - 1), lastChar)
+          } else {
+            // 删除字符，因为 val 全是 ● ，没有办法匹配，不知道是从末尾还是中间删除的字符，删除了几个，不好对 password 处理，所以可以通过光标的位置和 val 的长度来判断
+            let pos = document.getElementById('pwd').selectionEnd // 获取光标位置
+            realArr.splice(pos, realLen - coverLen)
+          }
+        }
+
+        // 将 pwdCover 替换成 ●
+        this.pwdCover = val.replace(/\S/g, '●')
+        let v = val.replace(/●/g, '')
+        this.loginForm.password =
+          coverLen - realLen >= 2 ? realArr.join('') + v : realArr.join('')
+      }
+    },
+    // 点击右侧小眼睛控制显示隐藏
+    hidePassword() {
+      if (!this.isShowPassword) {
+        // console.log("显示");
+        this.isShowPassword = true
+        this.pwdCover = this.loginForm.password
+      } else {
+        // console.log("隐藏");
+        this.isShowPassword = false
+        this.pwdCover = this.pwdCover.replace(/\S/g, '●')
+      }
+    },
   },
 }
 </script>

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

@@ -1,10 +1,10 @@
 <template>
   <div class="question-login-wrapper">
     <div class="box-wrapper">
-      <h2 style="text-align:center;">
+      <h2 style="text-align: center">
         <!-- 中心调研表 -->
         <!-- 独立阅片人信息填写 -->
-        {{$t("trials:researchForm:form:title")}}
+        {{ $t('trials:researchForm:form:title') }}
       </h2>
       <el-card shadow="hover" style="padding-top: 40px">
         <el-form
@@ -12,30 +12,45 @@
           v-loading="loading"
           :model="form"
           label-width="150px"
-          style="width:80%;margin:0 auto;"
+          style="width: 80%; margin: 0 auto"
           :rules="rules"
           class="demo-ruleForm"
           size="small"
         >
           <!-- 联系邮箱 -->
-          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
-            <el-input v-model="form.EmailOrPhone" autocomplete="new-password" @change="handleEmailChange" />
+          <el-form-item
+            :label="$t('trials:researchForm:form:contactorEmail')"
+            prop="EmailOrPhone"
+          >
+            <el-input
+              v-model="form.EmailOrPhone"
+              autocomplete="new-password"
+              @change="handleEmailChange"
+            />
           </el-form-item>
           <!-- 验证码 -->
-          <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
+          <el-form-item
+            :label="$t('trials:researchForm:form:verifyCode')"
+            required
+          >
             <el-col :span="20">
               <el-form-item prop="VerificationCode">
-                <el-input v-model="form.VerificationCode" autocomplete="new-password" />
+                <el-input
+                  v-model="form.VerificationCode"
+                  autocomplete="new-password"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-button
                 size="small"
                 type="primary"
-                style="width:100%;"
+                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>
           <el-form-item>
@@ -44,10 +59,14 @@
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 提交 -->
-            <el-button size="small" type="primary" :loading="btnLoading" @click="onSubmit">
+            <el-button
+              size="small"
+              type="primary"
+              :loading="btnLoading"
+              @click="onSubmit"
+            >
               {{ $t('common:button:submit') }}
             </el-button>
-
           </el-form-item>
         </el-form>
       </el-card>
@@ -55,17 +74,23 @@
   </div>
 </template>
 <script>
-import { sendVerifyCode, verifySendCode, getTrialSurveyInitInfo } from '@/api/research'
+import {
+  sendVerifyCode,
+  verifySendCode,
+  getTrialSurveyInitInfo,
+} from '@/api/research'
 import { verifyEmialGetDoctorInfo, sendEmialVerifyCode } from '@/api/reviewers'
 import { login, getUserMenuTree, getUserPermissions } from '@/api/user'
 import store from '@/store'
-import {  mapMutations } from 'vuex'
+import { mapMutations } from 'vuex'
 export default {
   data() {
     var checkPhone = (rule, value, callback) => {
       const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
       if (!value) {
-        return callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+        return callback(
+          new Error(this.$t('trials:researchForm:formRule:specify'))
+        )
       }
       setTimeout(() => {
         if (!Number.isInteger(+value)) {
@@ -83,7 +108,8 @@ export default {
       if (value === '') {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
-        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           this.sendDisabled = false
           callback()
@@ -97,8 +123,12 @@ export default {
       if (value === '') {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
-        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
-        if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (
+          this.form.ReplaceUserEmailOrPhone &&
+          reg.test(this.form.ReplaceUserEmailOrPhone)
+        ) {
           callback()
         } else {
           callback(new Error(this.$t('trials:researchForm:formRule:email')))
@@ -120,26 +150,51 @@ export default {
         TrialSiteCode: '',
         IsUpdate: false,
         ReplaceUserEmailOrPhone: '',
-        VerificationCode: ''
+        VerificationCode: '',
       },
       rules: {
         SiteId: [
-          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: ['blur'],
+          },
         ],
         UserName: [
-          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] },
-          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
-        ],
-        Phone: [
-          { required: true, validator: checkPhone, trigger: ['blur'] }
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: ['blur'],
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur',
+          },
         ],
+        Phone: [{ required: true, validator: checkPhone, trigger: ['blur'] }],
         EmailOrPhone: [
-          { required: true, validator: validateEmail, trigger: ['blur', 'change'] }
+          {
+            required: true,
+            validator: validateEmail,
+            trigger: ['blur', 'change'],
+          },
         ],
         ReplaceUserEmailOrPhone: [
-          { required: true, validator: validateReplaceEmail, trigger: ['blur'] }
+          {
+            required: true,
+            validator: validateReplaceEmail,
+            trigger: ['blur'],
+          },
+        ],
+        VerificationCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: ['blur'],
+          },
         ],
-        VerificationCode: [{ required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }]
       },
       siteOptions: [],
       loading: false,
@@ -148,20 +203,19 @@ export default {
       sendTitle: this.$t('trials:researchForm:button:send'),
       count: '',
       timer: null,
-      isHaveSiteSurveyRecord: false
+      isHaveSiteSurveyRecord: false,
     }
   },
-  created(){
+  created() {
     this.$i18n.locale = this.$route.query.lang
     this.setLanguage(this.$route.query.lang)
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     // 提交
     onSubmit() {
-      this.$refs['resetForm'].validate(valid => {
+      this.$refs['resetForm'].validate((valid) => {
         if (valid) {
           // 登陆成功并跳转
           this.btnLoading = true
@@ -173,21 +227,44 @@ export default {
             emailOrPhone: this.form.EmailOrPhone,
             verificationCode: this.form.VerificationCode,
           }
-          verifyEmialGetDoctorInfo(param).then(async res => {
-            this.btnLoading = false
-            zzSessionStorage.clear()
-            store.dispatch('user/setToken', res.Result.Token)
-            zzSessionStorage.setItem('TokenKey', res.Result.Token)
-            var permissions = await getUserPermissions()
-            var menuTree = await getUserMenuTree()
-            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: `/ReviewersResearchForm?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''}&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus}&lang=${this.$route.query.lang}`})
-          }).catch(() => {
-            this.btnLoading = false
-            this.sendDisabled = false
-          })
+          if (this.$route.query.trialId) {
+            param.TrialId = this.$route.query.trialId
+          }
+          verifyEmialGetDoctorInfo(param)
+            .then(async (res) => {
+              this.btnLoading = false
+              zzSessionStorage.clear()
+              store.dispatch('user/setToken', res.Result.Token)
+              zzSessionStorage.setItem('TokenKey', res.Result.Token)
+              var permissions = await getUserPermissions()
+              var menuTree = await getUserMenuTree()
+              store.dispatch('user/setTree', menuTree.Result)
+              store.dispatch('user/setPermissions', permissions.Result)
+              // this.$router.push({ path: `/researchForm?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
+              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
+              this.sendDisabled = false
+            })
         } else {
           return false
         }
@@ -197,21 +274,24 @@ export default {
     handleSendCode() {
       this.sendDisabled = true
       const param = {
-        Email: this.form.EmailOrPhone
+        Email: this.form.EmailOrPhone,
       }
-      sendEmialVerifyCode(param).then(res => {
-        if (res.IsSuccess) {
-          this.getCode()
-        } else {
-          this.$alert(res.ErrorMessage)
-        }
-      }).catch(() => {
-        this.sendDisabled = false
-      })
+      sendEmialVerifyCode(param)
+        .then((res) => {
+          if (res.IsSuccess) {
+            this.getCode()
+          } else {
+            this.$alert(res.ErrorMessage)
+          }
+        })
+        .catch(() => {
+          this.sendDisabled = false
+        })
     },
     // 邮箱change事件
     handleEmailChange() {
-      var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+      var reg =
+        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
       if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
         this.sendDisabled = false
       } else {
@@ -226,21 +306,24 @@ export default {
         this.timer = setInterval(() => {
           if (this.count > 0 && this.count <= TIME_COUNT) {
             this.count--
-            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${this.count}s)`
+            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${
+              this.count
+            }s)`
             this.sendDisabled = true
           } else {
             this.sendDisabled = false
             this.sendTitle = this.$t('trials:researchForm:button:send')
             clearInterval(this.timer)
             this.timer = null
+            this.count = null
           }
         }, 1000)
       }
     },
     onCancel() {
       this.$refs['resetForm'].resetFields()
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

src/views/reviewers/components/Agreements.vue

@@ -190,7 +190,7 @@
         :label="$t('system:Agreements:table:Upload Time')"
         width="150"
       />
-      <el-table-column label="Action" width="400">
+      <el-table-column :label="$t('common:action:action')" width="400">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -257,6 +257,7 @@
               :on-remove="handleRemoveFile2"
               :show-file-list="true"
               :limit="1"
+              accept=".pdf"
               :file-list="fileList"
             >
               <el-button
@@ -265,6 +266,7 @@
                 :disabled="fileList.length > 0"
                 >{{ $t('common:button:upload') }}</el-button
               >
+              <span>{{ $t('system:tip:file:pdf') }}</span>
             </el-upload>
           </el-form-item>
           <el-form-item :label="$t('system:Agreements:label:Remark')">
@@ -272,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')">
@@ -352,6 +355,13 @@ export default {
         IsEnable: false,
       },
       rules: {
+        Remark: [
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
         CriterionType: [
           {
             required: true,
@@ -368,12 +378,14 @@ export default {
         ],
       },
       fileList: [],
+      accept: '.pdf',
     }
   },
   watch: {
     reviewerId() {
       if (this.reviewerId) {
         this.doctorId = this.reviewerId
+        this.initSowList()
       }
     },
   },
@@ -413,41 +425,66 @@ export default {
       this.form.FilePath = null
       this.fileList = []
     },
-    beforeUpload() {
+    beforeUpload(row) {
       if (this.fileList.length > 0) {
         this.$alert('最多只能传一个附件')
         return
       }
+      if (!this.checkFileSuffix(row.name)) {
+        this.$message.warning(`Must be in .pdf format`)
+        return false
+      }
     },
     handlePreview3(row) {
+      return this.$preview({
+        path: row.Path || row.FilePath,
+        type: 'pdf',
+        title: row.FileName,
+      })
       if (row.FilePath) {
         window.open(this.OSSclientConfig.basePath + row.FilePath, '_blank')
       }
     },
     handlePreview2(row, r2) {
+      return this.$preview({
+        path: row.Path || row.fullPath,
+        type: 'pdf',
+        title: row.FileName,
+      })
       if (row.fullPath) {
         window.open(this.OSSclientConfig.basePath + row.fullPath, '_blank')
       }
     },
-    async handleUploadFile(param) {
-      this.btnLoading = true
-      var fileName = param.file.name
-      let file = await this.fileToBlob(param.file)
-      let res = await this.OSSclient.put(
-        `/SystemData/reviewer/${
-          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
-        }/${this.doctorId}/${fileName}`,
-        file
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      return (
+        this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
       )
-      this.form.FileName = param.file.name
-      this.form.FilePath = this.$getObjectName(res.url)
-      this.fileList[0] = {
-        name: this.$getObjectName(res.url),
-        path: this.$getObjectName(res.url),
-        fullPath: this.$getObjectName(res.url),
-        url: res.url,
+    },
+    async handleUploadFile(param) {
+      try {
+        this.btnLoading = true
+        var fileName = param.file.name
+        let file = await this.fileToBlob(param.file)
+        let res = await this.OSSclient.put(
+          `/SystemData/reviewer/${
+            this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+          }/${this.doctorId}/${fileName}`,
+          file
+        )
+        this.form.FileName = param.file.name
+        this.form.FilePath = this.$getObjectName(res.url)
+        this.fileList[0] = {
+          name: this.$getObjectName(res.url),
+          path: this.$getObjectName(res.url),
+          fullPath: this.$getObjectName(res.url),
+          url: res.url,
+        }
+        this.btnLoading = false
+      } catch (err) {
+        console.log(err)
       }
-      this.btnLoading = false
     },
     handleCancle() {
       this.model_cfg.visible = false
@@ -476,6 +513,7 @@ export default {
         FilePath: null,
         DoctorId: null,
         CriterionType: null,
+        IsEnable: false,
       }
       this.handleRemoveFile2()
       this.form.FileType = fileType
@@ -497,6 +535,12 @@ export default {
       })
     },
     handlePreview(row) {
+      console.log(row)
+      return this.$preview({
+        path: row.Path || row.FullPath,
+        type: 'pdf',
+        title: row.FileName,
+      })
       if (row.FullPath) {
         window.open(this.OSSclientConfig.basePath + row.FullPath, '_blank')
       }

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

@@ -37,7 +37,13 @@
         min-width="70"
         show-overflow-tooltip
       >
-        <template slot-scope="scope">
+        <template
+          slot-scope="scope"
+          v-if="$fd('Degree', Number(scope.row.Degree))"
+        >
+          {{ $fd('Degree', Number(scope.row.Degree)) }}
+        </template>
+        <template slot-scope="scope" v-else>
           {{
             scope.row.DegreeCN
               ? `${scope.row.Degree} / ${scope.row.DegreeCN}`
@@ -53,7 +59,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.MajorCN
+            !isEN
               ? `${scope.row.Major} / ${scope.row.MajorCN}`
               : scope.row.Major
           }}
@@ -67,7 +73,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.OrganizationCN
+            !isEN
               ? `${scope.row.Organization} / ${scope.row.OrganizationCN}`
               : scope.row.Organization
           }}
@@ -81,9 +87,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.CityCN
-              ? `${scope.row.City} / ${scope.row.CityCN}`
-              : scope.row.City
+            !isEN ? `${scope.row.City} / ${scope.row.CityCN}` : scope.row.City
           }}
         </template>
       </el-table-column>
@@ -95,7 +99,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.ProvinceCN
+            !isEN
               ? `${scope.row.Province} / ${scope.row.ProvinceCN}`
               : scope.row.Province
           }}
@@ -109,7 +113,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.CountryCN
+            !isEN
               ? `${scope.row.Country} / ${scope.row.CountryCN}`
               : scope.row.Country
           }}
@@ -177,9 +181,15 @@
         min-width="70"
         show-overflow-tooltip
       >
-        <template slot-scope="scope">
+        <template
+          slot-scope="scope"
+          v-if="$fd('Training', Number(scope.row.Training))"
+        >
+          {{ $fd('Training', Number(scope.row.Training)) }}
+        </template>
+        <template slot-scope="scope" v-else>
           {{
-            scope.row.TrainingCN
+            !isEN
               ? `${scope.row.Training} / ${scope.row.TrainingCN}`
               : scope.row.Training
           }}
@@ -193,7 +203,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.MajorCN
+            !isEN
               ? `${scope.row.Major} / ${scope.row.MajorCN}`
               : scope.row.Major
           }}
@@ -206,11 +216,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{
-            scope.row.HospitalCN
-              ? `${scope.row.Hospital} / ${scope.row.HospitalCN}`
-              : scope.row.Hospital
-          }}
+          {{ !isEN ? scope.row.HospitalCN : scope.row.Hospital }}
         </template>
       </el-table-column>
       <el-table-column
@@ -221,7 +227,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.SchoolCN
+            !isEN
               ? `${scope.row.School} / ${scope.row.SchoolCN}`
               : scope.row.School
           }}
@@ -235,9 +241,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.CityCN
-              ? `${scope.row.City} / ${scope.row.CityCN}`
-              : scope.row.City
+            !isEN ? `${scope.row.City} / ${scope.row.CityCN}` : scope.row.City
           }}
         </template>
       </el-table-column>
@@ -249,7 +253,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.ProvinceCN
+            !isEN
               ? `${scope.row.Province} / ${scope.row.ProvinceCN}`
               : scope.row.Province
           }}
@@ -263,7 +267,7 @@
       >
         <template slot-scope="scope">
           {{
-            scope.row.CountryCN
+            !isEN
               ? `${scope.row.Country} / ${scope.row.CountryCN}`
               : scope.row.Country
           }}
@@ -279,14 +283,14 @@
             size="small"
             :disabled="$route.query.ReviewStatus === '1'"
             @click="handlePostgraduateEdit(scope.row)"
-            >Edit</el-button
+            >{{ $t('common:button:edit') }}</el-button
           >
           <el-button
             type="text"
             size="small"
             :disabled="$route.query.ReviewStatus === '1'"
             @click="handlePostgraduateDelete(scope.row)"
-            >Delete</el-button
+            >{{ $t('common:button:delete') }}</el-button
           >
         </template>
       </el-table-column>
@@ -298,6 +302,7 @@
       :visible.sync="educationDialogVisible"
       width="40%"
       :close-on-click-modal="false"
+      append-to-body
     >
       <el-form
         v-if="educationDialogVisible"
@@ -341,9 +346,9 @@
         >
           <el-select v-model="educationForm.Degree" size="small">
             <el-option
-              v-for="item in degreeOptions"
-              :key="item.value"
-              :label="item.value"
+              v-for="item in $d.Degree"
+              :key="item.id"
+              :label="item.label"
               :value="item.value"
             />
           </el-select>
@@ -359,6 +364,7 @@
                 v-model="educationForm.Major"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -366,6 +372,7 @@
                 v-model="educationForm.MajorCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -380,6 +387,7 @@
                 v-model="educationForm.Organization"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -387,6 +395,7 @@
                 v-model="educationForm.OrganizationCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -401,6 +410,7 @@
                 v-model="educationForm.City"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -408,6 +418,7 @@
                 v-model="educationForm.CityCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -422,6 +433,7 @@
                 v-model="educationForm.Province"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -429,6 +441,7 @@
                 v-model="educationForm.ProvinceCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -443,6 +456,7 @@
                 v-model="educationForm.Country"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -450,6 +464,7 @@
                 v-model="educationForm.CountryCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -472,6 +487,7 @@
       :visible.sync="postgraduateDialogVisible"
       width="40%"
       :close-on-click-modal="false"
+      append-to-body
     >
       <el-form
         v-if="postgraduateDialogVisible"
@@ -515,12 +531,12 @@
         >
           <el-select
             v-model="postgraduateForm.Training"
-            placeholder="Please select"
-            size="small"
+            clearable
+            placeholder=""
           >
             <el-option
-              v-for="item in TrainingOptions"
-              :key="item.value"
+              v-for="item in $d.Training"
+              :key="item.id"
               :label="item.label"
               :value="item.value"
             />
@@ -536,6 +552,7 @@
                 v-model="postgraduateForm.Major"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -543,6 +560,7 @@
                 v-model="postgraduateForm.MajorCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -553,18 +571,26 @@
         >
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
-              <el-input
+              <el-autocomplete
+                clearable
+                class="inline-input"
+                style="width: 100%"
                 v-model="postgraduateForm.Hospital"
+                :fetch-suggestions="querySearch"
+                @select="handleSelect"
                 placeholder="Please specify in English"
-                size="small"
-              />
+              ></el-autocomplete>
             </el-col>
             <el-col :span="11">
-              <el-input
+              <el-autocomplete
+                clearable
+                class="inline-input"
+                style="width: 100%"
                 v-model="postgraduateForm.HospitalCN"
+                :fetch-suggestions="querySearchCN"
+                @select="handleSelect"
                 placeholder="请用中文注明"
-                size="small"
-              />
+              ></el-autocomplete>
             </el-col>
           </el-row>
         </el-form-item>
@@ -578,6 +604,7 @@
                 v-model="postgraduateForm.School"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -585,6 +612,7 @@
                 v-model="postgraduateForm.SchoolCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -600,6 +628,7 @@
                 v-model="postgraduateForm.City"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -607,6 +636,7 @@
                 v-model="postgraduateForm.CityCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -621,6 +651,7 @@
                 v-model="postgraduateForm.Province"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -628,6 +659,7 @@
                 v-model="postgraduateForm.ProvinceCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -642,6 +674,7 @@
                 v-model="postgraduateForm.Country"
                 placeholder="Please specify in English"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
             <el-col :span="11">
@@ -649,6 +682,7 @@
                 v-model="postgraduateForm.CountryCN"
                 placeholder="请用中文注明"
                 size="small"
+                :maxlength="400"
               />
             </el-col>
           </el-row>
@@ -674,6 +708,8 @@ import {
   addOrUpdatePostgraduateInfo,
   deletePostgraduateInfo,
 } from '@/api/reviewers'
+import store from '@/store'
+import { mapGetters } from 'vuex'
 const getEducationDefault = () => {
   return {
     Id: '',
@@ -712,6 +748,7 @@ const getPostgraduateDefault = () => {
     ProvinceCN: '',
     Country: '',
     CountryCN: '',
+    HospitalId: null,
   }
 }
 export default {
@@ -748,7 +785,6 @@ export default {
             message: 'Please enter the degree',
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         Major: [
           {
@@ -756,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: [
           {
@@ -764,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: [
           {
@@ -776,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: [
           {
@@ -784,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,
@@ -846,7 +937,6 @@ export default {
             message: 'Please enter the degree',
             trigger: 'blur',
           },
-          { max: 100, message: 'The maximum length is 100' },
         ],
         Major: [
           {
@@ -854,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: [
           {
@@ -866,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: [
           {
@@ -874,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: {
@@ -903,12 +1051,81 @@ export default {
       },
       isDisabled: false,
       loading: false,
+      hospitalSelectList: [],
+      hospitalSelectListCN: [],
     }
   },
+  computed: {
+    ...mapGetters(['hospitalList']),
+    isEN() {
+      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) {
@@ -935,6 +1152,7 @@ export default {
       this.educationDialogTitle = 'Edit'
       this.educationDialogVisible = true
       this.educationForm = param
+      this.educationForm.Degree = Number(this.educationForm.Degree)
     },
 
     handleEducationSave() {
@@ -1002,6 +1220,7 @@ export default {
       this.postgraduateDialogTitle = 'Edit'
       this.postgraduateDialogVisible = true
       this.postgraduateForm = param
+      this.postgraduateForm.Training = Number(this.postgraduateForm.Training)
     },
     handlePostgraduateSave() {
       this.$refs.postgraduateForm.validate((valid) => {

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,100 +244,48 @@
                   v-model="employmentForm.RankOtherCN"
                   placeholder="请用中文注明"
                   size="small"
+                  :maxlength="400"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="14">
+              <el-form-item
+                :label="$t('system:reviewer:label:WorkPartTime')"
+                prop="WorkPartTime"
+              >
+                <el-input
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  v-model="employmentForm.WorkPartTime"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="
+                    $t('curriculumVitae:info:form:placeholder:partTimeJob')
+                  "
+                  size="small"
+                  :maxlength="4000"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="14">
+              <el-form-item prop="WorkPartTimeEn">
+                <el-input
+                  :disabled="$route.query.ReviewStatus === '1'"
+                  v-model="employmentForm.WorkPartTimeEn"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="
+                    $t('curriculumVitae:info:form:placeholder:partTimeJobEN')
+                  "
+                  size="small"
+                  :maxlength="4000"
                 />
               </el-form-item>
             </el-col>
           </el-row>
-
-          <!--          <el-row>-->
-          <!--            <el-col :span="14">-->
-          <!--              <el-form-item label="Physician: " prop="PhysicianId" >-->
-          <!--                <el-select-->
-          <!--                  v-model="employmentForm.PhysicianId"-->
-          <!--                  placeholder="select"-->
-          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-          <!--                  @change="PhysicianChange"-->
-          <!--                  style="width:100%;"-->
-          <!--                  size="small"-->
-          <!--                >-->
-          <!--                  <el-option-->
-          <!--                    v-for="item of $d.PhysicianOriginal"-->
-          <!--                    :key="item.id"-->
-          <!--                    :label="item.raw.Value"-->
-          <!--                    :value="item.id"-->
-          <!--                  />-->
-          <!--                </el-select>-->
-          <!--              </el-form-item>-->
-          <!--            </el-col>-->
-          <!--            <el-col :span="5">-->
-          <!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="Physician">-->
-          <!--                <el-input-->
-          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-          <!--                  v-model="employmentForm.Physician"-->
-          <!--                  placeholder="Please specify"-->
-          <!--                  size="small"-->
-          <!--                />-->
-          <!--              </el-form-item>-->
-          <!--            </el-col>-->
-          <!--            <el-col :span="5">-->
-          <!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="PhysicianCN">-->
-          <!--                <el-input-->
-          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-          <!--                  v-model="employmentForm.PhysicianCN"-->
-          <!--                  placeholder="请用中文注明"-->
-          <!--                  size="small"-->
-          <!--                />-->
-          <!--              </el-form-item>-->
-          <!--            </el-col>-->
-          <!--          </el-row>-->
-          <!--          <el-row>-->
-          <!--            <el-col :span="14">-->
-          <!--              <el-form-item label="Position: " prop="PositionId">-->
-          <!--                <el-select-->
-          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-          <!--                  v-model="employmentForm.PositionId"-->
-          <!--                  placeholder="select"-->
-          <!--                  style="width:100%;"-->
-          <!--                  size="small"-->
-          <!--                >-->
-          <!--                  &lt;!&ndash; <el-option-->
-          <!--                    v-for="(key,value) of dictionaryList.Position"-->
-          <!--                    :key="key"-->
-          <!--                    :label="key"-->
-          <!--                    :value="value"-->
-          <!--                  /> &ndash;&gt;-->
-          <!--                  <el-option-->
-          <!--                    v-for="item of dictionaryList.Position"-->
-          <!--                    :key="item.Id"-->
-          <!--                    :label="item.Value"-->
-          <!--                    :value="item.Id"-->
-          <!--                  />-->
-          <!--                  <el-option label="Other" :value="otherId" />-->
-          <!--                  <el-option label="None" value="f30a074b-2b47-4a92-97ec-e15086d37883" />-->
-          <!--                </el-select>-->
-          <!--              </el-form-item>-->
-          <!--            </el-col>-->
-          <!--            <el-col :span="5">-->
-          <!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOther">-->
-          <!--                <el-input-->
-          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-          <!--                  v-model="employmentForm.PositionOther"-->
-          <!--                  placeholder="Please specify"-->
-          <!--                  size="small"-->
-          <!--                />-->
-          <!--              </el-form-item>-->
-          <!--            </el-col>-->
-          <!--            <el-col :span="5">-->
-          <!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOtherCN">-->
-          <!--                <el-input-->
-          <!--                  :disabled="$route.query.ReviewStatus === '1'"-->
-          <!--                  v-model="employmentForm.PositionOtherCN"-->
-          <!--                  placeholder="请用中文注明"-->
-          <!--                  size="small"-->
-          <!--                />-->
-          <!--              </el-form-item>-->
-          <!--            </el-col>-->
-          <!--          </el-row>-->
 
           <el-form-item>
             <el-button
@@ -331,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('请输入适应症'))
         }
@@ -339,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('请输入适应症'))
         }
@@ -363,12 +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,
@@ -378,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: [
           {
@@ -405,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: [
           {
@@ -413,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: [
           {
@@ -422,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,
@@ -437,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 {
@@ -462,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 {
@@ -481,6 +606,8 @@ export default {
           // })
           param.Id = this.$route.query.Id || this.reviewerId
           param.DepartmentId = this.employmentForm.DepartmentId
+          param.WorkPartTime = this.employmentForm.WorkPartTime
+          param.WorkPartTimeEn = this.employmentForm.WorkPartTimeEn
           param.DepartmentOther =
             this.employmentForm.DepartmentId === this.otherId
               ? this.employmentForm.DepartmentOther
@@ -512,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
@@ -548,7 +683,24 @@ 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
             this.employmentForm.DepartmentId =
               DepartmentId === this.selectId ? '' : DepartmentId
@@ -577,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

@@ -1,11 +1,47 @@
 <template>
   <div class="gcp-container">
-    <el-radio-group v-model="GCP" style="margin-bottom:20px">
-      <el-radio :label="1">{{ $t('system:GcpCertificate:radio:Yes') }}</el-radio>
+    <el-radio-group v-model="GCP" style="margin-bottom: 20px">
+      <el-radio :label="1">{{
+        $t('system:GcpCertificate:radio:Yes')
+      }}</el-radio>
       <el-radio :label="0">{{ $t('system:GcpCertificate:radio:No') }}</el-radio>
     </el-radio-group>
+    <el-form
+      ref="certificateFrom"
+      v-loading="saveBtnLoading"
+      :model="certificateForm"
+      :rules="certificateRules"
+      label-width="80px"
+      size="small"
+    >
+      <el-form-item
+        :label="$t('curriculumVitae:clinicalTrials:form:CertificateTime')"
+        prop="GCPTime"
+        v-if="GCP"
+      >
+        <el-date-picker
+          v-model="certificateForm.GCPTime"
+          type="date"
+          placeholder=""
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item
+        :label="$t('curriculumVitae:clinicalTrials:form:certificateHospital')"
+        prop="GCPAgencies"
+        v-if="GCP"
+      >
+        <el-input
+          v-model="certificateForm.GCPAgencies"
+          clearable
+          :maxlength="400"
+        ></el-input>
+      </el-form-item>
+    </el-form>
     <div v-if="GCP" class="upload-container">
-<!--      <upload-file :doctor-id="doctorId" type="GCP" />-->
+      <!--      <upload-file :doctor-id="doctorId" type="GCP" />-->
       <el-upload
         class="upload-demo"
         action
@@ -19,12 +55,23 @@
         :on-exceed="handleExceed"
         accept=".pdf"
       >
-        <el-button size="small" type="primary" :loading="btnDisabled">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
-        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">{{ $t('system:tip:file:pdf') }}</span>
+        <el-button size="small" type="primary" :loading="btnDisabled">{{
+          $t('system:GcpCertificate:upload:Upload')
+        }}</el-button>
+        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">{{
+          $t('system:tip:file:pdf')
+        }}</span>
       </el-upload>
     </div>
     <div>
-      <el-button :loading="saveBtnLoading" :disabled="(fileList.length === 0 && GCP === 1)" type="primary" size="small" style="margin-top:20px" @click="handleSaveGCP">
+      <el-button
+        :loading="saveBtnLoading"
+        :disabled="fileList.length === 0 && GCP === 1"
+        type="primary"
+        size="small"
+        style="margin-top: 20px"
+        @click="handleSaveGCP"
+      >
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -32,26 +79,43 @@
 </template>
 <script>
 import UploadFile from '@/components/UploadFile'
-import { uploadFile, deleteAttachment, getAttachmentByType, saveAttachments } from '@/api/attachment'
+import {
+  uploadFile,
+  deleteAttachment,
+  getAttachmentByType,
+  saveAttachments,
+} from '@/api/attachment'
 import { updateGcpExperience } from '@/api/reviewers'
+const defaultCertificateForm = () => {
+  return {
+    GCPTime: '',
+    GCPAgencies: '',
+  }
+}
 export default {
   name: 'GcpCertificate',
   components: {
-    UploadFile
+    UploadFile,
   },
   props: {
     doctorId: {
       type: String,
-      required: true
+      required: true,
     },
     gcp: {
       type: Number,
-      default: 0
+      default: 0,
     },
     gcpId: {
       type: String,
-      default: ''
-    }
+      default: '',
+    },
+    DATA: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
   },
   data() {
     return {
@@ -59,7 +123,17 @@ export default {
       btnDisabled: false,
       saveBtnLoading: false,
       GCP: 0,
-      GCPID: ''
+      GCPID: '',
+      certificateForm: defaultCertificateForm(),
+      certificateRules: {
+        GCPAgencies: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
     }
   },
   watch: {
@@ -68,7 +142,16 @@ export default {
     },
     gcpId(val) {
       this.GCPID = val
-    }
+    },
+    DATA: {
+      handler() {
+        Object.keys(this.certificateForm).forEach((key) => {
+          this.certificateForm[key] = this.DATA[key]
+        })
+      },
+      immediate: true,
+      deep: true,
+    },
   },
   mounted() {
     this.initFileList()
@@ -76,48 +159,53 @@ export default {
   methods: {
     handleSaveGCP() {
       if (this.GCP && this.GCPID === '') {
-        this.$message.info(this.$t('reviewers:GCPCertificate:message:uploadValid'))
+        this.$message.info(
+          this.$t('reviewers:GCPCertificate:message:uploadValid')
+        )
         return
       }
 
       const param = {
         Id: this.doctorId,
         GCP: this.GCP,
-        GCPId: this.GCP ? this.GCPID : ''
+        GCPId: this.GCP ? this.GCPID : '',
+        GCPTime: this.GCP ? this.certificateForm.GCPTime : '',
+        GCPAgencies: this.GCP ? this.certificateForm.GCPAgencies : '',
       }
       this.saveBtnLoading = true
-      updateGcpExperience(param).then(res => {
-        if (this.GCP === 0) {
-          this.fileList = []
-        }
-        this.saveBtnLoading = false
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-      }).catch(() => {
-        this.saveBtnLoading = false
-      })
+      updateGcpExperience(param)
+        .then((res) => {
+          if (this.GCP === 0) {
+            this.fileList = []
+          }
+          this.saveBtnLoading = false
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        })
+        .catch(() => {
+          this.saveBtnLoading = false
+        })
     },
     initFileList() {
-      if(!this.doctorId) return
-      getAttachmentByType(this.doctorId, 'GCP')
-        .then(res => {
-          if (res.IsSuccess) {
-            if (res.Result.length > 0) {
-              this.fileList = this.formatterFileList(res.Result)
-            } else {
-              this.fileList = []
-            }
+      if (!this.doctorId) return
+      getAttachmentByType(this.doctorId, 'GCP').then((res) => {
+        if (res.IsSuccess) {
+          if (res.Result.length > 0) {
+            this.fileList = this.formatterFileList(res.Result)
+          } else {
+            this.fileList = []
           }
-        })
+        }
+      })
     },
     formatterFileList(list) {
       var arr = []
-      list.forEach(item => {
+      list.forEach((item) => {
         var data = {
           name: item.FileName,
           path: item.Path,
           fullPath: item.FullPath,
           id: item.Id,
-          type: item.Type
+          type: item.Type,
         }
         arr.push(data)
       })
@@ -127,8 +215,17 @@ export default {
       var fileName = param.file.name
       this.btnDisabled = true
       const file = await this.fileToBlob(param.file)
-      const res = await this.OSSclient.put(`/SystemData/reviewer/GCP/${this.doctorId}/${fileName}`, file)
-      this.fileList.push({ name: fileName, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url),url: this.$getObjectName(res.url), type: 'GCP' })
+      const res = await this.OSSclient.put(
+        `/SystemData/reviewer/GCP/${this.doctorId}/${fileName}`,
+        file
+      )
+      this.fileList.push({
+        name: fileName,
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: this.$getObjectName(res.url),
+        type: 'GCP',
+      })
       this.saveFile()
     },
     // uploadFile(param) {
@@ -147,15 +244,24 @@ export default {
     // },
     saveFile() {
       const { name, path, fullPath, type } = this.fileList[0]
-      const param = [{ DoctorId: this.doctorId, Type: type, Path: path, FullPath: fullPath, FileName: name }]
-      saveAttachments(param).then(res => {
-        this.btnDisabled = false
-        if (res.IsSuccess) {
-          this.fileList[0].id = res.Result[0].Id
-          this.GCPID = res.Result[0].Id
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }
-      })
+      const param = [
+        {
+          DoctorId: this.doctorId,
+          Type: type,
+          Path: path,
+          FullPath: fullPath,
+          FileName: name,
+        },
+      ]
+      saveAttachments(param)
+        .then((res) => {
+          this.btnDisabled = false
+          if (res.IsSuccess) {
+            this.fileList[0].id = res.Result[0].Id
+            this.GCPID = res.Result[0].Id
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          }
+        })
         .catch(() => {
           this.btnDisabled = false
         })
@@ -177,19 +283,19 @@ export default {
     handleRemoveFile(file, fileList) {
       if (file && file.status === 'success') {
         if (file.id) {
-          deleteAttachment(file.id, file.path).then(res => {
+          deleteAttachment(file.id, file.path).then((res) => {
             if (res.IsSuccess) {
               this.fileList = []
               this.GCPID = ''
               this.$message({
                 message: this.$t('common:message:deletedSuccessfully'),
-                type: 'success'
+                type: 'success',
               })
             }
           })
         } else {
           this.fileList = []
-           this.GCPID = ''
+          this.GCPID = ''
         }
       }
     },
@@ -202,18 +308,20 @@ export default {
       this.$message.warning(`Upload is currently limited to 1 file`)
     },
     fileValid(fileName, typeArr) {
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) > -1) {
         return true
       } else {
         return false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-.gcp-container{
+.gcp-container {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;

src/views/reviewers/components/Pay.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="form-container basic-form">
+    <el-card class="box-card">
+      <div style="width: 1000px">
+        <!-- v-loading="loading" -->
+        <el-form
+          ref="payForm"
+          v-loading="loading"
+          :inline="true"
+          :rules="rules"
+          :model="form"
+          class="demo-ruleForm"
+          label-width="120px"
+          size="small"
+        >
+          <div>{{ $t('system:reviewer:title:pay') }}</div>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:reviewer:label:BankNum')"
+                prop="BankNum"
+              >
+                <el-input
+                  v-model="form.BankNum"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:reviewer:label:BankName')"
+                prop="BankName"
+              >
+                <el-input
+                  v-model="form.BankName"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:reviewer:label:OpeningBank')"
+                prop="OpeningBank"
+              >
+                <el-input
+                  v-model="form.OpeningBank"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:reviewer:label:IdCard')"
+                prop="IdCard"
+              >
+                <el-input
+                  v-model="form.IdCard"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                :label="$t('system:reviewer:label:BankPhoneNum')"
+                prop="BankPhoneNum"
+              >
+                <el-input
+                  v-model="form.BankPhoneNum"
+                  clearable
+                  size="small"
+                  :maxlength="400"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-form-item style="margin-left: 120px">
+              <el-button
+                :disabled="$route.query.ReviewStatus === '1'"
+                type="primary"
+                :loading="loading"
+                size="small"
+                @click="handleSave"
+              >
+                {{ $t('common:button:save') }}</el-button
+              >
+            </el-form-item>
+          </el-row>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+import { getDetail, updatePaymentMode } from '@/api/reviewers'
+export default {
+  props: {
+    reviewerId: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      form: {
+        BankNum: '',
+        BankName: '',
+        OpeningBank: '',
+        IdCard: '',
+        BankPhoneNum: '',
+      },
+      rules: {
+        BankNum: [
+          {
+            validator: (rule, value, callback) => {
+              let reg = new RegExp(/^[A-Za-z0-9]+$/, 'ig')
+              if (value && !reg.test(value)) {
+                callback(new Error(this.$t('common:ruleMessage:pattern')))
+              } else {
+                callback()
+              }
+            },
+            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: [
+          {
+            validator: (rule, value, callback) => {
+              let reg = new RegExp(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/, 'ig')
+              if (value && !reg.test(value)) {
+                callback(new Error(this.$t('common:ruleMessage:pattern')))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BankPhoneNum: [
+          {
+            validator: (rule, value, callback) => {
+              let reg = new RegExp(/^\d{11}$/, 'i')
+              if (value && !reg.test(value)) {
+                callback(new Error(this.$t('common:ruleMessage:pattern')))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.getDetail()
+  },
+  methods: {
+    async handleSave() {
+      try {
+        let validate = await this.$refs.payForm.validate()
+        if (!validate) return false
+        this.form.Id = this.$route.query.Id || this.reviewerId
+        this.loading = true
+        let res = await updatePaymentMode(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 获取详情
+    async getDetail() {
+      try {
+        let id = this.$route.query.Id || this.reviewerId
+        if (!id) return false
+        this.loading = true
+        let res = await getDetail(id)
+        this.loading = false
+        if (res.IsSuccess) {
+          Object.keys(this.form).forEach((key) => {
+            this.form[key] = res.Result.PaymentModeInfo[key]
+          })
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+  },
+}
+</script>

src/views/reviewers/components/ResearchPublication.vue

@@ -5,8 +5,10 @@
       v-loading="loading"
       label-width="140px"
       :model="researchForm"
+      :rules="rule"
       size="small"
     >
+      <div class="title">{{ $t('system:reviewer:title:Research') }}</div>
       <el-form-item :label="$t('system:reviewer:label:Field of Research')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
@@ -17,6 +19,7 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
           <el-col :span="11">
@@ -27,6 +30,7 @@
               rows="5"
               placeholder="请用中文注明"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
         </el-row>
@@ -41,6 +45,7 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
           <el-col :span="11">
@@ -51,13 +56,15 @@
               rows="5"
               placeholder="请用中文注明"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
         </el-row>
       </el-form-item>
+      <div class="title">{{ $t('system:reviewer:title:Publications') }}</div>
       <el-form-item :label="$t('system:reviewer:label:Publications')">
         <el-row type="flex" justify="space-between">
-          <el-col :span="11">
+          <el-col :span="24">
             <el-input
               :disabled="$route.query.ReviewStatus === '1'"
               v-model="researchForm.Publications"
@@ -65,13 +72,12 @@
               rows="5"
               placeholder="Please specify in English"
               size="small"
+              :maxlength="4000"
             />
           </el-col>
-          <el-col :span="11">
-            <!-- <el-input v-model="researchForm.PublicationsCN" type="textarea" rows="5" placeholder="请用中文注明" size="small" /> -->
-          </el-col>
         </el-row>
       </el-form-item>
+      <div class="title">{{ $t('system:reviewer:title:AH') }}</div>
       <el-form-item :label="$t('system:reviewer:label:Awards & Honors')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
@@ -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,
     }
@@ -184,3 +243,13 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.title {
+  width: 100%;
+  background-color: #eee;
+  line-height: 30px;
+  padding-left: 10px;
+  border-radius: 3px;
+  margin-bottom: 20px;
+}
+</style>

src/views/reviewers/components/Resumes.vue

@@ -241,10 +241,11 @@ export default {
     reviewerId() {
       if (this.reviewerId) {
         this.doctorId = this.reviewerId
+        this.getResumeList()
       }
     },
   },
-  created() {
+  mounted() {
     if (!this.doctorId) return
     this.getResumeList()
   },

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>
@@ -113,7 +122,7 @@
 
         <el-form-item :label="$t('system:Setting:label:On Vacation:')">
           <span style="font-size: 12px; margin-right: 20px">{{
-            checkForm.InHoliday
+            InHoliday
           }}</span>
           <el-button type="text" @click="handleView">{{
             $t('system:Setting:Planned Vacation')
@@ -128,6 +137,7 @@
             type="textarea"
             style="width: 60%"
             rows="8"
+            :maxlength="4000"
           />
         </el-form-item>
 
@@ -147,6 +157,7 @@
       width="50%"
       :close-on-click-modal="false"
       @close="closeDialog"
+      append-to-body
     >
       <div>
         <el-date-picker
@@ -216,6 +227,7 @@ import {
   getVacationList,
   addOrUpdateVacation,
   deleteVacation,
+  getIsVacation,
 } from '@/api/reviewers'
 import { fmtDate } from '@/utils/formatter'
 export default {
@@ -243,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,
@@ -258,19 +295,38 @@ export default {
       pageSize: 5,
       totalItems: 0,
       loading2: false,
+      InHoliday: '',
     }
   },
   watch: {
     reviewerId() {
       if (this.reviewerId) {
         this.doctorId = this.reviewerId
+        this.initForm()
+        this.getIsVacation()
       }
     },
   },
   mounted() {
     this.initForm()
+    this.getIsVacation()
   },
   methods: {
+    // 获取是否休假
+    async getIsVacation() {
+      if (!this.doctorId) return false
+      try {
+        let data = {
+          DoctorId: this.doctorId,
+        }
+        let res = await getIsVacation(data)
+        if (res.IsSuccess) {
+          this.InHoliday = res.Result.IsVacation ? 'Yes' : 'No'
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     initForm() {
       if (!this.doctorId) return
       getAuditState(this.doctorId).then((res) => {
@@ -380,7 +436,7 @@ export default {
         .catch((action) => {})
     },
     closeDialog() {
-      this.initForm()
+      this.getIsVacation()
     },
     handleChange() {
       if (

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

@@ -0,0 +1,357 @@
+<template>
+  <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="100px"
+        >
+          <el-form-item
+            :label="$t('system:reviewer:label:Indication')"
+            prop="Indication"
+          >
+            <el-input
+              v-model="form.Indication"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:Indication')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item prop="IndicationEn">
+            <el-input
+              v-model="form.IndicationEn"
+              :placeholder="
+                $t('curriculumVitae:summarize:form:placeholder:IndicationEn')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item
+            :label="$t('system:reviewer:label:Summarize')"
+            prop="Summarize"
+          >
+            <el-input
+              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"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave"
+          :loading="loading"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+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,
+      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',
+          },
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.getDetail()
+  },
+  methods: {
+    async handleSave() {
+      try {
+        let validate = await this.$refs.summarizeFrom.validate()
+        if (!validate) return false
+        this.form.DoctorId = this.$route.query.Id || this.reviewerId
+        this.loading = true
+        if (this.$route.query.trialId) {
+          this.form.TrialId = this.$route.query.trialId
+        }
+        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
+        console.log(err)
+      }
+    },
+    // 获取详情
+    async getDetail() {
+      try {
+        let id = this.$route.query.Id || this.reviewerId
+        if (!id) return false
+        this.loading = true
+        let res = await getSummarizeInfo({
+          DoctorId: id,
+        })
+        this.loading = false
+        if (res.IsSuccess) {
+          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>
+  <style lang="scss" scoped>
+.basic-form {
+  .el-input--small {
+    width: 220px !important;
+  }
+  .el-select--small {
+    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

@@ -23,7 +23,13 @@
           prop="Phase"
           :label="$t('system:TrialExperience:title:Phase')"
           min-width="50"
-        />
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.OtherStages ? scope.row.OtherStages : scope.row.Phase
+            }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="EvaluationCriteriaList"
           :label="$t('system:TrialExperience:title:Review Criteria')"
@@ -35,6 +41,13 @@
                 ? scope.row.EvaluationCriteriaList.join(', ')
                 : ''
             }}
+            <span v-if="scope.row.OtherCriterion">
+              {{
+                scope.row.EvaluationCriteriaList.length > 0
+                  ? `, ${scope.row.OtherCriterion}`
+                  : scope.row.OtherCriterion
+              }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -44,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
             >
@@ -59,7 +73,16 @@
           prop="EvaluationContent"
           :label="$t('system:TrialExperience:Indication')"
           min-width="70"
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.EvaluationContent">
+              {{ scope.row.EvaluationContent }}
+            </span>
+            <span v-else>
+              {{ $fd('Indication', scope.row.IndicationEnum) }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('system:TrialExperience:Operation')"
           min-width="200"
@@ -71,15 +94,16 @@
               :disabled="$route.query.ReviewStatus === '1'"
               @click="handleEdit(scope.row)"
             >
-              {{ $t('common:button:edit') }}</el-button
-            >
+              {{ $t('common:button:edit') }}
+            </el-button>
             <el-button
               type="text"
               size="small"
               :disabled="$route.query.ReviewStatus === '1'"
               @click="handleDel(scope.row)"
-              >{{ $t('common:button:delete') }}</el-button
             >
+              {{ $t('common:button:delete') }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -89,7 +113,12 @@
       <p>{{ $t('system:TrialExperience:title:GCP Certificate') }}</p>
     </div>
     <div style="margin-left: 40px; width: 40%">
-      <gcp-certificate :doctor-id="doctorId" :gcp="GCP" :gcp-id="GCPID" />
+      <gcp-certificate
+        :doctor-id="doctorId"
+        :gcp="GCP"
+        :gcp-id="GCPID"
+        :DATA="GCPData"
+      />
     </div>
     <div class="title-wrapper" style="margin-top: 10px">
       <p>{{ $t('system:TrialExperience:title:Other Relevant Experience') }}</p>
@@ -100,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">
@@ -110,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>
@@ -132,6 +163,7 @@
       :visible.sync="clinicalTrialDialogVisible"
       width="480px"
       :close-on-click-modal="false"
+      append-to-body
     >
       <el-form
         ref="clinicalTrialForm"
@@ -145,13 +177,11 @@
           :label="$t('system:TrialExperience:label:Phase')"
           prop="PhaseId"
         >
-          <el-select v-model="clinicalTrialForm.PhaseId">
-            <!-- <el-option
-              v-for="(key,value) of dictionaryList.Phase"
-              :key="value"
-              :label="key"
-              :value="value"
-            /> -->
+          <el-select
+            v-model="clinicalTrialForm.PhaseId"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="item of dictionaryList.Trial_Phase"
               :key="item.Id"
@@ -160,6 +190,16 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item prop="OtherStages" v-if="Trial_Phase_isOther">
+          <el-input
+            v-model="clinicalTrialForm.OtherStages"
+            clearable
+            :placeholder="
+              $t('curriculumVitae:clinicalTrials:placeholder:byStagesOther')
+            "
+            :maxlength="400"
+          ></el-input>
+        </el-form-item>
         <el-form-item
           :label="$t('system:TrialExperience:label:Review Criteria')"
           prop="EvaluationCriteriaIdList"
@@ -168,15 +208,25 @@
             v-model="clinicalTrialForm.EvaluationCriteriaIdList"
             multiple
           >
-            <!-- <el-option v-for="(key,value) of dictionaryList.ReadingStandard" :key="value" :label="key" :value="value" /> -->
+            <!-- <el-option v-for="(key,value) of dictionaryList.CriterionType" :key="value" :label="key" :value="value" /> -->
             <el-option
-              v-for="item of dictionaryList.ReadingStandard"
+              v-for="item in CriterionType"
               :key="item.Id"
               :label="item.Value"
               :value="item.Id"
             />
           </el-select>
         </el-form-item>
+        <el-form-item prop="OtherCriterion" v-if="ReadingStandard_isOther">
+          <el-input
+            v-model="clinicalTrialForm.OtherCriterion"
+            clearable
+            :placeholder="
+              $t('curriculumVitae:clinicalTrials:placeholder:criterionOther')
+            "
+            :maxlength="400"
+          ></el-input>
+        </el-form-item>
         <el-form-item
           :label="$t('system:TrialExperience:label:Start Time')"
           prop="StartTime"
@@ -211,11 +261,45 @@
             :min="0"
           />
         </el-form-item>
+        <!-- 适应症类型 IndicationType -->
+        <el-form-item
+          :label="$t('system:TrialExperience:indicationType')"
+          prop="IndicationTypeId"
+        >
+          <el-select
+            v-model="clinicalTrialForm.IndicationTypeId"
+            @change="handleIndicationTypeChange"
+          >
+            <el-option
+              v-for="item of $d.IndicationType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="$t('system:TrialExperience:Indication')"
-          prop="EvaluationContent"
+          prop="IndicationEnum"
         >
-          <el-input v-model="clinicalTrialForm.EvaluationContent" />
+          <el-select
+            v-model="clinicalTrialForm.IndicationEnum"
+            :disabled="!clinicalTrialForm.IndicationTypeId"
+          >
+            <el-option
+              v-for="item of IndicationOptions"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="EvaluationContent" v-if="IndicationEnum_isOther">
+          <el-input
+            v-model="clinicalTrialForm.EvaluationContent"
+            clearable
+            :maxlength="400"
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -249,6 +333,10 @@ const getClinicalTrialDefault = () => {
     VisitReadingCount: 0,
     StartTime: null,
     EndTime: null,
+    OtherStages: '',
+    OtherCriterion: '',
+    IndicationEnum: null,
+    IndicationTypeId: null,
   }
 }
 export default {
@@ -286,10 +374,79 @@ 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: [
+          {
+            required: true,
+            message: 'Please input',
+            trigger: ['blur', 'change'],
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        OtherCriterion: [
+          {
+            required: true,
+            message: 'Please input',
+            trigger: ['blur', 'change'],
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
         ],
       },
       GCP: 0,
@@ -301,12 +458,89 @@ export default {
       isBtnDisabled: false,
       selectId: '00000000-0000-0000-0000-000000000000',
       dictionaryList: {},
+      // otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      otherId: '00000000-0000-0000-0000-000000000000',
+      GCPData: {},
     }
   },
+  computed: {
+    IndicationOptions() {
+      console.log(
+        this.$d.IndicationType,
+        this.clinicalTrialForm.IndicationTypeId
+      )
+      if (!this.clinicalTrialForm.IndicationTypeId) return []
+      let indicationGroupingArr = this.$d.IndicationType.filter(
+        (item) => item.id === this.clinicalTrialForm.IndicationTypeId
+      )
+      let indicationGrouping = null
+      if (
+        Array.isArray(indicationGroupingArr) &&
+        indicationGroupingArr.length > 0
+      ) {
+        indicationGrouping = indicationGroupingArr[0].raw.ChildGroup
+      }
+      let arr =
+        this.$d.Indication.filter(
+          (item) => indicationGrouping === item.raw.ChildGroup
+        ) || []
+      return arr
+    },
+    IndicationEnum_isOther() {
+      if (!this.clinicalTrialForm.IndicationEnum) return false
+      let value = this.$d.Indication.find(
+        (item) => item.value === this.clinicalTrialForm.IndicationEnum
+      ).label
+      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 === this.$t('curriculumVitae:selectLabel:Other')
+    },
+    ReadingStandard_isOther() {
+      if (
+        !this.clinicalTrialForm.EvaluationCriteriaIdList ||
+        this.clinicalTrialForm.EvaluationCriteriaIdList.length <= 0
+      )
+        return false
+      return this.clinicalTrialForm.EvaluationCriteriaIdList.includes(
+        this.otherId
+      )
+    },
+    CriterionType() {
+      if (!this.dictionaryList.CriterionType) return []
+      return [
+        ...this.dictionaryList.CriterionType,
+        {
+          Id: this.otherId,
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
+        },
+      ]
+    },
+  },
   watch: {
     reviewerId() {
       if (this.reviewerId) {
         this.doctorId = this.reviewerId
+        this.initForm()
+      }
+    },
+    Trial_Phase_isOther() {
+      if (!this.Trial_Phase_isOther) {
+        this.clinicalTrialForm.OtherStages = null
+      }
+    },
+    ReadingStandard_isOther() {
+      if (!this.ReadingStandard_isOther) {
+        this.clinicalTrialForm.OtherCriterion = null
+      }
+    },
+    IndicationEnum_isOther() {
+      if (!this.IndicationEnum_isOther) {
+        this.clinicalTrialForm.EvaluationContent = null
       }
     },
   },
@@ -316,14 +550,24 @@ export default {
   methods: {
     async initForm() {
       await this.getDicData()
-      const id = this.$route.query.Id
+      const id = this.$route.query.Id || this.reviewerId
       if (id) {
         this.loading = true
-        getTrialExperience(id)
+        let data = {
+          DoctorId: id,
+        }
+        if (this.$route.query.trialId) {
+          data.TrialId = this.$route.query.trialId
+        }
+        getTrialExperience(data)
           .then((res) => {
             this.clinicalTrialList = res.Result.ClinicalTrialExperienceList
             this.GCP = res.Result.GCP
             this.GCPID = res.Result.GCPId
+            this.GCPData = {
+              GCPAgencies: res.Result.GCPAgencies,
+              GCPTime: res.Result.GCPTime,
+            }
             this.OtherClinicalExperience = res.Result.OtherClinicalExperience
             this.OtherClinicalExperienceCN =
               res.Result.OtherClinicalExperienceCN
@@ -335,7 +579,7 @@ export default {
       }
     },
     getDicData() {
-      getBasicDataSelects(['Trial_Phase', 'ReadingStandard']).then((res) => {
+      getBasicDataSelects(['Trial_Phase', 'CriterionType']).then((res) => {
         this.dictionaryList = { ...res.Result }
       })
     },
@@ -354,6 +598,10 @@ export default {
         StartTime,
         EndTime,
         VisitReadingCount,
+        OtherStages,
+        OtherCriterion,
+        IndicationEnum,
+        IndicationTypeId,
       } = row
       this.clinicalTrialForm = Object.assign({}, getClinicalTrialDefault())
       this.clinicalTrialDialogTitle = 'Edit'
@@ -365,12 +613,17 @@ export default {
       this.clinicalTrialForm.VisitReadingCount = VisitReadingCount
       this.clinicalTrialForm.EvaluationCriteriaIdList = EvaluationCriteriaIdList
       this.clinicalTrialForm.EvaluationContent = EvaluationContent
+      this.clinicalTrialForm.OtherStages = OtherStages
+      this.clinicalTrialForm.OtherCriterion = OtherCriterion
+      this.clinicalTrialForm.IndicationEnum = IndicationEnum
+      this.clinicalTrialForm.IndicationTypeId = IndicationTypeId
     },
     handleSave() {
       this.$refs.clinicalTrialForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
-          this.clinicalTrialForm.DoctorId = this.$route.query.Id
+          this.clinicalTrialForm.DoctorId =
+            this.$route.query.Id || this.reviewerId
           var dateTime
           if (this.clinicalTrialForm.StartTime) {
             dateTime = new Date(this.clinicalTrialForm.StartTime)
@@ -386,6 +639,9 @@ export default {
                 'YYYY'
               ) + '-01'
           }
+          if (this.$route.query.trialId) {
+            this.clinicalTrialForm.TrialId = this.$route.query.trialId
+          }
           addOrUpdateTrialExperience(this.clinicalTrialForm)
             .then((res) => {
               this.isDisabled = false
@@ -431,6 +687,9 @@ export default {
         OtherClinicalExperience: this.OtherClinicalExperience,
         OtherClinicalExperienceCN: this.OtherClinicalExperienceCN,
       }
+      if (this.$route.query.trialId) {
+        param.TrialId = this.$route.query.trialId
+      }
       updateOtherExperience(param).then((res) => {
         if (res.IsSuccess) {
           if (this.id) {
@@ -441,6 +700,10 @@ export default {
         }
       })
     },
+    handleIndicationTypeChange(val) {
+      this.clinicalTrialForm.EvaluationContent = null
+      this.clinicalTrialForm.IndicationEnum = null
+    },
   },
 }
 </script>

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

@@ -5,115 +5,481 @@
       <div class="file_title">
         {{ $t('curriculumVitae:agreement:fileTitle') }}
       </div>
-      <template v-if="true">
-        <div class="file" v-for="item in [1, 2]" :key="item">
-          <div class="name">简历1</div>
+      <template v-if="sowList && sowList.length > 0">
+        <div class="file" v-for="item in sowList" :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"
+            @click.stop="handlePreview3(item)"
+          />
+          <i
+            class="el-icon-edit"
+            :title="$t('common:button:edit')"
+            v-if="item.IsIRUpload || isPM"
+            @click="
+              handleEditCol(item, 0, $t('trials:enrolledReviews:message:SOW'))
+            "
+          />
+          <i
+            class="el-icon-delete"
+            v-if="item.IsIRUpload || isPM"
+            :title="$t('common:button:delete')"
+            @click="handleRemoveFile3(item)"
           />
-          <i class="el-icon-delete" :title="$t('common:button:delete')" />
         </div>
       </template>
       <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
-      <div class="btnBox">
-        <div style="position: relative">
-          <el-button
-            type="primary"
-            size="small"
-            :disabled="loading"
-            :loading="loading"
-          >
-            {{ $t('curriculumVitae:agreement:btn:upload') }}
-          </el-button>
-          <input
-            type="file"
-            name="file"
-            multiple
-            ref="upload"
-            :title="$t('curriculumVitae:agreement:btn:upload')"
-            style="
-              position: absolute;
-              top: 0;
-              left: 0;
-              width: 100%;
-              height: 100%;
-              opacity: 0;
-              cursor: pointer;
-            "
-            :accept="faccept.join(',')"
-            @change="($event) => beginScanFiles($event)"
-          />
-        </div>
-        <el-button type="text">{{ $t('common:button:downloadTpl') }}</el-button>
+      <div class="btnBox" style="margin-top: 10px">
+        <el-button
+          type="primary"
+          size="small"
+          @click.stop="addCol(0, $t('trials:enrolledReviews:message:SOW'))"
+        >
+          {{ $t('curriculumVitae:agreement:btn:upload') }}
+        </el-button>
+        <el-button
+          type="text"
+          @click.stop="handleDownload('Reviewer_SOW_Template')"
+        >
+          {{ $t('common:button:downloadTpl') }}
+        </el-button>
       </div>
-      <template v-if="true">
+      <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 [1, 2]" :key="item">
-          <div class="name">简历1</div>
-          <i
-            class="el-icon-view"
-            :title="$t('common:button:preview')"
-            @click.stop="preview"
-          />
+        <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="true">
         <div class="file_title">
           {{ $t('curriculumVitae:agreement:confirmation') }}
         </div>
-        <div class="file" v-for="item in [1, 2]" :key="item">
-          <div class="name">简历1</div>
-          <i
-            class="el-icon-view"
-            :title="$t('common:button:preview')"
-            @click.stop="preview"
-          />
+        <template v-if="ackSowList && ackSowList.length > 0">
+          <div class="file" v-for="item in ackSowList" :key="item.Id">
+            <div class="name" :title="item.FileName">{{ item.FileName }}</div>
+            <i
+              class="el-icon-view"
+              :title="$t('common:button:preview')"
+              @click.stop="handlePreview3(item)"
+            />
+            <i
+              class="el-icon-edit"
+              :title="$t('common:button:edit')"
+              @click="
+                handleEditCol(item, 1, $t('trials:enrolledReviews:message:SOW'))
+              "
+            />
+            <i
+              class="el-icon-delete"
+              :title="$t('common:button:delete')"
+              @click="handleRemoveFile3(item)"
+            />
+          </div>
+        </template>
+        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
+        <div class="btnBox" style="margin-top: 10px">
+          <el-button
+            type="primary"
+            size="small"
+            @click.stop="addCol(1, $t('trials:enrolledReviews:message:SOW'))"
+          >
+            {{ $t('curriculumVitae:agreement:btn:uploadconfirmation') }}
+          </el-button>
         </div>
       </template>
     </div>
+    <BaseModel :config="model_cfg">
+      <template slot="dialog-body">
+        <el-form
+          ref="DictionaryTypeConfigForm"
+          :model="form"
+          :rules="rules"
+          label-width="120px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('system:Agreements:label:Criterion Type')"
+            prop="CriterionType"
+          >
+            <el-select v-model="form.CriterionType">
+              <el-option
+                v-for="item of $d.CriterionType"
+                :key="item.id"
+                :value="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('system:Agreements:label:File')"
+            prop="FilePath"
+          >
+            <el-upload
+              class="upload-demo"
+              action
+              :before-upload="beforeUpload"
+              :http-request="handleUploadFile"
+              :on-preview="handlePreview2"
+              :on-remove="handleRemoveFile2"
+              :show-file-list="true"
+              :limit="1"
+              :accept="accept"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t('common:button:upload') }}</el-button
+              >
+              <span>{{ $t('system:tip:file:pdf') }}</span>
+            </el-upload>
+          </el-form-item>
+          <el-form-item :label="$t('system:Agreements:label:Remark')">
+            <el-input
+              v-model="form.Remark"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 4 }"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('system:Agreements:label:Is Enable')">
+            <el-switch
+              v-model="form.IsEnable"
+              :active-value="true"
+              :inactive-value="false"
+            />
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancle"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </BaseModel>
   </div>
 </template>
 <script>
+import { DownloadCommonDoc } from '@/api/dictionary'
+import {
+  addDoctorCriterionFile,
+  deleteDoctorCriterionFile,
+  getDoctorCriterionFile,
+} from '@/api/reviewers'
+import BaseModel from '@/components/BaseModel'
+import UploadFiles from '@/components/UploadFiles'
 export default {
   name: 'agreement',
-  data() {
-    return {
-      faccept: ['.pdf'],
-      loading: false,
-    }
+  components: {
+    BaseModel,
+    UploadFiles,
   },
-  methods: {
-    preview() {
-      this.$preview({
-        path: '',
-        type: '',
-        title: '',
-      })
+  props: {
+    DATA: {
+      type: Array,
+      default: () => {
+        return []
+      },
     },
-    beginScanFiles(e) {
-      let files = e.target.files
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+    isPM: {
+      type: Boolean,
+      default: false,
     },
   },
   data() {
     return {
       faccept: ['.pdf'],
       loading: false,
+      agreementList: [],
+      sowList: [],
+      ackSowList: [],
+      loading: false,
+      isOpen: false,
+      btnLoading: false,
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: '',
+        appendToBody: true,
+      },
+      form: {
+        Remark: null,
+        FileType: null,
+        FileName: null,
+        FilePath: null,
+        DoctorId: null,
+        CriterionType: null,
+        IsEnable: false,
+      },
+      rules: {
+        CriterionType: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur'],
+          },
+        ],
+        FilePath: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur'],
+          },
+        ],
+      },
+      fileList: [],
+      accept: '.pdf',
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.initSowList()
+      }
+    },
+  },
+  computed: {
+    CounselorFiles() {
+      if (!this.DATA || this.DATA.length <= 0) return false
+      return this.DATA.filter(
+        (item) => item.Type && item.Type.indexOf('Consultant Agreement') >= 0
+      )
+    },
+  },
   methods: {
-    preview() {
+    handleRemoveFile(row) {
+      this.$refs.uploadAgreement.handleDeleteFile(row)
+    },
+    getFileList(fileList) {
+      this.agreementList = fileList
+    },
+    preview(row) {
       this.$preview({
-        path: '',
-        type: '',
-        title: '',
+        path: row.Path || row.FullPath,
+        type: 'pdf',
+        title: row.FileName,
       })
     },
-    beginScanFiles(e) {
-      let files = e.target.files
+    handleDownload(code) {
+      this.loading = true
+      DownloadCommonDoc(code)
+        .then((data) => {
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    handleEditCol(row, fileType, title) {
+      this.model_cfg.visible = true
+      this.form = Object.assign({}, row)
+      this.fileList[0] = { name: row.FileName, path: row.FilePath }
+      this.form.FileType = fileType
+      this.model_cfg.title = title
+    },
+    handleRemoveFile3(row) {
+      this.$confirm(
+        this.$t('dictionary:attachment:export:confirm:delete')
+      ).then(() => {
+        deleteDoctorCriterionFile({
+          Id: row.Id,
+        }).then(() => {
+          this.initSowList()
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+        })
+      })
+    },
+    handleRemoveFile2() {
+      this.form.FileName = null
+      this.form.FilePath = null
+      this.fileList = []
+    },
+    beforeUpload(row) {
+      if (this.fileList.length > 0) {
+        // this.$alert('最多只能传一个附件')
+        this.$alert(this.$t('upload:rule:maxFile1'))
+        return
+      }
+      if (!this.checkFileSuffix(row.name)) {
+        this.$message.warning(this.$t('upload:rule:MUSTPDF'))
+        return false
+      }
+    },
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      return (
+        this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
+      )
+    },
+    handlePreview3(row) {
+      return this.$preview({
+        path: row.FilePath || row.Path || row.FullPath,
+        type: 'pdf',
+        title: row.FileName,
+      })
+      if (row.FilePath) {
+        window.open(this.OSSclientConfig.basePath + row.FilePath, '_blank')
+      }
+    },
+    handlePreview2(row, r2) {
+      return this.$preview({
+        path: row.FullPath,
+        type: 'pdf',
+        title: row.FileName,
+      })
+      if (row.fullPath) {
+        window.open(this.OSSclientConfig.basePath + row.fullPath, '_blank')
+      }
+    },
+    async handleUploadFile(param) {
+      this.btnLoading = true
+      var fileName = param.file.name
+      let file = await this.fileToBlob(param.file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/${
+          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+        }/${this.reviewerId}/${fileName}`,
+        file
+      )
+      this.form.FileName = param.file.name
+      this.form.FilePath = this.$getObjectName(res.url)
+      this.fileList[0] = {
+        name: this.$getObjectName(res.url),
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: res.url,
+      }
+      this.btnLoading = false
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleSave() {
+      this.$refs['DictionaryTypeConfigForm'].validate((valid) => {
+        if (!valid) return
+        this.form.DoctorId = this.reviewerId
+        this.form.CriterionName = this.$fd(
+          'CriterionType',
+          this.form.CriterionType
+        )
+        if (!this.isPM) {
+          this.form.IsIRUpload = true
+        }
+        addDoctorCriterionFile(this.form).then((res) => {
+          this.$message.success(this.$t('common:message:addedSuccessfully'))
+          this.initSowList()
+          this.handleCancle()
+        })
+      })
+    },
+    addCol(fileType, title) {
+      this.model_cfg.visible = true
+      this.form = {
+        Remark: null,
+        FileType: null,
+        FileName: null,
+        FilePath: null,
+        DoctorId: null,
+        CriterionType: null,
+        IsEnable: false,
+      }
+      this.handleRemoveFile2()
+      this.form.FileType = fileType
+      this.model_cfg.title = title
+    },
+    initSowList() {
+      if (!this.reviewerId) return
+      getDoctorCriterionFile({
+        fileType: 0,
+        DoctorId: this.reviewerId,
+      }).then((res) => {
+        this.sowList = res.Result
+      })
+      getDoctorCriterionFile({
+        fileType: 1,
+        DoctorId: this.reviewerId,
+      }).then((res) => {
+        this.ackSowList = res.Result
+      })
     },
   },
 }

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

@@ -6,117 +6,295 @@
       <div class="file_title">
         {{ $t('curriculumVitae:certificate:fileTitle:diploma') }}
       </div>
-      <div class="file" v-if="true">
-        <div class="name">简历1</div>
+      <div class="file" v-if="diplomaFile">
+        <div class="name" :title="diplomaFile.FileName">
+          {{ diplomaFile.FileName }}
+        </div>
         <i
           class="el-icon-view"
           :title="$t('common:button:preview')"
-          @click.stop="preview"
+          @click.stop="preview(diplomaFile)"
+        />
+        <i
+          class="el-icon-delete"
+          :title="$t('common:button:delete')"
+          @click.stop="handleRemoveFile(diplomaFile)"
         />
-        <i class="el-icon-delete" :title="$t('common:button:delete')" />
       </div>
       <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       <!--医师资格证-->
-      <div class="file_title" v-if="true">
+      <div class="file_title">
         {{ $t('curriculumVitae:certificate:fileTitle:certificate') }}
       </div>
-      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
-      <div class="file">
-        <div class="name">简历1</div>
+      <div class="file" v-if="certificateFile">
+        <div class="name" :title="certificateFile.FileName">
+          {{ certificateFile.FileName }}
+        </div>
         <i
           class="el-icon-view"
           :title="$t('common:button:preview')"
-          @click.stop="preview"
+          @click.stop="preview(certificateFile)"
+        />
+        <i
+          class="el-icon-delete"
+          :title="$t('common:button:delete')"
+          @click.stop="handleRemoveFile(certificateFile)"
         />
-        <i class="el-icon-delete" :title="$t('common:button:delete')" />
       </div>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       <!--医师执业证-->
-      <div class="file_title" v-if="true">
+      <div class="file_title">
         {{ $t('curriculumVitae:certificate:fileTitle:license') }}
       </div>
-      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
-      <div class="file">
-        <div class="name">简历1</div>
+      <div class="file" v-if="licenseFile">
+        <div class="name" :title="licenseFile.FileName">
+          {{ licenseFile.FileName }}
+        </div>
         <i
           class="el-icon-view"
           :title="$t('common:button:preview')"
-          @click.stop="preview"
+          @click.stop="preview(licenseFile)"
+        />
+        <i
+          class="el-icon-delete"
+          :title="$t('common:button:delete')"
+          @click.stop="handleRemoveFile(licenseFile)"
         />
-        <i class="el-icon-delete" :title="$t('common:button:delete')" />
       </div>
+      <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       <!--大型医用设备上岗证-->
       <div class="file_title">
         {{ $t('curriculumVitae:certificate:fileTitle:workPermit') }}
       </div>
-      <template v-if="true">
+      <template v-if="workPermitFiles && workPermitFiles.length > 0">
         <div class="file_title">
           {{ $t('curriculumVitae:certificate:fileTitle:CT') }}
         </div>
-        <div v-for="item in [1, 2]" :key="item">
+        <div v-for="item in workPermitFiles" :key="item.Id">
           <div class="file">
-            <div class="name">简历1</div>
+            <div class="name" :title="item.FileName">{{ item.FileName }}</div>
             <i
               class="el-icon-view"
               :title="$t('common:button:preview')"
-              @click.stop="preview"
+              @click.stop="preview(item)"
+            />
+            <i
+              class="el-icon-delete"
+              :title="$t('common:button:delete')"
+              @click.stop="handleRemoveFile(item)"
             />
-            <i class="el-icon-delete" :title="$t('common:button:delete')" />
           </div>
         </div>
       </template>
       <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
-      <div class="btnBox">
-        <div style="position: relative">
-          <el-button
-            type="primary"
-            size="small"
-            :disabled="loading"
-            :loading="loading"
-          >
-            {{ $t('curriculumVitae:certificate:btn:upload') }}
-          </el-button>
-          <input
-            type="file"
-            name="file"
-            multiple
-            ref="upload"
-            :title="$t('curriculumVitae:certificate:btn:upload')"
-            style="
-              position: absolute;
-              top: 0;
-              left: 0;
-              width: 100%;
-              height: 100%;
-              opacity: 0;
-              cursor: pointer;
-            "
-            :accept="faccept.join(',')"
-            @change="($event) => beginScanFiles($event)"
-          />
-        </div>
+      <div class="btnBox" style="margin-top: 10px">
+        <el-button
+          type="primary"
+          size="small"
+          :disabled="loading"
+          :loading="loading"
+          @click.stop="openBox"
+        >
+          {{ $t('curriculumVitae:certificate:btn:upload') }}
+        </el-button>
       </div>
     </div>
+    <base-model :config="model_cfg">
+      <template slot="dialog-body">
+        <div class="box">
+          <div class="clearfix">
+            <p style="line-height: 30px; font-size: 13px">
+              {{ $t('system:Credentials:title:Default Certificate') }}
+            </p>
+            <el-card class="e-card">
+              <p class="title">
+                {{
+                  $t(
+                    'system:Credentials:title:Diploma of the highest medical degree'
+                  )
+                }}
+              </p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Diploma of the highest medical degree"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+            <el-card class="e-card">
+              <p class="title">
+                {{
+                  $t(
+                    'system:Credentials:title:Medical Qualification Certificate'
+                  )
+                }}
+              </p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Medical Qualification Certificate"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+            <el-card class="e-card">
+              <p class="title">
+                {{ $t('system:Credentials:title:Practice License') }}
+              </p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Practice License"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+          </div>
+
+          <div class="clearfix">
+            <p style="line-height: 30px; font-size: 13px">
+              {{ $t('system:Credentials:title:Modality Certificate') }}
+            </p>
+            <el-card class="e-card">
+              <p class="title">CT</p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Modality Certificate(CT)"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+
+            <el-card class="e-card">
+              <p class="title">MRI</p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Modality Certificate(MRI)"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+
+            <el-card class="e-card">
+              <p class="title">NM</p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Modality Certificate(NM)"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+
+            <el-card class="e-card">
+              <p class="title">US</p>
+              <upload-file
+                :doctor-id="reviewerId"
+                type="Modality Certificate(US)"
+                @getFileList="$emit('getInfo')"
+              />
+            </el-card>
+          </div>
+        </div>
+      </template>
+      <template slot="dialog-footer">
+        <el-button size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:confirm') }}
+        </el-button>
+      </template>
+    </base-model>
   </div>
 </template>
 <script>
 import PreviewFile from '@/components/PreviewFile/index'
+import BaseModel from '@/components/BaseModel'
+import UploadFile from '@/components/UploadFile'
+import { deleteAttachment } from '@/api/attachment'
 export default {
   name: 'certificate',
   components: {
     PreviewFile,
+    BaseModel,
+    UploadFile,
+  },
+  props: {
+    DATA: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
       faccept: ['.pdf'],
       loading: false,
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '800px',
+        title: this.$t('curriculumVitae:certificate:form:title'),
+        appendToBody: true,
+      },
     }
   },
+  computed: {
+    //最高医学学位毕业证书
+    diplomaFile() {
+      if (!this.DATA || this.DATA.length <= 0) return false
+      return this.DATA.find(
+        (item) => item.Type === 'Diploma of the highest medical degree'
+      )
+    },
+    //医师资格证
+    certificateFile() {
+      if (!this.DATA || this.DATA.length <= 0) return false
+      return this.DATA.find(
+        (item) => item.Type === 'Medical Qualification Certificate'
+      )
+    },
+    //医师执业证
+    licenseFile() {
+      if (!this.DATA || this.DATA.length <= 0) return false
+      return this.DATA.find((item) => item.Type === 'Practice License')
+    },
+    //大型医用设备上岗证
+    workPermitFiles() {
+      if (!this.DATA || this.DATA.length <= 0) return false
+      return this.DATA.filter(
+        (item) => item.Type && item.Type.indexOf('Modality Certificate') >= 0
+      )
+    },
+  },
   methods: {
-    preview() {
+    openBox() {
+      this.model_cfg.visible = true
+    },
+    handleCancle() {
+      this.model_cfg.visible = false
+    },
+    handleRemoveFile(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          deleteAttachment(row.Id, row.Path).then((res) => {
+            if (res.IsSuccess) {
+              this.$emit('getInfo')
+              this.$message({
+                message: this.$t('common:message:deletedSuccessfully'),
+                type: 'success',
+              })
+            }
+          })
+        })
+        .catch((action) => {})
+    },
+    preview(row) {
       this.$preview({
-        path: '',
-        type: '',
-        title: '',
+        path: row.Path || row.FullPath,
+        type: 'pdf',
+        title: row.FileName,
       })
     },
     beginScanFiles(e) {
@@ -126,4 +304,20 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+// ::v-deep .el-dialog__body {
+//   padding-top: 0;
+// }
+.box {
+  display: flex;
+  justify-content: space-between;
+  .clearfix {
+    width: 48%;
+    .e-card {
+      margin-bottom: 10px;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
 </style>

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

@@ -5,14 +5,23 @@
       <div class="file_title">
         {{ $t('curriculumVitae:curriculum:fileTitle:CN') }}
       </div>
-      <template v-if="true">
-        <div class="file" v-for="item in [1, 2]" :key="item">
-          <div class="name">简历1</div>
-          <i class="el-icon-download" :title="$t('common:button:download')" />
-          <i class="el-icon-delete" :title="$t('common:button:delete')" />
+      <template v-if="resumeListCN.length > 0">
+        <div class="file" v-for="item in resumeListCN" :key="item.Id">
+          <div class="name" :title="item.FileName">{{ item.FileName }}</div>
           <i
-            class="el-icon-circle-check"
+            class="el-icon-download"
+            :title="$t('common:button:download')"
+            @click.stop="handlePreview(item)"
+          />
+          <i
+            class="el-icon-delete"
+            :title="$t('common:button:delete')"
+            @click.stop="handleRemoveFile(item)"
+          />
+          <i
+            :class="{ 'el-icon-circle-check': true, disable: item.IsOfficial }"
             :title="$t('common:button:default')"
+            @click.stop="handleSetOfiical(item)"
           />
         </div>
       </template>
@@ -20,95 +29,292 @@
       <div class="file_title">
         {{ $t('curriculumVitae:curriculum:fileTitle:EN') }}
       </div>
-      <template v-if="true">
-        <div class="file" v-for="item in [1, 2]" :key="item">
-          <div class="name">Resume</div>
-          <i class="el-icon-download" :title="$t('common:button:download')" />
-          <i class="el-icon-delete" :title="$t('common:button:delete')" />
+      <template v-if="resumeListEN.length > 0">
+        <div class="file" v-for="item in resumeListEN" :key="item.FileName">
+          <div class="name" :title="item.FileName">{{ item.FileName }}</div>
           <i
-            class="el-icon-circle-check"
-            :title="$t('common:button:default')"
+            class="el-icon-download"
+            :title="$t('common:button:download')"
+            @click.stop="handlePreview(item)"
+          />
+          <i
+            class="el-icon-delete"
+            :title="$t('common:button:delete')"
+            @click.stop="handleRemoveFile(item)"
           />
         </div>
       </template>
       <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
-      <div class="btnBox">
-        <div style="position: relative">
-          <el-button
-            type="primary"
-            size="small"
-            :disabled="loading"
-            :loading="loading"
+      <div class="btnBox" style="margin-top: 20px">
+        <div class="uploadFile-container" style="margin-right: 10px">
+          <el-upload
+            class="upload-demo"
+            :data="{ language: 1 }"
+            action
+            :show-file-list="false"
+            :http-request="handleUploadFile"
+            :file-list="resumeList"
+            accept=".doc,.docx"
           >
-            {{ $t('curriculumVitae:curriculum:btn:uploadCN') }}
-          </el-button>
-          <input
-            type="file"
-            name="file"
-            multiple
-            ref="uploadCN"
-            :title="$t('curriculumVitae:curriculum:btn:uploadCN')"
-            style="
-              position: absolute;
-              top: 0;
-              left: 0;
-              width: 100%;
-              height: 100%;
-              opacity: 0;
-              cursor: pointer;
-            "
-            :accept="faccept.join(',')"
-            @change="($event) => beginScanFiles($event)"
-          />
+            <el-button size="small" type="primary">
+              {{ $t('curriculumVitae:curriculum:btn:uploadCN') }}
+            </el-button>
+          </el-upload>
         </div>
-        <el-button type="text">{{ $t('common:button:downloadTpl') }}</el-button>
+        <!-- <el-button
+          type="text"
+          @click.stop="handleDownload('Reviewer_resume_Template')"
+        >
+          {{ $t('common:button:downloadTpl') }}
+        </el-button> -->
       </div>
       <div class="btnBox">
-        <div style="position: relative">
-          <el-button
-            type="primary"
-            size="small"
-            :disabled="loading"
-            :loading="loading"
+        <div class="uploadFile-container" style="margin-right: 10px">
+          <el-upload
+            class="upload-demo"
+            :data="{ language: 2 }"
+            action
+            :show-file-list="false"
+            :http-request="handleUploadFile"
+            :file-list="resumeList"
+            accept=".doc,.docx"
           >
-            {{ $t('curriculumVitae:curriculum:btn:uploadEN') }}
-          </el-button>
-          <input
-            type="file"
-            name="file"
-            multiple
-            ref="uploadEN"
-            :title="$t('curriculumVitae:curriculum:btn:uploadEN')"
-            style="
-              position: absolute;
-              top: 0;
-              left: 0;
-              width: 100%;
-              height: 100%;
-              opacity: 0;
-              cursor: pointer;
-            "
-            :accept="faccept.join(',')"
-            @change="($event) => beginScanFiles($event)"
-          />
+            <el-button size="small" type="primary">
+              {{ $t('curriculumVitae:curriculum:btn:uploadEN') }}
+            </el-button>
+          </el-upload>
         </div>
-        <el-button type="text">{{ $t('common:button:downloadTpl') }}</el-button>
+        <!-- <el-button
+          type="text"
+          @click.stop="handleDownload('Reviewer_resume_Template')"
+        >
+          {{ $t('common:button:downloadTpl') }}
+        </el-button> -->
       </div>
     </div>
   </div>
 </template>
 <script>
+import {
+  getAttachmentByType,
+  saveAttachments,
+  deleteAttachment,
+  setOfficial,
+  setLanguageForResume,
+} from '@/api/attachment'
+import { DownloadCommonDoc } from '@/api/dictionary'
 export default {
   name: 'curriculum',
+  props: {
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
-      faccept: ['.pdf'],
       loading: false,
+      resumeList: [],
+      resumeListEN: [],
+      resumeListCN: [],
+      language: 0,
+      dialogVisible: false,
+      currentRow: {},
+      repeat: false,
+      isDisabled: false,
     }
   },
+  watch: {
+    reviewerId() {
+      if (this.reviewerId) {
+        this.getResumeList()
+      }
+    },
+  },
   methods: {
-    beginScanFiles(e) {
-      let files = e.target.files
+    handleDownload(code) {
+      this.loading = true
+      DownloadCommonDoc(code)
+        .then((data) => {
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    getResumeList() {
+      this.loading = true
+      getAttachmentByType(this.reviewerId, 'Resume')
+        .then((res) => {
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              this.resumeList = res.Result
+              this.filterByLanguage()
+            }
+          }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    handleUploadFile(param) {
+      this.repeat = false
+      // const fileName = param.file.name.substring(0, param.file.name.lastIndexOf('.'))
+      // const extension = param.file.name.substring(param.file.name.lastIndexOf('.'))
+      // 检测文件后缀名
+      if (this.checkFileSuffix(param.file.name) > -1) {
+        // 检测是否有重名文件
+        const isRepeat = this.resumeList.some(
+          (item) => item.FileName === param.file.name
+        )
+        if (isRepeat) {
+          this.$confirm(
+            this.$t('curriculumVitae:resume:message:existingResume'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true,
+            }
+          )
+            .then(() => {
+              // 重名覆盖
+              this.repeat = true
+              this.uploadFile(param.file, param.data.language)
+            })
+            .catch((action) => {})
+        } else {
+          this.uploadFile(param.file, param.data.language)
+        }
+      } else {
+        this.$alert(this.$t('upload:rule:MUSTPDF'))
+      }
+    },
+    async uploadFile(file, language) {
+      this.isDisabled = true
+      var fileName = file.name
+      var files = this.resumeList
+      file = await this.fileToBlob(file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/Resume/${this.reviewerId}/${fileName}`,
+        file
+      )
+      if (this.repeat) {
+        const index = files.findIndex((item, index) => {
+          return item.FileName === fileName
+        })
+        files[index].Path = this.$getObjectName(res.url)
+        files[index].FullPath = this.$getObjectName(res.url)
+        files[index].ReUpload = true
+        files[index].Language = language
+      } else {
+        const fileData = {
+          DoctorId: this.reviewerId,
+          Type: 'Resume',
+          Path: this.$getObjectName(res.url),
+          FullPath: this.$getObjectName(res.url),
+          FileName: fileName,
+          Language: language,
+        }
+        files.push(fileData)
+      }
+      this.saveUploadFiles(files)
+    },
+    saveUploadFiles(files) {
+      saveAttachments(files)
+        .then((res) => {
+          this.resumeList = res.Result
+          this.filterByLanguage()
+          this.isDisabled = false
+          this.$message.success(
+            this.$t('trials:uploadDicomList:table:Uploaded')
+          )
+        })
+        .catch(() => {
+          this.isDisabled = false
+        })
+    },
+    filterByLanguage() {
+      this.resumeListEN = []
+      this.resumeListCN = []
+      this.resumeList.map((resume) => {
+        if (resume.Language === 2) {
+          this.resumeListEN.push(resume)
+        } else if (resume.Language === 1) {
+          this.resumeListCN.push(resume)
+        }
+      })
+    },
+    checkFileSuffix(fileName) {
+      const accept = '.doc, .docx'
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName
+        .substring(index + 1, fileName.length)
+        .toLocaleLowerCase()
+      return accept.search(suffix)
+    },
+    handlePreview(row) {
+      if (row.FullPath) {
+        window.open(this.OSSclientConfig.basePath + row.FullPath, '_blank')
+      }
+    },
+    handleRemoveFile(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          deleteAttachment(row.Id, row.Path).then((res) => {
+            if (res.IsSuccess) {
+              this.resumeList.splice(
+                this.resumeList.findIndex((item) => item.Id === row.Id),
+                1
+              )
+              this.filterByLanguage()
+              this.$message({
+                message: this.$t('common:message:deletedSuccessfully'),
+                type: 'success',
+              })
+            }
+          })
+        })
+        .catch((action) => {})
+    },
+    handleSetOfiical(row) {
+      if (row.IsOfficial) return false
+      setOfficial(this.reviewerId, row.Id, row.Language).then((res) => {
+        if (res.IsSuccess) {
+          this.getResumeList()
+          this.$message({
+            message: this.$t('common:message:savedSuccessfully'),
+            type: 'success',
+          })
+        }
+      })
+    },
+    handleLanguageClick(row) {
+      this.dialogVisible = true
+      this.language = row.Language
+      this.currentRow = row
+    },
+    setResumeLanguage() {
+      setLanguageForResume(
+        this.reviewerId,
+        this.currentRow.Id,
+        this.language
+      ).then((res) => {
+        if (res.IsSuccess) {
+          this.dialogVisible = false
+          this.getResumeList()
+          this.$message({
+            message: this.$t('common:message:savedSuccessfully'),
+            type: 'success',
+          })
+        }
+      })
     },
   },
 }

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

@@ -2,12 +2,18 @@
   <div class="continuingTraining">
     <div class="title">
       <span>{{ $t('curriculumVitae:continuingTraining:title') }}</span>
-      <el-button type="text" class="editBtn" @click.stop="openEdit">
+      <el-button
+        type="text"
+        class="editBtn"
+        @click.stop="openEdit"
+        :disabled="!reviewerId"
+      >
         {{ $t('common:button:add') }}
       </el-button>
     </div>
     <el-table
-      :data="tableData"
+      :data="DATA"
+      v-loading="loading"
       style="width: 100%"
       :header-cell-style="{ background: '#eee', color: '#606266' }"
     >
@@ -15,33 +21,56 @@
         prop="date"
         :label="$t('curriculumVitae:continuingTraining:table:time')"
       >
+        <template slot-scope="scope">
+          <span>{{ scope.row.BeginDateStr }} ~ {{ scope.row.EndDateStr }}</span>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="Training"
         :label="$t('curriculumVitae:continuingTraining:table:type')"
       >
+        <template slot-scope="scope">
+          <span>{{ $fd('Training', Number(scope.row.Training)) }}</span>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="Major"
         :label="$t('curriculumVitae:continuingTraining:table:direction')"
       >
+        <template slot-scope="scope">
+          <span>{{ isEN ? scope.row.Major : scope.row.MajorCN }}</span>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="school"
         :label="$t('curriculumVitae:continuingTraining:table:school')"
       >
+        <template slot-scope="scope">
+          <span>{{ isEN ? scope.row.School : scope.row.SchoolCN }}</span>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="City"
         :label="$t('curriculumVitae:continuingTraining:table:city')"
       >
-      </el-table-column>
-      <el-table-column prop="date" :label="$t('common:action:action')">
         <template slot-scope="scope">
-          <el-button type="text" class="editBtn" @click.stop="openEdit(scope)">
+          <span>{{ isEN ? scope.row.City : scope.row.CityCN }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('common:action:action')">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            class="editBtn"
+            @click.stop="openEdit(scope.row)"
+          >
             {{ $t('common:button:edit') }}
           </el-button>
-          <el-button type="text" class="editBtn" @click.stop="openEdit">
+          <el-button
+            type="text"
+            class="editBtn"
+            @click.stop="handleDel(scope.row)"
+          >
             {{ $t('common:button:delete') }}
           </el-button>
         </template>
@@ -59,25 +88,28 @@
         >
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:time')"
-            prop="InternationalizationType"
+            prop="BeginDate"
           >
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
+              value-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')"
+              @change="changeTimeList"
             >
             </el-date-picker>
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:type')"
-            prop="InternationalizationType"
+            prop="Training"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
+            <el-select v-model="form.Training" clearable placeholder="">
               <el-option
-                v-for="item in $d.sex"
+                v-for="item in $d.Training"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
@@ -86,68 +118,147 @@
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:direction')"
-            prop="InternationalizationType"
+            prop="Major"
+            v-if="isEN"
           >
-            <el-row>
-              <el-col :span="12" style="margin-right: 5px">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:direction'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-              <el-col :span="11">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:directionEN'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-            </el-row>
+            <el-input
+              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"
+            :label="$t('curriculumVitae:continuingTraining:form:direction')"
+            v-else
+          >
+            <el-input
+              type="textarea"
+              :rows="2"
+              v-model="form.MajorCN"
+              :maxlength="4000"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:direction')
+              "
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:hospital')"
+            prop="Hospital"
+            v-if="isEN"
+          >
+            <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="InternationalizationType"
+            prop="School"
+            v-if="isEN"
           >
-            <el-row>
-              <el-col :span="12" style="margin-right: 5px">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t('curriculumVitae:continuingTraining:placeholder:school')
-                  "
-                ></el-input>
-              </el-col>
-              <el-col :span="11">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:continuingTraining:placeholder:schoolEN'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-            </el-row>
+            <el-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="InternationalizationType"
+            prop="City"
+            v-if="isEN"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
-              <el-option
-                v-for="item in $d.sex"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input
+              v-model="form.City"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:City')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CityCN"
+            :label="$t('curriculumVitae:continuingTraining:form:city')"
+            v-else
+          >
+            <el-input
+              v-model="form.CityCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:CityCN')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:Country')"
+            prop="Country"
+            v-if="isEN"
+          >
+            <el-input
+              v-model="form.Country"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:Country')
+              "
+              :maxlength="400"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="CountryCN"
+            :label="$t('curriculumVitae:continuingTraining:form:Country')"
+            v-else
+          >
+            <el-input
+              v-model="form.CountryCN"
+              clearable
+              :placeholder="
+                $t('curriculumVitae:continuingTraining:placeholder:CountryCN')
+              "
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
         </el-form>
       </template>
@@ -155,7 +266,12 @@
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="loading"
+          @click="handleSave"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -164,12 +280,52 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
+import {
+  addOrUpdatePostgraduateInfo,
+  deletePostgraduateInfo,
+} from '@/api/reviewers'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+const defaultForm = () => {
+  return {
+    BeginDate: '',
+    EndDate: '',
+    Training: '',
+    Major: '',
+    MajorCN: '',
+    HospitalId: null,
+    HospitalCN: null,
+    Hospital: null,
+    School: '',
+    SchoolCN: '',
+    City: '',
+    CityCN: '',
+    Country: '',
+    CountryCN: '',
+  }
+}
 export default {
   name: 'continuingTraining',
   components: { BaseModel },
+  props: {
+    DATA: {
+      type: Array,
+      required: true,
+      default: () => {
+        return []
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
-      tableData: [],
       model_cfg: {
         visible: false,
         showClose: true,
@@ -177,21 +333,236 @@ export default {
         title: this.$t('curriculumVitae:continuingTraining:form:title'),
         appendToBody: true,
       },
-      form: {},
-      rules: {},
+      form: defaultForm(),
+      rules: {
+        BeginDate: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        EndDate: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        Training: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        Major: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        MajorCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 4000,
+            message: this.$t('form:rules:maxLength:4000'),
+            trigger: 'blur',
+          },
+        ],
+        City: [
+          {
+            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: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Country: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        CountryCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
       daterange: [],
+      hospitalSelectList: [],
     }
   },
+  computed: {
+    ...mapGetters(['hospitalList']),
+  },
+  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: {
-    openEdit() {
+    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 = []
+      if (row) {
+        Object.keys(this.form).forEach((key) => {
+          if (row[key]) {
+            this.form[key] = row[key]
+          }
+        })
+        if (this.form.BeginDate && this.form.EndDate) {
+          this.daterange = [this.form.BeginDate, this.form.EndDate]
+        }
+        if (this.form.Degree) {
+          this.form.Degree = Number(this.form.Degree)
+        }
+        this.form.Id = row.Id
+      }
       this.model_cfg.visible = true
     },
     handleCancle() {
+      this.form = defaultForm()
+      this.daterange = []
       this.model_cfg.visible = false
     },
-    handleSave() {
-      this.model_cfg.visible = false
+    async handleSave() {
+      try {
+        let validate = await this.$refs.continuingTrainingFrom.validate()
+        if (!validate) return false
+        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
+        if (res.IsSuccess) {
+          this.$emit('getInfo')
+          this.model_cfg.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    async handleDel(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('trials:trials-list:table:isDeleted')
+        )
+        if (!confirm) return false
+        this.loading = true
+        let res = await deletePostgraduateInfo(row.Id)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.$emit('getInfo')
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    changeTimeList() {
+      if (this.daterange && this.daterange.length === 2) {
+        this.form.BeginDate = this.daterange[0]
+        this.form.EndDate = this.daterange[1]
+      } else {
+        this.form.BeginDate = null
+        this.form.EndDate = null
+      }
     },
   },
 }
@@ -204,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

@@ -2,12 +2,18 @@
   <div class="EducationalExperience">
     <div class="title">
       <span>{{ $t('curriculumVitae:EducationalExperience:title') }}</span>
-      <el-button type="text" class="editBtn" @click.stop="openEdit">
+      <el-button
+        type="text"
+        class="editBtn"
+        @click.stop="openEdit"
+        :disabled="!reviewerId"
+      >
         {{ $t('common:button:add') }}
       </el-button>
     </div>
     <el-table
-      :data="tableData"
+      :data="DATA"
+      v-loading="loading"
       style="width: 100%"
       :header-cell-style="{ background: '#eee', color: '#606266' }"
     >
@@ -15,33 +21,64 @@
         prop="date"
         :label="$t('curriculumVitae:EducationalExperience:table:time')"
       >
+        <template slot-scope="scope">
+          <span>{{ scope.row.BeginDateStr }} ~ {{ scope.row.EndDateStr }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="date"
         :label="$t('curriculumVitae:EducationalExperience:table:specialy')"
       >
+        <template slot-scope="scope">
+          <span>
+            {{ isEN ? scope.row.Major : scope.row.MajorCN }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="date"
         :label="$t('curriculumVitae:EducationalExperience:table:degree')"
       >
+        <template slot-scope="scope">
+          <span>
+            {{ $fd('Degree', Number(scope.row.Degree)) }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="date"
         :label="$t('curriculumVitae:EducationalExperience:table:school')"
       >
+        <template slot-scope="scope">
+          <span>
+            {{ isEN ? scope.row.Organization : scope.row.OrganizationCN }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="date"
         :label="$t('curriculumVitae:EducationalExperience:table:city')"
       >
+        <template slot-scope="scope">
+          <span>
+            {{ isEN ? scope.row.City : scope.row.CityCN }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column prop="date" :label="$t('common:action:action')">
         <template slot-scope="scope">
-          <el-button type="text" class="editBtn" @click.stop="openEdit(scope)">
+          <el-button
+            type="text"
+            class="editBtn"
+            @click.stop="openEdit(scope.row)"
+          >
             {{ $t('common:button:edit') }}
           </el-button>
-          <el-button type="text" class="editBtn" @click.stop="openEdit">
+          <el-button
+            type="text"
+            class="editBtn"
+            @click.stop="handleDel(scope.row)"
+          >
             {{ $t('common:button:delete') }}
           </el-button>
         </template>
@@ -59,53 +96,60 @@
         >
           <el-form-item
             :label="$t('curriculumVitae:EducationalExperience:form:time')"
-            prop="InternationalizationType"
+            prop="BeginDate"
           >
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
+              value-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')"
+              @change="changeTimeList"
             >
             </el-date-picker>
           </el-form-item>
 
           <el-form-item
             :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
-            prop="InternationalizationType"
+            prop="Major"
+            v-if="isEN"
           >
-            <el-row>
-              <el-col :span="12" style="margin-right: 5px">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:specialy'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-              <el-col :span="11">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:specialyEN'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-            </el-row>
+            <el-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:degree')"
-            prop="InternationalizationType"
+            :label="$t('curriculumVitae:EducationalExperience:form:specialy')"
+            prop="MajorCN"
+            v-else
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
+            <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')"
+            prop="Degree"
+          >
+            <el-select v-model="form.Degree" placeholder="">
               <el-option
-                v-for="item in $d.sex"
+                v-for="item in $d.Degree"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
@@ -115,43 +159,89 @@
 
           <el-form-item
             :label="$t('curriculumVitae:EducationalExperience:form:school')"
-            prop="InternationalizationType"
+            prop="Organization"
+            v-if="isEN"
           >
-            <el-row>
-              <el-col :span="12" style="margin-right: 5px">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:school'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-              <el-col :span="11">
-                <el-input
-                  clearable
-                  :placeholder="
-                    $t(
-                      'curriculumVitae:EducationalExperience:placeholder:schoolEN'
-                    )
-                  "
-                ></el-input>
-              </el-col>
-            </el-row>
+            <el-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="InternationalizationType"
+            prop="City"
+            v-if="isEN"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
-              <el-option
-                v-for="item in $d.sex"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-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>
@@ -159,7 +249,12 @@
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave"
+          :loading="loading"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -168,12 +263,44 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
+import { addOrUpdateEducationInfo, deleteEducationInfo } from '@/api/reviewers'
+const defaultForm = () => {
+  return {
+    BeginDate: '',
+    EndDate: '',
+    Degree: '',
+    Major: '',
+    MajorCN: '',
+    Organization: '',
+    OrganizationCN: '',
+    City: '',
+    CityCN: '',
+    Country: '',
+    CountryCN: '',
+  }
+}
 export default {
   name: 'EducationalExperience',
   components: { BaseModel },
+  props: {
+    DATA: {
+      type: Array,
+      required: true,
+      default: () => {
+        return []
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
-      tableData: [],
       model_cfg: {
         visible: false,
         showClose: true,
@@ -181,21 +308,192 @@ export default {
         title: this.$t('curriculumVitae:EducationalExperience:form:title'),
         appendToBody: true,
       },
-      form: {},
-      rules: {},
+      form: defaultForm(),
+      rules: {
+        BeginDate: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        EndDate: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        Degree: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        Major: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        MajorCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Organization: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        OrganizationCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        City: [
+          { 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: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Country: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        CountryCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
       daterange: [],
     }
   },
   methods: {
-    openEdit() {
+    openEdit(row) {
+      this.form = defaultForm()
+      this.daterange = []
+      if (row) {
+        Object.keys(this.form).forEach((key) => {
+          if (row[key]) {
+            this.form[key] = row[key]
+          }
+        })
+        if (this.form.BeginDate && this.form.EndDate) {
+          this.daterange = [this.form.BeginDate, this.form.EndDate]
+        }
+        if (this.form.Degree) {
+          this.form.Degree = Number(this.form.Degree)
+        }
+        this.form.Id = row.Id
+      }
       this.model_cfg.visible = true
     },
     handleCancle() {
+      this.form = defaultForm()
+      this.daterange = []
       this.model_cfg.visible = false
     },
-    handleSave() {
-      this.model_cfg.visible = false
+    async handleSave() {
+      try {
+        let validate = await this.$refs.EducationalExperienceFrom.validate()
+        if (!validate) return false
+        if (this.reviewerId) {
+          this.form.DoctorId = this.reviewerId
+        }
+        this.loading = true
+        let res = await addOrUpdateEducationInfo(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$emit('getInfo')
+          this.model_cfg.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    async handleDel(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('trials:trials-list:table:isDeleted')
+        )
+        if (!confirm) return false
+        this.loading = true
+        let res = await deleteEducationInfo(row.Id)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.$emit('getInfo')
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    changeTimeList() {
+      if (this.daterange && this.daterange.length === 2) {
+        this.form.BeginDate = this.daterange[0]
+        this.form.EndDate = this.daterange[1]
+      } else {
+        this.form.BeginDate = null
+        this.form.EndDate = null
+      }
     },
   },
 }
@@ -208,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

@@ -0,0 +1,201 @@
+<template>
+  <el-dialog
+    :title="$t('system:Setting:title:Vacation')"
+    :visible.sync="visible"
+    width="50%"
+    :close-on-click-modal="false"
+    :before-close="closeDialog"
+    append-to-body
+  >
+    <div v-if="!isPreview">
+      <el-date-picker
+        v-model="daterange"
+        style="width: 360px"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        type="daterange"
+        range-separator="to"
+        :start-placeholder="$t('system:Setting:label:Beginning Date')"
+        :end-placeholder="$t('system:Setting:label:End Date')"
+        size="small"
+      />
+      <el-button
+        style="margin-left: 10px"
+        type="primary"
+        size="small"
+        @click="handleAddHoliday"
+      >
+        {{ $t('common:button:add') }}
+      </el-button>
+    </div>
+    <el-table v-loading="loading" :data="gridData" size="small">
+      <el-table-column type="index" />
+      <el-table-column
+        property="StartDate"
+        :label="$t('system:Setting:table:Beginning Date')"
+        min-width="120"
+        :formatter="beginTimeFormatter"
+      />
+      <el-table-column
+        property="EndDate"
+        :label="$t('system:Setting:table:End Date')"
+        min-width="120"
+        :formatter="endTimeFormatter"
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        min-width="200"
+        v-if="!isPreview"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDelete(scope.row)">
+            {{ $t('common:button:delete') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination" style="padding: 10px 0; text-align: right">
+      <el-pagination
+        background
+        layout="total,sizes,prev, pager, next"
+        :total="totalItems"
+        :page-sizes="[5, 10, 20, 50]"
+        :page-size="pageSize"
+        :current-page.sync="pageIndex"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+      />
+    </div>
+  </el-dialog>
+</template>
+<script>
+import {
+  getVacationList,
+  addOrUpdateVacation,
+  deleteVacation,
+} from '@/api/reviewers'
+import { fmtDate } from '@/utils/formatter'
+export default {
+  name: 'holiday',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isPreview: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      daterange: [],
+      loading: false,
+      gridData: [],
+      pageIndex: 1,
+      pageSize: 5,
+      totalItems: 0,
+    }
+  },
+  mounted() {
+    this.initHolidayList()
+  },
+  methods: {
+    closeDialog() {
+      this.$emit('update:visible', false)
+    },
+    handleAddHoliday() {
+      if (this.daterange && this.daterange.length > 0) {
+        const param = {
+          DoctorId: this.reviewerId,
+          StartDate: this.daterange[0],
+          EndDate: this.daterange[1],
+        }
+        this.loading = true
+        addOrUpdateVacation(param)
+          .then((res) => {
+            if (res.IsSuccess) {
+              param.Id = res.Result
+              this.gridData.push(param)
+              this.totalItems = this.totalItems + 1
+              this.daterange = ''
+            } else {
+              this.$alert(res.ErrorMessage)
+            }
+            this.loading = false
+          })
+          .catch(() => {
+            this.daterange = ''
+            this.loading = false
+          })
+      }
+    },
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.loading = true
+          deleteVacation(row.Id)
+            .then((res) => {
+              if (res.IsSuccess) {
+                var index = this.gridData.findIndex(
+                  (item) => item.Id === row.Id
+                )
+                if (index !== -1) {
+                  this.gridData.splice(index, 1)
+                  this.totalItems = this.totalItems - 1
+                }
+                this.$message.success(
+                  this.$t('common:message:deletedSuccessfully')
+                )
+              }
+              this.loading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch((action) => {})
+    },
+    initHolidayList() {
+      this.loading = true
+      getVacationList(this.reviewerId, this.pageIndex, this.pageSize)
+        .then((res) => {
+          if (res.IsSuccess) {
+            this.gridData = res.Result.CurrentPageData
+            this.totalItems = res.Result.TotalCount
+          }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    beginTimeFormatter(row) {
+      if (row.StartDate) {
+        return fmtDate(row.StartDate)
+      }
+    },
+    endTimeFormatter(row) {
+      if (row.EndDate) {
+        return fmtDate(row.EndDate)
+      }
+    },
+    handleCurrentChange(val) {
+      this.pageIndex = val
+      this.initHolidayList()
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.initHolidayList()
+    },
+  },
+}
+</script>

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

@@ -3,23 +3,68 @@
     <el-button type="text" class="editBtn" @click.stop="openEdit">
       {{ $t('common:button:edit') }}
     </el-button>
-    <template v-if="true">
+    <template v-if="DATA.FirstName && DATA.LastName">
       <div class="userInfo">
-        <span>张三</span>
-        <span>医学博士</span>
-        <span>广州医院</span>
-        <span>社会兼职中华医学会XXXXXX</span>
+        <span>{{
+          isEN ? DATA.LastName + ' / ' + DATA.FirstName : DATA.ChineseName
+        }}</span>
+        <span>{{ $fd('Sex', DATA.Sex) }}</span>
+        <span v-if="isEN">
+          {{
+            Array.isArray(DATA.TitleList) && DATA.TitleList.length > 0
+              ? DATA.TitleList.join(', ')
+              : ''
+          }}
+        </span>
+        <span v-else>
+          {{
+            Array.isArray(DATA.TitleCNList) && DATA.TitleCNList.length > 0
+              ? DATA.TitleCNList.join(', ')
+              : ''
+          }}
+        </span>
+        <span v-if="isEN">{{ DATA.HospitalName }}</span>
+        <span v-else>{{ DATA.HospitalNameCN }}</span>
       </div>
       <div class="userTitle">
-        <span class="el-icon-first-aid-kit">放射科</span>
-        <span class="el-icon-user">主任</span>
-        <span class="el-icon-medal">副主任医师</span>
-        <span class="el-icon-trophy">副教授</span>
+        <span
+          class="el-icon-first-aid-kit"
+          v-if="DATA.Department || DATA.DepartmentCN"
+        >
+          <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>
       </div>
       <div class="userTel">
-        <span class="el-icon-phone-outline">18616815282</span>
-        <span class="el-icon-message">sicauzhangye@sina.com</span>
-        <span class="el-icon-chat-dot-round">wechat666</span>
+        <span class="el-icon-phone-outline">
+          {{ DATA.Phone }}
+        </span>
+        <span class="el-icon-message">{{ DATA.EMail }}</span>
+        <span class="el-icon-chat-dot-round" v-if="DATA.WeChat">{{
+          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>
@@ -30,44 +75,59 @@
           v-loading="loading"
           :model="form"
           :rules="rules"
-          label-width="80px"
+          label-width="100px"
           size="small"
         >
+          <div class="form_title">
+            {{ $t('curriculumVitae:info:form:infoTitle') }}
+          </div>
           <el-row>
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:surname')"
-                prop="InternationalizationType"
+                prop="FirstName"
               >
-                <el-input v-model="form.surname" clearable></el-input>
+                <el-input
+                  v-model="form.FirstName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:name')"
-                prop="InternationalizationType"
+                prop="LastName"
               >
-                <el-input 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="InternationalizationType"
+                prop="ChineseName"
               >
-                <el-input clearable></el-input>
+                <el-input
+                  v-model="form.ChineseName"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:sex')"
-                prop="InternationalizationType"
+                prop="Sex"
               >
                 <el-select v-model="form.Sex" clearable placeholder="">
                   <el-option
-                    v-for="item in $d.sex"
+                    v-for="item in $d.Sex"
                     :key="item.id"
                     :label="item.label"
                     :value="item.value"
@@ -80,14 +140,14 @@
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:education')"
-                prop="InternationalizationType"
+                prop="TitleIds"
               >
-                <el-select v-model="form.Sex" clearable placeholder="">
+                <el-select v-model="form.TitleIds[0]" clearable placeholder="">
                   <el-option
-                    v-for="item in $d.sex"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="item of dictionaryList.Title"
+                    :key="item.Id"
+                    :label="item.Value"
+                    :value="item.Id"
                   />
                 </el-select>
               </el-form-item>
@@ -95,9 +155,13 @@
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:phone')"
-                prop="InternationalizationType"
+                prop="Phone"
               >
-                <el-input clearable></el-input>
+                <el-input
+                  v-model="form.Phone"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -105,122 +169,232 @@
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:email')"
-                prop="InternationalizationType"
+                prop="EMail"
               >
-                <el-input clearable></el-input>
+                <el-input v-model="form.EMail" clearable disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
                 :label="$t('curriculumVitae:info:form:wechat')"
-                prop="InternationalizationType"
+                prop="WeChat"
               >
-                <el-input clearable></el-input>
+                <el-input
+                  v-model="form.WeChat"
+                  clearable
+                  :maxlength="400"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item
-                :label="$t('curriculumVitae:info:form:payType')"
-                prop="InternationalizationType"
+                :label="$t('curriculumVitae:info:form:country')"
+                prop="Nation"
               >
-                <el-select v-model="form.Sex" clearable placeholder="">
+                <el-select v-model="form.Nation" size="small" class="mr">
                   <el-option
-                    v-for="item in $d.sex"
-                    :key="item.id"
-                    :label="item.label"
+                    v-for="item of $d.AttendedReviewerType"
                     :value="item.value"
+                    :label="item.label"
+                    :key="item.id"
                   />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
+          <div class="form_title">
+            {{ $t('curriculumVitae:info:form:workTitle') }}
+          </div>
           <el-form-item
             :label="$t('curriculumVitae:info:form:hospital')"
-            prop="InternationalizationType"
+            prop="HospitalName"
+            v-if="isEN"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
-              <el-option
-                v-for="item in $d.sex"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalName"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
+              placeholder=""
+              @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
+              v-model="form.UniversityAffiliated"
+              type="textarea"
+              autosize
+              size="small"
+              :maxlength="4000"
+            />
+          </el-form-item>
+          <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')"
-            prop="InternationalizationType"
+            prop="DepartmentId"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
+            <el-select v-model="form.DepartmentId" clearable placeholder="">
               <el-option
-                v-for="item in $d.sex"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
+                v-for="item of dictionaryList.Department"
+                :key="item.Id"
+                :label="item.Value"
+                :value="item.Id"
+              />
+              <el-option
+                :label="$t('curriculumVitae:selectLabel:Other')"
+                :value="otherId"
               />
             </el-select>
           </el-form-item>
           <el-form-item
-            :label="$t('curriculumVitae:info:form:rank')"
-            prop="InternationalizationType"
+            v-if="form.DepartmentId === otherId && isEN"
+            class="other-item"
+            prop="DepartmentOther"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
-              <el-option
-                v-for="item in $d.sex"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input
+              v-model="form.DepartmentOther"
+              :placeholder="
+                $t('curriculumVitae:info:form:placeholder:DepartmentOther')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="form.DepartmentId === otherId && !isEN"
+            class="other-item"
+            prop="DepartmentOtherCN"
+          >
+            <el-input
+              v-model="form.DepartmentOtherCN"
+              :placeholder="
+                $t('curriculumVitae:info:form:placeholder:DepartmentOtherCN')
+              "
+              size="small"
+              :maxlength="400"
+            />
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:physician')"
-            prop="InternationalizationType"
+            prop="RankId"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
+            <el-select v-model="form.RankId" clearable placeholder="">
               <el-option
-                v-for="item in $d.sex"
+                v-for="item in $d.Rank"
                 :key="item.id"
                 :label="item.label"
-                :value="item.value"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
           <el-form-item
-            :label="$t('curriculumVitae:info:form:position')"
-            prop="InternationalizationType"
+            v-if="
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && isEN
+            "
+            class="other-item"
+            prop="RankOther"
           >
-            <el-select v-model="form.Sex" clearable placeholder="">
-              <el-option
-                v-for="item in $d.sex"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input
+              v-model="form.RankOther"
+              :placeholder="
+                $t('curriculumVitae:info:form:placeholder:RankOther')
+              "
+              size="small"
+              :maxlength="400"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && !isEN
+            "
+            class="other-item"
+            prop="RankOtherCN"
+          >
+            <el-input
+              v-model="form.RankOtherCN"
+              :placeholder="
+                $t('curriculumVitae:info:form:placeholder:RankOtherCN')
+              "
+              size="small"
+              :maxlength="400"
+            />
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:partTimeJob')"
-            prop="InternationalizationType"
+            prop="WorkPartTime"
+            v-if="!isEN"
           >
             <el-input
               :placeholder="
                 $t('curriculumVitae:info:form:placeholder:partTimeJob')
               "
+              v-model="form.WorkPartTime"
               type="textarea"
-              :rows="2"
+              :rows="10"
               clearable
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
-          <el-form-item prop="InternationalizationType">
+          <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>
@@ -230,7 +404,12 @@
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleSave"
+          :loading="loading"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -239,32 +418,379 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+import { addOrUpdateDoctorBasicInfoAndEmployment } from '@/api/reviewers'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+const defaultForm = () => {
+  return {
+    FirstName: '',
+    LastName: '',
+    ChineseName: '',
+    Sex: '',
+    TitleIds: [],
+    Phone: '',
+    EMail: '',
+    WeChat: '',
+    Nation: 0,
+
+    DepartmentId: '',
+    DepartmentOther: '',
+    DepartmentOtherCN: '',
+    RankId: '',
+    RankOther: '',
+    RankOtherCN: '',
+    HospitalId: '',
+    HospitalName: null,
+    HospitalNameCN: null,
+    WorkPartTime: null,
+    WorkPartTimeEn: null,
+    UniversityAffiliated: null,
+    UniversityAffiliatedCN: null,
+    City: null,
+    CityCN: null,
+  }
+}
 export default {
   name: 'info',
   components: { BaseModel },
+  props: {
+    DATA: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {}
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:info:form:title'),
         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: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        LastName: [
+          {
+            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',
+          },
+        ],
+        Sex: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        TitleIds: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        Phone: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          { max: 20, min: 7, message: 'The length is 7 to 20' },
+        ],
+        EMail: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            type: 'email',
+            message: this.$t('rules:email'),
+            trigger: 'blur,change',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        WeChat: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        Nation: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        DepartmentId: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        DepartmentOther: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+          ,
+        ],
+        DepartmentOtherCN: [
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        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',
+          },
+        ],
       },
-      form: {},
-      rules: {},
       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) => {
+        if (this.DATA[key] || this.DATA[key] == 0) {
+          this.form[key] = this.DATA[key]
+        }
+      })
       this.model_cfg.visible = true
     },
     handleCancle() {
+      this.form = defaultForm()
       this.model_cfg.visible = false
     },
-    handleSave() {
-      this.model_cfg.visible = false
+    async handleSave() {
+      try {
+        let validate = await this.$refs.infoFrom.validate()
+        if (!validate) return false
+        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(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$emit('update:reviewerId', res.Result.Id)
+          sessionStorage.setItem('reviewerId', res.Result.Id)
+          this.$emit('getInfo')
+          this.model_cfg.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    getDicData() {
+      getBasicDataSelects(['Title', 'Department', 'Rank', 'Position'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+        })
+        .catch(() => {})
+    },
+    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
+      }
     },
   },
 }
@@ -312,4 +838,22 @@ export default {
 .el-select {
   width: 100%;
 }
+::v-deep .el-dialog__body {
+  padding-top: 0 !important;
+}
+.form_title {
+  margin: 10px 0;
+  display: flex;
+  align-items: center;
+  &::after {
+    margin-left: 20px;
+    display: block;
+    content: '';
+    border-top: 1px solid #eee;
+    flex: 1;
+  }
+}
+.noData {
+  line-height: 100px;
+}
 </style>

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

@@ -1,15 +1,23 @@
 <template>
   <div class="other">
     <div class="title">
-      <span>{{ $t('curriculumVitae:other:title') }}</span>
-      <el-button type="text" class="editBtn" @click.stop="openEdit">
+      <span>{{ $t('curriculumVitae:other:AH') }}</span>
+      <el-button
+        type="text"
+        class="editBtn"
+        :disabled="!reviewerId"
+        @click.stop="openEdit"
+      >
         {{ $t('common:button:edit') }}
       </el-button>
     </div>
-    <div class="message">
-      <div>{{ $t('curriculumVitae:other:AH') }}</div>
-      <p>a诺夫卡刷积分八九十快点把手里的v八路军那是的健康蓝色的艰苦拉萨的</p>
+    <div class="message" v-if="DATA.AwardsHonors || DATA.AwardsHonorsCN">
+      <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">
       <template slot="dialog-body">
         <el-form
@@ -17,25 +25,37 @@
           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="InternationalizationType"
+            prop="AwardsHonors"
+            v-if="isEN"
           >
             <el-input
               clearable
+              v-model="form.AwardsHonors"
               style="margin-bottom: 10px"
               type="textarea"
-              :rows="2"
-              :placeholder="$t('curriculumVitae:other:placeholder:AH')"
+              :rows="10"
+              :maxlength="4000"
+              :placeholder="$t('curriculumVitae:other:placeholder:AHEN')"
             ></el-input>
+          </el-form-item>
+          <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"
-              :placeholder="$t('curriculumVitae:other:placeholder:AHEN')"
+              :rows="10"
+              :maxlength="4000"
+              :placeholder="$t('curriculumVitae:other:placeholder:AH')"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -44,7 +64,12 @@
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="loading"
+          @click="handleSave"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -53,32 +78,95 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
+import { addOrUpdateResearchPublicationInfo } from '@/api/reviewers'
+const defaultForm = () => {
+  return {
+    Id: null,
+    AwardsHonors: '',
+    AwardsHonorsCN: '',
+  }
+}
 export default {
   name: 'other',
   components: { BaseModel },
+  props: {
+    DATA: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {}
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
+        width: '800px',
         title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
         appendToBody: true,
       },
-      form: {},
-      rules: {},
+      form: defaultForm(),
+      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,
     }
   },
   methods: {
     openEdit() {
+      this.form = defaultForm()
+      Object.keys(this.form).forEach((key) => {
+        if (this.DATA[key]) {
+          this.form[key] = this.DATA[key]
+        }
+      })
       this.model_cfg.visible = true
     },
     handleCancle() {
+      this.form = defaultForm()
       this.model_cfg.visible = false
     },
-    handleSave() {
-      this.model_cfg.visible = false
+    async handleSave() {
+      try {
+        let validate = await this.$refs.otherFrom.validate()
+        if (!validate) return false
+        if (this.reviewerId) {
+          this.form.DoctorId = this.reviewerId
+        }
+        this.loading = true
+        let res = await addOrUpdateResearchPublicationInfo(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$emit('getInfo')
+          this.model_cfg.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
     },
   },
 }
@@ -91,6 +179,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -99,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

@@ -2,7 +2,12 @@
   <div class="pay">
     <div class="title">
       <span>{{ $t('curriculumVitae:pay:title') }}</span>
-      <el-button type="text" class="editBtn" @click.stop="openEdit">
+      <el-button
+        type="text"
+        class="editBtn"
+        :disabled="!reviewerId"
+        @click.stop="openEdit"
+      >
         {{ $t('common:button:edit') }}
       </el-button>
     </div>
@@ -11,25 +16,33 @@
         <el-form-item
           :label="$t('curriculumVitae:pay:form:payCardId')"
           style="width: 45%"
-          >21323123123123123213123123213123</el-form-item
         >
+          {{ DATA.BankNum }}
+        </el-form-item>
         <el-form-item
           :label="$t('curriculumVitae:pay:form:username')"
           style="width: 45%"
-          >wangxiaoshuang</el-form-item
         >
+          {{ DATA.BankName }}
+        </el-form-item>
         <el-form-item
           :label="$t('curriculumVitae:pay:form:bank')"
           style="width: 45%"
-        ></el-form-item>
+        >
+          {{ DATA.OpeningBank }}
+        </el-form-item>
         <el-form-item
           :label="$t('curriculumVitae:pay:form:idCard')"
           style="width: 45%"
-        ></el-form-item>
+        >
+          {{ DATA.IdCard }}
+        </el-form-item>
         <el-form-item
           :label="$t('curriculumVitae:pay:form:phone')"
           style="width: 45%"
-        ></el-form-item>
+        >
+          {{ DATA.BankPhoneNum }}
+        </el-form-item>
       </el-form>
     </div>
     <base-model :config="model_cfg">
@@ -47,37 +60,62 @@
           <el-form-item
             style="width: 45%"
             :label="$t('curriculumVitae:pay:form:payCardId')"
-            prop="InternationalizationType"
+            prop="BankNum"
           >
-            <el-input clearable placeholder=""></el-input>
+            <el-input
+              clearable
+              placeholder=""
+              v-model="form.BankNum"
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
           <el-form-item
             style="width: 45%"
             :label="$t('curriculumVitae:pay:form:username')"
-            prop="InternationalizationType"
+            prop="BankName"
           >
-            <el-input clearable placeholder=""></el-input>
+            <el-input
+              clearable
+              placeholder=""
+              v-model="form.BankName"
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
           <el-form-item
             style="width: 45%"
             :label="$t('curriculumVitae:pay:form:bank')"
-            prop="InternationalizationType"
+            prop="OpeningBank"
           >
-            <el-input clearable placeholder=""></el-input>
+            <el-input
+              clearable
+              placeholder=""
+              v-model="form.OpeningBank"
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
           <el-form-item
             style="width: 45%"
             :label="$t('curriculumVitae:pay:form:idCard')"
-            prop="InternationalizationType"
+            prop="IdCard"
           >
-            <el-input clearable placeholder=""></el-input>
+            <el-input
+              clearable
+              placeholder=""
+              v-model="form.IdCard"
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
           <el-form-item
             style="width: 45%"
             :label="$t('curriculumVitae:pay:form:phone')"
-            prop="InternationalizationType"
+            prop="BankPhoneNum"
           >
-            <el-input clearable placeholder=""></el-input>
+            <el-input
+              clearable
+              placeholder=""
+              v-model="form.BankPhoneNum"
+              :maxlength="400"
+            ></el-input>
           </el-form-item>
         </el-form>
       </template>
@@ -85,7 +123,12 @@
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="loading"
+          @click="handleSave"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -94,32 +137,151 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
+import { updatePaymentMode } from '@/api/reviewers'
+const defaultForm = () => {
+  return {
+    BankNum: '',
+    BankName: '',
+    OpeningBank: '',
+    IdCard: '',
+    BankPhoneNum: '',
+  }
+}
 export default {
   name: 'pay',
   components: { BaseModel },
+  props: {
+    DATA: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {}
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       model_cfg: {
         visible: false,
         showClose: true,
         width: '800px',
-        title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
+        title: this.$t('curriculumVitae:pay:form:title'),
         appendToBody: true,
       },
-      form: {},
-      rules: {},
+      form: defaultForm(),
+      rules: {
+        BankNum: [
+          {
+            validator: (rule, value, callback) => {
+              let reg = new RegExp(/^[A-Za-z0-9]+$/, 'ig')
+              if (value && !reg.test(value)) {
+                callback(new Error(this.$t('common:ruleMessage:pattern')))
+              } else {
+                callback()
+              }
+            },
+            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: [
+          {
+            validator: (rule, value, callback) => {
+              let reg = new RegExp(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/, 'ig')
+              if (value && !reg.test(value)) {
+                callback(new Error(this.$t('common:ruleMessage:pattern')))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+        BankPhoneNum: [
+          {
+            validator: (rule, value, callback) => {
+              let reg = new RegExp(/^\d{11}$/, 'i')
+              if (value && !reg.test(value)) {
+                callback(new Error(this.$t('common:ruleMessage:pattern')))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+          {
+            max: 400,
+            message: this.$t('form:rules:maxLength:400'),
+            trigger: 'blur',
+          },
+        ],
+      },
       loading: false,
     }
   },
   methods: {
     openEdit() {
+      this.form = defaultForm()
+      Object.keys(this.form).forEach((key) => {
+        if (this.DATA[key]) {
+          this.form[key] = this.DATA[key]
+        }
+      })
       this.model_cfg.visible = true
     },
     handleCancle() {
+      this.form = defaultForm()
       this.model_cfg.visible = false
     },
-    handleSave() {
-      this.model_cfg.visible = false
+    async handleSave() {
+      try {
+        let validate = await this.$refs.payFrom.validate()
+        if (!validate) return false
+        if (this.reviewerId) {
+          this.form.Id = this.reviewerId
+        }
+        this.loading = true
+        let res = await updatePaymentMode(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$emit('getInfo')
+          this.model_cfg.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
     },
   },
 }
@@ -132,6 +294,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -141,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

@@ -2,28 +2,65 @@
   <div class="scientificResearchProject">
     <div class="title">
       <span>{{ $t('curriculumVitae:scientificResearchProject:title') }}</span>
-      <el-button type="text" class="editBtn" @click.stop="openEdit">
+      <el-button
+        type="text"
+        class="editBtn"
+        :disabled="!reviewerId"
+        @click.stop="openEdit"
+      >
         {{ $t('common:button:edit') }}
       </el-button>
     </div>
-    <div class="message">
+    <div
+      class="message"
+      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>direction</div>
-        </el-form-item>
-        <el-form-item
+          <div>
+            <span v-if="isEN">{{ DATA.Research }}</span>
+            <span v-else>{{ DATA.ResearchCN }}</span>
+          </div>
+        </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>subject</div>
-        </el-form-item>
+          <div>
+            <span
+              style="white-space: pre-wrap"
+              v-html="isEN ? DATA.Grants : DATA.GrantsCN"
+            ></span>
+          </div>
+        </el-form-item> -->
+        <div style="display: flex; font-size: 14px">
+          <span style="display: inline-block; width: 80px; color: #606266">{{
+            $t('curriculumVitae:scientificResearchProject:subject')
+          }}</span>
+          <span
+            class="break-word"
+            style="white-space: pre-wrap; width: calc(100% - 80px)"
+            v-html="isEN ? DATA.Grants : DATA.GrantsCN"
+          ></span>
+        </div>
       </el-form>
     </div>
+    <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
       <template slot="dialog-body">
         <el-form
-          ref="continuingTrainingFrom"
+          ref="scientificResearchProjectFrom"
           v-loading="loading"
           :model="form"
           :rules="rules"
@@ -34,47 +71,57 @@
             :label="
               $t('curriculumVitae:scientificResearchProject:form:direction')
             "
-            prop="InternationalizationType"
+            prop="Research"
+            v-if="isEN"
           >
             <el-input
               clearable
+              v-model="form.Research"
               style="margin-bottom: 10px"
-              :placeholder="
-                $t(
-                  'curriculumVitae:scientificResearchProject:placeholder:direction'
-                )
-              "
-            ></el-input>
-            <el-input
-              clearable
               :placeholder="
                 $t(
                   'curriculumVitae:scientificResearchProject:placeholder:directionEN'
                 )
               "
+              type="textarea"
+              :rows="2"
+              :maxlength="4000"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="ResearchCN"
+            :label="
+              $t('curriculumVitae:scientificResearchProject:form:direction')
+            "
+            v-else
+          >
+            <el-input
+              v-model="form.ResearchCN"
+              clearable
+              :placeholder="
+                $t(
+                  'curriculumVitae:scientificResearchProject:placeholder:direction'
+                )
+              "
+              type="textarea"
+              :rows="2"
+              :maxlength="4000"
             ></el-input>
           </el-form-item>
           <el-form-item
             :label="
               $t('curriculumVitae:scientificResearchProject:form:subject')
             "
-            prop="InternationalizationType"
+            prop="Grants"
+            v-if="isEN"
           >
             <el-input
+              v-model="form.Grants"
               clearable
               style="margin-bottom: 10px"
               type="textarea"
-              :rows="2"
-              :placeholder="
-                $t(
-                  'curriculumVitae:scientificResearchProject:placeholder:subject'
-                )
-              "
-            ></el-input>
-            <el-input
-              clearable
-              type="textarea"
-              :rows="2"
+              :rows="5"
+              :maxlength="4000"
               :placeholder="
                 $t(
                   'curriculumVitae:scientificResearchProject:placeholder:subjectEN'
@@ -82,13 +129,38 @@
               "
             ></el-input>
           </el-form-item>
+          <el-form-item
+            prop="GrantsCN"
+            :label="
+              $t('curriculumVitae:scientificResearchProject:form:subject')
+            "
+            v-else
+          >
+            <el-input
+              clearable
+              v-model="form.GrantsCN"
+              type="textarea"
+              :rows="5"
+              :maxlength="4000"
+              :placeholder="
+                $t(
+                  'curriculumVitae:scientificResearchProject:placeholder:subject'
+                )
+              "
+            ></el-input>
+          </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
         <el-button size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="loading"
+          @click="handleSave"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -97,9 +169,36 @@
 </template>
 <script>
 import BaseModel from '@/components/BaseModel'
+import { addOrUpdateResearchPublicationInfo } from '@/api/reviewers'
+const defaultForm = () => {
+  return {
+    Id: null,
+    Research: '',
+    ResearchCN: '',
+    Grants: '',
+    GrantsCN: '',
+  }
+}
 export default {
   name: 'scientificResearchProject',
   components: { BaseModel },
+  props: {
+    DATA: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {}
+      },
+    },
+    reviewerId: {
+      type: String,
+      default: '',
+    },
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       model_cfg: {
@@ -109,20 +208,72 @@ export default {
         title: this.$t('curriculumVitae:scientificResearchProject:form:title'),
         appendToBody: true,
       },
-      form: {},
-      rules: {},
+      form: defaultForm(),
+      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,
     }
   },
   methods: {
     openEdit() {
+      this.form = defaultForm()
+      Object.keys(this.form).forEach((key) => {
+        if (this.DATA[key]) {
+          this.form[key] = this.DATA[key]
+        }
+      })
       this.model_cfg.visible = true
     },
     handleCancle() {
+      this.form = defaultForm()
       this.model_cfg.visible = false
     },
-    handleSave() {
-      this.model_cfg.visible = false
+    async handleSave() {
+      try {
+        let validate = await this.$refs.scientificResearchProjectFrom.validate()
+        if (!validate) return false
+        if (this.reviewerId) {
+          this.form.DoctorId = this.reviewerId
+        }
+        this.loading = true
+        let res = await addOrUpdateResearchPublicationInfo(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$emit('getInfo')
+          this.model_cfg.visible = false
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
     },
   },
 }
@@ -135,6 +286,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;
@@ -143,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>