diff --git a/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue b/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue index 07677719..1f3aaeef 100644 --- a/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue +++ b/apps/web-antd/src/views/business/warehouse-drug-management/admin/components/ExcelUpload.vue @@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.close(); }, onConfirm: async () => { - modalApi.setState({ loading: true, confirmLoading: true }); + // modalApi.setState({ loading: true, confirmLoading: true }); gridApi.value?.reload(); modalApi.close(); }, diff --git a/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue b/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue index 7c9fc111..bd303c27 100644 --- a/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue +++ b/apps/web-antd/src/views/business/warehouse-drug-management/store/components/ExcelUpload.vue @@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.close(); }, onConfirm: async () => { - modalApi.setState({ loading: true, confirmLoading: true }); + // modalApi.setState({ loading: true, confirmLoading: true }); gridApi.value?.reload(); modalApi.close(); }, diff --git a/apps/web-antd/src/views/finance/withdrawal/config/table.ts b/apps/web-antd/src/views/finance/withdrawal/config/table.ts index 2d4fd06d..094db2b9 100644 --- a/apps/web-antd/src/views/finance/withdrawal/config/table.ts +++ b/apps/web-antd/src/views/finance/withdrawal/config/table.ts @@ -36,9 +36,21 @@ export const gridOptions: VxeGridProps = { { field: 'charge_cash', title: '手续费' }, { field: 'apply_time', title: '申请时间' }, { field: 'check_id', title: '审核人', slots: { default: 'check_id' } }, - { field: 'check_status', title: '审核状态', slots: { default: 'check_status'} }, - { field: 'check_result', title: '审核结果', slots: { default: 'check_result'} }, - { field: 'dakuan_status', title: '打款状态' }, + { + field: 'check_status', + title: '审核状态', + slots: { default: 'check_status' }, + }, + { + field: 'check_result', + title: '审核结果', + slots: { default: 'check_result' }, + }, + { + field: 'dakuan_status', + title: '打款状态', + slots: { default: 'dakuan_status' }, + }, { field: 'dakuan_time', title: '打款时间' }, { field: 'created_at', title: '注册时间' }, { type: 'html', title: '操作', slots: { default: 'action' } }, diff --git a/apps/web-antd/src/views/finance/withdrawal/index.vue b/apps/web-antd/src/views/finance/withdrawal/index.vue index 3eccab1d..3939ddf9 100644 --- a/apps/web-antd/src/views/finance/withdrawal/index.vue +++ b/apps/web-antd/src/views/finance/withdrawal/index.vue @@ -63,8 +63,13 @@ const chartTabs = [ {{ row.check_result }} +