From e1d26f6b155308c2212af8d84689faa2af6e1918 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Tue, 19 Sep 2023 09:53:37 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/patient/list.js | 9 +- src/utils/request.js | 4 + src/views/order/order-list/index.vue | 4 + src/views/patient/patient-list/index.vue | 201 ++++++----------------- 4 files changed, 59 insertions(+), 159 deletions(-) diff --git a/src/api/patient/list.js b/src/api/patient/list.js index ee95432..c431d57 100644 --- a/src/api/patient/list.js +++ b/src/api/patient/list.js @@ -11,13 +11,6 @@ export function getPatientList(params){ }) } -export function addPatient(data) { - return request({ - url, - method: 'post', - data - }) -} export function removePatient(data) { return request({ @@ -36,7 +29,7 @@ export function updatePatient(data, id) { } export function getPatientDetail(id){ return request({ - url:'/admin/doctor/'+id, + url:'/admin/patient/'+id, method: 'get' }) } diff --git a/src/utils/request.js b/src/utils/request.js index 002f538..3110d74 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,10 +19,14 @@ service.interceptors.request.use( // Store 必须在拦截器内部导入，在外部导入会显示 Pinia 未初始化 const store = useUserStore(); // 设置请求头部 Authorization + if(config.method=="put"){ + config.headers['Content-Type'] = 'application/x-www-form-urlencoded' + } if (store.token) { config.headers['Authorization'] = 'Bearer ' + store.token; //config.headers['Content-Type'] = 'multipart/form-data' } + return config; }, (error) => { diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue index ea28bba..d25b4de 100644 --- a/src/views/order/order-list/index.vue +++ b/src/views/order/order-list/index.vue @@ -123,6 +123,9 @@
{{record.patient_name}}({{record.patient_sex==1?'男，':'女，'}}{{record.patient_age}}岁)
+ @@ -516,6 +519,7 @@ const columns = [ { title: '联系电话', dataIndex: 'patient_mobile',width: 130 }, { title: '订单金额', dataIndex: 'amount_total',slotName:'amount_total',width:100 }, { title: '实付金额', dataIndex: 'payment_amount_total',slotName:'payment_amount_total',width:100 }, + { title: '服务类型', dataIndex: 'inquiry_type',slotName:'inquiry_type',width:100 }, { title: '支付方式', dataIndex: 'inquiry_pay_channel',slotName: 'inquiry_pay_channel'}, { title: '订单状态', dataIndex: 'inquiry_status', slotName:'inquiry_status' }, { title: '支付时间', dataIndex: 'pay_time', slotName: 'pay_time',width:200 }, diff --git a/src/views/patient/patient-list/index.vue b/src/views/patient/patient-list/index.vue index 8fd2745..73b9bfb 100644 --- a/src/views/patient/patient-list/index.vue +++ b/src/views/patient/patient-list/index.vue @@ -2,79 +2,12 @@
- - + + - - - - - - - - 主任医师 - 主任中医师 - 副主任医师 - 副主任中医师 - 主治医师 - 住院医师 - - - - - - 专家问诊 - 快速问诊 - 公益问诊 - 问诊购药 - - - - - - 未认证 - 认证通过 - 审核中 - 认证失败 - - - - - - 未认证 - 认证通过 - 审核中 - 认证失败 - - - - - - 未认证 - 认证通过 - 认证失败 - - - - - - 否 - 是 - - - - - - 否 - 是 - - - 搜索 @@ -88,13 +21,13 @@
- 新增 - + 新增 +
-
{{(rowIndex+1)+(pager.page-1)*10}}
- - - - - - - - + + + + @@ -573,7 +474,7 @@ - import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue'; - import { getDoctorList, addDoctor, removeDoctor, updateDoctor, getDoctorDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/doctor/list'; + import { getPatientList, removePatient, updatePatient, getPatientDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/patient/list'; import { ossSign, ossUpload } from '@/api/oss'; import dayjs from 'dayjs' // Akiraka 20230210 删除数据 @@ -600,7 +501,7 @@ watch(() => deleteVisible.value, (value) => { if (value == false) { - getDoctorInfo(pager); + getPatientInfo(pager); } }); @@ -928,20 +829,12 @@ // Table Columns const columns = [ { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' }, - { title: '医生名字', dataIndex: 'user_name' }, - { title: '手机号码', dataIndex: 'mobile', width: 125 }, - { title: '医院', dataIndex: 'hospital_name', width: '150', slotName: 'hospital_name' }, - { title: '职称', dataIndex: 'doctor_title', slotName: 'doctor_title' }, - { title: '开启服务', dataIndex: 'inquiry_service', slotName: 'inquiry_service' }, - { title: '多点审核状态', dataIndex: 'multi_point_status', slotName: 'multi_point_status', width: 140 }, - { title: '是否推荐', dataIndex: 'is_recommend', slotName: 'is_recommend' }, - { title: '深度合作', dataIndex: 'is_platform_deep_cooperation', slotName: 'is_platform_deep_cooperation' }, - { title: '申请人', dataIndex: 'user_name' }, - { title: '审核状态', dataIndex: 'iden_auth_status', slotName: 'iden_auth_status' }, - { title: '实名认证', dataIndex: 'idcard_status', slotName: 'iden_auth_status' }, - - { title: '状态', dataIndex: 'status', slotName: 'status' }, - // { title: '创建时间', dataIndex: 'created_at', slotName: 'created_at' }, + { title: '患者名字', dataIndex: 'user_name' }, + { title: '联系号码', dataIndex: 'mobile', width: 125 }, + { title: '就诊人', dataIndex: 'patient_family_count', slotName: 'patient_family_count' }, + { title: '注册时间', dataIndex: 'created_at', slotName: 'created_at' }, + { title: '启用状态', dataIndex: 'status', slotName: 'status' }, + { title: '禁用理由', dataIndex: 'disable_reason', slotName: 'disable_reason' }, { title: '操作', slotName: 'action', fixed: "right", width: 180 }, ]; @@ -987,7 +880,7 @@ modalVisible.value = true; modalTitle.value = '医生详情'; modalSatus.value = 'detail'; - const { code, data, message } = await getDoctorDetail(record.doctor_id); + const { code, data, message } = await getPatientDetail(record.doctor_id); if (code == 200) { Object.assign(modalForm, data); @@ -1037,7 +930,7 @@ modalVisible.value = true; modalTitle.value = '修改医生'; modalSatus.value = 'edit'; - const { code, data, message } = await getDoctorDetail(record.doctor_id); + const { code, data, message } = await getPatientDetail(record.doctor_id); if (code == 200) { Object.assign(modalForm, data); handleDecryptBank(); @@ -1185,7 +1078,7 @@ } proxy.$loading.show(); - const { code, message } = await addDoctor(modalData); + const { code, message } = await addPatient(modalData); if (code == 200) { proxy.$notification.success('新增成功'); modalVisible.value = false; @@ -1230,7 +1123,7 @@ } proxy.$loading.show(); - const { code, message } = await updateDoctor(modalData, modalForm.doctor_id); + const { code, message } = await updatePatient(modalData, modalForm.doctor_id); if (code == 200) { proxy.$notification.success('更新成功'); modalVisible.value = false; @@ -1238,7 +1131,7 @@ proxy.$loading.hide(); } //done(); - getDoctorInfo(pager); + getPatientInfo(pager); } else { console.log(valid) @@ -1256,9 +1149,9 @@ content: '是否批量删除以下选中的数据？', hideCancel: false, onOk: async () => { - const res = await removeDoctor({ ids: batchList }); + const res = await removePatient({ ids: batchList }); proxy.$message.success(res.message); - getDoctorInfo(pager); + getPatientInfo(pager); }, onCancel: () => { proxy.$message.info('已取消批量删除数据'); @@ -1278,18 +1171,18 @@ // 修改当前页码 currentPage.value = page; - getDoctorInfo({ ...pager, ...queryForm }); + getPatientInfo({ ...pager, ...queryForm }); }; // 每页数据量 const handlepage_sizeChange = (page_size) => { pager.page_size = page_size; - getDoctorInfo({ ...pager, ...queryForm }); + getPatientInfo({ ...pager, ...queryForm }); }; // 获取医生信息 - const getDoctorInfo = async (params = {}) => { - const { data, code, message } = await getDoctorList(params); + const getPatientInfo = async (params = {}) => { + const { data, code, message } = await getPatientList(params); if (code == 200) { tableData.value = data.data; Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size }); @@ -1305,7 +1198,7 @@ ...queryForm, }; - getDoctorInfo(params); + getPatientInfo(params); }; const departmentData = ref([]); @@ -1420,7 +1313,7 @@ // 重置搜索 const handleResetQuery = () => { proxy.$refs.queryFormRef.resetFields(); - getDoctorInfo(queryForm); + getPatientInfo(queryForm); } //获取oss签名 const getOssSign = async (scene, File) => { @@ -1466,7 +1359,7 @@ getOssSign(1, fileList[0].file); } onMounted(() => { - getDoctorInfo(pager); + getPatientInfo(pager); handleHospitalList(); getDepartmentList(); handlExpertiseList(); @@ -1538,4 +1431,10 @@ display: flex; align-items: center; } + .reason{ + width:250px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } \ No newline at end of file From 15eced470a3e636d10bc4056de4b9292c2bf2e59 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Tue, 19 Sep 2023 17:44:51 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feature=20=E5=B0=B1=E8=AF=8A=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/patient/family.js | 26 + src/api/patient/list.js | 63 -- src/components/familyModal.vue | 252 +++++ src/components/tableUnit.vue | 18 +- src/utils/format.js | 9 + src/views/patient/family-list/index.vue | 500 +++++++++ src/views/patient/patient-list/index.vue | 1199 ++-------------------- 7 files changed, 908 insertions(+), 1159 deletions(-) create mode 100644 src/api/patient/family.js create mode 100644 src/components/familyModal.vue create mode 100644 src/views/patient/family-list/index.vue diff --git a/src/api/patient/family.js b/src/api/patient/family.js new file mode 100644 index 0000000..887b8c0 --- /dev/null +++ b/src/api/patient/family.js @@ -0,0 +1,26 @@ +import request from '../../utils/request' + +const url = '/admin/patient/family'; + + +export function getFamilyList(params){ + return request({ + url:'/admin/patient/family', + method: 'get', + params + }) +} +export function getFamilyDetail(id){ + return request({ + url:'/admin/patient/family/'+id, + method: 'get' + }) + } + export function decryptMobile(params){ + return request({ + url:'/decrypt/mobile', + method: 'get', + params + }) + } + \ No newline at end of file diff --git a/src/api/patient/list.js b/src/api/patient/list.js index c431d57..aeeb1c6 100644 --- a/src/api/patient/list.js +++ b/src/api/patient/list.js @@ -10,73 +10,10 @@ export function getPatientList(params){ params }) } - - -export function removePatient(data) { - return request({ - url, - method: 'delete', - data - }) -} - -export function updatePatient(data, id) { - return request({ - url: `${url}/${id}`, - method: 'put', - data - }) -} export function getPatientDetail(id){ return request({ url:'/admin/patient/'+id, method: 'get' }) } - export function departmentList(){ //获取科室列表 - return request({ - url:'/basic/department/custom/list', - method: 'get' - }) - } - export function decryptCard(params){ - return request({ - url:'/decrypt/card/num', - method: 'get', - params - }) - } - export function decryptBank(doctor_id){ - return request({ - url:'/decrypt/bank/'+doctor_id, - method: 'get' - }) - } - - export function hospitalList(params){ //获取医院地址列表 - return request({ - url:'/basic/hospital/list', - method: 'get', - params - }) - } - export function expertiseList(){ //获取专长列表 - return request({ - url:'/basic/expertise/list', - method: 'get' - }) - } - export function bankList(){ //获取银行列表 - return request({ - url:'/basic/bank/list', - method: 'get' - }) - } - export function areaList(params){ //获取银行列表 - return request({ - url:'/basic/area/list', - method: 'get', - params - }) - } \ No newline at end of file diff --git a/src/components/familyModal.vue b/src/components/familyModal.vue new file mode 100644 index 0000000..c9be3ab --- /dev/null +++ b/src/components/familyModal.vue @@ -0,0 +1,252 @@ + + \ No newline at end of file diff --git a/src/components/tableUnit.vue b/src/components/tableUnit.vue index 0a2f90a..18fc4c2 100644 --- a/src/components/tableUnit.vue +++ b/src/components/tableUnit.vue @@ -1,13 +1,26 @@ @@ -235,6 +251,7 @@ const formRules = reactive({ disable_reason: [{ required: true, message: '请输入禁用理由' }] }); +const isVisible=ref(false); watch(() => deleteVisible.value, (value) => { if (value == false) { getPatientInfo(pager); @@ -360,15 +377,22 @@ const formRules = reactive({ } }) } +//关闭启用弹框 +const closeChangeOk = () => { + isVisible.value = false; + modalVisible.value = false; + handleQuery(); +}; //改变用户状态 const handleChangeStatus=async(status)=>{ if(status==0){ cur_parent_id.value=modalForm.patient_id; okVisible.value=true; }else{ - switchStatus(modalForm.patient_id,{ - status:1 - }) + isVisible.value=true + // switchStatus(modalForm.patient_id,{ + // status:1 + // }) } // if(record.status==0){