国际化修改

src/App.vue

@@ -209,9 +209,9 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.indexOf(this.key) ||
+              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.Value.indexOf(this.key) ||
+              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.ValueCN.indexOf(this.key)
+              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
           )
         )
       } else {

src/store/modules/reading.js

@@ -882,13 +882,13 @@ const actions = {
               // }
               series.InstanceInfoList.forEach(instance => {
                 if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
-                  if (study.IsCriticalSequence && instance.KeyFramesList.length > 0 && instance.KeyFramesList[0] !== null) {
+                  if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) {
                     instance.KeyFramesList.map(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 if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
-                    console.log(111)
+                    // 兼容保存标记数据未存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)

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

@@ -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">{{
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            $t("dictionary:browser:button:reset")
+            {{ $t('common:button:search') }}
-          }}</el-button>
+          </el-button>
-          <el-button type="primary" @click="handleSearch">{{
+          <el-button
-            $t("dictionary:browser:button:search")
+            type="primary"
-          }}</el-button>
+            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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-              <el-button type="primary" @click="handleSearch">查询</el-button>
+                {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleReset">重置</el-button>
+            {{ $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" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $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-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/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/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>