From 006665fd4b102045a330a138c25dcf598b3e5336 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Mon, 30 Sep 2024 14:44:36 +0800 Subject: [PATCH] pacs --- public/sysConfig.json | 4 +- src/store/index.js | 9 +- .../common-settings/BigtextResultTypeEdit.vue | 11 +- .../BigtextResultTemplateEdit.vue | 335 ++++++++++++++++++ src/views/fee-settings/ResultSetting.vue | 120 ++++++- 5 files changed, 454 insertions(+), 25 deletions(-) create mode 100644 src/views/fee-settings/BigtextResultTemplateEdit.vue diff --git a/public/sysConfig.json b/public/sysConfig.json index bcd600a..1ee8013 100644 --- a/public/sysConfig.json +++ b/public/sysConfig.json @@ -1,6 +1,6 @@ { - "apiurl": "http://192.168.2.67:9529", + "apiurl": "http://140.143.162.39:9529", "softName": "神豚体检管理系统", - "pacsApi":"http://192.168.2.74:9529", + "pacsApi":"http://140.143.162.39:9529", "dcmViewers":"http://192.168.2.74:5081" } \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 9e6e7d7..dc72e36 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -432,6 +432,7 @@ export default new Vuex.Store({ third_medical_center: { S: 0, M: 0 }, // third_medical_center_booking_date: { S: 0, M: 0 }, // bigtext_result_type: { S: 0, M: 0 }, // + bigtext_result_template: { S: 0, M: 0 }, }, //表当前数据（单条记录 S--single） @@ -473,7 +474,8 @@ export default new Vuex.Store({ common_table_type: { id: '' }, // 公共表 third_medical_center: { id: '' }, // 公共表 third_medical_center_booking_date: { id: '' }, // 公共表 - bigtext_result_type:{ id: '' } + bigtext_result_type: { id: '' }, + bigtext_result_template: { id: '' } }, //表当前数据（多条记录 M--more） tableM: { @@ -547,8 +549,9 @@ export default new Vuex.Store({ CommonTableTypeEdit: false, //公共表类别 CommonTableEdit: false, //公共表 PacsTemplate: false, // pacs结果模版 - ThirdMedicalCenterEdit:false, - BigtextResultTypeEdit:false + ThirdMedicalCenterEdit: false, + BigtextResultTypeEdit: false, + BigtextResultTemplateEdit: false, } }, diff --git a/src/views/common-settings/BigtextResultTypeEdit.vue b/src/views/common-settings/BigtextResultTypeEdit.vue index 422250f..d787eb1 100644 --- a/src/views/common-settings/BigtextResultTypeEdit.vue +++ b/src/views/common-settings/BigtextResultTypeEdit.vue @@ -11,7 +11,7 @@ children: 'treeChildren', label: 'displayName', value: 'bigtextResultTypeId', - }" clearable size="small"> + }" disabled size="small"> @@ -177,6 +177,14 @@ export default { dispEdit() { + // 需要刷新上级节点字典库，因为有可能更新 + postapi('/api/app/BigtextResultType/GetByCodeAll').then(res => { + if (res.code > -1) { + this.treeData = res.data + tcdate(this.treeData) + } + }) + if (this.$refs.ruleForm !== undefined) { this.$refs.ruleForm.resetFields(); } @@ -202,6 +210,7 @@ export default { postapi('/api/app/BigtextResultType/Create', this.form).then(res => { if (res.code > -1) { this.refFunOther(res.data) + this.dataTransOpts.tableS.bigtext_result_type.id = res.data.id this.dialogWin.BigtextResultTypeEdit = false } }) diff --git a/src/views/fee-settings/BigtextResultTemplateEdit.vue b/src/views/fee-settings/BigtextResultTemplateEdit.vue new file mode 100644 index 0000000..3e2c101 --- /dev/null +++ b/src/views/fee-settings/BigtextResultTemplateEdit.vue @@ -0,0 +1,335 @@ + + + diff --git a/src/views/fee-settings/ResultSetting.vue b/src/views/fee-settings/ResultSetting.vue index d6d265a..67f43d6 100644 --- a/src/views/fee-settings/ResultSetting.vue +++ b/src/views/fee-settings/ResultSetting.vue @@ -195,6 +195,12 @@ + + + + @@ -334,15 +340,11 @@ import { examinationgender, instrumentlist } from "@/request/systemapi"; import { deepCopy, objCopy, dddw, tcdate, arrayExistObj } from "../../utlis/proFunc"; import { getTreeNode, getTreePids, getTreeAllChildIdsById, madeTree } from "../../utlis/tree"; import BigtextResultTypeEdit from "../../views/common-settings/BigtextResultTypeEdit.vue" +import BigtextResultTemplateEdit from "../../views/fee-settings/BigtextResultTemplateEdit.vue" -import { - getporjectlists, - groupsandlist, - combination, -} from "@/request/commonapi"; export default { components: { - BigtextResultTypeEdit + BigtextResultTypeEdit, BigtextResultTemplateEdit }, data() { return { @@ -427,7 +429,8 @@ export default { initfiletelists: [], bigtextResultTemplateId: "", - bigtextResultType: {} + bigtextResultType: {}, + bigtextResultTemplate: {} }; }, created() { @@ -498,7 +501,7 @@ export default { items.push({ label: '新增结果模版', onClick: () => { - this.editPacsTemplate({ id: '', displayName: '', bigtextResultTypeId: data.bigtextResultTypeId }) + this.editPacsTemplate({ id: '', displayName: '', bigtextResultTypeId: data.parentId }) } }) items.push({ @@ -565,22 +568,72 @@ export default { // "parentId": "3f36f000-4081-46b0-92b9-9923444c2a59", // "itemTypeId": "3a133e27-4ae2-0d0f-8de7-cdf2bdf93ce4", // "id": "0a8c3073-fbf7- + this.dataTransOpts.tableS.bigtext_result_type.id = data.id this.bigtextResultType = data this.dataTransOpts.refresh.bigtext_result_type.S++ this.dialogWin.BigtextResultTypeEdit = true }, + // 删除类别节点 delPacsType(data) { + let bigtextResultTypeId = data.id; + this.$confirm("是否删除, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + cancelButtonClass: "difference", + confirmButtonClass: "commonbutton", + }) + .then(() => { + postapi('/api/app/BigtextResultType/Delete', { bigtextResultTypeId }).then((res) => { + if (res.code > -1) { + // 是否根节点 + let lfind = -1 + if (data.parentId) { + // 有上级节点，需先找出上级节点 + let pNode = getTreeNode(this.pacsTemplateTree, 'children', 'id', data.parentId) + lfind = arrayExistObj(pNode['children'], 'id', data.id) + if (lfind > -1) pNode['children'].splice(lfind, 1) + } else { + lfind = arrayExistObj(this.pacsTemplateTree, 'id', data.id) + if (lfind > -1) this.pacsTemplateTree.splice(lfind, 1) + } + } + }); + }) + .catch(() => { + this.$message("取消成功"); + }); }, + + editPacsTemplate(data) { // "displayName": "陈旧性肛裂", // "bigtextResultTypeId": "a1b264d5-c690-49dd-8ff5-93d53e61852d", - // "id": "3a241898-e + this.dataTransOpts.tableS.bigtext_result_template.id = data.id + this.bigtextResultTemplate = data + this.dataTransOpts.refresh.bigtext_result_template.S++ + this.dialogWin.BigtextResultTemplateEdit = true }, delPacsTemplate(data) { + this.$confirm("是否确认删除, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + cancelButtonClass: "difference", + confirmButtonClass: "commonbutton", + }).then(() => { + postapi('/api/app/BigtextResultTemplate/Delete', { bigtextResultTemplateId: data.id }).then((res) => { + if (res.code != -1) { + let pNode = getTreeNode(this.pacsTemplateTree, 'children', 'id', data.parentId) + let lfind = arrayExistObj(pNode['children'], 'id', data.id) + if (lfind > -1) pNode['children'].splice(lfind, 1) + } + }); + }); }, @@ -588,22 +641,51 @@ export default { this.bigtextResultType = bigtextResultType }, - close_BigtextResultTypeEdit() { - let parentNode = getTreeNode(this.pacsTemplateTree, 'children', 'id', this.bigtextResultType.parentId || null) - if (parentNode) { + retBigtextResultTemplate(bigtextResultTemplate) { + this.bigtextResultTemplate = Object.assign({}, bigtextResultTemplate, { parentId: bigtextResultTemplate.bigtextResultTypeId,isTemplate:'Y' }) + }, - if (!parentNode['children']) parentNode['children'] = [] - let lfind = arrayExistObj(parentNode['children'], 'id', this.bigtextResultType.id) - if (lfind > -1) { - parentNode['children'][lfind].displayName = this.bigtextResultType.displayName + close_BigtextResultTypeEdit() { + // 如果是当前节点 + if(!this.bigtextResultType.id) return + if (this.curTreeNode.id == this.bigtextResultType.id) { + this.curTreeNode.displayName = this.bigtextResultType.displayName + } else { + // 不是当前节点，有可能是新增根级节点、同级节点或子级节点 + if (this.bigtextResultType.parentId) { + if (this.bigtextResultType.parentId == this.curTreeNode.parentId) { + // 同级节点，需先找出上级节点 + let pNode = getTreeNode(this.pacsTemplateTree, 'children', 'id', this.bigtextResultType.parentId) + if (pNode && pNode['children']) pNode['children'].push(this.bigtextResultType) + } else { + // 子级节点 + if (!this.curTreeNode['children']) this.curTreeNode['children'] = [] + this.curTreeNode['children'].push(this.bigtextResultType) + } } else { - parentNode['children'].push(this.bigtextResultType) + // 根节点 + this.pacsTemplateTree.push(this.bigtextResultType) } + } + }, + close_BigtextResultTemplateEdit() { + // 如果是当前节点 + if(!this.bigtextResultTemplate.id) return + if (this.curTreeNode.id == this.bigtextResultTemplate.id) { + this.curTreeNode.displayName = this.bigtextResultTemplate.displayName } else { - this.pacsTemplateTree.push(this.bigtextResultType) + // 不是当前节点，有可能是新增同级节点或子级节点 + if (this.bigtextResultTemplate.parentId == this.curTreeNode.parentId) { + // 同级节点，需先找出上级节点 + let pNode = getTreeNode(this.pacsTemplateTree, 'children', 'id', this.bigtextResultTemplate.parentId) + if (pNode && pNode['children']) pNode['children'].push(this.bigtextResultTemplate) + } else { + // 子级节点 + if (!this.curTreeNode['children']) this.curTreeNode['children'] = [] + this.curTreeNode['children'].push(this.bigtextResultTemplate) + } } - }, //获取pacs结果模板