From 42e8475e8e178ddd0085b2da78708f8a02577161 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 21 Nov 2023 09:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E6=96=B9=E4=BF=A1=E6=81=AF=E4=B8=8B=E8=BD=BD=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=99=BB=E5=BD=95=E9=80=89=E6=8B=A9=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=83=A8=E9=97=A8=E4=BB=93=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/sicker/prescribeApi.js | 11 +++++ src/api/basic/sicker/skPersonApi.js | 11 +++++ src/assets/styles/ruoyi.scss | 2 +- src/layout/components/Navbar.vue | 11 ++++- src/views/basic/sicker/skPerson.js | 60 +++++++++++++++++++++------- src/views/basic/sicker/skPerson.vue | 7 ++++ 6 files changed, 84 insertions(+), 18 deletions(-) diff --git a/src/api/basic/sicker/prescribeApi.js b/src/api/basic/sicker/prescribeApi.js index 0d083c4b..9d6dbaf3 100644 --- a/src/api/basic/sicker/prescribeApi.js +++ b/src/api/basic/sicker/prescribeApi.js @@ -16,3 +16,14 @@ export function detail(query) { params: query }); } + +export function downloadPrescribe(query) { + return axios({ + url: "/udiwms/basic/sk/prescribe/download", + method: "post", + data: query + }); +} + + + diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js index 05ee3ca9..bc9e5e10 100644 --- a/src/api/basic/sicker/skPersonApi.js +++ b/src/api/basic/sicker/skPersonApi.js @@ -8,3 +8,14 @@ export function page(query) { params: query }); } + +export function downloadSick(query) { + return axios({ + url: "/udiwms/basic/sk/sicker/download", + method: "post", + data: query + }); +} + + + diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 8c17fae2..114ed4a3 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -370,7 +370,7 @@ .el-form-item { margin-right: 10px; margin-bottom: 1px; - margin-top: -5px; + margin-top: 1px; } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 0d7bac1a..5693757e 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -13,7 +13,9 @@ style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门 : {{ deptName }} 仓库 : {{ inv }} - 用户 : {{ this.companyName }} + 用户 : {{ + this.companyName + }} ({{ this.userName @@ -193,7 +195,7 @@ import RuoYiDoc from '@/components/RuoYi/Doc' import store from "@/store"; import {filterAllByUser} from "@/api/system/invWarehouse"; import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse"; -import {updateInv, modifyPasswd,filterByUser} from "@/api/auth/authAdmin"; +import {updateInv, modifyPasswd, filterByUser} from "@/api/auth/authAdmin"; import {isRelogin} from "@/utils/request"; import router from "@/router"; @@ -446,6 +448,11 @@ export default { }; this.getInputQuery(); this.getDeptList(); + + + if (this.userInfo.locInvCode == null) { + this.selInvVisible = true; + } //this.getInvList() } diff --git a/src/views/basic/sicker/skPerson.js b/src/views/basic/sicker/skPerson.js index 75373d85..e9514ccf 100644 --- a/src/views/basic/sicker/skPerson.js +++ b/src/views/basic/sicker/skPerson.js @@ -1,5 +1,5 @@ -import {page} from "@/api/basic/sicker/skPersonApi"; -import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi"; +import {downloadSick, page} from "@/api/basic/sicker/skPersonApi"; +import {detail, downloadPrescribe, page as prescribePage} from "@/api/basic/sicker/prescribeApi"; let query = { name: "", @@ -18,7 +18,9 @@ let prescribeQuery = { export default { data() { return { - fullscreenLoading:false, + fullscreenLoading: false, + dlSickLoading: false, + updatePrecribeLoading: false, showSearch: true, filterQuery: {...query}, editType: "", @@ -29,12 +31,12 @@ export default { total: 0, list: [], // =============患者================= - showSickerDialog:false, - sicker:null, + showSickerDialog: false, + sicker: null, // =============患者end================ // ============处方============= - sickerInfo:null, - showPrescribeDetailDialog:false, + sickerInfo: null, + showPrescribeDetailDialog: false, prescribeLoading: false, prescribeList: [], prescribeTotal: 0, @@ -72,7 +74,7 @@ export default { }); }, sickerClick(row) { - this.sickerInfo={...row} + this.sickerInfo = {...row} this.prescribeQuery = {...prescribeQuery} this.prescribeQuery.sickerCode = row.code this.prescribeLoading = true @@ -80,30 +82,58 @@ export default { this.prescribeLoading = false this.prescribeList = res.data.list || [] this.prescribeTotal = res.data.total || 0 - }).catch(()=>{ + }).catch(() => { this.prescribeLoading = false this.prescribeList = [] this.prescribeTotal = 0 }) }, - showSickerInfo(row){ + showSickerInfo(row) { this.sicker = {...row} this.showSickerDialog = true }, - showPrescribeDetail(row){ + showPrescribeDetail(row) { this.fullscreenLoading = true - detail({prescribeCode:row.code}).then(res=>{ + detail({prescribeCode: row.code}).then(res => { this.fullscreenLoading = false - if(res.code!=20000){ + if (res.code != 20000) { this.$message.error(res.message) return } this.prescribeDetail = res.data this.showPrescribeDetailDialog = true - }).catch (() => { + }).catch(() => { this.fullscreenLoading = false this.$message.error("数据加载失败") }) - } + }, + onDownload() { + this.dlSickLoading = true; + downloadSick({thidSys: "thirdId"}).then(res => { + this.dlSickLoading = false + if (res.code != 20000) { + this.$message.error(res.message) + return + } + }).catch(() => { + this.dlSickLoading = false + this.$message.error("数据加载失败") + }) + }, + + + updatePrecribe() { + this.updatePrecribeLoading = true; + downloadPrescribe({sickCode: this.sickerInfo.code}).then(res => { + this.updatePrecribeLoading = false + if (res.code != 20000) { + this.$message.error(res.message) + return + } + }).catch(() => { + this.updatePrecribeLoading = false + this.$message.error("数据加载失败") + }) + }, } } diff --git a/src/views/basic/sicker/skPerson.vue b/src/views/basic/sicker/skPerson.vue index de1a024c..f085ae90 100644 --- a/src/views/basic/sicker/skPerson.vue +++ b/src/views/basic/sicker/skPerson.vue @@ -22,6 +22,8 @@ 显示/隐藏搜索栏 + 下载患者信息 + 重置 查询 @@ -58,6 +60,11 @@ + + + 更新处方信息 + +