From 95848a6a238d00834b91fcb4944c5c6ee7ec3504 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 17 Jan 2024 17:19:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=87=BA=E5=BA=93=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E6=90=9C=E7=B4=A2=EF=BC=8C=E8=AF=81=E4=B9=A6=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E5=AE=A1=E6=A0=B8=E4=BA=BA=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 11 ++- public/index.html | 43 ++++----- src/api/basic/sicker/skPersonApi.js | 11 +++ src/views/basic/sicker/skPersonDownload.vue | 3 +- src/views/inout/DialogCreateOrder.vue | 39 +++++--- src/views/inout/IoAuditedOrder.vue | 2 - src/views/inout/IoCreateBusOrder.vue | 2 + src/views/inout/IoCreateErrorOrder.vue | 2 + src/views/inout/IoCreateOrder.vue | 2 + src/views/inout/IoCreateScanOrder.vue | 48 +++++----- src/views/inout/IoDealCheckOrder.vue | 2 + src/views/inout/IoDealOrder.vue | 2 + src/views/purchase/cert/supCertAudit.vue | 17 ++-- .../company/supCompanyAduditDialog.vue | 19 +++- .../supManufacturerAuditDialog.vue | 48 ++++++---- .../product/supProductAuditDialog.vue | 88 ++++++++++++------- 16 files changed, 220 insertions(+), 119 deletions(-) diff --git a/.env.production b/.env.production index b9e5fb43..acf02e9f 100644 --- a/.env.production +++ b/.env.production @@ -38,11 +38,12 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' + # 长泰医院 -VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' +# 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/' @@ -51,7 +52,13 @@ VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # 林纪裕centos # VUE_APP_BASE_API = 'http://192.168.0.86:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.31.2:9150/UDI_WMS_MC/' + + +# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.80.80:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.0.207:9160/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/public/index.html b/public/index.html index e32e1293..973ace06 100644 --- a/public/index.html +++ b/public/index.html @@ -1,14 +1,16 @@ - - - - - - - <%= webpackConfig.name %> - - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
-
- + + +
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+
+ diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js index 6a34a88c..bb2c82ff 100644 --- a/src/api/basic/sicker/skPersonApi.js +++ b/src/api/basic/sicker/skPersonApi.js @@ -26,6 +26,17 @@ export function downloadSick(query) { }); } +/** + * 远程下载 + */ +export function remoteFilter(query) { + return axios({ + url: "/udiwms/basic/sk/sicker/filter/remote", + method: "get", + params: query + }); +} + /** * 处方使用耗材明细 diff --git a/src/views/basic/sicker/skPersonDownload.vue b/src/views/basic/sicker/skPersonDownload.vue index 35703e7f..ad51e504 100644 --- a/src/views/basic/sicker/skPersonDownload.vue +++ b/src/views/basic/sicker/skPersonDownload.vue @@ -76,7 +76,7 @@ let query = { code: "", adNum: "", thirdSys: "thirdId", - selectSickers: [], + selectSickers: null, page: 1, limit: 10 } @@ -139,6 +139,7 @@ export default { return } let selectData = this.multipleSelection; + this.filterQuery.selectSickers = [] selectData.forEach((obj) => { this.filterQuery.selectSickers.push(obj); }); diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 250856c3..1844b815 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -217,6 +217,7 @@ :remote-method="findSickMethod" :loading="loading" @change="sickChange" + @keyup.enter.native="remoteFindSickMethod" :disabled="corpOrderIdDisabled" > - - - + + + + { }); }, + + remoteFindSickMethod(e) { + console.log(e.target.value) + let sickQuery = { + page: 1, + limit: 10, + adNum: e.target.value, + }; + remoteFilter(sickQuery).then(res => { + this.fromSickOptions = res.data.list || [] + }).catch(() => { + }); + }, + + //单据类型改变 actionChange(item) { this.orderFormData.checkPreInOption = null; diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index 5910039b..57fefc78 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -139,8 +139,6 @@ {{ scope.row.auditTime }} - - diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue index ce6841e1..6cf4c1bc 100644 --- a/src/views/inout/IoCreateBusOrder.vue +++ b/src/views/inout/IoCreateBusOrder.vue @@ -143,6 +143,8 @@ + +