国际化修改

src/App.vue

@@ -209,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 {

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/store/modules/reading.js

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

@@ -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"
       >
@@ -69,6 +69,7 @@
           :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="110"
         />
         <el-table-column
           prop="NeedConfirmedUserTypes"
@@ -103,6 +104,7 @@
           :label="$t('dictionary:signature:table:DocUserSignType')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="90"
         >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
@@ -115,7 +117,7 @@
           sortable="custom"
         />
 
-        <el-table-column :label="$t('common:action: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') }}

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

@@ -57,8 +57,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/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/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">

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

@@ -334,7 +334,7 @@ export default {
   },
   mounted() {
     let lang = zzSessionStorage.getItem('lang') || 'zh'
-    zzSessionStorage.clear()
+    // zzSessionStorage.clear()
     this.loginType = this.$route.query.loginType
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
@@ -421,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,

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

@@ -1015,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/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" :disabled="user.UserCode" />
+        <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" />

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

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

@@ -392,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'),

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: {

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

@@ -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/medical-feedback/components/ChatForm.vue

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

src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue

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

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

@@ -22,12 +22,15 @@
       <el-table-column 
         v-for="item in exportInfo.DicList"
         :key="item.Code" 
-        :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
+        :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+        
+      >
         <template v-slot="scope">
           <el-checkbox
             @change="() => changeState(scope, item.Code)"
             :checked="getCheckState(scope, item.Code)"
             :disabled="getDisabledState(scope.row, item)"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-checkbox>
         </template>
@@ -43,6 +46,7 @@
             v-model="scope.row.CDISCCode"
             size="mini"
             :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
+            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
         </template>
@@ -91,29 +95,7 @@ export default {
     async submit() {
       this.loading = true
       try {
-        let params= {
-          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

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

@@ -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,7 +102,18 @@
           :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"
@@ -220,11 +242,16 @@ export default {
       userListLoading: '',
       userList: [],
       trialId: '',
+      hasSubjectRoute: false,
+      hasVisitRoute: false
     }
   },
   mounted() {
     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: {
@@ -273,6 +300,26 @@ export default {
       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/subject-list/index.vue

@@ -291,6 +291,7 @@ import SubjectsForm from './components/SubjectsForm'
 import SubjectStatusForm from './components/SubjectStatusForm'
 import MessageTable from './components/MessageTable'
 import moment from 'moment'
+import { changeURLStatic } from '@/utils/history.js'
 const searchDataDefault = () => {
   return {
     Code: '',
@@ -339,6 +340,10 @@ export default {
     this.hasCrcRoute = this.hasRoute('crc-upload', trialsPanelRouter)
     this.hasQCRoute = this.hasRoute('qc-check', trialsPanelRouter)
     this.trialId = this.$route.query.trialId
+    if (this.$route.query.trialSiteId) {
+      this.searchData.TrialSiteId = this.$route.query.trialSiteId
+      changeURLStatic('trialSiteId', '')
+    }
     this.getSite()
     this.getList()
   },
@@ -441,7 +446,7 @@ export default {
     // 关闭状态编辑框
     closeStatusDialog() {
       this.statusVisible = false
-    },
+    }, 
     handleTotalVisitCount(subjectCode) {
       if (this.hasCrcRoute) {
         this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}` })

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

src/views/trials/trials-workbench/components/needSignSysDoc.vue

@@ -59,7 +59,7 @@
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        prop="CreateTime"
         show-overflow-tooltip
         sortable="custom"
       />
@@ -168,7 +168,7 @@ const searchDataDefault = () => {
     pageIndex: 1,
     pageSize: 20,
     asc: false,
-    sortField: 'UpdateTime',
+    sortField: 'CreateTime',
   }
 }
 export default {

src/views/trials/trials-workbench/components/needSignedSysDoc.vue

@@ -38,7 +38,7 @@
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        prop="CreateTime"
         show-overflow-tooltip
         sortable="custom"
       />
@@ -130,7 +130,7 @@ const searchDataDefault = () => {
     pageIndex: 1,
     pageSize: 20,
     asc: false,
-    sortField: 'UpdateTime'
+    sortField: 'CreateTime'
   }
 }
 export default {

src/views/trials/trials-workbench/index.vue

@@ -233,14 +233,14 @@
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
+                  <span class="my_select_box_content_text" :title="$t('trials:workbench:title:trialDocSigned')">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
                 </div>
               </div>
               <!-- 系统已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedSysDoc'}" tab-data="NeedSignedSysDoc" @click="$nextTick(() => selected = 'NeedSignedSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
+                  <span class="my_select_box_content_text" :title="$t('trials:workbench:title:sysDocSigned')">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
                 </div>
               </div>
             </div>