From 0ee35c266e024cb8a0d48372c07596c56ba3558c Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 3 Nov 2023 08:57:37 +0800 Subject: [PATCH] =?UTF-8?q?page=5Fsize=E6=94=B9=E5=8A=A8=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=BB=93=E7=AE=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/finance/account.js | 21 + src/api/finance/bank.js | 9 + src/api/finance/record.js | 37 +- src/components/accountModal.vue | 314 +++++++++++++ src/components/inquiryDetailMoneyModal.vue | 308 +++++++++++++ src/components/numberModal.vue | 68 +++ src/components/withdrawalModal.vue | 432 ++++++++++++++++++ src/utils/format.js | 12 +- src/views/admin/sys-post/index.vue | 2 +- src/views/admin/sys-role/index.vue | 2 +- src/views/admin/sys-user/index.vue | 2 +- src/views/dictionary/sign-list/index.vue | 2 +- src/views/doctor/doctor-examine/index.vue | 2 +- src/views/doctor/doctor-list/index.vue | 2 +- src/views/doctor/doctor-multipoint/index.vue | 2 +- src/views/finance/bankcard/index.vue | 307 +++++++++++++ src/views/finance/doctoraccount/index.vue | 298 ++++++++++++ src/views/finance/financialrecord/index.vue | 116 +++-- src/views/inquiry/inquiry-list/index.vue | 2 +- src/views/inquiry/sysconfig-list/index.vue | 2 +- src/views/order/inquiry-record/index.vue | 2 +- src/views/order/order-list/index.vue | 2 +- src/views/patient/family-list/index.vue | 2 +- src/views/patient/patient-list/index.vue | 2 +- .../prescription/prescription-list/index.vue | 2 +- 25 files changed, 1890 insertions(+), 60 deletions(-) create mode 100644 src/api/finance/account.js create mode 100644 src/api/finance/bank.js create mode 100644 src/components/accountModal.vue create mode 100644 src/components/inquiryDetailMoneyModal.vue create mode 100644 src/components/numberModal.vue create mode 100644 src/components/withdrawalModal.vue create mode 100644 src/views/finance/bankcard/index.vue create mode 100644 src/views/finance/doctoraccount/index.vue diff --git a/src/api/finance/account.js b/src/api/finance/account.js new file mode 100644 index 0000000..d99942b --- /dev/null +++ b/src/api/finance/account.js @@ -0,0 +1,21 @@ +import request from '../../utils/request' +export function getAccountList(params){ + return request({ + url:'/admin/doctor/account', + method: 'get', + params + }) +} +export function getAccountDetail(id){ + return request({ + url:'/admin/doctor/account/'+id, + method: 'get' + }) + } + export function getAccountOrder(id,params){//关联订单列表 + return request({ + url:'/admin/doctor/account/order/'+id, + method: 'get', + params + }) + } \ No newline at end of file diff --git a/src/api/finance/bank.js b/src/api/finance/bank.js new file mode 100644 index 0000000..49e5463 --- /dev/null +++ b/src/api/finance/bank.js @@ -0,0 +1,9 @@ +import request from '../../utils/request' +export function getBankList(params){ + return request({ + url:'/admin/doctor/bank', + method: 'get', + params + }) +} + diff --git a/src/api/finance/record.js b/src/api/finance/record.js index 5fcd6a7..276052e 100644 --- a/src/api/finance/record.js +++ b/src/api/finance/record.js @@ -1,8 +1,6 @@ import request from '../../utils/request' const url = '/admin/finance/withdrawal'; - - export function getWithdrawalList(params){ return request({ url:'/admin/finance/withdrawal', @@ -15,4 +13,37 @@ export function getWithdrawalDetail(id){ url:'/admin/finance/withdrawal/'+id, method: 'get' }) - } \ No newline at end of file + } +export function getOrder(id,params){ + return request({ + url:'/admin/finance/withdrawal/order/'+id, + method: 'get', + params + }) + } + + export function editIncome(id,data){ + return request({ + url:'/admin/finance/withdrawal/income/'+id, + method: 'put', + data + }) + } + + export function withdrawalStatus(id,data){//提现-修改提现审核状态 + return request({ + url:'/admin/finance/withdrawal/examine/'+id, + method: 'put', + data + }) + } + + export function confirmPay(id){//提现-确认打款 + return request({ + url:'/admin/finance/withdrawal/payment/'+id, + method: 'put' + }) + } + + + \ No newline at end of file diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue new file mode 100644 index 0000000..de681ae --- /dev/null +++ b/src/components/accountModal.vue @@ -0,0 +1,314 @@ + + + + + + + 关联订单 + + + + + + + + + + + + + + 待支付 + 待分配 + 待接诊 + 已接诊 + 已完成 + 已结束 + 已取消 + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + {deleteData = selection;console.log(selection)}" + @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> + + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} + + + 小程序支付 + 微信扫码 + 模拟支付 + + + + 待支付 + 待分配 + 待接诊 + 已接诊 + 已完成 + 已结束 + 已取消 + + + {{(record.doctor_amount) }}元 + + + + {{record.patient_name_mask}}({{record.patient_sex==1?'男,':'女,'}}{{record.patient_age}}岁) + + + {{ formatInquiryType(record.inquiry_type) }} + + + {{ formatOrderCancelReason(record.cancel_reason) }} + + + {{ formatEnteyStatus(record.entry_status) }} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue new file mode 100644 index 0000000..cf16b8a --- /dev/null +++ b/src/components/inquiryDetailMoneyModal.vue @@ -0,0 +1,308 @@ + + + + + + 订单信息 + + + + + + {{ modalForm.inquiry_no }} + + + + + {{ formatInquiryStatus(modalForm.inquiry_status) }} + + + + + + + {{modalForm.created_at}} + + + + + {{parseTime(modalForm.pay_time)}} + - + + + + + + + {{modalForm.amount_total}}元 + + + + + {{modalForm.coupon_amount_total}}元 + 无 + + + + + + + {{modalForm.payment_amount_total}}元 + + + + + {{formatInquiryType(modalForm.inquiry_type)}} + + + + + + + {{ formatOrderCancelReason(modalForm.cancel_reason)}} + + + + + + + 收益信息(订单金额*分成比例) + + + + + 2.5/7.5 + + + + + 0元 + {{ (modalForm.payment_amount_total*0.25).toFixed(2) }} + + + + + + + 0元 + {{ (modalForm.payment_amount_total*0.75).toFixed(2) }} + + + + + + + 医生信息 + + 查看医生完整信息 + + + + + + + + + + + + + + + {{ modalForm.user_doctor.user_name }} {{ + formatDoctorTitle(modalForm.user_doctor.doctor_title) + }} + + + {{ + modalForm.user_doctor.hospital.hospital_name + }} {{ + modalForm.user_doctor.department_custom_name + }} + + + + 暂未分配到医生 + + + + + + + 就诊人信息 + + 查看就诊人完整信息 + + + + + + {{ modalForm.order_inquiry_case.name }} ({{ + modalForm.order_inquiry_case.sex == 1 ? '男' : '女' + }} {{ modalForm.order_inquiry_case.age }}岁) + + + + + + + {{ modalForm.order_inquiry_case.disease_desc }} + + + + + + + {{ + modalForm.order_inquiry_case.disease_class_name + }} {{ + modalForm.user_doctor.department_custom_name + }} + + + + + + + + { + doctorVisible = false; + doctor_id = ''; + } + " + > + + { + patientVisible = false; + } + " + > + + + \ No newline at end of file diff --git a/src/components/numberModal.vue b/src/components/numberModal.vue new file mode 100644 index 0000000..d26a731 --- /dev/null +++ b/src/components/numberModal.vue @@ -0,0 +1,68 @@ + + + + 提示 + + + + + + + + 取消 + 确认 + + + + + \ No newline at end of file diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue new file mode 100644 index 0000000..e3e0433 --- /dev/null +++ b/src/components/withdrawalModal.vue @@ -0,0 +1,432 @@ + + + + + + 医生信息 + + + + + + {{modalForm.doctor_name}} + + + + + + {{modalForm.doctor_card_num_mask}} + + + + {{id_card_num}} + {showEye=false}" /> + + + + + + + + + 银行信息 + + + + + {{modalForm.bank_card_code}} + + + + + + + 待结算 + 结算中 + 结算成功 + 结算失败 + + + + + + + {{modalForm.doctor_withdrawal_bank.province}}{{modalForm.doctor_withdrawal_bank.city}}{{modalForm.doctor_withdrawal_bank.county}} + - + + + + + {{modalForm.doctor_withdrawal_bank.basic_bank.bank_name +}} + - + + + + + + + 账户信息 + + + + + {{modalForm.created_at}} + + + + + {{parseTime(modalForm.examine_time)}} + - + + + + + + + {{modalForm.applied_withdrawal_amount}} + + + + + {{modalForm.actual_withdrawal_amount}} + + + + + + + 平台2.5/医生7.5 + + + + + {{modalForm.income_tax}} + okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'">纠正个人所得税 + + + + + + + {{parseTime(modalForm.payment_time)}} + + + + + + + + 订单记录 + + + + + + {deleteData = selection;console.log(selection)}" + @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> + + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} + + + 小程序支付 + 微信扫码 + 模拟支付 + + + + 待支付 + 待分配 + 待接诊 + 已接诊 + 已完成 + 已结束 + 已取消 + + + {{(record.doctor_amount) }}元 + + + + {{record.patient_name_mask}}({{record.patient_sex==1?'男,':'女,'}}{{record.patient_age}}岁) + + + + {{ formatInquiryType(record.inquiry_type) }} + + + {{ parseTime(record.pay_time) }} + + + + 详情 + + + + + + + + + + + + + 操作 + + + + + + {confirmVisible=true;okStatus=1}" v-if="modalForm.examine_status==1" v-has="'admin:sysFinancialRecord:pass'">确认账单 + {confirmVisible=true;okStatus=2}" v-if="modalForm.examine_status==2 && modalForm.payment_status==0" v-has="'admin:sysFinancialRecord:pay'">确认打款 + {rejectVisible=true;}" v-if="modalForm.examine_status==1" v-has="'admin:sysFinancialRecord:reject'">拒绝提现 + + + + + + {recordVisible=false}"> + + + rejectVisible=false" > + + 提示 + + + + + + + + rejectVisible=false">取消 + 确认 + + + + + confirmVisible=false"> + + 提示 + + 确定账单审核通过? + 确定打款? + + + + \ No newline at end of file diff --git a/src/utils/format.js b/src/utils/format.js index 1530cba..e928781 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -107,4 +107,14 @@ export const formatRelation=(val)=>{ }else{ return '' } - }; \ No newline at end of file + }; + export const formatEnteyStatus=(val)=>{ + //入账状态(0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消) + let data={0:'未入账',1:'已入账', 2:'入账中', 3:'入账失败',4:'入账取消'} + if(val || val==0){ + return data[val] + }else{ + return '' + } + }; + \ No newline at end of file diff --git a/src/views/admin/sys-post/index.vue b/src/views/admin/sys-post/index.vue index fce2647..53c771b 100644 --- a/src/views/admin/sys-post/index.vue +++ b/src/views/admin/sys-post/index.vue @@ -35,7 +35,7 @@ @page-size-change="handlepage_sizeChange" > - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} {{ parseTime(record.createdAt) }} diff --git a/src/views/admin/sys-role/index.vue b/src/views/admin/sys-role/index.vue index 0dcdb55..c9e3ecc 100644 --- a/src/views/admin/sys-role/index.vue +++ b/src/views/admin/sys-role/index.vue @@ -42,7 +42,7 @@ @selection-change="(selection) => {deleteData = selection;}" @select="handleSelect" @page-change="handlePageChange" @page-size-change="handlePageSizeChange"> - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} diff --git a/src/views/admin/sys-user/index.vue b/src/views/admin/sys-user/index.vue index 6871a16..addbb34 100644 --- a/src/views/admin/sys-user/index.vue +++ b/src/views/admin/sys-user/index.vue @@ -84,7 +84,7 @@ @page-size-change="handlePageSizeChange" > - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} {{ record.role_name?.role_name}} diff --git a/src/views/dictionary/sign-list/index.vue b/src/views/dictionary/sign-list/index.vue index 45485f8..d9cd433 100644 --- a/src/views/dictionary/sign-list/index.vue +++ b/src/views/dictionary/sign-list/index.vue @@ -8,7 +8,7 @@ row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}" @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} {{ parseTime(record.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(record.cert_expire_time,'{y}-{m}-{d}')}} diff --git a/src/views/doctor/doctor-examine/index.vue b/src/views/doctor/doctor-examine/index.vue index 405a901..1fa83ba 100644 --- a/src/views/doctor/doctor-examine/index.vue +++ b/src/views/doctor/doctor-examine/index.vue @@ -34,7 +34,7 @@ @selection-change="(selection) => {deleteData = selection;}" @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue index 7f4ed97..18f38bb 100644 --- a/src/views/doctor/doctor-list/index.vue +++ b/src/views/doctor/doctor-list/index.vue @@ -106,7 +106,7 @@ row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}" @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} diff --git a/src/views/doctor/doctor-multipoint/index.vue b/src/views/doctor/doctor-multipoint/index.vue index d45116e..f50b3af 100644 --- a/src/views/doctor/doctor-multipoint/index.vue +++ b/src/views/doctor/doctor-multipoint/index.vue @@ -34,7 +34,7 @@ @selection-change="(selection) => {deleteData = selection;}" @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} diff --git a/src/views/finance/bankcard/index.vue b/src/views/finance/bankcard/index.vue new file mode 100644 index 0000000..92b1c1b --- /dev/null +++ b/src/views/finance/bankcard/index.vue @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + 导出 + + + + + {deleteData = selection;console.log(selection)}" + @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> + + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} + + + {{record.province}}{{record.city}}{{record.county}} + + + + + + 修改 + + + + + + + + + okVisible=false"> + + 提示 + + 确定保存当前信息? + + + + + + + \ No newline at end of file diff --git a/src/views/finance/doctoraccount/index.vue b/src/views/finance/doctoraccount/index.vue new file mode 100644 index 0000000..f8e8a6f --- /dev/null +++ b/src/views/finance/doctoraccount/index.vue @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + 导出 + + + + + {deleteData = selection;console.log(selection)}" + @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> + + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} + + + {{record.province}}{{record.city}}{{record.county}} + + + + + + 详情 + + + + + + {modalVisible=false,modalForm.doctor_id=''}" > + + + + okVisible=false"> + + 提示 + + 确定保存当前信息? + + + + + + + \ No newline at end of file diff --git a/src/views/finance/financialrecord/index.vue b/src/views/finance/financialrecord/index.vue index 8a39510..35172b1 100644 --- a/src/views/finance/financialrecord/index.vue +++ b/src/views/finance/financialrecord/index.vue @@ -2,23 +2,35 @@ - - + + - - + + + + 否 + 是 + + + + + + @@ -41,35 +53,35 @@ {deleteData = selection;console.log(selection)}" @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> - {{(rowIndex+1)+(pager.page-1)*10}} + {{(rowIndex+1)+(pager.page-1)*pager.page_size}} - + - 禁用 - 正常 - 删除 + 待结算 + 结算中 + 结算成功 + 结算失败 + - - 否 - 是 + + + + {{parseTime(record.created_at)}} - - - {{ record.disable_reason }} - - - - - {{formatRelation(record.relation)}} - + + {{parseTime(record.payment_time)}} - 详情 @@ -79,25 +91,25 @@ - {modalVisible=false}"> + {modalVisible=false,modalForm.withdrawal_id=''}" @freshDetail="freshDetail"> - okVisible=false"> 提示 确定保存当前信息? - + -->