Browse Source

fix: [试验管理] 已进入的页面跳转到方法页

lkf
memorylkf 2 months ago
parent
commit
cb605bff64
14 changed files with 110 additions and 25 deletions
  1. +4
    -4
      src/views/business/form/drug/comp/enter.vue
  2. +4
    -4
      src/views/business/form/nonTrial/comp/enter.vue
  3. +4
    -1
      src/views/business/form/nonTrial/comp/tbbd.vue
  4. +5
    -1
      src/views/business/form/nonTrial/comp/tbbdList.vue
  5. +4
    -1
      src/views/business/form/nonTrial/comp/ytbd.vue
  6. +5
    -1
      src/views/business/form/nonTrial/comp/ytbdList.vue
  7. +6
    -6
      src/views/business/study/comp/enter.vue
  8. +5
    -1
      src/views/business/study/comp/jhbdList.vue
  9. +4
    -1
      src/views/business/study/comp/syxx.vue
  10. +4
    -1
      src/views/business/study/comp/tbbd.vue
  11. +5
    -1
      src/views/business/study/comp/tbbdList.vue
  12. +4
    -1
      src/views/business/study/comp/ytbd.vue
  13. +6
    -1
      src/views/business/study/comp/ytbdList.vue
  14. +50
    -1
      src/views/business/systemLog/comp/czrz.vue

+ 4
- 4
src/views/business/form/drug/comp/enter.vue View File

@ -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>

+ 4
- 4
src/views/business/form/nonTrial/comp/enter.vue View File

@ -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>

+ 4
- 1
src/views/business/form/nonTrial/comp/tbbd.vue View File

@ -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)
}
}
}

+ 5
- 1
src/views/business/form/nonTrial/comp/tbbdList.vue View File

@ -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)
}
}
});
},

+ 4
- 1
src/views/business/form/nonTrial/comp/ytbd.vue View File

@ -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)
}
}
}

+ 5
- 1
src/views/business/form/nonTrial/comp/ytbdList.vue View File

@ -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)
}
}
});
},

+ 6
- 6
src/views/business/study/comp/enter.vue View File

@ -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>

+ 5
- 1
src/views/business/study/comp/jhbdList.vue View File

@ -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)
}
}
});
},

+ 4
- 1
src/views/business/study/comp/syxx.vue View File

@ -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)
}
}
}

+ 4
- 1
src/views/business/study/comp/tbbd.vue View File

@ -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)
}
}
}

+ 5
- 1
src/views/business/study/comp/tbbdList.vue View File

@ -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)
}
}
});
},

+ 4
- 1
src/views/business/study/comp/ytbd.vue View File

@ -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)
}
}
}

+ 6
- 1
src/views/business/study/comp/ytbdList.vue View File

@ -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)
}
}
});
},

+ 50
- 1
src/views/business/systemLog/comp/czrz.vue View File

@ -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>

Loading…
Cancel
Save