diff --git a/src/router/index.js b/src/router/index.js
index c7db4a8..c090d4e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,7 +46,7 @@ export const constantRoutes = [
     component: () => import('@/views/login'),
     hidden: true
   },
-   {
+  {
     path: '/lblh',
     component: () => import('@/views/lblh/index'),
     hidden: true
@@ -167,22 +167,49 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
+  },
+  {
+    path: '/study/enter',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:study:enter'],
+    children: [
+      {
+        path: ':studyId(\\d+)',
+        component: () => import('@/views/business/study/comp/enter'),
+        name: 'StudyEnter',
+        meta: { title: '进入试验', activeMenu: '/trial/list' }
+      }
+    ]
+  },
+  {
+    path: '/nonTrial/enter',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:form:nonTrial:enter'],
+    children: [
+      {
+        path: ':studyId(\\d+)',
+        component: () => import('@/views/business/form/nonTrial/comp/enter'),
+        name: 'NonTrialEnter',
+        meta: { title: '进入', activeMenu: '/form/nonTrial' }
+      }
+    ]
+  },
+  {
+    path: '/drug/enter',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:form:drug:enter'],
+    children: [
+      {
+        path: ':studyId(\\d+)',
+        component: () => import('@/views/business/form/drug/comp/enter'),
+        name: 'DrugEnter',
+        meta: { title: '进入', activeMenu: '/form/drug' }
+      }
+    ]
   }
-
-  // {
-  //   path: '/study/enter',
-  //   component: Layout,
-  //   hidden: true,
-  //   permissions: ['business:study:enter'],
-  //   children: [
-  //     {
-  //       path: 'index/:studyId(\\d+)',
-  //       component: () => import('@/views/business/study/comp/enter'),
-  //       name: 'Data',
-  //       meta: { title: '进入试验', activeMenu: '/busuness/study/list' }
-  //     }
-  //   ]
-  // }
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/business/form/drug/comp/enter.vue b/src/views/business/form/drug/comp/enter.vue
index eea197d..1659fcc 100644
--- a/src/views/business/form/drug/comp/enter.vue
+++ b/src/views/business/form/drug/comp/enter.vue
@@ -8,7 +8,7 @@
         </div>
       </div>
 
-      <div class="content-box">
+      <div class="content-box" v-if="study.id!='' && study.id!=undefined">
         <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" />
         <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback"/>
         <sqbd v-if="active === 'sqbd'" :study="study" @showDetail="showDetailCallback"/>
@@ -19,12 +19,13 @@
 </template>
 
 <script>
+import { drug_info} from "@/api/business/form/drug";
 import ytbd from './ytbd.vue'
 import tbbd from './tbbd.vue'
 import sqbd from './sqbd.vue'
 import wzlb from './wzlb.vue'
 export default {
-  name: 'StudyEnter',
+  name: 'DrugEnter',
   props: {},
   components: { ytbd, tbbd ,sqbd,wzlb},
   computed: {},
@@ -43,8 +44,20 @@ export default {
       study: {},
     }
   },
-  created() { },
+  created() {
+    this.getInfo()
+   },
   methods: {
+    getInfo(){
+      this.$modal.loading()
+      drug_info({id:this.$route.params.studyId}).then(({data}) => {
+        this.study = data
+        const obj = Object.assign({}, this.$route, { title: '麻精药：'+this.study.sn }) 
+        this.$tab.updatePage(obj);
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
     show(row) {
       this.study = row
     },
@@ -61,6 +74,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .study-enter {
+  margin: 10px 10px;
   .search-box {
     background: #fff;
     padding: 0;
diff --git a/src/views/business/form/drug/list.vue b/src/views/business/form/drug/list.vue
index 58e5f47..66bc600 100644
--- a/src/views/business/form/drug/list.vue
+++ b/src/views/business/form/drug/list.vue
@@ -141,7 +141,7 @@
     </div>
 
     <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
-    <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" />
+    <!-- <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" /> -->
     <Detail ref="detail" v-show="showType==='detail'" @cancel="showType='list'" />
     <Sign ref="signRef" @callback="doSign" />
   </div>
@@ -237,8 +237,9 @@ export default {
       this.getList()
     },
     enter(row){
-      this.showType = 'enter'
-      this.$refs.enter.show(row)
+      this.$tab.openPage("进入", '/drug/enter/' + row.id)
+      // this.showType = 'enter'
+      // this.$refs.enter.show(row)
     },
     detail(row){
       this.showType = 'detail'
diff --git a/src/views/business/form/nonTrial/comp/enter.vue b/src/views/business/form/nonTrial/comp/enter.vue
index e58ff89..dcfbf1b 100644
--- a/src/views/business/form/nonTrial/comp/enter.vue
+++ b/src/views/business/form/nonTrial/comp/enter.vue
@@ -8,7 +8,7 @@
         </div>
       </div>
 
-      <div class="content-box">
+      <div class="content-box" v-if="study.id!='' && study.id!=undefined">
         <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" />
         <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback"/>
         <syff v-if="active === 'syff'" :study="study" @showDetail="showDetailCallback"/>
@@ -19,12 +19,13 @@
 </template>
 
 <script>
+import { nonTrial_info} from "@/api/business/form/nonTrial";
 import ytbd from './ytbd.vue'
 import tbbd from './tbbd.vue'
 import syff from './syff.vue'
 import wzlb from './wzlb.vue'
 export default {
-  name: 'StudyEnter',
+  name: 'NonTrialEnter',
   props: {},
   components: { ytbd, tbbd ,syff,wzlb},
   computed: {},
@@ -43,8 +44,18 @@ export default {
       study: {},
     }
   },
-  created() { },
+  created() {this.getInfo() },
   methods: {
+    getInfo(){
+      this.$modal.loading()
+      nonTrial_info({id:this.$route.params.studyId}).then(({data}) => {
+        this.study = data
+        const obj = Object.assign({}, this.$route, { title: '非试验：'+this.study.sn }) 
+        this.$tab.updatePage(obj);
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
     show(row) {
       this.study = row
     },
@@ -61,6 +72,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .study-enter {
+  margin: 10px 10px;
   .search-box {
     background: #fff;
     padding: 0;
diff --git a/src/views/business/form/nonTrial/list.vue b/src/views/business/form/nonTrial/list.vue
index 8cc407f..2631642 100644
--- a/src/views/business/form/nonTrial/list.vue
+++ b/src/views/business/form/nonTrial/list.vue
@@ -141,7 +141,7 @@
     </div>
 
     <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
-    <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" />
+    <!-- <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" /> -->
     <Detail ref="detail" v-show="showType==='detail'" @cancel="showType='list'" />
     <Sign ref="signRef" @callback="doSign" />
   </div>
@@ -237,8 +237,9 @@ export default {
       this.getList()
     },
     enter(row){
-      this.showType = 'enter'
-      this.$refs.enter.show(row)
+      this.$tab.openPage("进入", '/nonTrial/enter/' + row.id)
+      // this.showType = 'enter'
+      // this.$refs.enter.show(row)
     },
     detail(row){
       this.showType = 'detail'
diff --git a/src/views/business/study/comp/enter.vue b/src/views/business/study/comp/enter.vue
index 2de28e7..d0b2ba7 100644
--- a/src/views/business/study/comp/enter.vue
+++ b/src/views/business/study/comp/enter.vue
@@ -8,7 +8,7 @@
         </div>
       </div>
 
-      <div class="content-box">
+      <div class="content-box" v-if="study.id!='' && study.id!=undefined">
         <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" />
         <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback"/>
         <syxx v-if="active === 'syxx'" :study="study" @showDetail="showDetailCallback"/>
@@ -21,6 +21,7 @@
 </template>
 
 <script>
+import { study_info} from "@/api/business/study/study";
 import ytbd from './ytbd.vue'
 import tbbd from './tbbd.vue'
 import syxx from './syxx.vue'
@@ -53,8 +54,20 @@ export default {
     // let x = this.$route.params
     // let y = this.$route.query
     // debugger
+    this.getInfo()
+
   },
   methods: {
+    getInfo(){
+      this.$modal.loading()
+      study_info({id:this.$route.params.studyId}).then(({data}) => {
+        this.study = data
+        const obj = Object.assign({}, this.$route, { title: '进入试验：'+this.study.sn }) 
+        this.$tab.updatePage(obj);
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
     show(row) {
       this.study = row
     },
@@ -71,6 +84,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .study-enter {
+  margin: 10px 10px;
   .search-box {
     background: #fff;
     padding: 0;
diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue
index a638799..58328b0 100644
--- a/src/views/business/study/comp/suject.vue
+++ b/src/views/business/study/comp/suject.vue
@@ -131,7 +131,7 @@ export default {
           this.subjectList = response.data;
           for(let i=0;i<this.subjectList.length;i++){
             let item = this.subjectList[i]
-            if(item.leader==this.userId || (item.userIdList && item.userIdList.length>0 && item.userIdList.indexof(this.userId)>-1)){
+            if(item.leader==this.userId || (item.userIdList && item.userIdList.length>0 && item.userIdList.indexOf(this.userId)>-1)){
               this.selectedSubjectId = item.id
               break
             }
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index 819140a..d575431 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -140,7 +140,7 @@
     </div>
 
     <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
-    <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" />
+    <!-- <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" /> -->
     <Detail ref="detail" v-show="showType==='detail'" @cancel="showType='list'" />
     <Sign ref="signRef" @callback="doSign" />
   </div>
@@ -236,11 +236,10 @@ export default {
       this.getList()
     },
     enter(row){
-      // const params = row
-      // this.$tab.openPage("进入试验", '/study/enter/index/' + row.id, params)
+      this.$tab.openPage("进入试验", '/study/enter/' + row.id)
 
-      this.showType = 'enter'
-      this.$refs.enter.show(row)
+      // this.showType = 'enter'
+      // this.$refs.enter.show(row)
     },
     detail(row){
       this.showType = 'detail'