From 1ed5d1d71ad0b229be4502eca7663be8b34c439e Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Mon, 19 May 2025 14:10:42 +0800 Subject: [PATCH 1/9] dev --- src/components/charge/CardPay.vue | 9 +++++++++ src/components/charge/Settlement.vue | 2 +- .../home/index/Dialog/ExpireWarnDetail.vue | 7 +++---- .../home/index/Dialog/InventoryWarnDetail.vue | 8 ++++---- src/components/registration/List.vue | 14 +++++++------- src/stores/counter.ts | 14 -------------- src/views/charge/index.vue | 6 ------ src/views/outpatient/index.vue | 4 +--- 8 files changed, 25 insertions(+), 39 deletions(-) diff --git a/src/components/charge/CardPay.vue b/src/components/charge/CardPay.vue index af464de..36fad4b 100644 --- a/src/components/charge/CardPay.vue +++ b/src/components/charge/CardPay.vue @@ -74,10 +74,19 @@ const getInfoFor1101 = (params: any) => { } onMounted(async () => { wsStore.setMessageCallback(reciceMessage) + wsStore.setErrorCallback(errorCallBack) }); onUnmounted(() => { wsStore.removeAllMessageCallback() + wsStore.removeAllErrorCallback() }) +const errorCallBack = () => { + ElMessage({ + message: '请连接设备', + type: 'warning', + }); + isReading.value = false; +} @@ -64,9 +64,8 @@ const close = () => { const pageNum = ref(1); const pageSize = ref(20); const total = ref(0); -const changePage = (pageNum: any) => { - pageNum.value = pageNum - console.log(pageNum.value) +const changePage = (value: any) => { + pageNum.value = value init() } diff --git a/src/components/home/index/Dialog/InventoryWarnDetail.vue b/src/components/home/index/Dialog/InventoryWarnDetail.vue index 63c3d83..c957ba1 100644 --- a/src/components/home/index/Dialog/InventoryWarnDetail.vue +++ b/src/components/home/index/Dialog/InventoryWarnDetail.vue @@ -40,7 +40,7 @@ :current-page="pageNum" :page-size="pageSize" :total="total" - @change="changePage" + @current-change="changePage" /> @@ -67,10 +67,10 @@ const close = () => { tableData.value = [] }; const pageNum = ref(1); -const pageSize = ref(1); +const pageSize = ref(20); const total = ref(0); -const changePage = (pageNum: any) => { - pageNum.value = pageNum +const changePage = (value: any) => { + pageNum.value = value init() } diff --git a/src/components/registration/List.vue b/src/components/registration/List.vue index cba0d1c..c5d6b7a 100644 --- a/src/components/registration/List.vue +++ b/src/components/registration/List.vue @@ -15,8 +15,8 @@ - - + + - + - + - + - + - + diff --git a/src/stores/counter.ts b/src/stores/counter.ts index ccb01fa..8b13789 100644 --- a/src/stores/counter.ts +++ b/src/stores/counter.ts @@ -1,15 +1 @@ -import { ref } from 'vue' -import { defineStore } from 'pinia' - -export const useLogoStore = defineStore('logo', () => { - const logoUrl = ref("") - function setLogoUrl(url: string) { - logoUrl.value = url - } - function getLogoUrl() { - return logoUrl.value - } - // 返回需要暴露的方法和变量 - return { logoUrl, setLogoUrl, getLogoUrl } -}) \ No newline at end of file diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue index 260ac80..4839c74 100644 --- a/src/views/charge/index.vue +++ b/src/views/charge/index.vue @@ -246,10 +246,8 @@ const orderCompleted = (printReceipt: any) => { type MedTypeKey = keyof typeof medTypeJson; const wsStore = useWsStore() const printReceiptDo = async () => { - let chargeOrder:any = await post("charge/getOrderByDiagnosisCode", { diagnosisCode: formData.value.code, - status: formData.value.status }) if (!chargeOrder) { ElMessage.error("该订单不存在") @@ -269,7 +267,6 @@ const printReceiptDo = async () => { if (res.chargeSocialPayLog) { res.chargeSocialPayLog.medTypeStr = medTypeJson[res.chargeSocialPayLog.medType as MedTypeKey]; } - console.log(res) wsStore.sendMessage({ type: "PrintReceipt", config: null, @@ -317,8 +314,6 @@ const getOrderTotalPrice = () => { }) formData.value.preTotalPrice = Math.round(totalPrice * 100) / 100 formData.value.totalPrice = Math.round(totalPrice * 100) / 100 - - } @@ -357,7 +352,6 @@ const refund = async () => { } let chargeOrder:any = await post("charge/getOrderByDiagnosisCode", { diagnosisCode: formData.value.code, - status: formData.value.status }) if (!chargeOrder) { ElMessage.error("该订单不存在") diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue index 97f6e64..ec41c73 100644 --- a/src/views/outpatient/index.vue +++ b/src/views/outpatient/index.vue @@ -126,6 +126,7 @@ const clickItem = (item: any) => { formData.value.itemDetail = res.itemDetail formData.value.diagType = Number(formData.value.diagType) patientRegistration.value = res.patientRegistration + getOrderTotalPrice() }) } @@ -162,14 +163,11 @@ const getOrderTotalPrice = () => { formData.value.itemDetail?.forEach((item: any) => { totalPrice += item.selectedPrice * item.selectedNum }) - console.log(totalPrice, 'totalPrice') formData.value.goodsDetail?.forEach((item: any) => { totalPrice += item.selectedPrice * item.selectedNum }) - console.log(totalPrice, 'totalPrice') formData.value.preTotalPrice = Math.round((totalPrice * 100) / 100) formData.value.totalPrice = totalPrice - console.log(formData.value.totalPrice, 'formData.value.totalPrice') } const caseRef = ref("") const copyForm = (item: any) => { From 71befb8a9128b521cf955dbe32998c0e4ab98033 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Mon, 19 May 2025 14:14:10 +0800 Subject: [PATCH 2/9] dev --- src/components/home/index/InventoryAlert.vue | 1 - src/components/home/index/ValidityWarning.vue | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/components/home/index/InventoryAlert.vue b/src/components/home/index/InventoryAlert.vue index e20be86..c3beb15 100644 --- a/src/components/home/index/InventoryAlert.vue +++ b/src/components/home/index/InventoryAlert.vue @@ -38,7 +38,6 @@ const isZeroInventory = (item: any) => {
{{ item.name }}
-
剩余库存值
{{ item.inventoryWholeNumber }} diff --git a/src/components/home/index/ValidityWarning.vue b/src/components/home/index/ValidityWarning.vue index fabd097..b2828e8 100644 --- a/src/components/home/index/ValidityWarning.vue +++ b/src/components/home/index/ValidityWarning.vue @@ -18,7 +18,7 @@ const expireDateWarningListSrc = ref([]); const expireDateWarningList = ref([]); const getExpiryDateWarning = () => { - post("statistics/expiryDateWarning",{pageNum: 1, pageSize: 20}).then((res: any) => { + post("statistics/expiryDateWarning", {pageNum: 1, pageSize: 20}).then((res: any) => { expireDateWarningList.value = res.list.slice(0, 4) }) } @@ -38,13 +38,7 @@ const isExpire = (item: any) => { :class="isExpire(item) ? 'item__danger' : 'item__warn'">
- -
{{ item.name }}
- +
{{ item.name }}
{{ item.whole_number }}{{ item.packaging_unit }} {{ @@ -146,6 +140,7 @@ const isExpire = (item: any) => { .item-right { width: 120px; display: flex; + .item-right-num { font-size: 28px; font-weight: bold; From 70d26919b3051ed6a594444f3f7766244380f198 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Mon, 19 May 2025 14:27:58 +0800 Subject: [PATCH 3/9] dev --- src/components/home/index/Card.vue | 6 +++++- src/components/home/index/CustomerService.vue | 15 +++++++++++---- src/components/home/index/SystemMessage.vue | 5 +++++ src/views/registration/index.vue | 6 +++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/home/index/Card.vue b/src/components/home/index/Card.vue index c6396f0..cc4c0a6 100644 --- a/src/components/home/index/Card.vue +++ b/src/components/home/index/Card.vue @@ -46,15 +46,19 @@ const imageUrl = ref() height: 208px; .info-content { + width: 100%; display: flex; + padding-left: 24px; .image { width: 88px; height: 88px; - margin: 0 24px; + margin-right:24px; } .app_info-content-text { + flex: 1; + min-width: 0; font-weight: 500; font-size: 16px; color: #333333; diff --git a/src/components/home/index/CustomerService.vue b/src/components/home/index/CustomerService.vue index 2680c10..7c2e186 100644 --- a/src/components/home/index/CustomerService.vue +++ b/src/components/home/index/CustomerService.vue @@ -10,7 +10,7 @@ const proxyMessage = defineModel()
-
服务名称：{{ proxyMessage.name }}
+
服务名称：{{ proxyMessage.name }}
服务热线：{{ proxyMessage.phone }}
@@ -19,20 +19,22 @@ const proxyMessage = defineModel()