From 3806032c138f32a6f917fec10898f1046aed86df Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 20 Jun 2023 18:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84,=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home.vue | 7 +-- src/views/fee-settings/Item.vue | 67 ++++++++++------------- src/views/fee-settings/SysParmType.vue | 53 ++++++++++++++++-- src/views/user-list/OrganizationUnits.vue | 51 +++++++++++------ 4 files changed, 114 insertions(+), 64 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index 8184a16..d9be3e2 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -16,7 +16,6 @@ >退出登录 修改密码 - 螺蛳粉 @@ -160,13 +159,13 @@ 参考范围 - 性激素参考范围 诊断 - 诊断模板 套餐 - 系统参数类别 diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue index da68daa..ef38bd1 100644 --- a/src/views/fee-settings/Item.vue +++ b/src/views/fee-settings/Item.vue @@ -386,28 +386,17 @@ - - - + + + -
+
添加1
编辑 @@ -415,11 +404,11 @@
删除
-
+
诊断匹配 { this.$message.success("添加成功"); @@ -1255,24 +1244,26 @@ export default { this.diageoisaddId(); }, //诊断匹配弹框获取诊断数据 + //改成直接跳转到诊断页面 diagnosticmatching() { - this.diagnosdialogVisible = true; - console.log(this.diagnosdialogVisible); - postapi("/api/app/diagnosis/getlistinfilter").then((res) => { - this.diagnosticdata = res.data.items; - console.log(res); - }); + // this.diagnosdialogVisible = true; + // console.log(this.diagnosdialogVisible); + // postapi("/api/app/diagnosis/getlistinfilter").then((res) => { + // this.diagnosticdata = res.data.items; + // console.log(res); + // }); + this.$router.push({ path: "/diagnosis" }); }, //结果模板添加 resultaddition() {}, //模板类别弹框 - templatecategory() { - getapi("/api/app/item-result-template").then((res) => { - this.projectdata = res.data.items; - console.log(res); - }); - this.projectdialogVisible = true; - }, + // templatecategory() { + // getapi("/api/app/item-result-template").then((res) => { + // this.projectdata = res.data.items; + // console.log(res); + // }); + // this.projectdialogVisible = true; + // }, //项目模板置底 bottoming() { if (this.rusetform.id == undefined) { @@ -1384,7 +1375,6 @@ export default { this.$message.warning("请选择操作的数据"); } else { this.referencerangedialogVisible = true; - console.log("11111111"); } }, @@ -1407,6 +1397,7 @@ export default { this.addoredit(); this.ruesttiele = 1; this.ruesttieledialogVisible = true; + this.rusetform = {}; }, //获取项目类别列表 getmedicalconclusionlist() { @@ -1471,6 +1462,7 @@ export default { resultlist() { getapi("/api/app/item-result-template").then((res) => { this.reusttableData = res.data.items; + console.log(res); }); }, @@ -1479,11 +1471,12 @@ export default { this.$message.warning("请选择操作的数据"); } else { this.rurestdialogVisible = true; - getapi("/api/app/item-result-template").then((res) => { this.reusttableData = res.data.items; + console.log("2222222222222222"); + console.log(res); }); - // // 获取项目类别 + //// 获取项目类别 getapi("/api/app/item-type/by-code-all").then((res) => { this.resultitemtype = res.data; console.log(res); diff --git a/src/views/fee-settings/SysParmType.vue b/src/views/fee-settings/SysParmType.vue index 3e6c361..439a730 100644 --- a/src/views/fee-settings/SysParmType.vue +++ b/src/views/fee-settings/SysParmType.vue @@ -2,7 +2,29 @@
- + + + + 组织选择 + + + + + + + + @@ -17,19 +39,38 @@ import { getapi } from "@/api/api"; export default { data() { return { + organizationvalue: "", + organizationdata: [], tableData: [], }; }, created() { - this.getlist(); + // this.getlist(); + this.getoraniztion(); }, methods: { - getlist() { - getapi("/api/app/sys-parm-type").then((res) => { - this.tableData = res.data; + //获取组织数据 + getoraniztion() { + getapi("/api/app/organization-units/organization-unit-by-is-peis").then( + (res) => { + this.organizationdata = res.data; + } + ); + }, + //组织下拉框值发生变化 + changvalue(v) { + getapi(`/api/app/sys-parm/in-sys-parm-value-name/${v}`).then(res=>{ + this.tableData=res.data console.log(res); - }); + }) + console.log(v); }, + // getlist() { + // getapi("/api/app/sys-parm-type").then((res) => { + // this.tableData = res.data; + // console.log(res); + // }); + // }, }, }; diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue index d48d2a7..4a3b3b2 100644 --- a/src/views/user-list/OrganizationUnits.vue +++ b/src/views/user-list/OrganizationUnits.vue @@ -104,14 +104,14 @@ import { deleteschema, modifyedit, } from "../../request/ruquset"; -import { postapi, putapi } from "@/api/api"; +import { postapi, putapi, getapi } from "@/api/api"; export default { data() { return { form: { parentId: "", displayName: "", - isPeis: "", + isPeis: "N", }, title: 1, dialogVisible: false, @@ -128,6 +128,12 @@ export default { this.getonorganization(); }, methods: { + //关闭弹框 + closethebulletbox() { + this.dialogVisible = false; + this.form = {}; + this.form.isPeis = "N"; + }, //确定新增或者编辑 organizationtreeaddoredit() { if (this.title == 1) { @@ -138,6 +144,7 @@ export default { }).then((res) => { this.$message.success("新增成功"); this.dialogVisible = false; + this.form = {}; this.getonorganization(); }); } @@ -149,16 +156,18 @@ export default { this.dialogVisible = false; this.getonorganization(); }); - }else if(this.title==3){ - postapi("/api/app/organization-units/creatre", { - displayName: this.form.displayName, - isPeis: this.form.isPeis, - parentId:this.form.parentId - }).then((res) => { - this.$message.success("新增成功"); - this.dialogVisible = false; - this.getonorganization(); - }); + } else if (this.title == 3) { + postapi("/api/app/organization-units/creatre", { + displayName: this.form.displayName, + isPeis: this.form.isPeis, + parentId: this.form.parentId, + }).then((res) => { + this.$message.success("新增成功"); + this.dialogVisible = false; + this.form = {}; + this.form.isPeis = "N"; + this.getonorganization(); + }); } }, check(data) { @@ -193,9 +202,13 @@ export default { //新增组织组织 append(node, data) { this.title = 3; - this.dialogVisible = true; - this.form.parentId = data.id; - console.log(this.form.parentId); + if (this.title == 3) { + this.dialogVisible = true; + this.form.parentId = data.id; + this.form.displayName = ""; + console.log(this.form.parentId); + } + // if(this.natureoptions) // console.log(node, data); // if (this.natureoptions.length == 0) { @@ -241,8 +254,12 @@ export default { rena(node, data) { this.dialogVisible = true; this.title = 2; - this.form = data; - console.log(this.form); + getapi(`/api/app/organization-units?Id=${data.id}`).then((res) => { + this.form = res.data; + console.log(res); + }); + // this.form = data; + // console.log(this.form); // console.log(data); // this.$prompt("组织名称", "修改组织", { // confirmButtonText: "确定",