From 89ab6bcf932957329c95239f8684cf0f3627460b Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 22 Jan 2026 10:27:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E8=A1=A8=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/study/comp/tbbd/Bj.vue | 18 +++++++++++++++---
 src/views/business/study/comp/ytbd/Xq.vue | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 8e9bcd4..f0c586f 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -535,6 +535,18 @@ export default {
         this.$tab.closeOpenPage('/404')
       }
     },
+    cancelSave() {
+      try {
+        let key = caesarDecipher(this.$route.params.key)
+        let data = JSON.parse(key)
+        if (data && data != undefined && data != '') {
+          const obj = { path: data.urlTj ? data.urlTj : data.url }
+          this.$tab.closeOpenPage(obj)
+        }
+      } catch (e) {
+        this.$tab.closeOpenPage('/404')
+      }
+    },
     reset() {
       this.form = {
         id: null,
@@ -564,7 +576,7 @@ export default {
           this.$modal.loading()
           studyFormFill_bcOnly(this.form).then(response => {
             this.$modal.closeLoading()
-            this.cancel()
+            this.cancelSave()
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -585,7 +597,7 @@ export default {
           this.$modal.loading()
           studyFormFill_bc(this.form).then(response => {
             this.$modal.closeLoading()
-            this.cancel()
+            this.cancelSave()
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -607,7 +619,7 @@ export default {
           studyFormFill_tj(that.formApprove).then(response => {
             that.openApprove = false
             that.$modal.closeLoading()
-            that.cancel()
+            that.cancelSave()
           }).finally(() => {
             that.$modal.closeLoading()
           })
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index 91d1fdd..e78ba2d 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -10,8 +10,10 @@
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="primary" v-hasPermi="['business:studyFormPre:tb','business:nonTrialFormPre:tb','business:drugFormPre:tb']" v-if="form.bdzt === 5 && (fromNon || isMatchSubject)" @click="openApprove = true">{{
-            $t('page.business.study.studyFormPre.tb') }}</el-button>
+          <el-button type="primary"
+            v-hasPermi="['business:studyFormPre:tb', 'business:nonTrialFormPre:tb', 'business:drugFormPre:tb']"
+            v-if="form.bdzt === 5 && (fromNon || isMatchSubject)" @click="openApprove = true">{{
+              $t('page.business.study.studyFormPre.tb') }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
@@ -55,7 +57,8 @@
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px" v-if="openApprove">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
-        <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" style="margin-bottom: 10px;" type="success">
+        <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" style="margin-bottom: 10px;"
+          type="success">
         </el-alert>
         <el-row>
           <el-col :span="24">
@@ -232,8 +235,17 @@ export default {
         if (valid) {
           this.$modal.loading()
           studyFormPre_tb(this.formApprove).then(response => {
+            let type = ''
+            if (this.$route.fullPath.indexOf('/study/') > -1) {
+              type = '/study'
+            } else if (this.$route.fullPath.indexOf('/nonTrial/') > -1) {
+              type = '/nonTrial'
+            } else {
+              type = '/drug'
+            }
             let params = caesarCipher(JSON.stringify({
               url: this.$route.fullPath,
+              urlTj: type+'/enter/' + this.form.studyId + '/tbbd',
               studyId: this.form.studyId,
               formId: response.data.id,
               fromYt: true