From d664f121a951ef4741ff5ad35680946866a977b7 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 12 Jan 2026 15:13:29 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E5=A1=AB=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E5=A1=AB=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/zh/business/study/studyFormFill.js | 8 + .../comps/template/comps/sp/SWYPFXRYPZB.vue | 6 +- .../business/resource/gyzj/comps/gyzj/Xgkc.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Xgkc.vue | 2 +- src/views/business/study/comp/tbbd/Bj.vue | 191 +++++++++++++++++++-- 5 files changed, 188 insertions(+), 21 deletions(-) diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 42c77b3..442bff2 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -1,4 +1,12 @@ export default { + mc:'名称', + bh:'编号', + syl:'使用量', + cz:'处置', + tjcz:'添加处置', + cc:'存储', + tjcc:'添加存储', + yltj:'用量统计', jcsz:'基础设置', bdtb:'表单填报', xzbd:'新增表单', diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue index 4698be6..31d0ae4 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue @@ -261,7 +261,7 @@ export default { //生成resource todo 已经提交，再次编辑需要合并,通过编号关联 // type（1：试剂；3：供试品；5：给药制剂；7：麻精药）,syl（使用量）syldw（使用量单位） let tmpResource = [] - + debugger //配置的试剂 tmpResource.push({ mc: content.targetName, @@ -274,10 +274,10 @@ export default { sxrq: content.expireDate, ndz: content.targetActConcentration, nddw: content.targetActConcentrationUnit, - kc: content.targetActVolume, + kc: content.targetActVolume*content.targetActConcentration, kcdw: content.targetActVolumeUnit, syl: null, - syldw: content.targetActVolumeUnit, + syldw:content.targetActVolumeUnit, }) //使用的试剂 this.resource=tmpResource diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue index 022ca96..3d77ec2 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue index f1237f4..d84a687 100644 --- a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue +++ b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue @@ -24,7 +24,7 @@ - + diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index fd100ee..bc4f765 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -88,18 +88,95 @@ - 处置 - {{ formApprove.resource }} +
{{ + $t('page.business.study.studyFormFill.cz') }} + {{ + $t('page.business.study.studyFormFill.tjcz') }} +
+ - 存储 +
{{ + $t('page.business.study.studyFormFill.cc') }} + {{ + $t('page.business.study.studyFormFill.tjcc') }} +
+ - 用量统计 +
{{ $t('page.business.study.studyFormFill.yltj') }}
+
+ {{ item.bh }} + + + +
@@ -152,16 +229,15 @@ import { mapGetters } from 'vuex' import SelectTemplate from "@/views/business/comps/select/SelectTemplate"; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import TemplateTable from '@/views/business/comps/template/TemplateTable'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Bj", - components: { SelectTemplate, SelectDeptUser, TemplateTable }, + components: { SelectTemplate, SelectDeptUser, TemplateTable, BusinessSelect }, data() { return { open: false, showIndex: 1, - showCz: false, - showCc: false, form: {}, rules: { bdmc: [{ @@ -181,8 +257,26 @@ export default { }], }, + czlist: [], + cclist: [], openApprove: false, - formApprove: {}, + formApprove: { + id: null, + qmyy: '填写并提交记录', + remark: '', + bdnr: '', + resource: '', + qmrmm: '', + sfcz: false, + czfs: '', + czfsqt: '', + czids: '', + sfcc: false, + cctj: '', + ccwz: '', + ccids: '', + }, + resource: [], bdmbTitle: this.$t('page.business.form.bdmb'), rulesApprove: { qmrmm: [{ @@ -202,6 +296,25 @@ export default { this.getInfo() }, methods: { + delcc(index) { + this.cclist.splice(index, 1) + }, + delcz(index) { + this.czlist.splice(index, 1) + }, + addCz() { + this.czlist.push({ + list: [], + czfs: '' + }) + }, + addCc() { + this.cclist.push({ + list: [], + cctj: '', + ccwz: '' + }) + }, getInfo() { let formId = this.$route.params.formId let studyId = this.$route.params.studyId @@ -229,14 +342,52 @@ export default { }) } }, + getDisabledCz(bh, idx) { + let mark = false + for (var i = 0; i < this.czlist.length; i++) { + if (idx != i) { + for (var j = 0; j < this.czlist[i].list.length; j++) { + if (this.czlist[i].list[j] == bh) { + mark = true; + break + } + } + } + } + return mark + }, + getDisabledCc(bh, idx) { + let mark = false + for (var i = 0; i < this.cclist.length; i++) { + if (idx != i) { + for (var j = 0; j < this.cclist[i].list.length; j++) { + if (this.cclist[i].list[j] == bh) { + mark = true; + break + } + } + } + } + return mark + }, + sfczChange() { + if (!this.formApprove.sfcz) { + this.czlist = [] + } + }, + sfccChange() { + if (!this.formApprove.sfcc) { + this.cclist = [] + } + }, async showApprove() { - let that=this + let that = this let content = await that.$refs.templateTable.getFormData() if (content) { that.resetApprove() that.formApprove.id = that.form.id that.formApprove.bdnr = JSON.stringify(content) - that.formApprove.resource = JSON.stringify(that.$refs.templateTable.getResource()) + that.resource = that.$refs.templateTable.getResource() that.openApprove = true } }, @@ -248,6 +399,10 @@ export default { bdnr: '', resource: '', qmrmm: '', + sfcz: false, + czlist: '', + sfcc: false, + cclist: '', } this.resetForm("formApprove") }, @@ -325,15 +480,19 @@ export default { } }, tj() { + let that=this this.$refs["formApprove"].validate(valid => { if (valid) { - this.$modal.loading() - studyFormFill_tj(this.formApprove).then(response => { - this.openApprove = false - this.$modal.closeLoading() - this.cancel() + that.$modal.loading() + that.formApprove.resource = JSON.stringify(that.resource) + that.formApprove.czlist = JSON.stringify(that.czlist) + that.formApprove.cclist = JSON.stringify(that.cclist) + studyFormFill_tj(that.formApprove).then(response => { + that.openApprove = false + that.$modal.closeLoading() + that.cancel() }).finally(() => { - this.$modal.closeLoading() + that.$modal.closeLoading() }) } })