diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index c1623e8..766a717 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -7,7 +7,7 @@ 接诊 收费 库存 - 会员 + 患者 医保 统计 设置 diff --git a/src/components/home/index/BusinessOverview.vue b/src/components/home/index/BusinessOverview.vue index ef08f52..e92c1fa 100644 --- a/src/components/home/index/BusinessOverview.vue +++ b/src/components/home/index/BusinessOverview.vue @@ -56,7 +56,7 @@ const initEcharts = (dateList: any[], vipData: any, commonData: any) => { trigger: 'axis' }, legend: { - data: ['会员', '普通',] + data: ['患者', '普通',] }, grid: { left: '3%', @@ -74,7 +74,7 @@ const initEcharts = (dateList: any[], vipData: any, commonData: any) => { }, series: [ { - name: '会员', + name: '患者', type: 'line', stack: 'Total', data: vipData diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue index e8decb4..5e4610a 100644 --- a/src/components/member/memberProfile/VipEdit.vue +++ b/src/components/member/memberProfile/VipEdit.vue @@ -1,5 +1,5 @@ @@ -51,6 +55,7 @@ const serviceShowConfig = [ }, ] const serviceSelect = (row: any) => { + row.selectedNum = 1 list.value.push(row) } @@ -75,35 +80,40 @@ const deleteItem = (id: any) => { display: flex; align-items: center; justify-content: space-between; - .index{ + + .index { height: 100%; width: 50px; text-align: center; border-right: 1px solid #EAEAEC; line-height: 64px; } - .name{ + + .name { flex: 1; margin-left: 10px; border-right: 1px solid #EAEAEC; height: 100%; line-height: 64px; } - .code{ + + .code { flex: 1; margin-left: 10px; border-right: 1px solid #EAEAEC; height: 100%; line-height: 64px; } - .price{ + + .price { height: 100%; width: 200px; line-height: 64px; border-right: 1px solid #EAEAEC; text-align: center; } - .delete{ + + .delete { height: 100%; width: 50px; line-height: 64px; @@ -117,6 +127,7 @@ const deleteItem = (id: any) => { border-top: 1px solid #EAEAEC; display: flex; align-items: center; + .search-input { height: 100%; flex: 1; diff --git a/src/components/registration/CardDefault.vue b/src/components/registration/CardDefault.vue index fc187cd..0d3de58 100644 --- a/src/components/registration/CardDefault.vue +++ b/src/components/registration/CardDefault.vue @@ -73,7 +73,7 @@ const getInfoFor1101 = (params: any) => { socialCard.value.data = res; socialCard.value.mdtrtCertType = params.mdtrtCertType; socialCard.value.mdtrtCertNo = params.mdtrtCertNo; - emit('socialCardUpdate') + emit('socialCardUpdate',socialCard.value) }).finally(() => { isReading.value = false; }) diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index 21d2a02..6f61266 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -16,14 +16,14 @@ > - + - - + + @@ -120,19 +120,16 @@ const props = defineProps({ default: () => [] }, id: { + type: [String,Number], + default: '' + }, + doctorId: { type: String, default: '' } }) const certTypeList = ref(Object.entries(psnCertTypes).map(([id, name]) => ({ id, name }))); -const edit_data = ref({ - name: '', - gender: '', - spec: '', - phone: '', - organizationDoctorId: '', - memo: '' -}) +const edit_data = ref({}) const rules = ref({ name: [ {required: true, message: '请输入名称', trigger: 'blur'}, @@ -166,9 +163,10 @@ const isShow = ref(false) const emit = defineEmits(['close']) const close = () => { isShow.value = false + edit_data.value = {} emit('close') } -const id = props.id +const id = ref(props.id) const form = ref() const save = () => { let data = { @@ -178,7 +176,7 @@ const save = () => { } form.value.validate((v: any) => { if (v) { - if (id) { + if (id.value) { post('registration/edit', { data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo, mdtrtCertType: socialCard.value.mdtrtCertType @@ -201,13 +199,14 @@ const save = () => { } const deleteDetail = () => { - post('registration/delete', {id}).then(() => { + post('registration/delete', {id:id.value}).then(() => { ElMessage.success('删除成功') close() }) } -const socialCardUpdate = () => { - console.log('socialCardUpdate') +const socialCardUpdate = (e:any) => { + edit_data.value=e.data.baseinfo + edit_data.value.gender=e.data.baseinfo.gend } const socialCard: any = ref({ data: null, @@ -216,9 +215,9 @@ const socialCard: any = ref({ }) const init = () => { isShow.value = true - edit_data.value.organizationDoctorId = props.id - if (id) { - post('registration/getById', {id}).then((res: any) => { + edit_data.value.organizationDoctorId = props.doctorId + if (id.value) { + post('registration/getById', {id:id.value}).then((res: any) => { edit_data.value = res }) } diff --git a/src/components/retail/VipSearch.vue b/src/components/retail/VipSearch.vue index eacce76..3fa6d83 100644 --- a/src/components/retail/VipSearch.vue +++ b/src/components/retail/VipSearch.vue @@ -70,7 +70,7 @@ const closePurchaseList = () => { ref="selectRef" :remote-method="querySearchAsync" :options="options" - placeholder="输入会员号" + placeholder="输入患者号" :fit-input-width="500" >