gdxz/hospital-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
zoujiandong 2024-06-21 11:49:24 +08:00
commit 5e10206d3a
6 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components.d.ts vendored
View File

@ -17,14 +17,11 @@ declare module '@vue/runtime-core' {
AddVisitConfigModal: typeof import('./src/components/addVisitConfigModal.vue')['default']
ChatRecord: typeof import('./src/components/chatRecord.vue')['default']
ConfirmModal: typeof import('./src/components/confirmModal.vue')['default']
copy: typeof import('./src/components/medinceDetailModal copy.vue')['default']
CouponDetail: typeof import('./src/components/couponDetail.vue')['default']
DeleteModal: typeof import('./src/components/DeleteModal.vue')['default']
DoctorModal: typeof import('./src/components/doctorModal.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElTree: typeof import('element-plus/es')['ElTree']
FamilyModal: typeof import('./src/components/familyModal.vue')['default']
GiveCouponModal: typeof import('./src/components/giveCouponModal.vue')['default']
HospitalDetailModal: typeof import('./src/components/hospitalDetailModal.vue')['default']

28
src/components/addHealthConfigModal.vue
View File

@ -73,7 +73,7 @@
<a-col :span="12">
<a-form-item field="package_id" label="健康包：">
<a-select v-model="modalForm.package_id" placeholder="请选择健康包" allow-search
:loading="loading" @search="healthConfig" :disabled="id?true:false" >
:loading="loading" @search="healthConfig" :disabled="id?true:false" @change="changePackage">
<a-option v-for="item in packageList" :key="item.package_id" :value="item.package_id" :label="item.package_id">
{{ item.package_id }}
</a-option>
@ -85,7 +85,7 @@
<a-col :span="12">
<a-form-item field="doctor_id" label="选择医生：">
<a-select v-model="modalForm.doctor_id" placeholder="请选择医生" allow-search
:loading="loading" @search="handleGetDoctor" @change="changeDoctor" :disabled="id?true:false">
:loading="loading" @search="handleGetDoctor" @change="changeDoctor" :disabled="(id || !packagePrice)?true:false" @click="isSelectPackage">
<a-option v-for="item in doctorList" :key="item.doctor_id" :value="item.doctor_id" :label="item.user_name">
{{ item.user_name }}
</a-option>
@ -105,7 +105,7 @@
class="input-demo"
:step="1" :precision="0"
:min="0"
/><span class="tips" v-if="!id && modalForm.doctor_id">&nbsp;&nbsp;提示：<span>问诊金额{{tuwenPrice}}元，</span><span v-if="modalForm.service_price">健康包金额{{modalForm.service_price}}元</span></span>
/><span class="tips" v-if="!id && modalForm.doctor_id">&nbsp;&nbsp;提示：<span v-if="tuwenPrice">问诊金额{{tuwenPrice*6*.5}}元，</span><span v-if="packagePrice">健康包金额{{packagePrice}}元</span></span>
</a-form-item>
</a-col>
@ -180,6 +180,15 @@ const handleGetDoctor=async(name='',id='')=>{
}
loading.value=false;
};
const packagePrice=ref(null);
const changePackage=(val)=>{
packageList.value.forEach(item=>{
if(item.package_id==val){
packagePrice.value=item.discount_product_total_amount;
}
})
}
const healthConfig=async()=>{
const {code,data}=await getHealthConfigAddList({
limit:100
@ -190,6 +199,8 @@ const healthConfig=async()=>{
}
const reset=()=>{
product_data.value=[];
packagePrice.value=null;
tuwenPrice.value='';
};
let multi_point_status=null;
@ -204,10 +215,14 @@ const configDetail=async()=>{
if(code==200){
if(data.inquiry_price){
tuwenPrice.value=data.inquiry_price;
emits('setPrice',data.inquiry_price*0.6*5)
if(!id.value){
emits('setPrice',data.inquiry_price*0.6*5+packagePrice.value)
}
}else{
proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
}
// if(data.multi_point_status!=1){
// multi_point_status=data.multi_point_status;
// proxy.$message.warning('本服务需开处方，该医生需要做多点执业认证');
@ -216,6 +231,11 @@ const configDetail=async()=>{
}
const changeDoctor=(val)=>{
configDetail();
}
const isSelectPackage=()=>{
if(packagePrice.value==null && !id.value){
proxy.$message.warning('请先选择健康包');
}
}
const {modalVisible,id,modalForm}=toRefs(props);
const emits = defineEmits(['healthVisibleChange','freshList']);

1
src/layout/components/Menu/Menu.vue
View File

@ -33,6 +33,7 @@ const props = defineProps({
},
});
const {menuList} = storeToRefs(permissionStore);
const route = useRoute();
const router = useRouter();

1
src/router/index.js
View File

@ -80,6 +80,7 @@ router.beforeEach(async(to, from, next) => {
if (store.token && permissionStore.addRouters.length==0) {
await permissionStore.getButtonRole();
const menuResult = await permissionStore.getMenuRole();
console.log( permissionStore.addRouters)
permissionStore.addRouters.forEach((route) => {
router.addRoute('/', route);
});

1
src/views/inquiry/health/index.vue
View File

@ -120,6 +120,7 @@
// Table Columns
const columns = [
{ title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
{ title: '健康包id', dataIndex: 'package_id',width:190 },
{ title: '总服务次数', dataIndex: 'service_count',width:180 },
{ title: '每月次数', dataIndex: 'monthly_frequency',slotName:'monthly_frequency', width:130 },
{ title: '服务有效天数', dataIndex: 'effective_days', width: 150 },

2
src/views/inquiry/healthconfig/index.vue
View File

@ -153,7 +153,7 @@
// Table Columns
const columns = [
{ title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
// { title: '服务名称', dataIndex: 'inquiry_mode',slotName:'inquiry_mode',width:180 },
{ title: '健康包id', dataIndex: 'package_id',slotName:'package_id',width:180 },
{ title: '医生姓名', dataIndex: 'doctor_name',slotName:'doctor_name',width:180 },
{ title: '医生科室', dataIndex: 'department_custom_name',slotName:'department_custom_name',width:180 },
{ title: '职称', dataIndex: 'doctor_title',slotName:'doctor_title',width:180 },