diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts index 4b530a0..a314fba 100644 --- a/src/assets/config/apiConfig.ts +++ b/src/assets/config/apiConfig.ts @@ -21,4 +21,10 @@ export enum apiConfig{ "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表 "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表 "OrganizationMemberListBySectionId"="organization/member/listBySectionId",//获取当前科室的所有医生列表 + + /** + * 收费接口 + */ + + "ChargeListChargeLog"="charge/listChargeLog"//查询收费记录 } diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue index bc69477..3c3d848 100644 --- a/src/components/outpatient/MedicalQueue.vue +++ b/src/components/outpatient/MedicalQueue.vue @@ -129,9 +129,9 @@ const initStatusList = () => { statusList.value[2].num = res.completeDiaCount }) } -const clickLi = (item: any) => { +const clickLi = (item: any,showBox:any = true) => { curItem.value = item - if (item.status == 1) { + if (item.status == 1 && showBox) { ElMessageBox.confirm(`您将要接诊${item.name}`, "提示", { confirmButtonText: '确定', cancelButtonText: '取消', @@ -145,15 +145,18 @@ const clickLi = (item: any) => { curStatus.value = 2 curItem.value = res initStatusList() + emit('clickItem', curItem.value) }) } }, }) + }else { + emit('clickItem', curItem.value) } - emit('clickItem', curItem.value) + } const changeCurItemOrStatus = (item:any, status:any) => { - curItem.value = item + clickLi(item,false) if (curStatus != null){ curStatus.value = status } diff --git a/src/components/registration/CardDefault.vue b/src/components/registration/CardDefault.vue index 453d35b..18ccfd6 100644 --- a/src/components/registration/CardDefault.vue +++ b/src/components/registration/CardDefault.vue @@ -110,7 +110,7 @@ onUnmounted(() => { emit('changeLoading',false) }) const close = () => { - socialCard.value.data = null + socialCard.value = null } defineExpose({close}) diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index dc7f891..0f362d2 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -232,17 +232,18 @@ const close = () => { } const form = ref() const save = () => { + debugger let data = { ...edit_data.value, - psnNo: socialCard.value.data?.baseinfo.psn_no, - insutype: socialCard.value.data?.insuinfo[0].insutype + psnNo: socialCard.value?.data?.baseinfo.psn_no, + insutype: socialCard.value?.data?.insuinfo[0].insutype } form.value.validate((v: any) => { if (v) { if (edit_data.value.id) { post('registration/edit', { - data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo, - mdtrtCertType: socialCard.value.mdtrtCertType + data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo, + mdtrtCertType: socialCard.value?.mdtrtCertType }).then(() => { ElMessage.success('修改成功') close() @@ -251,8 +252,8 @@ const save = () => { console.log(socialCard.value) post('registration/add', { data: data, - mdtrtCertNo: socialCard.value.mdtrtCertNo, - mdtrtCertType: socialCard.value.mdtrtCertType + mdtrtCertNo: socialCard.value?.mdtrtCertNo, + mdtrtCertType: socialCard.value?.mdtrtCertType }).then(() => { ElMessage.success('挂号成功') close() diff --git a/src/components/social/inventoryUp/List_3501.vue b/src/components/social/inventoryUp/List_3501.vue index ceee360..6ead3ed 100644 --- a/src/components/social/inventoryUp/List_3501.vue +++ b/src/components/social/inventoryUp/List_3501.vue @@ -110,7 +110,7 @@ const formatDate = (isoStr:any) => { \ No newline at end of file diff --git a/src/components/social/inventoryUp/List_3502.vue b/src/components/social/inventoryUp/List_3502.vue index 13e6ff6..f902525 100644 --- a/src/components/social/inventoryUp/List_3502.vue +++ b/src/components/social/inventoryUp/List_3502.vue @@ -197,7 +197,7 @@ const formatDate = (isoStr: any) => { \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index f581053..574f588 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -133,16 +133,33 @@ const router = createRouter({ }, { path: '/social', - component: () => import('../views/Layout.vue'), + component: () => import('../views/LayoutSocial.vue'), children: [ { path: "", - redirect: "/social/index", + redirect: "/social/directory", }, { - path: "index", - component: () => import('../views/social/directory.vue'), - } + path: "directory", + component: () => import('@/views/social/directory.vue'), + }, + { + path: "update", + component: () => import('@/views/social/update.vue'), + }, + { + path: "inventoryUp", + component: () => import('@/views/social/inventoryUp.vue'), + }, + { + path: "costRecord", + component: () => import('@/views/social/costRecord.vue'), + }, + { + path: "accountRecord", + component: () => import('@/views/social/accountRecords.vue'), + }, + ] }, { diff --git a/src/views/LayoutSocial.vue b/src/views/LayoutSocial.vue new file mode 100644 index 0000000..2bfceae --- /dev/null +++ b/src/views/LayoutSocial.vue @@ -0,0 +1,79 @@ + + + + + + \ No newline at end of file diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue index 61e88f0..ae3e352 100644 --- a/src/views/outpatient/index.vue +++ b/src/views/outpatient/index.vue @@ -95,14 +95,14 @@ const save = () => { const data = { registrationId: registerId.value, patientId: patientId.value, - itemList: itemDetail.value, - goodsList: goodsList.value, + itemList: formData.value.itemDetail, + goodsList: formData.value.goodsDetail, diagnosisMedicalRecord: medicalRecord, } - post('medical/record/save', {data: data}).then(() => { + post('medical/record/save', {data: data}).then((res:any) => { ElMessage.success("保存成功") - medicalQueueRef.value?.changeCurItemOrStatus(null,3); + medicalQueueRef.value?.changeCurItemOrStatus(null,2); }) diff --git a/src/views/social/costRecord.vue b/src/views/social/costRecord.vue index 0f404ff..9ca576b 100644 --- a/src/views/social/costRecord.vue +++ b/src/views/social/costRecord.vue @@ -40,6 +40,7 @@ import {onMounted, ref} from "vue"; import {post} from "@/utils/request.ts"; import {getToday, formatDateArray} from "@/utils/dateUtils.ts"; +import {apiConfig} from "@/assets/config/apiConfig.ts"; const tableData = ref([]) const date = ref() @@ -50,7 +51,7 @@ const dateChangeHandler = () => { const getTableData = () => { - post("retail/reconciliation/getChargeList", {beginTime: date.value[0], endTime: date.value[1]}).then((res: any) => { + post(apiConfig.ChargeListChargeLog, {beginTime: date.value[0], endTime: date.value[1]}).then((res: any) => { tableData.value = res }) }