From 924b11e0934f33b7719252ecd1653b6e5bbfd8a8 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 8 Jan 2026 18:03:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E8=BF=9B=E5=85=A5=E8=AF=95=E9=AA=8C=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/study/comp/syff.vue     | 16 ++++------------
 src/views/business/study/comp/syffList.vue |  2 +-
 src/views/business/study/comp/syj.vue      | 16 ++++------------
 src/views/business/study/comp/syjList.vue  |  2 +-
 src/views/business/study/comp/syxx.vue     |  1 +
 src/views/business/study/comp/tbbd.vue     | 17 +++++------------
 src/views/business/study/comp/tbbdList.vue |  2 +-
 src/views/business/study/comp/ytbd.vue     | 15 ++++-----------
 src/views/business/study/comp/ytbdList.vue |  2 +-
 9 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/src/views/business/study/comp/syff.vue b/src/views/business/study/comp/syff.vue
index 27750a6..958584b 100644
--- a/src/views/business/study/comp/syff.vue
+++ b/src/views/business/study/comp/syff.vue
@@ -3,7 +3,7 @@
     <div class="tbbd-left" v-show="!showDetail">
       <sbject :study="study" @change="changeSubject" />
     </div>
-    <div class="tbbd-right" v-if="studyInfo.studySubjectId!=''">
+    <div class="tbbd-right" v-if="studyInfo.studySubjectId!='' && studyInfo.studySubjectId!=undefined">
       <syffList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
@@ -25,14 +25,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: {sbject, syffList},
@@ -41,11 +37,7 @@ export default {
   data() {
     return {
       showDetail:false,
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/study/comp/syffList.vue b/src/views/business/study/comp/syffList.vue
index 9baeffd..13cdebe 100644
--- a/src/views/business/study/comp/syffList.vue
+++ b/src/views/business/study/comp/syffList.vue
@@ -107,7 +107,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studyId = newVal.id
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
         this.search()
diff --git a/src/views/business/study/comp/syj.vue b/src/views/business/study/comp/syj.vue
index f8c06e3..0f00979 100644
--- a/src/views/business/study/comp/syj.vue
+++ b/src/views/business/study/comp/syj.vue
@@ -4,7 +4,7 @@
     <div class="tbbd-left" v-show="!showDetail">
       <sbject :study="study" @change="changeSubject" />
     </div>
-    <div class="tbbd-right" v-if="studyInfo.studySubjectId != ''">
+    <div class="tbbd-right" v-if="studyInfo.studySubjectId!='' && studyInfo.studySubjectId!=undefined">
       <syjList :study="studyInfo" @showDetail="showDetailCallback" />
     </div>
   </div>
@@ -25,15 +25,11 @@ export default {
   },
   watch: {
     study: {
+      deep: true,
       immediate: true,
       handler(v) {
-        this.studyInfo = {
-          studyId: v.id,
-          studyLeader: v.leader,
-          studySubjectId: ''
-        }
+        this.studyInfo = v
       },
-      deep: true,
     },
   },
   components: { sbject, syjList },
@@ -42,11 +38,7 @@ export default {
   data() {
     return {
       showDetail: false,
-      studyInfo: {
-        studyId: this.study.id,
-        studyLeader: this.study.leader,
-        studySubjectId: ''
-      }
+      studyInfo: {}
     }
   },
   created() { },
diff --git a/src/views/business/study/comp/syjList.vue b/src/views/business/study/comp/syjList.vue
index 16e0482..277c524 100644
--- a/src/views/business/study/comp/syjList.vue
+++ b/src/views/business/study/comp/syjList.vue
@@ -125,7 +125,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studyId = newVal.id
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
         this.search()
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index 7de964e..e620224 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -76,6 +76,7 @@ export default {
   watch: {
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
         this.id = v.id
         this.getStudyInfo()
diff --git a/src/views/business/study/comp/tbbd.vue b/src/views/business/study/comp/tbbd.vue
index 0ffd96b..86a43bd 100644
--- a/src/views/business/study/comp/tbbd.vue
+++ b/src/views/business/study/comp/tbbd.vue
@@ -3,7 +3,7 @@
     <div class="tbbd-left" v-show="!showDetail">
       <sbject :study="study" @change="changeSubject" />
     </div>
-    <div class="tbbd-right" v-if="studyInfo.studySubjectId!=''">
+    <div class="tbbd-right" v-if="studyInfo.studySubjectId!='' && studyInfo.studySubjectId!=undefined">
       <tbbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
@@ -25,13 +25,10 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
-      }
+        this.studyInfo = v
+      },
     },
   },
   components: {sbject,tbbdList},
@@ -40,11 +37,7 @@ export default {
   data() {
     return {
       showDetail:false,
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index 76b0928..46f1e40 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -204,7 +204,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studyId = newVal.id
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
         this.getIsMatchSubject()
diff --git a/src/views/business/study/comp/ytbd.vue b/src/views/business/study/comp/ytbd.vue
index e42ff3b..6e039bf 100644
--- a/src/views/business/study/comp/ytbd.vue
+++ b/src/views/business/study/comp/ytbd.vue
@@ -3,7 +3,7 @@
     <div class="ytbd-left" v-show="!showDetail">
       <sbject :study="study" :operate="true" @change="changeSubject" />
     </div>
-    <div class="ytbd-right" v-if="studyInfo.studySubjectId!=''">
+    <div class="ytbd-right" v-if="studyInfo.studySubjectId!='' && studyInfo.studySubjectId!=undefined">
       <ytbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
@@ -25,12 +25,9 @@ export default {
   watch:{
     study: {
       immediate: true,
+      deep:true,
       handler(v) {
-        this.studyInfo = {
-          studyId:v.id,
-          studyLeader:v.leader,
-          studySubjectId:''
-        }
+        this.studyInfo = v
       }
     },
   },
@@ -40,11 +37,7 @@ export default {
   data() {
     return {
       showDetail:false,
-      studyInfo:{
-        studyId:this.study.id,
-        studyLeader:this.study.leader,
-        studySubjectId:''
-      }
+      studyInfo:{}
     }
   },
   created() {},
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 09b215e..7ee4855 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -199,7 +199,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studyId = newVal.id
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
         this.search()