diff --git a/README-zh.md b/README-zh.md
index e472d1d6..9e111c1e 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -5,3 +5,6 @@ npm install
 # 启动服务
 npm run dev
 
+# v1.9.0修改
+1. 角色修改，全局userId实际意义修改为userRoleId（用户角色id），新增identityUserId（新的用户id）
+
diff --git a/public/index.html b/public/index.html
index 0c22a84a..8703f504 100644
--- a/public/index.html
+++ b/public/index.html
@@ -30,7 +30,6 @@
     </script>
     <% } else { %>
     <script>
-      console.log(2)
       window.zzSessionStorage = {
         setItem: (item, value) => {
           return sessionStorage.setItem(item, value)
diff --git a/src/App.vue b/src/App.vue
index bbc835a7..769f0bed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,12 +23,38 @@
     >
       i18n
     </div>
-    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
-      <div style="width: 320px">
-        <el-form label-width="100px" @submit.native.prevent size="small">
-          <el-form-item label="关键字">
+    <el-drawer
+      :title="$t('il8n:title')"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="80%"
+    >
+      <div style="width: 620px">
+        <el-form
+          label-width="100px"
+          @submit.native.prevent
+          size="small"
+          :inline="true"
+          class="demo-form-inline"
+        >
+          <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')" v-if="il8nExternal">
+            <el-select
+              v-model="State"
+              clearable
+              filterable
+              @change="handleStateChange"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
@@ -39,7 +65,7 @@
       >
         <el-table-column
           prop="Code"
-          label="标签"
+          :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
         >
@@ -53,7 +79,7 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column prop="Value" :label="$t('il8n:table:en')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -66,7 +92,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" label="中文">
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -79,6 +105,27 @@
             ></el-input>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          v-if="il8nExternal"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.State"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
         <el-button size="mini" @click="drawer = false">取消 </el-button>
@@ -110,10 +157,13 @@ export default {
       show: false,
       key: null,
       arr: [],
+      il8nExternal: false,
+      State: null,
     }
   },
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    Vue.prototype.$openI18n = this.openI18n
   },
   // watch: {
   //   '$route.query': {
@@ -145,6 +195,11 @@ export default {
   //   },
   // },
   methods: {
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
     changeValue(target, attr, e) {
       this.$set(target, attr, e)
     },
@@ -154,9 +209,9 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.indexOf(this.key) ||
-              ~v.Value.indexOf(this.key) ||
-              ~v.ValueCN.indexOf(this.key)
+              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
+              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
+              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
           )
         )
       } else {
@@ -181,22 +236,50 @@ export default {
             i18n.mergeLocaleMessage('en', enMessages)
             this.drawer = false
             this.$message.success('国际化修改成功')
+            if (this.il8nExternal) {
+              this.$EventBus.$emit('il8nUpdate')
+            }
           }
         )
       })
     },
-    openI18n() {
+    openI18n(ARRAY) {
       this.tableData = []
+      this.il8nExternal = false
       this.key = null
       this.drawer = true
       let arr = []
-      let tableData = this.$tl.map((v) => {
-        let a = { ...v }
-        // if (!a.Description) {
-        //   a.Description = this.$route.path
-        // }
-        return a
-      })
+      let tableData = []
+      if (ARRAY && Array.isArray(ARRAY)) {
+        this.il8nExternal = true
+        let data = ARRAY.map((v) => {
+          let a = { ...v }
+
+          return a
+        })
+        tableData = data.map((item) => {
+          return {
+            Code: item.Code,
+            Description: item.Description,
+            FrontType: item.FrontType,
+            Module: item.Module,
+            Value: item.Value,
+            ValueCN: item.ValueCN,
+            State: item.State,
+          }
+        })
+        this.tableData = Object.assign([], tableData)
+        this.arr = Object.assign([], tableData)
+        return false
+      } else {
+        tableData = this.$tl.map((v) => {
+          let a = { ...v }
+          // if (!a.Description) {
+          //   a.Description = this.$route.path
+          // }
+          return a
+        })
+      }
       tableData = tableData.filter((v) => {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
         return ~this.$path.indexOf(v.Code)
diff --git a/src/api/admin.js b/src/api/admin.js
index dbd9acf4..fa0cc84e 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -44,11 +44,19 @@ export function updateUser(param) {
     data: param
   })
 }
-
-export function getUser(userId) {
+export function updateUserBasicInfo(param) {
   return request({
-    url: `/user/getUser/${userId}`,
-    method: 'get'
+    url: `/user/updateUserBasicInfo`,
+    method: 'put',
+    data: param
+  })
+}
+
+export function getUser(params) {
+  return request({
+    url: `/user/getUser`,
+    method: 'get',
+    params
   })
 }
 
@@ -317,3 +325,20 @@ export function useUserIDGetDoctorID(data) {
     data
   })
 }
+
+// 管理端修改用户角色
+export function updateUserRoleInfo(data) {
+  return request({
+    url: `/User/updateUserRoleInfo`,
+    method: 'put',
+    data
+  })
+}
+// 管理端新增用户发送邮件
+export function addNewUserSendEmail(data) {
+  return request({
+    url: `/User/addNewUserSendEmail`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/reading.js b/src/api/reading.js
index a7fa5a6d..85717221 100644
--- a/src/api/reading.js
+++ b/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
+  })
+}
+
+
diff --git a/src/api/trials.js b/src/api/trials.js
index 26fd4bb2..432f32c5 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3914,4 +3914,48 @@ export function getVisitClinicalDataName(data) {
     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
+  })
 }
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index f7a60455..7aa40313 100644
--- a/src/api/user.js
+++ b/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,
+  })
+}
diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 378bec3a..f1f99380 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/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')"
diff --git a/src/components/BaseTable/index.vue b/src/components/BaseTable/index.vue
index 8311d4e8..dfdc43da 100644
--- a/src/components/BaseTable/index.vue
+++ b/src/components/BaseTable/index.vue
@@ -48,6 +48,7 @@
             :show-overflow-tooltip="column.showOverflowTooltip || false"
             :sortable="column.sortable || false"
             :prop="column.prop"
+            :fixed="column.fixed"
           >
             <template slot-scope="scope">
               <!-- 仅仅显示文字 -->
@@ -63,6 +64,10 @@
                     <el-button
                       :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
+                      v-if="
+                        (operate.show && scope.row[operate.show]) ||
+                        !operate.show
+                      "
                       style="margin-right: 5px"
                       @click="handleClick(operate, scope.row)"
                       >{{ operate.name }}</el-button
diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index 73310696..dcbd7f1d 100644
--- a/src/components/MFA/index.vue
+++ b/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;
diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index f49aafe6..7ea17661 100644
--- a/src/components/TrialsTab/index.vue
+++ b/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;
diff --git a/src/components/toggleRole/index.vue b/src/components/toggleRole/index.vue
new file mode 100644
index 00000000..7d508b3a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/const/check/index.js b/src/const/check/index.js
index 8b2ea225..f19bc6c2 100644
--- a/src/const/check/index.js
+++ b/src/const/check/index.js
@@ -1,6 +1,5 @@
 import { SubjectCheckConfig } from './module/Subject'
 
-console.log(SubjectCheckConfig.moduleType)
 export const checkConfig = {
   ModuleType: {
     ...SubjectCheckConfig.ModuleType
diff --git a/src/directive/dialogDrag.js b/src/directive/dialogDrag.js
index 460884d6..c798679c 100644
--- a/src/directive/dialogDrag.js
+++ b/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
       }
     }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d8a1ad17..9268d926 100644
--- a/src/layout/components/Navbar.vue
+++ b/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;
diff --git a/src/main.js b/src/main.js
index f9799d70..12bbc267 100644
--- a/src/main.js
+++ b/src/main.js
@@ -293,6 +293,7 @@ async function VueInit() {
     }()
     _vm.$forceUpdate()
   }
+  Vue.prototype.$EventBus = new Vue()
   Vue.prototype.$path = []
   var t = function (key) {
     if (!~Vue.prototype.$path.indexOf(key)) {
@@ -402,8 +403,12 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if (_vm.$msgbox) {
-        _vm.$msgbox.close();
+      try {
+        if (_vm.$msgbox && _vm.$msgbox.close) {
+          _vm.$msgbox.close();
+        }
+      } catch (err) {
+        console.log(err)
       }
       _vm.$FB.close();
       _vm.$FBT.close();
diff --git a/src/permission.js b/src/permission.js
index 92ec36ab..ea78a655 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,9 +1,10 @@
 import router from './router'
+import { resetRouter } from '@/router'
 import store from './store'
 // import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
 import WHITELIST from "./utils/whiteList"
@@ -26,7 +27,6 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    console.log(to.query.path)
     let res = await getTrialExtralConfig({
       TrialId: to.query.trialId,
     })
@@ -70,6 +70,16 @@ router.beforeEach(async (to, from, next) => {
       }
       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
@@ -79,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}`)
@@ -94,9 +107,10 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
+        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()
         }
@@ -109,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?`)
diff --git a/src/store/getters.js b/src/store/getters.js
index 9f5c1c33..e843f66d 100644
--- a/src/store/getters.js
+++ b/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
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index 4a411426..e3a7eb1b 100644
--- a/src/store/modules/reading.js
+++ b/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
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a2cf9be9..d5894a69 100644
--- a/src/store/modules/user.js
+++ b/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)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 00624119..19e68157 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -47,3 +47,6 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+.el-select-dropdown__wrap{
+  max-height: 350px;
+}
\ No newline at end of file
diff --git a/src/utils/dialog.js b/src/utils/dialog.js
index fa9ddae5..0559b07d 100644
--- a/src/utils/dialog.js
+++ b/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
diff --git a/src/utils/request-download.js b/src/utils/request-download.js
index 90bf9d29..03ab1808 100644
--- a/src/utils/request-download.js
+++ b/src/utils/request-download.js
@@ -89,9 +89,9 @@ service.interceptors.response.use(
           })
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            //this.$i18n.locale = 'zh'
+            //this.setLanguage('zh')
+            // this.$updateDictionary()
           })
         }
       } else {
diff --git a/src/utils/request.js b/src/utils/request.js
index f7dfed08..e08153f7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,11 +1,11 @@
 import axios from 'axios'
-import _vm from '@/main'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 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',
@@ -91,13 +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(() => {
-          if (_vm.$msgbox) {
-            _vm.$msgbox.close();
+          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) {
@@ -127,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({
@@ -143,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')
         }
@@ -153,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"
       )
@@ -171,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);
diff --git a/src/views/admin/user/components/UserInfo.vue b/src/views/admin/user/components/UserInfo.vue
index c77558a7..5b2057d5 100644
--- a/src/views/admin/user/components/UserInfo.vue
+++ b/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>
diff --git a/src/views/dashboard/bigdata.vue b/src/views/dashboard/bigdata.vue
index e551f087..adbfc643 100644
--- a/src/views/dashboard/bigdata.vue
+++ b/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()
           })
         })
diff --git a/src/views/dictionary/attachment/components/CommonTemplate/index.vue b/src/views/dictionary/attachment/components/CommonTemplate/index.vue
index 8e9e6fe1..fbe06690 100644
--- a/src/views/dictionary/attachment/components/CommonTemplate/index.vue
+++ b/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"
         />
diff --git a/src/views/dictionary/attachment/components/EmailTemplate/index.vue b/src/views/dictionary/attachment/components/EmailTemplate/index.vue
index 4cc5ab80..cedddeff 100644
--- a/src/views/dictionary/attachment/components/EmailTemplate/index.vue
+++ b/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"
         />
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
index 725124bd..f93cf82a 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
@@ -3,13 +3,16 @@
     ref="sysAttachmentFrom"
     v-loading="loading"
     :model="form"
-    label-width="170px"
+    label-width="190px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="文件类型: " prop="FileTypeId">
+      <el-form-item
+        :label="$t('dictionary:signature:form:FileTypeId')"
+        prop="FileTypeId"
+      >
         <el-select
           v-model="form.FileTypeId"
           style="width: 100%"
@@ -25,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -46,16 +49,16 @@
               type="primary"
               :disabled="form.FileTypeId === ''"
               :loading="btnLoading"
-              >Select</el-button
+              >{{ $t('common:button:check') }}</el-button
             >
             <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-              (must be in pdf format)
+              ({{ $t('trials:signature:label:mustBepdf') }})
             </span>
           </el-upload>
         </div>
       </el-form-item>
       <el-form-item
-        label="需要签署的用户类型: "
+        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
         prop="NeedConfirmedUserTypeIdList"
       >
         <el-select
@@ -71,7 +74,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否仅内部签署: " prop="DocUserSignType">
+      <el-form-item
+        :label="$t('dictionary:signature:form:DocUserSignType')"
+        prop="DocUserSignType"
+      >
         <el-switch
           v-model="form.DocUserSignType"
           :active-value="1"
@@ -80,7 +86,7 @@
         </el-switch>
       </el-form-item>
       <el-form-item
-        label="查看最短时间（分钟）: "
+        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
         prop="SignViewMinimumMinutes"
       >
         <el-input-number
@@ -105,7 +111,7 @@
           :disabled="form.FileTypeId === '' || form.Name === ''"
           :loading="saveBtnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -138,13 +144,25 @@ export default {
       },
       rules: {
         FileTypeId: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
         ],
         SignViewMinimumMinutes: [
-          { required: true, message: 'Please specify', trigger: ['change'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['change'],
+          },
         ],
         NeedConfirmedUserTypeIdList: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
         ],
       },
       fileList: [],
@@ -211,7 +229,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('trials:signature:label:mustBepdf'))
 
         return false
       }
@@ -236,7 +254,7 @@ export default {
       this.$refs.sysAttachmentFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
-          this.$alert('Please select file.')
+          this.$alert(this.$t('trials:signature:message:selectFile'))
           return
         }
         this.saveBtnLoading = true
@@ -245,7 +263,7 @@ export default {
             this.saveBtnLoading = false
             this.$emit('closeDialog')
             this.$emit('getList')
-            this.$message.success('Uploaded successfully')
+            this.$message.success(this.$t('common:message:updatedSuccessfully'))
           })
           .catch(() => {
             this.saveBtnLoading = false
@@ -263,7 +281,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
       var typeArr = ['pdf']
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index d2af93cc..3d052d91 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -2,7 +2,7 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="文件类型:">
+        <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
           <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of dict.type.Sys_Document"
@@ -12,7 +12,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <el-form-item :label="$t('dictionary:signature:search:Name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
@@ -34,7 +34,7 @@
       <el-button
         type="primary"
         icon="el-icon-plus"
-        style="margin-left: auto"
+        style="margin-left: auto; margin-bottom: 10px"
         size="small"
         @click="handleAdd"
       >
@@ -53,26 +53,27 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="FileType"
-          label="文件类型"
+          :label="$t('dictionary:signature:table:FileType')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:signature:table:Name')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="SignViewMinimumMinutes"
-          label="查看最短时间(分钟)"
+          :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="110"
         />
         <el-table-column
           prop="NeedConfirmedUserTypes"
-          label="需要签署的用户类型"
+          :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -85,48 +86,54 @@
         </el-table-column>
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:signature:table:IsDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.IsDeleted ? 'Yes' : 'No' }}
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
           prop="DocUserSignType"
-          label="是否仅内部签署"
+          :label="$t('dictionary:signature:table:DocUserSignType')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="90"
         >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="UpdateTime"
-          label="更新时间"
+          prop="CreateTime"
+          :label="$t('dictionary:signature:table:CreateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')" min-width="100">
           <template slot-scope="scope">
             <el-button type="text" @click="handlePreview(scope.row)">
-              预览
+              {{ $t('common:button:preview') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button
               :disabled="scope.row.IsDeleted"
               type="text"
               @click="handleRepeal(scope.row)"
             >
-              废除
+              {{ $t('common:button:revoke') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -261,7 +268,7 @@ export default {
     },
     // 废除
     handleRepeal(row) {
-      this.$confirm('是否确认废除此文件?', {
+      this.$confirm(this.$t('dictionary:signature:confirm:delFile'), {
         type: 'warning',
         distinguishCancelAndClose: true,
       })
@@ -298,7 +305,9 @@ export default {
                 this.list.findIndex((item) => item.Id === row.Id),
                 1
               )
-              this.$message.success('删除成功！')
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
             }
           })
           .catch(() => {
diff --git a/src/views/dictionary/attachment/components/UploadTemplate/index.vue b/src/views/dictionary/attachment/components/UploadTemplate/index.vue
index 4f497239..03626142 100644
--- a/src/views/dictionary/attachment/components/UploadTemplate/index.vue
+++ b/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"
         />
diff --git a/src/views/dictionary/institutions/components/HospitalForm.vue b/src/views/dictionary/institutions/components/HospitalForm.vue
index 504d4c89..70d647af 100644
--- a/src/views/dictionary/institutions/components/HospitalForm.vue
+++ b/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>
diff --git a/src/views/dictionary/template/browser/index.vue b/src/views/dictionary/template/browser/index.vue
index a9ddb472..47a779a2 100644
--- a/src/views/dictionary/template/browser/index.vue
+++ b/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">
diff --git a/src/views/dictionary/template/components/AddCriterion.vue b/src/views/dictionary/template/components/AddCriterion.vue
index 06e1ec76..249cd998 100644
--- a/src/views/dictionary/template/components/AddCriterion.vue
+++ b/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,
diff --git a/src/views/dictionary/template/components/Anonymization.vue b/src/views/dictionary/template/components/Anonymization.vue
index d202154b..817d65eb 100644
--- a/src/views/dictionary/template/components/Anonymization.vue
+++ b/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">
diff --git a/src/views/dictionary/template/components/ClinicalDataConfig.vue b/src/views/dictionary/template/components/ClinicalDataConfig.vue
index 1fcdc3e3..9fda81a4 100644
--- a/src/views/dictionary/template/components/ClinicalDataConfig.vue
+++ b/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">
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 8cb54177..dc6fbec8 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -243,7 +243,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="导出标识" 
+        <!-- <el-form-item label="导出标识" 
           prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -262,8 +262,11 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
+        </el-form-item> -->
+        <el-form-item 
+          label="导出结果"
+           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -446,13 +449,14 @@
             />
           </el-select>
         </el-form-item>
+        
         <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
-              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value.toString()"
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :value="item.Code"
             />
           </el-select>
         </el-form-item>
@@ -598,6 +602,27 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item
+          v-if="form.Type === 'table' || form.Type === 'basicTable'"
+          label="关联字典"
+        >
+          <el-select
+            v-model="form.DictionaryCode"
+            clearable
+            @change="
+              () => {
+                form.DefaultValue = null
+              }
+            "
+          >
+            <el-option
+              v-for="item of dicList"
+              :key="item.Id"
+              :label="item.Code"
+              :value="item.Code"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item 
           v-if="form.Type === 'upload'" 
           label="最大上传个数"
@@ -807,7 +832,7 @@ export default {
         ConvertShowType: 0,
         QuestionClassify: null,
         HighlightAnswerList: [],
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         MaxAnswerLength: null,
         FileType: [],
@@ -844,17 +869,18 @@ export default {
           { required: true, message: '请注明', trigger: 'blur' },
           { max: 50, message: '最大长度为 50' },
         ],
-        ExportIdentification: [
-          { required: true, message: '请选择', trigger: 'blur' },
-        ],
-        ExportResult: [
-          { required: true, message: '请选择', trigger: 'blur' },
-        ]
+        // ExportIdentification: [
+        //   { required: true, message: '请选择', trigger: 'blur' },
+        // ],
+        // ExportResult: [
+        //   { required: true, message: '请选择', trigger: 'blur' },
+        // ]
       },
       loading: false,
       btnLoading: false,
       parentOptions: [],
       parentTriggerValOptions: [],
+      reParentTriggerValOptions: [],
       groupOptions: [],
       isParentExistGroup: false,
       lesionTypes: [],
@@ -890,6 +916,7 @@ export default {
   mounted() {
     this.initForm()
     this.getCalculateQuestions('number')
+    
   },
   methods: {
     typeValueChange(v) {
@@ -905,6 +932,14 @@ export default {
         }
       })
     },
+    getBasicConfigSelect() {
+      getCriterionDictionaryList({
+        CriterionId: this.criterionId,
+        SystemCriterionId: this.criterionId
+      }).then(res => {
+        this.dicList = res.Result
+      })
+    }, 
     getCalculateQuestions(type) {
       getSystemCalculateQuestions({
         systemCriterionId: this.criterionId,
@@ -944,6 +979,7 @@ export default {
       await this.getParentQuestions()
       await this.getLesionTypeDictionary()
       await this.getLesionType()
+      await this.getBasicConfigSelect()
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
@@ -969,8 +1005,15 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.parentTriggerValOptions =
-                this.$d[this.parentOptions[index].DictionaryCode]
+              // this.parentTriggerValOptions =
+              //   this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
+
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach(
@@ -988,8 +1031,13 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.reParentTriggerValOptions =
-                this.$d[this.parentOptions[index].DictionaryCode]
+              // this.reParentTriggerValOptions =
+              //   this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1114,7 +1162,7 @@ export default {
       data.ConvertShowType = 0
       data.QuestionClassify = null
       data.HighlightAnswerList = []
-      data.ExportIdentification = 0
+      // data.ExportIdentification = 0
       data.ExportResult = []
       data.FileType = []
       data.ClassifyQuestionId = null
@@ -1180,15 +1228,21 @@ export default {
       }
       form.ParentTriggerValue = ''
     },
-    relevanceQuestionChange(val, form) {
+    async relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.reParentTriggerValOptions =
-              this.$d[this.parentOptions[index].DictionaryCode]
+            // this.reParentTriggerValOptions =
+            //   this.$d[this.parentOptions[index].DictionaryCode]
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+              
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
           } else {
             var options = []
             this.parentOptions[index].TypeValue.split('|').forEach(
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index fba49f04..69ac43b1 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/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>
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index f75e41d8..2d5deae5 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/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()
     }
   }
diff --git a/src/views/dictionary/template/components/IncreaseFields.vue b/src/views/dictionary/template/components/IncreaseFields.vue
index c653fafb..badc3517 100644
--- a/src/views/dictionary/template/components/IncreaseFields.vue
+++ b/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">
diff --git a/src/views/dictionary/template/components/MedicalAudit.vue b/src/views/dictionary/template/components/MedicalAudit.vue
index 543ae93a..6b5f5636 100644
--- a/src/views/dictionary/template/components/MedicalAudit.vue
+++ b/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">
diff --git a/src/views/dictionary/template/components/QcQuestions.vue b/src/views/dictionary/template/components/QcQuestions.vue
index 9e16395e..b6730d59 100644
--- a/src/views/dictionary/template/components/QcQuestions.vue
+++ b/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">
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index cde88917..0bafcd56 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -147,7 +147,7 @@
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
-        <el-form-item 
+        <!-- <el-form-item 
           :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -166,9 +166,12 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -327,6 +330,32 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item v-if="form.TableQuestionType === 3" label="默认值">
+          <el-select v-model="form.DefaultValue" clearable>
+            <!-- <el-option
+              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            /> -->
+            <el-option
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :value="item.Code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.TableQuestionType === 0" label="默认值">
+          <el-select v-model="form.DefaultValue" clearable>
+            <el-option
+              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
@@ -338,11 +367,17 @@
               />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
+              <!-- <el-option
                 v-for="item of $d[form.DictionaryCode]"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value.toString()"
+              /> -->
+              <el-option
+                v-for="item of highlightAnswers"
+                :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+                :value="item.Code"
               />
             </template>
           </el-select>
@@ -607,8 +642,9 @@ export default {
         ImageCount: 0,
         ClassifyTableQuestionId: null,
         ClassifyAlgorithms: null,
-        ExportIdentification: 0,
-        ExportResult: []
+        // ExportIdentification: 0,
+        ExportResult: [],
+        DefaultValue:null
         // IsEnable: true
       },
       rules: {
@@ -633,12 +669,12 @@ export default {
         DataTableColumn: [{ required: true, message: '请选择', trigger: 'blur' }],
         // DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
         DependParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ExportIdentification: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ],
-        ExportResult: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ]
+        // ExportIdentification: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ],
+        // ExportResult: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ]
       },
       loading: false,
       parentOptions: [],
@@ -648,9 +684,31 @@ export default {
       colOptions: [],
       dicList: [],
       CriterionDictionaryList: [],
-      Questions: []
+      Questions: [],
+      highlightAnswers: []
     }
   },
+  watch: {
+    'form.DictionaryCode': {
+      deep: true,
+      immediate: true,
+      async handler(v, oldv) {
+        try {
+          if (!v) {
+            this.highlightAnswers = []
+            return
+          }
+          let res = await getCriterionDictionary({
+            ReadingCriterionId: this.criterionId,
+            DictionaryCode: this.form.DictionaryCode,
+          })
+          this.highlightAnswers = res.Result[this.form.DictionaryCode]
+        } catch (e) {
+          console.log(e)
+        }
+      },
+    },
+  },
   mounted() {
     this.initForm()
     this.getCriterionDictionary()
@@ -710,7 +768,13 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -726,8 +790,12 @@ export default {
           })
           if (i !== -1) {
             if (this.parentOptions[i].QuestionGenre === 3) {
-              console.log(this.$d[this.parentOptions[i].DictionaryCode])
-              this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+              // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+              let dicCode = this.parentOptions[i].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
             } else {
               const options = []
               this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
@@ -805,14 +873,20 @@ export default {
         form.RelevanceValue = ''
       }
     },
-    parentQuestionChange(val, form) {
+    async parentQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+             let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -824,16 +898,20 @@ export default {
       }
       form.ParentTriggerValue = ''
     },
-    relevanceQuestionChange(val, form) {
+    async relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
-        console.log(this.$d[this.parentOptions[index].DictionaryCode], this.parentOptions[index].QuestionGenre)
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            console.log(this.$d[this.parentOptions[index].DictionaryCode])
-            this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -890,8 +968,9 @@ export default {
       form.ImageCount = null
       form.ClassifyTableQuestionId = null
       form.ClassifyAlgorithms = null
-      form.ExportIdentification = 0
+      // form.ExportIdentification = 0
       form.ExportResult = []
+      form.DefaultValue = null
     },
     close() {
       this.$emit('close')
diff --git a/src/views/dictionary/template/email/components/EmailForm.vue b/src/views/dictionary/template/email/components/EmailForm.vue
index 0cbc1171..f9e75ec7 100644
--- a/src/views/dictionary/template/email/components/EmailForm.vue
+++ b/src/views/dictionary/template/email/components/EmailForm.vue
@@ -246,9 +246,9 @@
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
       <el-button
-        :disabled="!form.EmailHtmlContentCN"
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
         type="text"
-        @click="PreviewHTML(form.EmailHtmlContentCN)"
+        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
         style="position: absolute; left: -50px; top: 30px"
       >
         {{ $t('common:button:preview') }}
@@ -265,9 +265,9 @@
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
       <el-button
-        :disabled="!form.EmailHtmlContent"
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
         type="text"
-        @click="PreviewHTML(form.EmailHtmlContent)"
+        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
         style="position: absolute; left: -50px; top: 30px"
       >
         {{ $t('common:button:preview') }}
@@ -519,8 +519,8 @@ export default {
       })
     },
     // 预览模板
-    PreviewHTML(html) {
-      this.$emit('PreviewHTML', html)
+    PreviewHTML(html, htmlEn) {
+      this.$emit('PreviewHTML', html, htmlEn)
     },
   },
 }
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index fe3ca77d..db56ca4d 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -123,8 +123,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
@@ -370,6 +378,13 @@
           <el-button type="text" @click="handleDelete(scope.row)"
             >删除</el-button
           >
+          <el-button
+            type="text"
+            @click="
+              preview(scope.row.EmailHtmlContentCN, scope.row.EmailHtmlContent)
+            "
+            >{{ $t('common:button:preview') }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -427,7 +442,23 @@
       fullscreen
       custom-class="base-dialog-wrapper"
     >
-      <div v-html="previewHTML"></div>
+      <div
+        style="
+          display: flex;
+          align-items: flex-start;
+          justify-content: space-around;
+          flex-wrap: wrap;
+        "
+      >
+        <div>
+          <h3>邮件内容模版（CN）</h3>
+          <div v-html="previewHTML"></div>
+        </div>
+        <div>
+          <h3>邮件内容模版（EN）</h3>
+          <div v-html="previewHTMLEN"></div>
+        </div>
+      </div>
     </el-dialog>
   </box-content>
 </template>
@@ -487,6 +518,7 @@ export default {
       attachmentVisible: false,
       previewVisible: false,
       previewHTML: null,
+      previewHTMLEN: null,
     }
   },
   computed: {
@@ -574,8 +606,9 @@ export default {
     closeDialog() {
       this.editVisible = false
     },
-    preview(html) {
+    preview(html, htmlEN) {
       this.previewHTML = html
+      this.previewHTMLEN = htmlEN
       this.previewVisible = true
     },
     // 导出
diff --git a/src/views/dictionary/template/sign/index.vue b/src/views/dictionary/template/sign/index.vue
index 7e84582b..0ced8f42 100644
--- a/src/views/dictionary/template/sign/index.vue
+++ b/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;">
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 9a11ceb9..b47e1f5f 100644
--- a/src/views/email-recompose/index.vue
+++ b/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>
diff --git a/src/views/error.vue b/src/views/error.vue
index db3aa915..47389a41 100644
--- a/src/views/error.vue
+++ b/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%;
     }
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 1f18d6f4..170a0c5c 100644
--- a/src/views/forgetpassword/index.vue
+++ b/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;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 468f4b66..484ad362 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -83,7 +83,7 @@
               <svg-icon icon-class="password" />
             </span>
             <!-- password -->
-            <!-- <el-input
+            <el-input
               :key="passwordType"
               ref="password"
               v-model="loginForm.password"
@@ -100,8 +100,8 @@
               <svg-icon
                 :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
               />
-            </span> -->
-            <el-input
+            </span>
+            <!-- <el-input
               :key="passwordType"
               ref="password"
               v-model="pwdCover"
@@ -115,7 +115,7 @@
             />
             <span class="show-pwd" @click="hidePassword">
               <svg-icon :icon-class="!isShowPassword ? 'eye' : 'eye-open'" />
-            </span>
+            </span> -->
           </el-form-item>
           <!-- Login -->
           <el-button
@@ -205,17 +205,21 @@
         "
       >
         <h1
-          style="text-align: center; margin-bottom: 20px"
+          style="text-align: center; margin-bottom: 30px"
           v-if="NODE_ENV === 'usa'"
         >
           About
         </h1>
-        <h1 style="text-align: center; margin-bottom: 20px" v-else>关于</h1>
-        <p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
-          {{ $t('login:title:system_title_about') }}
+        <h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
+        <p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
+          <!-- {{ $t('login:title:system_title_about') }} -->
+          <svg-icon
+            icon-class="login-logo"
+            style="width: 250px; height: 71px"
+          />
         </p>
-        <p style="margin-bottom: 20px" v-else>{{ $t('login:title:system') }}</p>
-        <p style="margin-bottom: 20px">
+        <p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
+        <p style="margin-bottom: 20px; margin-top: 0">
           V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
         </p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
@@ -243,6 +247,13 @@
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+      @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -253,9 +264,10 @@ import TopLang from './topLang'
 import Vcode from 'vue-puzzle-vcode'
 import browserTip from '@/views/dictionary/template/browser/tip.vue'
 import Img1 from '@/assets/pic-2.png'
+import toggleRole from '@/components/toggleRole'
 export default {
   name: 'Login',
-  components: { TopLang, Vcode, browserTip },
+  components: { TopLang, Vcode, browserTip, toggleRole },
   data() {
     return {
       NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
@@ -298,12 +310,15 @@ export default {
       isShow: false,
       showCode: false,
       Img1,
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
     }
   },
   computed: {
     ...mapGetters(['asyncRoutes', 'routes', 'language']),
     host() {
-      return window.location.host
+      // return window.location.host
+      return 'elevateimaging.ai '
     },
   },
   watch: {
@@ -318,6 +333,8 @@ export default {
     },
   },
   mounted() {
+    let lang = zzSessionStorage.getItem('lang') || 'zh'
+    // zzSessionStorage.clear()
     this.loginType = this.$route.query.loginType
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
@@ -332,9 +349,9 @@ export default {
         this.setLanguage('en')
         this.$updateDictionary()
       } else {
-        // this.$i18n.locale = 'zh'
-        // this.setLanguage('zh')
-        // this.$updateDictionary()
+        this.$i18n.locale = lang
+        this.setLanguage(lang)
+        this.$updateDictionary()
       }
     }
     this.$refs.browserTip.open()
@@ -376,6 +393,9 @@ export default {
       this.$store
         .dispatch('user/login', this.loginForm)
         .then((res) => {
+          if (res.BasicInfo.LoginState === 2) {
+            this.$message.warning(this.$t('login:message:login4'))
+          }
           if (res.BasicInfo.IsFirstAdd) {
             // 当前用户为首次登录,请先修改密码之后再次登录
             this.$message.success(this.$t('login:message:login1'))
@@ -385,7 +405,7 @@ export default {
               })
             }, 500)
             return
-          } else if (res.BasicInfo.LoginState === 1) {
+          } else if (res.BasicInfo.NeedChangePassWord) {
             // 请先修改密码后再登录！
             this.$alert(
               this.$t('login:message:login3'),
@@ -401,52 +421,117 @@ export default {
             )
             return
           } else if (res.IsMFA) {
+            zzSessionStorage.removeItem('userId')
+            zzSessionStorage.removeItem('identityUserId')
             this.$MFA({
-              UserId: res.BasicInfo.Id,
+              UserId: res.BasicInfo.IdentityUserId,
               EMail: res.BasicInfo.EMail,
               username: this.loginForm.username,
-              callBack: this.loginIn,
+              callBack: this.changeRoleLogin,
               cancelBack: () => {
                 this.loading = false
               },
             })
             return
-          } else if (res.BasicInfo.LoginState === 2) {
-            // 本次登录的IP或设备与上次不一致，请确认'
-            // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
-            this.$message.warning(this.$t('login:message:login4'))
           }
-          this.$store.dispatch('permission/generateRoutes').then((res) => {
-            this.loading = false
-            if (res && res.length > 0) {
-              this.$store.dispatch('global/getNoticeList')
-              this.$router.addRoutes(res)
-              if (this.loginType === 'DevOps') {
-                this.$router.replace({ path: res[0].path })
-                return
-              }
-              if (this.hasPermi(['role:radmin'])) {
-                this.$router.replace({ path: res[0].path })
-                return
-              }
-              if (
-                this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])
-              ) {
-                this.$router.replace({ path: '/trials/trials-list' })
-              } else {
-                this.$router.replace({ path: '/trials' })
-              }
-            } else {
-              // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
-              this.$message.warning(this.$t('login:message:login2'))
-            }
-          })
+          // else if (res.BasicInfo.LoginState === 2) {
+          //   // 本次登录的IP或设备与上次不一致，请确认'
+          //   // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+          //   this.$message.warning(this.$t('login:message:login4'))
+          // }
+          zzSessionStorage.removeItem('userId')
+          zzSessionStorage.removeItem('identityUserId')
+          this.changeRoleLogin()
         })
         .catch(() => {
           this.showCode = true
           this.loading = false
         })
     },
+    loginByRole(userRoleId) {
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          this.toggleRoleLoading = false
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then((res) => {
+                this.loading = false
+                if (res && res.length > 0) {
+                  this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  // if (this.LoginState === 2) {
+                  //   this.$message.warning(this.$t('login:message:login4'))
+                  // }
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    this.$router.replace({ path: '/trials/trials-list' })
+                  } else {
+                    this.$router.replace({ path: '/trials' })
+                  }
+                } else {
+                  this.toggleRoleLoading = false
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.showCode = true
+          this.loading = false
+          this.toggleRoleLoading = false
+        })
+    },
+    changeRoleLogin() {
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.length === 1
+      ) {
+        this.loginByRole(this.$store.state.user.roles[0].Id)
+        return
+      }
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
+          .length ===
+          this.$store.state.user.roles.length - 1
+      ) {
+        let role = this.$store.state.user.roles.find(
+          (item) => !item.IsUserRoleDisabled
+        )
+        this.loginByRole(role.Id)
+        return
+      }
+      return (this.toggleRoleVisible = true)
+    },
+    cancel() {
+      this.showCode = true
+      this.loading = false
+      this.toggleRoleLoading = false
+      // this.toggleRoleVisible = false
+    },
     onSuccess() {
       this.isShow = false
       this.loginIn()
@@ -456,7 +541,6 @@ export default {
     },
     // 输入框输入事件
     setPassword(val) {
-      console.log(val)
       if (this.isShowPassword) {
         this.loginForm.password = val
       } else {
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index 171d78ea..7fcb08e3 100644
--- a/src/views/recompose/index.vue
+++ b/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>
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index aef8b573..1edd4a70 100644
--- a/src/views/research/form.vue
+++ b/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">
diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index c037b271..4b23887c 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -437,7 +437,7 @@ export default {
     },
     handlePreview3(row) {
       return this.$preview({
-        path: row.FilePath,
+        path: row.Path || row.FilePath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -447,7 +447,7 @@ export default {
     },
     handlePreview2(row, r2) {
       return this.$preview({
-        path: row.fullPath,
+        path: row.Path || row.fullPath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -537,7 +537,7 @@ export default {
     handlePreview(row) {
       console.log(row)
       return this.$preview({
-        path: row.FullPath,
+        path: row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })
diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue
index 85da0264..99c39408 100644
--- a/src/views/reviewers/components/EducationTraining.vue
+++ b/src/views/reviewers/components/EducationTraining.vue
@@ -569,22 +569,30 @@
           :label="$t('system:EducationTraining:table:Hospital')"
           prop="Hospital"
         >
-          <el-select
-            v-model="postgraduateForm.HospitalId"
-            filterable
-            placeholder=""
-          >
-            <el-option
-              v-for="(item, index) in hospitalList"
-              :key="index"
-              :label="isEN ? item.HospitalName : item.HospitalNameCN"
-              :value="item.Id"
-            >
-              <span>
-                {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-              </span>
-            </el-option>
-          </el-select>
+          <el-row type="flex" justify="space-between">
+            <el-col :span="11">
+              <el-autocomplete
+                clearable
+                class="inline-input"
+                style="width: 100%"
+                v-model="postgraduateForm.Hospital"
+                :fetch-suggestions="querySearch"
+                @select="handleSelect"
+                placeholder="Please specify in English"
+              ></el-autocomplete>
+            </el-col>
+            <el-col :span="11">
+              <el-autocomplete
+                clearable
+                class="inline-input"
+                style="width: 100%"
+                v-model="postgraduateForm.HospitalCN"
+                :fetch-suggestions="querySearchCN"
+                @select="handleSelect"
+                placeholder="请用中文注明"
+              ></el-autocomplete>
+            </el-col>
+          </el-row>
         </el-form-item>
         <el-form-item
           :label="$t('system:EducationTraining:table:University')"
@@ -1043,6 +1051,8 @@ export default {
       },
       isDisabled: false,
       loading: false,
+      hospitalSelectList: [],
+      hospitalSelectListCN: [],
     }
   },
   computed: {
@@ -1051,11 +1061,71 @@ export default {
       return this.$i18n.locale !== 'zh'
     },
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          this.hospitalSelectList.push({
+            value: item.HospitalName,
+            ...item,
+          })
+          this.hospitalSelectListCN.push({
+            value: item.HospitalNameCN,
+            ...item,
+          })
+        })
+      },
+      deep: true,
+    },
+  },
   mounted() {
     this.initPage()
     store.dispatch('global/getHospital')
   },
   methods: {
+    handleSelect(value) {
+      const item = value
+      if (item) {
+        this.postgraduateForm.Hospital = item.HospitalName
+        this.postgraduateForm.HospitalCN = item.HospitalNameCN
+      }
+    },
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    querySearchCN(queryString, cb) {
+      var hospitalList = this.hospitalSelectListCN
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString, false))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString, isEN = true) {
+      return (hospitalList) => {
+        if (isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     initPage() {
       const id = this.$route.query.Id || this.reviewerId
       if (id) {
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 7378bd26..95dad9bb 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/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="isEN ? item.HospitalName : item.HospitalNameCN"
-                    :value="item.Id"
-                  >
-                    <span>
-                      {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-                    </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,12 +48,25 @@
             <el-col :span="14">
               <el-form-item
                 :label="$t('system:reviewer:label:AffiliatedUniversity')"
+                prop="UniversityAffiliated"
               >
                 <el-input
-                  disabled
-                  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"
                 />
@@ -59,15 +77,23 @@
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:City')">
                 <el-input
-                  disabled
-                  v-model="City"
+                  v-model="employmentForm.City"
                   size="small"
-                  :maxlength="400"
+                  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
@@ -90,7 +116,7 @@
                 />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <el-row>
             <el-col :span="14">
@@ -321,14 +347,34 @@ export default {
         Physician: '',
         PhysicianCN: '',
         PhysicianOriginal: null,
+        HospitalName: '',
+        HospitalNameCN: '',
         WorkPartTime: null,
         WorkPartTimeEn: null,
+        UniversityAffiliated: null,
+        UniversityAffiliatedCN: null,
+        City: null,
+        CityCN: null,
       },
       UniversityAffiliated: '',
       City: '',
       Province: '',
       Country: '',
       employmentRules: {
+        HospitalName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        HospitalNameCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         DepartmentId: [
           {
             required: true,
@@ -435,6 +481,8 @@ export default {
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
       loading: false,
       dictionaryList: {},
+      hospitalSelectList: [],
+      hospitalSelectListCN: [],
     }
   },
   computed: {
@@ -446,7 +494,83 @@ export default {
   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
@@ -515,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
@@ -551,9 +683,22 @@ export default {
               PositionOther,
               PositionOtherCN,
               HospitalId,
+              HospitalName,
+              HospitalNameCN,
               WorkPartTime,
               WorkPartTimeEn,
+              UniversityAffiliated,
+              UniversityAffiliatedCN,
+              City,
+              CityCN,
             } = res.Result
+            this.employmentForm.HospitalName = HospitalName
+            this.employmentForm.HospitalNameCN = HospitalNameCN
+            this.employmentForm.UniversityAffiliated = UniversityAffiliated
+            this.employmentForm.UniversityAffiliatedCN = UniversityAffiliatedCN
+            this.employmentForm.City = City
+            this.employmentForm.CityCN = CityCN
+
             this.employmentForm.WorkPartTime = WorkPartTime
             this.employmentForm.WorkPartTimeEn = WorkPartTimeEn
             this.employmentForm.Id = id
diff --git a/src/views/reviewers/curriculumVitae/components/file/agreement.vue b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
index 06d67587..7a3a8a1b 100644
--- a/src/views/reviewers/curriculumVitae/components/file/agreement.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
@@ -333,7 +333,7 @@ export default {
     },
     preview(row) {
       this.$preview({
-        path: row.FullPath,
+        path: row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })
diff --git a/src/views/reviewers/curriculumVitae/components/file/certificate.vue b/src/views/reviewers/curriculumVitae/components/file/certificate.vue
index 752f7fa7..5826bdf0 100644
--- a/src/views/reviewers/curriculumVitae/components/file/certificate.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/certificate.vue
@@ -292,7 +292,7 @@ export default {
     },
     preview(row) {
       this.$preview({
-        path: row.FullPath,
+        path: row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })
diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
index 68e68dd9..2146a36b 100644
--- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
@@ -150,20 +150,31 @@
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:hospital')"
-            prop="HospitalId"
+            prop="Hospital"
+            v-if="isEN"
           >
-            <el-select v-model="form.HospitalId" filterable placeholder="">
-              <el-option
-                v-for="(item, index) in hospitalList"
-                :key="index"
-                :label="isEN ? item.HospitalName : item.HospitalNameCN"
-                :value="item.Id"
-              >
-                <span>
-                  {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-                </span>
-              </el-option>
-            </el-select>
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.Hospital"
+              :fetch-suggestions="querySearch"
+              placeholder=""
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:continuingTraining:form:hospital')"
+            prop="Hospital"
+            v-else
+          >
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalCN"
+              :fetch-suggestions="querySearch"
+              placeholder=""
+            ></el-autocomplete>
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:continuingTraining:form:school')"
@@ -283,6 +294,8 @@ const defaultForm = () => {
     Major: '',
     MajorCN: '',
     HospitalId: null,
+    HospitalCN: null,
+    Hospital: null,
     School: '',
     SchoolCN: '',
     City: '',
@@ -418,6 +431,7 @@ export default {
       },
       loading: false,
       daterange: [],
+      hospitalSelectList: [],
     }
   },
   computed: {
@@ -426,7 +440,55 @@ export default {
   mounted() {
     store.dispatch('global/getHospital')
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          if (this.isEN) {
+            this.hospitalSelectList.push({
+              value: item.HospitalName,
+              ...item,
+            })
+          } else {
+            this.hospitalSelectList.push({
+              value: item.HospitalNameCN,
+              ...item,
+            })
+          }
+        })
+      },
+      deep: true,
+    },
+  },
   methods: {
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (hospitalList) => {
+        if (this.isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     openEdit(row) {
       this.form = defaultForm()
       this.daterange = []
@@ -458,6 +520,11 @@ export default {
         if (this.reviewerId) {
           this.form.DoctorId = this.reviewerId
         }
+        let data = Object.assign({}, this.form)
+        if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+          data.Hospital = data.HospitalId
+          data.HospitalId = null
+        }
         this.loading = true
         let res = await addOrUpdatePostgraduateInfo(this.form)
         this.loading = false
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index 1bf054c1..68a6ef80 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -6,7 +6,7 @@
     <template v-if="DATA.FirstName && DATA.LastName">
       <div class="userInfo">
         <span>{{
-          isEN ? DATA.FirstName + DATA.LastName : DATA.ChineseName
+          isEN ? DATA.LastName + ' / ' + DATA.FirstName : DATA.ChineseName
         }}</span>
         <span>{{ $fd('Sex', DATA.Sex) }}</span>
         <span v-if="isEN">
@@ -209,25 +209,35 @@
           </div>
           <el-form-item
             :label="$t('curriculumVitae:info:form:hospital')"
-            prop="HospitalId"
+            prop="HospitalName"
+            v-if="isEN"
           >
-            <el-select
-              v-model="form.HospitalId"
-              filterable
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalName"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
               placeholder=""
-              @change="handleHospitalChange"
-            >
-              <el-option
-                v-for="(item, index) in hospitalList"
-                :key="index"
-                :label="isEN ? item.HospitalName : item.HospitalNameCN"
-                :value="item.Id"
-              >
-                <span>
-                  {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-                </span>
-              </el-option>
-            </el-select>
+              @change="handleChange"
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item
+            :label="$t('curriculumVitae:info:form:hospital')"
+            prop="HospitalNameCN"
+            v-else
+          >
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.HospitalNameCN"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
+              placeholder=""
+              @change="handleChange"
+            ></el-autocomplete>
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:AffiliatedUniversity')"
@@ -235,7 +245,6 @@
             v-if="isEN"
           >
             <el-input
-              disabled
               v-model="form.UniversityAffiliated"
               type="textarea"
               autosize
@@ -249,7 +258,6 @@
             v-else
           >
             <el-input
-              disabled
               v-model="form.UniversityAffiliatedCN"
               type="textarea"
               autosize
@@ -261,10 +269,10 @@
             :label="$t('curriculumVitae:info:form:City')"
             v-if="isEN"
           >
-            <el-input disabled v-model="form.City" size="small" />
+            <el-input v-model="form.City" size="small" />
           </el-form-item>
           <el-form-item :label="$t('curriculumVitae:info:form:City')" v-else>
-            <el-input disabled v-model="form.CityCN" size="small" />
+            <el-input v-model="form.CityCN" size="small" />
           </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:info:form:department')"
@@ -433,6 +441,8 @@ const defaultForm = () => {
     RankOther: '',
     RankOtherCN: '',
     HospitalId: '',
+    HospitalName: null,
+    HospitalNameCN: null,
     WorkPartTime: null,
     WorkPartTimeEn: null,
     UniversityAffiliated: null,
@@ -616,11 +626,18 @@ export default {
             trigger: 'blur',
           },
         ],
-        HospitalId: [
+        HospitalName: [
           {
             required: true,
-            message: this.$t('common:ruleMessage:select'),
-            trigger: 'blur',
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        HospitalNameCN: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
           },
         ],
         UniversityAffiliated: [
@@ -648,16 +665,72 @@ export default {
       loading: false,
       dictionaryList: {},
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      hospitalSelectList: [],
     }
   },
   computed: {
     ...mapGetters(['hospitalList']),
   },
+  watch: {
+    hospitalList: {
+      handler() {
+        if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+          return false
+        this.hospitalSelectList = []
+        this.hospitalList.forEach((item) => {
+          if (this.isEN) {
+            this.hospitalSelectList.push({
+              value: item.HospitalName,
+              ...item,
+            })
+          } else {
+            this.hospitalSelectList.push({
+              value: item.HospitalNameCN,
+              ...item,
+            })
+          }
+        })
+      },
+      deep: true,
+    },
+  },
   mounted() {
     this.getDicData()
     store.dispatch('global/getHospital')
   },
   methods: {
+    handleChange(v) {
+      if (v) return
+      this.form.UniversityAffiliated = null
+      this.form.City = null
+      this.form.UniversityAffiliatedCN = null
+      this.form.CityCN = null
+    },
+    querySearch(queryString, cb) {
+      var hospitalList = this.hospitalSelectList
+      var results = queryString
+        ? hospitalList.filter(this.createFilter(queryString))
+        : hospitalList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (hospitalList) => {
+        if (this.isEN) {
+          return (
+            hospitalList.HospitalName.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        } else {
+          return (
+            hospitalList.HospitalNameCN.toLowerCase().indexOf(
+              queryString.toLowerCase()
+            ) >= 0
+          )
+        }
+      }
+    },
     openEdit() {
       this.form = defaultForm()
       Object.keys(this.form).forEach((key) => {
@@ -666,8 +739,6 @@ export default {
         }
       })
       this.model_cfg.visible = true
-      console.log(this.form)
-      console.log(this.DATA)
     },
     handleCancle() {
       this.form = defaultForm()
@@ -680,8 +751,14 @@ export default {
         if (this.reviewerId) {
           this.form.Id = this.reviewerId
         }
+        // console.log(this.form)
+        let data = Object.assign({}, this.form)
+        // if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+        //   data.HospitalName = data.HospitalId
+        //   data.HospitalId = null
+        // }
         this.loading = true
-        let res = await addOrUpdateDoctorBasicInfoAndEmployment(this.form)
+        let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
         this.loading = false
         if (res.IsSuccess) {
           this.$emit('update:reviewerId', res.Result.Id)
@@ -701,13 +778,18 @@ export default {
         })
         .catch(() => {})
     },
-    handleHospitalChange(value) {
-      const item = this.hospitalList.filter((item) => item.Id === value)
-      if (item.length) {
-        this.form.UniversityAffiliated = item[0].UniversityAffiliated
-        this.form.City = item[0].City
-        this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN
-        this.form.CityCN = item[0].CityCN
+    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
       }
     },
   },
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index d752faa3..999cbbc4 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -7,8 +7,9 @@
           <span v-if="isAll">
             {{
               isEN
-                ? reviewerData.BasicInfoView.FirstName +
-                  reviewerData.BasicInfoView.LastName
+                ? reviewerData.BasicInfoView.LastName +
+                  ' / ' +
+                  reviewerData.BasicInfoView.FirstName
                 : reviewerData.BasicInfoView.ChineseName
             }}
           </span>
@@ -1014,7 +1015,7 @@ export default {
       }
     },
     preview(row) {
-      let path = row.FullPath || row.FilePath
+      let path = row.Path || row.FullPath || row.FilePath
       this.$preview({
         path: path,
         type: 'pdf',
diff --git a/src/views/system/i18n/components/I18nForm.vue b/src/views/system/i18n/components/I18nForm.vue
index 7e8150d0..66a46bca 100644
--- a/src/views/system/i18n/components/I18nForm.vue
+++ b/src/views/system/i18n/components/I18nForm.vue
@@ -179,6 +179,7 @@ export default {
   methods: {
     openDialog(title, data, options = [], status) {
       this.PublishVersionList = options;
+      this.loading = false
       this.status = status;
       this.model_cfg.visible = true;
       this.model_cfg.title = title;
diff --git a/src/views/system/i18n/index.vue b/src/views/system/i18n/index.vue
index 65cbc3c6..b7886b1d 100644
--- a/src/views/system/i18n/index.vue
+++ b/src/views/system/i18n/index.vue
@@ -154,6 +154,15 @@
           >
             批量更新
           </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-edit-outline"
+            size="mini"
+            :disabled="selectTableList.length <= 0"
+            @click="handleBatchUpdateToChange"
+          >
+            批量编辑
+          </el-button>
           <el-button
             size="mini"
             type="primary"
@@ -380,6 +389,9 @@ export default {
   mounted() {
     this.getList()
     this.getPublishVersionSelect()
+    this.$EventBus.$on('il8nUpdate', (data) => {
+      this.getList()
+    })
   },
   methods: {
     // 获取迭代
@@ -416,6 +428,10 @@ export default {
         )
       })
     },
+    // 批量编辑国际化内容
+    handleBatchUpdateToChange() {
+      this.$openI18n(this.selectTableList)
+    },
     async batch(row) {
       let { PublishLogId, State } = row
       let data = {
diff --git a/src/views/system/log/components/LogForm.vue b/src/views/system/log/components/LogForm.vue
index 8e8c630f..3b671592 100644
--- a/src/views/system/log/components/LogForm.vue
+++ b/src/views/system/log/components/LogForm.vue
@@ -12,7 +12,7 @@
         <el-form-item :label="$t('system:log:form:version')" prop="Version">
           <el-input v-model="form.Version" />
         </el-form-item>
-        <el-form-item :label="$t('system:log:form:versionUS')" prop="Version">
+        <el-form-item :label="$t('system:log:form:versionUS')" prop="Version_US">
           <el-input v-model="form.Version_US" />
         </el-form-item>
         <el-form-item
@@ -100,6 +100,9 @@ export default {
           },
           { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
         ],
+        Version_US:[
+        { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }
+        ],
         // PublishTime: [
         //   { required: true, message: '请注明', trigger: 'blur' }
         // ],
diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue
new file mode 100644
index 00000000..f5e93903
--- /dev/null
+++ b/src/views/system/login-log/detail.vue
@@ -0,0 +1,107 @@
+<template>
+  <base-model v-if="config.visible" :config="config">
+    <template slot="dialog-body">
+      <el-table :data="curData" border style="width: 100%" size="small">
+        <el-table-column
+          prop="key"
+          :label="$t('system:loginLog:table:cfgItem')"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="value"
+          :label="$t('system:loginLog:table:cfgVal')"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.prop !== 'UserRoleList'">{{
+              scope.row.value
+            }}</span>
+            <template v-else>
+              <div
+                v-for="item in scope.row.value"
+                :key="item.UserTypeEnum"
+                style="margin: 0"
+              >
+                {{ item.UserTypeShortName
+                }}{{ $t('system:loginLog:form:symbol')
+                }}{{ $fd('IsEnable', !item.IsUserRoleDisabled) }}
+              </div>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <template slot="dialog-footer">
+      <el-button type="primary" @click="config.visible = false">
+        {{ $t('common:button:confirm') }}
+      </el-button>
+    </template>
+  </base-model>
+</template>
+<script>
+import BaseModel from '@/components/BaseModel'
+export default {
+  components: { BaseModel },
+  props: {
+    JsonObj: {
+      type: String,
+      default: '',
+    },
+    config: {
+      type: Object,
+      default: () => {
+        return {
+          visible: false,
+          title: this.$t('system:loginLog:dialog:title'),
+          width: '500px',
+          top: '10vh',
+          appendToBody: true,
+          bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      curKeys: [
+        'UserName',
+        'FirstName',
+        'LastName',
+        'EMail',
+        'Phone',
+        'OrganizationName',
+        'PositionName',
+        'DepartmentName',
+        'UserRoleList',
+      ],
+    }
+  },
+  computed: {
+    curDataArr() {
+      if (!this.curData) return []
+      return Object.keys(this.curData)
+    },
+    curData() {
+      if (!this.JsonObj) return []
+      let obj = JSON.parse(this.JsonObj)
+      let curData = []
+      Object.keys(obj).forEach((key) => {
+        if (this.curKeys.includes(key)) {
+          let o = {
+            key: this.$t(`system:loginLog:form:${key}`),
+            value: obj[key],
+            prop: key,
+          }
+          curData.push(o)
+        }
+      })
+      return curData
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-form-item__label {
+  font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index d6cac187..f3a775dc 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -50,7 +50,7 @@
           />
         </el-form-item>
         <el-form-item
-          :label=" $t('system:loginLog:table:LoginUserType')"
+          :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
         >
           <el-select
@@ -77,19 +77,15 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            @click="getList"
-          >
-            {{ $t("common:button:search") }}
+          <el-button type="primary" icon="el-icon-search" @click="getList">
+            {{ $t('common:button:search') }}
           </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -101,7 +97,32 @@
         class="table"
         @sort-change="handleSortByColumn"
       >
-        <el-table-column type="index" width="50" />
+        <el-table-column type="index" width="50">
+          <template slot-scope="scope">
+            <span
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+              "
+            >
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="$t('system:loginLog:label:IsLoginUncommonly')"
+                placement="top"
+                style="margin-right: 3px"
+                v-if="scope.row.IsLoginUncommonly"
+              >
+                <i
+                  v-if="scope.row.IsLoginUncommonly"
+                  class="el-icon-warning icon-i"
+                ></i>
+              </el-tooltip>
+              <span>{{ scope.$index + 1 }}</span>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('system:loginLog:table:OptType')"
           prop="OptType"
@@ -110,7 +131,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd("UserOptType", scope.row.OptType) }}
+            {{ $fd('UserOptType', scope.row.OptType) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -127,21 +148,28 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
           min-width="180"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginUserName')"
-          prop="LoginUserName"
+          prop="ActionUserName"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
+          :label="$t('system:loginLog:table:Aetionlserlype')"
+          prop="ActionUserType"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
           min-width="120"
@@ -151,15 +179,15 @@
           <template slot-scope="scope">
             {{ $fd("UserType", scope.row.LoginUserTypeEnum) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           :label="$t('system:loginLog:table:OptUserName')"
-          prop="OptUserName"
+          prop="TargetIdentityUserName"
           min-width="200"
           sortable="custom"
           show-overflow-tooltip
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:OptUserType')"
           prop="OptUserTypeEnum"
           min-width="200"
@@ -169,6 +197,21 @@
           <template slot-scope="scope">
             {{ $fd("UserType", scope.row.OptUserTypeEnum) }}
           </template>
+        </el-table-column> -->
+        <el-table-column
+          :label="$t('system:loginLog:table:detail')"
+          min-width="120"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.JsonObj"
+              type="text"
+              @click="handleOpenDialog(scope.row)"
+            >
+              <span>{{ $t('system:loginLog:message:detail') }}</span>
+            </el-button>
+          </template>
         </el-table-column>
         <el-table-column
           :label="$t('system:loginLog:table:CreateTime')"
@@ -187,29 +230,31 @@
         />
       </div>
     </div>
+    <detail :config="config" :JsonObj="JsonObj" />
   </div>
 </template>
 <script>
-import { getUserLogList } from "@/api/user";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
+import { getUserLogList } from '@/api/user'
+import Pagination from '@/components/Pagination'
+import detail from './detail.vue'
+import moment from 'moment'
 const searchDataDefault = () => {
   return {
     OptType: null,
-    Ip: "",
-    LoginFaildName: "",
+    Ip: '',
+    LoginFaildName: '',
     LoginUserName: '',
     LoginUserTypeEnum: null,
-    BeginDate: "",
-    EndDate: "",
+    BeginDate: '',
+    EndDate: '',
     Asc: false,
-    SortField: "CreateTime",
+    SortField: 'CreateTime',
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  components: { Pagination },
+  components: { Pagination, detail },
   data() {
     return {
       moment,
@@ -218,52 +263,69 @@ export default {
       total: 0,
       loading: false,
       datetimerange: [],
-    };
+      config: {
+        visible: false,
+        title: this.$t('system:loginLog:dialog:title'),
+        width: '500px',
+        top: '10vh',
+      },
+      JsonObj: null,
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
+    handleOpenDialog(row) {
+      if (!row.JsonObj)
+        return this.$message.warning(this.$t('system:loginLog:message:noJSON'))
+      this.config.title = this.$t('system:loginLog:dialog:title').replace(
+        'xxx',
+        this.$fd('UserOptType', row.OptType)
+      )
+      this.JsonObj = row.JsonObj
+      this.config.visible = true
+    },
     getList() {
-      this.loading = true;
+      this.loading = true
       getUserLogList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.BeginDate = val[0];
-        this.searchData.EndDate = val[1];
+        this.searchData.BeginDate = val[0]
+        this.searchData.EndDate = val[1]
       } else {
-        this.searchData.BeginDate = "";
-        this.searchData.EndDate = "";
+        this.searchData.BeginDate = ''
+        this.searchData.EndDate = ''
       }
     },
     // 重置列表查询
     handleReset() {
       this.datetimerange = []
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .log {
@@ -291,5 +353,9 @@ export default {
       text-align: right;
     }
   }
+  .icon-i {
+    color: #f56c6c;
+    cursor: pointer;
+  }
 }
 </style>
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 7b98223b..64b8dd60 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -5,24 +5,38 @@
     :model="user"
     :rules="userFormRules"
     label-width="150px"
-    style="width:800px;"
+    style="width: 800px"
   >
     <el-card class="Basic" shadow="never" size="small">
       <div slot="header" class="clearfix">
         <span>{{ $t('system:userlist:title:Information') }}</span>
       </div>
-      <el-form-item  v-if="user.UserCode" :label="$t('system:userlist:table:S/N')" prop="UserCode">
+      <el-form-item
+        v-if="user.UserCode"
+        :label="$t('system:userlist:table:S/N')"
+        prop="UserCode"
+      >
         <el-input v-model="user.UserCode" disabled />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:UserName')" class="my_new_pwd" prop="UserName">
+      <el-form-item
+        :label="$t('system:userlist:table:UserName')"
+        class="my_new_pwd"
+        prop="UserName"
+      >
         <el-input v-model="user.UserName" />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:LastName')" prop="LastName">
+      <el-form-item
+        :label="$t('system:userlist:table:LastName')"
+        prop="LastName"
+      >
         <el-input v-model="user.LastName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
+      <el-form-item
+        :label="$t('system:userlist:table:FirstName')"
+        prop="FirstName"
+      >
         <el-input v-model="user.FirstName" />
       </el-form-item>
       <!-- <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
@@ -32,49 +46,134 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item :label="$t('system:userlist:table:Email')" prop="EMail">
-        <el-input v-model="user.EMail" />
+        <el-input v-model="user.EMail" :disabled="!!user.UserCode" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:Phone')" prop="Phone">
         <el-input v-model="user.Phone" />
       </el-form-item>
-      <el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')">
-        <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
+      <el-form-item
+        v-if="type == 1"
+        :label="$t('system:userlist:table:Disable')"
+      >
+        <el-switch
+          v-model="user.Status"
+          :active-value="1"
+          :inactive-value="0"
+        />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
         <el-radio-group v-model="user.IsTestUser">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="item.id"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">
-        <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
-          <el-option
-            v-for="(userType,key) of userTypeOptions"
-            v-if="userType.UserTypeEnum !== 20"
-            :key="key"
-            :label="userType.UserType"
-            :value="userType.Id"
-          />
-        </el-select>
+      <el-form-item
+        :label="$t('system:userlist:table:UserType')"
+        prop="Roles"
+        v-if="type === 0"
+      >
+        <div style="display: flex; align-items: center">
+          <el-select
+            ref="userType"
+            v-model="user.Roles"
+            size="small"
+            placeholder="Please select"
+            multiple
+            style="width: 100%"
+            :disabled="user.CanEditUserType === false || type === 1"
+            @change="handleChange"
+          >
+            <template v-for="userType of userTypeOptions">
+              <el-option
+                v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
+                :key="userType.Id"
+                :label="userType.UserType"
+                :value="userType.Id"
+              />
+            </template>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item
+        :label="$t('system:userlist:table:UserType')"
+        prop="userTypeId"
+        v-else
+      >
+        <div style="display: flex; align-items: center">
+          <el-select
+            ref="userType"
+            v-model="Roles"
+            size="small"
+            placeholder="Please select"
+            multiple
+            style="width: 100%"
+            :disabled="user.CanEditUserType === false || type === 1"
+            @change="handleChange"
+          >
+            <template v-for="userType of userTypeOptions">
+              <el-option
+                v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
+                :key="userType.Id"
+                :label="userType.UserType"
+                :value="userType.Id"
+              />
+            </template>
+          </el-select>
+          <el-button
+            type="primary"
+            size="small"
+            style="margin-left: 5px"
+            v-if="type === 1"
+            @click.stop="openRoleList"
+          >
+            {{ $t('system:userlist:button:roles') }}
+          </el-button>
+        </div>
       </el-form-item>
     </el-card>
 
-    <el-card class="Affiliation" shadow="never" style="margin-top:10px;" size="small">
+    <el-card
+      class="Affiliation"
+      shadow="never"
+      style="margin-top: 10px"
+      size="small"
+    >
       <div slot="header" class="clearfix">
         <span>{{ $t('system:userlist:title:Affiliation') }}</span>
       </div>
       <el-form-item prop="IsZhiZhun">
-        <el-radio-group v-model="user.IsZhiZhun" @change="OrgnizationTypeChanged">
-          <el-radio :label="true">{{ $t('system:userlist:title:Internal') }}</el-radio>
-          <el-radio :label="false">{{ $t('system:userlist:title:External') }}</el-radio>
+        <el-radio-group
+          v-model="user.IsZhiZhun"
+          @change="OrgnizationTypeChanged"
+        >
+          <el-radio :label="true">{{
+            $t('system:userlist:title:Internal')
+          }}</el-radio>
+          <el-radio :label="false">{{
+            $t('system:userlist:title:External')
+          }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="user.IsZhiZhun === false" :label="$t('system:userlist:table:OrganizationName')">
+      <el-form-item
+        v-show="user.IsZhiZhun === false"
+        :label="$t('system:userlist:table:OrganizationName')"
+      >
         <el-input v-model="user.OrganizationName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Department')" prop="DepartmentName">
+      <el-form-item
+        :label="$t('system:userlist:table:Department')"
+        prop="DepartmentName"
+      >
         <el-input v-model="user.DepartmentName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Position')" prop="PositionName">
+      <el-form-item
+        :label="$t('system:userlist:table:Position')"
+        prop="PositionName"
+      >
         <el-input v-model="user.PositionName" />
       </el-form-item>
     </el-card>
@@ -83,20 +182,35 @@
         type="primary"
         size="small"
         :disabled="isDisabled"
-        style="margin:10px 15px"
+        style="margin: 10px 15px"
         @click="handleSave"
-      >Save</el-button>
+        >Save</el-button
+      >
     </el-form-item>
-
+    <roleList
+      v-if="visible"
+      :visible.sync="visible"
+      :userId="userId"
+      :list="userRoleList"
+      :userTypeOptions="userTypeOptions"
+      @getRoleList="getRoleList"
+    />
   </el-form>
 </template>
 <script>
-import { getUser, addUser, updateUser, getUserTypeListByUserType } from '@/api/admin.js'
+import {
+  getUser,
+  addUser,
+  updateUser,
+  getUserTypeListByUserType,
+} from '@/api/admin.js'
+import roleList from './roleList.vue'
 export default {
   name: 'UserInfo',
   props: {
-    userId: { type: String, default: '' }
+    userId: { type: String, default: '' },
   },
+  components: { roleList },
   created() {
     this.getUserTypeList()
     if (this.userId !== '') {
@@ -107,26 +221,46 @@ export default {
     }
   },
   methods: {
-    updateQueryParam(param, newValue,wurl) {
+    openRoleList() {
+      this.userRoleList = []
+      this.user.UserRoleList.forEach((item) => {
+        this.userRoleList.push(Object.assign({}, item))
+      })
+      this.visible = true
+    },
+    handleChange(val) {
+      this.user.UserRoleList = []
+      val.forEach((item) => {
+        let data = this.userTypeOptions.find((d) => d.Id === item)
+        this.user.UserRoleList.push({
+          UserTypeEnum: data.UserTypeEnum,
+          UserTypeId: data.Id,
+          IsUserRoleDisabled: false,
+        })
+      })
+    },
+    updateQueryParam(param, newValue, wurl) {
       // 获取当前URL
-      let url = wurl || window.location.href;
+      let url = wurl || window.location.href
 
       // 正则表达式匹配参数
-      let regex = new RegExp('([?&])' + param + '=.*?(&|$)');
-      let separator = url.indexOf('?') !== -1 ? '&' : '?';
+      let regex = new RegExp('([?&])' + param + '=.*?(&|$)')
+      let separator = url.indexOf('?') !== -1 ? '&' : '?'
 
       // 如果参数存在，替换它，如果不存在，添加它
       if (regex.test(url)) {
-        return url.replace(regex, '$1' + param + '=' + newValue + '$2');
+        return url.replace(regex, '$1' + param + '=' + newValue + '$2')
       } else {
-        return url + separator + param + '=' + newValue;
+        return url + separator + param + '=' + newValue
       }
     },
     handleSave() {
-      this.$refs.userForm.validate(valid => {
+      this.$refs.userForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
-          const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId)
+          const selectedUserType = this.userTypeOptions.filter(
+            (item) => item.Id === this.user.UserTypeId
+          )
           let newUrl = this.updateQueryParam('userName', this.user.UserName)
           newUrl = this.updateQueryParam('email', this.user.EMail, newUrl)
           window.history.pushState({ path: newUrl }, '', newUrl)
@@ -136,53 +270,117 @@ export default {
           this.user.BaseUrl = `${location.protocol}//${location.host}/login`
           this.user.RouteUrl = `${location.protocol}//${location.host}/email-recompose`
           if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success('Updated successfully')
-            }).catch(() => { this.isDisabled = false })
+            updateUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.$message.success('Updated successfully')
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           } else {
-            addUser(this.user).then(res => {
-              this.isDisabled = false
-              this.user.Id = res.Result.Id
-              this.user.UserCode = res.Result.UserCode
-              this.$emit('getUserId', res.Result.Id)
-              this.$message.success('Added successfully')
-              this.$router.push({ path: '/system/user/list' })
-            }).catch(() => { this.isDisabled = false })
+            addUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.user.Id = res.Result.Id
+                this.user.UserCode = res.Result.UserCode
+                this.$emit('getUserId', res.Result.Id)
+                this.$message.success('Added successfully')
+                this.$router.push({ path: '/system/user/list' })
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           }
         }
       })
     },
     getUserTypeList() {
-      getUserTypeListByUserType(0).then(res => {
+      getUserTypeListByUserType(0).then((res) => {
         if (res.IsSuccess) {
-          this.userTypeOptions = res.Result
+          this.userTypeOptions = []
+          res.Result.forEach((item) => {
+            if (item.UserTypeEnum !== 21) {
+              this.userTypeOptions.push(item)
+            }
+          })
         }
       })
     },
     getUserInfo() {
-      getUser(this.userId).then(res => {
+      getUser({
+        IdentityUserId: this.userId,
+      }).then((res) => {
         this.user = res.Result
+        this.Roles = []
+        this.user.Roles = []
+        this.user.UserRoleList = []
+        res.Result.AccountList.forEach((item) => {
+          if (!item.IsUserRoleDisabled) {
+            this.Roles.push(item.UserTypeId)
+            this.user.Roles.push(item.UserTypeId)
+          }
+          this.user.UserRoleList.push({
+            UserTypeEnum: item.UserTypeEnum,
+            UserTypeId: item.UserTypeId,
+            IsUserRoleDisabled: item.IsUserRoleDisabled,
+            UserTypeShortName: item.UserTypeShortName,
+          })
+        })
+      })
+    },
+    getRoleList() {
+      getUser({
+        IdentityUserId: this.userId,
+      }).then((res) => {
+        this.Roles = []
+        this.user.Roles = []
+        this.user.UserRoleList = []
+        res.Result.AccountList.forEach((item) => {
+          if (!item.IsUserRoleDisabled) {
+            this.Roles.push(item.UserTypeId)
+            this.user.Roles.push(item.UserTypeId)
+          }
+          this.user.UserRoleList.push({
+            UserTypeEnum: item.UserTypeEnum,
+            UserTypeId: item.UserTypeId,
+            IsUserRoleDisabled: item.IsUserRoleDisabled,
+            UserTypeShortName: item.UserTypeShortName,
+          })
+        })
       })
     },
     OrgnizationTypeChanged(val) {
       this.user.OrganizationName = ''
-    }
+    },
   },
   data() {
     var validatePassword = (rule, value, callback) => {
-      var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
+      var lang = zzSessionStorage.getItem('lang')
+        ? zzSessionStorage.getItem('lang')
+        : 'zh'
       /* eslint-disable */
-      var reg1 = /^[a-zA-Z0-9_]{4,16}$/; //密码必须是8位以上、必须含有字母、数字、特殊符号
-      console.log(!reg1.test(value))
+      var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
       if (!reg1.test(value)) {
-        callback(lang==='zh' ? new Error("1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；") : new Error('For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'))
+        callback(
+          lang === 'zh'
+            ? new Error(
+                '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+              )
+            : new Error(
+                'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+              )
+        )
       } else {
-        callback();
+        callback()
       }
     }
     return {
+      userRoleList: [],
+      Roles: [],
       user: {
+        Roles: [],
+        UserRoleList: [],
         UserName: '',
         LastName: '',
         FirstName: '',
@@ -194,65 +392,75 @@ export default {
         OrganizationName: '',
         DepartmentName: '',
         PositionName: '',
-        IsTestUser: false
+        IsTestUser: false,
       },
+      visible: false,
       userFormRules: {
         UserName: [
-          { required: true, validator: validatePassword, trigger: 'blur' }
+          { required: true, validator: validatePassword, trigger: 'blur' },
         ],
-        UserTypeId: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+        Roles: [
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         IsZhiZhun: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         OrganizationName: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
         LastName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         FirstName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         Phone: [
-          { max: 20, min: 7, message: 'The length is 7 to 20', trigger: ['blur'] }
+          {
+            max: 20,
+            min: 7,
+            message: 'The length is 7 to 20',
+            trigger: ['blur'],
+          },
         ],
         EMail: [
           {
             required: true,
             message: 'Please input the email address',
-            trigger: 'blur'
+            trigger: 'blur',
           },
           {
             type: 'email',
             message: 'Please input the correct email address',
-            trigger: ['blur']
+            trigger: ['blur'],
           },
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        Sex: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
+        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
         Status: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
-        DepartmentName: [
-          { max: 50, message: 'The maximum length is 50' }],
-        PositionName: [{ max: 50, message: 'The maximum length is 50' }
-        ]
+        DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
+        PositionName: [{ max: 50, message: 'The maximum length is 50' }],
       },
       userTypeOptions: [],
       isDisabled: false,
-      type: 0 // 1为编辑，0为新增
+      type: 0, // 1为编辑，0为新增
     }
-  }
+  },
 }
 </script>
 <style scoped>
-/deep/ .is-error.my_new_pwd{
+::v-deep .is-error.my_new_pwd {
   margin-bottom: 40px;
 }
 </style>
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
new file mode 100644
index 00000000..fc96ebda
--- /dev/null
+++ b/src/views/system/user/components/roleList.vue
@@ -0,0 +1,212 @@
+<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('system:userlist:roleList:title')"
+    :before-close="cancel"
+  >
+    <el-button
+      size="mini"
+      type="primary"
+      @click.stop="openAdd"
+      style="float: right"
+    >
+      {{ $t('common:button:new') }}
+    </el-button>
+    <el-table
+      :data="list"
+      style="width: 100%"
+      max-height="300px"
+      v-loading="loading"
+    >
+      <el-table-column type="index" width="40" />
+      <el-table-column
+        prop="UserTypeShortName"
+        :label="$t('system:userlist:roleList:table:UserTypeShortName')"
+      />
+      <el-table-column
+        prop="IsUserRoleDisabled"
+        :label="$t('system:userlist:roleList:table:IsUserRoleDisabled')"
+      >
+        <template slot-scope="scope">
+          <span> {{ $fd('IsEnable', !scope.row.IsUserRoleDisabled) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('common:action:action')" min-width="120px">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            :disabled="scope.row.IsUserRoleDisabled"
+            @click.stop="scope.row.IsUserRoleDisabled = true"
+          >
+            {{ $fd('IsEnable', false) }}
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            :disabled="!scope.row.IsUserRoleDisabled"
+            @click.stop="scope.row.IsUserRoleDisabled = false"
+          >
+            {{ $fd('IsEnable', true) }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer">
+      <!-- 保存 -->
+      <el-button type="primary" :loading="loading" size="small" @click="save">
+        {{ $t('common:button:confirm') }}
+      </el-button>
+      <!-- 取消 -->
+      <el-button size="small" @click="cancel">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+    </div>
+    <el-dialog
+      v-if="addVisible"
+      :visible.sync="addVisible"
+      v-dialogDrag
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      width="540px"
+      :title="$t('system:userlist:roleList:addTitle')"
+    >
+      <el-form ref="addForm" :model="form" :rules="rule" label-width="80px">
+        <el-form-item :label="$t('system:userlist:table:UserType')">
+          <el-select
+            v-model="form.roles"
+            size="small"
+            placeholder=""
+            multiple
+            style="width: 100%"
+          >
+            <template v-for="item of roleList">
+              <el-option
+                :key="item.Id"
+                :label="item.UserType"
+                :value="item.Id"
+              />
+            </template>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <!-- 保存 -->
+        <el-button type="primary" size="small" @click="saveAdd">
+          {{ $t('common:button:confirm') }}
+        </el-button>
+        <!-- 取消 -->
+        <el-button size="small" @click="addVisible = false">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+<script>
+import { updateUserRoleInfo } from '@/api/admin.js'
+export default {
+  name: 'roleList',
+  props: {
+    userId: { type: String, default: '' },
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    list: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    userTypeOptions: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+  },
+  data() {
+    return {
+      addVisible: false,
+      loading: false,
+      form: {
+        roles: [],
+      },
+      rule: {
+        roles: [
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+    }
+  },
+  computed: {
+    roleList() {
+      let arr = this.list.map((item) => item.UserTypeId)
+      return this.userTypeOptions.filter(
+        (item) =>
+          !arr.includes(item.Id) && ![4, 6, 20].includes(item.UserTypeEnum)
+      )
+    },
+  },
+  methods: {
+    cancel() {
+      this.$emit('update:visible', false)
+    },
+    openAdd() {
+      this.form.roles = []
+      this.addVisible = true
+    },
+    async save() {
+      try {
+        let data = {
+          Id: this.userId,
+          UserRoleList: this.list,
+        }
+        this.loading = true
+        let res = await updateUserRoleInfo(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:updatedSuccessfully'))
+          this.$emit('update:visible', false)
+          this.$emit('getRoleList')
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    async saveAdd() {
+      try {
+        let validate = await this.$refs.addForm.validate()
+        if (!validate) return
+        let arr = this.userTypeOptions.filter((item) =>
+          this.form.roles.includes(item.Id)
+        )
+        arr.forEach((item) => {
+          this.list.push({
+            UserTypeEnum: item.UserTypeEnum,
+            UserTypeId: item.Id,
+            IsUserRoleDisabled: false,
+            UserTypeShortName: item.UserTypeShortName,
+          })
+        })
+        this.addVisible = false
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index f00d9a15..2114e3e5 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -20,23 +20,49 @@
       :total="total"
       @getList="getList"
       @editCb="handleEditUser"
+      @sendCb="addNewUserSendEmail"
       @deleteCb="handleDeleteUser"
       @sortByColumn="sortByColumn"
     >
       <!-- 选择自定义slot -->
       <template slot="tip-slot" slot-scope="{ scope }">
         <i
-          v-if="diffTime(scope.row.LastLoginTime) >= 90"
+          v-if="
+            diffTime(scope.row.LastLoginTime) >= 90 &&
+            diffTime(scope.row.LastChangePassWordTime) >= 90
+          "
+          class="el-icon-warning"
+          style="color: #f56c6c"
+          :title="$t('system:userlist:tip:overTimeAndoverTimePassWord')"
+        />
+        <i
+          v-else-if="diffTime(scope.row.LastLoginTime) >= 90"
           class="el-icon-warning"
           style="color: #f56c6c"
           :title="$t('system:userlist:tip:overTime')"
         />
+        <i
+          v-else-if="diffTime(scope.row.LastChangePassWordTime) >= 90"
+          class="el-icon-warning"
+          style="color: #f56c6c"
+          :title="$t('system:userlist:tip:overTimePassWord')"
+        />
       </template>
       <template slot="genderSlot" slot-scope="{ scope }">
         {{ scope.row.Sex ? 'Male' : 'Female' }}
       </template>
+      <template slot="UserTypeSlot" slot-scope="{ scope }">
+        {{
+          Array.isArray(scope.row.UserRoleList) &&
+          scope.row.UserRoleList.length > 0
+            ? scope.row.UserRoleList.map((item) => item.UserTypeShortName).join(
+                ', '
+              )
+            : ''
+        }}
+      </template>
       <template slot="roleSlot" slot-scope="{ scope }">
-        {{ scope.row.RoleNameList.map((role) => role.RoleName).join(',') }}
+        {{ scope.row.RoleNameList.map((role) => role.RoleName).join(', ') }}
       </template>
       <template slot="isZhiZhunSlot" slot-scope="{ scope }">
         {{
@@ -63,7 +89,12 @@
   </box-content>
 </template>
 <script>
-import { getUserList, getUserTypeList, deleteSysUser } from '@/api/admin'
+import {
+  getUserList,
+  getUserTypeList,
+  deleteSysUser,
+  addNewUserSendEmail,
+} from '@/api/admin'
 // import { searchForm, searchHandle, columns } from './list'
 import BoxContent from '@/components/BoxContent'
 import SearchForm from '@/components/BaseForm/search-form'
@@ -85,8 +116,12 @@ const searchDataDefault = () => {
     RealName: '',
     BeginCreateTime: '',
     EndCreateTime: '',
+    EndLastLoginTime: null,
+    EndLastChangePassWordTime: null,
+    BeginLastChangePassWordTime: null,
     CreateTimeArr: [],
     LastLoginTimeArr: [],
+    LastChangePassWordTimeArr: [],
     SortField: 'CreateTime',
   }
 }
@@ -115,7 +150,7 @@ export default {
           showOverflowTooltip: true,
         },
         {
-          prop: 'RealName',
+          prop: 'FullName',
           label: this.$t('system:userlist:table:RealName'),
           minWidth: 120,
           sortable: 'custom',
@@ -154,6 +189,7 @@ export default {
           prop: 'UserType',
           label: this.$t('system:userlist:table:UserType'),
           minWidth: 100,
+          slot: 'UserTypeSlot',
           sortable: 'custom',
           showOverflowTooltip: true,
         },
@@ -191,6 +227,13 @@ export default {
           sortable: 'custom',
           showOverflowTooltip: true,
         },
+        {
+          prop: 'LastChangePassWordTime',
+          label: this.$t('system:userlist:table:LastChangePassWordTime'),
+          minWidth: 250,
+          sortable: 'custom',
+          showOverflowTooltip: true,
+        },
         {
           prop: 'CreateTime',
           label: this.$t('system:userlist:table:createTime'),
@@ -202,12 +245,19 @@ export default {
           type: 'operate',
           label: this.$t('common:action:action'),
           minWidth: 200,
+          fixed: 'right',
           operates: [
             {
               name: this.$t('common:button:edit'),
               type: 'primary',
               emitKey: 'editCb',
             },
+            {
+              name: this.$t('common:button:email'),
+              type: 'primary',
+              emitKey: 'sendCb',
+              show: 'IsFirstAdd',
+            },
             // {
             //   name: this.$t('common:button:delete'),
             //   type: 'danger',
@@ -326,6 +376,13 @@ export default {
           width: '400px',
           placeholder: '',
         },
+        {
+          type: 'Daterange',
+          label: this.$t('system:userlist:label:LastChangePassWordTime'),
+          prop: 'LastChangePassWordTimeArr',
+          width: '400px',
+          placeholder: '',
+        },
         {
           type: 'Daterange',
           label: this.$t('system:userlist:label:CreateTime'),
@@ -335,15 +392,17 @@ export default {
         },
       ],
       searchHandle: [
-        {
-          label: this.$t('common:button:reset'),
-          type: 'primary',
-          emitKey: 'reset',
-        },
         {
           label: this.$t('common:button:search'),
           type: 'primary',
           emitKey: 'search',
+          icon: 'el-icon-search'
+        },
+        {
+          label: this.$t('common:button:reset'),
+          type: 'primary',
+          emitKey: 'reset',
+          icon: 'el-icon-refresh-left'
         },
         {
           label: this.$t('common:button:new'),
@@ -365,6 +424,31 @@ export default {
     diffTime(time) {
       return moment(new Date()).diff(time, 'days')
     },
+    async addNewUserSendEmail(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('system:userlist:confirm:sendEmail')
+        )
+        if (!confirm) return false
+        let data = {
+          IdentityUserId: row.Id,
+          BaseUrl: `${location.protocol}//${location.host}/login`,
+          RouteUrl: `${location.protocol}//${location.host}/email-recompose`,
+        }
+        this.loading = true
+        let res = await addNewUserSendEmail(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('system:userlist:message:sendEmailSuccess')
+          )
+          this.getList()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
     // 获取用户信息
     getList() {
       this.loading = true
@@ -430,6 +514,12 @@ export default {
         this.searchData.BeginLastLoginTime = this.searchData.LastLoginTimeArr[0]
         this.searchData.EndLastLoginTime = this.searchData.LastLoginTimeArr[1]
       }
+      if (this.searchData.LastChangePassWordTimeArr.length > 0) {
+        this.searchData.BeginLastChangePassWordTime =
+          this.searchData.LastChangePassWordTimeArr[0]
+        this.searchData.EndLastChangePassWordTime =
+          this.searchData.LastChangePassWordTimeArr[1]
+      }
       this.getList()
     },
   },
diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 4b54f77b..336504f7 100644
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@@ -71,6 +71,8 @@ export default {
 <style lang="scss" scoped>
 .notice-marquee_wrapper{
   width: 100%;
+  display: flex;
+  align-items: center;
   /deep/ .el-dialog__header{
     padding: 10px;
   }
diff --git a/src/views/trials/trials-layout/components/topLang.vue b/src/views/trials/trials-layout/components/topLang.vue
index c3b9caf1..c41d6a92 100644
--- a/src/views/trials/trials-layout/components/topLang.vue
+++ b/src/views/trials/trials-layout/components/topLang.vue
@@ -44,7 +44,6 @@ export default {
       this.$i18n.locale = lang
       this.setLanguage(lang)
       this.$updateDictionary()
-      console.log(Vue)
       this.$upload()
       window.location.reload()
     }
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index d09a8fe8..004aa805 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -11,7 +11,7 @@
       <img v-else src="@/assets/zzlogo4.png" alt="" />
       <span style="white-space: nowrap" v-if="NODE_ENV !== 'usa'">
         <!-- 中心影像系统（EICS） -->
-        {{ $t("trials:trials:title:eics") }}
+        {{ $t('trials:trials:title:eics') }}
       </span>
     </div>
     <div class="center-menu">
@@ -39,13 +39,17 @@
         >
           <i class="el-icon-odometer" />
           <!-- 工作台 -->
-          <span slot="title">{{ $t("trials:menuTitle:workbench") }}</span>
+          <span slot="title">{{ $t('trials:menuTitle:workbench') }}</span>
         </el-menu-item>
-        <el-menu-item v-if="!hasPermi(['role:zys','role:zyss','role:zybs'])" index="2" :disabled="TotalNeedSignSystemDocCount !== 0">
+        <el-menu-item
+          v-if="!hasPermi(['role:zys', 'role:zyss', 'role:zybs'])"
+          index="2"
+          :disabled="TotalNeedSignSystemDocCount !== 0"
+        >
           <i class="el-icon-box" />
           <!-- 我的项目 -->
           <span slot="title">
-            {{ $t("trials:tab:trials") }}
+            {{ $t('trials:tab:trials') }}
           </span>
         </el-menu-item>
         <el-menu-item
@@ -63,7 +67,7 @@
         >
           <i class="el-icon-chat-dot-square" />
           <!-- 通知消息 -->
-          <span slot="title">{{ $t("trials:tab:notice") }}</span>
+          <span slot="title">{{ $t('trials:tab:notice') }}</span>
         </el-menu-item>
 
         <el-submenu index="4" class="my_info">
@@ -75,128 +79,230 @@
           </span>
           <!-- 账户信息 -->
           <el-menu-item v-if="!hasPermi(['role:air'])" index="4-2">{{
-            $t("trials:trials-myinfo:title:accountInfo")
+            $t('trials:trials-myinfo:title:accountInfo')
           }}</el-menu-item>
           <!-- 管理后台 -->
           <el-menu-item
             v-if="hasPermi(['role:dev', 'role:oa', 'role:admin'])"
             index="4-4"
-            >{{ $t("trials:trials-myinfo:title:system") }}</el-menu-item
+            >{{ $t('trials:trials-myinfo:title:system') }}</el-menu-item
           >
+          <!-- 切换角色 -->
+          <el-menu-item index="4-5" v-if="hasRole">{{
+            $t('trials:trials-myinfo:title:toggleRole')
+          }}</el-menu-item>
           <!-- 退出 -->
           <el-menu-item index="4-3">{{
-            $t("trials:trials-myinfo:button:loginout")
+            $t('trials:trials-myinfo:button:loginout')
           }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
+      <TopLang
+        v-if="
+          VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' && NODE_ENV !== 'usa'
+        "
+      />
     </div>
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+    />
   </div>
 </template>
 
 <script>
-import { mapGetters, mapMutations } from "vuex";
-import TopLang from "./topLang";
-import NoticeMarquee from "./noticeMarquee";
+import { mapGetters, mapMutations } from 'vuex'
+import TopLang from './topLang'
+import NoticeMarquee from './noticeMarquee'
+import { resetRouter } from '@/router'
+import toggleRole from '@/components/toggleRole'
 export default {
-  components: { TopLang, NoticeMarquee },
+  components: { TopLang, NoticeMarquee, toggleRole },
   data() {
     return {
-      activeIndex: "2",
+      activeIndex: '2',
       isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem("userTypeShortName"),
-      notice: "",
+      // userTypeShortName: zzSessionStorage.getItem('userTypeShortName'),
+      notice: '',
       VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
       NODE_ENV: process.env.NODE_ENV,
-    };
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
+    }
   },
   computed: {
     ...mapGetters([
-      "sidebar",
-      "name",
-      "userName",
-      "device",
-      "TotalNeedSignSystemDocCount",
-      "language",
+      'sidebar',
+      'name',
+      'userName',
+      'device',
+      'TotalNeedSignSystemDocCount',
+      'language',
+      'userTypeShortName',
     ]),
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return (
+        this.roles &&
+        this.roles.length > 1 &&
+        this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
+      )
+    },
   },
   watch: {
     $route(v) {
-      this.changeRoute(v);
+      this.changeRoute(v)
     },
   },
   created() {
-    console.log(!this.hasPermi(["role:air"]));
-    this.isReviewer = JSON.parse(zzSessionStorage.getItem("IsReviewer"));
-    this.changeRoute(this.$route);
+    // this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
+    this.changeRoute(this.$route)
   },
   methods: {
-    ...mapMutations({ setLanguage: "lang/setLanguage" }),
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     changeRoute(v) {
-      if (v.path === "/trials/trials-workbench") {
-        this.activeIndex = "1";
+      if (v.path === '/trials/trials-workbench') {
+        this.activeIndex = '1'
       }
       if (
-        v.path === "/trials/trials-list" ||
-        ~v.path.indexOf("/trials/trials-panel")
+        v.path === '/trials/trials-list' ||
+        ~v.path.indexOf('/trials/trials-panel')
       ) {
-        this.activeIndex = "2";
+        this.activeIndex = '2'
       }
-      if (v.path === "/trials/trials-notice") {
-        this.activeIndex = "3";
+      if (v.path === '/trials/trials-notice') {
+        this.activeIndex = '3'
       }
-      if (v.path === "/trials/trials-myinfo") {
-        this.activeIndex = "4-2";
+      if (v.path === '/trials/trials-myinfo') {
+        this.activeIndex = '4-2'
       }
     },
     handleSelect(key, keyPath) {
       switch (key) {
-        case "4-2":
-          this.go("/trials/trials-myinfo");
-          break;
-        case "4-3":
-          this.logout();
-          break;
-        case "4-4":
-          this.go("/dashboard/list");
-          break;
-        case "1":
-          this.go("/trials/trials-workbench");
-          break;
-        case "2":
-          if (~this.$route.path.indexOf("/trials/trials-panel")) {
-            return;
+        case '4-2':
+          this.go('/trials/trials-myinfo')
+          break
+        case '4-3':
+          this.logout()
+          break
+        case '4-4':
+          this.go('/dashboard/list')
+          break
+        case '4-5':
+          // this.go('/dashboard/list')
+          // console.log('切换角色')
+          this.$store.dispatch('user/getUserInfo').then((res) => {
+            this.toggleRoleVisible = true
+          })
+
+          break
+        case '1':
+          this.go('/trials/trials-workbench')
+          break
+        case '2':
+          if (~this.$route.path.indexOf('/trials/trials-panel')) {
+            return
           }
-          var lastWorkbench = zzSessionStorage.getItem("lastWorkbench");
+          var lastWorkbench = zzSessionStorage.getItem('lastWorkbench')
           if (lastWorkbench) {
-            this.go(lastWorkbench);
+            this.go(lastWorkbench)
           } else {
-            this.go("/trials/trials-list");
+            this.go('/trials/trials-list')
           }
-          break;
-        case "3":
-          this.go("/trials/trials-notice");
-          break;
+          break
+        case '3':
+          this.go('/trials/trials-notice')
+          break
       }
     },
     toggleSideBar() {
-      this.$store.dispatch("app/toggleSideBar");
+      this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      await this.$store.dispatch("user/logout");
-      this.$router.push(`/login`);
-      this.$i18n.locale = "zh";
-      this.setLanguage("zh");
-      this.$updateDictionary();
+      await this.$store.dispatch('user/logout')
+      this.$router.push(`/login`)
+      //this.$i18n.locale = 'zh'
+      //this.setLanguage('zh')
+      this.$updateDictionary()
     },
     go(value) {
-      this.$router.push({ path: value });
+      this.$router.push({ path: value })
     },
     account() {
-      this.$router.push({ name: "Account" });
+      this.$router.push({ name: 'Account' })
+    },
+    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)
+                    // this.$router.replace({ path: '/trials/trials-list' })
+                  } else {
+                    history.replaceState(null, null, '/trials/trials-workbench')
+                    history.go(0)
+                    // this.$router.replace({ path: '/trials/trials-workbench' })
+                  }
+                  this.toggleRoleVisible = false
+                  this.toggleRoleLoading = false
+                  this.$EventBus.$emit('reload')
+                  // this.$nextTick(() => {
+                  //   window.location.reload()
+                  // })
+                } else {
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.toggleRoleLoading = false
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
     },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -277,6 +383,11 @@ export default {
       cursor: pointer;
     }
   }
+  .right-menu {
+    .el-menu-item.is-active {
+      font-weight: bolder;
+    }
+  }
   .center-menu {
     width: calc(100% - 1200px);
   }
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 9a81a4c5..578850d7 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -788,6 +788,11 @@ export default {
   created() {
     this.initPage()
   },
+  mounted(){
+    this.$EventBus.$on("reload", (data) => {
+      window.location.reload()
+    });
+  },
   methods: {
     initPage() {
       this.getList()
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index bf5c9b35..3bbfe432 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -108,6 +108,35 @@
             {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:toggleRole')"
+          style="position: relative"
+          prop="VerificationCode"
+          v-if="hasRole"
+        >
+          <el-radio-group v-model="userRoleId" class="roles" v-if="hasRole">
+            <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>
+          <!-- 修改 -->
+          <el-button
+            :disabled="!userRoleId || saveDisabled"
+            class="saveBtn"
+            :loading="toggleRoleLoading"
+            type="primary"
+            size="small"
+            @click="toggleRole"
+          >
+            {{ $t('trials:trials-myinfo:button:toggleRole') }}
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
     <password />
@@ -142,6 +171,8 @@ export default {
   data() {
     return {
       userForm: {},
+      userRoleId: null,
+      toggleRoleLoading: false,
       sendDisabled: true,
       sendTitle: this.$t('trials:trials-myinfo:button:getVCode'),
       rule: {
@@ -174,7 +205,38 @@ export default {
       },
     }
   },
+  created() {
+    this.userRoleId = zzSessionStorage.getItem('userId')
+  },
+  computed: {
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 1
+    },
+    saveDisabled() {
+      return this.userRoleId === zzSessionStorage.getItem('userId')
+    },
+  },
   methods: {
+    // 切换角色
+    toggleRole() {
+      if (
+        this.userRoleId === zzSessionStorage.getItem('userId') ||
+        this.toggleRoleLoading
+      )
+        return false
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId: this.userRoleId })
+        .then((res) => {
+          window.location.reload()
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
+    },
     setNewEmail() {
       setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(
         () => {
@@ -271,10 +333,18 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.$i18n.locale = 'zh'
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
   },
 }
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+.el-radio-group {
+  margin-top: 12px;
+}
+.el-radio {
+  width: 60px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index 488c1954..443754b6 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -37,7 +37,7 @@
         :IsCanConnectInternet="IsCanConnectInternet"
         v-if="activeIndex === '2'"
       />
-      <login-log v-if="activeIndex === '3'" :id="userId" :isMine="true" />
+      <login-log v-if="activeIndex === '3'" :id="identityUserId" :isMine="true" />
     </div>
   </div>
 </template>
@@ -64,7 +64,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['userId', 'userName']),
+    ...mapGetters(['identityUserId', 'userName']),
   },
   mounted() {
     this.getUserInfo()
@@ -107,11 +107,11 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.07)',
       })
-      getUser(this.userId)
+      getUser()
         .then(async (res) => {
           this.user = res.Result
           /* eslint-disable */
-          zzSessionStorage.setItem('realName', this.user.RealName)
+          zzSessionStorage.setItem('Name', this.user.FullName)
           await store.dispatch('user/updateInfo')
           loading.close()
         })
diff --git a/src/views/trials/trials-myinfo/mine.vue b/src/views/trials/trials-myinfo/mine.vue
index 455623f5..1745969e 100644
--- a/src/views/trials/trials-myinfo/mine.vue
+++ b/src/views/trials/trials-myinfo/mine.vue
@@ -82,7 +82,7 @@
   </div>
 </template>
 <script>
-import { updateUser } from "@/api/admin.js";
+import { updateUserBasicInfo } from "@/api/admin.js";
 export default {
   name: "mine",
   props: {
@@ -179,7 +179,7 @@ export default {
           //   this.user.OrganizationName = 'ZhiZhun'
           // }
           if (this.user.Id) {
-            updateUser(this.user)
+            updateUserBasicInfo(this.user)
               .then((res) => {
                 this.isDisabled = false;
                 this.$message.success(
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index 8779f816..ce97b99e 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -27,6 +27,7 @@
       <!-- 新密码 -->
       <el-form-item
         :label="$t('recompose:form:newPassword')"
+        class="my_new_pwd"
         prop="NewPassWord"
       >
         <el-input
@@ -151,15 +152,15 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.$i18n.locale = 'zh'
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
   },
 }
 </script>
 <style lang="scss" scoped>
-.el-form-item {
-  margin-bottom: 30px;
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue
index 966e17e6..a733e44d 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -17,7 +17,7 @@
         <el-form-item :label="$t('trials:notice:table:notificationContent')">
           <el-input
             v-model="searchData.NoticeContent"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -36,7 +36,11 @@
           <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">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
@@ -44,7 +48,7 @@
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="loading"
         :data="list"
         stripe
@@ -79,7 +83,15 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag :type="scope.row.ActualNoticeStateEnum === 0 ? 'info' : scope.row.ActualNoticeStateEnum === 1 ? 'success' : 'error'">
+            <el-tag
+              :type="
+                scope.row.ActualNoticeStateEnum === 0
+                  ? 'info'
+                  : scope.row.ActualNoticeStateEnum === 1
+                  ? 'success'
+                  : 'error'
+              "
+            >
               {{ $fd('NoticeState', scope.row.ActualNoticeStateEnum) }}
             </el-tag>
           </template>
@@ -113,7 +125,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <a :href="OSSclientConfig.basePath + scope.row.Path" target="_blank" style="color:#428bca">{{ scope.row.FileName }}</a>
+            <a
+              :href="OSSclientConfig.basePath + scope.row.Path"
+              target="_blank"
+              style="color: #428bca"
+              >{{ scope.row.FileName }}</a
+            >
           </template>
         </el-table-column>
         <el-table-column
@@ -124,11 +141,19 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsRead">{{ $fd('YesOrNo', scope.row.IsRead) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsRead) }}</el-tag>
+            <el-tag v-if="scope.row.IsRead">{{
+              $fd('YesOrNo', scope.row.IsRead)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd('YesOrNo', scope.row.IsRead)
+            }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
+        <el-table-column
+          :label="$t('common:action:action')"
+          min-width="100"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <el-button
               circle
@@ -136,12 +161,17 @@
               icon="el-icon-info"
               @click="showDetail(scope.row)"
             />
-
           </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"
+      />
     </template>
   </BaseContainer>
 </template>
@@ -157,9 +187,10 @@ const searchDataDefault = () => {
     ApplicableProjectEnum: null,
     NoticeModeEnum: null,
     NoticeStateEnum: null,
-    Asc: true,
+    Asc: false,
+    SortField: 'PublishedTime',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
@@ -171,7 +202,7 @@ export default {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -180,17 +211,21 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      getUserSystemNoticeList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      getUserSystemNoticeList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     showDetail(row) {
       var currentNoticeType = this.$fd('NoteType', row.NoticeTypeEnum)
       if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
         this.$alert(row.NoticeContent, currentNoticeType, {
-          showConfirmButton: false
+          showConfirmButton: false,
         })
       } else {
         const h = this.$createElement
@@ -200,18 +235,22 @@ export default {
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
               instance.confirmButtonLoading = true
-              setSystemNoticeHaveRead(row.Id).then(async res => {
-                if (res.IsSuccess) {
-                  await this.$store.dispatch('global/getNoticeList')
-                  this.getList()
-                }
-                instance.confirmButtonLoading = false
-                done()
-              }).catch(() => { instance.confirmButtonLoading = false })
+              setSystemNoticeHaveRead(row.Id)
+                .then(async (res) => {
+                  if (res.IsSuccess) {
+                    await this.$store.dispatch('global/getNoticeList')
+                    this.getList()
+                  }
+                  instance.confirmButtonLoading = false
+                  done()
+                })
+                .catch(() => {
+                  instance.confirmButtonLoading = false
+                })
             } else {
               done()
             }
-          }
+          },
         })
       }
     },
@@ -237,10 +276,9 @@ export default {
       this.searchData.SortField = column.prop
       this.searchData.PageIndex = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-
 </style>
diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
index a29f1082..eee1e3cd 100644
--- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue
+++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
@@ -5,7 +5,11 @@
       <el-form :inline="true">
         <!-- 文件类型 -->
         <el-form-item :label="$t('trials:signRecords:table:fileType')">
-          <el-select v-model="searchData.FileTypeId" clearable style="width: 150px">
+          <el-select
+            v-model="searchData.FileTypeId"
+            clearable
+            style="width: 150px"
+          >
             <el-option
               v-for="item of typeOptions"
               :key="item.FileTypeId"
@@ -72,7 +76,7 @@
             style="width: 120px"
           >
             <el-option
-              v-for="i of $d.YesOrNo"
+              v-for="i of $d.TrainingStatusEnum"
               :key="'IsConfirmed' + i.label"
               :value="i.value"
               :label="i.label"
@@ -86,7 +90,7 @@
             style="width: 120px"
           >
             <el-option
-              v-for="i of $d.YesOrNo"
+              v-for="i of $d.TrainingStatus"
               :key="'IsDeleted' + i.label"
               :value="i.value"
               :label="i.label"
@@ -96,7 +100,7 @@
         <el-form-item>
           <!-- 查询 -->
           <el-button icon="el-icon-search" type="primary" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -104,7 +108,7 @@
             type="primary"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
           <!-- 导出 -->
           <el-button
@@ -113,7 +117,7 @@
             :loading="exportLoading"
             @click="handleExport"
           >
-            {{ $t("common:button:export") }}
+            {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -156,10 +160,10 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsSystemDoc" type="primary">{{
-              $fd("IsSystemDoc", scope.row.IsSystemDoc)
+              $fd('IsSystemDoc', scope.row.IsSystemDoc)
             }}</el-tag>
             <el-tag v-else type="warning">{{
-              $fd("IsSystemDoc", scope.row.IsSystemDoc)
+              $fd('IsSystemDoc', scope.row.IsSystemDoc)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -172,10 +176,10 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-              $fd("YesOrNo", scope.row.IsDeleted)
+              $fd('TrainingStatus', scope.row.IsDeleted)
             }}</el-tag>
             <el-tag v-else type="primary">{{
-              $fd("YesOrNo", scope.row.IsDeleted)
+              $fd('TrainingStatus', scope.row.IsDeleted)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -195,11 +199,11 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="!scope.row.IsConfirmed" type="primary">{{
-              $fd("YesOrNo", scope.row.IsConfirmed)
+            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{
+              $fd('TrainingStatusEnum', scope.row.IsConfirmed)
             }}</el-tag>
             <el-tag v-else type="danger">{{
-              $fd("YesOrNo", scope.row.IsConfirmed)
+              $fd('TrainingStatusEnum', scope.row.IsConfirmed)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -219,11 +223,19 @@
         />
         <!-- 用户类型 -->
         <el-table-column
-          prop="UserTypeShortName"
+          prop="UserConfirmedUserTypeList"
           :label="$t('trials:signRecords:table:userType')"
           show-overflow-tooltip
-          sortable="custom"
-        />
+        >
+          <template slot-scope="scope">
+            <span>{{
+              Array.isArray(scope.row.UserConfirmedUserTypeList) &&
+              scope.row.UserConfirmedUserTypeList.length > 0
+                ? scope.row.UserConfirmedUserTypeList.join(', ')
+                : ''
+            }}</span>
+          </template>
+        </el-table-column>
         <!-- 签署时间 -->
         <el-table-column
           prop="ConfirmTime"
@@ -283,25 +295,25 @@ import {
   getTrialUserSelect,
   getTrialUserTypeList,
   getTrialDocAndSystemDocType,
-} from "@/api/trials";
-import { pMTrainingRecordList_Export } from "@/api/export";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import PreviewFile from "@/components/PreviewFile/index";
+} from '@/api/trials'
+import { pMTrainingRecordList_Export } from '@/api/export'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import PreviewFile from '@/components/PreviewFile/index'
 const searchDataDefault = () => {
   return {
-    FileTypeId: "",
-    Name: "",
-    UserId: "",
-    UserTypeId: "",
+    FileTypeId: '',
+    Name: '',
+    UserId: '',
+    UserTypeId: '',
     PageIndex: 1,
     PageSize: 20,
     IsConfirmed: null,
     IsDeleted: null,
-  };
-};
+  }
+}
 export default {
-  name: "AttachmentsManagement",
+  name: 'AttachmentsManagement',
   components: { BaseContainer, Pagination, PreviewFile },
   data() {
     return {
@@ -310,99 +322,99 @@ export default {
       list: [],
       total: 0,
       currentRow: {},
-      currentPath: "",
-      currentType: "",
+      currentPath: '',
+      currentType: '',
       previewVisible: false,
       userOptions: [],
       userTypeOptions: [],
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       typeOptions: [],
       trialId: this.$route.query.trialId,
       exportLoading: false,
-    };
+    }
   },
   mounted() {
-    this.getTypeOptions();
-    this.getUserSelect();
-    this.getUserType();
-    this.getList();
+    this.getTypeOptions()
+    this.getUserSelect()
+    this.getUserType()
+    this.getList()
   },
   methods: {
     handleExport() {
-      this.exportLoading = true;
+      this.exportLoading = true
       pMTrainingRecordList_Export(this.searchData)
         .then(() => {
-          this.exportLoading = false;
+          this.exportLoading = false
         })
         .catch((err) => {
-          this.exportLoading = false;
-        });
+          this.exportLoading = false
+        })
     },
     // 获取系统文件数据
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       getDocumentConfirmList(this.searchData)
         .then(async (res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-          console.log(this.total);
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          console.log(this.total)
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 获取文件类型下拉数据
     getTypeOptions() {
       getTrialDocAndSystemDocType(this.trialId).then((res) => {
-        this.typeOptions = res.Result;
-      });
+        this.typeOptions = res.Result
+      })
     },
     // 获取当前项目下参与者信息
     getUserSelect() {
       getTrialUserSelect(this.trialId).then((res) => {
-        this.userOptions = res.Result;
-      });
+        this.userOptions = res.Result
+      })
     },
     // 获取用户类型下拉数据
     getUserType() {
       getTrialUserTypeList().then((res) => {
-        this.userTypeOptions = res.Result;
-      });
+        this.userTypeOptions = res.Result
+      })
     },
     // 预览
     handlePreview(row) {
-      this.currentRow = { ...row };
-      const { Name, FullFilePath } = row;
-      this.currentPath = FullFilePath;
+      this.currentRow = { ...row }
+      const { Name, FullFilePath } = row
+      this.currentPath = FullFilePath
       this.currentType = row.Name
-        ? Name.substring(Name.lastIndexOf(".") + 1).toLocaleLowerCase()
-        : "";
-      this.previewVisible = true;
+        ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
+        : ''
+      this.previewVisible = true
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
       this.$nextTick(() => {
-        this.$refs.AttachmentsManagement.clearSort();
-      });
+        this.$refs.AttachmentsManagement.clearSort()
+      })
     },
     // 查询
     handleSearch() {
-      this.getList();
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.getList()
     },
   },
-};
+}
 </script>
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
index 5dd4dce1..88000983 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
@@ -1,14 +1,14 @@
 <template>
   <BaseContainer>
     <template slot="search-container">
-      <div style="margin-left:auto;">
+      <div style="margin-left: auto">
         <!-- Approve -->
       </div>
     </template>
     <template slot="main-container">
       <el-table
         v-loading="listLoading"
-        v-adaptive="{bottomOffset:65}"
+        v-adaptive="{ bottomOffset: 65 }"
         height="100"
         :data="list"
         class="table"
@@ -27,17 +27,26 @@
         >
           <template slot-scope="scope">
             <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
-             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&trialId=${$route.query.trialId}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
+            <span
+              style="color: #428bca; cursor: pointer"
+              @click="
+                go(
+                  `/trialsResume?doctorId=${scope.row.Id}&trialId=${$route.query.trialId}&token=${token}`
+                )
+              "
+              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span
+            >
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <!-- <el-table-column
+        <el-table-column
+          v-if="!isEN"
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           min-width="120"
           sortable="custom"
-        /> -->
+        />
         <!-- ID -->
         <el-table-column
           prop="Code"
@@ -53,8 +62,12 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.DoctorTrialState !== 5" type="primary">{{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}</el-tag>
+            <el-tag v-if="scope.row.DoctorTrialState !== 5" type="primary">{{
+              $fd('DoctorTrialState', scope.row.DoctorTrialState)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd('DoctorTrialState', scope.row.DoctorTrialState)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- Approver -->
@@ -70,19 +83,34 @@
           min-width="150"
         />
       </el-table>
-      <pagination class="page" :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="listQuery.PageIndex"
+        :limit.sync="listQuery.PageSize"
+        @pagination="getList"
+      />
     </template>
   </BaseContainer>
 </template>
 <script>
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
-import { getSubmissionOrApprovalReviewerList, approveReviewer } from '@/api/trials'
+import {
+  getSubmissionOrApprovalReviewerList,
+  approveReviewer,
+} from '@/api/trials'
 import store from '@/store'
 const enrollState = 4
 export default {
   name: 'Approval',
   components: { BaseContainer, Pagination },
+  props: {
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       list: [],
@@ -93,15 +121,17 @@ export default {
         PageIndex: 1,
         PageSize: 20,
         Asc: false,
-        SortField: ''
+        SortField: '',
       },
       total: 0,
       listLoading: false,
       approveIdArr: [],
-      token: store.getters.token
+      token: store.getters.token,
     }
   },
-  created() { this.initPage() },
+  created() {
+    this.initPage()
+  },
   methods: {
     go(path) {
       window.open(path)
@@ -112,28 +142,36 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.TrialId = this.$route.query.trialId
-      getSubmissionOrApprovalReviewerList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      // eslint-disable-next-line handle-callback-err
-      }).catch(() => { this.listLoading = false })
+      getSubmissionOrApprovalReviewerList(this.listQuery)
+        .then((res) => {
+          this.listLoading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          // eslint-disable-next-line handle-callback-err
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     handleApprove() {
       // Confirm the approval?
       this.$confirm(this.$t('trials:seletctedReviews:message:msg2'), {
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         this.loading = true
         const trialId = this.$route.query.trialId
-        approveReviewer(trialId, this.approveIdArr, 1).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.getList()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.$emit('nextStep', 'confirmation')
-          }
-        }).catch(() => {this.loading = false})
+        approveReviewer(trialId, this.approveIdArr, 1)
+          .then((res) => {
+            this.loading = false
+            if (res.IsSuccess) {
+              this.getList()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.$emit('nextStep', 'confirmation')
+            }
+          })
+          .catch(() => {
+            this.loading = false
+          })
       })
     },
     handleSelectionChange(val) {
@@ -158,12 +196,16 @@ export default {
         return 'selected'
       }
     },
-    handleSelectTable(row) { return row.DoctorTrialState !== 8 },
+    handleSelectTable(row) {
+      return row.DoctorTrialState !== 8
+    },
     handleDetail(row) {
-      const { href } = this.$router.resolve({ path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}` })
+      const { href } = this.$router.resolve({
+        path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}`,
+      })
       window.open(href, '_blank')
-    }
-  }
+    },
+  },
 }
 </script>
 
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
index e914972b..c5e3b65b 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
@@ -50,13 +50,14 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <!-- <el-table-column
+        <el-table-column
+          v-if="!isEN"
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           min-width="120"
           sortable="custom"
-        /> -->
+        />
         <!-- ID -->
         <el-table-column
           prop="Code"
@@ -119,6 +120,12 @@ import store from '@/store'
 export default {
   name: 'Confirmation',
   components: { BaseContainer, Pagination },
+  props: {
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       list: [],
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index e04ff056..b281465a 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -186,13 +186,14 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <!-- <el-table-column
+        <el-table-column
+          v-if="!isEN"
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           sortable="custom"
           width="120"
-        /> -->
+        />
 
         <el-table-column
           prop="DoctorUserName"
@@ -483,6 +484,12 @@ export default {
     curriculumVitae,
   },
   dicts: ['ReadingType', 'Subspeciality', 'Position', 'Rank'],
+  props: {
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       list: [],
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
index 8b56712f..e48bfda9 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
@@ -60,13 +60,14 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <!-- <el-table-column
+        <el-table-column
+          v-if="!isEN"
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           sortable="custom"
           min-width="120"
-        /> -->
+        />
         <!-- ID -->
         <el-table-column
           prop="Code"
@@ -166,6 +167,12 @@ const enrollState = 1
 export default {
   name: 'Submission',
   components: { BaseContainer, Pagination },
+  props: {
+    isEN: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       list: [],
diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index c1400a3c..1549030f 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -8,50 +8,83 @@
       <div v-if="trialInfo" class="trial-wrapper">
         <div class="div-row">
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
-            <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
-          </div>
-         
-          <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:declarationType:') }}</label>
-            <el-tooltip
-              class="item"
-              :content="trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')"
-              placement="top"
+            <label class="el-label">{{
+              $t('trials:trials-list:form:indication:')
+            }}</label>
+            <span
+              >{{ $fd('Indication', trialInfo.IndicationEnum)
+              }}{{
+                trialInfo.Indication ? '-' + trialInfo.Indication : ''
+              }}</span
             >
-              <span>{{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }}</span>
-            </el-tooltip>
-          </div>
-           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
-            <el-tooltip
-              class="item"
-              :content="(trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): ''"
-              placement="top"
-            >
-              <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
-            </el-tooltip>
-            
-          </div>
-          <div class="div-col">
           </div>
 
+          <div class="div-col">
+            <label class="el-label">{{
+              $t('trials:trials-list:form:declarationType:')
+            }}</label>
+            <el-tooltip
+              class="item"
+              :content="
+                trialInfo.DeclarationTypeEnumList.map((v) =>
+                  $fd('DeclarationType', v)
+                ).join(', ')
+              "
+              placement="top"
+            >
+              <span>{{
+                trialInfo.DeclarationTypeEnumList.map((v) =>
+                  $fd('DeclarationType', v)
+                ).join(', ')
+              }}</span>
+            </el-tooltip>
+          </div>
+          <div class="div-col">
+            <label class="el-label">{{
+              $t('trials:trials-list:form:criterion:')
+            }}</label>
+            <el-tooltip
+              class="item"
+              :content="
+                trialInfo.CriterionList && trialInfo.CriterionList.length > 0
+                  ? trialInfo.CriterionList.join(', ')
+                  : ''
+              "
+              placement="top"
+            >
+              <span>{{
+                trialInfo.CriterionList && trialInfo.CriterionList.length > 0
+                  ? trialInfo.CriterionList.join(', ')
+                  : ''
+              }}</span>
+            </el-tooltip>
+          </div>
+          <div class="div-col"></div>
         </div>
         <div class="div-row">
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:expedited:') }}</label>
-            <span>{{$fd('YesOrNoForInt', trialInfo.Expedited)}}</span>
+            <label class="el-label">{{
+              $t('trials:trials-list:form:expedited:')
+            }}</label>
+            <span>{{ $fd('YesOrNoForInt', trialInfo.Expedited) }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
+            <label class="el-label">{{
+              $t('trials:trials-list:form:totalReviewers:')
+            }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
-            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}</span>
-          </div>
-          <div class="div-col">
+            <label class="el-label">{{
+              $t('trials:trials-list:form:typeofReviewers:')
+            }}</label>
+            <span>{{
+              trialInfo.AttendedReviewerTypeEnumList.map((v) =>
+                $fd('AttendedReviewerType', v)
+              ).join(', ')
+            }}</span>
           </div>
+          <div class="div-col"></div>
         </div>
       </div>
       <div class="title">
@@ -60,7 +93,12 @@
       </div>
     </div>
     <div class="step-wrapper">
-      <el-steps :active="activeStatus" style="margin-top: 70px" align-center :space="300">
+      <el-steps
+        :active="activeStatus"
+        style="margin-top: 70px"
+        align-center
+        :space="300"
+      >
         <!-- Selection -->
         <el-step
           :title="$t('trials:seletctedReviews:timeline:selection')"
@@ -92,22 +130,26 @@
       </el-steps>
       <div class="step-content">
         <Selection
-          v-if="activeStatus===0"
+          v-if="activeStatus === 0"
+          :isEN="isEN"
           @nextStep="nextStep"
         />
         <Submission
-          v-if="activeStatus===1"
+          v-if="activeStatus === 1"
           ref="submission"
+          :isEN="isEN"
           @nextStep="nextStep"
         />
         <Approval
-          v-if="activeStatus===2"
+          v-if="activeStatus === 2"
           ref="approval"
+          :isEN="isEN"
           @nextStep="nextStep"
         />
         <Confirmation
-          v-if="activeStatus===3"
+          v-if="activeStatus === 3"
           ref="confirmation"
+          :isEN="isEN"
         />
       </div>
     </div>
@@ -127,18 +169,30 @@ export default {
       trialInfo: null,
       TrialId: '',
       activeStatus: null,
-      TrialMaxState: 0
+      TrialMaxState: 0,
     }
   },
   mounted() {
     this.TrialId = this.$route.query.trialId
     this.initPage()
   },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   methods: {
     initPage() {
-      getTrialInfoAndMaxTrialState(this.TrialId).then(res => {
+      getTrialInfoAndMaxTrialState(this.TrialId).then((res) => {
         this.trialInfo = res.Result.TrialView
-        var activeStatus = res.Result.TrialMaxState < 1 ? 0 : res.Result.TrialMaxState < 5 ? 1 : res.Result.TrialMaxState < 8 ? 2 : 3
+        var activeStatus =
+          res.Result.TrialMaxState < 1
+            ? 0
+            : res.Result.TrialMaxState < 5
+            ? 1
+            : res.Result.TrialMaxState < 8
+            ? 2
+            : 3
         this.activeStatus = activeStatus
         this.TrialMaxState = activeStatus
       })
@@ -147,95 +201,93 @@ export default {
       this.activeStatus = step
     },
     nextStep(stepName) {
-      this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1;
-      if(stepName==='confirmation'){
-        this.activeStatus = 3;
+      this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1
+      if (stepName === 'confirmation') {
+        this.activeStatus = 3
       }
       this.TrialMaxState = this.activeStatus
       this.$nextTick(
-        function() {
+        function () {
           this.$refs[stepName].getList()
         }.bind(this)
       )
-    }
-
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-  .enroll-container {
-    height: 100%;
-    padding: 0;
-    margin: 0;
+.enroll-container {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  .content-wrapper {
+    height: 100px;
+  }
+  .step-wrapper {
+    flex: 1;
     display: flex;
     flex-direction: column;
-    background-color: #fff;
-    .content-wrapper{
-      height: 100px;
+  }
+  .el-steps {
+    height: 80px;
+  }
+  .step-content {
+    flex: 1;
+  }
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 5px;
+    background: #e4ebf1;
+    border-left: 3px solid #0fc8e0;
+    font-size: 13px;
+    p {
+      padding: 0;
+      margin: 0;
     }
-    .step-wrapper{
-      flex: 1;
+  }
+  .trial-wrapper {
+    height: 60px;
+    .div-row {
       display: flex;
-      flex-direction: column;
-    }
-    .el-steps{
-      height: 80px;
-    }
-    .step-content{
-      flex: 1;
-    }
-    .title {
-      height: 40px;
-      line-height: 40px;
-      padding-left: 5px;
-      background: #e4ebf1;
-      border-left: 3px solid #0fc8e0;
+      justify-content: space-between;
+      margin: 10px 20px !important;
       font-size: 13px;
-      p{
-        padding: 0;
-        margin: 0;
-      }
-    }
-    .trial-wrapper{
-      height: 60px;
-      .div-row {
-        display: flex;
-        justify-content: space-between;
-        margin: 10px 20px !important;
-        font-size: 13px;
-        .div-col {
-          flex: 1;
-          width: 100px;
-          white-space: nowrap !important;
-          text-overflow: ellipsis !important;
-          word-break: break-word !important;
-          overflow: hidden !important;
-          label {
-            font-weight: bold;
-          }
-        }
-        .div-textarea {
-          display: inline-block;
+      .div-col {
+        flex: 1;
+        width: 100px;
+        white-space: nowrap !important;
+        text-overflow: ellipsis !important;
+        word-break: break-word !important;
+        overflow: hidden !important;
+        label {
+          font-weight: bold;
         }
+      }
+      .div-textarea {
+        display: inline-block;
+      }
+    }
+  }
 
-      }
+  .underline {
+    // .el-step__title {
+    //   text-decoration: underline;
+    // }
+    .el-step__title,
+    .el-step__title.is-process,
+    .el-step__title.is-finish {
+      text-decoration: underline;
     }
-
-    .underline{
-      // .el-step__title {
-      //   text-decoration: underline;
-      // }
-      .el-step__title,
-      .el-step__title.is-process,
-      .el-step__title.is-finish {
-        text-decoration: underline;
-      }
-    }
-    .noneUnderline{
-      .el-step__title {
-        text-decoration: none;
-      }
+  }
+  .noneUnderline {
+    .el-step__title {
+      text-decoration: none;
     }
+  }
   .el-step__head.is-process,
   .el-step__title.is-process,
   .el-step__description.is-process {
@@ -261,5 +313,5 @@ export default {
   .click_cursor {
     cursor: pointer;
   }
-  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 4539d256..90888a42 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -25,7 +25,7 @@
         <!-- 是否签署 -->
         <el-form-item :label="$t('trials:self-attachment:table:isSign')">
           <el-select v-model="searchData.IsSign" clearable style="width:120px;">
-            <template v-for="item of $d.YesOrNo">
+            <template v-for="item of $d.TrainingStatusEnum">
               <el-option  v-if="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="item.id"/>
             </template>
           </el-select>
@@ -77,8 +77,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <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>
         <!-- 上传时间 -->
@@ -96,8 +96,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
+            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('TrainingStatusEnum', scope.row.IsConfirmed) }}</el-tag>
+            <el-tag v-else type="danger">{{ $fd('TrainingStatusEnum', scope.row.IsConfirmed) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 签署时间 -->
diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue
index 7b665215..cd45126a 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -270,7 +270,7 @@
               v-hasPermi="[
                 'trials:trials-panel:attachments:site-research:auidt',
               ]"
-              :disabled="scope.row.State === 0 || scope.row.State === 3"
+              :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted"
               circle
               :title="$t('trials:researchRecord:action:view')"
               icon="el-icon-s-check"
@@ -332,13 +332,12 @@
       <template slot="dialog-body">
         <div style="width: 100%; display: flex">
           <div class="shareLink">
-            <div>
+            <!-- <div>
               <i style="color: #428bca" class="el-icon-success" />
-              <!-- 成功创建调查表链接 -->
               <span>{{
                 $t('trials:researchRecord:message:createLinkSuccessfully')
               }}</span>
-            </div>
+            </div> -->
             <div style="margin: 10px 0">
               <!-- 链接： -->
               {{ $t('trials:researchRecord:label:link') }}
@@ -525,7 +524,7 @@ export default {
         .getElementsByTagName('canvas')
       let a = document.createElement('a')
       a.href = qrCodeCanvas[0].toDataURL('image/url')
-      a.download = `${this.$t('trials:researchRecord:title:code')}.png`
+      a.download = `${this.$route.query.researchProgramNo}${this.$t('trials:researchRecord:title:code')}.png`
       a.click()
     },
     // 复制二维码
diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 7ad26027..45efb219 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -307,23 +307,21 @@
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-if="adInfo.ReadingTaskState < 2">
-          <div style="text-align: center">
-            <el-button type="primary" @click="skipTask">
-              <!-- 跳过 -->
-              {{ $t("trials:readingReport:button:skip") }}
-            </el-button>
-            <!-- 保存 -->
-            <el-button type="primary" @click="handleSave">{{
-              $t("common:button:save")
-            }}</el-button>
-            <!-- 提交 -->
-            <el-button type="primary" @click="handleSubmit">{{
-              $t("common:button:submit")
-            }}</el-button>
-          </div>
-        </el-form-item>
       </el-form>
+      <div style="text-align: center;width:100%" v-if="adInfo.ReadingTaskState < 2">
+        <el-button type="primary" @click="skipTask">
+          <!-- 跳过 -->
+          {{ $t("trials:readingReport:button:skip") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button type="primary" @click="handleSave">{{
+          $t("common:button:save")
+        }}</el-button>
+        <!-- 提交 -->
+        <el-button type="primary" @click="handleSubmit">{{
+          $t("common:button:submit")
+        }}</el-button>
+      </div>
     </el-card>
 
     <el-card
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 9c157e11..0bc5056d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -148,12 +148,14 @@ import LengthTool from '@/views/trials/trials-panel/reading/dicoms/tools/Length/
 import BidirectionalTool from '@/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/BidirectionalTool'
 import ArrowAnnotateTool from '@/views/trials/trials-panel/reading/dicoms/tools/ArrowAnnotate/ArrowAnnotateTool'
 import RectangleRoiTool from '@/views/trials/trials-panel/reading/dicoms/tools/RectangleRoi/RectangleRoiTool'
+import ProbeTool from '@/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool'
 // import OrientationMarkersTool from '@/views/trials/trials-panel/reading/dicoms/tools/OrientationMarkers/OrientationMarkersTool'
 import ScaleOverlayTool from '@/views/trials/trials-panel/reading/dicoms/tools/ScaleOverlay/ScaleOverlayTool'
 import getOrientationString from '@/views/trials/trials-panel/reading/dicoms/tools/OrientationMarkers/getOrientationString'
 import invertOrientationString from '@/views/trials/trials-panel/reading/dicoms/tools/OrientationMarkers/invertOrientationString'
 // import calculateLongestAndShortestDiameters from '@/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/calculateLongestAndShortestDiameters'
 import calculateSUV from '@/views/trials/trials-panel/reading/dicoms/tools/calculateSUV'
+// import { ProbeTool } from '@cornerstonejs/tools'
 cornerstoneTools.external.cornerstone = cornerstone
 cornerstoneTools.external.Hammer = Hammer
 cornerstoneTools.external.cornerstoneMath = cornerstoneMath
@@ -799,8 +801,8 @@ export default {
                 measureData.ww = Math.round(viewport.voi.windowWidth)
                 measureData.wc = Math.round(viewport.voi.windowCenter)
                 var questionInfo = this.measureData[idx]
-                const canvas = this.canvas.querySelector('canvas')
-                measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+                // const canvas = this.canvas.querySelector('canvas')
+                // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
                 measureData.data.active = false
                 this.$emit('modifyMeasureData', { measureData, questionInfo })
                 // e.stopImmediatePropagation()
@@ -1000,26 +1002,14 @@ export default {
         if (i > -1) {
           var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === toolState.data[i].uuid)
           if (idx > -1) {
-            // console.log('mouseClick')
             DicomEvent.$emit('setCollapseActive', this.measureData[idx])
             if (this.readingTaskState < 2) {
               const measureData = {}
               var markName = this.measureData[idx].OrderMarkName
               if (this.disabledMarks.indexOf(markName) === -1 || !this.disabledMarks) {
-                // if (toolType === 'Bidirectional') {
-                //   const {
-                //     longestDiameter,
-                //     shortestDiameter
-                //   } = calculateLongestAndShortestDiameters(toolState.data[i], image, this.digitPlaces)
-                //   toolState.data[i].longestDiameter = longestDiameter
-                //   toolState.data[i].shortestDiameter = shortestDiameter
-                // }
-                // if (toolType === 'Length') {
-                //   toolState.data[i].length = this.calculateLenth(toolState.data[i])
-                // }
                 var questionInfo = this.measureData[idx]
-                const canvas = this.canvas.querySelector('canvas')
-                measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+                // const canvas = this.canvas.querySelector('canvas')
+                // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
                 measureData.studyId = this.stack.studyId
                 measureData.seriesId = this.stack.seriesId
                 measureData.instanceId = instanceId
@@ -1031,6 +1021,10 @@ export default {
                 measureData.ww = Math.round(viewport.voi.windowWidth)
                 measureData.wc = Math.round(viewport.voi.windowCenter)
                 measureData.data.active = false
+                var criterionType = parseInt(localStorage.getItem('CriterionType'))
+                if (criterionType === 21) {
+                  measureData.tableQuestionId = this.measureData[idx].TableQuestionId
+                }
                 this.$emit('modifyMeasureData', { measureData, questionInfo })
               }
             }
@@ -1161,6 +1155,8 @@ export default {
                   cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
                 } else if (toolName === 'RectangleRoi') {
                   cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                } else if (toolName === 'Probe' && parseInt(localStorage.getItem('CriterionType')) === 21) {
+                   cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { fixedRadius: 5, handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces }})
                 } else {
                   cornerstoneTools.addToolForElement(element, apiTool)
                 }
@@ -1351,8 +1347,8 @@ export default {
         measureData.ww = Math.round(viewport.voi.windowWidth)
         measureData.wc = Math.round(viewport.voi.windowCenter)
 
-        const canvas = this.canvas.querySelector('canvas')
-        measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+        // const canvas = this.canvas.querySelector('canvas')
+        // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
         this.$emit('setMeasureData', measureData)
         cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
       } else if (e.detail.toolName === 'Bidirectional') {
@@ -1367,8 +1363,22 @@ export default {
         measureData.location = this.dicomInfo.location
         measureData.ww = Math.round(viewport.voi.windowWidth)
         measureData.wc = Math.round(viewport.voi.windowCenter)
-        const canvas = this.canvas.querySelector('canvas')
-        measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+        // const canvas = this.canvas.querySelector('canvas')
+        // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+        this.$emit('setMeasureData', measureData)
+        cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
+      } else if (e.detail.toolName === 'Probe') {
+        const measureData = {}
+        measureData.studyId = this.stack.studyId
+        measureData.seriesId = this.stack.seriesId
+        measureData.instanceId = instanceId
+        measureData.frame = this.stack.frame ? this.stack.frame : 0
+        measureData.data = e.detail.measurementData
+        measureData.type = e.detail.toolName
+        measureData.thick = this.dicomInfo.thick
+        measureData.location = this.dicomInfo.location
+        measureData.ww = Math.round(viewport.voi.windowWidth)
+        measureData.wc = Math.round(viewport.voi.windowCenter)
         this.$emit('setMeasureData', measureData)
         cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
       } else if (!e.detail.toolName) {
@@ -1448,7 +1458,7 @@ export default {
     },
     onMeasurementmodified(e) {
       // 移动
-      // console.log('modified')
+      console.log('modified')
       if (this.readingTaskState >= 2) return
       const { measurementData, toolType } = e.detail
       var element = cornerstone.getEnabledElement(this.canvas)
@@ -1466,8 +1476,8 @@ export default {
         var markName = this.measureData[idx].OrderMarkName
         if (this.disabledMarks.indexOf(markName) === -1 || !this.disabledMarks) {
           var questionInfo = this.measureData[idx]
-          const canvas = this.canvas.querySelector('canvas')
-          measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+          // const canvas = this.canvas.querySelector('canvas')
+          // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
           measureData.studyId = this.stack.studyId
           measureData.seriesId = this.stack.seriesId
           measureData.instanceId = instanceId
@@ -1479,6 +1489,10 @@ export default {
           measureData.ww = Math.round(viewport.voi.windowWidth)
           measureData.wc = Math.round(viewport.voi.windowCenter)
           measureData.data.active = false
+          var criterionType = parseInt(localStorage.getItem('CriterionType'))
+          if (criterionType === 21) {
+            measureData.tableQuestionId = this.measureData[idx].TableQuestionId
+          }
           this.$emit('modifyMeasureData', { measureData, questionInfo })
         }
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 64973ddc..ae41e258 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -493,6 +493,14 @@
               :is-show="isShow"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
             />
+            <MRIPDFF
+              v-else-if="CriterionType === 21"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
             <h2 v-else style="color:#ddd">
               Developing...
             </h2>
@@ -786,6 +794,7 @@ import PCWGQuestionList from './PCWG/QuestionList'
 import LuganoQuestionList from './Lugano/QuestionList'
 import IVUSList from './IVUS/QuestionList'
 import OCTList from './OCT/QuestionList'
+import MRIPDFF from './MRIPDFF/QuestionList'
 import CustomWwwcForm from './CustomWwwcForm'
 import Manuals from './Manuals'
 import Hotkeys from './Hotkeys'
@@ -818,6 +827,7 @@ export default {
     LuganoQuestionList,
     IVUSList,
     OCTList,
+    MRIPDFF,
     'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
     'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
     SignForm
@@ -978,7 +988,8 @@ export default {
       taskId: '',
       signVisible: false,
       signCode: null,
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      tmpData: null
     }
   },
 
@@ -1067,6 +1078,10 @@ export default {
       this.measuredTools = []
     } else if (this.CriterionType === 20) {
       this.measuredTools = []
+    } else if (this.CriterionType === 21) {
+      this.measuredTools = [{
+        toolName: 'Probe', text: this.$t('trials:reading:button:circle'), icon: 'oval', isDisabled: false, disabledReason: ''
+      }]
     }
     this.rotateList[0] = '1'
     this.colorList[0] = ''
@@ -1178,6 +1193,11 @@ export default {
         this.petctWindow.close()
       }
     })
+    DicomEvent.$on('addAnnotation', async obj => {
+      this.tmpData = Object.assign({}, obj.question)
+      // await this.imageLocation(obj.locateInfo)
+      this.setToolActive('Probe', true, null, 'tableQuestion')
+    })
     window.addEventListener('beforeunload', () => {
       if (this.petctWindow) {
         this.petctWindow.close()
@@ -1600,7 +1620,7 @@ export default {
         var activeCanvasTaskId = obj.visitTaskId
 
         var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId)
-        if (index === -1) {
+        if (index === -1) { 
           resolve()
           return
         }
@@ -2046,6 +2066,9 @@ export default {
     },
     // 设置测量工具启用(不会对输入作出反应)
     setToolActive(toolName, isMeasuredTool, e, type) {
+      if (!type) {
+        this.tmpData = null
+      }
       if (isMeasuredTool) {
         // var i = this.measuredTools.findIndex(item => item.toolName === toolName)
         // if (i === -1 && this.measuredTools[i].isDisabled) return
@@ -2144,13 +2167,27 @@ export default {
     },
     // 添加标记
     setMeasureData(data) {
-      this.$refs['measurementList'].setMeasuredData(data)
+      if (this.CriterionType === 21) {
+        if (this.tmpData) {
+          data.tableQuestionId = this.tmpData.Id
+          data.tableQuestionMark = this.tmpData.QuestionMark
+          this.$refs['measurementList'].setMeasuredData(data)
+        }
+      } else {
+        this.$refs['measurementList'].setMeasuredData(data)
+      }
       this.activeTool = ''
+
     },
     // 修改标记
     modifyMeasureData(data) {
-      this.$refs['measurementList'].modifyMeasuredData(data)
+      if (this.CriterionType === 21 && data.measureData.tableQuestionId) {
+        this.$refs['measurementList'].modifyMeasuredData(data)
+      } else {
+        this.$refs['measurementList'].modifyMeasuredData(data)
+      }
       this.activeTool = ''
+      
     },
     async saveImage() {
       // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 7330b60e..5aff1168 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -561,10 +561,13 @@ export default {
                 })
               })
             })
-          })
+          }) 
           await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
           DicomEvent.$emit('getMeasureData')
-          this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: this.$route.query.trialId, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
           loading.close()
           resolve()
         } catch (e) { console.log(e) }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
new file mode 100644
index 00000000..f3dfe44d
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -0,0 +1,880 @@
+<template>
+  <el-form
+    v-if="isRender"
+    ref="measurementForm"
+    v-loading="loading"
+    :model="questionForm"
+    size="mini"
+    class="measurement-form"
+  >
+    <div class="base-dialog-body">
+      <div style="display: flex;justify-content: space-between;">
+        <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
+          <!-- {{ lesionName }} -->
+        </h3>
+        <!-- 关闭 -->
+        <div>
+          <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="handleClose" />
+        </div>
+      </div>
+
+      
+      <el-form-item
+        v-for="qs in questions"
+        v-show="qs.ShowQuestion!==2"
+        :key="qs.Id"
+        :label="`${qs.QuestionName}`"
+        :prop="qs.Id"
+        :rules="[
+          { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (String(questionForm[qs.RelevanceId]) === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type!=='group' && qs.Type!=='summary',
+            message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
+        ]"
+        style="flex-wrap: wrap"
+      >
+
+        <!-- 输入框 -->
+        <template v-if="(qs.Type==='input' || qs.Type==='number') && (qs.QuestionMark === 1101 || qs.QuestionMark === 1102 || qs.QuestionMark === 1103)">
+          <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+            <el-input
+              v-model="questionForm[qs.Id]"
+              disabled
+              style="width: 100px;"
+            >
+              <template v-if="qs.Unit" slot="append">
+                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+              </template>
+            </el-input>
+            <!-- 测量 -->
+            <el-button 
+              v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && !questionForm[qs.Id] && readingTaskState!== 2" 
+              size="mini" 
+              type="text" 
+              @click="addAnnotation(qs)"
+            >
+              {{$t('trials:MRIPDFF:button:measure')}}
+            </el-button>
+            <!-- 清除标记 -->
+            <el-button 
+              v-if="getAnnotationStatus(qs) && readingTaskState!== 2" 
+              size="mini" 
+              type="text" 
+              @click="removeAnnotation(qs)"
+              style="margin-left: 0px"
+            >
+              {{$t('trials:MRIPDFF:button:clear')}}
+            </el-button>
+            <!-- 返回 -->
+            <el-button 
+              v-if="questionForm[qs.Id]" 
+              size="mini" 
+              type="text" 
+              @click="locateAnnotation(qs)"
+              style="margin-left: 0px"
+            >
+              {{$t('trials:MRIPDFF:button:return')}}
+            </el-button>
+            <!-- 保存 -->
+            <el-button 
+              v-if="questionForm[isMeasurableId] && parseInt(questionForm[isMeasurableId]) === 1 && questionForm[qs.Id] && readingTaskState!== 2" 
+              size="mini" 
+              type="text" 
+              @click="saveAnnotation(qs)"
+              style="margin-left: 0px"
+            >
+              <!-- 未保存 -->
+              <el-tooltip v-if="getAnnotationSaveEnum(qs) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                <i class="el-icon-warning" style="color:red" />
+              </el-tooltip>
+              {{ $t('common:button:save') }}
+            </el-button>
+          </div>
+        </template>
+        <template v-else-if="qs.Type==='input' || qs.Type==='number'">
+          <el-input
+            v-model="questionForm[qs.Id]"
+            :disabled="!isCurrentTask || readingTaskState>=2"
+            @change="((val)=>{formItemChange(val, qs)})"
+          >
+            <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+            </template>
+          </el-input>
+        </template>
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-else-if="qs.Type==='textarea'"
+          v-model="questionForm[qs.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          :disabled="!isCurrentTask || readingTaskState>=2"
+          @change="((val)=>{formItemChange(val, qs)})"
+        />
+        <!-- 下拉框 -->
+
+        <el-select
+          v-else-if="qs.Type==='select'"
+          v-model="questionForm[qs.Id]"
+          filterable
+          :placeholder="$t('common:placeholder:select')"
+          :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 1106"
+          @change="((val)=>{formItemChange(val, qs)})"
+        >
+          <template v-if="qs.TableQuestionType === 1">
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[qs.DataTableColumn]"
+              :value="item[qs.DataTableColumn]"
+            />
+          </template>
+          <template v-else-if="qs.DictionaryCode">
+            <el-option
+              v-for="item of $d[qs.DictionaryCode]"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="val in qs.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+              :value="val"
+            />
+          </template>
+
+        </el-select>
+        <!-- 单选 -->
+        <el-radio-group
+          v-else-if="qs.Type==='radio'"
+          v-model="questionForm[qs.Id]"
+          :disabled="!isCurrentTask || readingTaskState>=2 || (qs.QuestionMark === 1105 && isDisabledMeasurableRadio)"
+          @change="((val)=>{formItemChange(val, qs)})"
+        >
+          <template v-if="qs.DictionaryCode.length > 0">
+            <el-radio
+              v-for="item in $d[qs.DictionaryCode]"
+              :key="item.id"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else-if="qs.options.length > 0">
+            <el-radio
+              v-for="val in qs.options.split('|')"
+              :key="val"
+              :label="val"
+            >
+              {{ val }}
+            </el-radio>
+          </template>
+        </el-radio-group>
+        <!-- 自动计算 -->
+        <el-input
+          v-else-if="qs.Type==='calculation'"
+          v-model="questionForm[qs.Id]"
+          disabled
+          @change="((val)=>{formItemChange(val, qs)})"
+        >
+          <template v-if="qs.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+          </template>
+        </el-input>
+      </el-form-item>
+
+    </div>
+
+    <div
+      v-if="isCurrentTask && readingTaskState<2"
+      class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;"
+    >
+      <!-- 保存 -->
+      <el-button
+        size="mini"
+        @click="handleSave"
+      >
+        {{ $t('common:button:save') }}
+      </el-button>
+    </div>
+  </el-form>
+</template>
+<script>
+// import { submitTableQuestion } from '@/api/trials'
+import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark, deleteSingleTableQuestionMark } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+export default {
+  name: 'MeasurementForm',
+  props: {
+    questions: {
+      type: Array,
+      default() { return [] }
+    },
+    answers: {
+      type: Object,
+      default() { return {} }
+    },
+    lesionType: {
+      type: Number,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      required: true
+    },
+    parentQsId: {
+      type: String,
+      required: true
+    },
+    isCurrentTask: {
+      type: Boolean,
+      required: true
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    isBaseLineTask: {
+      type: Boolean,
+      required: true
+    },
+    orderMark: {
+      type: String,
+      default: ''
+    },
+    questionName: {
+      type: String,
+      required: true
+    },
+    rowIndex: {
+      type: String,
+      required: true
+    },
+    tableQuestions: {
+      type: Array,
+      default() { return [] }
+    }
+  },
+  data() {
+    return {
+      questionForm: {},
+      loading: false,
+      trialId: '',
+      originalQuestionForm: {},
+      isRender: false,
+      lesionName: '',
+      lesionMark: '',
+      activeQuestionId: '',
+      activeQuestionMark: '',
+      markList: [],
+      digitPlaces: 2,
+      isMeasurableId: '',
+      isExitsMarks: false,
+      isDisabledMeasurableRadio: false,
+      liverSeg: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    this.initForm()
+    DicomEvent.$on('handleImageQualityAbnormal', () => {
+      this.setState()
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('handleImageQualityAbnormal')
+  },
+  methods: {
+    async initForm() {
+      this.isRender = false
+      this.isMeasurableId = this.getQuestionId(1105)
+      // const loading = this.$loading({ fullscreen: true })
+      this.questions.forEach(item => {
+        var val = this.answers[item.Id]
+        if (item.DictionaryCode) {
+          val = isNaN(parseInt(this.answers[item.Id])) ? this.answers[item.Id] : parseInt(this.answers[item.Id])
+        }
+        this.$set(this.questionForm, item.Id, val)
+        
+      })
+      this.$set(this.questionForm, 'MeasureData', this.answers.MeasureData ? JSON.parse(this.answers.MeasureData) : '')
+      this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
+      this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
+      // 如果存在标记且是否可测量为否，则将是否可测量更改为是
+      if (this.isCurrentTask && this.readingTaskState < 2) {
+        let arr = JSON.parse(this.answers.TableQuestionMarkList) 
+        let isExitsMarks = arr.findIndex(i=>i.MeasureData) > -1
+        if (isExitsMarks && parseInt(this.questionForm[this.isMeasurableId]) === 0) {
+          this.$set(this.questionForm, this.isMeasurableId, 1)
+        }
+      }
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+      let isMeasurable = this.getQuestionVal(1105)
+      const mean = this.getQuestionVal(1104)
+      if (this.questionForm.saveTypeEnum !== 1 && this.isCurrentTask && this.readingTaskState < 2) {
+        this.$set(this.questionForm, 'saveTypeEnum', parseInt(isMeasurable) === 1 && isNaN(parseFloat(mean)) ? 1 : 2)
+      }
+      this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex)
+      this.lesionMark = this.getLesionName(this.orderMark, 1101)
+      this.originalQuestionForm = { ...this.questionForm }
+      this.markList = []
+      this.isExitsMarks = false
+      this.isDisabledMeasurableRadio = false
+      let seg = this.getQuestionVal(1106)
+      this.liverSeg = this.$fd('LiverSegmentation', seg)
+      if (this.answers.TableQuestionMarkList) {
+        let arr = JSON.parse(this.answers.TableQuestionMarkList)
+        arr.map(i=>{
+          if (i.MeasureData) {
+            this.isExitsMarks = true
+            if (!isNaN(parseInt(isMeasurable)) && parseInt(isMeasurable) === 1 && this.isCurrentTask && this.readingTaskState < 2) {
+              this.isDisabledMeasurableRadio = true
+            }
+            i.MeasureData = JSON.parse(i.MeasureData)
+          }
+          this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1})
+        })
+      }
+      
+      let newMean = this.getMean()
+      if (newMean !== mean) {
+        let meanId = this.getQuestionId(1104)
+        this.$set(this.questionForm, meanId, newMean ? newMean : '')
+      } 
+      if (this.questionForm.saveTypeEnum === 1 && this.isCurrentTask && this.readingTaskState < 2) {
+        this.setQuestions()
+      }
+      this.isRender = true
+      // loading.close()
+    },
+    getLesionName(orderMark, questionMark) {
+      // 根据肝脏分段枚举和第一次（或第二次或第三次）测量问题标识定义标记名称
+      // I II III IV V VI VII VIII
+      // L-I-01 L-I-02 L-I-03
+      // L-II-01 L-II-02 L-II-03
+      let segArr = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII']
+      let lessionName = ''
+      let segmentId = this.getQuestionId(1106)
+      let segmentVal = this.answers[segmentId]
+      segmentVal = segmentVal ? parseInt(segmentVal) : null
+      if (segmentVal) {
+        let i = questionMark === 1101 ? '01' : questionMark === 1102 ? '02' : questionMark === 1103 ? '03' : ''
+        lessionName = `${orderMark}-${segArr[segmentVal - 1]}-${i}`
+      }
+      return lessionName
+    },
+    getLesionInfo(orderMark, rowIndex) {
+      var arr = []
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+        arr.push(lessionName)
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+        arr.push(lessionName)
+      }
+      return arr.join(' ')
+    },
+    getQuestionId(questionMark) {
+      var idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        return this.questions[idx].Id
+      } else {
+        return ''
+      }
+    },
+    async formItemChange(v, qs) {
+      // 维护平均值、是否可测量等信息
+      this.$set(this.questionForm, 'saveTypeEnum', 1)
+      const mean = this.getQuestionVal(1104)
+      if (qs.QuestionMark === 1101 || qs.QuestionMark === 1102 || qs.QuestionMark === 1103) {
+        let newMean = this.getMean()
+        if (newMean !== mean) {
+          let meanId = this.getQuestionId(1104)
+          this.$set(this.questionForm, meanId, newMean ? newMean : '')
+        } 
+      } else if (qs.QuestionMark === 1105) {
+        if (!v) {
+          let meanId = this.getQuestionId(1104)
+          this.$set(this.questionForm, meanId, 'NE')
+        } else {
+          let mean = this.getMean()
+          let meanId = this.getQuestionId(1104)
+          this.$set(this.questionForm, meanId, mean)
+        }
+      }
+      this.setQuestions()
+    },
+    getMean() {
+      let mean = null
+      let isMeasurable = this.getQuestionVal(1105)
+      isMeasurable = !isNaN(parseInt(isMeasurable)) ? parseInt(isMeasurable) : null
+      let l1 = this.getQuestionVal(1101)
+      let l2 = this.getQuestionVal(1102)
+      let l3 = this.getQuestionVal(1103)
+      if ( isMeasurable && !isNaN(parseFloat(l1)) && !isNaN(parseFloat(l2)) && !isNaN(parseFloat(l3))) {
+        const sum = l1 + l2 + l3
+        mean = sum / 3
+        return parseFloat(mean.toFixed(this.digitPlaces))
+      } else if (isMeasurable === 0) {
+        return 'NE'
+      } else {
+        return ''
+      }
+    },
+    setMeasureData(measureData, isInit = false) {
+      return new Promise(resolve => {
+        if (!measureData || (measureData && measureData.tableQuestionId !== this.activeQuestionId)) {
+          resolve()
+        }
+        var data = {}
+        // 创建标记
+        if (!measureData.data.remark) {
+          // 维护标记信息
+          measureData.data.remark = this.getLesionName(this.orderMark, this.activeQuestionMark)
+        }
+        let val = measureData.data.cachedStats.mean / 10
+        this.$set(this.questionForm, measureData.tableQuestionId, val.toFixed(this.digitPlaces))
+        data = {
+          Id: '',
+          StudyId: measureData.studyId,
+          InstanceId: measureData.instanceId,
+          SeriesId: measureData.seriesId,
+          MeasureData: measureData,
+          QuestionId: this.parentQsId,
+          RowIndex: this.questionForm.RowIndex,
+          RowId: this.questionForm.RowId,
+          VisitTaskId: this.visitTaskId,
+          NumberOfFrames: isNaN(parseInt(measureData.frame)) ? 0 : measureData.frame,
+          frame: isNaN(parseInt(measureData.frame)) ? 0 : measureData.frame,
+          OrderMarkName: measureData.data.remark,
+          TableQuestionId: measureData.tableQuestionId
+        }
+        store.dispatch('reading/addMeasuredData', { visitTaskId: this.visitTaskId, data: data })
+        let mean = this.getQuestionVal(1104)
+        let newMean = this.getMean()
+        if (newMean !== mean) {
+          mean = newMean
+          let meanId = this.getQuestionId(1104)
+          this.$set(this.questionForm, meanId, newMean ? newMean : '')
+        }
+        const isMeasurable = this.getQuestionVal(1105)
+        DicomEvent.$emit('refreshStudyListMeasureData')
+        let i = this.markList.findIndex(i=>i.tableQuestionId === measureData.tableQuestionId)
+        if (i === -1) {
+          this.markList.push({tableQuestionId: measureData.tableQuestionId, measureData: data, saveEnum: 0})
+        } else {
+          this.markList[i].saveEnum = 0
+          this.markList[i].measureData = data
+        }
+        if (!isNaN(parseInt(isMeasurable)) && parseInt(isMeasurable) === 1) {
+          this.isDisabledMeasurableRadio = true
+        }
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
+        this.setQuestions()
+        resolve()
+      })
+    },
+    addAnnotation(qs) {
+      // 判断是否有测量数据未保存
+      let i = this.markList.findIndex(i=>i.saveEnum === 0)
+      if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
+        this.$alert(this.$t('trials:MRIPDFF:message:message3'))
+        // this.$message.warning(this.$t('trials:MRIPDFF:message:message3'))
+        return
+      }
+      let orderMarkName = this.getLesionName(this.orderMark, qs.QuestionMark)
+      this.activeQuestionId = qs.Id
+      this.activeQuestionMark= qs.QuestionMark
+      DicomEvent.$emit('addAnnotation', {question: qs, locateInfo: { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: orderMarkName, lesionType: null, markTool: 'Probe', readingTaskState: this.readingTaskState, isMarked: true }})
+    },
+    getAnnotationSaveEnum(qs) {
+      let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
+      if (i > -1) {
+        return this.markList[i].saveEnum
+      } else {
+        return 1
+      }
+    },
+    getAnnotationStatus(qs) {
+      let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
+      if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
+        return true
+      } else {
+        return false
+      }
+    },
+    getIsExitsMarks() {
+      const isMeasurable = this.getQuestionVal(1105)
+      if (!isNaN(parseInt(isMeasurable)) && parseInt(isMeasurable) === 1) {
+        return this.markList.findIndex(i=>i.measureData && i.measureData.MeasureData) > -1 ? true : false
+      } else {
+        return false
+      }
+      
+    },
+    async removeAnnotation(qs) {
+      let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
+      DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.markList[i].measureData.OrderMarkName, lesionType: null, markTool: 'Probe', readingTaskState: this.readingTaskState, isMarked: true })
+      // 是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      
+      let measureData = Object.assign({}, this.markList[i].measureData)
+      if (measureData.Id) {
+        await deleteSingleTableQuestionMark({Id: measureData.Id}, 11)
+      }
+      // 移除缓存中的measureData
+      await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: measureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, orderMarkName: measureData.OrderMarkName})
+      DicomEvent.$emit('getMeasureData')
+      this.markList[i].measureData = null
+      this.markList[i].saveEnum = 0
+      // 清除测量值、清除平均值
+      this.$set(this.questionForm, this.markList[i].tableQuestionId, '')
+      let meanId = this.getQuestionId(1104)
+      this.$set(this.questionForm, meanId, '')
+      this.isDisabledMeasurableRadio = this.getIsExitsMarks()
+      this.$set(this.questionForm, 'saveTypeEnum', 1)
+      this.setQuestions()
+    },
+    locateAnnotation(qs) {
+      let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
+      let measureData = this.markList[i].measureData
+      // 定位
+      var markTool = 'Probe'
+      var readingTaskState = this.readingTaskState
+      var isMarked = !!measureData
+      DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, markTool, readingTaskState, isMarked })
+    },
+    setQuestions() {
+      const mean = this.getQuestionVal(1104)
+      const isMeasurable = this.getQuestionVal(1105)
+      this.$emit('resetQuestions', { mean, isMeasurable, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+    },
+    async saveAnnotation(qs) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
+        let params = {}
+        if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
+          let measureData = this.markList[i].measureData.MeasureData
+          // 上传截图
+          DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => {
+            params = Object.assign({}, this.markList[i].measureData)
+            if (val) {
+              let pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+              params.PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+            }
+            let tableQuestionId = this.markList[i].tableQuestionId
+            params.Answer = this.questionForm[tableQuestionId]
+            params.MeasureData = JSON.stringify(this.markList[i].measureData.MeasureData)
+            loading.close()
+            this.saveTableQuestionInfo(params, qs)
+          })
+        } else {
+          params = {
+            Answer: "",
+            VisitTaskId: this.visitTaskId,
+            QuestionId: this.parentQsId,
+            InstanceId: '',
+            SeriesId: '',
+            StudyId: '',
+            MarkTool:'',
+            PicturePath: '',
+            NumberOfFrames: 0,
+            MeasureData: '',
+            QuestionType: 0,
+            OrderMarkName: '',
+            RowId: this.questionForm.RowId,
+            TableQuestionId: qs.Id,
+            RowIndex: this.questionForm.RowIndex
+          }
+          loading.close()
+          this.saveTableQuestionInfo(params, qs)
+        }
+        
+        
+      } catch(e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    async saveTableQuestionInfo(params, qs) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let res = await saveTableQuestionMark(params, 11)
+        if (res.IsSuccess) {
+          // 保存后设置保存状态
+          let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
+          this.markList[i].saveEnum = 1
+          // 保存病灶
+          let j = this.markList.findIndex(i=>!(i.saveEnum === 1 && i.measureData && i.measureData.MeasureData))
+          if (j === -1) {
+            let answers = []
+            let reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+            for (const k in this.questionForm) {
+              if (reg.test(k)) {
+                if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+                  answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
+                }
+              }
+            }
+            let params = {
+              questionId: this.parentQsId,
+              rowId: this.questionForm.RowId,
+              rowIndex: this.answers.RowIndex,
+              visitTaskId: this.visitTaskId,
+              trialId: this.trialId,
+              answerList: answers,
+              isDicomReading: true
+            }
+            const res = await submitTaskRowInfo(params, 11)
+            if (res.IsSuccess) {
+              this.$set(this.questionForm, 'saveTypeEnum', 2)
+              this.originalQuestionForm = { ...this.questionForm }
+              this.$set(this.questionForm, 'RowId', res.Result.RowId)
+              this.setQuestions()
+              DicomEvent.$emit('getReportInfo', true)
+            }
+          }
+          // 保存成功
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          // 刷新表格、刷新标记信息
+          this.$emit('getReadingQuestionAndAnswer')
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          loading.close()
+        }
+      } catch(e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    returnFloat(num) {
+      if (num) return
+      var value = Math.round(parseFloat(num) * 100) / 100
+      var s = value.toString().split('.')
+      if (s.length === 1) {
+        value = value.toString() + '.00'
+        return value
+      }
+      if (s.length > 1) {
+        if (s[1].length < 2) {
+          value = value.toString() + '0'
+        }
+        return value
+      }
+    },
+    getQuestionVal(questionMark) {
+      const idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        const questionId = this.questions[idx].Id
+        const answer = this.questionForm[questionId]
+        if (isNaN(parseFloat(answer))) {
+          return answer
+        } else {
+          return parseFloat(answer)
+        }
+      } else {
+        return ''
+      }
+    },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        var trialId = this.$route.query.trialId
+        var subjectId = this.$route.query.trialId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      var base64Arr = imageEditorBase64.split(',')
+      var imgtype = ''
+      var base64String = ''
+      if (base64Arr.length > 1) {
+        // 如果是图片base64，去掉头信息
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      // 将base64解码
+      var bytes = atob(base64String)
+      // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode)
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], { type: imgtype })
+    },
+    async handleSave() {
+      try {
+        const valid = await this.$refs.measurementForm.validate()
+      if (!valid) return
+      if (parseInt(this.questionForm[this.isMeasurableId]) === 1) {
+        // 检验是否有标记为保存
+        let i = this.markList.findIndex(i=>i.saveEnum === 0)
+        if (i > -1) {
+          // 请先保存标注信息！
+          this.$alert(this.$t('trials:MRIPDFF:message:message1'))
+          // this.$message.warning(this.$t('trials:MRIPDFF:message:message1'))
+          return
+        }
+      } else {
+        // 不可测量时，清空测量值，平均值
+        // '是否确认不可测量？'
+        const confirm = await this.$confirm(
+          this.$t('trials:MRIPDFF:message:message2'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        let l1Id = this.getQuestionId(1101)
+        this.$set(this.questionForm, l1Id, '')
+        let l2Id = this.getQuestionId(1102)
+        this.$set(this.questionForm, l2Id, '')
+        let l3Id = this.getQuestionId(1103)
+        this.$set(this.questionForm, l3Id, '')
+        let meanId = this.getQuestionId(1104)
+        this.$set(this.questionForm, meanId, 'NE')
+      }
+      
+      const loading = this.$loading({ fullscreen: true })
+
+      try {
+          // let isResetMarks = this.markList.findIndex(i=>i.measureData && i.measureData.MeasureData) > -1 ? true : false
+          if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && this.isExitsMarks) {
+            await deleteTableQuestionMark({rowId: this.questionForm.RowId}, 11)
+            this.markList.forEach(i => {
+              if (i.measureData && i.measureData.MeasureData) {
+                i.measureData = ''
+              }
+            })
+            this.isExitsMarks = false
+          }
+          var answers = []
+          var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+          for (const k in this.questionForm) {
+            if (reg.test(k)) {
+              if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+                answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
+              }
+            }
+          }
+
+          var params = {
+            questionId: this.parentQsId,
+            rowId: this.questionForm.RowId,
+            rowIndex: this.answers.RowIndex,
+            visitTaskId: this.visitTaskId,
+            trialId: this.trialId,
+            answerList: answers,
+            isDicomReading: true
+          }
+          const res = await submitTaskRowInfo(params, 11)
+          if (res.IsSuccess) {
+          // 保存成功！
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$set(this.questionForm, 'saveTypeEnum', 2)
+            this.originalQuestionForm = { ...this.questionForm }
+            this.$set(this.questionForm, 'RowId', res.Result.RowId)
+            this.setQuestions()
+            this.$emit('close')
+            DicomEvent.$emit('getReportInfo', true)
+            DicomEvent.$emit('setMeasuredToolsPassive')
+            // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+            // DicomEvent.$emit('getMeasureData')
+            this.$emit('getReadingQuestionAndAnswer')
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async handleClose() {
+      this.$emit('close')
+    },
+    setState() {
+      this.$nextTick(() => {
+        if (this.isCurrentTask && this.readingTaskState < 2) {
+          // 是否要将是否可测量设置为否？
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-form{
+  /deep/ .el-form-item__label{
+    color: #c3c3c3;
+  }
+  /deep/ .el-input .el-input__inner{
+    background-color: transparent;
+    color: #ddd;
+    border: 1px solid #5e5e5e;
+  }
+  /deep/ .el-form-item{
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+  }
+  /deep/ .el-form-item__content{
+    flex: 1;
+  }
+  /deep/ .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+  /deep/ .el-input-group__append, .el-input-group__prepend {
+    padding: 0 10px;
+  }
+  .el-form-item__content
+  .el-select{
+    width: 100%;
+  }
+  .input-width1{
+    width: calc(100% -60px)!important;
+  }
+  .input-width2{
+    width: 100% !important;
+  }
+}
+
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
new file mode 100644
index 00000000..036ddf99
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
@@ -0,0 +1,618 @@
+<template>
+  <div class="measurement-wrapper">
+
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <!-- 非测量问题 -->
+      <div class="lesions">
+        <Questions ref="ecrf" :groupClassify="1" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" />
+      </div>
+      <!-- 测量问题 -->
+      <template >
+        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+          </h4>
+          <div class="lesion_list">
+            <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
+              <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
+                <div class="title">{{ item.QuestionName }}</div>
+              </div>
+              <div style="color: #ddd;text-align: left;padding: 5px 10px;border-bottom: 1px solid #5a5a5a;    font-size: 15px;">
+                <el-row >
+                  <!-- 分段 -->
+                  <el-col :span="14">{{$t('trials:MRIPDFF:label:col1')}}</el-col>
+                  <!-- 是否可测量 -->
+                  <!-- <el-col :span="7">{{$t('trials:MRIPDFF:label:col2')}}</el-col> -->
+                  <!-- 平均值 -->
+                  <el-col :span="7">{{$t('trials:MRIPDFF:label:col3')}}</el-col>
+                </el-row>
+              </div>
+              
+              <el-collapse
+                v-if="item.Type === 'table' && item.TableQuestions"
+                v-model="activeName"
+                accordion
+                @change="handleCollapseChange"
+              >
+                <el-collapse-item
+                  v-for="(q,i) in item.TableQuestions.Answers"
+                  :key="`${item.Id}_${q.RowIndex}`"
+                  :name="`${item.Id}_${q.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
+                >
+                  <template slot="title">
+                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+
+                      {{ getLesionName(item.TableQuestions.Questions, q) }}
+                      <!-- 未保存 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                        <i class="el-icon-warning" style="color:red" />
+                      </el-tooltip>
+                      <!-- 信息不完整 -->
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                        <i class="el-icon-warning" style="color:#ff9800" />
+                      </el-tooltip>
+                      <div style="position: absolute;right: 0px;top: 2px;">
+                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+                        <div style="font-size: 13px;width:110px;height: 30px;">
+                          <!-- <div style="display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:95px">
+                            {{ $fd('ReadingYesOrNo', parseInt(item.TableQuestions.Answers[i].isMeasurable)) }}
+                          </div> -->
+                          <div style="display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:50px">
+                            {{ isNaN(parseFloat(item.TableQuestions.Answers[i].mean)) ? item.TableQuestions.Answers[i].mean : `${item.TableQuestions.Answers[i].mean}%` }}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                  </template>
+                  <QuestionForm
+                    :ref="`${item.Id}_${q.RowIndex}`"
+                    :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]"
+                    :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark"
+                    :table-questions="tableQuestions"
+                    :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName"
+                    :parent-qs-id="item.Id"
+                    :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask"
+                    :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask"
+                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @resetQuestions="resetQuestions"
+                    @close="close"
+                  />
+                </el-collapse-item>
+
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import { resetReadingTask } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import Questions from './../Questions'
+import QuestionForm from './QuestionForm'
+export default {
+  name: 'MeasurementList',
+  components: {
+    Questions,
+    QuestionForm
+  },
+  props: {
+    isShow: {
+      type: Boolean,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    questionFormChangeState: {
+      type: Boolean,
+      default() {
+        return false
+      }
+    },
+    questionFormChangeNum: {
+      type: Number,
+      default() {
+        return 0
+      }
+    }
+  },
+  data() {
+    return {
+      questions: [],
+      activeName: '',
+      activeItem: {
+        activeRowIndex: null,
+        activeCollapseId: null
+      },
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      unSaveTargets: [],
+      temporaryLesions: [],
+      readingTaskState: 2,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      tableQuestions: [],
+      isFirstRender: false,
+      CriterionType: null,
+      subjectCode: '',
+      liverSegmentId: '',
+      liverSegmentDicCode: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['visitTaskList', 'language', 'lastCanvasTaskId', 'currentReadingTaskState'])
+  },
+  watch: {
+    lastCanvasTaskId: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.initList()
+        }
+        console.log('lastCanvasTaskId', val)
+      }
+    },
+    currentReadingTaskState: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.readingTaskState = val
+        }
+      }
+    }
+  },
+  mounted() {
+    // this.subjectCode = this.$router.currentRoute.query.subjectCode
+    this.subjectCode = localStorage.getItem('subjectCode')
+    this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
+    DicomEvent.$on('setCollapseActive', measureData => {
+      this.setCollapseActive(measureData)
+      console.log('setCollapseActive')
+    })
+    DicomEvent.$on('getAllUnSaveLesions', (callback) => {
+      var list = this.getAllUnSaveLesions()
+      callback(list)
+      console.log('getAllUnSaveLesions')
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('setCollapseActive')
+    DicomEvent.$off('getUnSaveTarget')
+    DicomEvent.$off('getAllUnSaveLesions')
+  },
+  methods: {
+    async initList() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      if (i > -1) {
+        this.visitTaskId = this.visitTaskList[i].VisitTaskId
+        this.taskBlindName = this.visitTaskList[i].TaskBlindName
+        this.readingTaskState = this.visitTaskList[i].ReadingTaskState
+        this.isBaseLineTask = this.visitTaskList[i].IsBaseLineTask
+        this.isCurrentTask = this.visitTaskList[i].IsCurrentTask
+        this.activeName = ''
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+        if (!this.visitTaskList[i].IsInit) {
+          var loading = this.$loading({ fullscreen: true })
+          var triald = this.trialId = this.$router.currentRoute.query.trialId
+          if (!this.visitTaskList[i].measureDataInit) {
+            await store.dispatch('reading/getMeasuredData', this.visitTaskList[i].VisitTaskId)
+          }
+          if (!this.visitTaskList[i].studyListInit) {
+            await store.dispatch('reading/getStudyInfo', { trialId: triald, subjectVisitId: this.visitTaskList[i].VisitId, visitTaskId: this.visitTaskList[i].VisitTaskId, taskBlindName: this.visitTaskList[i].TaskBlindName })
+          }
+          if (!this.visitTaskList[i].readingQuestionsInit) {
+            await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+          if (!this.visitTaskList[i].questionsInit) {
+            await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+
+          await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[i].VisitTaskId })
+          loading.close()
+        }
+        this.questions = this.visitTaskList[i].ReadingQuestions
+        this.$nextTick(() => {
+          this.$refs['ecrf'].getQuestions(this.visitTaskId)
+          this.getTableQuestions()
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              this.$refs[refName] && this.$refs[refName][0].initForm()
+            })
+          })
+        })
+      }
+    },
+    async resetQuestions(obj) {
+      this.setQuestions(this.questions, obj)
+      await store.dispatch('reading/setReadingQuestionAndAnswer', { questions: this.questions, visitTaskId: this.visitTaskId })
+
+      this.getTableQuestions()
+    },
+    setQuestions(questions, obj) {
+      questions.forEach(item => {
+        if (item.Type === 'table' && item.Id === obj.questionId) {
+          var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
+          item.TableQuestions.Answers[idx].isMeasurable = obj.isMeasurable
+          console.log(obj.isMeasurable)
+          item.TableQuestions.Answers[idx].mean = obj.mean
+          item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
+
+          for (const i in obj.anwsers) {
+            if (i === 'MeasureData' && obj.anwsers[i]) {
+             
+            } else {
+              item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
+            }
+          }
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestions(item.Childrens, obj)
+        }
+      })
+    },
+    getQuestions(questions) {
+      questions.forEach(item => {
+        if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+          item.TableQuestions.Answers.forEach(answerObj => {
+            let isMeasurable = this.getQuestionAnswer(item.TableQuestions.Questions, 1105, answerObj)
+            this.$set(answerObj, 'isMeasurable', isMeasurable)
+            this.$set(answerObj, 'mean', this.getQuestionAnswer(item.TableQuestions.Questions, 1104, answerObj))
+            if (answerObj.RowId) {
+              this.$set(answerObj, 'saveTypeEnum', isNaN(parseInt(isMeasurable)) ? 1 : 2)
+            } else {
+              this.$set(answerObj, 'saveTypeEnum', 0)
+            }
+          })
+        }
+        if (item.Childrens.length > 0) {
+          this.getQuestions(item.Childrens)
+        }
+      })
+      return questions
+    },
+    getTableQuestions() {
+      this.tableQuestions = []
+      this.questions.map(item => {
+        if (item.Type === 'table') {
+          this.tableQuestions.push(item)
+        }
+        if (item.Childrens.length > 0) {
+          this.getTableQuestionsChild(item.Childrens)
+        }
+      })
+    },
+    getTableQuestionsChild(obj) {
+      obj.map(item => {
+        if (item.Type === 'table') {
+          this.tableQuestions.push(item)
+        }
+        if (item.Childrens.length > 0) {
+          this.getTableQuestionsChild(item.Childrens)
+        }
+      })
+    },
+    refreshReadingQuestionAndAnswer(type) {
+      if (type === 0) {
+        // 删除
+        this.activeName = ''
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+      }
+
+      this.getReadingQuestionAndAnswer(this.visitTaskId)
+    },
+    getReadingQuestionAndAnswer(showLoading = true) {
+      return new Promise(async resolve => {
+        try {
+          let loading = null
+          if (showLoading) {
+            loading = this.$loading({ fullscreen: true })
+          }
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(() => {
+            var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+            if (idx > -1) {
+              if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
+                this.questions = this.visitTaskList[idx].ReadingQuestions
+              }
+              this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
+              this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
+              this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
+            }
+            this.getTableQuestions()
+            this.$nextTick(() => {
+              this.tableQuestions.forEach(item => {
+                item.TableQuestions.Answers.forEach(i => {
+                  var refName = `${item.Id}_${i.RowIndex}`
+                  this.$refs[refName] && this.$refs[refName][0].initForm()
+                })
+              })
+            })
+          })
+          await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+          DicomEvent.$emit('getMeasureData')
+          
+          loading ? loading.close() : ''
+          resolve()
+        } catch (e) { 
+          console.log(e) 
+          loading ? loading.close() : ''
+        }
+      })
+    },
+    getQuestionAnswer(questions, questionMark, answers) {
+      var idx = questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        var questionId = questions[idx].Id
+        return answers[questionId]
+      } else {
+        return ''
+      }
+    },
+    isCanActiveTool(toolName) {
+      return { isCanActiveTool: true, reason: '' }
+    },
+
+    checkToolCanActive(toolName) {
+       return { isCanActiveTool: true, reason: '' }
+    },
+
+    getLesionName(questions, q) {
+      let liverSegmentStr = ''
+      if (!this.liverSegmentId) {
+        let i = questions.findIndex(i=>i.QuestionMark === 1106)
+        if (i === -1) return
+        this.liverSegmentId = questions[i].Id
+        this.liverSegmentDicCode = questions[i].DictionaryCode
+      }
+      if (q && q[this.liverSegmentId]) {
+        liverSegmentStr = this.$fd(this.liverSegmentDicCode, parseInt(q[this.liverSegmentId]))
+      }
+      return liverSegmentStr
+    },
+    handleCollapseChange(val) {
+      if (this.activeName) {
+        var arr = this.activeName.split('_')
+        this.activeItem.activeRowIndex = arr[1]
+        this.activeItem.activeCollapseId = arr[0]
+        this.$nextTick(() => {
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
+            var markTool = this.$refs[refName][0].currentMarkTool
+            var readingTaskState = this.readingTaskState
+            var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
+            DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
+          }
+        })
+      } else {
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+      }
+    },
+    collapseRightClick(e, obj, activeCollapseId, activeRowIndex) {
+      if (obj.IsDicomReading !== false) {
+        const refName = `${activeCollapseId}_${activeRowIndex}`
+        DicomEvent.$emit('imageLocation', { questionId: activeCollapseId, rowIndex: activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType })
+      }
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    setCollapseActive(measureData) {
+      if (measureData) {
+        if (this.activeItem.activeRowIndex === measureData.RowIndex && this.activeItem.activeCollapseId === measureData.QuestionId) {
+          return
+        } else {
+          this.activeItem.activeCollapseId = measureData.QuestionId
+          this.activeItem.activeRowIndex = measureData.RowIndex
+          this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        }
+      }
+    },
+    modifyMeasuredData(measureObj) {
+      if (measureObj.questionInfo) {
+        this.activeItem.activeCollapseId = measureObj.questionInfo.QuestionId
+        this.activeItem.activeRowIndex = String(measureObj.questionInfo.RowIndex)
+        this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        this.$refs[refName][0].setMeasureData(measureObj.measureData)
+      }
+    },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+      if (this.activeItem.activeCollapseId) {
+        // 判断是否存在测量数据
+        this.$nextTick(() => {
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (!this.$refs[refName][0].questionForm.MeasureData || (this.$refs[refName][0].questionForm && this.$refs[refName][0].questionForm.MeasureData && measureData.data.uuid === this.$refs[refName][0].questionForm.MeasureData.data.uuid)) {
+            this.$refs[refName][0].setMeasureData(measureData)
+          }
+        })
+      } else {
+       
+      }
+    },
+    async close(questionsObj) {
+      if (questionsObj) {
+        this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
+      }
+      this.activeItem.activeRowIndex = null
+      this.activeItem.activeCollapseId = null
+      this.activeName = ''
+    },
+    getECRFQuestions(obj) {
+      this.$refs['ecrf'].getQuestions(obj.visitTaskId)
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.activeName = ''
+          this.activeItem.activeRowIndex = null
+          this.activeItem.activeCollapseId = null
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    getAllUnSaveLesions() {
+      var arr = []
+      this.tableQuestions.map(item => {
+        if (item.TableQuestions && item.TableQuestions.Answers) {
+          item.TableQuestions.Answers.map(t => {
+            const refName = `${item.Id}_${t.RowIndex}`
+            if (this.$refs[refName] && this.$refs[refName][0] && this.$refs[refName][0].questionForm.saveTypeEnum !== 2) {
+              var lessionName = this.$refs[refName][0].liverSeg
+              arr.push({ lessionName: lessionName, rowIndex: t.RowIndex, questionId: item.Id })
+            }
+          })
+        }
+      })
+      return arr
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  // overflow: hidden;
+
+  .container{
+    padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+  }
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    /deep/ .el-collapse-item{
+      background-color: #000!important;
+      color: #ddd;
+
+    }
+    /deep/ .el-collapse-item__header{
+      background-color: #000!important;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    /deep/ .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    /deep/ .el-collapse-item__content{
+      width:260px;
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      // border: 1px solid #ffeb3b;
+      border: 1px solid #fff;
+      z-index: 1;
+      color: #ddd;
+      padding: 5px;
+      background-color:#1e1e1e;
+    }
+
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 2e7c5019..0cbec5a1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -57,7 +57,7 @@
           :data="taskQuestions"
           row-key="Id"
           border
-          default-expand-all
+          :expand-row-keys="expandedRows"
           :height="height"
           :tree-props="{children: 'Childrens', hasChildren: 'hasChildren'}"
           size="mini"
@@ -319,7 +319,8 @@ export default {
       assessmentQuestions: [],
       tLesionCount: null,
       ntLesionCount: null,
-      openWindow: null
+      openWindow: null,
+      expandedRows: []
     }
   },
   computed: {
@@ -373,13 +374,13 @@ export default {
       })
     },
     async beforeLeave() {
-      if (this.questionFormChangeState && this.CriterionType !== 2) {
-        var msg = this.$t('trials:readingReport:message:msg5')
-        var isgo = await this.myConfirm(msg)
-        if (!isgo) {
-          return Promise.resolve(true)
-        }
-      }
+      // if (this.questionFormChangeState && this.CriterionType !== 2) {
+      //   var msg = this.$t('trials:readingReport:message:msg5')
+      //   var isgo = await this.myConfirm(msg)
+      //   if (!isgo) {
+      //     return Promise.resolve(true)
+      //   }
+      // }
       var list = null
       DicomEvent.$emit('getAllUnSaveLesions', val => {
         list = val
@@ -458,16 +459,32 @@ export default {
       const arr = []
       if (questions.length !== 0) {
         questions.forEach((item) => {
+          if (this.CriterionType === 21) {
+            if (!this.isShowDetail) {
+              if (!item.RowId) {
+                this.expandedRows.push(item.Id)
+              }
+            } else {
+              this.expandedRows.push(item.Id)
+            }
+            
+          } else {
+            this.expandedRows.push(item.Id)
+          }
           // 过滤病灶标识  病灶名称  部位  器官  位置  是否淋巴结
           // 非靶病灶和新病灶 过滤长径和短径信息
           // 非淋巴结靶病灶 过滤短径
 
           lesionType = item.LesionType
           var filterArr = [7]
+          // 0：靶病灶、 5：新靶病灶
+          // 1：非靶病灶、2：新病灶、6：新非靶病灶、7：其它既往新病灶、8：触发irecisit后的新病灶
+          // 0：长径，1：短径，2：是否淋巴结，3：自增ID，4：病灶名称，5：所在器官，6：所在位置，7：状态，8：所在部位，10：部位描述
+          // 1105：是否可测量，1106：肝脏分段
           if ((item.LesionType === 1 || item.LesionType === 2 || item.LesionType === 6 || item.LesionType === 7 || item.LesionType === 8) && isNTFilterLength) {
-            filterArr = [0, 1, 3, 4, 5, 6, 2, 8, 10, 7]
+            filterArr = [0, 1, 3, 4, 5, 6, 2, 8, 10, 7, 1105]
           } else {
-            filterArr = [3, 4, 5, 6, 2, 8, 10, 7]
+            filterArr = [3, 4, 5, 6, 2, 8, 10, 7, 1106, 1105]
           }
           if ((lesionType === 0 || lesionType === 5) && isLymphNodes === 0 && !this.isShowDetail && (this.CriterionType === 1 || this.CriterionType === 3 || this.CriterionType === 17)) {
             filterArr.push(1)
@@ -542,6 +559,28 @@ export default {
                     }
                   }
                 }
+                if (this.CriterionType === 21) {
+                  var liverSegmentIdx = item.Childrens.findIndex(i => i.QuestionMark === 1106)
+                  if (liverSegmentIdx > -1) {
+                    if (item.Childrens[liverSegmentIdx].Answer.length > 0) {
+                      let v = item.Childrens[liverSegmentIdx].Answer[0].Answer
+                      obj.QuestionName = this.$fd(item.Childrens[liverSegmentIdx].DictionaryCode, parseInt(v))
+                      let Answers = {}
+                      let mean = item.Childrens.findIndex(i => i.QuestionMark === 1104)
+                      if (mean > -1) {
+                        this.visitTaskList.forEach(v => {
+                          const o = item.Childrens[mean].Answer.find(v1 => {
+                            return v1.VisitTaskId === v.VisitTaskId
+                          })
+                          if (o) {
+                            Answers[o.VisitTaskId] = isNaN(parseFloat(o.Answer)) ? o.Answer : `${o.Answer}%`
+                          }
+                        })
+                      }
+                      this.$set(obj, 'Answers', Answers)
+                    }
+                  }
+                }
               } catch (e) {
                 console.log(e)
               }
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js
new file mode 100644
index 00000000..92caea2c
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js
@@ -0,0 +1,404 @@
+import * as cornerstoneTools from 'cornerstone-tools'
+const external = cornerstoneTools.external
+// State
+const getToolState = cornerstoneTools.getToolState
+const textStyle = cornerstoneTools.textStyle
+const toolColors = cornerstoneTools.toolColors
+const toolStyle = cornerstoneTools.toolStyle
+// Drawing
+const getNewContext = cornerstoneTools.import('drawing/getNewContext')
+const draw = cornerstoneTools.import('drawing/draw')
+const drawHandles = cornerstoneTools.import('drawing/drawHandles')
+const drawTextBox = cornerstoneTools.import('drawing/drawTextBox')
+// Utilities
+const getRGBPixels = cornerstoneTools.import('util/getRGBPixels')
+const calculateSUV = cornerstoneTools.import('util/calculateSUV')
+// import { probeCursor } from '../cursors/index.js';
+// import { getLogger } from '../../util/logger.js';
+const throttle = cornerstoneTools.import('util/throttle')
+const getModule = cornerstoneTools.getModule
+const getPixelSpacing = cornerstoneTools.import('util/getPixelSpacing')
+// import numbersWithCommas from './../../util/numbersWithCommas.js';
+const numbersWithCommas = cornerstoneTools.import('util/numbersWithCommas')
+// const logger = getLogger('tools:annotation:ProbeTool');
+import calculateEllipseStatistics from './calculateEllipseStatistics'
+import getCircleCoords from './getCircleCoords'
+/**
+ * @public
+ * @class ProbeTool
+ * @memberof Tools.Annotation
+ * @classdesc Tool which provides a probe of the image data at the
+ * desired position.
+ * @extends Tools.Base.BaseAnnotationTool
+ */
+export default class ProbeTool extends cornerstoneTools.ProbeTool {
+  constructor(props = {}) {
+    const defaultProps = {
+      name: 'Probe',
+      supportedInteractionTypes: ['Mouse', 'Touch'],
+      // svgCursor: probeCursor,
+      configuration: {
+        drawHandles: true,
+        renderDashed: false,
+        handleRadius: 0,
+        fixedRadius: 0,
+        hideHandlesIfMoving: false,
+        digits: 1,
+        showRadius: false,
+      },
+    };
+
+    super(props, defaultProps);
+
+    this.throttledUpdateCachedStats = throttle(this.updateCachedStats, 110);
+  }
+
+  createNewMeasurement(eventData) {
+    const goodEventData =
+      eventData && eventData.currentPoints && eventData.currentPoints.image;
+
+    if (!goodEventData) {
+      logger.error(
+        `required eventData not supplied to tool ${this.name}'s createNewMeasurement`
+      );
+
+      return;
+    }
+
+    return {
+      visible: true,
+      active: true,
+      color: undefined,
+      invalidated: true,
+      handles: {
+        // start: {
+        //   x: eventData.currentPoints.image.x,
+        //   y: eventData.currentPoints.image.y,
+        //   highlight: true,
+        //   active: false,
+        // },
+        end: {
+          x: eventData.currentPoints.image.x,
+          y: eventData.currentPoints.image.y,
+          highlight: true,
+          active: true,
+          radius: 0
+        },
+      },
+    };
+  }
+
+  /**
+   *
+   *
+   * @param {*} element
+   * @param {*} data
+   * @param {*} coords
+   * @returns {Boolean}
+   */
+  pointNearTool(element, data, coords) {
+    const hasEndHandle = data && data.handles && data.handles.end;
+    const validParameters = hasEndHandle;
+
+    if (!validParameters) {
+      logger.warn(
+        `invalid parameters supplied to tool ${this.name}'s pointNearTool`
+      );
+    }
+
+    if (!validParameters || data.visible === false) {
+      return false;
+    }
+
+    const probeCoords = external.cornerstone.pixelToCanvas(
+      element,
+      data.handles.end
+    );
+
+    return external.cornerstoneMath.point.distance(probeCoords, coords) < 5;
+  }
+  // pointNearTool(element, data, coords) {
+  //   const hasEndHandle = data && data.handles && data.handles.end;
+  //   const validParameters = hasEndHandle;
+
+  //   if (!validParameters) {
+  //     logger.warn(
+  //       `invalid parameters supplied to tool ${this.name}'s pointNearTool`
+  //     );
+  //   }
+
+  //   if (!validParameters || data.visible === false) {
+  //     return false;
+  //   }
+  //   // data.handles.end.x = data.handles.end.x + 10
+  //   let endCoords = {
+  //     x: data.handles.end.x + 50,
+  //     y: data.handles.end.y,
+  //     highlight: data.handles.end.highlight,
+  //     active: data.handles.end.active,
+  //   }
+  //   const probeCoords = external.cornerstone.pixelToCanvas(
+  //     element,
+  //     endCoords
+  //   );
+
+  //   return external.cornerstoneMath.point.distance(probeCoords, coords) < 5;
+  // }
+
+  // updateCachedStats(image, element, data) {
+  //   const x = Math.round(data.handles.end.x);
+  //   const y = Math.round(data.handles.end.y);
+
+  //   const stats = {};
+
+  //   if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+  //     stats.x = x;
+  //     stats.y = y;
+
+  //     if (image.color) {
+  //       stats.storedPixels = getRGBPixels(element, x, y, 1, 1);
+  //     } else {
+  //       stats.storedPixels = external.cornerstone.getStoredPixels(
+  //         element,
+  //         x,
+  //         y,
+  //         1,
+  //         1
+  //       );
+  //       stats.sp = stats.storedPixels[0];
+  //       stats.mo = stats.sp * image.slope + image.intercept;
+  //       stats.suv = calculateSUV(image, stats.sp);
+  //     }
+  //   }
+
+  //   data.cachedStats = stats;
+  //   data.invalidated = false;
+  // }
+  updateCachedStats(image, element, data) {
+    const seriesModule =
+      external.cornerstone.metaData.get('generalSeriesModule', image.imageId) ||
+      {};
+    const modality = seriesModule.modality;
+    const pixelSpacing = getPixelSpacing(image);
+    const { fixedRadius, digits } = this.configuration;
+    const stats = _calculateStats(
+      image,
+      element,
+      data.handles,
+      modality,
+      pixelSpacing,
+      fixedRadius,
+      digits
+    );
+
+    data.cachedStats = stats;
+    data.invalidated = false;
+  }
+
+  renderToolData(evt) {
+    const eventData = evt.detail;
+    const { fixedRadius, renderDashed } = this.configuration;
+    const toolData = getToolState(evt.currentTarget, this.name);
+
+    if (!toolData) {
+      return;
+    }
+
+    // We have tool data for this element - iterate over each one and draw it
+    const context = getNewContext(eventData.canvasContext.canvas);
+    const { image, element } = eventData;
+    const fontHeight = textStyle.getFontSize();
+    const lineDash = getModule('globalConfiguration').configuration.lineDash;
+    const pixelSpacing = getPixelSpacing(image);
+    // Meta
+    const seriesModule =
+      external.cornerstone.metaData.get('generalSeriesModule', image.imageId) ||
+      {};
+
+    // Pixel Spacing
+    const modality = seriesModule.modality;
+    const hasPixelSpacing = pixelSpacing && pixelSpacing.rowPixelSpacing && pixelSpacing.colPixelSpacing;
+    for (let i = 0; i < toolData.data.length; i++) {
+      const data = toolData.data[i];
+      if (data.visible === false) {
+        continue;
+      }
+
+      draw(context, context => {
+        const color = toolColors.getColorIfActive(data);
+        
+        if (this.configuration.drawHandles) {
+          // Draw the handles
+          let radius = getCanvasRadius(data.handles, fixedRadius, element, pixelSpacing)
+          data.handles.end.radius = radius
+          const handleOptions = { handleRadius: radius, color };
+
+          if (renderDashed) {
+            handleOptions.lineDash = lineDash;
+          }
+          drawHandles(context, eventData, data.handles, handleOptions);
+        }
+
+        // Update textbox stats
+        if (data.invalidated === true) {
+          if (data.cachedStats) {
+            this.throttledUpdateCachedStats(image, element, data);
+          } else {
+            this.updateCachedStats(image, element, data);
+          }
+        }
+
+        // let text, str;
+        let textLines = []
+        const { x, y, area, mean, radius } = data.cachedStats;
+
+        if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+          // text = `${x}, ${y}`;
+          if (data.remark) {
+            textLines.push(`${data.remark}`)
+          }
+          if (!image.color) {
+            // Draw text
+            let unit = _getUnit(modality, this.configuration.showHounsfieldUnits);
+
+            // textLines.push(_formatArea(area, hasPixelSpacing));
+            if (mean) {
+              // str += `mean: ${parseFloat(mean.toFixed(3))}`;
+              textLines.push(`Mean: ${mean} ${unit}`)
+            }
+            // if (radius) {
+            //   str += `radius: ${parseFloat(radius.toFixed(3))}`;
+            //   textLines.push(`radius: ${parseFloat(radius.toFixed(3))}`)
+            // }
+          }
+          let r = getPixelRadius(fixedRadius, pixelSpacing)
+          // Coords for text
+          const coords = {
+            // Translate the x/y away from the cursor
+            x: data.handles.end.x + r,
+            y: data.handles.end.y - r,
+          };
+          const textCoords = external.cornerstone.pixelToCanvas(
+            eventData.element,
+            coords
+          );
+          drawTextBox(
+            context,
+            textLines,
+            textCoords.x,
+            textCoords.y ,
+            color
+          );
+          // drawTextBox(context, '', textCoords.x, textCoords.y, color);
+        }
+      });
+    }
+  }
+}
+function _getUnit(modality, showHounsfieldUnits) {
+  return modality === 'CT' && showHounsfieldUnits !== false ? 'HU' : '';
+}
+function _formatArea(area, hasPixelSpacing) {
+  const suffix = hasPixelSpacing
+    ? ` mm${String.fromCharCode(178)}`
+    : ` px${String.fromCharCode(178)}`;
+
+  return `Area: ${numbersWithCommas(area.toFixed(2))}${suffix}`;
+}
+function getCanvasRadius(handles, fixedRadius, element, pixelSpacing) {
+  let startCoords = {
+    x: handles.end.x,
+    y: handles.end.y
+  }
+  const handleCanvasStartCoords = external.cornerstone.pixelToCanvas(
+    element,
+    startCoords
+  );
+  let r = getPixelRadius(fixedRadius, pixelSpacing)
+  let endCoords = {
+    x: handles.end.x + r,
+    y: handles.end.y
+  }
+  const handleCanvasEndCoords = external.cornerstone.pixelToCanvas(
+    element,
+    endCoords
+  );
+  return Math.abs(handleCanvasEndCoords.x - handleCanvasStartCoords.x)
+}
+function getPixelRadius(r, pixelSpacing) {
+  return r / ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)
+}
+function _calculateStats(image, element, handles, modality, pixelSpacing, fixedRadius, digits) {
+  // Retrieve the bounds of the ellipse in image coordinates
+  let startCoords = {
+    x: handles.end.x,
+    y: handles.end.y
+  }
+  let r = getPixelRadius(fixedRadius, pixelSpacing)
+  let endCoords = {
+    x: handles.end.x + r,
+    y: handles.end.y
+  }
+  const circleCoordinates = getCircleCoords(startCoords, endCoords);
+
+  // Retrieve the array of pixels that the ellipse bounds cover
+  const pixels = external.cornerstone.getPixels(
+    element,
+    circleCoordinates.left,
+    circleCoordinates.top,
+    circleCoordinates.width,
+    circleCoordinates.height
+  );
+ 
+  // Calculate the mean & standard deviation from the pixels and the ellipse details.
+  const ellipseMeanStdDev = calculateEllipseStatistics(
+    pixels,
+    circleCoordinates
+  );
+
+  let meanStdDevSUV;
+
+  if (modality === 'PT') {
+    meanStdDevSUV = {
+      mean: calculateSUV(image, ellipseMeanStdDev.mean, true) || 0,
+      stdDev: calculateSUV(image, ellipseMeanStdDev.stdDev, true) || 0,
+    };
+  }
+
+  const radius =
+    (circleCoordinates.width *
+      ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)) /
+    2;
+  const perimeter = 2 * Math.PI * radius;
+  const area =
+    Math.PI *
+    ((circleCoordinates.width *
+      ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)) /
+      2) *
+    ((circleCoordinates.height *
+      ((pixelSpacing && pixelSpacing.rowPixelSpacing) || 1)) /
+      2);
+  const x = Math.round(handles.end.x);
+  const y = Math.round(handles.end.y);
+
+  const stats = {};
+
+  if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+    stats.x = x;
+    stats.y = y;
+  }
+  return {
+    area: area || 0,
+    radius: radius || 0,
+    perimeter: perimeter || 0,
+    mean: ellipseMeanStdDev.mean.toFixed(digits) || 0,
+    stdDev: ellipseMeanStdDev.stdDev.toFixed(digits) || 0,
+    min: ellipseMeanStdDev.min.toFixed(digits) || 0,
+    max: ellipseMeanStdDev.max.toFixed(digits) || 0,
+    meanStdDevSUV,
+    x: stats.x,
+    y: stats.y
+  };
+}
+
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js
new file mode 100644
index 00000000..867437f5
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js
@@ -0,0 +1,67 @@
+import pointInEllipse from './pointInEllipse.js';
+
+/**
+ * Calculates the statistics of an elliptical region of interest.
+ *
+ * @private
+ * @function calculateEllipseStatistics
+ *
+ * @param {number[]} sp - Array of the image data's pixel values.
+ * @param {Object} ellipse - { top, left, height, width } - An object describing the ellipse.
+ * @returns {Object} { count, mean, variance, stdDev, min, max }
+ */
+export default function(sp, ellipse) {
+  let sum = 0;
+  let sumSquared = 0;
+  let count = 0;
+  let index = 0;
+  let min = null;
+  let max = null;
+
+  for (let y = ellipse.top; y < ellipse.top + ellipse.height; y++) {
+    for (let x = ellipse.left; x < ellipse.left + ellipse.width; x++) {
+      const point = {
+        x,
+        y,
+      };
+
+      if (pointInEllipse(ellipse, point)) {
+        if (min === null) {
+          min = sp[index];
+          max = sp[index];
+        }
+
+        sum += sp[index];
+        sumSquared += sp[index] * sp[index];
+        min = Math.min(min, sp[index]);
+        max = Math.max(max, sp[index]);
+        count++;
+      }
+
+      index++;
+    }
+  }
+
+  if (count === 0) {
+    return {
+      count,
+      mean: 0.0,
+      variance: 0.0,
+      stdDev: 0.0,
+      min: 0.0,
+      max: 0.0,
+    };
+  }
+
+  const mean = sum / count;
+  const variance = sumSquared / count - mean * mean;
+
+  return {
+    count,
+    mean,
+    variance,
+    stdDev: Math.sqrt(variance),
+    min,
+    max,
+  };
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js
new file mode 100644
index 00000000..ddc90942
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js
@@ -0,0 +1,21 @@
+import * as cornerstoneTools from 'cornerstone-tools'
+const external = cornerstoneTools.external
+
+/**
+ * Retrieve the bounds of the circle in image coordinates
+ *
+ * @param {*} startHandle
+ * @param {*} endHandle
+ * @returns {{ left: number, top: number, width: number, height: number }}
+ */
+export default function getCircleCoords(startHandle, endHandle) {
+  const { distance } = external.cornerstoneMath.point
+  const radius = distance(startHandle, endHandle)
+
+  return {
+    left: Math.floor(Math.min(startHandle.x - radius, endHandle.x)),
+    top: Math.floor(Math.min(startHandle.y - radius, endHandle.y)),
+    width: radius * 2,
+    height: radius * 2
+  }
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js
new file mode 100644
index 00000000..e7a09e2e
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js
@@ -0,0 +1,39 @@
+/**
+ * Returns true if a point is within an ellipse
+ * @export @public @method
+ * @name pointInEllipse
+ *
+ * @param  {Object} ellipse  Object defining the ellipse.
+ * @param  {Object} location The location of the point.
+ * @returns {boolean} True if the point is within the ellipse.
+ */
+export default function(ellipse, location) {
+  const xRadius = ellipse.width / 2;
+  const yRadius = ellipse.height / 2;
+
+  if (xRadius <= 0.0 || yRadius <= 0.0) {
+    return false;
+  }
+
+  const center = {
+    x: ellipse.left + xRadius,
+    y: ellipse.top + yRadius,
+  };
+
+  /* This is a more general form of the circle equation
+   *
+   * X^2/a^2 + Y^2/b^2 <= 1
+   */
+
+  const normalized = {
+    x: location.x - center.x,
+    y: location.y - center.y,
+  };
+
+  const inEllipse =
+    (normalized.x * normalized.x) / (xRadius * xRadius) +
+      (normalized.y * normalized.y) / (yRadius * yRadius) <=
+    1.0;
+
+  return inEllipse;
+}
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5a8c2668..ec423c4b 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,12 +11,7 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-                <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
-
-              </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
@@ -35,7 +30,7 @@
                         style="margin:0 10px;"
                         :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
                       >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
+                        <el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
                           {{ file.FileName }}
                         </el-button>
                         <img
@@ -60,11 +55,14 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              </template>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
+              <template v-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index b2012239..014518fd 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,12 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-                <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
-
-              </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
+              
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
@@ -35,7 +31,7 @@
                         style="margin:0 10px;"
                         :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
                       >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
+                        <el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
                           {{ file.FileName }}
                         </el-button>
                         <img
@@ -60,11 +56,14 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              </template>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
+              <template v-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 899e1396..81c9d179 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -260,7 +260,11 @@ export default {
       if (Object.keys(this.medicalReviewInfo).length > 0) {
         for (const k in this.form) {
           if (this.medicalReviewInfo.hasOwnProperty(k)) {
-            this.form[k] = this.medicalReviewInfo[k];
+            if (k === 'IsHaveQuestion' && this.medicalReviewInfo.AuditState === 0) {
+              this.form[k] = null
+            } else {
+              this.form[k] = this.medicalReviewInfo[k]
+            }
           }
         }
         this.fileList = [];
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 29d095c9..c00159f2 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -1,6 +1,6 @@
 /* eslint-disable */
 <template>
-  <BaseContainer>
+  <BaseContainer class="read-task-allocation">
     <el-tabs type="border-card" v-model="TrialReadingCriterionId">
       <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId" v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === i.TrialReadingCriterionId">
@@ -1013,6 +1013,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+  .read-task-allocation{
+    /deep/.search {
+      padding: 0px !important;
+    }
+  }
   /deep/ .hidden-row{
     display: none;
   }
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
new file mode 100644
index 00000000..32001c3b
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
@@ -0,0 +1,98 @@
+<template>
+  <div style="text-align: right">
+    <el-tabs v-model="activeName">
+      <!-- 报表导出 -->
+      <el-tab-pane
+        :label="$t('trials:readingTracking:reviewResult:reportsExport')"
+        name="reportsExport"
+      >
+        <el-tabs type="border-card" v-model="reportCriterionId">
+          <el-tab-pane
+            :label="i.TrialReadingCriterionName"
+            :name="i.TrialReadingCriterionId"
+            v-for="i of trialCriterionList"
+            :key="i.TrialReadingCriterionId"
+          >
+            <exportList 
+              v-if="reportCriterionId === i.TrialReadingCriterionId && activeName === 'reportsExport'" 
+              :trialReadingCriterionId="i.TrialReadingCriterionId" 
+              :data="data"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+      <!-- 报表导出配置 -->
+      <el-tab-pane
+        :label="$t('trials:readingTracking:reviewResult:reportsConfig')"
+        name="reportsConfig"
+      >
+        <el-tabs type="border-card" v-model="reportConfigCriterionId">
+          <el-tab-pane
+            :label="i.TrialReadingCriterionName"
+            :name="i.TrialReadingCriterionId"
+            v-for="i of trialCriterionList"
+            :key="i.TrialReadingCriterionId"
+          >
+            <configList 
+              v-if="reportConfigCriterionId === i.TrialReadingCriterionId && activeName === 'reportsConfig'" 
+              :trialReadingCriterionId="i.TrialReadingCriterionId"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+    </el-tabs>
+    
+  </div>
+</template>
+
+<script>
+import { getTrialCriterionList } from '@/api/trials/reading'
+import exportList from './exportList'
+import configList from './configList'
+export default {
+  name: 'ReviewResults',
+  components: {
+    exportList,
+    configList
+  },
+  data() {
+    return {
+      loading: false,
+      trialCriterionList: [],
+      reportCriterionId: null,
+      trialId: null,
+      activeName: 'reportsExport',
+      reportConfigCriterionId: ''
+    }
+  },
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.getTrialCriterionList()
+  },
+  methods: {
+    async getTrialCriterionList() {
+      try {
+        let res = await getTrialCriterionList(this.trialId)
+        if (res.IsSuccess) {
+          this.trialCriterionList = res.Result
+          this.reportCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+          this.reportConfigCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+        }
+      } catch(e) {
+        console.log(e)
+      }
+    },
+  },
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
new file mode 100644
index 00000000..edf6b235
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <!-- 保存 -->
+    <el-button type="primary" size="mini" @click="submit" style="margin-bottom: 5px;">
+      {{ $t('common:button:save') }}
+    </el-button>
+    <el-table
+      v-loading="loading"
+      :data="exportInfo.QuestionList"
+      height="500"
+      row-key="Id"
+      border
+      default-expand-all
+      :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
+    >
+      <!-- 问题名称 -->
+      <el-table-column 
+        prop="QuestionName" 
+        :label="$t('trials:readingTracking:config:questionName')"  
+        width="300">
+      </el-table-column>
+      <el-table-column 
+        v-for="item in exportInfo.DicList"
+        :key="item.Code" 
+        :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+        
+      >
+        <template v-slot="scope">
+          <el-checkbox
+            @change="() => changeState(scope, item.Code)"
+            :checked="getCheckState(scope, item.Code)"
+            :disabled="getDisabledState(scope.row, item)"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
+          >
+          </el-checkbox>
+        </template>
+      </el-table-column>
+      <!-- CDISC编码 -->
+      <el-table-column
+        prop="CDISCCode"
+        :label="$t('trials:readingTracking:config:code')"   
+        width="180" 
+      >
+       <template v-slot="scope">
+          <el-input 
+            v-model="scope.row.CDISCCode"
+            size="mini"
+            :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
+          >
+          </el-input>
+        </template>
+
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getTrialQuestionExportResult, setTrialQuestionExportResult } from '@/api/trials'
+export default {
+  name: 'configList',
+  props: {
+    trialReadingCriterionId: {
+      type: String,
+      required: true
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      exportInfo: []
+    }
+  },
+  mounted() {
+    this.getConfigInfo()
+  },
+  methods: {
+    async getConfigInfo() {
+      try {
+        this.loading = true
+        let res = await getTrialQuestionExportResult(
+          {
+            trialReadingCriterionId: this.trialReadingCriterionId
+          }
+        )
+        if (res.IsSuccess) {
+          this.exportInfo = res.Result
+        }
+        this.loading = false
+      } catch(e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    async submit() {
+      this.loading = true
+      try {
+        let params = this.filterQuestions(this.exportInfo.QuestionList)
+        let res = await setTrialQuestionExportResult(params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        this.loading = false
+      } catch(e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    filterQuestions(arr) {
+      let params= {
+        questionList: [],
+        tableQuestionList: []
+      }
+      for (let i of arr) {
+        if (!i.IsGroup && !i.IsTableQuestion) {
+          params.questionList.push({
+            questionId: i.QuestionId,
+            tableQuestionId: i.TableQuestionId,
+            exportResult: i.ExportResult,
+            CDISCCode: i.CDISCCode
+          })
+        }
+        if (i.TableQuestionId) {
+          params.tableQuestionList.push({
+            questionId: i.QuestionId,
+            tableQuestionId: i.TableQuestionId,
+            exportResult: i.ExportResult,
+            CDISCCode: i.CDISCCode
+          })
+        }
+        if (i.Children && i.Children.length > 0) {
+            const childResults = this.filterQuestions(i.Children)
+            params.questionList = params.questionList.concat(childResults.questionList)
+            params.tableQuestionList = params.tableQuestionList.concat(childResults.tableQuestionList)
+        }
+      }
+      return params;
+    },
+    // 获取状态
+    getCheckState(item, code) {
+      return item.row.ExportResult.indexOf(code) > -1
+    },
+    // 改变状态
+    changeState(item, code) {
+     item.row.ExportResult.indexOf(code) > -1 ? item.row.ExportResult.splice(item.row.ExportResult.indexOf(code), 1) : item.row.ExportResult.push(code);
+    },
+    // 获取禁用状态
+    getDisabledState(row, item) {
+      // 肿瘤评估标准阅片结果表(1)和阅片结果明细表(2)禁用
+      if (this.exportInfo.CriterionGroup === 1 && (item.Code === 1 || item.Code === 2)) {
+        return true
+      } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
+        // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
+        return true
+      } else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion)) {
+        // CDISC导出不能配置表格问题
+        return true
+      } else if (item.Code === 2 && row.HasChildren) {
+        // 阅片结果明细表
+        return true
+      } else {
+        return false
+      }
+      
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index 3b754970..e49c8a8c 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -1,58 +1,32 @@
 <template>
-  <div style="text-align: right">
-    <!--导出-->
-    <el-button
-      type="primary"
-      :disabled="!(trialCriterionList.length > 0)"
-      icon="el-icon-download"
-      size="mini"
-      @click="handleExport(0)"
-      style="margin-bottom: 10px"
+  <el-table v-loading="loading" :data="list" border stripe height="500">
+    <el-table-column label="" width="50">
+      <template slot-scope="scope">
+        {{ scope.$index + 1 }}
+      </template>
+    </el-table-column>
+    <!-- 文件名称 -->
+    <el-table-column
+      :label="$t('trials:reviewTrack:title:fileName')"
+      :min-width="50"
     >
-      {{ $t('common:button:export') }}
-    </el-button>
-    <el-tabs type="border-card" v-model="TrialReadingCriterionId">
-      <el-tab-pane
-        :label="i.TrialReadingCriterionName"
-        :name="i.TrialReadingCriterionId"
-        v-for="i of trialCriterionList"
-        :key="i.TrialReadingCriterionId"
-      >
-        <el-table v-loading="loading" :data="list" border stripe>
-          <el-table-column label="" :min-width="50">
-            <template slot-scope="scope">
-              {{ scope.$index + 1 }}
-            </template>
-          </el-table-column>
-          <!-- 文件名称 -->
-          <el-table-column
-            :label="$t('trials:reviewTrack:title:fileName')"
-            :min-width="50"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.FileName }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop=""
-            :label="$t('common:action:action')"
-            min-width="80"
-          >
-            <template slot-scope="scope">
-              <!-- 下载 -->
-              <el-button
-                icon="el-icon-download"
-                circle
-                :title="$t('trials:reviewTrack:title:download')"
-                size="mini"
-                @click="handleExport(scope.row.ExportCatogory)"
-              />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+      <template slot-scope="scope">
+        {{ scope.row.FileName }}
+      </template>
+    </el-table-column>
+    <el-table-column prop="" :label="$t('common:action:action')" min-width="80">
+      <template slot-scope="scope">
+        <!-- 下载 -->
+        <el-button
+          icon="el-icon-download"
+          circle
+          :title="$t('trials:reviewTrack:title:download')"
+          size="mini"
+          @click="handleExport(scope.row.ExportCatogory)"
+        />
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
 <script>
@@ -65,20 +39,13 @@ import {
   getEvaluationOfTumorEfficacy_Export,
   getDetailedOfEvaluatedLesion_Export,
 } from '@/api/export'
-import { getTrialCriterionList } from '@/api/trials/reading'
-
 export default {
   name: 'exportList',
-  data() {
-    return {
-      loading: false,
-      trialCriterionList: [],
-      TrialReadingCriterionId: null,
-      trialId: null,
-      list: [],
-    }
-  },
   props: {
+    trialReadingCriterionId: {
+      type: String,
+      required: true,
+    },
     data: {
       type: Object,
       default() {
@@ -86,30 +53,35 @@ export default {
       },
     },
   },
-  watch: {
-    TrialReadingCriterionId(v) {
-      if (v === '0') return
-      this.loading = true
-      getTrialReadingCriterionCanExportDocumentList({
-        TrialReadingCriterionId: v,
-      })
-        .then((res) => {
-          this.list = res.Result
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = true
-        })
-    },
+  data() {
+    return {
+      loading: false,
+      trialId: null,
+      list: [],
+    }
   },
   mounted() {
-    this.trialId = this.$route.query.trialId
-    this.getTrialCriterionList()
+    this.getList()
   },
   methods: {
+    async getList() {
+      this.loading = true
+      try {
+        let res = await getTrialReadingCriterionCanExportDocumentList({
+          TrialReadingCriterionId: this.trialReadingCriterionId,
+        })
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+        this.loading = false
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
+    },
     handleExport(type) {
       var searchData = { ...this.data }
-      searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+      searchData.TrialReadingCriterionId = this.trialReadingCriterionId
       switch (type) {
         case 0:
           getReadingTaskList_Export(searchData)
@@ -159,7 +131,8 @@ export default {
             })
           break
         case 8:
-          getCommonJudgeRatioList_Export(searchData)
+          searchData.ReadingExportType = 8
+          getCommonEvaluationList_Export(searchData)
             .then((res) => {})
             .catch(() => {
               this.loading = false
@@ -183,15 +156,6 @@ export default {
           break
       }
     },
-    getTrialCriterionList() {
-      getTrialCriterionList(this.trialId)
-        .then((res) => {
-          this.trialCriterionList = res.Result
-          this.TrialReadingCriterionId =
-            this.trialCriterionList[0].TrialReadingCriterionId
-        })
-        .catch(() => {})
-    },
   },
 }
 </script>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 4ed7f0e8..392799ba 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -110,6 +110,10 @@
           <el-button type="primary" icon="el-icon-download" @click="handleExport">
             {{ $t('common:button:export') }}
           </el-button>
+          <!-- 阅片结果 -->
+          <el-button type="primary" icon="el-icon-download" @click="handleReviewResults">
+            {{ $t('trials:readingTracking:button:reviewResults') }}
+          </el-button>
           <el-button type="primary" icon="el-icon-info" @click="handleViewRecord">
             {{ $t('common:button:failureRecord') }}
           </el-button>
@@ -146,8 +150,8 @@
             <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag> -->
             <el-tooltip placement="top">
               <div slot="content">
-                <span>{{`加急原因：${$fd('TaskUrgentType',scope.row.TaskUrgentType)}`}}</span><br/>
-                <span>{{scope.row.TaskUrgentRemake?`备注：${scope.row.TaskUrgentRemake}`:''}}</span>
+                <span>{{`${$t('trials:reviewTrack:label:taskUrgentType')}${$fd('TaskUrgentType',scope.row.TaskUrgentType)}`}}</span><br/>
+                <span>{{scope.row.TaskUrgentRemake?`${$t('trials:reviewTrack:label:taskUrgentRemake')}${scope.row.TaskUrgentRemake}`:''}}</span>
               </div>
              <div>
               <el-button :disabled="!(!scope.row.TaskState && (scope.row.ReadingTaskState === 0 || scope.row.ReadingTaskState === 1)) || !scope.row.IsCanEditUrgentState" v-if="scope.row.IsUrgent" type="danger" size="mini" @click="changeUrgentStatus(scope.row)">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-button>
@@ -833,11 +837,13 @@
       </el-dialog>
       <el-dialog
         v-if="exportVisible"
+        v-dialogDrag
         :title="$t('trials:reviewTrack:button:export')"
         :visible.sync="exportVisible"
         :close-on-click-modal="false"
+        width="60%"
         append-to-body>
-        <exportList :trial-reading-criterion-id="TrialReadingCriterionId" :data="searchData" />
+        <ReviewResults :data="searchData" />
       </el-dialog>
 
 
@@ -941,12 +947,15 @@
 <script>
 import { getTrialSiteSelect,setTaskUrgent } from '@/api/trials'
 import { getTrialCriterionList, PMSetTaskBack, getInfluencedTaskList, getReReadingOrBackInfluenceTaskList, getReadingTaskList, configTrialReadingTaskViewRule, getDoctorUserSelectList, applyReReading } from '@/api/trials/reading'
+import {
+  getReadingTaskList_Export
+} from '@/api/export'
 import { getToken } from '@/utils/auth'
 import { changeURLStatic } from '@/utils/history.js'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import RefereeRules from './components/RefereeRules.vue'
-import exportList from './components/exportList.vue'
+import ReviewResults from './components/ReviewResults'
 import ClinicalData from "../../subject/reading-period/components/ClinicalData"
 import RecordList from './components/RecordList.vue'
 const searchDataDefault = () => {
@@ -978,7 +987,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, RefereeRules, ClinicalData, exportList, RecordList },
+  components: { BaseContainer, Pagination, RefereeRules, ClinicalData, ReviewResults, RecordList },
   props: {
     AllocationReadingCategory: {
       type: String
@@ -1087,7 +1096,16 @@ export default {
         }
       })
     },
-    handleExport() {
+    async handleExport() {
+      this.loading = true
+      try {
+        await getReadingTaskList_Export(this.searchData)
+        this.loading = false
+      } catch(e) {
+        this.loading = false
+      }
+    },
+    handleReviewResults() {
       this.exportVisible = true
     },
     handleView(row) {
diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index ba88606c..10c2a9ce 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <box-content style="height: 100%;background: #fff;">
+  <box-content style="height: 100%; background: #fff">
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" class="base-search-form">
@@ -8,7 +8,7 @@
           <el-select
             v-model="searchData.FileTypeId"
             clearable
-            style="width:150px;"
+            style="width: 150px"
           >
             <el-option
               v-for="item of $d.Trial_Document"
@@ -20,20 +20,20 @@
         </el-form-item>
         <!-- 文件名称 -->
         <el-form-item :label="$t('trials:attachment:table:fileName')">
-          <el-input v-model="searchData.Name" style="width:100px;" />
+          <el-input v-model="searchData.Name" style="width: 100px" />
         </el-form-item>
         <!-- 培训状态 -->
         <el-form-item :label="$t('trials:attachment:table:isDeleted')">
           <el-select
             clearable
             v-model="searchData.IsDeleted"
-            style="width:150px;"
+            style="width: 150px"
           >
             <el-option
               v-for="item of $d.TrainingStatus"
               :key="item.value"
               :label="item.label"
-              :value="!item.value"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
@@ -42,11 +42,18 @@
           <el-select
             v-model="searchData.UserTypeId"
             clearable
-            style="width:100%;"
+            style="width: 100%"
           >
             <el-option
               v-for="item of userTypeOptions"
-              v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27 && item.UserTypeEnum !== 31"
+              v-show="
+                item.UserTypeEnum !== 1 &&
+                item.UserTypeEnum !== 8 &&
+                item.UserTypeEnum !== 20 &&
+                item.UserTypeEnum !== 26 &&
+                item.UserTypeEnum !== 27 &&
+                item.UserTypeEnum !== 31
+              "
               :key="item.Id"
               :label="item.UserTypeShortName"
               :value="item.Id"
@@ -55,20 +62,23 @@
             </el-option>
           </el-select>
         </el-form-item>
-        
-      
+
         <el-form-item>
           <!-- 查询 -->
           <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">
+          <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;">
+      <span style="margin-left: auto">
         <!-- 新增 -->
         <el-button
           v-hasPermi="['trials:trials-panel:setting:attachment:add']"
@@ -85,7 +95,7 @@
     <el-table
       ref="attachmentList"
       v-loading="loading"
-      v-adaptive="{bottomOffset:60}"
+      v-adaptive="{ bottomOffset: 60 }"
       :data="list"
       stripe
       height="100"
@@ -125,8 +135,12 @@
         min-width="100"
       >
         <template slot-scope="scope">
-          <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>
+          <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>
       <!-- 需要签署的用户类型 -->
@@ -137,7 +151,11 @@
         min-width="100"
       >
         <template slot-scope="scope">
-          {{ scope.row.NeedConfirmedUserTypes?scope.row.NeedConfirmedUserTypes.join(', '):'' }}
+          {{
+            scope.row.NeedConfirmedUserTypes
+              ? scope.row.NeedConfirmedUserTypes.join(', ')
+              : ''
+          }}
         </template>
       </el-table-column>
       <!-- 描述 -->
@@ -148,14 +166,21 @@
         min-width="300"
       /> -->
       <!-- 更新时间 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="UpdateTime"
         :label="$t('trials:attachment:table:updateTime')"
         show-overflow-tooltip
         sortable="custom"
         min-width="160"
+      /> -->
+      <!--创建时间-->
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:attachment:table:CreateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
       />
-
       <el-table-column
         :label="$t('common:action:action')"
         min-width="140"
@@ -192,7 +217,13 @@
     </el-table>
 
     <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
 
     <!-- 新增/编辑 -->
     <el-dialog
@@ -203,7 +234,11 @@
       width="800px"
       custom-class="base-dialog-wrapper"
     >
-      <AttachmentForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+      <AttachmentForm
+        :data="currentRow"
+        @closeDialog="closeDialog"
+        @getList="getList"
+      />
     </el-dialog>
 
     <!-- 预览文件 -->
@@ -215,16 +250,25 @@
       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>
   </box-content>
 </template>
 <script>
-
-import { getTrialDocumentList, userAbandonDoc, getTrialUserTypeList } from '@/api/trials'
+import {
+  getTrialDocumentList,
+  userAbandonDoc,
+  getTrialUserTypeList,
+} from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
 import AttachmentForm from './components/attachmentForm'
@@ -238,7 +282,7 @@ const searchDataDefault = () => {
     SortField: '',
     Asc: false,
     IsDeleted: null,
-    UserTypeId: null
+    UserTypeId: null,
   }
 }
 export default {
@@ -258,7 +302,7 @@ export default {
       currentPath: '',
       currentType: '',
       trialId: '',
-      userTypeOptions: []
+      userTypeOptions: [],
     }
   },
   mounted() {
@@ -271,31 +315,38 @@ export default {
     getList() {
       this.loading = true
       this.searchData.TrialId = this.trialId
-      getTrialDocumentList(this.searchData).then(res => {
-        this.loading = false
-        const { CurrentPageData, TotalCount } = res.Result
-        CurrentPageData.forEach(item => {
-          item.NeedConfirmedUserTypes = []
-          item.NeedConfirmedUserTypeeIds = []
-          item.NeedConfirmedUserTypeList.forEach((i) => {
-            item.NeedConfirmedUserTypes.push(i.UserTypeShortName)
-            item.NeedConfirmedUserTypeeIds.push(i.NeedConfirmUserTypeId)
+      getTrialDocumentList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          const { CurrentPageData, TotalCount } = res.Result
+          CurrentPageData.forEach((item) => {
+            item.NeedConfirmedUserTypes = []
+            item.NeedConfirmedUserTypeeIds = []
+            item.NeedConfirmedUserTypeList.forEach((i) => {
+              item.NeedConfirmedUserTypes.push(i.UserTypeShortName)
+              item.NeedConfirmedUserTypeeIds.push(i.NeedConfirmUserTypeId)
+            })
           })
+          this.list = CurrentPageData
+          this.total = TotalCount
+        })
+        .catch(() => {
+          this.loading = false
         })
-        this.list = CurrentPageData
-        this.total = TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
     },
     // 获取用户类型下拉数据
     getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-        if (this.form.Id) {
-          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeeIds
-        }
-      }).catch(() => { this.loading = false })
+      getTrialUserTypeList()
+        .then((res) => {
+          this.userTypeOptions = res.Result
+          if (this.form.Id) {
+            this.form.NeedConfirmedUserTypeIdList =
+              this.data.NeedConfirmedUserTypeeIds
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     // 新增
     handleAdd() {
@@ -307,7 +358,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
     },
     // 编辑
@@ -320,19 +373,25 @@ export default {
     handleRepeal(row) {
       this.$confirm(this.$t('trials:attachment:message:abolish'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       })
         .then(() => {
           this.loading = true
           userAbandonDoc(row.Id, false)
-            .then(res => {
+            .then((res) => {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success(this.$t('trials:trials-list:message:abolitionSuccessfully'))
+                this.$message.success(
+                  this.$t('trials:trials-list:message:abolitionSuccessfully')
+                )
               }
-            }).catch(() => { this.loading = false })
-        }).catch(() => {})
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => {})
     },
     // 关闭编辑弹窗
     closeDialog() {
@@ -361,7 +420,7 @@ export default {
       this.searchData.SortField = column.prop
       this.searchData.PageIndex = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue b/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue
index 10ad9201..25f3581d 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue
@@ -396,6 +396,12 @@ export default {
         return false
       },
     },
+    UserTypeList: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
   },
   data() {
     return {
@@ -407,13 +413,6 @@ export default {
       total: 0,
     }
   },
-  computed: {
-    UserTypeList() {
-      return this.$d.UserType.filter(
-        (item) => ![7, 31, 32, 21, 26, 27].includes(item.value)
-      )
-    },
-  },
   mounted() {
     this.trialId = this.$route.query.trialId
     this.getList()
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue
index 040c318f..55b6af6f 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue
@@ -56,13 +56,12 @@
         >
           <el-select
             v-model="form.ToUserTypeList"
-            disabled
             clearable
             multiple
             class="mr"
           >
             <el-option
-              v-for="item of $d.UserType"
+              v-for="item of UserTypeList"
               :key="`ToUserTypeList${item.label}`"
               :label="item.label"
               :value="item.value"
@@ -77,13 +76,12 @@
         >
           <el-select
             v-model="form.CopyUserTypeList"
-            disabled
             clearable
             multiple
             class="mr"
           >
             <el-option
-              v-for="item of $d.UserType"
+              v-for="item of UserTypeList"
               :key="`CopyUserTypeList${item.label}`"
               :label="item.label"
               :value="item.value"
@@ -310,6 +308,12 @@ export default {
         return {}
       },
     },
+    UserTypeList: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
   },
   components: { vcrontab },
   data() {
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
index 581d0ac2..5e879517 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
@@ -339,6 +339,7 @@
           :data="currentRow"
           :criterion-type="criterionType"
           :is-distinguish-criteria="isDistinguishCriteria"
+          :UserTypeList="UserTypeList"
           @closeDialog="closeDialog"
           @getList="getList"
         />
@@ -357,6 +358,7 @@
             @getList="getList"
             :is-distinguish-criteria="isDistinguishCriteria"
             :isShow="isBtnShow"
+            :UserTypeList="UserTypeList"
             @close="addVisible = false"
           />
         </div>
@@ -422,7 +424,7 @@ export default {
   computed: {
     UserTypeList() {
       return this.$d.UserType.filter(
-        (item) => ![7, 31, 32, 21, 26, 27].includes(item.value)
+        (item) => ![4, 7, 8, 31, 32, 21, 26, 27].includes(item.value)
       )
     },
   },
diff --git a/src/views/trials/trials-panel/setting/email-manage/index.vue b/src/views/trials/trials-panel/setting/email-manage/index.vue
index 6a452ed4..107de54b 100644
--- a/src/views/trials/trials-panel/setting/email-manage/index.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/index.vue
@@ -236,11 +236,11 @@ export default {
     flex: 1;
     overflow-y: auto;
   }
-  >>>.el-collapse-item__header{
+  /deep/.el-collapse-item__header{
     background:#e5ecef;
     padding-left:10px;
   }
-  >>>.el-collapse-item__content{
+  /deep/.el-collapse-item__content{
     padding: 10px;
   }
   .bottom{
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index bab12043..f453be8f 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <box-content v-loading="loading" style="height: 100%;background: #fff;padding: 10px;box-sizing: border-box">
+  <box-content v-loading="loading" class="medical-audit-setting">
     <!-- 搜索框 -->
     <el-tabs v-model="trialReadingCriterionId" type="border-card">
       <el-tab-pane v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId" :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId">
@@ -130,7 +130,7 @@
         </div>
         <el-table
           v-if="isShow"
-          v-adaptive="{bottomOffset:85}"
+          v-adaptive="{bottomOffset:65}"
           :data="list"
           stripe
           height="100"
@@ -556,3 +556,17 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.medical-audit-setting {
+  height: 100%;
+  background: #fff;
+  padding: 0px 10px;
+  box-sizing: border-box;
+  /deep/.search {
+    padding: 0px !important;
+  }
+  /deep/ .el-tabs--border-card>.el-tabs__content {
+    padding: 0px 15px;
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue
index a6daf168..390dc870 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue
@@ -109,15 +109,13 @@ export default {
       this.TrialSiteId = row.TrialSiteId
       this.config.title = this.$t(
         'trials:trials-panel:setting:personnel-manage:dicomAETitle'
-      ).replace('xxx', `${row.TrialSiteCode}、${row.TrialSiteAliasName}`)
+      )
+        .replace('xxx', `${row.TrialSiteCode}`)
+        .replace('yyy', `${row.TrialSiteAliasName}`)
+
       this.siteData = row
       this.config.visible = true
       this.getList()
-      console.log(
-        this.hasPermi([
-          'trials:trials-panel:setting:personnel-manage:edit-site',
-        ])
-      )
     },
     // 获取dicomAE列表
     async getList() {
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/dicomForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/dicomForm.vue
index f4237c4e..54abbdc9 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/dicomForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/dicomForm.vue
@@ -47,26 +47,26 @@
         :disabled="loading"
         @click="config.visible = false"
       >
-        {{ $t("common:button:cancel") }}
+        {{ $t('common:button:cancel') }}
       </el-button>
       <el-button type="primary" size="small" :loading="loading" @click="save">
-        {{ $t("common:button:save") }}
+        {{ $t('common:button:save') }}
       </el-button>
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdateTrialSiteDicomAE } from "@/api/trials";
-import BaseModel from "@/components/BaseModel";
+import { addOrUpdateTrialSiteDicomAE } from '@/api/trials'
+import BaseModel from '@/components/BaseModel'
 export default {
-  name: "dicomForm",
+  name: 'dicomForm',
   components: { BaseModel },
   data() {
     return {
       config: {
         visible: false,
         title: null,
-        width: "600px",
+        width: '600px',
         appendToBody: true,
       },
       form: {
@@ -80,128 +80,127 @@ export default {
         CallingAE: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             pattern: /[a-zA-Z0-9]/,
-            message: this.$t("common:ruleMessage:CallingAEPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:CallingAEPattern'),
+            trigger: 'blur',
           },
           {
             min: 1,
             max: 16,
-            message: this.$t("common:ruleMessage:CallingAEPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:CallingAEPattern'),
+            trigger: 'blur',
           },
         ],
         Ip: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
               if (
-                value === "" ||
-                typeof value === "undefined" ||
+                value === '' ||
+                typeof value === 'undefined' ||
                 value == null
               ) {
-                callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                callback(new Error(this.$t('common:ruleMessage:ipPattern')))
               } else {
                 const reg =
-                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
-                if (!reg.test(value) && value !== "") {
-                  callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+                if (!reg.test(value) && value !== '') {
+                  callback(new Error(this.$t('common:ruleMessage:ipPattern')))
                 } else {
-                  callback();
+                  callback()
                 }
               }
             },
-            message: this.$t("common:ruleMessage:ipPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:ipPattern'),
+            trigger: 'blur',
           },
         ],
         Port: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
-            type: "number",
+            type: 'number',
             min: 0,
             max: 65535,
-            message: this.$t("common:ruleMessage:portPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:portPattern'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
               if (
                 value &&
-                (String(value).includes(".") ||
+                (String(value).includes('.') ||
                   new RegExp(/\D/g).test(String(value)))
               ) {
-                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+                callback(new Error(this.$t('common:ruleMessage:portPattern')))
               } else {
-                callback();
+                callback()
               }
             },
-            trigger: "blur",
+            trigger: 'blur',
           },
         ],
       },
       siteData: {},
       loading: false,
-      status: "add",
-    };
+      status: 'add',
+    }
   },
   methods: {
-    open(siteData, data = null, status = "add") {
-      this.siteData = siteData;
-      this.status = status;
+    open(siteData, data = null, status = 'add') {
+      this.siteData = siteData
+      this.status = status
       Object.keys(this.form).forEach((key) => {
-        this.form[key] = null;
-      });
-      if (data && status === "edit") {
+        this.form[key] = null
+      })
+      if (data && status === 'edit') {
         Object.keys(this.form).forEach((key) => {
-          this.form[key] = data[key];
-        });
-        this.form.Ip = data.IP;
+          this.form[key] = data[key]
+        })
+        this.form.Ip = data.IP
       }
       this.config.title = this.$t(
-        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
-      ).replace(
-        "xxx",
-        `${siteData.TrialSiteCode}、${siteData.TrialSiteAliasName}`
-      );
-      this.config.visible = true;
+        'trials:trials-panel:setting:personnel-manage:dicomAETitle'
+      )
+        .replace('xxx', `${siteData.TrialSiteCode}`)
+        .replace('yyy', `${siteData.TrialSiteAliasName}`)
+      this.config.visible = true
     },
     // 保存
     async save() {
       try {
-        let validate = await this.$refs.dicomForm.validate();
-        if (!validate) return false;
-        this.loading = true;
-        this.form.TrialSiteId = this.siteData.TrialSiteId;
-        this.form.TrialId = this.$route.query.trialId;
-        let res = await addOrUpdateTrialSiteDicomAE(this.form);
-        this.loading = false;
+        let validate = await this.$refs.dicomForm.validate()
+        if (!validate) return false
+        this.loading = true
+        this.form.TrialSiteId = this.siteData.TrialSiteId
+        this.form.TrialId = this.$route.query.trialId
+        let res = await addOrUpdateTrialSiteDicomAE(this.form)
+        this.loading = false
         if (res.IsSuccess) {
-          this.status === "add"
-            ? this.$t("common:message:savedSuccessfully")
-            : this.$t("common:message:savedFail");
-          this.$emit("getList");
-          this.$emit("save");
-          this.config.visible = false;
+          this.status === 'add'
+            ? this.$t('common:message:savedSuccessfully')
+            : this.$t('common:message:savedFail')
+          this.$emit('getList')
+          this.$emit('save')
+          this.config.visible = false
         }
       } catch (err) {
-        console.log(err);
-        this.loading = false;
+        console.log(err)
+        this.loading = false
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index fed20e1a..5a9e1ada 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -150,12 +150,7 @@
         min-width="100"
       >
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.UserCount > 0"
-            size="small"
-            type="text"
-            @click="getCrcList(scope.row)"
-          >
+          <el-button size="small" type="text" @click="getCrcList(scope.row)">
             {{
               scope.row.UserNameList.length > 0
                 ? scope.row.UserNameList.join(', ')
@@ -358,7 +353,7 @@
     <!-- 修改参与者人员状态 -->
     <base-model v-if="status_model.visible" :config="status_model">
       <template slot="dialog-body">
-        <span>{{ $t('trials:internalStaff:table:status') }}:</span>
+        <span style="margin-right: 5px;">{{ $t('trials:internalStaff:table:status') }}:</span>
         <el-radio-group v-model="staffStatus">
           <el-radio
             v-for="item of $d.IsUserExitTrial"
@@ -412,7 +407,7 @@
         >
           <!-- 姓名 -->
           <el-table-column
-            prop="UserRealName"
+            prop="FullName"
             :label="$t('trials:internalStaff:table:name')"
             min-width="100"
             show-overflow-tooltip
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index 5fb31630..ddf78fda 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -16,7 +16,12 @@
           <el-select v-model="listQuery.UserTypeId" clearable class="mr">
             <el-option
               v-for="item of userTypeOptions"
-              v-show="item.UserTypeEnum !== 8 && item.UserTypeEnum !== 31 && item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27"
+              v-show="
+                item.UserTypeEnum !== 8 &&
+                item.UserTypeEnum !== 31 &&
+                item.UserTypeEnum !== 26 &&
+                item.UserTypeEnum !== 27
+              "
               :key="item.Id"
               :label="item.UserTypeShortName"
               :value="item.Id"
@@ -32,8 +37,13 @@
         <!-- 状态 -->
         <el-form-item :label="$t('trials:staff:table:status')">
           <el-select v-model="listQuery.IsDeleted" clearable class="mr">
-            <el-option v-for="item of $d.IsUserExitTrial" :label="item.label" :value="item.value" :key="item.id" />
-<!--            <el-option label="加入" :value="false" />-->
+            <el-option
+              v-for="item of $d.IsUserExitTrial"
+              :label="item.label"
+              :value="item.value"
+              :key="item.id"
+            />
+            <!--            <el-option label="加入" :value="false" />-->
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -42,14 +52,20 @@
             {{ $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-button
-            v-hasPermi="['trials:trials-panel:setting:personnel-manage:add-internal-staff']"
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:add-internal-staff',
+            ]"
             type="primary"
-            style="margin-left:10px"
+            style="margin-left: 10px"
             icon="el-icon-plus"
             @click="handleAdd('Add')"
           >
@@ -57,7 +73,9 @@
           </el-button>
           <!-- 添加外部人员 -->
           <el-button
-            v-hasPermi="['trials:trials-panel:setting:personnel-manage:add-external-staff']"
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:add-external-staff',
+            ]"
             type="primary"
             icon="el-icon-plus"
             @click="handleAdd('External')"
@@ -85,10 +103,32 @@
       stripe
       @sort-change="handleSortByColumn"
     >
-      <el-table-column type="index" width="50" />
+      <el-table-column type="index" width="60">
+        <template slot-scope="scope">
+          <span
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: flex-end;
+            "
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="$t('trials:staff:tip:userDisabled')"
+              placement="top"
+              style="margin-right: 3px"
+              v-if="!scope.row.Status"
+            >
+              <i v-if="!scope.row.Status" class="el-icon-warning icon-i"></i>
+            </el-tooltip>
+            <span>{{ scope.$index + 1 }}</span>
+          </span>
+        </template>
+      </el-table-column>
       <!-- 姓名 -->
       <el-table-column
-        prop="UserRealName"
+        prop="FullName"
         :label="$t('trials:staff:table:name')"
         show-overflow-tooltip
         sortable
@@ -108,8 +148,66 @@
         :label="$t('trials:staff:table:userType')"
         show-overflow-tooltip
         sortable
-        width="140"
-      />
+        width="160"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              Array.isArray(scope.row.TrialUserRoleList) &&
+              scope.row.TrialUserRoleList.length > 0 &&
+              hasPermi(['trials:trials-panel:setting:personnel-manage:status'])
+            "
+            type="text"
+            @click.stop="openRoleList(scope.row)"
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="$t('trials:staff:tip:userTypeDisabled')"
+              placement="top"
+              style="margin-right: 2px"
+              v-if="
+                scope.row.TrialUserRoleList.some(
+                  (item) => item.IsDeleted || item.IsUserRoleDisabled
+                )
+              "
+            >
+              <i class="el-icon-warning icon-i"></i>
+            </el-tooltip>
+            <span>{{
+              scope.row.TrialUserRoleList.map(
+                (item) => item.UserTypeShortName
+              ).join(', ')
+            }}</span>
+          </el-button>
+          <div
+            v-else-if="
+              Array.isArray(scope.row.TrialUserRoleList) &&
+              scope.row.TrialUserRoleList.length > 0
+            "
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="$t('trials:staff:tip:userTypeDisabled')"
+              placement="top"
+              style="margin-right: 2px"
+              v-if="
+                scope.row.TrialUserRoleList.some(
+                  (item) => item.IsDeleted || item.IsUserRoleDisabled
+                )
+              "
+            >
+              <i class="el-icon-warning icon-i"></i>
+            </el-tooltip>
+            <span>{{
+              scope.row.TrialUserRoleList.map(
+                (item) => item.UserTypeShortName
+              ).join(', ')
+            }}</span>
+          </div>
+        </template>
+      </el-table-column>
       <!-- 联系电话 -->
       <el-table-column
         prop="Phone"
@@ -143,8 +241,12 @@
         min-width="40"
       >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('IsUserExitTrial', scope.row.IsDeleted) }}</el-tag>
-          <el-tag v-else>{{ $fd('IsUserExitTrial', scope.row.IsDeleted) }}</el-tag>
+          <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+            $fd('IsUserExitTrial', scope.row.IsDeleted)
+          }}</el-tag>
+          <el-tag v-else>{{
+            $fd('IsUserExitTrial', scope.row.IsDeleted)
+          }}</el-tag>
         </template>
       </el-table-column>
       <!-- 加入日期 -->
@@ -156,7 +258,11 @@
         width="160"
       >
         <template slot-scope="scope">
-          {{ scope.row.JoinTime?moment(scope.row.JoinTime).format('YYYY-MM-DD'):'' }}
+          {{
+            scope.row.JoinTime
+              ? moment(scope.row.JoinTime).format('YYYY-MM-DD')
+              : ''
+          }}
         </template>
       </el-table-column>
       <!-- 退出日期 -->
@@ -168,25 +274,29 @@
         width="160"
       >
         <template slot-scope="scope">
-          {{ scope.row.RemoveTime? moment(scope.row.RemoveTime).format('YYYY-MM-DD'):'' }}
+          {{
+            scope.row.RemoveTime
+              ? moment(scope.row.RemoveTime).format('YYYY-MM-DD')
+              : ''
+          }}
         </template>
       </el-table-column>
       <!-- 授权时间 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="CreateTime"
         :label="$t('trials:staff:table:authorizationTime')"
         show-overflow-tooltip
         sortable
         width="180"
-      />
+      /> -->
       <!-- 禁用时间 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="DeletedTime"
         :label="$t('trials:staff:table:disableTime')"
         show-overflow-tooltip
         sortable
         min-width="60"
-      />
+      /> -->
 
       <el-table-column
         v-if="hasPermi(['trials:trials-panel:setting:personnel-manage:status'])"
@@ -199,38 +309,80 @@
             circle
             :title="$t('trials:staff:action:status')"
             icon="el-icon-edit-outline"
-            :disabled="hasPermi(['role:pm']) && scope.row.UserTypeEnum*1===1"
+            :disabled="
+              !!scope.row.TrialUserRoleList.find(
+                (item) => item.UserTypeEnum === 1
+              )
+            "
             @click="handleStatus(scope.row)"
           />
+          <!---v-if="!scope.row.UserName"-->
+          <el-button
+            v-if="!scope.row.UserName"
+            circle
+            :title="$t('trials:staff:action:email')"
+            icon="el-icon-message"
+            @click="handleSendEmail(scope.row)"
+          />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页组件 -->
-    <div class="pagination" style="text-align:right">
-      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+    <div class="pagination" style="text-align: right">
+      <pagination
+        :total="total"
+        :page.sync="listQuery.PageIndex"
+        :limit.sync="listQuery.PageSize"
+        @pagination="getList"
+      />
     </div>
 
     <!-- 分配参与人员模态框 -->
     <base-model v-if="staff_model.visible" :config="staff_model">
       <template slot="dialog-body">
         <StaffForm v-if="isAdd == 'Add'" @closeDialog="closeDialog" />
-        <StaffExternalForm v-else @closeDialog="closeDialog" @getList="getList" />
+        <StaffExternalForm
+          v-else
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </template>
     </base-model>
 
     <!-- 修改参与者人员状态 -->
     <base-model v-if="status_model.visible" :config="status_model">
       <template slot="dialog-body">
-        <el-form ref="statusForm" :model="statusForm" label-width="110px" size="small" :rules="statusRules">
+        <el-form
+          ref="statusForm"
+          :model="statusForm"
+          label-width="110px"
+          size="small"
+          :rules="statusRules"
+        >
           <!-- Status -->
-          <el-form-item :label="$t('trials:staff:table:status')" prop="isDeleted">
-            <el-radio-group v-model="statusForm.isDeleted" @change="handleIsDeletedChanged">
-              <el-radio v-for="item of $d.IsUserExitTrial" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
+          <el-form-item
+            :label="$t('trials:staff:table:status')"
+            prop="isDeleted"
+          >
+            <el-radio-group
+              v-model="statusForm.isDeleted"
+              @change="handleIsDeletedChanged"
+            >
+              <el-radio
+                v-for="item of $d.IsUserExitTrial"
+                :label="item.value"
+                :key="item.id"
+                >{{ item.label }}</el-radio
+              >
             </el-radio-group>
           </el-form-item>
           <!-- 退出日期 -->
-          <el-form-item v-if="statusForm.isDeleted" :label="$t('trials:staff:table:exitTime')" prop="removeTime">
+          <el-form-item
+            v-if="statusForm.isDeleted"
+            :label="$t('trials:staff:table:exitTime')"
+            prop="removeTime"
+          >
             <el-date-picker
               v-model="statusForm.removeTime"
               type="date"
@@ -240,7 +392,11 @@
             />
           </el-form-item>
           <!-- 加入日期 -->
-          <el-form-item v-else :label="$t('trials:staff:table:joinTime')" prop="joinTime">
+          <el-form-item
+            v-else
+            :label="$t('trials:staff:table:joinTime')"
+            prop="joinTime"
+          >
             <el-date-picker
               v-model="statusForm.joinTime"
               type="date"
@@ -250,21 +406,143 @@
             />
           </el-form-item>
         </el-form>
-
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="status_model.visible = false">
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="status_model.visible = false"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="saveStatus">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="saveStatus"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
     </base-model>
+    <!-- 修改参与者人员角色 -->
+    <base-model v-if="role_model.visible" :config="role_model">
+      <template slot="dialog-body">
+        <el-table :data="roleList" style="width: 100%" max-height="300px">
+          <el-table-column type="index" width="60">
+            <template slot-scope="scope">
+              <span
+                style="
+                  display: flex;
+                  align-items: center;
+                  justify-content: flex-end;
+                "
+              >
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="$t('trials:staff:tip:userTypeSysDisabled')"
+                  placement="top"
+                  style="margin-right: 3px"
+                  v-if="scope.row.IsUserRoleDisabled"
+                >
+                  <i
+                    v-if="scope.row.IsUserRoleDisabled"
+                    class="el-icon-warning icon-i"
+                  ></i>
+                </el-tooltip>
+                <span>{{ scope.$index + 1 }}</span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="UserTypeShortName"
+            :label="
+              $t(
+                'trials:trials-panel:setting:personnel-manage:table:UserTypeShortName'
+              )
+            "
+          />
+          <el-table-column
+            prop="IsDeleted"
+            :label="
+              $t(
+                'trials:trials-panel:setting:personnel-manage:table:IsUserRoleDisabled'
+              )
+            "
+          >
+            <template slot-scope="scope">
+              <span> {{ $fd('IsDisable', scope.row.IsDeleted) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="IsDeleted"
+            :label="
+              $t(
+                'trials:trials-panel:setting:personnel-manage:table:enableTime'
+              )
+            "
+            min-width="120px"
+          >
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.CreateTime }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="IsDeleted"
+            :label="
+              $t(
+                'trials:trials-panel:setting:personnel-manage:table:forbiddenTime'
+              )
+            "
+            min-width="120px"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.IsDeleted">
+                {{ scope.row.UpdateTime }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('common:action:action')"
+            min-width="120px"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                :disabled="scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
+                @click.stop="changeRoleStatus(scope.row, true)"
+              >
+                {{ $fd('IsDisable', true) }}
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                :disabled="!scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
+                @click.stop="changeRoleStatus(scope.row, false)"
+              >
+                {{ $fd('IsDisable', false) }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+    </base-model>
   </div>
 </template>
 <script>
-import { getMaintenanceList, getTrialUserTypeList, updateTrialUser, trialUserListExport } from '@/api/trials'
+import {
+  getMaintenanceList,
+  getTrialUserTypeList,
+  updateTrialUser,
+  trialUserListExport,
+  updateTrialUserRole,
+  trialUserSendJoinEmail,
+} from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import StaffForm from './staffForm'
 import StaffExternalForm from './staffExternalForm'
@@ -278,7 +556,7 @@ const getListQueryDefault = () => {
     OrganizationName: '',
     IsDeleted: null,
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
@@ -290,8 +568,16 @@ export default {
       listQuery: getListQueryDefault(),
       listLoading: false,
       total: 0,
-      staff_model: { visible: false, title: this.$t('trials:staff:dialogTitle:add'), width: '1200px' },
-      status_model: { visible: false, title: this.$t('trials:staff:dialogTitle:status'), width: '500px' },
+      staff_model: {
+        visible: false,
+        title: this.$t('trials:staff:dialogTitle:add'),
+        width: '1200px',
+      },
+      status_model: {
+        visible: false,
+        title: this.$t('trials:staff:dialogTitle:status'),
+        width: '500px',
+      },
       userTypeOptions: [],
       isAdd: 'Add',
       staffStatus: null,
@@ -301,14 +587,33 @@ export default {
       moment,
       statusForm: { isDeleted: false, removeTime: '', joinTime: '' },
       statusRules: {
-        removeTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
-        joinTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        removeTime: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
+        ],
+        joinTime: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
+        ],
       },
       pickerOption: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
-      }
+        },
+      },
+
+      roleList: [],
+      role_model: {
+        visible: false,
+        title: this.$t('trials:staff:dialogTitle:role'),
+        width: '800px',
+      },
     }
   },
   mounted() {
@@ -317,15 +622,75 @@ export default {
     this.getList()
   },
   methods: {
+    // 发送邮件
+    async handleSendEmail(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('trials:staff:confirm:sendEmail')
+        )
+        if (!confirm) return false
+        let data = {
+          TrialId: this.$route.query.trialId,
+          IdentityUserId: row.IdentityUserId,
+          BaseUrl: `${location.protocol}//${location.host}/login`,
+          RouteUrl: `${location.protocol}//${location.host}/email-recompose`,
+        }
+        this.listLoading = true
+        let res = await trialUserSendJoinEmail(data)
+        this.listLoading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('trials:staff:message:sendEmailSuccess')
+          )
+          this.getList()
+        }
+      } catch (err) {
+        this.listLoading = false
+        console.log(err)
+      }
+    },
+    // 修改角色状态
+    async changeRoleStatus(row, status) {
+      try {
+        let message = this.$t('trials:staff:comfirm:changeRoleStatus').replace(
+          'xxx',
+          this.$fd('IsDisable', status)
+        )
+        let comfirm = await this.$confirm(message)
+        if (!comfirm) return false
+        let data = {
+          IdList: [row.Id],
+          IsDeleted: status,
+        }
+        let res = await updateTrialUserRole(data)
+        if (res.IsSuccess) {
+          row.IsDeleted = status
+          this.$message.success(
+            this.$t('trials:trials-myinfo:message:updateSuccessfully')
+          )
+          this.getList()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    openRoleList(row) {
+      this.roleList = row.TrialUserRoleList
+      this.role_model.visible = true
+    },
     // 分页获取项目参与人员列表
     getList() {
       this.listLoading = true
       this.listQuery.TrialId = this.trialId
-      getMaintenanceList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.listLoading = false })
+      getMaintenanceList(this.listQuery)
+        .then((res) => {
+          this.listLoading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     // 新增项目参与者
     handleAdd(type) {
@@ -347,7 +712,7 @@ export default {
     },
     // 修改参与者状态
     saveStatus() {
-      this.$refs.statusForm.validate(valid => {
+      this.$refs.statusForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         const param = {
@@ -355,17 +720,18 @@ export default {
           trialId: this.trialId,
           isDeleted: this.statusForm.isDeleted,
           removeTime: this.statusForm.removeTime,
-          joinTime: this.statusForm.joinTime
+          joinTime: this.statusForm.joinTime,
         }
         updateTrialUser(param)
-          .then(res => {
+          .then((res) => {
             this.btnLoading = false
             if (res.IsSuccess) {
               this.status_model.visible = false
               this.getList()
               this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
-          }).catch(() => {
+          })
+          .catch(() => {
             this.btnLoading = false
           })
       })
@@ -408,39 +774,47 @@ export default {
     handleExport() {
       this.listLoading = true
       this.listQuery.TrialId = this.trialId
-      trialUserListExport({ ...this.listQuery }).then((data) => {
-        this.listLoading = false
-      }).catch(() => { this.listLoading = false })
+      trialUserListExport({ ...this.listQuery })
+        .then((data) => {
+          this.listLoading = false
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     // 获取用户类型下拉数据
     getUserType() {
-      getTrialUserTypeList().then(res => {
+      getTrialUserTypeList().then((res) => {
         this.userTypeOptions = res.Result
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-.participant-list{
-  .filter-box{
+.participant-list {
+  .filter-box {
     display: flex;
     padding: 5px;
-    .base-search-form{
-      .el-form-item{
+    .base-search-form {
+      .el-form-item {
         margin-bottom: 0px;
       }
     }
-    .mr{
+    .mr {
       margin-right: 5px;
-        width: 120px;
+      width: 120px;
     }
   }
-  .el-dialog__header{
-    padding:10px;
+  .el-dialog__header {
+    padding: 10px;
   }
-  .el-dialog__body{
-    padding:10px;
+  .el-dialog__body {
+    padding: 10px;
   }
 }
+.icon-i {
+  color: #e6a23c;
+  cursor: pointer;
+}
 </style>
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d6071671..18dc25d1 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container class="participant-container">
-    <el-header style="height:50px">
+    <el-header style="height: 50px">
       <div class="filter-container">
         <!-- 姓名 -->
         <span>{{ $t('trials:externalStaff:table:name') }}:</span>
@@ -12,19 +12,55 @@
         <span>{{ $t('trials:externalStaff:table:phone') }}:</span>
         <el-input v-model="listQuery.Phone" size="mini" class="mr" clearable />
         <!-- 查询 -->
-        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-search"
+          @click="handleSearch"
+        >
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button size="mini" type="primary" icon="el-icon-refresh-left" @click="handleReset">
+        <el-button
+          size="mini"
+          type="primary"
+          style="margin-right: 10px"
+          icon="el-icon-refresh-left"
+          @click="handleReset"
+        >
           {{ $t('common:button:reset') }}
         </el-button>
+        <!-- 权限配置 -->
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-left: auto"
+          :loading="assignLoadStatus"
+          @click="openPermission"
+        >
+          {{ $t('trials:staff:button:permissionConfiguration') }}
+        </el-button>
         <!-- 发送邮件 -->
-        <el-button type="primary" size="mini" style="margin-left:auto" :disabled="selectArr.length === 0" :loading="assignLoadStatus" icon="el-icon-message" @click="sendEmail">
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-left: 10px"
+          :disabled="selectArr.length === 0"
+          :loading="assignLoadStatus"
+          icon="el-icon-message"
+          @click="sendEmail"
+        >
           {{ $t('trials:staff:button:sendEmail') }}
         </el-button>
         <!-- 添加 -->
-        <el-button type="primary" icon="el-icon-plus" size="mini" style="margin-left:10px" :loading="assignLoadStatus" @click="handleAdd">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          style="margin-left: 10px"
+          :loading="assignLoadStatus"
+          @click="handleAdd"
+        >
           {{ $t('trials:staff:button:addExternalStaff') }}
         </el-button>
       </div>
@@ -53,7 +89,9 @@
             sortable="custom"
             min-width="100"
           >
-            <template slot-scope="scope">{{ scope.row.LastName + ' / ' + scope.row.FirstName }}</template>
+            <template slot-scope="scope">{{
+              scope.row.LastName + ' / ' + scope.row.FirstName
+            }}</template>
           </el-table-column>
           <el-table-column
             prop="UserType"
@@ -63,7 +101,13 @@
             min-width="120"
           >
             <template slot-scope="scope">
-              {{ userTypeOptions.length > 0 ? userTypeOptions.find((v) => { return v.Id == scope.row.UserTypeId }).UserTypeShortName : '' }}
+              {{
+                userTypeOptions.length > 0
+                  ? userTypeOptions.find((v) => {
+                      return v.Id == scope.row.UserTypeId
+                    }).UserTypeShortName
+                  : ''
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -96,9 +140,15 @@
             sortable="custom"
             min-width="120"
           >
-            <template slot-scope="scope">{{ $fd('IsJoin', scope.row.IsJoin) }}</template>
+            <template slot-scope="scope">{{
+              $fd('IsJoin', scope.row.IsJoin)
+            }}</template>
           </el-table-column>
-          <el-table-column :label="$t('common:action:action')" fixed="right" min-width="150">
+          <el-table-column
+            :label="$t('common:action:action')"
+            fixed="right"
+            min-width="150"
+          >
             <template slot-scope="scope">
               <el-button
                 circle
@@ -112,22 +162,103 @@
         </el-table>
       </div>
     </el-main>
-    <StaffExternalAdd ref="StaffExternalAdd" :user-type-options="userTypeOptions" @getList="refeshList" />
+    <StaffExternalAdd
+      ref="StaffExternalAdd"
+      :user-type-options="userTypeOptions"
+      @getList="refeshList"
+    />
+    <base-model v-if="model_config.visible" :config="model_config">
+      <template slot="dialog-body">
+        <el-form
+          :model="permission"
+          :rules="permissionRole"
+          ref="permissionForm"
+          label-width="230px"
+          class="demo-ruleForm"
+        >
+          <el-form-item
+            :label="$t('trials:externalStaff:form:IsSPMJoinReReadingApproval')"
+            prop="IsSPMJoinReReadingApproval"
+          >
+            <el-radio-group v-model="permission.IsSPMJoinReReadingApproval">
+              <el-radio
+                v-for="item in $d.YesOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            :label="$t('trials:externalStaff:form:IsSPMJoinReviewerSelect')"
+            prop="IsSPMJoinReviewerSelect"
+          >
+            <el-radio-group v-model="permission.IsSPMJoinReviewerSelect">
+              <el-radio
+                v-for="item in $d.YesOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            :label="$t('trials:externalStaff:form:IsSPMJoinSiteSurvey')"
+            prop="IsSPMJoinSiteSurvey"
+          >
+            <el-radio-group v-model="permission.IsSPMJoinSiteSurvey">
+              <el-radio
+                v-for="item in $d.YesOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button
+          :disabled="assignLoadStatus"
+          size="small"
+          type="primary"
+          @click="model_config.visible = false"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          :loading="assignLoadStatus"
+          @click="savePermission"
+        >
+          {{ $t('common:button:save') }}
+        </el-button>
+      </template>
+    </base-model>
   </el-container>
 </template>
 <script>
-import { getTrialExternalUserList, addTrialUsers, getUserTypeList, sendExternalUserJoinEmail } from '@/api/trials'
+import {
+  getTrialExternalUserList,
+  addTrialUsers,
+  getUserTypeList,
+  sendExternalUserJoinEmail,
+  getTrialConfigInfo,
+  configTrialSPMInfo,
+} from '@/api/trials'
 import { deleteTrialExternalUser } from '@/api/trials/setting.js'
 import StaffExternalAdd from './staffExternalAdd'
+import BaseModel from '@/components/BaseModel'
 const getListQueryDefault = () => {
   return {
     Phone: '',
     Email: '',
-    Name: ''
+    Name: '',
   }
 }
 export default {
-  components: { StaffExternalAdd },
+  components: { StaffExternalAdd, BaseModel },
   data() {
     return {
       list: [],
@@ -135,10 +266,28 @@ export default {
       listQuery: getListQueryDefault(),
       selectArr: [],
       assignLoadStatus: false,
-      isAdmin: JSON.parse(zzSessionStorage.getItem('IsAdmin')),
+      // isAdmin: JSON.parse(zzSessionStorage.getItem('IsAdmin')),
       userTypeOptions: [],
-      stateList: ['WaitSent', 'HasSend', 'UserConfirmed', 'UserReject', 'OverTime'],
-      trialId: ''
+      stateList: [
+        'WaitSent',
+        'HasSend',
+        'UserConfirmed',
+        'UserReject',
+        'OverTime',
+      ],
+      trialId: '',
+      model_config: {
+        visible: false,
+        title: this.$t('trials:staff:dialogTitle:permissionConfiguration'),
+        width: '500px',
+        appendToBody: true,
+      },
+      permission: {
+        IsSPMJoinReReadingApproval: false,
+        IsSPMJoinReviewerSelect: false,
+        IsSPMJoinSiteSurvey: false,
+      },
+      permissionRole: {},
     }
   },
   mounted() {
@@ -147,6 +296,46 @@ export default {
     this.getList()
   },
   methods: {
+    // 获取权限配置
+    async getPermission() {
+      try {
+        let res = await getTrialConfigInfo(this.trialId)
+        if (res.IsSuccess) {
+          Object.keys(this.permission).forEach((key) => {
+            this.permission[key] = res.Result[key]
+          })
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 打开权限配置弹窗
+    async openPermission() {
+      try {
+        await this.getPermission()
+        this.model_config.visible = true
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 保存权限配置
+    async savePermission() {
+      try {
+        let validate = await this.$refs.permissionForm.validate()
+        if (!validate) return false
+        this.assignLoadStatus = true
+        let data = Object.assign({ Id: this.trialId }, this.permission)
+        let res = await configTrialSPMInfo(data)
+        this.assignLoadStatus = false
+        if (res.IsSuccess) {
+          this.model_config.visible = false
+          this.$message.success(this.$t('common:message:updatedSuccessfully'))
+        }
+      } catch (err) {
+        this.assignLoadStatus = false
+        console.log(err)
+      }
+    },
     refeshList() {
       this.getList()
       this.$emit('getList')
@@ -156,83 +345,108 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['StaffExternalAdd'].openDialog(this.$t('trials:externalStaff:dialogTitle:edit'), row)
+        this.$refs['StaffExternalAdd'].openDialog(
+          this.$t('trials:externalStaff:dialogTitle:edit'),
+          row
+        )
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['StaffExternalAdd'].openDialog(this.$t('trials:externalStaff:dialogTitle:add'), {})
+        this.$refs['StaffExternalAdd'].openDialog(
+          this.$t('trials:externalStaff:dialogTitle:add'),
+          {}
+        )
       })
     },
     deleteTrialExternalUser(row) {
       this.$confirm(this.$t('trials:externalStaff:message:delete'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true
+        deleteTrialExternalUser(row.Id, row.IsSystemUser, row.SystemUserId)
+          .then((res) => {
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+            this.getList()
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
       })
-        .then(() => {
-          this.loading = true
-          deleteTrialExternalUser(row.Id, row.IsSystemUser, row.SystemUserId)
-            .then(res => {
-              this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              this.getList()
-              this.loading = false
-            }).catch(() => { this.loading = false })
-        })
     },
     sendEmail() {
       const loading = this.$loading({
         target: document.querySelector('.participant-table-list'),
         fullscreen: false,
-        lock: true
+        lock: true,
       })
       // var BaseUrl = document.domain + `/#/login`
       var BaseUrl = `${location.protocol}//${location.host}/login`
       var joinUrl = `${location.protocol}//${location.host}/email-recompose`
-      var sendEmailUserArr = this.selectArr.map((v) => { return { Id: v.Id, Email: v.Email, IsSystemUser: v.IsSystemUser, SystemUserId: v.SystemUserId } })
+      var sendEmailUserArr = this.selectArr.map((v) => {
+        return {
+          Id: v.Id,
+          Email: v.Email,
+          IsSystemUser: v.IsSystemUser,
+          SystemUserId: v.SystemUserId,
+          UserTypeId: v.UserTypeId,
+        }
+      })
       sendExternalUserJoinEmail({
         TrialId: this.trialId,
         SendUsers: sendEmailUserArr,
         BaseUrl: BaseUrl,
-        RouteUrl: joinUrl
-      }).then(() => {
-        loading.close()
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.getList()
-        this.$emit('getList')
-      }).catch(() => { loading.close() })
+        RouteUrl: joinUrl,
+      })
+        .then(() => {
+          loading.close()
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.getList()
+          this.$emit('getList')
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     getList() {
       const loading = this.$loading({
         target: document.querySelector('.participant-table-list'),
         fullscreen: false,
-        lock: true
+        lock: true,
       })
       this.listQuery.TrialId = this.trialId
-      getTrialExternalUserList(this.listQuery).then(res => {
-        loading.close()
-        this.list = res.Result
-      }).catch(() => { loading.close() })
+      getTrialExternalUserList(this.listQuery)
+        .then((res) => {
+          loading.close()
+          this.list = res.Result
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     handleAssign() {
       this.$confirm(this.$t('trials:externalStaff:message:add'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       }).then(() => {
         const loading = this.$loading({
           target: document.querySelector('.participant-table-list'),
           fullscreen: false,
-          lock: true
+          lock: true,
         })
         this.assignLoadStatus = true
         addTrialUsers(this.selectArr)
-          .then(res => {
+          .then((res) => {
             this.assignLoadStatus = false
             loading.close()
             if (res.IsSuccess) {
               this.$emit('closeDialog')
               this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
-          }).catch(() => {
+          })
+          .catch(() => {
             loading.close()
             this.assignLoadStatus = false
           })
@@ -267,35 +481,36 @@ export default {
       }
     },
     getUserType() {
-      getUserTypeList(1).then(res => {
+      getUserTypeList(1).then((res) => {
         this.userTypeOptions = res.Result
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-  .participant-container{
-    height: 100%;
-    .el-header{
-      .filter-container{
-        display: flex;
-        align-items: center;
-        span{
-          font-size:13px;
-          margin-right:5px;
-        }
-        .mr{
-          margin-right: 5px;
-          width: 120px;
-        }
+.participant-container {
+  height: 100%;
+  .el-header {
+    padding-right: 5px;
+    .filter-container {
+      display: flex;
+      align-items: center;
+      span {
+        font-size: 13px;
+        margin-right: 5px;
+      }
+      .mr {
+        margin-right: 5px;
+        width: 120px;
       }
     }
-    .el-main{
-      padding: 0px;
-    }
-    .el-footer{
-      padding: 0 20px;
-    }
   }
+  .el-main {
+    padding: 0px;
+  }
+  .el-footer {
+    padding: 0 20px;
+  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
index e8f8c19a..0e9645b9 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
@@ -1,19 +1,39 @@
 <template>
   <el-container class="participant-container">
-    <el-header style="height:50px">
+    <el-header style="height: 50px">
       <div class="filter-container">
         <!-- 姓名 -->
         <span>{{ $t('trials:staff:table:name') }}:</span>
-        <el-input v-model="listQuery.UserRealName" size="mini" class="mr" clearable />
+        <el-input
+          v-model="listQuery.UserRealName"
+          size="mini"
+          class="mr"
+          clearable
+        />
         <!-- 用户名 -->
         <span>{{ $t('trials:staff:table:uid') }}:</span>
-        <el-input v-model="listQuery.UserName" size="mini" class="mr" clearable />
+        <el-input
+          v-model="listQuery.UserName"
+          size="mini"
+          class="mr"
+          clearable
+        />
         <!-- 单位 -->
         <span>{{ $t('trials:staff:table:organization') }}:</span>
-        <el-input v-model="listQuery.OrganizationName" size="mini" class="mr" clearable />
+        <el-input
+          v-model="listQuery.OrganizationName"
+          size="mini"
+          class="mr"
+          clearable
+        />
         <!-- 用户类型 -->
         <span>{{ $t('trials:staff:table:userType') }}:</span>
-        <el-select v-model="listQuery.UserTypeEnum" size="mini" clearable class="mr">
+        <el-select
+          v-model="listQuery.UserTypeEnum"
+          size="mini"
+          clearable
+          class="mr"
+        >
           <el-option
             v-for="item of userTypeOptions"
             :key="item.Id"
@@ -24,15 +44,33 @@
           </el-option>
         </el-select>
         <!-- 查询 -->
-        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-search"
+          @click="handleSearch"
+        >
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button size="mini" type="primary" icon="el-icon-refresh-left" @click="handleReset">
+        <el-button
+          size="mini"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="handleReset"
+        >
           {{ $t('common:button:reset') }}
         </el-button>
 
-        <el-button type="primary" size="mini" style="margin-left:auto" :disabled="selectArr.length === 0" :loading="assignLoadStatus" icon="el-icon-plus" @click="handleAssign">
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-left: auto"
+          :disabled="selectArr.length === 0"
+          :loading="assignLoadStatus"
+          icon="el-icon-plus"
+          @click="handleAssign"
+        >
           {{ $t('common:button:add') }}
         </el-button>
       </div>
@@ -55,7 +93,7 @@
           <el-table-column type="index" width="50" />
           <!-- 姓名 -->
           <el-table-column
-            prop="UserRealName"
+            prop="FullName"
             :label="$t('trials:staff:table:name')"
             show-overflow-tooltip
             sortable="custom"
@@ -95,23 +133,31 @@
           />
           <!-- 用户类型 -->
           <el-table-column
-            prop="UserType"
+            prop="UserTypeShortName"
             :label="$t('trials:staff:table:userType')"
             show-overflow-tooltip
             sortable="custom"
             min-width="100"
           />
-
         </el-table>
       </div>
     </el-main>
-    <div class="pagination" style="text-align: right;margin-top:5px;">
-      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+    <div class="pagination" style="text-align: right; margin-top: 5px">
+      <pagination
+        :total="total"
+        :page.sync="listQuery.PageIndex"
+        :limit.sync="listQuery.PageSize"
+        @pagination="getList"
+      />
     </div>
   </el-container>
 </template>
 <script>
-import { getTrialUserScreeningList, addTrialUsers, getUserTypeList } from '@/api/trials'
+import {
+  getTrialUserScreeningList,
+  addTrialUsers,
+  getUserTypeList,
+} from '@/api/trials'
 import Pagination from '@/components/Pagination'
 const getListQueryDefault = () => {
   return {
@@ -120,7 +166,7 @@ const getListQueryDefault = () => {
     OrganizationName: '',
     UserTypeEnum: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
@@ -132,9 +178,9 @@ export default {
       listQuery: getListQueryDefault(),
       selectArr: [],
       assignLoadStatus: false,
-      isAdmin: JSON.parse(zzSessionStorage.getItem('IsAdmin')),
+      // isAdmin: JSON.parse(zzSessionStorage.getItem('IsAdmin')),
       userTypeOptions: [],
-      trialId: ''
+      trialId: '',
     }
   },
   mounted() {
@@ -147,40 +193,45 @@ export default {
       const loading = this.$loading({
         target: document.querySelector('.participant-table-list'),
         fullscreen: false,
-        lock: true
+        lock: true,
       })
       this.listQuery.TrialId = this.trialId
-      getTrialUserScreeningList(this.listQuery).then(res => {
-        loading.close()
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { loading.close() })
+      this.listQuery.IsUserRoleDisabled = false
+      getTrialUserScreeningList(this.listQuery)
+        .then((res) => {
+          loading.close()
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     handleAssign() {
       this.$confirm(this.$t('trials:staff:message:addStaff'), {
         type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          const loading = this.$loading({
-            target: document.querySelector('.participant-table-list'),
-            fullscreen: false,
-            lock: true
-          })
-          this.assignLoadStatus = true
-          addTrialUsers(this.selectArr)
-            .then(res => {
-              this.assignLoadStatus = false
-              loading.close()
-              if (res.IsSuccess) {
-                this.$emit('closeDialog')
-                this.$message.success(this.$t('common:message:addedSuccessfully'))
-              }
-            }).catch(() => {
-              loading.close()
-              this.assignLoadStatus = false
-            })
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        const loading = this.$loading({
+          target: document.querySelector('.participant-table-list'),
+          fullscreen: false,
+          lock: true,
         })
+        this.assignLoadStatus = true
+        addTrialUsers(this.selectArr)
+          .then((res) => {
+            this.assignLoadStatus = false
+            loading.close()
+            if (res.IsSuccess) {
+              this.$emit('closeDialog')
+              this.$message.success(this.$t('common:message:addedSuccessfully'))
+            }
+          })
+          .catch(() => {
+            loading.close()
+            this.assignLoadStatus = false
+          })
+      })
     },
     handleSearch() {
       this.listQuery.PageIndex = 1
@@ -211,34 +262,34 @@ export default {
       }
     },
     getUserType() {
-      getUserTypeList(2).then(res => {
+      getUserTypeList(2).then((res) => {
         this.userTypeOptions = res.Result
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.participant-container{
+.participant-container {
   height: 100%;
-  .el-header{
-    .filter-container{
+  .el-header {
+    .filter-container {
       display: flex;
       align-items: center;
-      span{
-        font-size:13px;
-        margin-right:5px;
+      span {
+        font-size: 13px;
+        margin-right: 5px;
       }
-      .mr{
+      .mr {
         margin-right: 5px;
         width: 120px;
       }
     }
   }
-  .el-main{
+  .el-main {
     padding: 0px;
   }
-  .el-footer{
+  .el-footer {
     padding: 0 20px;
   }
 }
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index a0d8800e..65f82fef 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -4,7 +4,7 @@
     <div class="search">
       <el-form :inline="true" class="base-search-form">
         <!-- 审核问题 -->
-        <el-form-item :label="$t('trials:qcCfg:table:questionName')" style="margin-top: 10px">
+        <el-form-item :label="$t('trials:qcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <!-- 语言类型 -->
@@ -26,22 +26,22 @@
 <!--          </el-select>-->
 <!--        </el-form-item>-->
         <!-- 类型 -->
-        <el-form-item :label="$t('trials:qcCfg:table:type')" style="margin-top: 10px">
+        <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-select v-model="searchData.Type" clearable style="width:120px;">
             <el-option v-for="item of $d.QcType" :key="item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:qcCfg:table:isEnable')" style="margin-top: 10px">
+        <el-form-item :label="$t('trials:qcCfg:table:isEnable')">
           <el-select v-model="searchData.IsEnable" clearable style="width:120px;">
             <el-option v-for="item of $d.YesOrNo" :key="item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:qcCfg:table:isRequired')" style="margin-top: 10px">
+        <el-form-item :label="$t('trials:qcCfg:table:isRequired')">
           <el-select v-model="searchData.IsRequired" clearable style="width:120px;">
             <el-option v-for="item of $d.YesOrNo" :key="`IsRequired${item.label}`" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        <el-form-item style="margin-top: 10px">
+        <el-form-item >
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
index 75a91c56..8611acdd 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
@@ -72,12 +72,10 @@
                   "
                   :label="item.value"
                   v-if="
-                    (JudgyInfo.ArbitrationRule === 1 &&
-                      (item.value < 4 ||
-                        (item.value > 3 &&
-                          (QuestionList[index].Type === 'number' ||
-                            QuestionList[index].Type === 'calculation')))) ||
-                    (JudgyInfo.ArbitrationRule === 2 && item.value < 4)
+                    item.value < 4 ||
+                    (item.value > 3 &&
+                      (QuestionList[index].Type === 'number' ||
+                        QuestionList[index].Type === 'calculation'))
                   "
                 >
                   {{ item.label }}
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index d78a361c..8e1c269b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -232,7 +232,7 @@
         </el-radio-group>
       </el-form-item>
       <!-- 导出标识 -->
-      <el-form-item 
+      <!-- <el-form-item 
         :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
         v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
       >
@@ -251,9 +251,12 @@
             >{{ item.label }}
           </el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <!-- 导出结果 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+      <el-form-item 
+        :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+        v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+      >
         <el-select v-model="form.ExportResult" multiple>
           <el-option
             v-for="item in $d.ExportResult"
@@ -1064,7 +1067,7 @@ export default {
         ClassifyAlgorithms: null,
         LimitShow: 0,
         HighlightAnswerList: [],
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         ClassifyType: null,
         ClassifyEditType: null,
@@ -1093,12 +1096,12 @@ export default {
         }],
         GroupName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
           {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
-        ExportIdentification: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ],
-        ExportResult: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ]
+        // ExportIdentification: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ],
+        // ExportResult: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ]
       },
       loading: false,
       dicList: [],
@@ -1543,7 +1546,7 @@ export default {
       form.ClassifyQuestionId = null
       form.ClassifyAlgorithms = null
       form.HighlightAnswerList = []
-      form.ExportIdentification = 0
+      // form.ExportIdentification = 0
       form.ExportResult = []
       form.ClassifyType = null
       form.ClassifyShowType = null
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 04dd00e2..a7b08f52 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -19,7 +19,7 @@
           >
             <template v-for="item of $d.Criterion_Question_Type">
               <el-option
-                v-if="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group'"
+                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group'"
                 :key="item.value"
                 :value="item.value"
                 :label="item.label"
@@ -114,9 +114,9 @@
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
             <el-option
               v-for="item of parentTriggerValOptions"
-              :key="item"
-              :label="item"
-              :value="item"
+              :key="item.id"
+              :label="item.label"
+              :value="String(item.value)"
             />
           </el-select>
         </el-form-item>
@@ -148,14 +148,14 @@
           <el-select v-model="form.RelevanceValueList" clearable multiple>
             <el-option
               v-for="item of reParentTriggerValOptions"
-              :key="item"
-              :label="item"
-              :value="item"
+              :key="item.id"
+              :label="item.label"
+              :value="String(item.value)"
             />
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
-        <el-form-item 
+        <!-- <el-form-item 
           :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -174,9 +174,12 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in $d.ExportResult"
@@ -887,7 +890,7 @@ export default {
         MaxAnswerLength: null,
         ClassifyTableQuestionId: null,
         ClassifyAlgorithms: null,
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         ImageCount: 0,
         ClassifyType: null,
@@ -917,12 +920,12 @@ export default {
         DataTableName: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         DataTableColumn: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         DependParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        ExportIdentification: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ],
-        ExportResult: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ]
+        // ExportIdentification: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ],
+        // ExportResult: [
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        // ]
       },
       loading: false,
       parentOptions: [],
@@ -964,6 +967,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$d.Criterion_Question_Type)
     this.validateTypeVal = (rule, value, callback) => {
       if (value === '' && this.form.Type !== 'number') {
         callback(new Error(this.$t('common:ruleMessage:specify')))
@@ -1127,7 +1131,22 @@ export default {
             return item.QuestionId === this.form.ParentId
           })
           if (index !== -1) {
-            this.parentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
+            if (this.parentOptions[index].QuestionGenre === 3) {
+              // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              let dicCode = this.parentOptions[index].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              
+              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
+            } else {
+              const options = []
+              this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
+                options.push({ id: index, label: item, value: item })
+              })
+              this.parentTriggerValOptions = options
+            }
+            
           }
         }
         if (this.form.RelevanceId) {
@@ -1135,7 +1154,21 @@ export default {
             return item.QuestionId === this.form.RelevanceId
           })
           if (i !== -1) {
-            this.reParentTriggerValOptions = this.parentOptions[i].TypeValue.split('|')
+            // this.reParentTriggerValOptions = this.parentOptions[i].TypeValue.split('|')
+            if (this.parentOptions[i].QuestionGenre === 3) {
+              // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode] 
+              let dicCode = this.parentOptions[i].DictionaryCode
+              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              })
+            } else {
+              const options = []
+              this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
+                options.push({ id: i, label: item, value: item })
+              })
+              this.reParentTriggerValOptions = options
+            }
           }
         }
       }
@@ -1231,24 +1264,53 @@ export default {
         form.RelevanceValueList = []
       }
     },
-    parentQuestionChange(val, form) {
+    async parentQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
         if (index !== -1) {
-          this.parentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
+           if (this.parentOptions[index].QuestionGenre === 3) {
+            // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            
+            this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            })
+          } else { 
+            const options = []
+            this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
+              options.push({ id: index, label: item, value: item })
+            })
+            this.parentTriggerValOptions = options
+          }
         }
       }
       form.ParentTriggerValueList = []
     },
-    relevanceQuestionChange(val, form) {
+    async relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
         if (index !== -1) {
-          this.reParentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
+          // this.reParentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
+          if (this.parentOptions[index].QuestionGenre === 3) {
+            // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            let dicCode = this.parentOptions[index].DictionaryCode
+            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            })
+          } else {
+            const options = []
+            this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
+              options.push({ id: index, label: item, value: item })
+            })
+            this.reParentTriggerValOptions = options
+          }
         }
       }
       form.RelevanceValueList = []
@@ -1305,7 +1367,7 @@ export default {
       form.HighlightAnswerList = []
       form.ClassifyTableQuestionId = null
       form.ClassifyAlgorithms = null
-      form.ExportIdentification = 0
+      // form.ExportIdentification = 0
       form.ExportResult = []
       form.ImageCount = 0
       form.ClassifyType = null
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 157f44d3..37190fe6 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -8,14 +8,14 @@
             :label="item.TrialReadingCriterionName"
             :name="item.TrialReadingCriterionId"
           >
-            <div style="text-align: right; padding-bottom: 10px">
+            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin'])">
               <!-- 同步当前标准 -->
               <el-button
                 type="primary"
                 icon="el-icon-refresh-left"
                 :loading="loading"
                 size="mini"
-                v-if="!hasPermi(['role:admin'])"
+                
                 @click="syncSign"
               >
                 {{ $t("trials:readingUnit:button:sync") }}
@@ -525,6 +525,9 @@ export default {
     background: #e5ecef;
     padding-left: 10px;
   }
+  /deep/ .el-tabs--border-card>.el-tabs__content {
+    padding: 0px 15px;
+  }
   /deep/ .el-collapse-item__content {
     padding: 10px;
   }
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index e5864f83..e7c35e00 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -632,10 +632,10 @@
       :close-on-click-modal="false"
       :title="$t('trials:logincCfg:form:modality')"
       custom-class="base-dialog-wrapper"
-      width="900px"
+      width="400px"
     >
-      <div class="base-dialog-body" style="height: 400px; text-align: center">
-        <el-transfer
+      <div class="base-dialog-body">
+        <!-- <el-transfer
           filterable
           :filter-method="filterMethod"
           filter-placeholder=""
@@ -651,8 +651,8 @@
           }"
           :render-content="renderFunc"
         >
-        </el-transfer>
-        <!-- <el-table
+        </el-transfer> -->
+        <el-table
           ref="multipleTable"
           :data="$d.Modality"
           stripe
@@ -671,7 +671,7 @@
             prop="value"
             :label="$t('trials:logincCfg:form:modality')"
           />
-        </el-table> -->
+        </el-table>
       </div>
       <div
         class="base-dialog-footer"
@@ -959,7 +959,8 @@ export default {
     handleConfirmModality() {
       this.form.ModalityList = Object.assign(
         [],
-        this.selectedList.map((v) => v)
+        // this.selectedList.map((v) => v)
+        this.selectedList.map((v) => v.value)
       )
       let Modalitys = this.form.ModalityList.map((item) => {
         return this.$fd('Modality', item.trim())
@@ -984,12 +985,20 @@ export default {
     },
     handleSetModality() {
       this.modalityListVisible = true
-      var a = this.$d.Modality.filter((v) => {
-        return !!this.form.ModalityList.find((v1) => {
-          return v1 === v.value
+      this.$nextTick(() => {
+        var a = this.$d.Modality.filter((v) => {
+          return !!this.form.ModalityList.find((v1) => {
+            return v1 === v.value
+          })
         })
+        this.toggleSelection(a)
       })
-      this.selectedList = a.map((item) => item.value)
+      // var a = this.$d.Modality.filter((v) => {
+      //   return !!this.form.ModalityList.find((v1) => {
+      //     return v1 === v.value
+      //   })
+      // })
+      // this.selectedList = a.map((item) => item.value)
     },
     handleBodyPartSelectionChange(val) {
       this.selectedBodyParts = val
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 007e6450..b1fff910 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -121,6 +121,24 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 采集影像 -->
+      <el-form-item
+        :label="$t('trials:processCfg:form:CollectImagesEnum')"
+        prop="CollectImagesEnum"
+      >
+        <el-radio-group
+          v-model="form.CollectImagesEnum"
+          :disabled="form.IsTrialProcessConfirmed && !isEdit"
+        >
+          <el-radio
+            v-for="item of $d.CollectImagesType"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <!-- 修约小数位数 -->
       <!-- <el-form-item
         :label="$t('trials:processCfg:form:digitPlaces')"
@@ -753,6 +771,7 @@
               <el-button
                 v-if="scope.row.FileName && scope.row.ClinicalUploadType"
                 circle
+                :title="$t('common:button:download')"
                 icon="el-icon-download"
                 @click="handleDownloadTpl(scope.row)"
               >
@@ -760,6 +779,7 @@
               <el-button
                 v-if="scope.row.FileName && !scope.row.ClinicalUploadType"
                 circle
+                :title="$t('common:button:preview')"
                 icon="el-icon-view"
                 @click="handlePreviewTpl(scope.row)"
               >
@@ -767,6 +787,7 @@
               <el-button
                 v-if="scope.row.ClinicalUploadType === 2"
                 circle
+                :title="$t('common:button:preview')"
                 icon="el-icon-view"
                 @click="handlePreview(scope.row)"
               >
@@ -1157,6 +1178,7 @@ export default {
         ClinicalDataTrialSetIds: [],
         ClinicalDataSetNamesStr: '',
         QCProcessEnum: null,
+        CollectImagesEnum: null,
         IsImageConsistencyVerification: null,
         ReadingMode: null,
         // ImagePlatform: null,
@@ -1189,6 +1211,13 @@ export default {
             trigger: 'blur',
           },
         ],
+        CollectImagesEnum: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         QCProcessEnum: [
           {
             required: true,
@@ -1455,6 +1484,14 @@ export default {
             this.initialForm.IsImageConsistencyVerification
           ),
         },
+        {
+          Name: this.$t('trials:processCfg:form:CollectImagesEnum'), // 采集影像
+          NewVal: this.$fd('CollectImagesType', this.form.CollectImagesEnum),
+          OldVal: this.$fd(
+            'CollectImagesType',
+            this.initialForm.CollectImagesEnum
+          ),
+        },
         // {
         //   Name: this.$t('trials:processCfg:form:criterion'), // 阅片标准
         //   NewVal: criterions.length > 0 ? criterions.join(', ') : '',
diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue
index eda57c3b..bf9e1e62 100644
--- a/src/views/trials/trials-panel/site/index.vue
+++ b/src/views/trials/trials-panel/site/index.vue
@@ -29,7 +29,7 @@
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -37,7 +37,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -83,7 +83,18 @@
           :label="$t('trials:site:table:subjects')"
           show-overflow-tooltip
           sortable="custom"
-        />
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.SubjectCount > 0 && hasSubjectRoute"
+              type="text"
+              @click="jumpToSubjectList(scope.row.TrialSiteId)"
+            >
+              {{ scope.row.SubjectCount }}
+            </el-button>
+            <span v-else> {{ scope.row.SubjectCount }}</span>
+          </template>
+        </el-table-column>
         <!-- Visits -->
         <el-table-column
           prop="VisitCount"
@@ -91,25 +102,31 @@
           :label="$t('trials:site:table:visits')"
           show-overflow-tooltip
           sortable="custom"
-        />
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.VisitCount > 0 && hasVisitRoute"
+              type="text"
+              @click="jumpToVisitList(scope.row.TrialSiteId)"
+            >
+              {{ scope.row.VisitCount }}
+            </el-button>
+            <span v-else> {{ scope.row.VisitCount }}</span>
+          </template>
+        </el-table-column>
         <!-- Staff -->
         <el-table-column
           prop="UserCount"
           min-width="150"
           :label="$t('trials:site:table:staff')"
           show-overflow-tooltip
-          sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.UserCount > 0"
-              type="text"
-              @click="getStaffList(scope.row)"
-            >
+            <el-button type="text" @click="getStaffList(scope.row)">
               {{
                 scope.row.UserNameList.length > 0
-                  ? scope.row.UserNameList.join(", ")
-                  : ""
+                  ? scope.row.UserNameList.join(', ')
+                  : ''
               }}
             </el-button>
           </template>
@@ -129,7 +146,7 @@
         <el-table v-loading="userListLoading" :data="userList" height="400">
           <!-- Name -->
           <el-table-column
-            prop="UserRealName"
+            prop="FullName"
             :label="$t('trials:site:table:name')"
             width="150"
           />
@@ -164,10 +181,10 @@
           >
             <template slot-scope="scope">
               <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-                $fd("IsUserExitTrial", scope.row.IsDeleted)
+                $fd('IsUserExitTrial', scope.row.IsDeleted)
               }}</el-tag>
               <el-tag v-else>{{
-                $fd("IsUserExitTrial", scope.row.IsDeleted)
+                $fd('IsUserExitTrial', scope.row.IsDeleted)
               }}</el-tag>
             </template>
           </el-table-column>
@@ -193,23 +210,23 @@
   </BaseContainer>
 </template>
 <script>
-import { getSiteCRCList, getTrialSiteCRCList } from "@/api/trials";
-import BaseContainer from "@/components/BaseContainer";
-import BaseModel from "@/components/BaseModel";
-import Pagination from "@/components/Pagination";
+import { getSiteCRCList, getTrialSiteCRCList } from '@/api/trials'
+import BaseContainer from '@/components/BaseContainer'
+import BaseModel from '@/components/BaseModel'
+import Pagination from '@/components/Pagination'
 const searchDataDefault = () => {
   return {
-    UserRealName: "",
-    SiteName: "",
-    SortField: "TrialSiteCode",
+    UserRealName: '',
+    SiteName: '',
+    SortField: 'TrialSiteCode',
     Asc: true,
     PageIndex: 1,
     PageSize: 20,
     TrialSiteCode: null,
-  };
-};
+  }
+}
 export default {
-  name: "SiteList",
+  name: 'SiteList',
   components: { BaseContainer, BaseModel, Pagination },
   data() {
     return {
@@ -219,65 +236,90 @@ export default {
       loading: false,
       crc_model: {
         visible: false,
-        title: this.$t("trials:site:dialogTitle:staff"),
-        width: "60%",
+        title: this.$t('trials:site:dialogTitle:staff'),
+        width: '60%',
       },
-      userListLoading: "",
+      userListLoading: '',
       userList: [],
-      trialId: "",
-    };
+      trialId: '',
+      hasSubjectRoute: false,
+      hasVisitRoute: false
+    }
   },
   mounted() {
-    this.trialId = this.$route.query.trialId;
-
-    this.getList();
+    this.trialId = this.$route.query.trialId
+    const trialsRouter = this.$store.getters.routes.find(r => { return r.name === 'Trials' })
+    const trialsPanelRouter = trialsRouter.children.find(r => { return r.name === 'TrialsPanel' }).children
+    this.hasSubjectRoute = this.hasRoute('subject-list', trialsPanelRouter)
+    this.hasVisitRoute = this.hasRoute('crc-upload', trialsPanelRouter)
+    this.getList()
   },
   methods: {
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       getSiteCRCList(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
+        })
     },
     getStaffList(row) {
-      this.currentRow = { ...row };
-      this.crc_model.visible = true;
-      this.userListLoading = true;
+      this.currentRow = { ...row }
+      this.crc_model.visible = true
+      this.userListLoading = true
       getTrialSiteCRCList(this.trialId, this.currentRow.TrialSiteId)
         .then((res) => {
-          this.userListLoading = false;
-          this.userList = res.Result;
+          this.userListLoading = false
+          this.userList = res.Result
         })
         .catch(() => {
-          this.userListLoading = false;
-        });
+          this.userListLoading = false
+        })
     },
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
+    jumpToSubjectList(trialSiteId) {
+      this.$router.push({ path: `/trials/trials-panel/subject/subject-list?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&trialSiteId=${trialSiteId}` })
+    },
+    jumpToVisitList(trialSiteId) {
+      this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&trialSiteId=${trialSiteId}` })
+    },
+    hasRoute(name, routeList) {
+      for (let i = 0; i < routeList.length; i++) {
+        if (routeList[i].name === name) {
+          return true
+        }
+        if (routeList[i].children) {
+          const flag = this.hasRoute(name, routeList[i].children)
+          if (flag) {
+            return flag
+          }
+        }
+      }
+      return false
+    }
   },
-};
+}
 </script>
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 08091218..5b1605f0 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <BaseContainer>
+  <BaseContainer class="reading-period">
     <el-tabs v-model="TrialReadingCriterionId" type="border-card">
       <el-tab-pane v-for="criterion of trialCriterionList" :key="criterion.TrialReadingCriterionId" :label="criterion.TrialReadingCriterionName" :name="criterion.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === criterion.TrialReadingCriterionId">
@@ -217,10 +217,9 @@
                 </el-table-column>
               </el-table-column>
               <el-table-column
-                v-if="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])"
-                fixed="right"
-                :label="$t('common:action:action')"
-                width="150"
+                :fixed="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) ? 'right':false"
+                :label="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) ? $t('common:action:action') : ''"
+                :width="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) ? '150px' : '80px' "
               >
                 <template slot-scope="scope">
                   <el-button
@@ -577,6 +576,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+  .reading-period{
+    /deep/.search {
+      padding: 0px !important;
+    }
+  }
   /deep/ .hidden-row{
     display: none;
   }
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 8da20979..dce76874 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -291,6 +291,7 @@ import SubjectsForm from './components/SubjectsForm'
 import SubjectStatusForm from './components/SubjectStatusForm'
 import MessageTable from './components/MessageTable'
 import moment from 'moment'
+import { changeURLStatic } from '@/utils/history.js'
 const searchDataDefault = () => {
   return {
     Code: '',
@@ -339,6 +340,10 @@ export default {
     this.hasCrcRoute = this.hasRoute('crc-upload', trialsPanelRouter)
     this.hasQCRoute = this.hasRoute('qc-check', trialsPanelRouter)
     this.trialId = this.$route.query.trialId
+    if (this.$route.query.trialSiteId) {
+      this.searchData.TrialSiteId = this.$route.query.trialSiteId
+      changeURLStatic('trialSiteId', '')
+    }
     this.getSite()
     this.getList()
   },
@@ -441,7 +446,7 @@ export default {
     // 关闭状态编辑框
     closeStatusDialog() {
       this.statusVisible = false
-    },
+    }, 
     handleTotalVisitCount(subjectCode) {
       if (this.hasCrcRoute) {
         this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}` })
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 1544454b..cdedeb41 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -62,13 +62,13 @@
         <div>
           <!-- 功能模块 -->
           <el-form-item :label="$t('trials:auditRecord:table:funcModule')">
-            <el-select v-model="searchData.ModuleType" style="width:120px"  clearable @change="getModuleTypeDescriptionList">
+            <el-select v-model="searchData.ModuleType" style="width:120px" filterable   clearable @change="getModuleTypeDescriptionList">
               <el-option v-for="item of $d.ModuleType" :value="item.id" :label="item.label" :key="`ModuleType${item.value}`"/>
             </el-select>
           </el-form-item>
           <!-- 操作名 -->
           <el-form-item :label="$t('trials:auditRecord:table:operationName')">
-            <el-select v-model="searchData.Description" style="width:120px"  clearable>
+            <el-select v-model="searchData.Description" style="width:120px" filterable   clearable>
               <el-option v-for="item of DescriptionOptions" :value="item" :label="item" :key="item"/>
             </el-select>
           </el-form-item>
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index 4888773d..749ae21b 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -86,7 +86,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -94,7 +94,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -118,7 +118,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd("UserOptType", scope.row.OptType) }}
+            {{ $fd('UserOptType', scope.row.OptType) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -135,22 +135,29 @@
           show-overflow-tooltip
           sortable="custom"
         /> -->
-        <el-table-column
+        <!-- <el-table-column
           v-if="!isMine"
           :label="$t('trials:loginLog:table:incorrectUserName')"
           prop="LoginFaildName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('trials:loginLog:table:userName')"
-          prop="LoginUserName"
+          prop="ActionUserName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
+          :label="$t('trials:loginLog:table:Aetionlserlype')"
+          prop="ActionUserType"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- <el-table-column
           :label="$t('trials:loginLog:table:userType')"
           prop="LoginUserTypeEnum"
           min-width="90"
@@ -158,18 +165,18 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd("UserType", scope.row.LoginUserTypeEnum) }}
+            {{ $fd('UserType', scope.row.LoginUserTypeEnum) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           v-if="!isMine"
           :label="$t('trials:loginLog:table:optUserName')"
-          prop="OptUserName"
-          min-width="160"
+          prop="TargetIdentityUserName"
+          min-width="120"
           show-overflow-tooltip
           sortable="custom"
         />
-        <el-table-column
+        <!-- <el-table-column
           v-if="!isMine"
           :label="$t('trials:loginLog:table:optUserType')"
           prop="OptUserTypeEnum"
@@ -178,7 +185,22 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd("UserType", scope.row.OptUserTypeEnum) }}
+            {{ $fd('UserType', scope.row.OptUserTypeEnum) }}
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          :label="$t('trials:loginLog:table:detail')"
+          min-width="80"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.JsonObj"
+              type="text"
+              @click="handleOpenDialog(scope.row)"
+            >
+              <span>{{ $t('trials:loginLog:message:detail') }}</span>
+            </el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -198,32 +220,34 @@
         @pagination="getList"
       />
     </template>
+    <detail :config="config" :JsonObj="JsonObj" />
   </BaseContainer>
 </template>
 <script>
-import { getUserLogList, getTrialUserList } from "@/api/user";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
+import { getUserLogList, getTrialUserList } from '@/api/user'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import moment from 'moment'
+import detail from '@/views/system/login-log/detail.vue'
 const searchDataDefault = () => {
   return {
-    TrialId: "",
+    TrialId: '',
     OptType: null,
-    Ip: "",
-    LoginFaildName: "",
-    LoginUserName: "",
+    Ip: '',
+    LoginFaildName: '',
+    LoginUserName: '',
     LoginUserTypeEnum: null,
-    BeginDate: "",
-    EndDate: "",
+    BeginDate: '',
+    EndDate: '',
     Asc: false,
-    SortField: "CreateTime",
+    SortField: 'CreateTime',
     PageIndex: 1,
     PageSize: 20,
-    UserId: "",
-  };
-};
+    UserId: '',
+  }
+}
 export default {
-  components: { BaseContainer, Pagination },
+  components: { BaseContainer, Pagination, detail },
   props: {
     isMine: {
       type: Boolean,
@@ -231,7 +255,7 @@ export default {
     },
     id: {
       type: String,
-      default: "",
+      default: '',
     },
   },
   data() {
@@ -243,75 +267,92 @@ export default {
       loading: false,
       datetimerange: [],
       trialUserList: [],
-    };
+      config: {
+        visible: false,
+        title: this.$t('trials:loginLog:dialog:title'),
+        width: '500px',
+        top: '10vh',
+      },
+      JsonObj: null,
+    }
   },
   mounted() {
     if (!this.isMine) {
-      this.getTrialUserList();
+      this.getTrialUserList()
     }
-    this.getList();
+    this.getList()
   },
   methods: {
+    handleOpenDialog(row) {
+      if (!row.JsonObj)
+        return this.$message.warning(this.$t('trials:loginLog:message:noJSON'))
+      this.config.title = this.$t('trials:loginLog:dialog:title').replace(
+        'xxx',
+        this.$fd('UserOptType', row.OptType)
+      )
+      this.JsonObj = row.JsonObj
+      this.config.visible = true
+    },
     // 获取登录用户
     async getTrialUserList() {
       try {
         let params = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getTrialUserList(params);
+        }
+        let res = await getTrialUserList(params)
         if (res.IsSuccess) {
-          this.trialUserList = res.Result;
+          this.trialUserList = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.$route.query.trialId
       if (this.isMine) {
-        this.searchData.UserId = this.id;
+        this.searchData.IdentityUserId = this.id
       }
       getUserLogList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.BeginDate = val[0];
-        this.searchData.EndDate = val[1];
+        this.searchData.BeginDate = val[0]
+        this.searchData.EndDate = val[1]
       } else {
-        this.searchData.BeginDate = "";
-        this.searchData.EndDate = "";
+        this.searchData.BeginDate = ''
+        this.searchData.EndDate = ''
       }
     },
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 重置列表查询
     handleReset() {
-      this.datetimerange = null;
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.datetimerange = null
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
   },
-};
+}
 </script>
diff --git a/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue b/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
index 72f61274..9218af6b 100644
--- a/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
@@ -29,7 +29,7 @@
           />
           <div class="info">
             <p class="user-info">
-              <span style="font-weight: 700">{{ record.CreateUserName }} </span>
+              <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div
@@ -42,7 +42,7 @@
         <div v-else class="word-my">
           <div class="info">
             <p class="user-info">
-              <span style="font-weight: 700">{{ record.CreateUserName }} </span>
+              <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div
@@ -169,6 +169,7 @@
           <el-tab-pane
             :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
             name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-dicom-files
               v-if="uploadVisible"
@@ -183,6 +184,7 @@
           <el-tab-pane
             :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
             name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-non-dicom-files
               v-if="activeName === 'non-dicom'"
@@ -369,6 +371,7 @@ export default {
         TalkContent: content,
         CreateTime: this.data.CreateTime,
         CreateUserName: this.data.CreateUserName,
+        CreateUserFullName: this.data.CreateUserFullName,
         CreateUserId: this.data.CreateUserId,
         UserTypeEnum: this.data.UserTypeEnum,
       })
@@ -419,6 +422,7 @@ export default {
         TalkContent: content,
         CreateTime: this.data.CreateTime,
         CreateUserName: this.data.CreateUserName,
+        CreateUserFullName: this.data.CreateUserFullName,
         CreateUserId: this.data.CreateUserId,
         UserTypeEnum: this.data.UserTypeEnum,
       })
@@ -473,6 +477,13 @@ export default {
           this.uploadBtnLoading = false
           if (res.IsSuccess) {
             dicomStore.studyList = []
+            if (
+              [0, 1].includes(this.$store.state.trials.config.CollectImagesEnum)
+            ) {
+              this.activeName = 'dicom'
+            } else {
+              this.activeName = 'non-dicom'
+            }
             this.uploadVisible = true
           }
         })
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue b/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue
index aa660e92..907862b9 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/historyChat.vue
@@ -17,7 +17,7 @@
                 <img v-else-if="record.UserTypeEnum*1 === 3" :src="qcAvatar" alt="QC">
                 <div class="info">
                   <p class="user-info">
-                    <span style="font-weight:700;">{{ record.CreateUserName }} </span>
+                    <span style="font-weight:700;">{{ record.CreateUserFullName || record.CreateUserName }} </span>
                     <span>({{ record.CreateTime }}) </span>
                   </p>
                   <div class="info-content" v-html="record.TalkContent" />
@@ -27,7 +27,7 @@
               <div v-else class="word-my">
                 <div class="info">
                   <p class="user-info">
-                    <span style="font-weight:700;">{{ record.CreateUserName }} </span>
+                    <span style="font-weight:700;">{{ record.CreateUserFullName || record.CreateUserName }} </span>
                     <span>({{ record.CreateTime }}) </span>
                   </p>
                   <div class="info-content" v-html="record.TalkContent" />
@@ -118,6 +118,7 @@
           <el-tab-pane
             :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
             name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-dicom-files :data="data" :subject-id="data.SubjectId" :subject-visit-id="data.Id" @close="closeUpload" @getList="reFreshList" />
           </el-tab-pane>
@@ -125,6 +126,7 @@
           <el-tab-pane
             :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
             name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-non-dicom-files v-if="activeName==='non-dicom'" :data="data" :allow-add-or-edit="true" :body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.Id" @getList="reFreshList" />
           </el-tab-pane>
@@ -286,6 +288,7 @@ export default {
               TalkContent: content,
               CreateTime: item.CreateTime,
               CreateUserName: item.CreateUserName,
+              CreateUserFullName: item.CreateUserFullName,
               CreateUserId: item.CreateUserId,
               UserTypeEnum: item.UserTypeEnum,
             });
@@ -347,6 +350,11 @@ export default {
           this.uploadBtnLoading = false;
           if (res.IsSuccess) {
             dicomStore.studyList = [];
+            if ([0, 1].includes(this.$store.state.trials.config.CollectImagesEnum)) {
+              this.activeName = 'dicom'
+            } else {
+              this.activeName = 'non-dicom'
+            }
             this.uploadVisible = true;
           }
         })
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 8f3c6ae1..725cefbb 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -742,7 +742,10 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <div class="tip">
+        <div
+          class="tip"
+          v-if="[0].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           <i class="el-icon-warning-outline"></i>
           <div v-html="$t('trials:uploadedDicoms:tip:message')"></div>
         </div>
@@ -751,6 +754,7 @@
           <el-tab-pane
             :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
             name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-dicom-files2
               :data="rowData"
@@ -766,6 +770,7 @@
           <el-tab-pane
             :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
             name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-non-dicom-files
               v-if="activeName === 'non-dicom'"
@@ -890,8 +895,16 @@
           </el-form-item>
         </el-form>
         <!-- DICOM影像  -->
-        <h4 class="box-title">{{ $t('trials:crcUpload:label:dicom') }}</h4>
-        <el-card class="box-card">
+        <h4
+          class="box-title"
+          v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+        >
+          {{ $t('trials:crcUpload:label:dicom') }}
+        </h4>
+        <el-card
+          class="box-card"
+          v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           <StudyInfo
             v-if="rowData.Id"
             :data="rowData"
@@ -900,10 +913,17 @@
           />
         </el-card>
         <!-- 非DICOM影像 -->
-        <h4 class="box-title" style="margin-top: 10px">
+        <h4
+          class="box-title"
+          style="margin-top: 10px"
+          v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           {{ $t('trials:crcUpload:label:noneDicom') }}
         </h4>
-        <el-card class="box-card">
+        <el-card
+          class="box-card"
+          v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           <UploadNonDicomFiles
             v-if="rowData.Id"
             :data="rowData"
@@ -1660,8 +1680,13 @@ export default {
     this.getSite()
     if (this.$route.query.subjectCode) {
       this.searchData.SubjectInfo = this.$route.query.subjectCode
+      changeURLStatic('subjectCode', '')
+    }
+    
+    if (this.$route.query.trialSiteId) {
+      this.searchData.TrialSiteId = this.$route.query.trialSiteId
+      changeURLStatic('trialSiteId', '')
     }
-    changeURLStatic('subjectCode', '')
     this.TrialCode = this.$route.query.trialCode
     this.getList()
     this.getVisitPlanOptions()
@@ -1737,12 +1762,10 @@ export default {
           this.selected.TrialId = this.subjectRowData.TrialId
           this.selected.SubjectId = this.subjectRowData.SubjectId
           this.isShow = true
-          console.log(res)
         })
       }
     },
     handleView2(row) {
-      console.log(row)
       this.rowData = { ...row }
       this.openType = 'look'
       this.preview.visible = true
@@ -1897,7 +1920,6 @@ export default {
           this.list = res.Result.CurrentPageData
           this.total = res.Result.TotalCount
           this.otherInfo = res.OtherInfo
-          console.log(this.otherInfo)
         })
         .catch(() => {
           this.loading = false
@@ -1929,7 +1951,12 @@ export default {
     },
     CRChandleUpload2(row) {
       dicomStore.studyList = []
-      this.activeName = 'dicom'
+      if ([0, 1].includes(this.$store.state.trials.config.CollectImagesEnum)) {
+        this.activeName = 'dicom'
+      } else {
+        this.activeName = 'non-dicom'
+      }
+
       this.rowData = { ...row }
       this.$store.state.trials.checkTaskId = row.Id
       this.uploadVisible = true
@@ -2031,9 +2058,16 @@ export default {
           this.otherInfo.ClinicalInformationTransmissionEnum > 0 &&
           this.rowData.IsBaseLine
         ) {
-          const { ClinicalDataConfirmation } = const_.processSignature
-          this.signCode = ClinicalDataConfirmation
-          this.signVisible = true
+          getVisitClinicalDataName({ id: this.rowData.Id })
+            .then((res) => {
+              this.signReplaceText = res.Result.ClinicalDataName
+              const { ClinicalDataConfirmation } = const_.processSignature
+              this.signCode = ClinicalDataConfirmation
+              this.signVisible = true
+            })
+            .catch((err) => {
+              console.log(err)
+            })
         } else {
           this.submit()
         }
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
index 4eb939a2..edf4dd3b 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
@@ -10,7 +10,7 @@
           <img v-else-if="record.UserTypeEnum*1 === 3" :src="qcAvatar" alt="QC">
           <div class="info">
             <p class="user-info">
-              <span style="font-weight:700;">{{ record.CreateUserFullName }} </span>
+              <span style="font-weight:700;">{{ record.CreateUserFullName || record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content" v-html="formattedText(record.TalkContent)" />
@@ -20,7 +20,7 @@
         <div v-else class="word-my">
           <div class="info">
             <p class="user-info">
-              <span style="font-weight:700;">{{ record.CreateUserName }} </span>
+              <span style="font-weight:700;">{{ record.CreateUserFullName || record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content" v-html="formattedText(record.TalkContent)" />
@@ -184,6 +184,7 @@ export default {
           TalkContent: content,
           CreateTime: this.data.CreateTime,
           CreateUserName: this.data.CreateUserName,
+          CreateUserFullName: this.data.CreateUserFullName,
           CreateUserId: this.data.CreateUserId,
           UserTypeEnum: this.data.UserTypeEnum
         }
@@ -223,6 +224,7 @@ export default {
           TalkContent: content,
           CreateTime: this.data.CreateTime,
           CreateUserName: this.data.CreateUserName,
+          CreateUserFullName: this.data.CreateUserFullName,
           CreateUserId: this.data.CreateUserId,
           UserTypeEnum: this.data.UserTypeEnum
         }
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 274695a3..d1262449 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -121,7 +121,19 @@
                 :label="$t('trials:audit:table:bodyPart')"
               >
                 <template slot-scope="scope">
-                  {{ getBodyPart(scope.row.BodyPartForEdit) }}
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="$t('trials:audit:message:noBodyPartForEdit')"
+                    placement="bottom"
+                    v-if="!scope.row.BodyPartForEdit"
+                  >
+                    <i
+                      class="el-icon-warning"
+                      style="color: #f44336; font-size: 16px"
+                    />
+                  </el-tooltip>
+                  <span v-else>{{ getBodyPart(scope.row.BodyPartForEdit) }}</span>
                 </template>
               </el-table-column>
               <!-- 序列数量 -->
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 5206cafc..0d2c631d 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -860,18 +860,33 @@
         </el-form>
         <div>
           <!-- DICOM影像 -->
-          <h4 class="box-title">{{ $t('trials:audit:tab:dicoms') }}</h4>
-          <el-card class="box-card">
+          <h4
+            class="box-title"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+          >
+            {{ $t('trials:audit:tab:dicoms') }}
+          </h4>
+          <el-card
+            class="box-card"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+          >
             <DicomFiles v-if="rowData.Id" :data="rowData" />
           </el-card>
         </div>
 
         <div>
           <!-- 非DICOM影像 -->
-          <h4 class="box-title" style="margin-top: 10px">
+          <h4
+            class="box-title"
+            style="margin-top: 10px"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+          >
             {{ $t('trials:audit:tab:nonDicoms') }}
           </h4>
-          <el-card class="box-card">
+          <el-card
+            class="box-card"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+          >
             <UploadNonDicomFiles
               v-if="rowData.Id"
               :body-parts="OtherInfo.BodyPartTypes"
diff --git a/src/views/trials/trials-panel/visit/qc-question/index.vue b/src/views/trials/trials-panel/visit/qc-question/index.vue
index e575cecb..89b0421a 100644
--- a/src/views/trials/trials-panel/visit/qc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-question/index.vue
@@ -229,7 +229,7 @@
         />
         <!-- 发起人 -->
         <el-table-column
-          prop="CreateUserName"
+          prop="CreateUserFullName"
           :label="$t('trials:qcQuality:table:organizer')"
           show-overflow-tooltip
           width="120"
diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
index bd102f68..342e71ad 100644
--- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@@ -57,6 +57,12 @@
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:CreateTime')"
+        prop="CreateTime"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
         prop="ConfirmTime"
diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index 1a84d446..1f97a933 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -3,12 +3,33 @@
     <el-row>
       <el-col :span="12">
         <!-- 待签署的系统文件 -->
-        <h3>{{ !isSigned ? $t('trials:workbench:title:sysDocBeSigned') : $t('trials:workbench:title:sysDocSigned') }}</h3>
-      </el-col>
-      <el-col :span="12" style="text-align:right;">
         <h3>
-          <Pagination class="page" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;" @pagination="getList" />
-          <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')" @click="handleReset" />
+          {{
+            !isSigned
+              ? $t('trials:workbench:title:sysDocBeSigned')
+              : $t('trials:workbench:title:sysDocSigned')
+          }}
+        </h3>
+      </el-col>
+      <el-col :span="12" style="text-align: right">
+        <h3>
+          <Pagination
+            class="page"
+            :total="total"
+            :page.sync="listQuery.pageIndex"
+            :limit.sync="listQuery.pageSize"
+            layout="total, sizes, prev, pager, next"
+            :background="false"
+            style="display: inline-block"
+            @pagination="getList"
+          />
+          <el-button
+            icon="el-icon-refresh-left"
+            size="small"
+            circle
+            :title="$t('common:button:reset')"
+            @click="handleReset"
+          />
         </h3>
       </el-col>
     </el-row>
@@ -18,10 +39,10 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      v-adaptive="{bottomOffset:45}"
+      v-adaptive="{ bottomOffset: 45 }"
       height="100"
       @sort-change="handleSortByColumn"
-      :default-sort ="{prop: 'UpdateTime', order: 'descending'}"
+      :default-sort="{ prop: 'UpdateTime', order: 'descending' }"
     >
       <el-table-column type="index" width="40" />
       <el-table-column
@@ -38,14 +59,11 @@
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        prop="CreateTime"
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="140"
-      >
+      <el-table-column :label="$t('common:action:action')" width="140">
         <template slot-scope="scope">
           <!-- 预览 -->
           <el-button
@@ -59,6 +77,7 @@
             icon="el-icon-edit-outline"
             circle
             v-if="!isSigned"
+            :disabled="IsFirstSysDocNeedSign && !!~scope.row.DocTypeCode"
             :title="$t('trials:needSignSysDoc:action:sign')"
             @click="handleSign(scope.row)"
           />
@@ -75,11 +94,16 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <span v-if="!currentIsConfirm" style="position: fixed;right: 75px;top: 14px;">
-        <span style="color:red;margin-right:10px;">
+      <span
+        v-if="!currentIsConfirm"
+        style="position: fixed; right: 75px; top: 14px"
+      >
+        <span style="color: red; margin-right: 10px">
           <!-- 请仔细阅读文件，并签名确认 -->
           {{ $t('common:message:signTip') }}
-          <span v-show="duration < currentMinMinutes * 60">{{ `(${currentMinMinutes * 60 - duration}s)` }}</span>
+          <span v-show="duration < currentMinMinutes * 60">{{
+            `(${currentMinMinutes * 60 - duration}s)`
+          }}</span>
         </span>
 
         <el-button
@@ -93,8 +117,16 @@
         </el-button>
       </span>
 
-      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" @getList="getList" />
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+          @getList="getList"
+        />
       </div>
     </el-dialog>
 
@@ -107,24 +139,36 @@
       append-to-body
     >
       <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
+        <span style="font-size: 12px; margin-left: 5px">{{
+          `(${$t('common:label:sign')}${currentUser})`
+        }}</span>
       </div>
-      <SignForm :is-system-doc="currentRow.IsSystemDoc" :document-id="currentRow.Id" :file-name="fileName" @closeDialog="closeSignDialog" />
+      <SignForm
+        :is-system-doc="currentRow.IsSystemDoc"
+        :document-id="currentRow.Id"
+        :file-name="fileName"
+        @closeDialog="closeSignDialog"
+      />
     </el-dialog>
   </div>
 </template>
 <script>
-import { getWaitSignSysDocList,getNextUnSignDocument, setSystemDocFirstViewTime } from '@/api/trials'
+import {
+  getWaitSignSysDocList,
+  getNextUnSignDocument,
+  setSystemDocFirstViewTime,
+} from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import PreviewFile from '@/components/PreviewFile/index'
 import SignForm from '@/views/trials/trials-panel/attachments/self-attachment/components/SignForm'
+import { mapGetters } from 'vuex'
 const searchDataDefault = () => {
   return {
     pageIndex: 1,
     pageSize: 20,
     asc: false,
-    sortField: 'UpdateTime'
+    sortField: 'CreateTime',
   }
 }
 export default {
@@ -133,8 +177,10 @@ export default {
   props: {
     isSigned: {
       type: Boolean,
-      default() { return false }
-    }
+      default() {
+        return false
+      },
+    },
   },
   data() {
     return {
@@ -153,7 +199,7 @@ export default {
       currentType: '',
       currentIsConfirm: false,
       currentUser: zzSessionStorage.getItem('userName'),
-      currentRow: {}
+      currentRow: {},
     }
   },
   mounted() {
@@ -164,13 +210,18 @@ export default {
       this.stopTimer()
     }
   },
+  computed: {
+    ...mapGetters(['IsFirstSysDocNeedSign']),
+  },
   methods: {
     // 预览
     handlePreview(row) {
       this.currentRow = { ...row }
       const { Name, FullFilePath, SignViewMinimumMinutes } = 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.currentMinMinutes = SignViewMinimumMinutes
       this.currentIsConfirm = true
       this.title = Name
@@ -178,32 +229,40 @@ export default {
     },
     getList() {
       this.listQuery.IsSigned = this.isSigned
-      getWaitSignSysDocList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.total = res.Result.TotalCount
-        this.list = res.Result.CurrentPageData
-      }).catch(() => { this.listLoading = false })
+      getWaitSignSysDocList(this.listQuery)
+        .then((res) => {
+          this.listLoading = false
+          this.total = res.Result.TotalCount
+          this.list = res.Result.CurrentPageData
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     handleSign(row) {
       this.currentRow = { ...row }
       const { Name, FullFilePath, SignViewMinimumMinutes } = 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.currentMinMinutes = SignViewMinimumMinutes
       this.currentIsConfirm = false
       this.title = Name
       this.fileName = Name.slice(0, Name.lastIndexOf('.'))
       this.listLoading = true
-      setSystemDocFirstViewTime(row.Id).then(res => {
-        this.listLoading = false
-        this.previewVisible = true
-        const _this = this
-        setTimeout(() => {
-          _this.initTimer()
-        }, 1000)
-      }).catch(() => {
-        this.listLoading = false
-      })
+      setSystemDocFirstViewTime(row.Id)
+        .then((res) => {
+          this.listLoading = false
+          this.previewVisible = true
+          const _this = this
+          setTimeout(() => {
+            _this.initTimer()
+          }, 1000)
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     // 排序
     handleSortByColumn(column) {
@@ -233,24 +292,29 @@ export default {
         this.currentIsConfirm = true
         // this.getList()
         // this.$emit('refreshStats')
-        this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
-          getNextUnSignDocument({}).then(res => {
-            if (!res.Result) {
-              // 文档签署已完成，是否关闭弹窗？
-              this.$confirm(this.$t('trials:self-attachment:message:closeDocument')).then(() => {
-                this.previewVisible = false
-              }).catch(()=>{})
-              
-            } else {
-              this.handleSign(res.Result)
-            }
-            this.getList()
-            this.$emit('refreshStats')
+        this.$confirm(this.$t('trials:self-attachment:message:nextDocument'))
+          .then((res) => {
+            getNextUnSignDocument({}).then((res) => {
+              if (!res.Result) {
+                // 文档签署已完成，是否关闭弹窗？
+                this.$confirm(
+                  this.$t('trials:self-attachment:message:closeDocument')
+                )
+                  .then(() => {
+                    this.previewVisible = false
+                  })
+                  .catch(() => {})
+              } else {
+                this.handleSign(res.Result)
+              }
+              this.getList()
+              this.$emit('refreshStats')
+            })
+          })
+          .catch(() => {
+            this.currentIsConfirm = true
+            this.getList()
           })
-        }).catch(() => {
-          this.currentIsConfirm = true
-          this.getList()
-        })
       }
     },
     // 初始化计时器,清除上一次的数据
@@ -276,14 +340,13 @@ export default {
     stopTimer() {
       clearInterval(this.timer)
       this.timer = null
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.needSignSys-wrapper{
+.needSignSys-wrapper {
   height: 100%;
 }
-
 </style>
diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
index 31e97e91..e26c7553 100644
--- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@@ -38,7 +38,13 @@
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        prop="CreateTime"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
+        prop="ConfirmTime"
         show-overflow-tooltip
         sortable="custom"
       />
@@ -124,7 +130,7 @@ const searchDataDefault = () => {
     pageIndex: 1,
     pageSize: 20,
     asc: false,
-    sortField: 'UpdateTime'
+    sortField: 'CreateTime'
   }
 }
 export default {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 3a92b8fb..4f803c9f 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -126,7 +126,7 @@
               <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])&&!hasPermi(['role:admin'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{hasPermi(['role:pm'])? tabList.PM_SiteSurveryCount : tabList.SPM_SiteSurveryCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{hasPermi(['role:pm','role:apm'])? tabList.PM_SiteSurveryCount : tabList.SPM_SiteSurveryCount }}</span>
                 </div>
               </div>
               <!-- SPM/CPM -->
@@ -233,14 +233,14 @@
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
+                  <span class="my_select_box_content_text" :title="$t('trials:workbench:title:trialDocSigned')">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
                 </div>
               </div>
               <!-- 系统已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedSysDoc'}" tab-data="NeedSignedSysDoc" @click="$nextTick(() => selected = 'NeedSignedSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
+                  <span class="my_select_box_content_text" :title="$t('trials:workbench:title:sysDocSigned')">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
                 </div>
               </div>
             </div>
@@ -471,7 +471,6 @@ export default {
     ...mapState('user', ['isTestUser'])
   },
   mounted() {
-    console.log('isTestUser: ',this.isTestUser)
     this.getUserTobeDoneRecord()
     this.getNeedSignTrialDocTrialIdList()
     this.getUserInfo()
@@ -488,10 +487,13 @@ export default {
       hoursTip=this.$t('common:date:good evening')
     }
     this.hoursTip = hoursTip
+    this.$EventBus.$on("reload", (data) => {
+      window.location.reload()
+    });
   },
   methods: {
     getUserInfo() {
-      getUser(this.userId).then(async res => {
+      getUser().then(async res => {
         this.user = res.Result
       }).catch(() => { loading.close() })
     },
@@ -507,7 +509,6 @@ export default {
     },
     getNeedSignTrialDocTrialIdList() {
       getNeedSignTrialDocTrialIdList().then(res => {
-        console.log(res)
         this.trialIdList = res.Result
         this.$nextTick(() => {
           var list = document.querySelectorAll('div[tab-data]')
@@ -521,13 +522,17 @@ export default {
       })
     },
     refreshSysData(){
-      --this.tabList.SysWaitSignDocCount
-      store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount)
+      // this.tabList.SysWaitSignDocCount = this.tabList.SysWaitSignDocCount - 1
+      // this.tabList.SysSignedDocCount = this.tabList.SysWaitSignDocCount + 1
+      // store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount)
+      this.getUserTobeDoneRecord()
     },
     getUserTobeDoneRecord() {
       getUserTobeDoneRecord().then(async res => {
         this.tabList = res.Result
+        this.isSignSystemDoc = this.tabList.IsFirstSysDocNeedSign
         await store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount)
+        await store.dispatch('user/setIsFirstSysDocNeedSign', this.tabList.IsFirstSysDocNeedSign)
       })
     }
   }
diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue
index 2dfecd78..b79417d1 100644
--- a/src/views/user/myInfo.vue
+++ b/src/views/user/myInfo.vue
@@ -17,36 +17,78 @@
           <!-- 用户基本信息 -->
           {{ $t('trials:trials-myinfo:title:basicInfo') }}
         </div>
-        <el-form ref="userForm" label-position="right" :model="user" :rules="userFormRules" label-width="120px">
+        <el-form
+          ref="userForm"
+          label-position="right"
+          :model="user"
+          :rules="userFormRules"
+          label-width="120px"
+        >
           <el-form-item v-if="user.Code" label="ID: " prop="Code">
             <el-input v-model="user.Code" disabled />
           </el-form-item>
           <!-- 姓 -->
-          <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:surname')" prop="LastName">
-            <el-input v-model="user.LastName" :placeholder="$t('trials:trials-myinfo:form:surname')"/>
+          <el-form-item
+            :disabled="user.UserTypeEnum === 8"
+            :label="$t('trials:trials-myinfo:form:surname')"
+            prop="LastName"
+          >
+            <el-input
+              v-model="user.LastName"
+              :placeholder="$t('trials:trials-myinfo:form:surname')"
+            />
           </el-form-item>
           <!-- 名 -->
-          <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:givenname')" prop="FirstName">
-            <el-input v-model="user.FirstName" :placeholder="$t('trials:trials-myinfo:form:givenname')"/>
+          <el-form-item
+            :disabled="user.UserTypeEnum === 8"
+            :label="$t('trials:trials-myinfo:form:givenname')"
+            prop="FirstName"
+          >
+            <el-input
+              v-model="user.FirstName"
+              :placeholder="$t('trials:trials-myinfo:form:givenname')"
+            />
           </el-form-item>
           <!-- 性别 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:gender')" prop="Sex" style="margin-right:40px;">
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form: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>
             </el-radio-group>
           </el-form-item>
           <!-- 单位 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:organization')" prop="OrganizationName">
-            <el-input v-model="user.OrganizationName" :placeholder="$t('trials:trials-myinfo:form:organization')"/>
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form:organization')"
+            prop="OrganizationName"
+          >
+            <el-input
+              v-model="user.OrganizationName"
+              :placeholder="$t('trials:trials-myinfo:form:organization')"
+            />
           </el-form-item>
           <!-- 部门 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:department')" prop="DepartmentName">
-            <el-input v-model="user.DepartmentName" :placeholder="$t('trials:trials-myinfo:form:organization')"/>
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form:department')"
+            prop="DepartmentName"
+          >
+            <el-input
+              v-model="user.DepartmentName"
+              :placeholder="$t('trials:trials-myinfo:form:organization')"
+            />
           </el-form-item>
           <!-- 职位 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:position')" prop="PositionName">
-            <el-input v-model="user.PositionName" :placeholder="$t('trials:trials-myinfo:form:position')"/>
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form:position')"
+            prop="PositionName"
+          >
+            <el-input
+              v-model="user.PositionName"
+              :placeholder="$t('trials:trials-myinfo:form:position')"
+            />
           </el-form-item>
         </el-form>
         <!-- 保存 -->
@@ -68,39 +110,97 @@
         </div>
         <el-form label-position="right" label-width="180px">
           <!-- 用户名 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px;" prop="UserName">
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form:userName')"
+            style="margin-bottom: 5px"
+            prop="UserName"
+          >
             <span>{{ user.UserName }}</span>
           </el-form-item>
           <el-form-item label="" style="position: relative" prop="UserName">
-            <el-input v-model="userForm.UserName" :placeholder="$t('trials:trials-myinfo:form:userName')"/>
+            <el-input
+              v-model="userForm.UserName"
+              :placeholder="$t('trials:trials-myinfo:form:userName')"
+            />
             <!-- 修改 -->
-            <el-button :disabled="!userForm.UserName" class="saveBtn" type="primary" size="small" @click="setNewUserName">
+            <el-button
+              :disabled="!userForm.UserName"
+              class="saveBtn"
+              type="primary"
+              size="small"
+              @click="setNewUserName"
+            >
               {{ $t('trials:trials-myinfo:button:update') }}
             </el-button>
           </el-form-item>
           <!-- 电话 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:phone')" style="margin-bottom: 5px;" prop="UserName">
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form:phone')"
+            style="margin-bottom: 5px"
+            prop="UserName"
+          >
             <span>{{ user.Phone }}</span>
           </el-form-item>
           <el-form-item label="" style="position: relative" prop="UserName">
-            <el-input v-model="userForm.Phone" :placeholder="$t('trials:trials-myinfo:form:phone')"/>
+            <el-input
+              v-model="userForm.Phone"
+              :placeholder="$t('trials:trials-myinfo:form:phone')"
+            />
             <!-- 修改 -->
-            <el-button :disabled="!userForm.Phone" class="saveBtn" type="primary" size="small" @click="setNewPhone">
+            <el-button
+              :disabled="!userForm.Phone"
+              class="saveBtn"
+              type="primary"
+              size="small"
+              @click="setNewPhone"
+            >
               {{ $t('trials:trials-myinfo:button:update') }}
             </el-button>
           </el-form-item>
           <!-- 邮箱 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:email')" style="margin-bottom: 5px;" prop="UserName">
+          <el-form-item
+            :label="$t('trials:trials-myinfo:form:email')"
+            style="margin-bottom: 5px"
+            prop="UserName"
+          >
             <span>{{ user.EMail }}</span>
           </el-form-item>
-          <el-form-item label="" style="margin-bottom: 10px;position: relative" prop="EMail">
-            <el-input v-model="userForm.EMail" @input="handleEmailChange" :placeholder="$t('trials:trials-myinfo:form:email')"/>
-            <el-button class="sendCode" :disabled="sendDisabled" type="primary" size="mini" @click="sendVerificationCode">{{ sendTitle }}</el-button>
+          <el-form-item
+            label=""
+            style="margin-bottom: 10px; position: relative"
+            prop="EMail"
+          >
+            <el-input
+              v-model="userForm.EMail"
+              @input="handleEmailChange"
+              :placeholder="$t('trials:trials-myinfo:form:email')"
+            />
+            <el-button
+              class="sendCode"
+              :disabled="sendDisabled"
+              type="primary"
+              size="mini"
+              @click="sendVerificationCode"
+              >{{ sendTitle }}</el-button
+            >
           </el-form-item>
-          <el-form-item label="" style="position: relative" prop="VerificationCode">
-            <el-input v-model="userForm.VerificationCode" :placeholder="$t('trials:researchForm:form:verifyCode')"/>
+          <el-form-item
+            label=""
+            style="position: relative"
+            prop="VerificationCode"
+          >
+            <el-input
+              v-model="userForm.VerificationCode"
+              :placeholder="$t('trials:researchForm:form:verifyCode')"
+            />
             <!-- 修改 -->
-            <el-button :disabled="!userForm.EMail || !userForm.VerificationCode" class="saveBtn" type="primary" size="small" @click="setNewEmail">
+            <el-button
+              :disabled="!userForm.EMail || !userForm.VerificationCode"
+              class="saveBtn"
+              type="primary"
+              size="small"
+              @click="setNewEmail"
+            >
               {{ $t('trials:trials-myinfo:button:update') }}
             </el-button>
           </el-form-item>
@@ -111,18 +211,52 @@
           <!-- 修改密码 -->
           {{ $t('trials:trials-myinfo:title:updatePaasord') }}
         </div>
-        <el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="180px">
+        <el-form
+          ref="passwordForm"
+          label-position="right"
+          :model="password"
+          :rules="passwordFormRules"
+          label-width="180px"
+        >
           <!-- 旧密码 -->
-          <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
-            <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:oldPassword')"/>
+          <el-form-item
+            :label="$t('recompose:form:oldPassword')"
+            prop="OldPassWord"
+          >
+            <el-input
+              v-model="password.OldPassWord"
+              type="password"
+              show-password
+              auto-complete="new-password"
+              :placeholder="$t('recompose:form:oldPassword')"
+            />
           </el-form-item>
           <!-- 新密码 -->
-          <el-form-item class="my_new_pwd" :label="$t('recompose:form:newPassword')" prop="NewPassWord">
-            <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:newPassword')"/>
+          <el-form-item
+            class="my_new_pwd"
+            :label="$t('recompose:form:newPassword')"
+            prop="NewPassWord"
+          >
+            <el-input
+              v-model="password.NewPassWord"
+              type="password"
+              show-password
+              auto-complete="new-password"
+              :placeholder="$t('recompose:form:newPassword')"
+            />
           </el-form-item>
           <!-- 确认密码 -->
-          <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
-            <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:confirmPassword')"/>
+          <el-form-item
+            :label="$t('recompose:form:confirmPassword')"
+            prop="ConfirmPassWord"
+          >
+            <el-input
+              v-model="password.ConfirmPassWord"
+              type="password"
+              show-password
+              auto-complete="new-password"
+              :placeholder="$t('recompose:form:confirmPassword')"
+            />
           </el-form-item>
         </el-form>
         <el-button
@@ -139,13 +273,23 @@
 </template>
 
 <script>
-import { getUserTypeList, getUser, updateUser, modifyPassword } from '@/api/admin.js'
-import { sendVerificationCode, setNewEmail, setNewPhone, setNewUserName } from '@/api/system/user.js'
+import {
+  getUserTypeList,
+  getUser,
+  updateUser,
+  modifyPassword,
+} from '@/api/admin.js'
+import {
+  sendVerificationCode,
+  setNewEmail,
+  setNewPhone,
+  setNewUserName,
+} from '@/api/system/user.js'
 import md5 from 'js-md5'
 var timer = ''
 var countdown = 60
 import store from '@/store'
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   name: 'TrialsMyinfo',
@@ -158,38 +302,102 @@ export default {
       sendDisabled: true,
       sendTitle: this.$t('trials:trials-myinfo:button:getVCode'),
       userFormRules: {
-        UserName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        IsZhiZhun: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        OrganizationName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        LastName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
-        FirstName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
-        Sex: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        Status: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
+        UserName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        IsZhiZhun: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        OrganizationName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        LastName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
+        ],
+        Sex: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        Status: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
       },
       passwordFormRules: {
-        OldPassWord: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        OldPassWord: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
         NewPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             required: true,
             trigger: 'blur',
-            validator: this.$validatePassword
+            validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             required: true,
             trigger: 'blur',
-            validator: this.$validatePassword
+            validator: this.$validatePassword,
           },
-        ]
-      }
+        ],
+      },
     }
   },
   computed: {
-    ...mapGetters(['userId', 'name'])
+    ...mapGetters(['userId', 'name']),
   },
   mounted() {
     this.getUserInfo()
@@ -198,7 +406,7 @@ export default {
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     handleSave() {
-      this.$refs.userForm.validate(valid => {
+      this.$refs.userForm.validate((valid) => {
         console.log(valid)
         if (valid) {
           this.isDisabled = true
@@ -212,17 +420,24 @@ export default {
           //   this.user.OrganizationName = 'ZhiZhun'
           // }
           if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-              this.getUserInfo()
-            }).catch(() => { this.isDisabled = false })
+            updateUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.$message.success(
+                  this.$t('trials:trials-myinfo:message:updateSuccessfully')
+                )
+                this.getUserInfo()
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           }
         }
       })
     },
     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.userForm.EMail && reg.test(this.userForm.EMail)) {
         this.sendDisabled = false
       } else {
@@ -233,11 +448,13 @@ export default {
       sendVerificationCode(this.userForm.EMail).then(() => {
         this.settime(this)
         // 发送成功
-        this.$message.success(this.$t('trials:trials-myinfo:message:sendSuccessfully'))
+        this.$message.success(
+          this.$t('trials:trials-myinfo:message:sendSuccessfully')
+        )
       })
     },
     save() {
-      this.$refs.passwordForm.validate(valid => {
+      this.$refs.passwordForm.validate((valid) => {
         if (valid) {
           if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
             this.$alert(this.$t('passwordReset:formRule:passwordsDiffer'))
@@ -246,12 +463,14 @@ export default {
           const param = {
             UserId: this.userId,
             NewPassWord: md5(this.password.NewPassWord),
-            OldPassWord: md5(this.password.OldPassWord)
+            OldPassWord: md5(this.password.OldPassWord),
           }
-          modifyPassword(param).then(res => {
+          modifyPassword(param).then((res) => {
             if (res.IsSuccess) {
               // 修改成功,请重新登录账号
-              this.$message.success(this.$t('trials:trials-myinfo:message:modifyPWSuccessfully'))
+              this.$message.success(
+                this.$t('trials:trials-myinfo:message:modifyPWSuccessfully')
+              )
               setTimeout(() => {
                 this.logout()
               }, 1000)
@@ -261,26 +480,36 @@ export default {
       })
     },
     setNewEmail() {
-      setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(() => {
-        this.userForm.EMail = ''
-        this.userForm.VerificationCode = ''
-        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-        this.getUserInfo()
-      })
+      setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(
+        () => {
+          this.userForm.EMail = ''
+          this.userForm.VerificationCode = ''
+          this.$message.success(
+            this.$t('trials:trials-myinfo:message:updateSuccessfully')
+          )
+          this.getUserInfo()
+        }
+      )
     },
     setNewUserName() {
       setNewUserName(this.userForm.UserName).then(() => {
-        this.$store.dispatch('user/changeUserName', this.userForm.UserName).then((res) => {
-          this.userForm.UserName = ''
-          this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-          this.getUserInfo()
-        })
+        this.$store
+          .dispatch('user/changeUserName', this.userForm.UserName)
+          .then((res) => {
+            this.userForm.UserName = ''
+            this.$message.success(
+              this.$t('trials:trials-myinfo:message:updateSuccessfully')
+            )
+            this.getUserInfo()
+          })
       })
     },
     setNewPhone() {
       setNewPhone(this.userForm.Phone).then(() => {
         this.userForm.Phone = ''
-        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
+        this.$message.success(
+          this.$t('trials:trials-myinfo:message:updateSuccessfully')
+        )
         this.getUserInfo()
       })
     },
@@ -290,36 +519,42 @@ export default {
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.07)'
+        background: 'rgba(0, 0, 0, 0.07)',
       })
-      getUser(this.userId).then(async res => {
-        this.user = res.Result
-        /* eslint-disable */
-        zzSessionStorage.setItem('realName', this.user.RealName)
-        await store.dispatch('user/updateInfo')
-        loading.close()
-      }).catch(() => { loading.close() })
+      getUser()
+        .then(async (res) => {
+          this.user = res.Result
+          /* eslint-disable */
+          zzSessionStorage.setItem('Name', this.user.FullName)
+          await store.dispatch('user/updateInfo')
+          loading.close()
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     settime(obj) {
       if (countdown === 0) {
         obj.sendDisabled = false
-        obj.sendTitle = this.$t('trials:trials-myinfo:button:getVCode')// '获取验证码'
+        obj.sendTitle = this.$t('trials:trials-myinfo:button:getVCode') // '获取验证码'
         countdown = 60
         clearTimeout(timer)
         return
       } else {
         obj.sendDisabled = true
-        obj.sendTitle = `${this.$t('trials:trials-myinfo:button:wait')}(${countdown}s)`
+        obj.sendTitle = `${this.$t(
+          'trials:trials-myinfo:button:wait'
+        )}(${countdown}s)`
         countdown--
         // eslint-disable-next-line no-self-assign
         countdown = countdown
-        timer = setTimeout(function() {
+        timer = setTimeout(function () {
           obj.settime(obj)
         }, 1000)
       }
     },
     getUserTypeList() {
-      getUserTypeList().then(res => {
+      getUserTypeList().then((res) => {
         if (res.IsSuccess) {
           this.userTypeOptions = res.Result
         }
@@ -334,59 +569,96 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.$i18n.locale = 'zh'
+      //this.setLanguage('zh')
       this.$updateDictionary()
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.trial-myinfo{
+.trial-myinfo {
   background: #f3f3f3;
-  flex: 1;overflow: auto;display: flex;flex-direction: row;justify-content: space-around;
-  .trial-myinfo-head{
-    position: absolute;top: 40px;left: -10%;font-size: 14px;
+  flex: 1;
+  overflow: auto;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  .trial-myinfo-head {
+    position: absolute;
+    top: 40px;
+    left: -10%;
+    font-size: 14px;
   }
-  .trial-myinfo-left{
+  .trial-myinfo-left {
     overflow: auto;
-    background: #fff;width: calc(50% - 9px);margin: 6px 0;
+    background: #fff;
+    width: calc(50% - 9px);
+    margin: 6px 0;
     padding-bottom: 50px;
-    .trial-myinfo-left-top{
-      width: 70%;padding-top: 100px;position: relative;margin: 0 auto;margin-bottom: 10px;
-      .trial-myinfo-body{
-        width:160px;height:160px;border-radius: 50%;background: #428bca;display: flex;justify-content: center;align-items: center;
-        div{
-          color:#fff;font-size: 30px;
+    .trial-myinfo-left-top {
+      width: 70%;
+      padding-top: 100px;
+      position: relative;
+      margin: 0 auto;
+      margin-bottom: 10px;
+      .trial-myinfo-body {
+        width: 160px;
+        height: 160px;
+        border-radius: 50%;
+        background: #428bca;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        div {
+          color: #fff;
+          font-size: 30px;
         }
       }
     }
   }
-  .saveBtn{
-    position: absolute;right: -10px;top:2px;transform: translateX(100%)
+  .saveBtn {
+    position: absolute;
+    right: -10px;
+    top: 2px;
+    transform: translateX(100%);
   }
-  .trial-info-btn{
-    position: absolute;bottom: -60px;left: calc(100% + 10px);min-width: 97px;
+  .trial-info-btn {
+    position: absolute;
+    bottom: -60px;
+    left: calc(100% + 10px);
+    min-width: 97px;
   }
-  .trial-myinfo-left-bottom{
-    width: 70%;padding-top: 100px;position: relative;margin: 0 auto;
+  .trial-myinfo-left-bottom {
+    width: 70%;
+    padding-top: 100px;
+    position: relative;
+    margin: 0 auto;
   }
-  .trial-myinfo-right{
+  .trial-myinfo-right {
     overflow: auto;
-    background: #fff;width: calc(50% - 9px);margin: 6px 0;
+    background: #fff;
+    width: calc(50% - 9px);
+    margin: 6px 0;
     padding-bottom: 50px;
     .sendCode {
-      position: absolute;right: -10px;top: 50%;transform: translate(100%, -50%);
+      position: absolute;
+      right: -10px;
+      top: 50%;
+      transform: translate(100%, -50%);
     }
-    .trial-myinfo-right-box{
-      width: 70%;padding-top: 100px;position: relative;margin: 0 auto;
+    .trial-myinfo-right-box {
+      width: 70%;
+      padding-top: 100px;
+      position: relative;
+      margin: 0 auto;
     }
   }
 }
 </style>
 <style scoped>
-/deep/ .is-error.my_new_pwd{
-  margin-bottom: 40px;
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
 }
 </style>
diff --git a/static/pdfjs/web/viewer.js b/static/pdfjs/web/viewer.js
index bf2c94fd..d87d8b4f 100644
--- a/static/pdfjs/web/viewer.js
+++ b/static/pdfjs/web/viewer.js
@@ -12380,7 +12380,8 @@ class PDFPageView {
           c.style.color = "rgba(0, 191, 255, 0.1)";
           c.style.whiteSpace = 'nowrap'
           // c.innerText = text;//text为水印内容，可以在viewer.html中传入，也可以直接替换成固定的字符串如：c.innerText = "这是一个水印";
-          c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
+          // c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
+          c.innerText = `${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
           cover.appendChild(c);
         }
       }