clinic-v2
/
web
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
ChenQiuYu 2025-04-29 13:17:44 +08:00
parent 3de45ef2a3 23a7ede76e
commit 85b4fa0efb
3 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/member/memberProfile/VipEdit.vue
View File

@ -14,8 +14,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="realName"> <el-form-item label="姓名" prop="name">
<el-input v-model="ruleForm.realName" placeholder="输入真实姓名"></el-input> <el-input v-model="ruleForm.name" placeholder="输入真实姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -42,8 +42,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证码" prop="idcode"> <el-form-item label="证件号码" prop="certNo">
<el-input v-model="ruleForm.idcode"></el-input> <el-input v-model="ruleForm.certNo"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -105,11 +105,11 @@ const close = () => {
interface RuleForm { interface RuleForm {
exp: string exp: string
phone: string phone: string
realName: string name: string
sex: string sex: string
age: string age: string
birthday: string birthday: string
idCode: string certNo: string
source: string source: string
nation: string nation: string
area: string area: string
@ -119,11 +119,11 @@ interface RuleForm {
let ruleForm = ref<any>({ let ruleForm = ref<any>({
exp: 0, exp: 0,
phone: '', phone: '',
realName: '', name: '',
sex: '', sex: '',
age: '', age: '',
birthday: '', birthday: '',
idCode: '', certNo: '',
source: '', source: '',
nation: '', nation: '',
area: '', area: '',
@ -180,7 +180,7 @@ const rules = {
phone: [ phone: [
{required: true, message: '请输入手机号码', trigger: 'blur'}, {required: true, message: '请输入手机号码', trigger: 'blur'},
], ],
realName: [ name: [
{required: true, message: '请输入姓名', trigger: 'blur'}, {required: true, message: '请输入姓名', trigger: 'blur'},
], ],
sex: [ sex: [

50
src/components/statistics/over/Charge.vue
View File

@ -11,22 +11,22 @@
/> />
</div> </div>
<div class="content-box"> <div class="content-box">
<el-table :data="tableData" style="width: 100%" :summary-method="getSummaries" show-summary> <el-table :data="list" style="width: 100%" :summary-method="getSummaries" show-summary>
<el-table-column prop="date" label="日期" align="center"/> <el-table-column prop="date" label="日期" align="center"/>
<el-table-column label="营业收入" align="center"> <el-table-column label="营业收入" align="center">
<el-table-column prop="id" label="总金额" align="center"/> <el-table-column prop="totalMoney" label="总金额" align="center"/>
<el-table-column prop="name" label="成本" align="center"></el-table-column> <el-table-column prop="totalCost" label="成本" align="center"></el-table-column>
<el-table-column prop="amount1" label="毛利" align="center"></el-table-column> <el-table-column prop="grossMargin" label="毛利" align="center"></el-table-column>
<el-table-column prop="amount1" label="毛利率" align="center"></el-table-column> <el-table-column prop="grossProfitRate" label="毛利率" align="center"></el-table-column>
<el-table-column prop="amount1" label="客量" align="center"></el-table-column> <el-table-column prop="amount1" label="客量" align="center"></el-table-column>
<el-table-column prop="amount1" label="客单" align="center"></el-table-column> <el-table-column prop="orderVolume" label="客单" align="center"></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="支付方式" align="center"> <el-table-column label="支付方式" align="center">
<el-table-column prop="amount1" label="医保" align="center"/> <el-table-column prop="paymentMethodVo.medicalInsurancePayment" label="医保" align="center"/>
<el-table-column prop="amount1" label="微信" align="center"/> <el-table-column prop="paymentMethodVo.wechatPayment" label="微信" align="center"/>
<el-table-column prop="amount1" label="支付宝" align="center"/> <el-table-column prop="paymentMethodVo.aliPayment" label="支付宝" align="center"/>
<el-table-column prop="amount1" label="现金" align="center"/> <el-table-column prop="paymentMethodVo.cashPayment" label="现金" align="center"/>
<el-table-column prop="amount1" label="其他" align="center"/> <el-table-column prop="paymentMethodVo.otherPayment" label="其他" align="center"/>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@ -35,26 +35,26 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {h, onMounted, ref, type VNode} from 'vue' import {h, onMounted, ref, type VNode} from 'vue'
import type { TableColumnCtx } from 'element-plus'
import {post} from "@/utils/request.ts"; import {post} from "@/utils/request.ts";
import {getThisWeek} from "@/utils/dateUtils.ts"; import {getThisWeek} from "@/utils/dateUtils.ts";
import type { TableColumnCtx } from 'element-plus'
const dateArray = ref<any>([]) const dateArray = ref<any>([])
const tableData: Product[] = [ const list = ref<any>([])
]
interface Product {
id: string const getDailyReport = ()=>{
name: string post("charge/dailyChargingReport",{startDate:dateArray.value[0],endDate:dateArray.value[1]} ).then((res:any)=>{
amount1: string list.value = res
amount2: string })
amount3: number
} }
interface SummaryMethodProps<T = Product> { interface SummaryMethodProps<T> {
columns: TableColumnCtx<T>[] columns: TableColumnCtx<T>[]
data: T[] data: T[]
} }
const getSummaries = (param: SummaryMethodProps) => {
const getSummaries = (param: SummaryMethodProps<any>) => {
const { columns, data } = param const { columns, data } = param
const sums: (string | VNode)[] = [] const sums: (string | VNode)[] = []
columns.forEach((column, index) => { columns.forEach((column, index) => {
@ -81,11 +81,9 @@ const getSummaries = (param: SummaryMethodProps) => {
return sums return sums
} }
const getDailyReport = ()=>{
post("charge/dailyChargingReport",{startDate:dateArray.value[0],endDate:dateArray.value[1]} ).then((res:any)=>{
})
}
onMounted(()=>{ onMounted(()=>{
let thisWeek = getThisWeek() let thisWeek = getThisWeek()
dateArray.value[0] = thisWeek.start dateArray.value[0] = thisWeek.start

9
src/views/member/index.vue
View File

@ -21,7 +21,7 @@
<img class="image" <img class="image"
:src="'/static/images/member/' + (item.sex === '男' ? 'man' : 'women') + '.png'" :src="'/static/images/member/' + (item.sex === '男' ? 'man' : 'women') + '.png'"
alt=""/> alt=""/>
<div class="name">{{ item.realName || '-' }}</div> <div class="name">{{ item.name || '-' }}</div>
<span class="age">{{ item.age ? item.age + '岁' : '-' }}</span> <span class="age">{{ item.age ? item.age + '岁' : '-' }}</span>
<el-tooltip <el-tooltip
class="box-item" class="box-item"
@ -53,7 +53,7 @@
<img class="image" src="/static/images/member/head.png" alt=""> <img class="image" src="/static/images/member/head.png" alt="">
<div class="detail-top-left-text"> <div class="detail-top-left-text">
<div class="detail-top-left-text-name"> <div class="detail-top-left-text-name">
<span style="margin-right: 16px">{{ listItem.realName || '-' }}</span> <span style="margin-right: 16px">{{ listItem.name || '-' }}</span>
<el-tag type="success">{{ listItem.levelName || '-' }}</el-tag> <el-tag type="success">{{ listItem.levelName || '-' }}</el-tag>
</div> </div>
<div class="detail-top-left-text-phone"> <div class="detail-top-left-text-phone">
@ -80,7 +80,7 @@
<el-descriptions-item label="出生日期">{{ listItem.birthday || "-" }}</el-descriptions-item> <el-descriptions-item label="出生日期">{{ listItem.birthday || "-" }}</el-descriptions-item>
<el-descriptions-item label="民族">{{ listItem.nation || "-" }}</el-descriptions-item> <el-descriptions-item label="民族">{{ listItem.nation || "-" }}</el-descriptions-item>
<el-descriptions-item label="创建日期">{{ listItem.createDatetime || "-" }}</el-descriptions-item> <el-descriptions-item label="创建日期">{{ listItem.createDatetime || "-" }}</el-descriptions-item>
<el-descriptions-item label="身份证号码">{{ listItem.idCode || "-" }}</el-descriptions-item> <el-descriptions-item label="身份证号码">{{ listItem.certNo || "-" }}</el-descriptions-item>
<el-descriptions-item label="积分"><span>{{ listItem.integralBalance || '-' }}</span> <el-descriptions-item label="积分"><span>{{ listItem.integralBalance || '-' }}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="家庭地址">{{ listItem.address || "-" }}</el-descriptions-item> <el-descriptions-item label="家庭地址">{{ listItem.address || "-" }}</el-descriptions-item>
@ -388,6 +388,7 @@ const openLevelEdit = (vip: any) => {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
padding: 0 24px; padding: 0 24px;
color: #000000;
.image { .image {
width: 20px; width: 20px;
@ -556,7 +557,7 @@ const openLevelEdit = (vip: any) => {
} }
.time_active { .time_active {
color: #fff !important; color: #000000 !important;
} }