diff --git a/src/api/business/sj/sj.js b/src/api/business/sj/sj.js index 63e5837..212915c 100644 --- a/src/api/business/sj/sj.js +++ b/src/api/business/sj/sj.js @@ -117,7 +117,6 @@ export function sj_jy(data) { }) } - // 查询试剂库存-稽查轨迹列表 export function jcgjList(query) { return request({ @@ -134,4 +133,29 @@ export function tzList(query) { method: 'get', params: query }) -} \ No newline at end of file +} + +// 分装 +export function sj_subpackage(data) { + return request({ + url: '/system/business/sj/subpackage', + method: 'post', + data: data + }) +} +// 开始配置 +export function sj_startConfiguration(data) { + return request({ + url: '/system/business/sj/startConfiguration', + method: 'post', + data: data + }) +} +// 完成配置 +export function sj_configurationCompleted(data) { + return request({ + url: '/system/business/sj/configurationCompleted', + method: 'post', + data: data + }) +} diff --git a/src/utils/calUnitTools.js b/src/utils/calUnitTools.js new file mode 100644 index 0000000..dd7f900 --- /dev/null +++ b/src/utils/calUnitTools.js @@ -0,0 +1,21 @@ +//体积不同单位相加 +export function addTj(valueArr, unitArr) { + let unit = ['pL', 'nL', 'uL', 'mL', 'L'] + + //计算最小单位 + let mixIndex = unit.length - 1 + for (let i = 0; i < unitArr.length; i++) { + let thisIndex = unit.indexOf(unitArr[i]) + mixIndex = thisIndex < mixIndex ? thisIndex : mixIndex + } + + let total = 0 + for (let i = 0; i < unitArr.length; i++) { + let thisIndex = unit.indexOf(unitArr[i]) + total += parseFloat(valueArr[i]) * Math.pow(1000, thisIndex - mixIndex) + } + return { + total: total, + unit: unit[mixIndex] + } +} diff --git a/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue b/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue index e388104..a434388 100644 --- a/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue +++ b/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue @@ -8,15 +8,17 @@
- +
- +
- + @@ -29,6 +31,7 @@ import CustomTable from '@/components/Template/CustomTable.vue'; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import SelectReagentDialog from "../../dialog/SelectReagentDialog.vue"; import { public_studyList } from '@/api/business/public/public'; +import { listData } from "@/api/system/dict/data" export default { name: "MJYLQSQD", @@ -60,7 +63,6 @@ export default { }, }, computed: { - // 备注表单配置 remarkConig() { return [ @@ -94,28 +96,28 @@ export default { SD: { label: "template.gsp.MJYLQSQD.sd", type: "input", + disabled:true, fillType: "actFill", }, sywzmc: { label: "template.gsp.MJYLQSQD.sywzmc", type: "select", fillType: "actFill", - otherCode: "sywzmcOther", options: this.getDictOptions('business_sywzmc'), }, gyjl: { label: "template.gsp.MJYLQSQD.gyjl", type: "select", - fillType: "actFill", otherCode: "gyjlOther", - options: this.getDictOptions('business_gyjl'), + fillType: "actFill", + options: this.gyjlOptions, }, xynd: { label: "template.gsp.MJYLQSQD.xynd", type: "select", - fillType: "actFill", otherCode: "xyndOther", - options: this.getDictOptions('business_gynd'), + fillType: "actFill", + options: this.gyndOptions, }, xyl: { label: "template.gsp.MJYLQSQD.xyl", @@ -162,13 +164,10 @@ export default { } }, ] - }, + } }, data() { return { - syId: null, - bmId: null, - sdId: null, public_studyList: public_studyList, searchForm: { name: { @@ -202,12 +201,76 @@ export default { prop: 'createTime', label: 'page.business.study.study.createDate', } - ] + ], + gyjlOptionsOld: [], + gyndOptionsOld: [], + gyjlOptions: [], + gyndOptions: [] }; }, + created() { + this.getGyjl() + this.getGynd() + }, mounted() { }, methods: { + onSelectBlur(val) { + if (val.key == 'sywzmc') { + let tmp = [] + _.forEach(_.filter(this.gyjlOptionsOld, function (o) { + return o.remark.indexOf(val.value) > -1; + }), function (item) { + tmp.push({ label: item.dictLabel, value: item.dictValue }) + }) + this.gyjlOptions = tmp + this.gyndOptions = [] + this.$refs.baseInfoRef.batchUpdateFormData({ + gyjl: '', + xynd: '', + }); + } + if (val.key == 'gyjl') { + let tmp = [] + _.forEach(_.filter(this.gyndOptionsOld, function (o) { + return o.remark.indexOf(val.value) > -1; + }), function (item) { + tmp.push({ label: item.dictLabel, value: item.dictValue }) + }) + this.gyndOptions = tmp + this.$refs.baseInfoRef.batchUpdateFormData({ + xynd: '', + }); + } + }, + //获取给药剂量 + getGyjl() { + listData({ + pageNum: 1, + pageSize: 999999, + dictType: 'business_gyjl', + status: 0 + }).then(response => { + this.gyjlOptionsOld = response.rows + if (this.formData.sywzmc && this.formData.sywzmc !== '') { + this.onSelectBlur({ key: 'sywzmc', value: this.formData.sywzmc }) + } + }) + }, + //获取给药浓度 + getGynd() { + listData({ + pageNum: 1, + pageSize: 999999, + dictType: 'business_gynd', + status: 0 + }).then(response => { + this.gyndOptionsOld = response.rows + if (this.formData.gyjl && this.formData.gyjl !== '') { + this.onSelectBlur({ key: 'gyjl', value: this.formData.gyjl }) + } + }) + }, onDialogSubmit(selectedId, currentRow) { console.log(JSON.stringify(currentRow)) //试验 @@ -216,9 +279,9 @@ export default { syNo: currentRow.sn, SD: currentRow.leaderName, }); - this.syId = currentRow.id - this.bmId = currentRow.deptId - this.sdId = currentRow.leader + this.formData.syId = currentRow.id + this.formData.bmId = currentRow.deptId + this.formData.sdId = currentRow.leader } //部门 if (currentRow.type == 2) { @@ -226,9 +289,9 @@ export default { syNo: currentRow.deptName, SD: currentRow.nickName, }); - this.syId = '' - this.bmId = currentRow.deptId - this.sdId = currentRow.userId + this.formData.syId = '' + this.formData.bmId = currentRow.deptId + this.formData.sdId = currentRow.userId } this.$refs.selectReagentDialogRef.onCancel() }, @@ -240,23 +303,18 @@ export default { //获取已填写的表单数据 getFilledFormData() { let content = this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]) - content.syId = this.syId - content.bmId = this.bmId - content.sdId = this.sdId + content.syId = this.formData.syId + content.bmId = this.formData.bmId + content.sdId = this.formData.sdId return content; }, async getFormData() { let content = await this.validFormFields(["baseInfoRef", "remarkRef"]); - content.syId = this.syId - content.bmId = this.bmId - content.sdId = this.sdId + content.syId = this.formData.syId + content.bmId = this.formData.bmId + content.sdId = this.formData.sdId return content; - }, - async onSave() { - const formData = await this.getFormData(); - // const formData = await this.$refs.stepTableRef.getFormData(); - console.log(formData, "formData") - }, + } } }; diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue index 3e7cd87..2555128 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "CBYDB", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue index fc0f14e..3574800 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "CBYHGZYWDX", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue index 066ed45..4d556e0 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue @@ -33,6 +33,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -65,6 +68,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "JZXY", @@ -359,6 +363,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue index 2a27110..a9602a4 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "QXWDX", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue index bcebc5f..f5f7979 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "RXJZXY", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue index 7cc2107..4224334 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue @@ -25,7 +25,11 @@ fieldItemLabel="template.common.operationSteps"> @@ -40,7 +44,11 @@ fieldItemLabel="template.common.operationSteps"> @@ -69,6 +77,7 @@ import { getSWYPFXFFXYPZBBTableConfig, getSWYPFXFFXYPZBBTQHSLTableConfig } from import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "SWYPFXRYPZB", components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog }, @@ -475,6 +484,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } }; diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue index 6e178f9..7b308a2 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "XSKKX", @@ -372,6 +376,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue index 0989e14..7fd172b 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "XZXHTYX", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue index a2cf0be..a929e64 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "ZDYBS", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue index 3ca71d9..7fb1033 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "ZQDYJMD", @@ -371,6 +375,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue index 4331e11..947679f 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue @@ -35,6 +35,9 @@ :rowIndex="rowIndex" :columns="columns" @deleteRow="(rowIndex) => deleteRow(rowIndex)" + @subPackageSubmit="subPackageSubmit" + @startConfig="startConfig" + @configComplete="configComplete" > @@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../formConfig/SWYPFXFFXYPZBBTable import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; +import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; export default { name: "CBYDB", @@ -225,7 +229,7 @@ export default { ] }, tableStepColumns() { - return getSWYPFXFFXYPZBBTableConfig(this,'business_sp_cbydb'); + return getSWYPFXFFXYPZBBTableConfig(this,'business_sp_zkgzy'); }, }, data() { @@ -372,6 +376,63 @@ export default { tableRef.deleteRow(rowIndex); } }, + subPackageSubmit(val){ + console.log("分装数据："+JSON.stringify(val)) + if(val.fzsj.fzList && val.fzsj.fzList.length>0){ + let list = [] + for(let i=0;i { + }).catch(() => { + }) + .finally(() => { + }) + } + }, + startConfig(val){ + console.log("开始配置数据："+JSON.stringify(val)) + let postData = { + bh:val.rowData.bh+val.rowData.bhCode, + } + console.log("开始配置提交数据："+JSON.stringify(postData)) + sj_startConfiguration(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, + configComplete(val){ + console.log("完成配置数据："+JSON.stringify(val)) + let postData = { + mc:null, + bh:val.rowData.bh+val.rowData.bhCode, + nd:val.rowData.hhwznd, + nddw:val.headerSelectFields.hhwzndUnit, + kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算 + kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算 + } + console.log("完成配置提交数据："+JSON.stringify(postData)) + sj_configurationCompleted(postData).then(() => { + }).catch(() => { + }) + .finally(() => { + }) + }, } diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js index 57609e4..20e145e 100644 --- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js +++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js @@ -20,7 +20,9 @@ export const getSWYPFXFFXYPZBBTableConfig = ( bodySubKey: 'bhCode', bodyFillType: 'preFill', width: 280, - myCodeFields: ['bh', 'bhOther', 'bhCode'] + myCodeFields: ['bh', 'bhOther', 'bhCode'], + maxVolumeField: 'sjryxql', //分装的最大量字段 + maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段 }, { label: 'template.sp.sp008.ysry', @@ -119,7 +121,10 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => { bodySubType: 'span', bodySubKey: 'bhCode', bodyFillType: 'preFill', - width: 280 + width: 280, + myCodeFields: ['bh', 'bhCode'], + maxVolumeField: 'sjryxql', //分装的最大量字段 + maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段 }, { label: 'template.sp.sp008.ysry', diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index e9c8517..7eb1989 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -1,5 +1,5 @@ -import moment from 'moment'; -import { getLatestSn } from '@/api/template'; +import moment from 'moment' +import { getLatestSn } from '@/api/template' export default { dicts: [ 'business_pztj', @@ -37,6 +37,7 @@ export default { handler(v) { if (v) { const { + studyId, studyMc, studySn, templateMc, @@ -54,6 +55,7 @@ export default { if (v.bdnr) { this.formData = { ...JSON.parse(v.bdnr), + studyId, studyMc, studySn, templateMc, @@ -66,6 +68,7 @@ export default { } } else { this.formData = { + studyId, studyMc, studySn, templateMc, @@ -87,8 +90,8 @@ export default { effectivePeriodUnit && !expireDate ) { - const start = moment(startDate); - const unit = effectivePeriodUnit === '天' ? 'days' : 'hours'; + const start = moment(startDate) + const unit = effectivePeriodUnit === '天' ? 'days' : 'hours' const end = start .add(Number(effectivePeriod), unit) .format('YYYY-MM-DD HH:mm:ss') @@ -126,10 +129,10 @@ export default { this.setTemplateData({}) }, methods: { - async getLatestSn(count = 1){ - const res = await getLatestSn({count}) - if(res.code === 200){ - return res.data; + async getLatestSn(count = 1) { + const res = await getLatestSn({ count }) + if (res.code === 200) { + return res.data } return null }, @@ -142,15 +145,18 @@ export default { refArr.map((ref) => { const refData = this.$refs[ref]?.getFilledFormData() || {} for (const [key, value] of Object.entries(refData)) { - let index = 0; + let index = 0 // 如果当前键是可能重复的字段，且结果对象中已经存在该键，则添加索引后缀 - if ((key === 'headerSelectFields' || key === 'stepTableFormData') && result.hasOwnProperty(key)) { + if ( + (key === 'headerSelectFields' || key === 'stepTableFormData') && + result.hasOwnProperty(key) + ) { // 为重复字段生成带索引的键名，从1开始（因为第一个组件不需要后缀） - const newKey = `${key}_${++index}`; - result[newKey] = value; + const newKey = `${key}_${++index}` + result[newKey] = value } else { // 正常合并其他字段 - result[key] = value; + result[key] = value } } }) diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index ce2c23a..730eb6c 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -110,7 +110,7 @@ @click="edit(scope.row)" v-hasPermi="['business:drugFormApply:bj']">{{ $t('form.edit') }} - {{ $t('page.business.study.studyFormApply.fh') }} @@ -127,7 +127,7 @@ v-hasPermi="['business:drugFormApply:sy']">{{ $t('page.business.study.studyFormApply.sy') }} - {{ $t('page.business.study.studyFormApply.sh') }} diff --git a/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue b/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue index 86eab41..7287676 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue @@ -1,7 +1,7 @@