Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

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/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/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/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/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">
@@ -576,6 +576,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+  .reading-period{
+    /deep/.search {
+      padding: 0px !important;
+    }
+  }
   /deep/ .hidden-row{
     display: none;
   }