From c44507fb47b5af78c9b5adde78e9d1d56219aea9 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Tue, 14 Nov 2023 16:20:52 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/doctor/list.js | 10 ++- src/api/finance/account.js | 17 ++++- src/api/finance/bank.js | 7 ++ src/api/finance/record.js | 18 ++++- src/api/order/list.js | 16 +++++ src/api/patient/family.js | 7 ++ src/api/patient/list.js | 7 ++ src/api/prescription/list.js | 8 +++ src/components/accountModal.vue | 58 +++++++++++++++- src/components/withdrawalModal.vue | 58 +++++++++++++++- src/utils/downloadFile.js | 15 ++++ src/views/doctor/doctor-list/index.vue | 68 +++++++++++++++++-- src/views/finance/bankcard/index.vue | 48 +++++++++++-- src/views/finance/doctoraccount/index.vue | 50 ++++++++++++-- src/views/finance/financialrecord/index.vue | 62 ++++++++++++++--- src/views/order/medince-list/index.vue | 52 +++++++++++++- src/views/order/order-list/index.vue | 53 +++++++++++++-- src/views/patient/family-list/index.vue | 53 ++++++++++++--- src/views/patient/patient-list/index.vue | 52 ++++++++++++-- .../prescription/prescription-list/index.vue | 55 ++++++++++++--- 20 files changed, 649 insertions(+), 65 deletions(-) create mode 100644 src/utils/downloadFile.js diff --git a/src/api/doctor/list.js b/src/api/doctor/list.js index 193f628..62d5279 100644 --- a/src/api/doctor/list.js +++ b/src/api/doctor/list.js @@ -86,4 +86,12 @@ export function getDoctorDetail(id){ params }) } - \ No newline at end of file + + export function exportDoctor(data){//导出 + return request({ + url:'/admin/export/doctor', + method: 'post', + data + }) + } + \ No newline at end of file diff --git a/src/api/finance/account.js b/src/api/finance/account.js index 3de141d..7c06003 100644 --- a/src/api/finance/account.js +++ b/src/api/finance/account.js @@ -18,4 +18,19 @@ export function getAccountDetail(id){ method: 'get', params }) - } \ No newline at end of file + } + export function exportAccount(data){//导出 + return request({ + url:'/admin/export/doctor/account', + method: 'post', + data + }) + } + export function exportAccountOrder(data){//导出关联订单 + return request({ + url:'/admin/export/doctor/account/order', + method: 'post', + data + }) + } + \ No newline at end of file diff --git a/src/api/finance/bank.js b/src/api/finance/bank.js index 49e5463..f9f1823 100644 --- a/src/api/finance/bank.js +++ b/src/api/finance/bank.js @@ -6,4 +6,11 @@ export function getBankList(params){ params }) } +export function exportBankcard(data){//导出 + return request({ + url:'/admin/export/doctor/bank/card', + method: 'post', + data + }) +} diff --git a/src/api/finance/record.js b/src/api/finance/record.js index 8a33e2b..1a190a4 100644 --- a/src/api/finance/record.js +++ b/src/api/finance/record.js @@ -44,6 +44,18 @@ export function getOrder(params){ method: 'put' }) } - - - \ No newline at end of file + export function exportRecord(data){//导出 + return request({ + url:'/admin/export/withdrawal', + method: 'post', + data + }) + } + export function exportRecordOrder(data){//导出相关订单 + return request({ + url:'/admin/export/withdrawal/order', + method: 'post', + data + }) + } + \ No newline at end of file diff --git a/src/api/order/list.js b/src/api/order/list.js index 007fa78..9cb8008 100644 --- a/src/api/order/list.js +++ b/src/api/order/list.js @@ -72,4 +72,20 @@ export function getIm(params){//获取im分页 params }) } + +export function exportInquiry(data){//导出问诊订单 + return request({ + url:'/admin/export/order/inquiry', + method: 'post', + data + }) +} +export function exportProduct(data){//导出药品订单 + return request({ + url:'/admin/export/order/product', + method: 'post', + data + }) +} + diff --git a/src/api/patient/family.js b/src/api/patient/family.js index 887b8c0..e88e6d9 100644 --- a/src/api/patient/family.js +++ b/src/api/patient/family.js @@ -23,4 +23,11 @@ export function getFamilyDetail(id){ params }) } + export function exportFamily(data){//导出 + return request({ + url:'/admin/export/patient/family', + method: 'post', + data + }) + } \ No newline at end of file diff --git a/src/api/patient/list.js b/src/api/patient/list.js index 8564b2b..952ad79 100644 --- a/src/api/patient/list.js +++ b/src/api/patient/list.js @@ -22,4 +22,11 @@ export function getPatientDetail(id){ method: 'put', data }) + } + export function exportPatient(data){//导出 + return request({ + url:'/admin/export/patient', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/api/prescription/list.js b/src/api/prescription/list.js index f369922..13b7a22 100644 --- a/src/api/prescription/list.js +++ b/src/api/prescription/list.js @@ -22,3 +22,11 @@ export function getPrescriptionDetail(id){ method: 'get' }) } + export function exportPrescription(data){//导出 + return request({ + url:'/admin/export/prescription', + method: 'post', + data + }) + } + \ No newline at end of file diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue index 3b81005..76fdb39 100644 --- a/src/components/accountModal.vue +++ b/src/components/accountModal.vue @@ -7,6 +7,8 @@
关联订单
+ + @@ -66,6 +68,16 @@ + + +
+ + 选择数据导出 + 当前搜索全部导出 + 全部导出 + +
+ @@ -77,7 +89,7 @@ :row-selection="{ type: 'checkbox', showCheckedAll: true }" :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }" - row-key="order_inquiry_id" @selection-change="(selection) => {console.log(selection)}" + row-key="order_inquiry_id" @selection-change="(selection) => {selectData=selection}" @page-change="handlePageChange" @page-size-change="handlepage_sizeChange"> From 8d72063263f6867ebdf591f11dbc10609ad995b7 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 16 Nov 2023 14:35:56 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/doctor/doctor-list/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue index c45c3b5..76cf65a 100644 --- a/src/views/doctor/doctor-list/index.vue +++ b/src/views/doctor/doctor-list/index.vue @@ -1600,7 +1600,7 @@ const handlExport=async(type)=>{ proxy.$loading.show(); let fromData=null; if(type==1){ - deleteData.value=[]; + fromData={ type, ...queryForm @@ -1624,7 +1624,7 @@ const handlExport=async(type)=>{ id } }else if(type==3){ - deleteData.value=[]; + //tableRef.value.selectAll(false) fromData={ type From c7a99a87b88d0fec4272737b1f3054953e688e55 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 16 Nov 2023 16:44:04 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 3 +++ src/utils/downloadFile.js | 4 ++-- src/utils/request.js | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main.js b/src/main.js index 9868b05..e0a7a23 100644 --- a/src/main.js +++ b/src/main.js @@ -30,6 +30,7 @@ app.config.globalProperties.parseTime = parseTime; for(const name in ArcoIconModules){ app.component(name,ArcoIconModules[name]) } +export const globals = app.config.globalProperties pinia.use(piniaPluginPersistedstate); app.use(Loading) app.use(ArcoVue); @@ -37,3 +38,5 @@ app.use(router); app.use(pinia); app.mount('#app'); + + diff --git a/src/utils/downloadFile.js b/src/utils/downloadFile.js index 75a1e73..43846ec 100644 --- a/src/utils/downloadFile.js +++ b/src/utils/downloadFile.js @@ -1,7 +1,7 @@ export const downloadFile=(fileUrl,name='')=>{ - let startIndex=fileUrl.indexOf("output"); + let startIndex=fileUrl.lastIndexOf("/"); let endIndex=fileUrl.lastIndexOf("."); - let originName=fileUrl.substring(startIndex,endIndex); + let originName=fileUrl.substring(startIndex+1,endIndex); const request = new XMLHttpRequest() request.open('GET', fileUrl) request.responseType = 'blob' diff --git a/src/utils/request.js b/src/utils/request.js index 66674a8..4ab76d0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,8 @@ import axios from 'axios'; import { Message } from '@arco-design/web-vue'; import { useUserStore } from '../store/userInfo' +import {globals} from '../main.js' + // create an axios instance console.log("________"+import.meta.env.VITE_BASE_URL) @@ -111,6 +113,7 @@ service.interceptors.response.use( duration: 3000 }) } + globals?.$loading.hide(); return Promise.reject(message); } ); From ed31966478c8d5f4c1a9c7c7db0964f7f2a42ff5 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 16 Nov 2023 16:56:52 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/sys-menu/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/sys-menu/index.vue b/src/views/admin/sys-menu/index.vue index 5c6dd05..a8f2d93 100644 --- a/src/views/admin/sys-menu/index.vue +++ b/src/views/admin/sys-menu/index.vue @@ -285,10 +285,10 @@ const handleSubmit = (done) => { modalForm.component=''; }; if (!modalForm.menu_id) { - console.log("dasdasd",modalForm) if(modalForm.menu_type==''){ modalForm.menu_type=0; }; + modalForm.api_ids= modalForm.apis; const {code,message} = await addMenu(modalForm); if (code==200) { proxy.$message.success('新增成功');