From 9ee2411d1e1c4b7fee9cef55634bc5c936798ade Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 19 Jan 2024 16:16:51 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 396513a..746b2bd 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ BASE_URL= "https://vue3.go-admin.dev" -VITE_BASE_URL= "https://dev.hospital.admin.api.igandanyiyuan.com" +VITE_BASE_URL= "http://dev.hospital.admin.api.igandanyiyuan.com" VITE_IMG_URL="https://img.applets.igandanyiyuan.com" \ No newline at end of file diff --git a/.env.test b/.env.test index 396513a..746b2bd 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,3 @@ BASE_URL= "https://vue3.go-admin.dev" -VITE_BASE_URL= "https://dev.hospital.admin.api.igandanyiyuan.com" +VITE_BASE_URL= "http://dev.hospital.admin.api.igandanyiyuan.com" VITE_IMG_URL="https://img.applets.igandanyiyuan.com" \ No newline at end of file From 654545884b3e19c01d9445d6a7a3062784f747b9 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Wed, 27 Mar 2024 15:14:24 +0800 Subject: [PATCH 02/10] =?UTF-8?q?3.27=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 2 + src/api/doctor/introduction.js | 24 + src/components/addInquiryConfigModal.vue | 26 + src/components/addSysconfigModal.vue | 25 +- src/components/confirmModal.vue | 26 +- src/views/doctor/doctor-examine/index.vue | 7 + .../doctor/doctor-introduction/index.vue | 563 ++++++++++++++++++ src/views/doctor/doctor-list/index.vue | 21 +- src/views/inquiry/inquiry-list/index.vue | 1 + src/views/order/order-list/index.vue | 2 +- 10 files changed, 686 insertions(+), 11 deletions(-) create mode 100644 src/api/doctor/introduction.js create mode 100644 src/views/doctor/doctor-introduction/index.vue diff --git a/components.d.ts b/components.d.ts index 514bb9b..4c957bf 100644 --- a/components.d.ts +++ b/components.d.ts @@ -16,6 +16,8 @@ declare module '@vue/runtime-core' { ConfirmModal: typeof import('./src/components/confirmModal.vue')['default'] DeleteModal: typeof import('./src/components/DeleteModal.vue')['default'] DoctorModal: typeof import('./src/components/doctorModal.vue')['default'] + ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] FamilyModal: typeof import('./src/components/familyModal.vue')['default'] InquiryDetailModal: typeof import('./src/components/inquiryDetailModal.vue')['default'] InquiryDetailMoneyModal: typeof import('./src/components/inquiryDetailMoneyModal.vue')['default'] diff --git a/src/api/doctor/introduction.js b/src/api/doctor/introduction.js new file mode 100644 index 0000000..a25d627 --- /dev/null +++ b/src/api/doctor/introduction.js @@ -0,0 +1,24 @@ +import request from '../../utils/request' + +const url = '/admin/doctor/introduction'; + +export function getDoctorList(params){ + return request({ + url:'/admin/doctor/introduction', + method: 'get', + params + }) +} +export function getDoctorDetail(id){ + return request({ + url:'/admin/doctor/'+id, + method: 'get' + }) + } + export function checkDoctor(data,id){ + return request({ + url:'/admin/doctor/introduction/'+id, + method: 'put', + data + }) + } \ No newline at end of file diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue index 976cbb2..bf1c7cc 100644 --- a/src/components/addInquiryConfigModal.vue +++ b/src/components/addInquiryConfigModal.vue @@ -34,6 +34,32 @@ +
+
+
问诊方式
+
+ + + + + + 图文问诊 + 视频问诊 + 语音问诊 + 电话购药 + 会员 + 疑难会诊 + + + + +
添加医生
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue index ee9b372..b9eae74 100644 --- a/src/components/addSysconfigModal.vue +++ b/src/components/addSysconfigModal.vue @@ -220,6 +220,27 @@ +
+
+
默认每日接诊数量
+
+ + + + + + + + + +
@@ -397,8 +418,10 @@ const handleSubmit = () => { if(modalForm.inquiry_type==3){ modalForm.inquiry_price=modalForm.temp_free_price.join(',') }else if(modalForm.inquiry_type==2 || modalForm.inquiry_type==4){ - modalForm.inquiry_price=String(modalForm.inquiry_price) + modalForm.inquiry_price=String(modalForm.inquiry_price); + } + console.log(modalForm) const {data,code}=await editSysconfig(modalForm, props.inquiry_config_id); if (code == 200) { proxy.$message.success('修改成功') diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue index 2c68974..b134f7f 100644 --- a/src/components/confirmModal.vue +++ b/src/components/confirmModal.vue @@ -5,9 +5,12 @@ 提示 - - - + + + + + + + + \ No newline at end of file diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue index 4a3b8e1..d32addc 100644 --- a/src/views/doctor/doctor-list/index.vue +++ b/src/views/doctor/doctor-list/index.vue @@ -303,6 +303,13 @@ --> + + + + + + + @@ -895,6 +902,7 @@ const showCheckedAll=ref(true); } } }], + 'hospital.address': [{ required: true, message: '请输入医院地址' }], 'hospital_id': [{ required: true, message: '请选择医院名称' }], 'department_custom_mobile': [{ @@ -903,7 +911,16 @@ const showCheckedAll=ref(true); department_custom_id: [{ required: true, message: '请选择所在科室' }], department_custom_name: [{ required: true, message: '请输入科室名称' }], doctor_title: [{ required: true, message: '请选择职称' }], - // 'user_doctor_info.qualification_cert_num': [{ required: true, message: '请输入资格证编码' }], + 'user.email': [ + { required: true, message: '请输入邮箱' }, + { + validator: (value, cb) => { + let reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/; + if (!reg.test(value)) { + cb('邮箱格式不正确'); + } + } + }], cur_doctor_expertise: [ { type: 'array', required: true, message: '请选择专长' }, { @@ -1283,7 +1300,7 @@ const showCheckedAll=ref(true); let modalData = { card_name: modalForm.user_name, mobile: modalForm.user.mobile, - mobile: modalForm.user.mobile, + is_recommend: modalForm.is_recommend, avatar: modalForm.avatar, doctor_title: modalForm.doctor_title, diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue index 93caae5..eedc0a7 100644 --- a/src/views/inquiry/inquiry-list/index.vue +++ b/src/views/inquiry/inquiry-list/index.vue @@ -18,6 +18,7 @@ + 关闭 diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue index 56ef0db..cef7ff1 100644 --- a/src/views/order/order-list/index.vue +++ b/src/views/order/order-list/index.vue @@ -403,7 +403,7 @@ - + From db5f68d1852a3ba16af282766d728048a9501288 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Wed, 27 Mar 2024 16:07:16 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/inquiryDetailModal.vue | 8 +++++++- src/components/inquiryDetailMoneyModal.vue | 9 ++++++++- src/utils/format.js | 2 +- src/views/doctor/doctor-introduction/index.vue | 6 +++--- src/views/order/order-list/index.vue | 9 ++++++++- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/components/inquiryDetailModal.vue b/src/components/inquiryDetailModal.vue index 4deb246..0719c4c 100644 --- a/src/components/inquiryDetailModal.vue +++ b/src/components/inquiryDetailModal.vue @@ -50,7 +50,13 @@ {{ formatInquiryType(modalForm.inquiry_type) }} + + + {{ formatMode(modalForm.inquiry_mode) }} + + +
@@ -254,7 +260,7 @@ import { ref, toRefs, reactive, watch,nextTick } from 'vue'; import { formatDoctorTitle } from '@/utils/format'; import { parseTime } from '@/utils/parseTime'; import { inquiryCase} from '@/api/order/list'; -import { formatInquiryType, formatInquiryStatus } from '@/utils/format'; +import { formatInquiryType, formatInquiryStatus,formatMode } from '@/utils/format'; const emits = defineEmits(['inquiryVisibleChange']); const props = defineProps({ // 是否显示 diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue index a545c1e..5d1865b 100644 --- a/src/components/inquiryDetailMoneyModal.vue +++ b/src/components/inquiryDetailMoneyModal.vue @@ -64,6 +64,13 @@ + + + + {{formatMode(modalForm.inquiry_mode)}} + + + @@ -237,7 +244,7 @@ import { ref, toRefs, reactive, watch} from 'vue'; import { formatDoctorTitle } from '@/utils/format'; import { parseTime } from '@/utils/parseTime'; import { inquiryCase} from '@/api/order/list'; -import { formatInquiryType, formatInquiryStatus,formatOrderCancelReason } from '@/utils/format'; +import { formatInquiryType,formatMode, formatInquiryStatus,formatOrderCancelReason } from '@/utils/format'; const emits = defineEmits(['inquiryVisibleChange']); const props = defineProps({ // 是否显示 diff --git a/src/utils/format.js b/src/utils/format.js index 111148b..bba579e 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -101,7 +101,7 @@ export const formatRelation=(val)=>{ export const formatMode=(val)=>{ //1:图文 2:视频 3:语音 4:电话 5:会员 - let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员'} + let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员',6:'疑难会诊',7:'附赠沟通'} if(val){ return data[val] }else{ diff --git a/src/views/doctor/doctor-introduction/index.vue b/src/views/doctor/doctor-introduction/index.vue index ab1c280..114f311 100644 --- a/src/views/doctor/doctor-introduction/index.vue +++ b/src/views/doctor/doctor-introduction/index.vue @@ -72,7 +72,7 @@ @@ -135,8 +135,8 @@ - 审核通过 - 审核拒绝 + 审核通过 + 审核拒绝
{{formatInquiryType(record.inquiry_type)}}
+ @@ -99,7 +102,7 @@