diff --git a/src/api/finance/account.js b/src/api/finance/account.js index d99942b..3de141d 100644 --- a/src/api/finance/account.js +++ b/src/api/finance/account.js @@ -12,9 +12,9 @@ export function getAccountDetail(id){ method: 'get' }) } - export function getAccountOrder(id,params){//关联订单列表 + export function getAccountOrder(params){//关联订单列表 return request({ - url:'/admin/doctor/account/order/'+id, + url:'/admin/doctor/account/order', method: 'get', params }) diff --git a/src/api/finance/record.js b/src/api/finance/record.js index 276052e..8a33e2b 100644 --- a/src/api/finance/record.js +++ b/src/api/finance/record.js @@ -14,9 +14,9 @@ export function getWithdrawalDetail(id){ method: 'get' }) } -export function getOrder(id,params){ +export function getOrder(params){ return request({ - url:'/admin/finance/withdrawal/order/'+id, + url:'/admin/finance/withdrawal/order', method: 'get', params }) diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue index 0c3ab28..ac59506 100644 --- a/src/components/accountModal.vue +++ b/src/components/accountModal.vue @@ -171,7 +171,7 @@ const {modalVisible,modalForm} = toRefs(props); watch(()=>props.modalForm.doctor_id,()=>{ if(props.modalForm.doctor_id){ doctor_id.value=props.modalForm.doctor_id; - handleGetOrder(props.modalForm.doctor_id,{...pager}) + handleGetOrder({...pager,doctor_id:props.modalForm.doctor_id}) }else{ doctor_id.value=''; } @@ -247,8 +247,8 @@ const handleClose = () => { emits('familyVisibleChange', false); }; const tableData=ref([]); -const handleGetOrder=(id,params={})=>{ - getAccountOrder(id,params).then(res=>{ +const handleGetOrder=(params={})=>{ + getAccountOrder(params).then(res=>{ if(res.code==200){ let data=res.data; tableData.value=data.data; @@ -264,14 +264,14 @@ const handleGetOrder=(id,params={})=>{ pager.page = page; // 修改当前页码 currentPage.value = page; - handleGetOrder(doctor_id.value,{ ...pager}); + handleGetOrder({ ...pager,doctor_id:doctor_id.value}); }; // 每页数据量 const handlepage_sizeChange = (page_size) => { pager.page_size = page_size; - handleGetOrder(doctor_id.value,{ ...pager}); + handleGetOrder({ ...pager,doctor_id:doctor_id.value}); }; const handleQuery = async () => { pager.page = 1; @@ -279,9 +279,9 @@ const handleQuery = async () => { page: pager.page, page_size: pager.page_size, ...queryForm, + doctor_id:doctor_id.value }; - - handleGetOrder(doctor_id.value,params); + handleGetOrder(params); }; // 重置搜索 diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue index 346188b..2b44a5e 100644 --- a/src/components/withdrawalModal.vue +++ b/src/components/withdrawalModal.vue @@ -102,7 +102,7 @@ -
{{modalForm.income_tax}}
+
{{modalForm.income_tax}}元
纠正个人所得税
@@ -266,7 +266,10 @@ const {modalVisible,modalForm} = toRefs(props); watch(()=>props.modalForm.withdrawal_id,()=>{ if(props.modalForm.withdrawal_id){ withdrawal_order_id.value=props.modalForm.withdrawal_id; - handleGetOrder(props.modalForm.withdrawal_id,{...pager}) + handleGetOrder({ + ...pager, + withdrawal_id:props.modalForm.withdrawal_id + }) }else{ withdrawal_order_id.value=''; } @@ -301,8 +304,8 @@ const handleClose = () => { emits('familyVisibleChange', false); }; const tableData=ref([]); -const handleGetOrder=(id,params={})=>{ - getOrder(id,params).then(res=>{ +const handleGetOrder=(params={})=>{ + getOrder(params).then(res=>{ if(res.code==200){ let data=res.data; console.log(data.data) @@ -319,13 +322,13 @@ const handleGetOrder=(id,params={})=>{ pager.page = page; // 修改当前页码 currentPage.value = page; - handleGetOrder(withdrawal_order_id.value,{ ...pager}); + handleGetOrder({ ...pager, withdrawal_id:withdrawal_order_id.value}); }; // 每页数据量 const handlepage_sizeChange = (page_size) => { pager.page_size = page_size; - handleGetOrder(withdrawal_order_id.value,{ ...pager}); + handleGetOrder({ ...pager, withdrawal_id:withdrawal_order_id.value}); }; const patientData=reactive({}); const modalFormData=reactive({});