diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js index c886658..9f29105 100644 --- a/src/lang/en/business/study/studyFormFill.js +++ b/src/lang/en/business/study/studyFormFill.js @@ -33,6 +33,7 @@ export default { dcxgjcgj:'导出(修改稽查轨迹)', dcbhsjgj:'导出(不含数据轨迹)', +ytbd:'预填表单', tbz:'On-going', ytj:'Submitted', ywc:'Completed', diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 24f5eb7..42c77b3 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -33,7 +33,7 @@ export default { dcbjjcgj:'导出(编辑稽查轨迹)', dcxgjcgj:'导出(修改稽查轨迹)', dcbhsjgj:'导出(不含数据轨迹)', - +ytbd:'预填表单', tbz:'填报中', ytj:'已提交', ywc:'已完成', diff --git a/src/router/index.js b/src/router/index.js index c090d4e..6750b2f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -209,6 +209,48 @@ export const dynamicRoutes = [ meta: { title: '进入', activeMenu: '/form/drug' } } ] + }, + { + path: '/study/formFillBj', + component: Layout, + hidden: true, + permissions: ['business:studyFormFill:bj'], + children: [ + { + path: ':formId(\\d+)/:fromYt/:key/:studyId', + component: () => import('@/views/business/study/comp/tbbd/Bj'), + name: 'studyFormFillBj', + meta: { title: 'loading', activeMenu: '/trial/list' } + } + ] + }, + { + path: '/nonTrial/formFillBj', + component: Layout, + hidden: true, + permissions: ['business:nonTrialFormFill:bj'], + children: [ + { + path: ':formId(\\d+)/:fromYt/:key/:studyId', + component: () => import('@/views/business/study/comp/tbbd/Bj'), + name: 'nonTrialFormFillBj', + meta: { title: 'loading', activeMenu: '/form/nonTrial' } + } + ] + }, + { + path: '/drug/formFillBj', + component: Layout, + hidden: true, + permissions: ['business:drugFormFill:bj'], + children: [ + { + path: ':formId(\\d+)/:fromYt/:key/:studyId', + component: () => import('@/views/business/study/comp/tbbd/Bj'), + name: 'drugFormFillBj', + meta: { title: 'loading', activeMenu: '/form/drug' } + } + ] } ] diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue index c4e681f..8397dce 100644 --- a/src/views/business/form/drug/comp/tbbdList.vue +++ b/src/views/business/form/drug/comp/tbbdList.vue @@ -310,14 +310,25 @@ export default { }) }, add() { - this.showEdit = true - this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId }) + // this.showEdit = true + // this.$emit('showDetail', this.showEdit) + // this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId }) + let key = 'formFillReturnUrl' + this.searchForm.studyId + localStorage.setItem(key, JSON.stringify({ + url: this.$route.fullPath + })) + this.$tab.openPage("新增表单", '/drug/formFillBj/0/0/' + key + '/' + this.searchForm.studyId) }, edit(row) { - this.showEdit = true - this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit(row) + // this.showEdit = true + // this.$emit('showDetail', this.showEdit) + // this.$refs.Bj.edit(row) + + let key = 'formFillReturnUrl' + this.searchForm.studyId + localStorage.setItem(key, JSON.stringify({ + url: this.$route.fullPath + })) + this.$tab.openPage(row.bdmc, '/drug/formFillBj/' + row.id + "/0/" + key + '/' + searchForm.studyId) }, bjClose() { this.showEdit = false diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue index 4edb161..0a034ba 100644 --- a/src/views/business/form/nonTrial/comp/tbbdList.vue +++ b/src/views/business/form/nonTrial/comp/tbbdList.vue @@ -69,8 +69,9 @@
- {{ - $t('page.business.study.studyFormFill.xzbd') }} + {{ + $t('page.business.study.studyFormFill.xzbd') }} @@ -105,7 +106,8 @@ {{ $t('form.detail') }} - {{ $t('form.edit') }} @@ -122,11 +124,12 @@ @click="ghgsr(scope.row)" v-hasPermi="['business:nonTrialFormFill:ghgsr']">{{ $t('page.business.study.studyFormFill.ghgsr') }} - {{ + {{ $t('page.business.study.studyFormFill.sy') }} - {{ $t('page.business.study.studyFormFill.fz') }} @@ -216,7 +219,7 @@ export default { components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog }, data() { return { - isQa:false, + isQa: false, leader: null, showFh: false, showAudit: false, @@ -252,7 +255,7 @@ export default { checkRole, getIsQa() { studySubject_isQa().then(response => { - this.isQa=response.data + this.isQa = response.data }) }, ghgsr(row) { @@ -310,14 +313,24 @@ export default { }) }, add() { - this.showEdit = true - this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId }) + // this.showEdit = true + // this.$emit('showDetail', this.showEdit) + // this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId }) + let key = 'formFillReturnUrl' + this.searchForm.studyId + localStorage.setItem(key, JSON.stringify({ + url: this.$route.fullPath + })) + this.$tab.openPage("新增表单", '/nonTrial/formFillBj/0/0/' + key + '/' + this.searchForm.studyId) }, edit(row) { - this.showEdit = true - this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit(row) + // this.showEdit = true + // this.$emit('showDetail', this.showEdit) + // this.$refs.Bj.edit(row) + let key = 'formFillReturnUrl' + this.searchForm.studyId + localStorage.setItem(key, JSON.stringify({ + url: this.$route.fullPath + })) + this.$tab.openPage(row.bdmc, '/nonTrial/formFillBj/' + row.id + "/0/" + key + '/' + searchForm.studyId) }, bjClose() { this.showEdit = false diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index 6481eac..8d7cd7f 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -29,7 +29,7 @@ @@ -40,9 +40,9 @@ - - + + @@ -56,7 +56,8 @@ - + @@ -80,15 +81,64 @@
- - - todo + + + + + 处置 + + + + + 存储 + + + + + 用量统计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + {{ $t('form.cancel') }} + @@ -107,25 +157,9 @@ export default { return { open: false, showIndex: 1, + showCz: false, + showCc: false, form: {}, - openSubmit: false, - rulesApprove: { - qmrmm: [{ - required: true, - message: ' ', - trigger: 'blur' - }], - fzrsh: [{ - required: true, - message: ' ', - trigger: 'blur' - }], - shryId: [{ - required: true, - message: ' ', - trigger: 'blur' - }] - }, rules: { bdmc: [{ required: true, @@ -143,17 +177,67 @@ export default { trigger: 'blur' }], - } + }, + openApprove: false, + formApprove: {}, + bdmbTitle:this.$t('page.business.form.bdmb'), + rulesApprove: { + qmrmm: [{ + required: true, + message: ' ', + trigger: 'blur' + }] + }, } }, computed: { ...mapGetters([ - 'nickName','name' + 'nickName', 'name' ]), }, created() { + this.getInfo() }, methods: { + getInfo() { + let formId = this.$route.params.formId + let studyId = this.$route.params.studyId + let fromYt = this.$route.params.fromYt + this.reset() + if (parseInt(formId) > 0) { + if (fromYt + '' == "10") { + this.showIndex = 1 + this.bdmbTitle=this.$t('page.business.study.studyFormFill.ytbd') + } else { + this.showIndex = 2 + } + this.$modal.loading() + studyFormFill_info({ id: formId }).then(response => { + this.form = response.data + this.form.qmyy = '制作提交预制表单' + this.$modal.closeLoading() + }) + } else { + this.showIndex = 1 + this.form = _.merge({}, this.form, { stydyId: studyId }) + } + }, + showApprove() { + this.resetApprove() + this.formApprove.id = this.form.id + this.openApprove = true + }, + resetApprove() { + this.formApprove = { + id: null, + qmyy: '填写并提交记录', + remark: '', + bdnr: '', + resource: '', + qmrmm: '', + } + this.resetForm("formApprove") + }, pre() { this.showIndex = 1 }, @@ -171,7 +255,12 @@ export default { this.form.templateSn = val.sn }, cancel() { - this.$emit('close') + let data = localStorage.getItem(this.$route.params.key) + if (data && data != '') { + let params = JSON.parse(data) + const obj = { path: params.url } + this.$tab.closeOpenPage(obj) + } }, reset() { this.form = { @@ -194,30 +283,13 @@ export default { selectDeptUserChange(val) { this.form.shryMc = val.name }, - edit(row) { - this.reset() - if (row && row.id) { - this.showIndex = 2 - this.$modal.loading() - studyFormFill_info({ id: row.id }).then(response => { - this.form = response.data - this.form.qmyy = '制作提交预制表单' - this.open = true - this.$modal.closeLoading() - }) - } else { - this.showIndex = 1 - this.form = _.merge({}, this.form, row) - this.open = true - } - }, save() { this.$refs["form"].validate(valid => { if (valid) { this.$modal.loading() studyFormFill_bc(this.form).then(response => { - this.$emit('close') this.$modal.closeLoading() + this.cancel() }).finally(() => { this.$modal.closeLoading() }) @@ -229,14 +301,14 @@ export default { this.form.bdnr = JSON.stringify(content) this.$modal.loading() studyFormFill_bc(this.form).then(response => { - this.$emit('close') this.$modal.closeLoading() + this.cancel() }).finally(() => { this.$modal.closeLoading() }) }, tj() { - this.$refs["formSubmit"].validate(valid => { + this.$refs["formApprove"].validate(valid => { if (valid) { this.dotj() } @@ -244,12 +316,12 @@ export default { }, async dotj() { let content = await this.$refs.templateTable.getFormData() - this.form.bdnr = JSON.stringify(content) + this.formApprove.bdnr = JSON.stringify(content) this.$modal.loading() - studyFormFill_tj(this.form).then(response => { - this.$emit('close') - this.openSubmit = false + studyFormFill_tj(this.formApprove).then(response => { + this.openApprove = false this.$modal.closeLoading() + this.cancel() }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue index 07bb00c..0f80a79 100644 --- a/src/views/business/study/comp/tbbdList.vue +++ b/src/views/business/study/comp/tbbdList.vue @@ -69,8 +69,9 @@
- {{ - $t('page.business.study.studyFormFill.xzbd') }} + {{ + $t('page.business.study.studyFormFill.xzbd') }} @@ -105,7 +106,8 @@ {{ $t('form.detail') }} - {{ $t('form.edit') }} @@ -118,19 +120,19 @@ $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') }} @@ -169,7 +171,7 @@