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;
+}
diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue
index 0cac716..9dffa4c 100644
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@@ -71,7 +71,7 @@ const socialCard = ref({
});
const loading = ref(false);
const show = ref(false)
-const printReceipt = ref(true);
+const printReceipt = ref(false);
const payType = ref(null);
const retailOrder = ref(null);
const close = () => {
diff --git a/src/components/home/index/Dialog/ExpireWarnDetail.vue b/src/components/home/index/Dialog/ExpireWarnDetail.vue
index 4da6c08..f30cdea 100644
--- a/src/components/home/index/Dialog/ExpireWarnDetail.vue
+++ b/src/components/home/index/Dialog/ExpireWarnDetail.vue
@@ -36,7 +36,7 @@
:current-page="pageNum"
:page-size="pageSize"
:total="total"
- @change="changePage"
+ @current-change="changePage"
/>
@@ -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 @@
-
-
+
+
-
+
{{ sectionList.find((item:any)=>item.id===scope.row.organizationSectionId)?.name || '-' }}
-
+
{{ roleList.find((item: any) => item.id === scope.row.organizationDoctorId)?.name || '-' }}
-
+
{{ visitType[scope.row.visitType] || '-' }}
-
+
{{ formatDate(scope.row.createDatetime) || '-' }}
-
+
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) => {