Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

This commit is contained in:
LiJianZhao 2025-04-29 12:10:45 +08:00
commit 23a7ede76e
13 changed files with 78 additions and 65 deletions

View File

@ -7,7 +7,7 @@
<router-link to="/outpatient" class="menu-item" active-class="active active3">接诊</router-link> <router-link to="/outpatient" class="menu-item" active-class="active active3">接诊</router-link>
<router-link to="/charge" class="menu-item" active-class="active active4">收费</router-link> <router-link to="/charge" class="menu-item" active-class="active active4">收费</router-link>
<router-link to="/inventory" class="menu-item" active-class="active active5">库存</router-link> <router-link to="/inventory" class="menu-item" active-class="active active5">库存</router-link>
<router-link to="/member" class="menu-item" active-class="active active6">会员</router-link> <router-link to="/member" class="menu-item" active-class="active active6">患者</router-link>
<router-link to="/social" class="menu-item" active-class="active active7">医保</router-link> <router-link to="/social" class="menu-item" active-class="active active7">医保</router-link>
<router-link to="/statistics" class="menu-item" active-class="active active8">统计</router-link> <router-link to="/statistics" class="menu-item" active-class="active active8">统计</router-link>
<router-link to="/settings" class="menu-item" active-class="active active9">设置</router-link> <router-link to="/settings" class="menu-item" active-class="active active9">设置</router-link>

View File

@ -56,7 +56,7 @@ const initEcharts = (dateList: any[], vipData: any, commonData: any) => {
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
data: ['会员', '普通',] data: ['患者', '普通',]
}, },
grid: { grid: {
left: '3%', left: '3%',
@ -74,7 +74,7 @@ const initEcharts = (dateList: any[], vipData: any, commonData: any) => {
}, },
series: [ series: [
{ {
name: '会员', name: '患者',
type: 'line', type: 'line',
stack: 'Total', stack: 'Total',
data: vipData data: vipData

View File

@ -1,5 +1,5 @@
<template> <template>
<Mask :width="600" :height="500" :is-show="show" @close="show=false" :title="id?'会员编辑':'会员建档'"> <Mask :width="600" :height="500" :is-show="show" @close="show=false" :title="id?'患者编辑':'患者建档'">
<div class="content"> <div class="content">
<el-form <el-form
:model="ruleForm" :model="ruleForm"
@ -175,7 +175,7 @@ const submitForm = async () => {
const levelName = ref('') const levelName = ref('')
const rules = { const rules = {
exp: [ exp: [
{required: true, message: '请选择会员等级', trigger: 'change'}, {required: true, message: '请选择患者等级', trigger: 'change'},
], ],
phone: [ phone: [
{required: true, message: '请输入手机号码', trigger: 'blur'}, {required: true, message: '请输入手机号码', trigger: 'blur'},

View File

@ -6,10 +6,14 @@
<li class="item" v-for="(item, index) in list" :key="index"> <li class="item" v-for="(item, index) in list" :key="index">
<span class="index">{{ index + 1 }}</span> <span class="index">{{ index + 1 }}</span>
<span class="name">{{ item.itemName }}</span> <span class="name">{{ item.itemName }}</span>
<span class="code">{{ item.itemSocialCode }}</span>
<span class="price">{{ item.unitPrice }}</span> <span class="price">{{ item.unitPrice }}</span>
<span class="code">{{ item.itemSocialCode }}</span>
<span class="unit">
<el-input-number v-model="item.selectedNum" min="1"></el-input-number>
<span style="line-height: 30px;margin-left: 10px">{{ item.unit }}</span>
</span>
<span class="delete"> <span class="delete">
<el-button text @click="deleteItem(item.id)"> <el-button @click="deleteItem(item.id)">
<el-icon><CircleClose/></el-icon> <el-icon><CircleClose/></el-icon>
</el-button> </el-button>
</span> </span>
@ -26,7 +30,7 @@
> >
</SearchInput> </SearchInput>
</div> </div>
<span style="margin-right: 24px">{{ list.reduce((acc, cur) => acc + cur.unitPrice, 0) }}</span></div> <span style="margin-right: 24px">{{ list.reduce((acc, cur) => acc + cur.unitPrice*cur.selectedNum, 0) }}</span></div>
</div> </div>
</Panel> </Panel>
</template> </template>
@ -51,6 +55,7 @@ const serviceShowConfig = [
}, },
] ]
const serviceSelect = (row: any) => { const serviceSelect = (row: any) => {
row.selectedNum = 1
list.value.push(row) list.value.push(row)
} }
@ -75,35 +80,40 @@ const deleteItem = (id: any) => {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.index{
.index {
height: 100%; height: 100%;
width: 50px; width: 50px;
text-align: center; text-align: center;
border-right: 1px solid #EAEAEC; border-right: 1px solid #EAEAEC;
line-height: 64px; line-height: 64px;
} }
.name{
.name {
flex: 1; flex: 1;
margin-left: 10px; margin-left: 10px;
border-right: 1px solid #EAEAEC; border-right: 1px solid #EAEAEC;
height: 100%; height: 100%;
line-height: 64px; line-height: 64px;
} }
.code{
.code {
flex: 1; flex: 1;
margin-left: 10px; margin-left: 10px;
border-right: 1px solid #EAEAEC; border-right: 1px solid #EAEAEC;
height: 100%; height: 100%;
line-height: 64px; line-height: 64px;
} }
.price{
.price {
height: 100%; height: 100%;
width: 200px; width: 200px;
line-height: 64px; line-height: 64px;
border-right: 1px solid #EAEAEC; border-right: 1px solid #EAEAEC;
text-align: center; text-align: center;
} }
.delete{
.delete {
height: 100%; height: 100%;
width: 50px; width: 50px;
line-height: 64px; line-height: 64px;
@ -117,6 +127,7 @@ const deleteItem = (id: any) => {
border-top: 1px solid #EAEAEC; border-top: 1px solid #EAEAEC;
display: flex; display: flex;
align-items: center; align-items: center;
.search-input { .search-input {
height: 100%; height: 100%;
flex: 1; flex: 1;

View File

@ -73,7 +73,7 @@ const getInfoFor1101 = (params: any) => {
socialCard.value.data = res; socialCard.value.data = res;
socialCard.value.mdtrtCertType = params.mdtrtCertType; socialCard.value.mdtrtCertType = params.mdtrtCertType;
socialCard.value.mdtrtCertNo = params.mdtrtCertNo; socialCard.value.mdtrtCertNo = params.mdtrtCertNo;
emit('socialCardUpdate') emit('socialCardUpdate',socialCard.value)
}).finally(() => { }).finally(() => {
isReading.value = false; isReading.value = false;
}) })

View File

@ -16,14 +16,14 @@
> >
<el-descriptions-item label="名称"> <el-descriptions-item label="名称">
<el-form-item prop="name"> <el-form-item prop="name">
<el-input v-model="edit_data.name" placeholder="请输入名称"></el-input> <el-input v-model="edit_data.name" placeholder="请输入名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="性别"> <el-descriptions-item label="性别">
<el-form-item prop="gender"> <el-form-item prop="gender">
<el-radio-group v-model="edit_data.gender"> <el-radio-group v-model="edit_data.gender">
<el-radio value=""></el-radio> <el-radio value="1"></el-radio>
<el-radio value=""></el-radio> <el-radio value="2"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
@ -120,19 +120,16 @@ const props = defineProps({
default: () => [] default: () => []
}, },
id: { id: {
type: [String,Number],
default: ''
},
doctorId: {
type: String, type: String,
default: '' default: ''
} }
}) })
const certTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({ id, name }))); const certTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({ id, name })));
const edit_data = ref<any>({ const edit_data = ref<any>({})
name: '',
gender: '',
spec: '',
phone: '',
organizationDoctorId: '',
memo: ''
})
const rules = ref<any>({ const rules = ref<any>({
name: [ name: [
{required: true, message: '请输入名称', trigger: 'blur'}, {required: true, message: '请输入名称', trigger: 'blur'},
@ -166,9 +163,10 @@ const isShow = ref(false)
const emit = defineEmits(['close']) const emit = defineEmits(['close'])
const close = () => { const close = () => {
isShow.value = false isShow.value = false
edit_data.value = {}
emit('close') emit('close')
} }
const id = props.id const id = ref<any>(props.id)
const form = ref() const form = ref()
const save = () => { const save = () => {
let data = { let data = {
@ -178,7 +176,7 @@ const save = () => {
} }
form.value.validate((v: any) => { form.value.validate((v: any) => {
if (v) { if (v) {
if (id) { if (id.value) {
post('registration/edit', { post('registration/edit', {
data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo, data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
mdtrtCertType: socialCard.value.mdtrtCertType mdtrtCertType: socialCard.value.mdtrtCertType
@ -201,13 +199,14 @@ const save = () => {
} }
const deleteDetail = () => { const deleteDetail = () => {
post('registration/delete', {id}).then(() => { post('registration/delete', {id:id.value}).then(() => {
ElMessage.success('删除成功') ElMessage.success('删除成功')
close() close()
}) })
} }
const socialCardUpdate = () => { const socialCardUpdate = (e:any) => {
console.log('socialCardUpdate') edit_data.value=e.data.baseinfo
edit_data.value.gender=e.data.baseinfo.gend
} }
const socialCard: any = ref({ const socialCard: any = ref({
data: null, data: null,
@ -216,9 +215,9 @@ const socialCard: any = ref({
}) })
const init = () => { const init = () => {
isShow.value = true isShow.value = true
edit_data.value.organizationDoctorId = props.id edit_data.value.organizationDoctorId = props.doctorId
if (id) { if (id.value) {
post('registration/getById', {id}).then((res: any) => { post('registration/getById', {id:id.value}).then((res: any) => {
edit_data.value = res edit_data.value = res
}) })
} }

View File

@ -70,7 +70,7 @@ const closePurchaseList = () => {
ref="selectRef" ref="selectRef"
:remote-method="querySearchAsync" :remote-method="querySearchAsync"
:options="options" :options="options"
placeholder="输入会员号" placeholder="输入患者号"
:fit-input-width="500" :fit-input-width="500"
> >
<template #prefix> <template #prefix>
@ -82,9 +82,9 @@ const closePurchaseList = () => {
</template> </template>
<template #header> <template #header>
<div class="header"> <div class="header">
<div class="text">会员信息</div> <div class="text">患者信息</div>
<div class="text">联系电话</div> <div class="text">联系电话</div>
<div class="text">会员等级</div> <div class="text">患者等级</div>
</div> </div>
</template> </template>
<template #default="{ item }"> <template #default="{ item }">
@ -124,7 +124,7 @@ const closePurchaseList = () => {
<div style="margin: 10px 0">消费{{ props.purchaseNum }}累计{{props.sum}}</div> <div style="margin: 10px 0">消费{{ props.purchaseNum }}累计{{props.sum}}</div>
</div> </div>
<div class="middle_box"> <div class="middle_box">
<div class="title">会员详情</div> <div class="title">患者详情</div>
<div class="right_content"> <div class="right_content">
<div class="bottom_box"> <div class="bottom_box">
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">

View File

@ -66,12 +66,12 @@
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="name" label="收费时间" align="center"/> <el-table-column prop="name" label="收费时间" align="center"/>
<el-table-column label="销售单号" align="center"></el-table-column> <el-table-column label="销售单号" align="center"></el-table-column>
<el-table-column label="会员姓名" align="center"></el-table-column> <el-table-column label="患者姓名" align="center"></el-table-column>
<el-table-column prop="name" label="性别" align="center"/> <el-table-column prop="name" label="性别" align="center"/>
<el-table-column prop="zip" label="年龄" align="center"></el-table-column> <el-table-column prop="zip" label="年龄" align="center"></el-table-column>
<el-table-column label="手机号" align="center"></el-table-column> <el-table-column label="手机号" align="center"></el-table-column>
<el-table-column prop="name" label="开单来源" align="center"/> <el-table-column prop="name" label="开单来源" align="center"/>
<el-table-column prop="zip" label="会员等级" align="center"></el-table-column> <el-table-column prop="zip" label="患者等级" align="center"></el-table-column>
<el-table-column prop="zip" label="顾客来源" align="center"></el-table-column> <el-table-column prop="zip" label="顾客来源" align="center"></el-table-column>
<el-table-column prop="zip" label="类型" align="center"></el-table-column> <el-table-column prop="zip" label="类型" align="center"></el-table-column>
<el-table-column prop="zip" label="原价" align="center"></el-table-column> <el-table-column prop="zip" label="原价" align="center"></el-table-column>

View File

@ -55,12 +55,12 @@
<div class="content-box"> <div class="content-box">
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column label="销售单号" align="center"></el-table-column> <el-table-column label="销售单号" align="center"></el-table-column>
<el-table-column label="会员姓名" align="center"></el-table-column> <el-table-column label="患者姓名" align="center"></el-table-column>
<el-table-column prop="name" label="性别" align="center"/> <el-table-column prop="name" label="性别" align="center"/>
<el-table-column prop="zip" label="年龄" align="center"></el-table-column> <el-table-column prop="zip" label="年龄" align="center"></el-table-column>
<el-table-column label="手机号" align="center"></el-table-column> <el-table-column label="手机号" align="center"></el-table-column>
<el-table-column prop="name" label="开单来源" align="center"/> <el-table-column prop="name" label="开单来源" align="center"/>
<el-table-column prop="zip" label="会员等级" align="center"></el-table-column> <el-table-column prop="zip" label="患者等级" align="center"></el-table-column>
<el-table-column prop="zip" label="整单原价" align="center"></el-table-column> <el-table-column prop="zip" label="整单原价" align="center"></el-table-column>
<el-table-column label="优惠" align="center"> <el-table-column label="优惠" align="center">
<el-table-column prop="zip" label="单项改价" align="center"></el-table-column> <el-table-column prop="zip" label="单项改价" align="center"></el-table-column>

View File

@ -43,7 +43,7 @@
<div class="revenue-content-item"> <div class="revenue-content-item">
<div class="revenue-content-item-text"> <div class="revenue-content-item-text">
<div class="num">{{ data.vipRevenue || 0 }}<span class="unit color2"></span></div> <div class="num">{{ data.vipRevenue || 0 }}<span class="unit color2"></span></div>
<div class="name color2">会员贡献收入</div> <div class="name color2">患者贡献收入</div>
<div class="text">日均{{ (data.vipRevenue / averageNum).toFixed(2) || 0 }}</div> <div class="text">日均{{ (data.vipRevenue / averageNum).toFixed(2) || 0 }}</div>
<div class="text"><span>本金0.00&nbsp;&nbsp;赠金0.00</span></div> <div class="text"><span>本金0.00&nbsp;&nbsp;赠金0.00</span></div>
</div> </div>
@ -52,7 +52,7 @@
<div class="revenue-content-item"> <div class="revenue-content-item">
<div class="revenue-content-item-text"> <div class="revenue-content-item-text">
<div class="num">{{ data.vipOrderCount || 0 }}<span class="unit color3"></span></div> <div class="num">{{ data.vipOrderCount || 0 }}<span class="unit color3"></span></div>
<div class="name color3">会员消费人次</div> <div class="name color3">患者消费人次</div>
<div class="text">日均{{ (data.vipOrderCount / averageNum).toFixed(0) || 0 }}</div> <div class="text">日均{{ (data.vipOrderCount / averageNum).toFixed(0) || 0 }}</div>
</div> </div>
<img class="image" src="/static/images/overView/4.png" alt=""> <img class="image" src="/static/images/overView/4.png" alt="">
@ -107,8 +107,8 @@ const data = ref<any>({
payTypeRevenue: [0], // payTypeRevenue: [0], //
totalOrderCount: 0, // totalOrderCount: 0, //
totalRevenue: null, // totalRevenue: null, //
vipOrderCount: 0, // vipOrderCount: 0, //
vipRevenue: null // vipRevenue: null //
}) })
const beginTime = ref('') const beginTime = ref('')
const endTime = ref('') const endTime = ref('')
@ -304,7 +304,7 @@ const initChart = () => {
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
data: ['会员', '普通',] data: ['患者', '普通',]
}, },
grid: { grid: {
left: '3%', left: '3%',
@ -332,7 +332,7 @@ const initChart = () => {
}, },
series: [ series: [
{ {
name: '会员', name: '患者',
type: 'line', type: 'line',
stack: 'Total', stack: 'Total',
data: [120, 132, 101, 134, 90, 230, 210] data: [120, 132, 101, 134, 90, 230, 210]

View File

@ -1,10 +1,10 @@
<template> <template>
<div class="container-wrapper"> <div class="container-wrapper">
<div class="left"> <div class="left">
<Panel title="会员列表"> <Panel title="患者列表">
<div class="search"> <div class="search">
<div class="input"> <div class="input">
<el-input v-model="input3" style="width:100%;height: 100%" placeholder="搜索会员" <el-input v-model="input3" style="width:100%;height: 100%" placeholder="搜索患者"
@keydown.enter="searchVip"> @keydown.enter="searchVip">
<template #prefix> <template #prefix>
<el-icon class="el-input__icon"> <el-icon class="el-input__icon">
@ -13,7 +13,7 @@
</template> </template>
</el-input> </el-input>
</div> </div>
<span class="btn" @click="openEdit(null)">会员建档</span> <span class="btn" @click="openEdit(null)">患者建档</span>
</div> </div>
<el-scrollbar @scroll="handleScroll" style="padding: 0 24px"> <el-scrollbar @scroll="handleScroll" style="padding: 0 24px">
<ul class="content" style="overflow: hidden"> <ul class="content" style="overflow: hidden">
@ -46,7 +46,7 @@
</Panel> </Panel>
</div> </div>
<div class="right"> <div class="right">
<Panel title="会员信息" class="right-top"> <Panel title="患者信息" class="right-top">
<div class="detail"> <div class="detail">
<div class="detail-top"> <div class="detail-top">
<div class="detail-top-left"> <div class="detail-top-left">
@ -68,7 +68,7 @@
<span class="btn" @click="openGrant()">发放积分</span> <span class="btn" @click="openGrant()">发放积分</span>
<span class="btn" @click="isExchange=true">兑换积分</span> <span class="btn" @click="isExchange=true">兑换积分</span>
<span class="btn" @click="isFlowingWater=true">查看流水</span> <span class="btn" @click="isFlowingWater=true">查看流水</span>
<!-- <span class="btn" @click="openLevelEdit(listItem)">会员等级编辑</span>--> <!-- <span class="btn" @click="openLevelEdit(listItem)">患者等级编辑</span>-->
</div> </div>
</div> </div>
<div class="detail-bottom"> <div class="detail-bottom">
@ -189,7 +189,7 @@ const listItem = ref<any>({
sex: "",// sex: "",//
phone: '',// phone: '',//
address: '',// address: '',//
levelId: '',// levelId: '',//
idCode: '',// idCode: '',//
area: '',// area: '',//
birthday: '',// birthday: '',//

View File

@ -49,7 +49,7 @@
</div> </div>
</div> </div>
</div> </div>
<Edit :id="id" ref="editRef" :doctorList="roleList" @close=" getPatientList"></Edit> <Edit :id="id" ref="editRef" :doctor-id="doctorId" :doctorList="roleList" @close=" getPatientList"></Edit>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -100,13 +100,16 @@ const changePage = (page: any) => {
getPatientList() getPatientList()
} }
const id = ref('') const id = ref('')
const doctorId= ref<any>('')
const rowClick = (row: any) => { const rowClick = (row: any) => {
id.value = row.id id.value = row.id
openDialog(row) nextTick(()=>{
editRef.value?.init()
})
} }
const editRef = ref<any>('') const editRef = ref<any>('')
const openDialog = (item: any) => { const openDialog = (item: any) => {
id.value = item.id doctorId.value = item.id
nextTick(()=>{ nextTick(()=>{
editRef.value?.init() editRef.value?.init()
}) })

View File

@ -8,7 +8,7 @@
<el-tab-pane label="销售业绩" name="first"> <el-tab-pane label="销售业绩" name="first">
<Sales /> <Sales />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="会员充值业绩" name="second" style="width: 100%;height: 100%"> <el-tab-pane label="患者充值业绩" name="second" style="width: 100%;height: 100%">
<MemberRecharge /> <MemberRecharge />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>