diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 66fc425..8fdcae2 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -444,7 +444,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row, true)
+      this.$refs.Xq.show(row, true,this.searchForm)
     },
     audit(row) {
       this.showAudit = true
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index 1a6fc17..fe3662a 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -481,7 +481,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row, true)
+      this.$refs.Xq.show(row, true,this.searchForm)
     },
     audit(row) {
       this.showAudit = true
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index b67449d..045433a 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -12,7 +12,7 @@
           <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">{{
+            v-if="form.bdzt === 5 && (fromNon || isMatchSubject)" @click="showTianbao">{{
               $t('page.business.study.studyFormPre.tb') }}</el-button>
         </div>
       </div>
@@ -48,8 +48,7 @@
           <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showBj="false" :showXg="true" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-            @pagination="getJjcgjList"  :page.sync="queryParamsJcgj.pageNum"
-              :limit.sync="queryParamsJcgj.pageSize"/>
+            @pagination="getJjcgjList" :page.sync="queryParamsJcgj.pageNum" :limit.sync="queryParamsJcgj.pageSize" />
         </div>
       </div>
     </div>
@@ -57,7 +56,7 @@
     <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px"
       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" show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" style="margin-bottom: 10px;"
           type="success">
         </el-alert>
@@ -89,7 +88,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input  type="password" show-password v-model="formApprove.qmrmm" maxlength="20"
+              <el-input type="password" show-password v-model="formApprove.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -106,6 +105,7 @@
 <script>
 import { studySubject_isMatchSubject } from "@/api/business/study/studySubject"
 import { studyFormPre_tb, studyFormPre_info, studyFormPre_jcgj, studyFormPre_qmxx } from "@/api/business/study/studyFormPre"
+import { studyMethod_getReadAllMethodStatus } from '@/api/business/study/studyMethod'
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -163,7 +163,7 @@ export default {
         formId: null,
         pageSize: 10,
       },
-
+      searchForm: {},
       fromNon: false//是否是从非试验+麻精药
     }
   },
@@ -176,6 +176,22 @@ export default {
   created() {
   },
   methods: {
+    showTianbao() {
+      if (this.searchForm.studySubjectId && this.searchForm.studySubjectId !== '') {
+        this.$modal.loading()
+        studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => {
+          if (response.data.toUrl) {
+            this.toRead(response.data)
+          } else {
+            this.openApprove = true
+          }
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else {
+        this.openApprove = true
+      }
+    },
     getIsMatchSubject() {
       studySubject_isMatchSubject({ studySubjectId: this.form.studySubjectId }).then(response => {
         this.isMatchSubject = response.data
@@ -183,8 +199,8 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      if(val){
-        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      if (val) {
+        this.queryParamsJcgj = _.merge({}, this.queryParamsJcgj, val)
       }
       studyFormPre_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
@@ -219,8 +235,9 @@ export default {
       }
       this.resetForm("form")
     },
-    show(row, fromNon) {
+    show(row, fromNon, val) {
       this.fromNon = fromNon
+      this.searchForm = val
       this.reset()
       this.$modal.loading()
       this.formApprove.id = row.id
@@ -233,7 +250,7 @@ export default {
         this.getJjcgjList()
         this.getIsMatchSubject()
         this.open = true
-        this.saveSimpleLog({jcmc:'预填详情',jcmcEn:'Preset Detail',name:this.form.bdmc+'（'+this.form.bdbh+'）',nameEn:this.form.bdmc+'（'+this.form.bdbh+'）'})
+        this.saveSimpleLog({ jcmc: '预填详情', jcmcEn: 'Preset Detail', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -253,7 +270,7 @@ export default {
             }
             let params = caesarCipher(JSON.stringify({
               url: this.$route.fullPath,
-              urlTj: type+'/enter/' + this.form.studyId + '/tbbd',
+              urlTj: type + '/enter/' + this.form.studyId + '/tbbd',
               studyId: this.form.studyId,
               formId: response.data.id,
               fromYt: true
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 47c7163..8ad4915 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -488,7 +488,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row, false)
+      this.$refs.Xq.show(row, false,this.searchForm)
     },
     gb(row) {
       this.$modal.loading()