diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js index c902877..009ca76 100644 --- a/src/api/business/study/studyFormFill.js +++ b/src/api/business/study/studyFormFill.js @@ -136,6 +136,33 @@ export function studyFormFill_gc(data) { }) } +//提交病理学家审核 +export function studyFormFill_tjblxjsh(data) { + return request({ + url: '/system/business/studyFormFill/tjblxjsh', + method: 'post', + data: data + }) +} + +//病理学家审核通过 +export function studyFormFill_blxjshtg(data) { + return request({ + url: '/system/business/studyFormFill/blxjshtg', + method: 'post', + data: data + }) +} + +//病理学家审核拒绝 +export function studyFormFill_blxjshjj(data) { + return request({ + url: '/system/business/studyFormFill/blxjshjj', + method: 'post', + data: data + }) +} + //复核通过 export function studyFormFill_fhtg(data) { return request({ diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js index 4abb26f..b2deb74 100644 --- a/src/lang/en/business/study/studyFormFill.js +++ b/src/lang/en/business/study/studyFormFill.js @@ -22,6 +22,8 @@ export default { next: 'Next', pre: 'Pre', save: 'Save', + blxjshtg:'病历学家审核通过', + blxjshjj:'病历学家审核拒绝', submit: 'Submit', bdnr: 'Record Information', qmxx: 'Signature information', @@ -31,6 +33,8 @@ export default { bzyy: 'Comment/Reason', jcgj: 'Track Record', cjjl: 'Create Record', + tjsh:'Submit Audit', + blxjsh:'病理学家审核', sfbl: 'Back Entry', yes: 'Yes', no: 'No', diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 294bddf..61d1744 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -21,6 +21,8 @@ export default { zc: '暂存', next: '下一步', pre: '上一步', + blxjshtg:'病历学家审核通过', + blxjshjj:'病历学家审核拒绝', save: '保存', submit: '提交', bdnr: '表单内容', @@ -33,6 +35,8 @@ export default { cjjl: '创建记录', sfbl: '是否补录', yes: '是', + blxjsh:'病理学家审核', + tjsh:'提交审核', no: '否', tjjl: '提交记录', sqfz: '申请废止', diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue index 7c4beb6..de31417 100644 --- a/src/views/business/form/drug/comp/tbbdList.vue +++ b/src/views/business/form/drug/comp/tbbdList.vue @@ -31,7 +31,8 @@ :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> - + @@ -143,6 +144,8 @@ + + @@ -167,6 +170,7 @@ import Xq from "@/views/business/study/comp/tbbd/Xq"; import Sy from "@/views/business/study/comp/tbbd/Sy"; import Fz from "@/views/business/study/comp/tbbd/Fz"; import Fh from "@/views/business/study/comp/tbbd/Fh"; +import Blxjsh from "@/views/business/study/comp/tbbd/Blxjsh"; import Qrfz from "@/views/business/study/comp/tbbd/Qrfz"; import Jq from "@/views/business/study/comp/tbbd/Jq"; import Ghgsr from "@/views/business/study/comp/tbbd/Ghgsr"; @@ -206,13 +210,14 @@ export default { deep: true } }, - components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog }, + components: { Ghgsr, Fh, Fz, Bj, Blxjsh, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog }, data() { return { isQa: false, leader: null, showFh: false, showAudit: false, + showBlxjsh: false, showEdit: false, showDetail: false, daterangetj: [], @@ -369,6 +374,11 @@ export default { this.$emit('showDetail', this.showFh) this.search() }, + blxjshClose() { + this.showBlxjsh = false + this.$emit('showDetail', this.showBlxjsh) + this.search() + }, detail(row) { this.showDetail = true this.$emit('showDetail', this.showDetail) @@ -384,6 +394,11 @@ export default { this.$emit('showDetail', this.showFh) this.$refs.Fh.show(row) }, + blxjsh(row) { + this.showBlxjsh = true + this.$emit('showDetail', this.showBlxjsh) + this.$refs.Blxjsh.show(row) + }, } } diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue index f3274c4..1418074 100644 --- a/src/views/business/form/nonTrial/comp/tbbdList.vue +++ b/src/views/business/form/nonTrial/comp/tbbdList.vue @@ -30,7 +30,8 @@ :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> - + @@ -141,6 +142,8 @@ + + @@ -166,6 +169,7 @@ import Xq from "@/views/business/study/comp/tbbd/Xq"; import Sy from "@/views/business/study/comp/tbbd/Sy"; import Fz from "@/views/business/study/comp/tbbd/Fz"; import Fh from "@/views/business/study/comp/tbbd/Fh"; +import Blxjsh from "@/views/business/study/comp/tbbd/Blxjsh"; import Qrfz from "@/views/business/study/comp/tbbd/Qrfz"; import Jq from "@/views/business/study/comp/tbbd/Jq"; import Ghgsr from "@/views/business/study/comp/tbbd/Ghgsr"; @@ -205,13 +209,14 @@ export default { deep: true } }, - components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog }, + components: { Ghgsr, Fh, Fz, Blxjsh, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog }, data() { return { isQa: false, leader: null, showFh: false, showAudit: false, + showBlxjsh: false, showEdit: false, showDetail: false, daterangetj: [], @@ -454,6 +459,11 @@ export default { this.$emit('showDetail', this.showFh) this.search() }, + blxjshClose() { + this.showBlxjsh = false + this.$emit('showDetail', this.showBlxjsh) + this.search() + }, detail(row) { this.showDetail = true this.$emit('showDetail', this.showDetail) @@ -465,18 +475,14 @@ export default { this.$refs.Sy.show(row) }, fh(row) { - this.$modal.loading() - studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - if (response.data.toUrl) { - this.toRead(response.data) - } else { - this.showFh = true - this.$emit('showDetail', this.showFh) - this.$refs.Fh.show(row) - } - }).finally(() => { - this.$modal.closeLoading() - }) + this.showFh = true + this.$emit('showDetail', this.showFh) + this.$refs.Fh.show(row) + }, + blxjsh(row) { + this.showBlxjsh = true + this.$emit('showDetail', this.showBlxjsh) + this.$refs.Blxjsh.show(row) }, } } diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index 53a435f..d8628f4 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -32,7 +32,10 @@ $t('page.business.study.studyFormFill.yjcc') }} {{ $t('page.business.study.studyFormFill.save') }} - {{ $t('page.business.study.studyFormFill.submit') + {{ + $t('page.business.study.studyFormFill.tjsh') + }} + {{ $t('page.business.study.studyFormFill.submit') }} {{ $t('page.business.study.studyFormFill.pre') }} @@ -78,7 +81,7 @@ -
+
@@ -124,7 +127,7 @@ - +
{{ $t('page.business.study.studyFormFill.cc') }} @@ -150,7 +153,8 @@
存储条件：
- +
@@ -263,7 +267,8 @@
存储条件：
- +
@@ -369,12 +374,57 @@ {{ $t('form.cancel') }}
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ {{ $t('form.confirm') }} + {{ $t('form.cancel') }} +
+
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue index 1b196b4..bec7404 100644 --- a/src/views/business/study/comp/tbbdList.vue +++ b/src/views/business/study/comp/tbbdList.vue @@ -1,6 +1,6 @@ @@ -147,6 +151,8 @@ + + @@ -175,6 +181,7 @@ import Qrfz from "./tbbd/Qrfz"; import Jq from "./tbbd/Jq"; import Ghgsr from "./tbbd/Ghgsr"; import Gc from "./tbbd/Gc"; +import Blxjsh from "./tbbd/Blxjsh"; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import SelectDeptUserDialog from '@/views/business/comps/select/SelectDeptUserDialog'; import { caesarCipher } from "@/utils/index"; @@ -228,7 +235,7 @@ export default { // 记得移除监听，避免内存泄漏 EventBus.$off('onRefreshStudyTbbdList'); }, - components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog }, + components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc,Blxjsh, SelectDeptUser, SelectDeptUserDialog }, data() { return { isMatchSubject: false, @@ -236,6 +243,7 @@ export default { leader: null, showFh: false, showAudit: false, + showBlxjsh: false, showEdit: false, showDetail: false, daterangetj: [], @@ -475,6 +483,11 @@ export default { this.$emit('showDetail', this.showFh) this.search() }, + blxjshClose() { + this.showBlxjsh = false + this.$emit('showDetail', this.showBlxjsh) + this.search() + }, detail(row) { this.showDetail = true this.$emit('showDetail', this.showDetail) @@ -498,6 +511,20 @@ export default { }).finally(() => { this.$modal.closeLoading() }) + }, + blxjsh(row) { + this.$modal.loading() + studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.showBlxjsh = true + this.$emit('showDetail', this.showBlxjsh) + this.$refs.Blxjsh.show(row) + } + }).finally(() => { + this.$modal.closeLoading() + }) }, } } diff --git a/src/views/business/template/list.vue b/src/views/business/template/list.vue index 972a116..940812d 100644 --- a/src/views/business/template/list.vue +++ b/src/views/business/template/list.vue @@ -138,6 +138,15 @@ + + + + + + + +