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 @@
- - - - + + + +
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 @@
- - - - + + + +
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 @@ @@ -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 @@ @@ -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 @@
- - - - - - + + + + + +
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 @@
- +
@@ -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 @@
- +
@@ -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 @@
- +
@@ -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 @@ - + + + { + 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; + } + } } }