diff --git a/src/App.vue b/src/App.vue index cc97974..2ce2341 100644 --- a/src/App.vue +++ b/src/App.vue @@ -202,14 +202,14 @@ export default { justify-content: space-between; .content-right { - width: 33%; + width: 20%; margin-left: 2%; padding: 0px 10px; border-left: 1px solid #d0d0d0; } .content-left { - width: 65%; + width: 78%; } .content { @@ -444,14 +444,14 @@ th { justify-content: center; .content-right { - width: 33%; + width: 20%; margin-left: 2%; padding: 0px 10px; border-left: 1px solid #d0d0d0; } .content-left { - width: 65%; + width: 78%; } .content { diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js index df926ef..c902877 100644 --- a/src/api/business/study/studyFormFill.js +++ b/src/api/business/study/studyFormFill.js @@ -24,6 +24,13 @@ export function studyFormFill_exportDetail(query) { params: query }) } +export function studyFormFill_exportByFileUrl(query) { + return request({ + url: '/system/business/studyFormFill/exportByFileUrl', + method: 'get', + params: query + }) +} export function studyFormFill_jcgjqmxxList(query) { return request({ url: '/system/business/studyFormFill/jcgjqmxxList', diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 21cb0af..9cd934c 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -1,19 +1,19 @@ @@ -205,6 +217,7 @@ export default { study: { handler(newVal) { this.searchForm.studySn = newVal.sn + this.searchForm.studyStatus = newVal.status this.searchForm.studyMc = newVal.name this.searchForm.studyId = newVal.id this.leader = newVal.leader @@ -214,10 +227,10 @@ export default { deep: true } }, - components: { Ghgsr, Fh, Sh,Fz, Bj, Xq, Qrfz, Sy, Jq, SelectDeptUser, SelectDeptUserDialog }, + components: { Ghgsr, Fh, Sh, Fz, Bj, Xq, Qrfz, Sy, Jq, SelectDeptUser, SelectDeptUserDialog }, data() { return { - isQa:false, + isQa: false, leader: null, showFh: false, showSh: false, @@ -230,6 +243,7 @@ export default { pageNum: 1, pageSize: 10, studyId: -1, + studyStatus: 5, studySn: '', studyMc: '', bdbh: '', @@ -239,7 +253,7 @@ export default { templateMc: '', cjsjjs: '', cjsjks: '', - sfbl:null, + sfbl: null, tjsjjs: '', tjsjks: '', }, @@ -249,13 +263,13 @@ export default { currentRow: null } }, - created() { this.getIsQa()}, + created() { this.getIsQa() }, methods: { checkPermi, checkRole, getIsQa() { studySubject_isQa().then(response => { - this.isQa=response.data + this.isQa = response.data }) }, ghgsr(row) { @@ -292,7 +306,7 @@ export default { this.searchForm.cjsjjs = '' this.searchForm.tjsjks = '' this.searchForm.tjsjjs = '' - this.searchForm.sfbl =null + this.searchForm.sfbl = null this.daterange = [] this.daterangetj = [] this.search() @@ -322,8 +336,9 @@ export default { add() { this.showEdit = true this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit({ - studyFormType:15,studyType: 10,studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc, studyId: this.searchForm.studyId }) + this.$refs.Bj.edit({ + studyFormType: 15, studyType: 10, studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId + }) }, edit(row) { this.showEdit = true @@ -370,7 +385,7 @@ export default { this.$emit('showDetail', this.showFh) this.$refs.Fh.show(row) }, - sh(row) { + sh(row) { this.showSh = true this.$emit('showDetail', this.showSh) this.$refs.Sh.show(row) diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue index 0c14a54..885c49a 100644 --- a/src/views/business/form/drug/comp/tbbdList.vue +++ b/src/views/business/form/drug/comp/tbbdList.vue @@ -7,13 +7,13 @@ + style="width: 200px" /> + style="width: 200px" /> @@ -42,16 +42,14 @@ + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> @@ -69,32 +67,41 @@
- {{ - $t('page.business.study.studyFormFill.xzbd') }} + {{ + $t('page.business.study.studyFormFill.xzbd') }} - - - + + + @@ -104,41 +111,44 @@ {{ $t('form.detail') }} - - {{ - $t('form.edit') }} - - {{ - $t('page.business.study.studyFormFill.fh') }} - - {{ - $t('page.business.study.studyFormFill.jq') }} - - {{ - $t('page.business.study.studyFormFill.ghgsr') }} - - {{ - $t('page.business.study.studyFormFill.sy') }} - - {{ - $t('page.business.study.studyFormFill.fz') }} - - {{ - $t('page.business.study.studyFormFill.qrfz') }} - - {{ - $t('page.business.study.studyFormFill.gc') }} + @@ -208,6 +218,7 @@ export default { study: { handler(newVal) { this.searchForm.studySn = newVal.sn + this.searchForm.studyStatus = newVal.status this.searchForm.studyMc = newVal.name this.searchForm.studyId = newVal.id this.leader = newVal.leader @@ -232,6 +243,7 @@ export default { pageNum: 1, pageSize: 10, studyId: -1, + studyStatus: 5, studySn: '', studyMc: '', bdbh: '', @@ -241,7 +253,7 @@ export default { templateMc: '', cjsjjs: '', cjsjks: '', - sfbl:null, + sfbl: null, tjsjjs: '', tjsjks: '', }, @@ -253,7 +265,7 @@ export default { }, created() { this.getIsQa() }, mounted() { - EventBus.$on('onRefreshDrugTbbdList',(data) => { + EventBus.$on('onRefreshDrugTbbdList', (data) => { this.getList() }); }, @@ -307,8 +319,8 @@ export default { this.searchForm.tjsjjs = '' this.searchForm.tjsjks = '' this.searchForm.sfbl = null - this.daterange=[] - this.daterangetj=[] + this.daterange = [] + this.daterangetj = [] this.search() }, getList() { @@ -341,7 +353,7 @@ export default { url: this.$route.fullPath, studyId: this.searchForm.studyId, studyType: 10, - studyFormType:5, + studyFormType: 5, formId: null })) this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/drug/formFillBj/' + params) @@ -354,7 +366,7 @@ export default { url: this.$route.fullPath, studyId: this.searchForm.studyId, studyType: 10, - studyFormType:5, + studyFormType: 5, formId: row.id })) this.$tab.openPage(row.bdmc, '/drug/formFillBj/' + params) diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue index ccd23c6..66fc425 100644 --- a/src/views/business/form/drug/comp/ytbdList.vue +++ b/src/views/business/form/drug/comp/ytbdList.vue @@ -7,7 +7,7 @@ + style="width: 200px" /> @@ -40,8 +40,7 @@ + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> @@ -50,29 +49,35 @@
- {{ - $t('page.business.study.studyFormPre.xzbd') }} + {{ + $t('page.business.study.studyFormPre.xzbd') }} {{ + v-if="(leader == id || checkRole(['bz']))" :disabled="studyStatus >= 5">{{ $t('page.business.study.drug.sdsy') }} - - - + + + @@ -82,33 +87,39 @@ {{ $t('form.detail') }} - - {{ - $t('form.edit') }} -