From cb605bff648cd64375900352ad7e591740ae6c1c Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 2 Feb 2026 16:38:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E5=B7=B2=E8=BF=9B=E5=85=A5=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=96=B9=E6=B3=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/form/drug/comp/enter.vue        |  8 ++--
 src/views/business/form/nonTrial/comp/enter.vue    |  8 ++--
 src/views/business/form/nonTrial/comp/tbbd.vue     |  5 ++-
 src/views/business/form/nonTrial/comp/tbbdList.vue |  6 ++-
 src/views/business/form/nonTrial/comp/ytbd.vue     |  5 ++-
 src/views/business/form/nonTrial/comp/ytbdList.vue |  6 ++-
 src/views/business/study/comp/enter.vue            | 12 ++---
 src/views/business/study/comp/jhbdList.vue         |  6 ++-
 src/views/business/study/comp/syxx.vue             |  5 ++-
 src/views/business/study/comp/tbbd.vue             |  5 ++-
 src/views/business/study/comp/tbbdList.vue         |  6 ++-
 src/views/business/study/comp/ytbd.vue             |  5 ++-
 src/views/business/study/comp/ytbdList.vue         |  7 ++-
 src/views/business/systemLog/comp/czrz.vue         | 51 +++++++++++++++++++++-
 14 files changed, 110 insertions(+), 25 deletions(-)

diff --git a/src/views/business/form/drug/comp/enter.vue b/src/views/business/form/drug/comp/enter.vue
index c046eba..a03c591 100644
--- a/src/views/business/form/drug/comp/enter.vue
+++ b/src/views/business/form/drug/comp/enter.vue
@@ -9,10 +9,10 @@
       </div>
 
       <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"/>
-        <wzlb v-if="active === 'wzlb'" :study="study" @showDetail="showDetailCallback"/>
+        <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab" />
+        <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <sqbd v-if="active === 'sqbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <wzlb v-if="active === 'wzlb'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
       </div>
     </div>
   </div>
diff --git a/src/views/business/form/nonTrial/comp/enter.vue b/src/views/business/form/nonTrial/comp/enter.vue
index 1366156..984d362 100644
--- a/src/views/business/form/nonTrial/comp/enter.vue
+++ b/src/views/business/form/nonTrial/comp/enter.vue
@@ -9,10 +9,10 @@
       </div>
 
       <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"/>
-        <wzlb v-if="active === 'wzlb'" :study="study" @showDetail="showDetailCallback"/>
+        <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab" />
+        <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <syff v-if="active === 'syff'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <wzlb v-if="active === 'wzlb'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
       </div>
     </div>
   </div>
diff --git a/src/views/business/form/nonTrial/comp/tbbd.vue b/src/views/business/form/nonTrial/comp/tbbd.vue
index 5cc5edf..4edce1a 100644
--- a/src/views/business/form/nonTrial/comp/tbbd.vue
+++ b/src/views/business/form/nonTrial/comp/tbbd.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="study-tbbd">
     <div class="tbbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
-      <tbbdList :study="studyInfo" @showDetail="showDetailCallback"/>
+      <tbbdList :study="studyInfo" @showDetail="showDetailCallback" @changeTab="changeTab"/>
     </div>
   </div>
 </template>
@@ -41,6 +41,9 @@ export default {
   methods: {
     showDetailCallback(val){
       this.$emit('showDetail',val)
+    },
+    changeTab(val){
+      this.$emit('changeTab',val)
     }
   }
 }
diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue
index 0340557..91e33f3 100644
--- a/src/views/business/form/nonTrial/comp/tbbdList.vue
+++ b/src/views/business/form/nonTrial/comp/tbbdList.vue
@@ -335,7 +335,11 @@ export default {
       this.$alert(data.ffmc, '', {
         confirmButtonText: this.$t('page.business.study.studyMethod.qyd'),
         callback: action => {
-          this.$tab.openPage("loading", data.toUrl)
+          if(this.$route.path===data.toUrl){
+            this.$emit('changeTab',{key:'syff'})
+          }else{
+            this.$tab.openPage("loading", data.toUrl)
+          }
         }
       });
     },
diff --git a/src/views/business/form/nonTrial/comp/ytbd.vue b/src/views/business/form/nonTrial/comp/ytbd.vue
index 2b4fa26..ed6b693 100644
--- a/src/views/business/form/nonTrial/comp/ytbd.vue
+++ b/src/views/business/form/nonTrial/comp/ytbd.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="study-ytbd">
     <div class="ytbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
-      <ytbdList :study="studyInfo" @showDetail="showDetailCallback"/>
+      <ytbdList :study="studyInfo" @showDetail="showDetailCallback" @changeTab="changeTab"/>
     </div>
   </div>
 </template>
@@ -41,6 +41,9 @@ export default {
   methods: {
     showDetailCallback(val){
       this.$emit('showDetail',val)
+    },
+    changeTab(val){
+      this.$emit('changeTab',val)
     }
   }
 }
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index db7b7fc..924760c 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -370,7 +370,11 @@ export default {
       this.$alert(data.ffmc, '', {
         confirmButtonText: this.$t('page.business.study.studyMethod.qyd'),
         callback: action => {
-          this.$tab.openPage("loading", data.toUrl)
+          if(this.$route.path===data.toUrl){
+            this.$emit('changeTab',{key:'syff'})
+          }else{
+            this.$tab.openPage("loading", data.toUrl)
+          }
         }
       });
     },
diff --git a/src/views/business/study/comp/enter.vue b/src/views/business/study/comp/enter.vue
index 2aeedba..cda9a1e 100644
--- a/src/views/business/study/comp/enter.vue
+++ b/src/views/business/study/comp/enter.vue
@@ -9,12 +9,12 @@
       </div>
 
       <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"/>
-        <syff v-if="active === 'syff'" :study="study" @showDetail="showDetailCallback"/>
-        <wzlb v-if="active === 'wzlb'" :study="study" @showDetail="showDetailCallback"/>
-        <syj v-if="active === 'syj'" :study="study" @showDetail="showDetailCallback"/>
+        <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab" />
+        <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <syxx v-if="active === 'syxx'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <syff v-if="active === 'syff'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <wzlb v-if="active === 'wzlb'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
+        <syj v-if="active === 'syj'" :study="study" @showDetail="showDetailCallback" @changeTab="changeTab"/>
       </div>
     </div>
   </div>
diff --git a/src/views/business/study/comp/jhbdList.vue b/src/views/business/study/comp/jhbdList.vue
index 3f07ada..ed077d8 100644
--- a/src/views/business/study/comp/jhbdList.vue
+++ b/src/views/business/study/comp/jhbdList.vue
@@ -191,7 +191,11 @@ export default {
       this.$alert(data.ffmc, '', {
         confirmButtonText: this.$t('page.business.study.studyMethod.qyd'),
         callback: action => {
-          this.$tab.openPage("loading", data.toUrl)
+          if(this.$route.path===data.toUrl){
+            this.$emit('changeTab',{key:'syff'})
+          }else{
+            this.$tab.openPage("loading", data.toUrl)
+          }
         }
       });
     },
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index ac1edb7..0816e04 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -50,7 +50,7 @@
       </div>
     </div>
     <div class="syxx-content" v-if="studyInfo.id&&studyInfo.id!=''">
-      <jhbdList :study="studyInfo" @showDetail="showDetailCallback" />
+      <jhbdList :study="studyInfo" @showDetail="showDetailCallback" @changeTab="changeTab" />
     </div>
 
     <Sign ref="syxxSignRef" @callback="doSign" />
@@ -147,6 +147,9 @@ export default {
     showDetailCallback(val) {
       this.showDetail = val
       this.$emit('showDetail', val)
+    },
+    changeTab(val){
+      this.$emit('changeTab',val)
     }
   }
 }
diff --git a/src/views/business/study/comp/tbbd.vue b/src/views/business/study/comp/tbbd.vue
index 811394e..bf0a3aa 100644
--- a/src/views/business/study/comp/tbbd.vue
+++ b/src/views/business/study/comp/tbbd.vue
@@ -4,7 +4,7 @@
       <sbject :study="study" @change="changeSubject" />
     </div>
     <div class="tbbd-right" v-if="studyInfo.studySubjectId!='' && studyInfo.studySubjectId!=undefined">
-      <tbbdList :study="studyInfo" @showDetail="showDetailCallback"/>
+      <tbbdList :study="studyInfo" @showDetail="showDetailCallback" @changeTab="changeTab"/>
     </div>
   </div>
 </template>
@@ -50,6 +50,9 @@ export default {
     showDetailCallback(val){
       this.showDetail=val
       this.$emit('showDetail',val)
+    },
+    changeTab(val){
+      this.$emit('changeTab',val)
     }
   }
 }
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index 80f13e5..80e6cef 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -386,7 +386,11 @@ export default {
       this.$alert(data.ffmc, '', {
         confirmButtonText: this.$t('page.business.study.studyMethod.qyd'),
         callback: action => {
-          this.$tab.openPage("loading", data.toUrl)
+          if(this.$route.path===data.toUrl){
+            this.$emit('changeTab',{key:'syff'})
+          }else{
+            this.$tab.openPage("loading", data.toUrl)
+          }
         }
       });
     },
diff --git a/src/views/business/study/comp/ytbd.vue b/src/views/business/study/comp/ytbd.vue
index b24978f..509b3b6 100644
--- a/src/views/business/study/comp/ytbd.vue
+++ b/src/views/business/study/comp/ytbd.vue
@@ -4,7 +4,7 @@
       <sbject :study="study" :operate="true" @change="changeSubject" />
     </div>
     <div class="ytbd-right" v-if="studyInfo.studySubjectId!='' && studyInfo.studySubjectId!=undefined">
-      <ytbdList :study="studyInfo" @showDetail="showDetailCallback"/>
+      <ytbdList :study="studyInfo" @showDetail="showDetailCallback" @changeTab="changeTab"/>
     </div>
   </div>
 </template>
@@ -50,6 +50,9 @@ export default {
     showDetailCallback(val){
       this.showDetail=val
       this.$emit('showDetail',val)
+    },
+    changeTab(val){
+      this.$emit('changeTab',val)
     }
   }
 }
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 0dceee1..0200a03 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -369,7 +369,12 @@ export default {
       this.$alert(data.ffmc, '', {
         confirmButtonText: this.$t('page.business.study.studyMethod.qyd'),
         callback: action => {
-          this.$tab.openPage("loading", data.toUrl)
+          debugger
+          if(this.$route.path===data.toUrl){
+            this.$emit('changeTab',{key:'syff'})
+          }else{
+            this.$tab.openPage("loading", data.toUrl)
+          }
         }
       });
     },
diff --git a/src/views/business/systemLog/comp/czrz.vue b/src/views/business/systemLog/comp/czrz.vue
index d9fddd2..dc2589b 100644
--- a/src/views/business/systemLog/comp/czrz.vue
+++ b/src/views/business/systemLog/comp/czrz.vue
@@ -46,7 +46,11 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('page.system.systemLog.czr')" prop="qmrMc" width="200" />
       <el-table-column :label="$t('page.system.systemLog.czlx')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="200" />
-      <el-table-column :label="$t('page.system.systemLog.czxq')" align="center" :prop="$i18n.locale === 'zh_CN'?'jcnr':'jcnrEn'" />
+      <el-table-column :label="$t('page.system.systemLog.czxq')" align="center">
+        <template slot-scope="scope">
+          <span>{{initNr(scope.row)}}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('page.business.archive.czsj')" align="center" prop="createTime" width="200" />
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
@@ -110,6 +114,51 @@ export default {
         this.loading = false
       })
     },
+    initNr(row){
+      if(this.$i18n.locale === 'zh_CN'){
+        debugger
+        if(this.isJSON(row.jcnr)){
+          let nr = ''
+          _.forEach(JSON.parse(row.jcnr),(o)=>{
+            nr+=o.name+':'+o.value+' '
+          })
+          if(nr!==''){
+            nr+='、'
+          }
+          return nr
+        }else{
+          return row.jcnr
+        }
+      }else{
+        if(this.isJSON(row.jcnrEn)){
+          let nr = ''
+          _.forEach(JSON.parse(row.jcnrEn),(o)=>{
+            nr+=o.name+':'+o.name+' '
+          })
+          if(nr!==''){
+            nr+='、'
+          }
+          return nr
+        }else{
+          return row.jcnrEn
+        }
+      }
+    },
+    isJSON(str) {
+      if (typeof str !== 'string') {
+        return false;
+      }
+      
+      try {
+        const result = JSON.parse(str);
+        
+        // 可选：确保解析后是对象或数组，而不是简单类型
+        const type = Object.prototype.toString.call(result);
+        return type === '[object Object]' || type === '[object Array]';
+      } catch (e) {
+        return false;
+      }
+    }
   }
 }
 </script>