From 0b6d619a5c0b1b2367bf7be4ee7d18e77180417b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 28 Dec 2023 10:08:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=E4=B8=8B=E8=BD=BD=E4=BF=AE?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- src/api/basic/sicker/skPersonApi.js | 19 +- src/views/basic/sicker/skPerson.js | 34 ++-- src/views/basic/sicker/skPerson.vue | 11 ++ src/views/basic/sicker/skPersonDownload.vue | 186 ++++++++++++++++++++ src/views/dev/deviceInfo.vue | 22 +-- 6 files changed, 249 insertions(+), 27 deletions(-) create mode 100644 src/views/basic/sicker/skPersonDownload.vue diff --git a/.env.production b/.env.production index b4a32b32..fe6051c9 100644 --- a/.env.production +++ b/.env.production @@ -41,12 +41,12 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # 三明大田医院 -# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js index 61933626..6a34a88c 100644 --- a/src/api/basic/sicker/skPersonApi.js +++ b/src/api/basic/sicker/skPersonApi.js @@ -47,7 +47,6 @@ export function skPrescribeCheck(query) { } - /** * 下载并查询处方信息 */ @@ -60,6 +59,24 @@ export function dlOrFilter(query) { }); } +/** + * 在线实时获取患者信息 + * @param query + * @returns {AxiosPromise} + */ +export function dlSickerOnline(query) { + return axios({ + url: "/udiwms/basic/sk/sicker/filter/onLine", + method: "get", + params: query + }); +} + + + + + + diff --git a/src/views/basic/sicker/skPerson.js b/src/views/basic/sicker/skPerson.js index 082faf50..3c08af3b 100644 --- a/src/views/basic/sicker/skPerson.js +++ b/src/views/basic/sicker/skPerson.js @@ -2,6 +2,7 @@ import {downloadSick, page} from "@/api/basic/sicker/skPersonApi"; import {detail, downloadPrescribe, page as prescribePage} from "@/api/basic/sicker/prescribeApi"; import skPrescribeDi from "./skPrescribeDi.vue"; +import skPersonDownload from "./skPersonDownload.vue"; let query = { name: "", @@ -36,6 +37,7 @@ export default { showSickerDialog: false, sicker: null, sickDiDialog: false, + sickDlDialog: false, // =============患者end================ // ============处方============= @@ -56,7 +58,7 @@ export default { this.getList() }, components: { - skPrescribeDi + skPrescribeDi, skPersonDownload }, methods: { @@ -130,23 +132,29 @@ export default { }) }, 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("数据加载失败") - }) + + this.sickDlDialog = true; + + + // this.dlSickLoading = true; + // downloadSick({thidSys: "thirdId"}).then(res => { + // this.dlSickLoading = false + // if (res.code != 20000) { + // this.$message.error(res.message) + // return + // } else { + // this.$message.success("后台正在下载更新，请稍后刷新重试！"); + // } + // }).catch(() => { + // this.dlSickLoading = false + // this.$message.error("数据加载失败") + // }) }, updatePrecribe() { this.updatePrecribeLoading = true; - downloadPrescribe({sickCode: this.sickerInfo.code,adNum:this.sickerInfo.adNum}).then(res => { + downloadPrescribe({sickCode: this.sickerInfo.code, adNum: this.sickerInfo.adNum}).then(res => { this.updatePrecribeLoading = false if (res.code != 20000) { this.$message.error(res.message) diff --git a/src/views/basic/sicker/skPerson.vue b/src/views/basic/sicker/skPerson.vue index c9b6c683..a651b60c 100644 --- a/src/views/basic/sicker/skPerson.vue +++ b/src/views/basic/sicker/skPerson.vue @@ -190,6 +190,17 @@ > + + + diff --git a/src/views/basic/sicker/skPersonDownload.vue b/src/views/basic/sicker/skPersonDownload.vue new file mode 100644 index 00000000..857f3e7b --- /dev/null +++ b/src/views/basic/sicker/skPersonDownload.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/dev/deviceInfo.vue b/src/views/dev/deviceInfo.vue index 9fab712c..14a57fea 100644 --- a/src/views/dev/deviceInfo.vue +++ b/src/views/dev/deviceInfo.vue @@ -115,34 +115,34 @@ - + - + - + - - - - + + + + - - - + + + - +