国际化修改

src/App.vue

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

src/api/admin.js

@@ -334,3 +334,11 @@ export function updateUserRoleInfo(data) {
     data
   })
 }
+// 管理端新增用户发送邮件
+export function addNewUserSendEmail(data) {
+  return request({
+    url: `/User/addNewUserSendEmail`,
+    method: 'post',
+    data
+  })
+}

src/api/reading.js

@@ -275,3 +275,13 @@ export function submitTaskRowInfo(param, type) {
     data: param
   })
 }
+
+export function deleteSingleTableQuestionMark(param, type) {
+  return request({
+    url: `/DeleteSingleTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+

src/api/trials.js

@@ -3951,3 +3951,11 @@ export function setTrialQuestionExportResult(data) {
     data
   })
 }
+// 项目加入人员发送邮件
+export function trialUserSendJoinEmail(data) {
+  return request({
+    url: `/TrialMaintenance/trialUserSendJoinEmail`,
+    method: 'post',
+    data
+  })
+}

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,6 +119,7 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           :disabled="item.disable && item.disable(searchData[item.prop])"
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间段 -->
         <el-date-picker

src/components/BaseTable/index.vue

@@ -64,6 +64,10 @@
                     <el-button
                       :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
+                      v-if="
+                        (operate.show && scope.row[operate.show]) ||
+                        !operate.show
+                      "
                       style="margin-right: 5px"
                       @click="handleClick(operate, scope.row)"
                       >{{ operate.name }}</el-button

src/components/TrialsTab/index.vue

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

src/directive/dialogDrag.js

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

src/layout/components/Navbar.vue

@@ -175,8 +175,8 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      // //this.$i18n.locale = 'zh'
+      // //this.setLanguage('zh')
       this.$updateDictionary()
     },
     editInfo() {

src/main.js

@@ -403,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();

src/permission.js

@@ -4,7 +4,7 @@ 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"
@@ -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
@@ -97,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()
         }
@@ -112,10 +123,12 @@ router.beforeEach(async (to, from, next) => {
       }
     } else {
       if (to.path === '/researchForm') {
-        next(`/researchLogin?`)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/researchDetail_m') {
-        next(`/researchLogin_m?`)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)

src/store/getters.js

@@ -47,6 +47,7 @@ const getters = {
   language: state => state.lang.language,
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
+  IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
   TrialStatusStr: state => state.user.TrialStatusStr
 }
 export default getters

src/store/modules/reading.js

@@ -75,7 +75,7 @@ function getQuestions(questions) {
             let isMeasurable = getQuestionAnswer(item.TableQuestions.Questions, 1105, answerObj)
             answerObj.isMeasurable = isMeasurable
             answerObj.mean = getQuestionAnswer(item.TableQuestions.Questions, 1104, answerObj)
-            answerObj.saveTypeEnum = isNaN(parseFloat(isMeasurable)) ? 1 : 2
+            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)
@@ -887,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}`

src/store/modules/user.js

@@ -18,6 +18,7 @@ const getDefaultState = () => {
     /* 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,
     roles: []
@@ -65,6 +66,10 @@ const mutations = {
   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) {
@@ -216,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)
   },
@@ -238,6 +246,7 @@ const actions = {
     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')))
+    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)
@@ -273,7 +282,9 @@ const actions = {
       })
       resetRouter()
       removeName()
+      let lang = zzSessionStorage.getItem('lang')
       zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
       commit('RESET_STATE')
     } catch (e) {
       console.log(e)
@@ -288,7 +299,9 @@ const actions = {
       // })
       resetRouter()
       removeName()
+      let lang = zzSessionStorage.getItem('lang')
       zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
       commit('RESET_STATE')
     } catch (e) {
       console.log(e)

src/styles/element-ui.scss

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

src/utils/dialog.js

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

src/utils/request-download.js

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

src/utils/request.js

@@ -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({
@@ -173,6 +180,8 @@ const setTimer = (obj, type) => {
       Message(obj)
     }
     if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
       MessageBox.confirm(...obj)
     }
     clearTimeout(timer);

src/views/dashboard/bigdata.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -243,7 +243,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="导出标识" 
+        <!-- <el-form-item label="导出标识" 
           prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -262,8 +262,11 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
+        </el-form-item> -->
+        <el-form-item 
+          label="导出结果"
+           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -450,10 +453,10 @@
         <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>
@@ -829,7 +832,7 @@ export default {
         ConvertShowType: 0,
         QuestionClassify: null,
         HighlightAnswerList: [],
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         MaxAnswerLength: null,
         FileType: [],
@@ -866,12 +869,12 @@ 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,
@@ -1159,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

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

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

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

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

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

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

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

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

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

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

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

@@ -147,7 +147,7 @@
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
-        <el-form-item 
+        <!-- <el-form-item 
           :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -166,9 +166,12 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -329,11 +332,17 @@
         </el-form-item>
         <el-form-item v-if="form.TableQuestionType === 3" label="默认值">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
+            <!-- <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>
@@ -358,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>
@@ -627,7 +642,7 @@ export default {
         ImageCount: 0,
         ClassifyTableQuestionId: null,
         ClassifyAlgorithms: null,
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         DefaultValue:null
         // IsEnable: true
@@ -654,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: [],
@@ -669,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()
@@ -931,7 +968,7 @@ export default {
       form.ImageCount = null
       form.ClassifyTableQuestionId = null
       form.ClassifyAlgorithms = null
-      form.ExportIdentification = 0
+      // form.ExportIdentification = 0
       form.ExportResult = []
       form.DefaultValue = null
     },

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)
     },
   },
 }

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

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

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

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

src/views/email-recompose/index.vue

@@ -38,6 +38,7 @@
         </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: [
@@ -175,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' }),
@@ -189,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() {
@@ -228,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
     },
   },
 }
@@ -262,7 +273,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
-.el-form-item {
-  margin-bottom: 30px;
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
 }
 </style>

src/views/error.vue

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

src/views/forgetpassword/index.vue

@@ -423,7 +423,7 @@ export default {
 /*  margin-bottom: 40px;*/
 /*}*/
 .is-error.my_new_pwd {
-  margin-bottom: 40px;
+  margin-bottom: 45px;
 }
 .flexBox {
   display: flex;

src/views/login/index.vue

@@ -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'">
@@ -308,14 +312,13 @@ export default {
       Img1,
       toggleRoleVisible: false,
       toggleRoleLoading: false,
-
-      LoginState: 0,
     }
   },
   computed: {
     ...mapGetters(['asyncRoutes', 'routes', 'language']),
     host() {
-      return window.location.host
+      // return window.location.host
+      return 'elevateimaging.ai '
     },
   },
   watch: {
@@ -330,7 +333,8 @@ export default {
     },
   },
   mounted() {
-    zzSessionStorage.clear()
+    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)
@@ -345,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()
@@ -385,12 +389,13 @@ export default {
     loginIn(Id) {
       this.loading = true
       this.showCode = false
-      this.LoginState = 0
       if (Id) this.loginForm.UserId = Id
       this.$store
         .dispatch('user/login', this.loginForm)
         .then((res) => {
-          this.LoginState = res.BasicInfo.LoginState
+          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'))
@@ -400,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'),
@@ -416,6 +421,8 @@ export default {
             )
             return
           } else if (res.IsMFA) {
+            zzSessionStorage.removeItem('userId')
+            zzSessionStorage.removeItem('identityUserId')
             this.$MFA({
               UserId: res.BasicInfo.IdentityUserId,
               EMail: res.BasicInfo.EMail,
@@ -432,6 +439,8 @@ export default {
           //   // 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(() => {
@@ -453,9 +462,9 @@ export default {
                 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.LoginState === 2) {
+                  //   this.$message.warning(this.$t('login:message:login4'))
+                  // }
                   if (this.loginType === 'DevOps') {
                     this.$router.replace({ path: res[0].path })
                     return
@@ -503,6 +512,18 @@ export default {
         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() {

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"
         >
@@ -144,8 +145,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() {
@@ -219,4 +222,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
+}
 </style>

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,
       })

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,
       })

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

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

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

@@ -159,7 +159,6 @@
               style="width: 100%"
               v-model="form.Hospital"
               :fetch-suggestions="querySearch"
-              @select="handleSelect"
               placeholder=""
             ></el-autocomplete>
           </el-form-item>

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">
@@ -269,16 +269,10 @@
             :label="$t('curriculumVitae:info:form:City')"
             v-if="isEN"
           >
-            <el-input
-              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
-              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')"
@@ -757,11 +751,12 @@ 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
-        }
+        // if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+        //   data.HospitalName = data.HospitalId
+        //   data.HospitalId = null
+        // }
         this.loading = true
         let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
         this.loading = false

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',

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

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

src/views/system/i18n/index.vue

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

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

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

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

@@ -1,18 +1,24 @@
 <template>
   <base-model v-if="config.visible" :config="config">
     <template slot="dialog-body">
-      <el-form ref="form" :model="curData" max-height="500px">
-        <template v-for="key in curDataArr">
-          <el-form-item
-            :key="key"
-            :label="$t(`system:loginLog:form:${key}`)"
-            label-width="120px"
-            style="margin-bottom: 0px"
-          >
-            <span v-if="key !== 'UserRoleList'">{{ curData[key] }}</span>
+      <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 curData[key]"
+                v-for="item in scope.row.value"
                 :key="item.UserTypeEnum"
                 style="margin: 0"
               >
@@ -21,9 +27,9 @@
                 }}{{ $fd('IsEnable', !item.IsUserRoleDisabled) }}
               </div>
             </template>
-          </el-form-item>
-        </template>
-      </el-form>
+          </template>
+        </el-table-column>
+      </el-table>
     </template>
     <template slot="dialog-footer">
       <el-button type="primary" @click="config.visible = false">
@@ -76,12 +82,17 @@ export default {
       return Object.keys(this.curData)
     },
     curData() {
-      if (!this.JsonObj) return {}
+      if (!this.JsonObj) return []
       let obj = JSON.parse(this.JsonObj)
-      let curData = {}
+      let curData = []
       Object.keys(obj).forEach((key) => {
         if (this.curKeys.includes(key)) {
-          curData[key] = obj[key]
+          let o = {
+            key: this.$t(`system:loginLog:form:${key}`),
+            value: obj[key],
+            prop: key,
+          }
+          curData.push(o)
         }
       })
       return curData

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

@@ -97,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"
@@ -328,5 +353,9 @@ export default {
       text-align: right;
     }
   }
+  .icon-i {
+    color: #f56c6c;
+    cursor: pointer;
+  }
 }
 </style>

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

@@ -46,7 +46,7 @@
         </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" />
@@ -73,7 +73,8 @@
       </el-form-item>
       <el-form-item
         :label="$t('system:userlist:table:UserType')"
-        prop="UserTypeId"
+        prop="Roles"
+        v-if="type === 0"
       >
         <div style="display: flex; align-items: center">
           <el-select
@@ -85,17 +86,24 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
-            v-if="type === 0"
           >
             <template v-for="userType of userTypeOptions">
               <el-option
-                 v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
+                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"
@@ -105,7 +113,6 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
-            v-else
           >
             <template v-for="userType of userTypeOptions">
               <el-option
@@ -291,7 +298,12 @@ export default {
     getUserTypeList() {
       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)
+            }
+          })
         }
       })
     },

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

@@ -37,7 +37,7 @@
           <span> {{ $fd('IsEnable', !scope.row.IsUserRoleDisabled) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('common:action:action')" width="120px">
+      <el-table-column :label="$t('common:action:action')" min-width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -165,6 +165,7 @@ export default {
       this.$emit('update:visible', false)
     },
     openAdd() {
+      this.form.roles = []
       this.addVisible = true
     },
     async save() {

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

@@ -20,17 +20,33 @@
       :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' }}
@@ -73,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'
@@ -231,6 +252,12 @@ export default {
               type: 'primary',
               emitKey: 'editCb',
             },
+            {
+              name: this.$t('common:button:email'),
+              type: 'primary',
+              emitKey: 'sendCb',
+              show: 'IsFirstAdd',
+            },
             // {
             //   name: this.$t('common:button:delete'),
             //   type: 'danger',
@@ -365,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'),
@@ -395,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

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;
   }

src/views/trials/trials-layout/components/trialsNavbar.vue

@@ -146,7 +146,11 @@ export default {
       return this.$store.state.user.roles
     },
     hasRole() {
-      return this.roles && this.roles.length > 1
+      return (
+        this.roles &&
+        this.roles.length > 1 &&
+        this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
+      )
     },
   },
   watch: {
@@ -221,8 +225,8 @@ export default {
     async logout() {
       await this.$store.dispatch('user/logout')
       this.$router.push(`/login`)
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.$i18n.locale = 'zh'
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
     go(value) {
@@ -379,6 +383,11 @@ export default {
       cursor: pointer;
     }
   }
+  .right-menu {
+    .el-menu-item.is-active {
+      font-weight: bolder;
+    }
+  }
   .center-menu {
     width: calc(100% - 1200px);
   }

src/views/trials/trials-myinfo/account.vue

@@ -119,7 +119,7 @@
               v-for="item in roles"
               :key="item.Id"
               :label="item.Id"
-              :disabled="item.isUserRoleDisabled"
+              :disabled="item.IsUserRoleDisabled"
               style="margin-bottom: 10px"
             >
               {{ item.UserTypeShortName }}
@@ -333,8 +333,8 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.$i18n.locale = 'zh'
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
   },

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()

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>

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>

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -76,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"
@@ -90,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"
@@ -176,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>
@@ -199,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>

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>
 

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: [],

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: [],

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: [],

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>
+            <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>
+            <label class="el-label">{{
+              $t('trials:trials-list:form:declarationType:')
+            }}</label>
             <el-tooltip
               class="item"
-              :content="trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')"
+              :content="
+                trialInfo.DeclarationTypeEnumList.map((v) =>
+                  $fd('DeclarationType', v)
+                ).join(', ')
+              "
               placement="top"
             >
-              <span>{{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }}</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">
+            <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>

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>
         <!-- 签署时间 -->

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') }}

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue

@@ -203,7 +203,7 @@
 </template>
 <script>
 // import { submitTableQuestion } from '@/api/trials'
-import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark } from '@/api/reading'
+import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark, deleteSingleTableQuestionMark } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 export default {
@@ -273,7 +273,8 @@ export default {
       digitPlaces: 2,
       isMeasurableId: '',
       isExitsMarks: false,
-      isDisabledMeasurableRadio: false
+      isDisabledMeasurableRadio: false,
+      liverSeg: ''
     }
   },
   mounted() {
@@ -298,37 +299,40 @@ export default {
         if (item.DictionaryCode) {
           val = isNaN(parseInt(this.answers[item.Id])) ? this.answers[item.Id] : parseInt(this.answers[item.Id])
         }
-        if (item.Id === this.isMeasurableId && !isNaN(parseInt(this.questionForm[item.Id]))) {
-          // 不做处理？
-          console.log(this.questionForm[item.Id])
-        } else {
-          this.$set(this.questionForm, item.Id, val)
-        }
+        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)
-      if (this.questionForm.saveTypeEnum !== 1) {
-        this.$set(this.questionForm, 'saveTypeEnum', isMeasurable === '' ? 1 : 2)
+      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) {
+            if (!isNaN(parseInt(isMeasurable)) && parseInt(isMeasurable) === 1 && this.isCurrentTask && this.readingTaskState < 2) {
               this.isDisabledMeasurableRadio = true
             }
             i.MeasureData = JSON.parse(i.MeasureData)
@@ -336,12 +340,15 @@ export default {
           this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1})
         })
       }
-      const mean = this.getQuestionVal(1104)
+      
       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()
     },
@@ -398,7 +405,11 @@ export default {
       } else if (qs.QuestionMark === 1105) {
         if (!v) {
           let meanId = this.getQuestionId(1104)
-          this.$set(this.questionForm, meanId, 'NA')
+          this.$set(this.questionForm, meanId, 'NE')
+        } else {
+          let mean = this.getMean()
+          let meanId = this.getQuestionId(1104)
+          this.$set(this.questionForm, meanId, mean)
         }
       }
       this.setQuestions()
@@ -413,9 +424,12 @@ export default {
       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 ''
       }
-
-      return mean ? mean.toFixed(this.digitPlaces) : '';
     },
     setMeasureData(measureData, isInit = false) {
       return new Promise(resolve => {
@@ -428,7 +442,8 @@ export default {
           // 维护标记信息
           measureData.data.remark = this.getLesionName(this.orderMark, this.activeQuestionMark)
         }
-        this.$set(this.questionForm, measureData.tableQuestionId, measureData.data.cachedStats.mean)
+        let val = measureData.data.cachedStats.mean / 10
+        this.$set(this.questionForm, measureData.tableQuestionId, val.toFixed(this.digitPlaces))
         data = {
           Id: '',
           StudyId: measureData.studyId,
@@ -521,6 +536,9 @@ export default {
       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')
@@ -715,14 +733,16 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
+      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.$message.warning(this.$t('trials:MRIPDFF:message:message1'))
+          this.$alert(this.$t('trials:MRIPDFF:message:message1'))
+          // this.$message.warning(this.$t('trials:MRIPDFF:message:message1'))
           return
         }
       } else {
@@ -743,7 +763,7 @@ export default {
         let l3Id = this.getQuestionId(1103)
         this.$set(this.questionForm, l3Id, '')
         let meanId = this.getQuestionId(1104)
-        this.$set(this.questionForm, meanId, 'NA')
+        this.$set(this.questionForm, meanId, 'NE')
       }
       
       const loading = this.$loading({ fullscreen: true })
@@ -798,6 +818,9 @@ export default {
           console.log(e)
           loading.close()
         }
+      } catch (e) {
+        console.log(e)
+      }
     },
     async handleClose() {
       this.$emit('close')
@@ -839,6 +862,9 @@ export default {
   /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%;

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue

@@ -33,13 +33,13 @@
                 <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 :gutter="20">
+                <el-row >
                   <!-- 分段 -->
-                  <el-col :span="7">{{$t('trials:MRIPDFF:label:col1')}}</el-col>
+                  <el-col :span="14">{{$t('trials:MRIPDFF:label:col1')}}</el-col>
                   <!-- 是否可测量 -->
-                  <el-col :span="8">{{$t('trials:MRIPDFF:label:col2')}}</el-col>
+                  <!-- <el-col :span="7">{{$t('trials:MRIPDFF:label:col2')}}</el-col> -->
                   <!-- 平均值 -->
-                  <el-col :span="6">{{$t('trials:MRIPDFF:label:col3')}}</el-col>
+                  <el-col :span="7">{{$t('trials:MRIPDFF:label:col3')}}</el-col>
                 </el-row>
               </div>
               
@@ -67,14 +67,14 @@
                       <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;left: 90px;top: 2px;">
+                      <div style="position: absolute;right: 0px;top: 2px;">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
-                        <div style="font-size: 13px;width:220px;height: 30px;">
-                          <div style="display: inline-block;margin-left:10px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width:110px">
+                        <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:80px">
-                            {{ item.TableQuestions.Answers[i].mean }}
+                          </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>
@@ -513,7 +513,7 @@ export default {
           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.getLesionName(item.OrderMark, t.RowIndex)
+              var lessionName = this.$refs[refName][0].liverSeg
               arr.push({ lessionName: lessionName, rowIndex: t.RowIndex, questionId: item.Id })
             }
           })

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: {
@@ -458,6 +459,18 @@ 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)
+          }
           // 过滤病灶标识  病灶名称  部位  器官  位置  是否淋巴结
           // 非靶病灶和新病灶 过滤长径和短径信息
           // 非淋巴结靶病灶 过滤短径
@@ -560,7 +573,7 @@ export default {
                             return v1.VisitTaskId === v.VisitTaskId
                           })
                           if (o) {
-                            Answers[o.VisitTaskId] = o.Answer
+                            Answers[o.VisitTaskId] = isNaN(parseFloat(o.Answer)) ? o.Answer : `${o.Answer}%`
                           }
                         })
                       }

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>

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>

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 = [];

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;
   }

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

@@ -1,9 +1,10 @@
 <template>
   <div style="text-align: right">
     <el-tabs v-model="activeName">
+      <!-- 报表导出 -->
       <el-tab-pane
-        label="报表导出"
-        name="report"
+        :label="$t('trials:readingTracking:reviewResult:reportsExport')"
+        name="reportsExport"
       >
         <el-tabs type="border-card" v-model="reportCriterionId">
           <el-tab-pane
@@ -13,35 +14,17 @@
             :key="i.TrialReadingCriterionId"
           >
             <exportList 
-              v-if="reportCriterionId === i.TrialReadingCriterionId && activeName === 'report'" 
+              v-if="reportCriterionId === i.TrialReadingCriterionId && activeName === 'reportsExport'" 
               :trialReadingCriterionId="i.TrialReadingCriterionId" 
               :data="data"
             />
           </el-tab-pane>
         </el-tabs>
       </el-tab-pane>
+      <!-- 报表导出配置 -->
       <el-tab-pane
-        label="CDISC导出"
-        name="CDISC"
-      >
-        <el-tabs type="border-card" v-model="CDISCCriterionId">
-          <el-tab-pane
-            :label="i.TrialReadingCriterionName"
-            :name="i.TrialReadingCriterionId"
-            v-for="i of trialCriterionList"
-            :key="i.TrialReadingCriterionId"
-          >
-            <exportList 
-              v-if="CDISCCriterionId === i.TrialReadingCriterionId && activeName === 'CDISC'" 
-              :trialReadingCriterionId="i.TrialReadingCriterionId" 
-              :data="data"
-            />
-          </el-tab-pane>
-        </el-tabs>
-      </el-tab-pane>
-      <el-tab-pane
-        label="报表导出配置"
-        name="reportConfig"
+        :label="$t('trials:readingTracking:reviewResult:reportsConfig')"
+        name="reportsConfig"
       >
         <el-tabs type="border-card" v-model="reportConfigCriterionId">
           <el-tab-pane
@@ -51,28 +34,8 @@
             :key="i.TrialReadingCriterionId"
           >
             <configList 
-              v-if="reportConfigCriterionId === i.TrialReadingCriterionId && activeName === 'reportConfig'" 
+              v-if="reportConfigCriterionId === i.TrialReadingCriterionId && activeName === 'reportsConfig'" 
               :trialReadingCriterionId="i.TrialReadingCriterionId"
-              :exportType="0"
-            />
-          </el-tab-pane>
-        </el-tabs>
-      </el-tab-pane>
-      <el-tab-pane
-        label="CDISC导出配置"
-        name="CDISCConfig"
-      >
-        <el-tabs type="border-card" v-model="CDISCCriterionId">
-          <el-tab-pane
-            :label="i.TrialReadingCriterionName"
-            :name="i.TrialReadingCriterionId"
-            v-for="i of trialCriterionList"
-            :key="i.TrialReadingCriterionId"
-          >
-            <configList 
-              v-if="CDISCCriterionId === i.TrialReadingCriterionId && activeName === 'CDISCConfig'" 
-              :trialReadingCriterionId="i.TrialReadingCriterionId"
-              :exportType="1"
             />
           </el-tab-pane>
         </el-tabs>
@@ -98,10 +61,8 @@ export default {
       trialCriterionList: [],
       reportCriterionId: null,
       trialId: null,
-      activeName: 'report',
-      CDISCCriterionId:'',
-      reportConfigCriterionId: '',
-      CDISCCriterionId: ''
+      activeName: 'reportsExport',
+      reportConfigCriterionId: ''
     }
   },
   props: {
@@ -123,9 +84,7 @@ export default {
         if (res.IsSuccess) {
           this.trialCriterionList = res.Result
           this.reportCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-          this.CDISCCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
           this.reportConfigCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-          this.CDISCCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
         }
       } catch(e) {
         console.log(e)

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

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="submit" style="margin-bottom: 5px;">提交</el-button>
+    <!-- 保存 -->
+    <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"
@@ -10,33 +13,40 @@
       default-expand-all
       :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
     >
+      <!-- 问题名称 -->
       <el-table-column 
         prop="QuestionName" 
-        label="问题名称"  
+        :label="$t('trials:readingTracking:config:questionName')"  
         width="300">
       </el-table-column>
       <el-table-column 
         v-for="item in exportInfo.DicList"
         :key="item.Code" 
-        :label="item.ValueCN"    >
+        :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+        
+      >
         <template v-slot="scope">
           <el-checkbox
             @change="() => changeState(scope, item.Code)"
-            :checked="getCheckState(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
-        v-if="exportType === 1"
         prop="CDISCCode"
-        label="CDISC编码"  
-        width="500" 
+        :label="$t('trials:readingTracking:config:code')"   
+        width="180" 
       >
        <template v-slot="scope">
           <el-input 
             v-model="scope.row.CDISCCode"
-            placeholder="CDISC编码"
             size="mini"
+            :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
         </template>
@@ -54,10 +64,6 @@ export default {
       type: String,
       required: true
     },
-    exportType: {
-      type: Number,
-      required: true
-    }
   },
   data() {
     return {
@@ -74,8 +80,7 @@ export default {
         this.loading = true
         let res = await getTrialQuestionExportResult(
           {
-            trialReadingCriterionId: this.trialReadingCriterionId, 
-            exportType: this.exportType
+            trialReadingCriterionId: this.trialReadingCriterionId
           }
         )
         if (res.IsSuccess) {
@@ -90,30 +95,7 @@ export default {
     async submit() {
       this.loading = true
       try {
-        let params= {
-          exportType: this.exportType,
-          questionList: [],
-          tableQuestionList: []
-        }
-        params.questionList = this.exportInfo.QuestionList.map(i => {
-          return {
-            questionId: i.QuestionId,
-            tableQuestionId: i.TableQuestionId,
-            exportResult: i.ExportResult,
-            CDISCCode: i.CDISCCode
-          }
-        })
-        this.exportInfo.QuestionList.forEach(i => {
-          let childlist = i.Children.map(k => {
-            return {
-              questionId: i.QuestionId,
-              tableQuestionId: k.TableQuestionId,
-              exportResult: k.ExportResult,
-              CDISCCode: k.CDISCCode
-            }
-          })
-          params.tableQuestionList = params.tableQuestionList.concat(childlist)
-        })
+        let params = this.filterQuestions(this.exportInfo.QuestionList)
         let res = await setTrialQuestionExportResult(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -124,6 +106,36 @@ export default {
         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
@@ -132,6 +144,25 @@ export default {
     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>

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

@@ -1,10 +1,5 @@
 <template>
-  <el-table 
-    v-loading="loading" 
-    :data="list" 
-    border 
-    stripe 
-    height="500">
+  <el-table v-loading="loading" :data="list" border stripe height="500">
     <el-table-column label="" width="50">
       <template slot-scope="scope">
         {{ scope.$index + 1 }}
@@ -19,11 +14,7 @@
         {{ scope.row.FileName }}
       </template>
     </el-table-column>
-    <el-table-column
-      prop=""
-      :label="$t('common:action:action')"
-      min-width="80"
-    >
+    <el-table-column prop="" :label="$t('common:action:action')" min-width="80">
       <template slot-scope="scope">
         <!-- 下载 -->
         <el-button
@@ -53,20 +44,20 @@ export default {
   props: {
     trialReadingCriterionId: {
       type: String,
-      required: true
+      required: true,
     },
     data: {
       type: Object,
       default() {
         return {}
-      }
-    }
+      },
+    },
   },
   data() {
     return {
       loading: false,
       trialId: null,
-      list: []
+      list: [],
     }
   },
   mounted() {
@@ -83,7 +74,7 @@ export default {
           this.list = res.Result
         }
         this.loading = false
-      } catch(e) {
+      } catch (e) {
         console.log(e)
         this.loading = false
       }
@@ -140,7 +131,8 @@ export default {
             })
           break
         case 8:
-          getCommonJudgeRatioList_Export(searchData)
+          searchData.ReadingExportType = 8
+          getCommonEvaluationList_Export(searchData)
             .then((res) => {})
             .catch(() => {
               this.loading = false

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>
@@ -943,6 +947,9 @@
 <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'
@@ -1089,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) {

src/views/trials/trials-panel/setting/attachment/index.vue

@@ -33,7 +33,7 @@
               v-for="item of $d.TrainingStatus"
               :key="item.value"
               :label="item.label"
-              :value="!item.value"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
@@ -136,10 +136,10 @@
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-            $fd('TrainingStatus', !scope.row.IsDeleted)
+            $fd('TrainingStatus', scope.row.IsDeleted)
           }}</el-tag>
           <el-tag v-else type="primary">{{
-            $fd('TrainingStatus', !scope.row.IsDeleted)
+            $fd('TrainingStatus', scope.row.IsDeleted)
           }}</el-tag>
         </template>
       </el-table-column>

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{

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>

src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

@@ -353,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"

src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue

@@ -154,7 +154,8 @@
           <el-button
             v-if="
               Array.isArray(scope.row.TrialUserRoleList) &&
-              scope.row.TrialUserRoleList.length > 0
+              scope.row.TrialUserRoleList.length > 0 &&
+              hasPermi(['trials:trials-panel:setting:personnel-manage:status'])
             "
             type="text"
             @click.stop="openRoleList(scope.row)"
@@ -179,6 +180,32 @@
               ).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>
       <!-- 联系电话 -->
@@ -289,6 +316,14 @@
             "
             @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>
@@ -407,7 +442,7 @@
                 <el-tooltip
                   class="item"
                   effect="dark"
-                  :content="$t('trials:staff:tip:userTypeDisabled')"
+                  :content="$t('trials:staff:tip:userTypeSysDisabled')"
                   placement="top"
                   style="margin-right: 3px"
                   v-if="scope.row.IsUserRoleDisabled"
@@ -438,7 +473,7 @@
             "
           >
             <template slot-scope="scope">
-              <span> {{ $fd('IsEnable', !scope.row.IsDeleted) }}</span>
+              <span> {{ $fd('IsDisable', scope.row.IsDeleted) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -471,7 +506,10 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('common:action:action')" width="120px">
+          <el-table-column
+            :label="$t('common:action:action')"
+            min-width="120px"
+          >
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -479,7 +517,7 @@
                 :disabled="scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
                 @click.stop="changeRoleStatus(scope.row, true)"
               >
-                {{ $fd('IsEnable', false) }}
+                {{ $fd('IsDisable', true) }}
               </el-button>
               <el-button
                 size="mini"
@@ -487,7 +525,7 @@
                 :disabled="!scope.row.IsDeleted || scope.row.UserTypeEnum === 1"
                 @click.stop="changeRoleStatus(scope.row, false)"
               >
-                {{ $fd('IsEnable', true) }}
+                {{ $fd('IsDisable', false) }}
               </el-button>
             </template>
           </el-table-column>
@@ -503,6 +541,7 @@ import {
   updateTrialUser,
   trialUserListExport,
   updateTrialUserRole,
+  trialUserSendJoinEmail,
 } from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import StaffForm from './staffForm'
@@ -583,12 +622,39 @@ 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('IsEnable', !status)
+          this.$fd('IsDisable', status)
         )
         let comfirm = await this.$confirm(message)
         if (!comfirm) return false

src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue

@@ -24,6 +24,7 @@
         <el-button
           size="mini"
           type="primary"
+          style="margin-right: 10px"
           icon="el-icon-refresh-left"
           @click="handleReset"
         >
@@ -172,7 +173,7 @@
           :model="permission"
           :rules="permissionRole"
           ref="permissionForm"
-          label-width="140px"
+          label-width="230px"
           class="demo-ruleForm"
         >
           <el-form-item
@@ -491,6 +492,7 @@ export default {
 .participant-container {
   height: 100%;
   .el-header {
+    padding-right: 5px;
     .filter-container {
       display: flex;
       align-items: center;

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>

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

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

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;
   }

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

@@ -771,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)"
               >
@@ -778,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)"
               >
@@ -785,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)"
               >

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>

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;
   }

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()
   },

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>

src/views/trials/trials-panel/trial-summary/login-log/index.vue

@@ -311,7 +311,7 @@ export default {
       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) => {

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
@@ -371,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,
       })
@@ -421,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,
       })

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" />
@@ -288,6 +288,7 @@ export default {
               TalkContent: content,
               CreateTime: item.CreateTime,
               CreateUserName: item.CreateUserName,
+              CreateUserFullName: item.CreateUserFullName,
               CreateUserId: item.CreateUserId,
               UserTypeEnum: item.UserTypeEnum,
             });

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

@@ -1680,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()

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
         }

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>
               <!-- 序列数量 -->