1. 表格配置优化
Some checks failed
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled

This commit is contained in:
李琦
2026-05-19 09:52:55 +08:00
parent c978b978ec
commit 90a9bde586
37 changed files with 121 additions and 96 deletions

View File

@@ -59,7 +59,7 @@ const deleteApi = (row: any) => {
}
deleteExpressCompanies({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -204,7 +204,14 @@ const orderTypeMap = {
<div class="mt-1 text-gray-600 dark:text-gray-400">
供货价{{
item.buy_price != null && item.buy_price !== ''
? `${item.buy_price}`
? `${item.buy_price}/g`
: '—'
}}
</div>
<div class="mt-1 text-gray-600 dark:text-gray-400">
售价{{
item.buy_price != null && item.buy_price !== ''
? `${item.price} 元/g`
: '—'
}}
</div>

View File

@@ -573,7 +573,7 @@ const openOrderAmountVerify = () => {
<div
v-if="row.prescription_type === 1"
class="medication-details mt-5 px-4 pb-4"
class="medication-details mt-5 px-4 pb-4 w-[60%]"
>
<span class="mb-3 block font-medium">药品明细</span>
<div class="flex flex-wrap gap-3">
@@ -591,7 +591,14 @@ const openOrderAmountVerify = () => {
<div class="mt-1 text-gray-600 dark:text-gray-400">
供货价{{
item.buy_price != null && item.buy_price !== ''
? `${item.buy_price}`
? `${item.buy_price}/g`
: '—'
}}
</div>
<div class="mt-1 text-gray-600 dark:text-gray-400">
售价{{
item.buy_price != null && item.buy_price !== ''
? `${item.price} 元/g`
: '—'
}}
</div>

View File

@@ -70,7 +70,7 @@ const deleteApi = (row: any) => {
}
deleteChinaMedicine({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
/**

View File

@@ -57,7 +57,7 @@ const deleteApi = (row: any) => {
deleteDrugCategories({ ids })
.then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
})
.catch((err: any) => {
message.error(err?.message || '删除失败');

View File

@@ -120,7 +120,7 @@ const deleteApi = (row: any) => {
deleteHealthFood({ ids }).then(() => {
message.success('删除成功!');
// 刷新表格
gridApi.reload();
gridApi.query();
});
};

View File

@@ -75,7 +75,7 @@ const deleteApi = (row: any) => {
}
deleteMedicalDevice({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};

View File

@@ -75,7 +75,7 @@ const deleteApi = (row: any) => {
}
deleteNonDrug({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};

View File

@@ -72,7 +72,7 @@ const deleteApi = (row: any) => {
}
deleteServicePack({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -48,7 +48,7 @@ const [ModalComponent, modalApi] = useVbenModal({
modalApi.close();
const gridApi = modalApi.getData()?.gridApi;
if (gridApi) {
gridApi.reload();
gridApi.query();
}
} catch (error: any) {
console.error('设置失败:', error);

View File

@@ -93,7 +93,7 @@ const deleteApi = (row: any) => {
}
deleteWesternMedicine({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
/**

View File

@@ -81,7 +81,7 @@ const deleteApi = (row: any) => {
}
deleteWarehouseDrugManagement({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
/**
@@ -111,7 +111,7 @@ const openExcelUploadModal = (type = 1) => {
const updateStatus = (id: number) => {
updateWarehouseDrugManagementStatusApi(id).then(() => {
message.success('修改成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -74,7 +74,7 @@ const deleteApi = (row: any) => {
}
deleteWarehouseDrugManagementStore({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
/**
@@ -101,7 +101,7 @@ const openExcelUploadModal = (type = 1) => {
const syncDrugs = () => {
syncDrugApi().then((res) => {
message.success('同步成功!');
gridApi.reload();
gridApi.query();
});
};
@@ -125,7 +125,7 @@ const syncDrugPrice = () => {
console.log(res, '同步结果');
message.success('同步成功!');
gridApi.setLoading(false);
gridApi.reload();
gridApi.query();
});
};

View File

@@ -38,7 +38,7 @@ export const gridOptions: VxeGridProps<RowType> = {
{ field: 'drug.drug_store_drug.price', title: '建议售价' },
{ field: 'price', title: '售价' },
{ field: 'status', title: '状态', slots: { default: 'status' } },
{ field: 'is_shop', title: '是否上架商城', slots: { default: 'is_shop' } },
// { field: 'is_shop', title: '是否上架商城', slots: { default: 'is_shop' } },
{ type: 'html', align: 'right', title: '操作', slots: { default: 'action' }, width: 300, },
],
keepSource: true,

View File

@@ -74,7 +74,7 @@ const deleteApi = (row: any) => {
}
deleteWarehouseDrugManagementStore({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
/**
@@ -101,7 +101,7 @@ const openExcelUploadModal = (type = 1) => {
const syncDrugs = () => {
syncDrugApi().then((res) => {
message.success('同步成功!');
gridApi.reload();
gridApi.query();
});
};
@@ -125,7 +125,7 @@ const syncDrugPrice = () => {
console.log(res, '同步结果');
message.success('同步成功!');
gridApi.setLoading(false);
gridApi.reload();
gridApi.query();
});
};

View File

@@ -80,21 +80,21 @@ const showBindSubjectsModal = (row: Record<string, any>) => {
const openPcWindows = (id: number) => {
openPcWindowsApi(id).then(() => {
message.success('开通成功!');
gridApi.reload();
gridApi.query();
});
};
const audit = (id: number) => {
auditApi(id).then(() => {
message.success('审核成功!');
gridApi.reload();
gridApi.query();
});
};
const refuse = (id: number) => {
refuseApi(id).then(() => {
message.success('审核成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -80,21 +80,21 @@ const showBindStoreModal = (data: number) => {
const openPcWindows = (id: number) => {
openPcWindowsApi(id).then(() => {
message.success('开通成功!');
gridApi.reload();
gridApi.query();
});
};
const audit = (id: number) => {
auditApi(id).then(() => {
message.success('审核成功!');
gridApi.reload();
gridApi.query();
});
};
const refuse = (id: number) => {
refuseApi(id).then(() => {
message.success('审核成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -60,7 +60,9 @@ function updateShowStatus() {
<Statistics v-show="isShow" :grid-api="GridApi" />
<AnalysisChartsTabs :tabs="chartTabs" class="mt-5">
<template #trends>
<Grid>
<!-- 提现记录 --->
<div style="min-height: 500px;">
<Grid>
<template #toolbar-buttons></template>
<template #toolbar-tools></template>
<template #user_id="{ row }">
@@ -106,20 +108,22 @@ function updateShowStatus() {
/>
</template>
</Grid>
</div>
</template>
<template #visits>
<!-- 提现记录 --->
<Grid3>
<template #toolbar-buttons></template>
<template #toolbar-tools></template>
<template #user_id="{ row }">
<span v-if="row.user_type === 1">{{ row.store.name }}</span>
<span v-else-if="row.user_type === 2">萧康平台</span>
<span v-else-if="row.user_type === 3">{{ row.supplier.name }}</span>
</template>
<template #action="{ row }">
<TableAction
:actions="[
<!-- 结算记录 --->
<div style="min-height: 500px;">
<Grid3>
<template #toolbar-buttons></template>
<template #toolbar-tools></template>
<template #user_id="{ row }">
<span v-if="row.user_type === 1">{{ row.store.name }}</span>
<span v-else-if="row.user_type === 2">萧康平台</span>
<span v-else-if="row.user_type === 3">{{ row.supplier.name }}</span>
</template>
<template #action="{ row }">
<TableAction
:actions="[
// {
// label: '编辑',
// type: 'link',
@@ -129,14 +133,16 @@ function updateShowStatus() {
// onClick: showModal.bind(null, row, true),
// },
]"
:drop-down-actions="[]"
/>
</template>
</Grid3>
:drop-down-actions="[]"
/>
</template>
</Grid3>
</div>
</template>
<template #visitsItems>
<!-- 结算明细 --->
<Grid2>
<div style="min-height: 500px;">
<Grid2>
<template #toolbar-buttons></template>
<template #toolbar-tools></template>
<template #user_id="{ row }">
@@ -160,6 +166,7 @@ function updateShowStatus() {
/>
</template>
</Grid2>
</div>
</template>
</AnalysisChartsTabs>
<!-- 浮动按钮组 -->

View File

@@ -71,7 +71,7 @@ const pass = (id) => {
passApi({
id,
}).then(() => {
gridApi.reload();
gridApi.query();
message.success('通过成功');
})
}

View File

@@ -59,14 +59,14 @@ const deleteApi = (row: any) => {
}
deleteAdmin({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
const resetPasswordApi = (id: number) => {
resetPassword(id).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
@@ -75,7 +75,7 @@ const generateAccountApi = async (row: any) => {
const result = await generateLoginAccount(row.id);
if (result.login_account) {
message.success('生成账号成功');
gridApi.reload();
gridApi.query();
}
} catch (error: any) {
message.error(error.message || '生成账号失败');

View File

@@ -26,7 +26,7 @@ const [Modal, modalApi] = useVbenModal({
message.success('排序更新成功');
const gridApi = modalApi.getData()?.gridApi;
if (gridApi) {
gridApi.reload();
gridApi.query();
}
modalApi.close();
})

View File

@@ -72,7 +72,7 @@ const deleteZonesApi = (row: any) => {
}
deleteHomeZones({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -61,7 +61,7 @@ const deleteApi = (row: any) => {
}
deleteMenu({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};

View File

@@ -60,7 +60,7 @@ const deleteApi = (row: any) => {
}
deleteNotice({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -32,7 +32,7 @@ export const gridOptions: VxeGridProps<RowType> = {
columns: [
{ type: 'checkbox', width: 60 }, // 复选框列
{ field: 'id', align: 'left', title: 'ID', width: 100 }, // ID列
{ field: 'name', align: 'left', title: '药店名称' }, // 药店名称列(已从"诊所名称"改为"药店名称"
{ field: 'name', align: 'left', title: '药店名称', width: 140 }, // 药店名称列(已从"诊所名称"改为"药店名称"
{
// 在线复诊配置列(合并委托诊所和负责人)
field: 'online_consultation_config',
@@ -79,21 +79,23 @@ export const gridOptions: VxeGridProps<RowType> = {
width: 140,
slots: { default: 'mes_id_cell' },
},
{ field: 'position', title: '详细地址' }, // 详细地址列
{ field: 'new_admin.nick_name', title: '业务员' }, // 业务员列
{ field: 'mobile', title: '联系人、电话', slots: { default: 'mobile' } }, // 联系人电话列
{ field: 'position', title: '详细地址', width: 140 }, // 详细地址列
{ field: 'new_admin.nick_name', title: '业务员', width: 140 }, // 业务员列
{ field: 'mobile', title: '联系人、电话', slots: { default: 'mobile' }, width: 140 }, // 联系人电话列
{
// 营业时间列
field: 'start_time',
title: '营业时间',
width: 140,
slots: { default: 'start-time' },
},
{ field: 'created_at', title: '注册时间' }, // 注册时间列
{ field: 'created_at', title: '注册时间', width: 140 }, // 注册时间列
{
// 操作列
type: 'html',
title: '操作',
align: 'right',
width: 200,
fixed: 'right',
slots: { default: 'action' },
},
],

View File

@@ -153,7 +153,7 @@ const deleteApi = (row: any) => {
deleteStore({ ids }).then(() => {
message.success('删除成功!');
// 刷新表格
gridApi.reload();
gridApi.query();
});
};
@@ -165,7 +165,7 @@ function openPcWindows(id) {
openPcWindowsApiByStore(id).then(() => {
message.success('操作成功!');
// 刷新表格
gridApi.reload();
gridApi.query();
});
}
@@ -177,7 +177,7 @@ function openQrCode(id) {
openQrCodeApi(id).then(() => {
message.success('操作成功!');
// 刷新表格
gridApi.reload();
gridApi.query();
});
}

View File

@@ -75,7 +75,7 @@ const deleteQualificationsApi = (row: any) => {
}
deletePlatformQualifications({ ids }).then(() => {
message.success('删除成功!');
qualificationsGridApi.reload();
qualificationsgridApi.query();
});
};
</script>

View File

@@ -59,7 +59,7 @@ const deleteApi = (row: any) => {
}
deletePlatformQualifications({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -59,7 +59,7 @@ const deleteApi = (row: any) => {
}
deletePlatform({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -59,7 +59,7 @@ const deleteApi = (row: any) => {
}
deleteProcess({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
const expandAll = () => {

View File

@@ -59,7 +59,7 @@ const deleteApi = (row: any) => {
}
deleteRegion({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
const expandAll = () => {

View File

@@ -60,7 +60,7 @@ const deleteApi = (row: any) => {
}
deleteRoleQuickNav({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -86,7 +86,7 @@ const deleteApi = (row: any) => {
}
deleteRole({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -24,7 +24,7 @@ export const gridOptions: VxeGridProps<RowType> = {
columns: [
{ type: 'checkbox', width: 60 },
{ field: 'id', align: 'left', title: 'ID', width: 100 },
{ field: 'name', align: 'left', title: '诊所名称' },
{ field: 'name', align: 'left', title: '诊所名称', width: 140 },
{
field: 'clinic_type',
align: 'left',
@@ -68,28 +68,30 @@ export const gridOptions: VxeGridProps<RowType> = {
width: 140,
slots: { default: 'erp_id_cell' },
},
{
field: 'mes_id',
align: 'left',
title: 'MES ID',
width: 140,
slots: { default: 'mes_id_cell' },
},
// {
// field: 'mes_id',
// align: 'left',
// title: 'MES ID',
// width: 140,
// slots: { default: 'mes_id_cell' },
// },
// { field: 'shouzimu', title: '诊所首字母' },
{ field: 'position', title: '详细地址' },
{ field: 'new_admin.nick_name', title: '业务员', slots: { default: 'sales_admin' } },
{ field: 'store_admin.phone', title: '管理员手机', slots: { default: 'store_admin_phone' } },
{ field: 'mobile', title: '联系人、电话', slots: { default: 'mobile' } },
{ field: 'position', title: '详细地址', width: 140 },
{ field: 'new_admin.nick_name', title: '业务员', slots: { default: 'sales_admin' }, width: 140 },
{ field: 'store_admin.phone', title: '管理员手机', slots: { default: 'store_admin_phone' }, width: 140 },
{ field: 'mobile', title: '联系人、电话', slots: { default: 'mobile' }, width: 140 },
{
field: 'start_time',
title: '营业时间',
slots: { default: 'start-time' },
width: 140,
},
{ field: 'created_at', title: '注册时间' },
{ field: 'created_at', title: '注册时间', width: 140 },
{
type: 'html',
title: '操作',
align: 'right',
fixed: 'right',
width: 200,
slots: { default: 'action' },
},
],

View File

@@ -150,7 +150,7 @@ const deleteApi = (row: any) => {
}
deleteStore({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
/**
@@ -159,7 +159,7 @@ const deleteApi = (row: any) => {
function openPcWindows(id) {
openPcWindowsApiByStore(id).then(() => {
message.success('操作成功!');
gridApi.reload();
gridApi.query();
});
}
/**
@@ -168,7 +168,7 @@ function openPcWindows(id) {
function openQrCode(id) {
openQrCodeApi(id).then(() => {
message.success('操作成功!');
gridApi.reload();
gridApi.query();
});
}
@@ -503,14 +503,14 @@ const handleSwitchClinicType = (row: any) => {
ifShow: isPlatformAdmin,
onClick: showDrugPriceModal.bind(null, row),
},
{
label: '推广员分成',
type: 'link',
icon: 'ant-design:account-book-outlined',
size: 'small',
auth: ['Super Admin', 'Admin'],
onClick: () => openSalespersonCommission(row),
},
// {
// label: '推广员分成',
// type: 'link',
// icon: 'ant-design:account-book-outlined',
// size: 'small',
// auth: ['Super Admin', 'Admin'],
// onClick: () => openSalespersonCommission(row),
// },
]"
/>
</template>

View File

@@ -59,7 +59,7 @@ const deleteApi = (row: any) => {
}
deleteSupplier({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>

View File

@@ -64,7 +64,7 @@ const deleteApi = (row: any) => {
}
deleteTransferQuestion({ ids }).then(() => {
message.success('删除成功!');
gridApi.reload();
gridApi.query();
});
};
</script>