diff --git a/src/views/business/form/drug/comp/sqbd.vue b/src/views/business/form/drug/comp/sqbd.vue
index 55d20e9..5472adf 100644
--- a/src/views/business/form/drug/comp/sqbd.vue
+++ b/src/views/business/form/drug/comp/sqbd.vue
@@ -21,12 +21,9 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       }
     },
   },
@@ -35,11 +32,7 @@ export default {
   filters: {},
   data() {
     return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue
index f4f17be..1efa81f 100644
--- a/src/views/business/form/drug/comp/sqbdList.vue
+++ b/src/views/business/form/drug/comp/sqbdList.vue
@@ -204,8 +204,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
-        this.searchForm.studySubjectId = newVal.studySubjectId
+        this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.search()
       },
@@ -230,7 +229,6 @@ export default {
         studyId: '',
         studySn: '',
         studyMc: '',
-        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -303,7 +301,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc, studyId: this.searchForm.studyId })
     },
     edit(row) {
       this.showEdit = true
diff --git a/src/views/business/form/drug/comp/syff.vue b/src/views/business/form/drug/comp/syff.vue
deleted file mode 100644
index d24f3aa..0000000
--- a/src/views/business/form/drug/comp/syff.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <div class="study-tbbd">
-    <div class="tbbd-right">
-      配置方法列表
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'StudySyff',
-  props: {
-    study:{
-      type:Object,
-      default:()=>{
-        return {}
-      }
-    }
-  },
-  watch:{
-    study: {
-      immediate: true,
-      handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
-      },
-      deep: true,
-    },
-  },
-  components: {},
-  computed: {},
-  filters: {},
-  data() {
-    return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
-    }
-  },
-  created() {},
-  methods: {
-  }
-}
-</script>
-<style lang="scss" scoped>
-.study-tbbd {
-  display: flex;
-  flex-direction: row;
-  .tbbd-left {
-    background: #fff;
-    padding: 20px;
-    margin-right: 10px;
-    flex-shrink: 0;
-    width: 350px;
-  }
-  .tbbd-right{
-    flex-grow: 1;
-    overflow: hidden;
-  }
-}
-</style>
diff --git a/src/views/business/form/drug/comp/tbbd.vue b/src/views/business/form/drug/comp/tbbd.vue
index 1145d97..f1dec26 100644
--- a/src/views/business/form/drug/comp/tbbd.vue
+++ b/src/views/business/form/drug/comp/tbbd.vue
@@ -21,12 +21,9 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       }
     },
   },
@@ -37,11 +34,7 @@ export default {
   filters: {},
   data() {
     return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue
index f3afa4b..c6cd3b2 100644
--- a/src/views/business/form/drug/comp/tbbdList.vue
+++ b/src/views/business/form/drug/comp/tbbdList.vue
@@ -203,8 +203,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
-        this.searchForm.studySubjectId = newVal.studySubjectId
+        this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.search()
       },
@@ -228,7 +227,6 @@ export default {
         studyId: '',
         studySn: '',
         studyMc: '',
-        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -304,7 +302,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId })
     },
     edit(row) {
       this.showEdit = true
diff --git a/src/views/business/form/drug/comp/wzlb.vue b/src/views/business/form/drug/comp/wzlb.vue
index 99466ac..94b8029 100644
--- a/src/views/business/form/drug/comp/wzlb.vue
+++ b/src/views/business/form/drug/comp/wzlb.vue
@@ -19,8 +19,6 @@ export default {
     study: {
       immediate: true,
       handler(v) {
-        this.id = v.id
-        // this.getStudyInfo()
       }
     },
   },
diff --git a/src/views/business/form/drug/comp/ytbd.vue b/src/views/business/form/drug/comp/ytbd.vue
index 341c2e5..356b8e7 100644
--- a/src/views/business/form/drug/comp/ytbd.vue
+++ b/src/views/business/form/drug/comp/ytbd.vue
@@ -21,12 +21,9 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       }
     },
   },
@@ -37,11 +34,7 @@ export default {
   filters: {},
   data() {
     return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 68ecb2a..a4f8b4b 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -197,8 +197,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
-        this.searchForm.studySubjectId = newVal.studySubjectId
+        this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.search()
       },
@@ -226,7 +225,6 @@ export default {
         studyId: '',
         studySn: '',
         studyMc: '',
-        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -346,7 +344,7 @@ export default {
       this.open = false
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId })
     },
     edit(row) {
       this.showEdit = true
diff --git a/src/views/business/form/nonTrial/comp/syff.vue b/src/views/business/form/nonTrial/comp/syff.vue
index d24f3aa..ae8a6d3 100644
--- a/src/views/business/form/nonTrial/comp/syff.vue
+++ b/src/views/business/form/nonTrial/comp/syff.vue
@@ -20,14 +20,10 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep: true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       },
-      deep: true,
     },
   },
   components: {},
@@ -35,11 +31,7 @@ export default {
   filters: {},
   data() {
     return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/form/nonTrial/comp/tbbd.vue b/src/views/business/form/nonTrial/comp/tbbd.vue
index 56b2f16..70232e5 100644
--- a/src/views/business/form/nonTrial/comp/tbbd.vue
+++ b/src/views/business/form/nonTrial/comp/tbbd.vue
@@ -21,12 +21,9 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       }
     },
   },
@@ -37,11 +34,7 @@ export default {
   filters: {},
   data() {
     return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue
index 9563fcc..9938ef0 100644
--- a/src/views/business/form/nonTrial/comp/tbbdList.vue
+++ b/src/views/business/form/nonTrial/comp/tbbdList.vue
@@ -203,8 +203,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
-        this.searchForm.studySubjectId = newVal.studySubjectId
+        this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.search()
       },
@@ -228,7 +227,6 @@ export default {
         studyId: '',
         studySn: '',
         studyMc: '',
-        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -304,7 +302,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId })
     },
     edit(row) {
       this.showEdit = true
diff --git a/src/views/business/form/nonTrial/comp/wzlb.vue b/src/views/business/form/nonTrial/comp/wzlb.vue
index 99466ac..94b8029 100644
--- a/src/views/business/form/nonTrial/comp/wzlb.vue
+++ b/src/views/business/form/nonTrial/comp/wzlb.vue
@@ -19,8 +19,6 @@ export default {
     study: {
       immediate: true,
       handler(v) {
-        this.id = v.id
-        // this.getStudyInfo()
       }
     },
   },
diff --git a/src/views/business/form/nonTrial/comp/ytbd.vue b/src/views/business/form/nonTrial/comp/ytbd.vue
index 8f3302a..e90168f 100644
--- a/src/views/business/form/nonTrial/comp/ytbd.vue
+++ b/src/views/business/form/nonTrial/comp/ytbd.vue
@@ -21,12 +21,9 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       }
     },
   },
@@ -37,11 +34,7 @@ export default {
   filters: {},
   data() {
     return {
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index b4b074b..9d1c57e 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -53,6 +53,8 @@
             <el-button type="primary" icon="el-icon-plus"  @click="showAdd()"
               v-hasPermi="['business:nonTrialFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
+
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5">{{ $t('page.business.study.nonTrial.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -163,11 +165,15 @@
       append-to-body :close-on-click-modal="false">
       <TemplateTable ref="templateTable" :sn="formPreview.templateSn" fillType="preFill" />
     </el-dialog>
+
+    <Sign ref="fsySignRef" @callback="doSign" />
   </div>
 
 </template>
 
 <script>
+import { checkPermi, checkRole } from "@/utils/permission";
+import { nonTrial_checkSd,nonTrial_sd } from "@/api/business/form/nonTrial"
 import { studyFormPre_list, studyFormPre_info } from '@/api/business/study/studyFormPre'
 import { public_studyList, public_studyFormPreList } from '@/api/business/public/public'
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -175,6 +181,7 @@ import Bj from "@/views/business/study/comp/ytbd/Bj";
 import Xq from "@/views/business/study/comp/ytbd/Xq";
 import Sh from "@/views/business/study/comp/ytbd/Sh";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import Sign from './sign.vue'
 import moment from "moment";
 import { mapGetters } from 'vuex'
 export default {
@@ -197,16 +204,16 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
-        this.searchForm.studySubjectId = newVal.studySubjectId
+        this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
+        this.studyStatus = newVal.status
         this.search()
       },
       immediate: true,
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
+  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
   data() {
     return {
       formPreview: {
@@ -216,6 +223,7 @@ export default {
       openXz: false,
       open: false,
       leader: null,
+      studyStatus: null,
       showAudit: false,
       showEdit: false,
       showDetail: false,
@@ -226,7 +234,6 @@ export default {
         studyId: '',
         studySn: '',
         studyMc: '',
-        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -260,6 +267,8 @@ export default {
   },
   created() { },
   methods: {
+    checkPermi,
+    checkRole,
     copy() {
       this.$modal.loading()
       public_studyList().then(response => {
@@ -346,7 +355,7 @@ export default {
       this.open = false
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId})
     },
     edit(row) {
       this.showEdit = true
@@ -378,6 +387,31 @@ export default {
       this.$emit('showDetail', this.showAudit)
       this.$refs.Sh.show(row)
     },
+    sdsy() {
+      this.$modal.loading()
+      nonTrial_checkSd({
+        study:{id:this.study.id},
+      }).then(() => {
+        this.$refs.fsySignRef.show(this.$t('page.business.study.nonTrial.sdsy'),this.$t('page.business.study.nonTrial.sdsy'))
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    doSign(val){
+      this.doSd(val)
+    },
+    doSd(sign){
+      this.$modal.loading()
+      nonTrial_sd({
+        study:{id:this.study.id},
+        sign:sign
+      }).then(() => {
+        this.$refs.fsySignRef.cancel()
+        this.getStudyInfo()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
   }
 }
 </script>
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index e620224..da0977e 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -35,7 +35,7 @@
             </el-form-item>
           </el-col>
           <el-col>
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==userId || checkRole(['TFM'])) && studyInfo.status!=5">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -63,6 +63,7 @@ import Sign from './sign.vue'
 import jhbdList from './jhbdList.vue'
 import { study_info,study_checkSd,study_sd } from "@/api/business/study/study"
 import { studySubject_listByStudyId } from '@/api/business/study/studySubject'
+import { mapGetters } from 'vuex'
 export default {
   name: 'StudyTbbd',
   props: {
@@ -78,17 +79,21 @@ export default {
       immediate: true,
       deep:true,
       handler(v) {
-        this.id = v.id
+        this.studyId = v.id
         this.getStudyInfo()
       }
     },
   },
   components: { jhbdList,Sign },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   data() {
     return {
-      userId:this.$store.getters.id,
       showDetail: false,
-      id: {},
+      studyId: '',
       studyInfo:{},
       subjectList: []
     }
@@ -99,7 +104,7 @@ export default {
     checkPermi,
     checkRole,
     getstudySubject() {
-      studySubject_listByStudyId({ studyId: this.id }).then(response => {
+      studySubject_listByStudyId({ studyId: this.studyId }).then(response => {
         this.subjectList = response.data;
       }).finally(() => {
         this.$modal.closeLoading()
@@ -107,7 +112,7 @@ export default {
     },
     getStudyInfo() {
       this.$modal.loading()
-      study_info({ id: this.id }).then(response => {
+      study_info({ id: this.studyId }).then(response => {
         this.studyInfo = response.data
         this.getstudySubject()
       }).finally(() => {
@@ -117,7 +122,7 @@ export default {
     sdsy() {
       this.$modal.loading()
       study_checkSd({
-        study:{id:this.study.id},
+        study:{id:this.studyId},
       }).then(() => {
         this.$refs.syxxSignRef.show(this.$t('page.business.study.study.sdsy'),this.$t('page.business.study.study.sdsy'))
       }).finally(() => {
@@ -130,7 +135,7 @@ export default {
     doSd(sign){
       this.$modal.loading()
       study_sd({
-        study:{id:this.study.id},
+        study:{id:this.studyId},
         sign:sign
       }).then(() => {
         this.$refs.syxxSignRef.cancel()
diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue
index 59d3338..572dcc7 100644
--- a/src/views/business/study/comp/wzlb.vue
+++ b/src/views/business/study/comp/wzlb.vue
@@ -39,7 +39,7 @@
 
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
-import { study_info,study_checkSd,study_sd } from "@/api/business/study/study"
+import { study_info } from "@/api/business/study/study"
 import { studySubject_listByStudyId } from '@/api/business/study/studySubject'
 export default {
   name: 'StudyWzlb',
@@ -55,7 +55,7 @@ export default {
     study: {
       immediate: true,
       handler(v) {
-        this.id = v.id
+        this.studyId = v.id
         this.getStudyInfo()
       }
     },
@@ -63,9 +63,8 @@ export default {
   components: {  },
   data() {
     return {
-      userId:this.$store.getters.id,
       showDetail: false,
-      id: {},
+      studyId: '',
       studyInfo:{},
       subjectList: []
     }
@@ -76,7 +75,7 @@ export default {
     checkPermi,
     checkRole,
     getstudySubject() {
-      studySubject_listByStudyId({ studyId: this.id }).then(response => {
+      studySubject_listByStudyId({ studyId: this.studyId }).then(response => {
         this.subjectList = response.data;
       }).finally(() => {
         this.$modal.closeLoading()
@@ -84,38 +83,13 @@ export default {
     },
     getStudyInfo() {
       this.$modal.loading()
-      study_info({ id: this.id }).then(response => {
+      study_info({ id: this.studyId }).then(response => {
         this.studyInfo = response.data
         this.getstudySubject()
       }).finally(() => {
         this.$modal.closeLoading()
       })
     },
-    sdsy() {
-      this.$modal.loading()
-      study_checkSd({
-        study:{id:this.study.id},
-      }).then(() => {
-        this.$refs.syxxSignRef.show(this.$t('page.business.study.study.sdsy'),this.$t('page.business.study.study.sdsy'))
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
-    },
-    doSign(val){
-      this.doSd(val)
-    },
-    doSd(sign){
-      this.$modal.loading()
-      study_sd({
-        study:{id:this.study.id},
-        sign:sign
-      }).then(() => {
-        this.$refs.syxxSignRef.cancel()
-        this.getStudyInfo()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
-    },
     showDetailCallback(val) {
       this.showDetail = val
       this.$emit('showDetail', val)