操作
@@ -399,6 +422,7 @@ import { reactive, ref, getCurrentInstance,watch,toRefs,onMounted } from 'vue';
import { getDoctorDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/doctor/list';
import { ossSign, ossUpload } from '@/api/oss';
import dayjs from 'dayjs'
+import { parseTime } from '@/utils/parseTime';
const { proxy } = getCurrentInstance();
const props = defineProps({
// 是否显示
@@ -421,6 +445,8 @@ watch(()=>props.doctorVisible,(value)=>{
doctorVisible.value=value
}
})
+const okVisible=ref(false)
+const okStatus=ref(1); //1保存 2证书续期 3//证书注销 //4申请签章 //5更新签章
watch(()=>props.doctor_id,(value)=>{
if(doctor_id){
doctor_id.value=value
@@ -894,7 +920,7 @@ const modalForm = reactive({
//获取oss签名
const getOssSign = async (scene, File) => {
const { data, code, message } = await ossSign({
- user_type: 4,
+ user_type: 2,
scene,
});
if (code == 200) {
diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue
new file mode 100644
index 0000000..a545c1e
--- /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元
+ {{ Math.floor(modalForm.amount_total*0.25*100)/100}}元
+
+
+
+
+
+
+ 0元
+ {{Math.floor(modalForm.amount_total*0.75*100)/100}}元
+
+
+
+
+
+
+
医生信息
+
+ 查看医生完整信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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..8435a9a
--- /dev/null
+++ b/src/components/numberModal.vue
@@ -0,0 +1,79 @@
+
+
+
+ 提示
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/upload.vue b/src/components/upload.vue
index 3324de7..0e95aea 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -63,7 +63,7 @@
const getOssSign = async (scene, File) => {
proxy.$loading.show();
const { data, code, message } = await ossSign({
- user_type: 4,
+ user_type: 2,
scene,
});
if (code == 200) {
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
new file mode 100644
index 0000000..564ad6b
--- /dev/null
+++ b/src/components/withdrawalModal.vue
@@ -0,0 +1,455 @@
+
+
+
+
+
+
+
+
+ {{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.doctor_withdrawal_bank.province}}{{modalForm.doctor_withdrawal_bank.city}}{{modalForm.doctor_withdrawal_bank.county}}
+
+
+
+
+
+
+
+
+
+ {{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'" :disabled="!(modalForm.examine_status==1 && modalForm.payment_status==0)">纠正个人所得税
+
+
+
+
+
+
+ {{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}">
+
+
+
+
+ 提示
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+ confirmVisible=false">
+
+ 提示
+
+ 确定账单审核通过?
+ 确定打款?
+
+
+
+
\ No newline at end of file
diff --git a/src/layout/components/Menu/SubMenu.vue b/src/layout/components/Menu/SubMenu.vue
index a15bcbb..b3cd39d 100644
--- a/src/layout/components/Menu/SubMenu.vue
+++ b/src/layout/components/Menu/SubMenu.vue
@@ -1,7 +1,7 @@
@@ -11,7 +11,7 @@
{{ menu.menu_title }}
diff --git a/src/main.js b/src/main.js
index 91c3e3a..9868b05 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,6 @@ import { Message, Modal, Notification } from '@arco-design/web-vue';
import '@arco-design/web-vue/dist/arco.css';
import router from './router/';
import { parseTime } from '@/utils/parseTime';
-
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
// Directive
import permission from '@/directive/permission/permission';
diff --git a/src/router/index.js b/src/router/index.js
index 1f9a82f..72f9e12 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -105,23 +105,25 @@ router.beforeEach(async(to, from, next) => {
// afterEach Router
router.afterEach((to) => {
const store = useUserStore();
-
- // 修改网页标题
- if (to.name !== 'login') {
- document.title = `${to.meta.title} - ${store.sysConfig.sys_app_name}`;
- } else {
- document.title = store.sysConfig.sys_app_name;
- }
-
- // Vincent 2023004 修复加载水印的bug
- if (store.userInfo != undefined){
- if ( store.userInfo.name != undefined ) {
- Watermark.set(store.userInfo.name)
+ // Vincent 2023004 修复加载水印的bug
+ if (store.userInfo != undefined){
+ if ( store.userInfo.nick_name != undefined ) {
+ Watermark.set(store.userInfo.nick_name)
} else {
Watermark.out() // 清除水印
}
} else{
Watermark.out() // 清除水印
}
+
+ // 修改网页标题
+ if (to.name !== 'login') {
+ document.title = `${to.meta.title} - ${store.sysConfig.sys_app_name}`;
+ } else {
+ document.title = store.sysConfig.sys_app_name;
+ Watermark.out()
+ }
+
+
});
export default router;
diff --git a/src/store/userInfo.js b/src/store/userInfo.js
index 07e31da..5610cc2 100644
--- a/src/store/userInfo.js
+++ b/src/store/userInfo.js
@@ -2,8 +2,8 @@ import { defineStore } from 'pinia';
import { setLocalStorage, getLocalStorage } from '@/utils/storage';
import {logout} from '@/api/admin/login'
import { usePermissionStore } from '@/store/permission';
-import { getInfo } from '@/api/admin/sys-user';
-import { getAppConfig } from '@/api/admin/login';
+// import { getInfo } from '@/api/admin/sys-user';
+// import { getAppConfig } from '@/api/admin/login';
export const useUserStore = defineStore('user', {
state: () => {
@@ -47,7 +47,7 @@ export const useUserStore = defineStore('user', {
if(code==200){
this.clearInfo();
- window.location.href="/login"
+ window.location.href="/login";
}
}
diff --git a/src/utils/format.js b/src/utils/format.js
index 9285380..e928781 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -97,4 +97,24 @@ export const formatRelation=(val)=>{
}else{
return ''
}
- };
\ No newline at end of file
+ };
+
+ export const formatMode=(val)=>{
+ //1:图文 2:视频 3:语音 4:电话 5:会员
+ let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员'}
+ if(val){
+ return data[val]
+ }else{
+ return ''
+ }
+ };
+ 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
new file mode 100644
index 0000000..d9cd433
--- /dev/null
+++ b/src/views/dictionary/sign-list/index.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
{deleteData = selection;console.log(selection)}"
+ @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+ {{ parseTime(record.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(record.cert_expire_time,'{y}-{m}-{d}')}}
+
+
+
+ 肝胆相照互联网医院签章
+
+
+
+
+ 证书续期
+
+
+
+
+
+
okVisible=false">
+
+ 提示
+
+ 确定保存当前信息?
+
+
+
+
+
+
+
\ No newline at end of file
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 249bfc5..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}}
@@ -368,11 +368,11 @@
-
+
-
+
@@ -409,15 +409,15 @@
-
+
-
-
+
+
@@ -557,8 +557,32 @@
-
+
+
+
+
+
+ 证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}
+
+ {okVisible=true;okStatus=6;}" v-has="'admin:sysDoctorList:applyCA'">证书申请
+ {okVisible=true;okStatus=2;}" v-has="'admin:sysDoctorList:updateCA'">证书续期
+ {okVisible=true;okStatus=3;}" v-has="'admin:sysDoctorList:removeCA'">证书注销
+
+
+
+ 签章配置
+
+ {okVisible=true;okStatus=4;}" v-has="'admin:sysDoctorList:applySign'">签章申请
+
+
+
+
+
+
操作
@@ -567,7 +591,7 @@
- okVisible=true">保存
+ {okVisible=true,okStatus=1}" v-has="'admin:sysDoctorList:save'">保存
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..315de2b
--- /dev/null
+++ b/src/views/finance/doctoraccount/index.vue
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
{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
new file mode 100644
index 0000000..4f169c8
--- /dev/null
+++ b/src/views/finance/financialrecord/index.vue
@@ -0,0 +1,389 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 待结算
+ 结算中
+ 结算成功
+ 结算失败
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
{deleteData = selection;console.log(selection)}"
+ @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+
+ 待结算
+ 结算中
+ 结算成功
+ 结算失败
+
+
+
+
+
+ {{parseTime(record.created_at)}}
+
+
+ {{parseTime(record.payment_time)}}
+
+
+
+ 详情
+
+
+
+
+
+
+
{modalVisible=false,modalForm.withdrawal_id=''}" @freshDetail="freshDetail">
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 65d4c49..93caae5 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -20,8 +20,8 @@
- 否
- 是
+ 关闭
+ 开启
@@ -39,7 +39,7 @@
@@ -52,7 +52,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}}
{{ formatDoctorTitle(record.doctor_title) }}
@@ -68,13 +68,19 @@
自己
后台
+
+ 关闭
+ 开启
+
+
+
{{formatRelation(record.relation)}}
- 修改
@@ -84,7 +90,7 @@
- {modalVisible=false}">
+ {modalVisible=false;inquiry_config_id='';}">
@@ -101,7 +107,7 @@
+
+
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9fa7b3d..8a3aae5 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -13,7 +13,7 @@