工作台改版

src/layout/components/Navbar.vue

@@ -40,6 +40,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </div>
+        <TopLang></TopLang>
       </div>
     </div>
   </div>
@@ -50,12 +51,15 @@ import {mapGetters, mapMutations} from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
+import TopLang from './topLang'
+
 
 export default {
   components: {
     Breadcrumb,
     Hamburger,
-    Screenfull
+    Screenfull,
+    TopLang
   },
   data() {
     return {

src/layout/components/topLang.vue

@@ -0,0 +1,54 @@
+<template>
+  <el-dropdown
+    style="height:50px;line-height: 60px;"
+    @command="handleSetLanguage"
+  >
+
+    <span class="el-dropdown-link">
+      <svg-icon icon-class="language" style="font-size:25px;margin:0 10px;" />
+      <!-- {{ language==='zh'?'语言：中文':'Language: English' }} -->
+      <!-- <i class="el-icon-arrow-down el-icon--right" /> -->
+    </span>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item
+        :disabled="language==='zh'"
+        command="zh"
+      >中文
+      </el-dropdown-item>
+      <el-dropdown-item
+        :disabled="language==='en'"
+        command="en"
+      >English
+      </el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  name: 'TopLang',
+
+  data() {
+    return {}
+  },
+  computed: {
+    ...mapGetters({
+      language: 'language'
+    })
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    handleSetLanguage(lang) {
+      this.$i18n.locale = lang
+      this.setLanguage(lang)
+      this.$updateDictionary()
+      // window.location.reload()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/reviewers/components/Employment.vue

@@ -376,9 +376,9 @@ export default {
           this.loading = true
           this.isDisabled = true
           const param = {}
-          var o = this.$d.PhysicianOriginal.find(v => {
+          // var o = this.$d.PhysicianOriginal.find(v => {
-            return v.id === this.employmentForm.PhysicianId
+          //   return v.id === this.employmentForm.PhysicianId
-          })
+          // })
           param.Id = this.$route.query.Id
           param.DepartmentId = this.employmentForm.DepartmentId
           param.DepartmentOther = this.employmentForm.DepartmentId === this.otherId ? this.employmentForm.DepartmentOther : ''
@@ -386,9 +386,9 @@ export default {
           param.RankId = this.employmentForm.RankId
           param.RankOther = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOther : ''
           param.RankOtherCN = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOtherCN : ''
-          param.PhysicianId = this.employmentForm.PhysicianId
+          // param.PhysicianId = this.employmentForm.PhysicianId
-          param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician
+          // param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician
-          param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN
+          // param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN
           param.PositionId = this.employmentForm.PositionId
           param.PositionOther = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOther : ''
           param.PositionOtherCN = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOtherCN : ''

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

@@ -9,127 +9,125 @@
             <!-- PM/APM -->
             <!-- 阅片期 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
                 <clinicalDataPM :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
             </el-tab-pane>
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <consistencyCheck :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 重阅审批 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <RereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 阅片人筛选 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ReviewerScreen :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 中心调研 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <SiteResearch :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- SPM/CPM -->
             <!-- 阅片人审批 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ReviewerApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 重阅审批 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <SpmRereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- CRC -->
             <!-- 临床数据录入 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 临床数据确认 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 影像质疑 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 核查质疑 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 影像重传 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 加急影像提交 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- IQC -->
             <!-- 影像质控 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- QC质疑 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- IR -->
             <!-- 影像待阅 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 医学反馈 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- MIM -->
             <!-- 医学审核 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 项目签署文件 -->
             <el-tab-pane  v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <NeedSignTrialDoc :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 系统签署文件 -->
             <el-tab-pane v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <NeedSignSysDoc @refreshStats="refreshStats" />
-              </el-card>
+
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -141,80 +139,80 @@
 <!--          &lt;!&ndash; CRC &ndash;&gt;-->
 <!--          &lt;!&ndash; 临床数据录入 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 影像质疑 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 核查质疑 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 影像重传 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 加急影像提交 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; IQC &ndash;&gt;-->
 <!--          &lt;!&ndash; 影像质控 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageQC'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; QC质疑 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; IR &ndash;&gt;-->
 <!--          &lt;!&ndash; 影像待阅 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 医学反馈 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; MIM &ndash;&gt;-->
 <!--          &lt;!&ndash; 医学审核 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          <div v-if="!isSignSystemDoc && !hasPermi(['role:zys'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <NeedSignTrialDoc />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <NeedSignSysDoc @refreshStats="refreshStats" />-->
 <!--            </el-card>-->
 <!--          </div>-->