xkyy/xk-admin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

feat:优化了模态框的大小
Some checks failed
CI / Test (ubuntu-latest) (push) Has been cancelled
Details
CI / Test (windows-latest) (push) Has been cancelled
Details
CI / Lint (ubuntu-latest) (push) Has been cancelled
Details
CI / Lint (windows-latest) (push) Has been cancelled
Details
CI / Check (ubuntu-latest) (push) Has been cancelled
Details
CI / Check (windows-latest) (push) Has been cancelled
Details
CI / CI OK (push) Has been cancelled
Details
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Details
Release Drafter / update_release_draft (push) Has been cancelled
Details
Lock Threads / action (push) Has been cancelled
Details
Issue Close Require / close-issues (push) Has been cancelled
Details
Close stale issues / stale (push) Has been cancelled
Details

Browse Source
This commit is contained in:
李琦
2026-07-28 07:59:10 +08:00
parent 14414bf9b0
commit c8045e1da8
33 changed files with 156 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/views/business/order/prescription/components/source.vue
View File

@@ -37,7 +37,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="处方溯源">
<Modal class="w-[80%] h-[80%]" title="处方溯源">
<PrescriptionSourceContent :data="data" />
</Modal>
</template>

9
apps/web-antd/src/views/business/order/prescription/config/search.ts
View File

@@ -47,9 +47,14 @@ export const formOptions: VbenFormProps = {
{
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD', // 确保格式与你需要的一致
format: 'YYYY-MM-DD',
// 提交纯日期，后端 getWhereBetween 会把结束日扩到当天 23:59:59
valueFormat: 'YYYY-MM-DD',
},
defaultValue: [dayjs().startOf('month'), dayjs()],
defaultValue: [
dayjs().startOf('month').format('YYYY-MM-DD'),
dayjs().format('YYYY-MM-DD'),
],
fieldName: 'search_time',
label: '时间范围',
},

2
apps/web-antd/src/views/business/order/product-order/components/detail.vue
View File

@@ -263,7 +263,7 @@ function prescriptionStatusColor() {
}
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="订单详情">
<Modal class="h-[80%] w-[80%]" title="订单详情">
<div v-if="data" class="flex flex-col gap-4">
<Space>
<Button type="primary" size="small" @click="openOrderTrace">

7
apps/web-antd/src/views/business/order/product-order/config/search.ts
View File

@@ -106,8 +106,13 @@ export const formOptions: VbenFormProps = {
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD',
// 提交纯日期，后端 getWhereBetween 会把结束日扩到当天 23:59:59
valueFormat: 'YYYY-MM-DD',
},
defaultValue: [dayjs().startOf('month'), dayjs()],
defaultValue: [
dayjs().startOf('month').format('YYYY-MM-DD'),
dayjs().format('YYYY-MM-DD'),
],
fieldName: 'search_time',
label: '时间范围',
},

9
apps/web-antd/src/views/business/order/register/config/search.ts
View File

@@ -18,9 +18,14 @@ export const formOptions: VbenFormProps = {
{
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD', // 确保格式与你需要的一致
format: 'YYYY-MM-DD',
// 提交纯日期，后端 getWhereBetween 会把结束日扩到当天 23:59:59
valueFormat: 'YYYY-MM-DD',
},
defaultValue: [dayjs().startOf('month'), dayjs()],
defaultValue: [
dayjs().startOf('month').format('YYYY-MM-DD'),
dayjs().format('YYYY-MM-DD'),
],
fieldName: 'search_time',
label: '时间范围',
},

12
apps/web-antd/src/views/business/product/_shared/drug-free-shipping-api.ts Normal file
View File

@@ -0,0 +1,12 @@
import { requestClient } from '#/api/request';
/**
* 切换药品单品包邮（非中药商品共用）
* @param drugId 药品 ID
*/
export async function toggleDrugFreeShipping(drugId: number) {
return requestClient.post<{ is_free_shipping: number }>(
'drug-free-shipping/toggle',
{ drug_id: drugId },
);
}

56
apps/web-antd/src/views/business/product/_shared/drug-free-shipping-cell.vue Normal file
View File

@@ -0,0 +1,56 @@
<script lang="ts" setup>
import { ref } from 'vue';
import { message, Tag } from 'ant-design-vue';
import { toggleDrugFreeShipping } from './drug-free-shipping-api';
const props = defineProps<{
/** 列表行：需含 id、is_free_shipping */
row: {
id: number | string;
is_free_shipping?: number;
};
}>();
const emit = defineEmits<{
/** 切换成功后通知父级刷新列表 */
(e: 'changed'): void;
}>();
const loading = ref(false);
/**
* 点击 Tag 切换单品包邮；成功后回写行内状态并通知父级
*/
const onToggle = async () => {
if (loading.value) {
return;
}
const drugId = Number(props.row.id);
if (!drugId) {
return;
}
loading.value = true;
try {
const res = await toggleDrugFreeShipping(drugId);
const next = Number(res?.is_free_shipping ?? 0);
props.row.is_free_shipping = next;
message.success(next === 1 ? '已设为单品包邮' : '已取消单品包邮');
emit('changed');
} finally {
loading.value = false;
}
};
</script>
<template>
<Tag
:color="row.is_free_shipping === 1 ? 'success' : 'default'"
class="cursor-pointer"
:class="{ 'opacity-60': loading }"
@click="onToggle"
>
{{ row.is_free_shipping === 1 ? '包邮' : '不包邮' }}
</Tag>
</template>

2
apps/web-antd/src/views/business/product/china-medicine/components/ExcelUpload.vue
View File

@@ -80,7 +80,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="上传Excel">
<Modal class="w-[80%] h-[80%]" title="上传Excel">
<!-- 新增：显示文件选择状态 -->
<div v-if="isFileSelected" class="mb-4 p-3 bg-green-50 border border-green-200 rounded">
<p class="text-green-700 text-sm">已选择文件：{{ selectedFile?.name }}</p>

2
apps/web-antd/src/views/business/product/health-food/components/ExcelUpload.vue
View File

@@ -102,7 +102,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="上传Excel">
<Modal class="w-[80%] h-[80%]" title="上传Excel">
<!-- 显示文件选择状态提示 -->
<div
v-if="isFileSelected"

6
apps/web-antd/src/views/business/product/health-food/config/table.ts
View File

@@ -57,6 +57,12 @@ export const gridOptions: VxeGridProps<RowType> = {
},
{ field: 'supplier.name', title: '供应商', slots: { default: 'supplier' }, width: 130 },
{ field: 'specification', title: '规格', width: 120 },
{
field: 'is_free_shipping',
title: '单品包邮',
width: 100,
slots: { default: 'is_free_shipping' },
},
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],

4
apps/web-antd/src/views/business/product/health-food/index.vue
View File

@@ -20,6 +20,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -303,6 +304,9 @@ const openExcelUploadModal = () => {
<template #supplier="{ row }">
{{ row.supplier?.name || row.source }}
</template>
<template #is_free_shipping="{ row }">
<DrugFreeShippingCell :row="row" />
</template>
<template #status="{ row }">
<Tag :color="row.status_color">{{ row.status_txt }}</Tag>
</template>

2
apps/web-antd/src/views/business/product/medical-device/components/ExcelUpload.vue
View File

@@ -73,7 +73,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="上传Excel">
<Modal class="w-[80%] h-[80%]" title="上传Excel">
<div
v-if="isFileSelected"
class="mb-4 rounded border border-green-200 bg-green-50 p-3"

6
apps/web-antd/src/views/business/product/medical-device/config/table.ts
View File

@@ -50,6 +50,12 @@ export const gridOptions: VxeGridProps<RowType> = {
{ field: 'supplier.name', title: '供应商', slots: { default: 'supplier' }, width: 130 },
{ field: 'function', title: '器械功能', width: 200 },
{ field: 'specification', title: '规格型号', width: 120 },
{
field: 'is_free_shipping',
title: '单品包邮',
width: 100,
slots: { default: 'is_free_shipping' },
},
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],

4
apps/web-antd/src/views/business/product/medical-device/index.vue
View File

@@ -13,6 +13,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -250,6 +251,9 @@ const openExcelUploadModal = () => {
<template #supplier="{ row }">
{{ row.supplier?.name || row.source }}
</template>
<template #is_free_shipping="{ row }">
<DrugFreeShippingCell :row="row" />
</template>
<template #status="{ row }">
<Tag :color="row.status_color">{{ row.status_txt }}</Tag>
</template>

2
apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue
View File

@@ -73,7 +73,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="上传Excel">
<Modal class="w-[80%] h-[80%]" title="上传Excel">
<div
v-if="isFileSelected"
class="mb-4 rounded border border-green-200 bg-green-50 p-3"

6
apps/web-antd/src/views/business/product/non-drug/config/table.ts
View File

@@ -50,6 +50,12 @@ export const gridOptions: VxeGridProps<RowType> = {
{ field: 'supplier.name', title: '供应商', slots: { default: 'supplier' }, width: 130 },
{ field: 'function', title: '产品功能', width: 200 },
{ field: 'specification', title: '规格', width: 120 },
{
field: 'is_free_shipping',
title: '单品包邮',
width: 100,
slots: { default: 'is_free_shipping' },
},
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],

4
apps/web-antd/src/views/business/product/non-drug/index.vue
View File

@@ -13,6 +13,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -250,6 +251,9 @@ const openExcelUploadModal = () => {
<template #supplier="{ row }">
{{ row.supplier?.name || row.source }}
</template>
<template #is_free_shipping="{ row }">
<DrugFreeShippingCell :row="row" />
</template>
<template #status="{ row }">
<Tag :color="row.status_color">{{ row.status_txt }}</Tag>
</template>

6
apps/web-antd/src/views/business/product/service-pack/config/table.ts
View File

@@ -50,6 +50,12 @@ export const gridOptions: VxeGridProps<RowType> = {
{ field: 'supplier.name', title: '供应商', width: 130 },
{ field: 'function', title: '主要功能', width: 200 },
{ field: 'specification', title: '规格', width: 120 },
{
field: 'is_free_shipping',
title: '单品包邮',
width: 100,
slots: { default: 'is_free_shipping' },
},
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],

4
apps/web-antd/src/views/business/product/service-pack/index.vue
View File

@@ -12,6 +12,7 @@ import { TableAction } from '#/components/table-action';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -219,6 +220,9 @@ const deleteApi = (row: any) => {
@stock-in="openStockIn"
/>
</template>
<template #is_free_shipping="{ row }">
<DrugFreeShippingCell :row="row" />
</template>
<template #status="{ row }">
<Tag :color="row.status_color">{{ row.status_txt }}</Tag>
</template>

2
apps/web-antd/src/views/business/product/western-medicine/components/ExcelUpload.vue
View File

@@ -80,7 +80,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="上传Excel">
<Modal class="w-[80%] h-[80%]" title="上传Excel">
<!-- 新增：显示文件选择状态 -->
<div
v-if="isFileSelected"

6
apps/web-antd/src/views/business/product/western-medicine/config/table.ts
View File

@@ -55,6 +55,12 @@ export const gridOptions: VxeGridProps<RowType> = {
width: 100,
slots: { default: 'is_otc' },
},
{
field: 'is_free_shipping',
title: '单品包邮',
width: 100,
slots: { default: 'is_free_shipping' },
},
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{
field: 'min_adjust_price',

4
apps/web-antd/src/views/business/product/western-medicine/index.vue
View File

@@ -13,6 +13,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -298,6 +299,9 @@ const openExcelUploadModal = () => {
{{ row.is_otc === 0 ? '处方药' : '非处方药' }}
</Tag>
</template>
<template #is_free_shipping="{ row }">
<DrugFreeShippingCell :row="row" />
</template>
<template #status="{ row }">
<Tag :color="row.status_color">{{ row.status_txt }}</Tag>
</template>

2
apps/web-antd/src/views/finance/monthly-payment-settlement/components/MonthlyPayment.vue
View File

@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="申请提现">
<Modal class="w-[80%] h-[80%]" title="申请提现">
<InvalidatedForm />
<SettlementForm />
</Modal>

2
apps/web-antd/src/views/finance/withdrawal/components/card-modal.vue
View File

@@ -57,7 +57,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="编辑银行卡账户">
<Modal class="w-[80%] h-[80%]" title="编辑银行卡账户">
<Form />
</Modal>
</template>

2
apps/web-antd/src/views/finance/withdrawal/components/withdrawal-modal.vue
View File

@@ -61,7 +61,7 @@ const setAmount = (amount: number) => {
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="申请提现">
<Modal class="w-[80%] h-[80%]" title="申请提现">
<Form />
<div class="mt-4 grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
<Button type="primary" @click="setAmount(1000)"> 1000 </Button>

2
apps/web-antd/src/views/log/api-log/components/modal.vue
View File

@@ -39,7 +39,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="Api访问日志详情">
<Modal class="w-[80%] h-[80%]" title="Api访问日志详情">
<div class="flex flex-col gap-4">
<Descriptions
:column="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 2 }"

2
apps/web-antd/src/views/log/hy-transit-log/components/fail-detail-modal.vue
View File

@@ -55,7 +55,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="监管回调详情">
<Modal class="w-[80%] h-[80%]" title="监管回调详情">
<Spin :spinning="loading">
<Descriptions bordered :column="2" class="mb-4">
<Descriptions.Item label="记录ID">{{ data.id }}</Descriptions.Item>

2
apps/web-antd/src/views/log/ledger-log/components/modal.vue
View File

@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
});
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="分账日志详情">
<Modal class="w-[80%] h-[80%]" title="分账日志详情">
<div class="flex flex-col gap-4">
<Descriptions
:column="{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }"

2
apps/web-antd/src/views/log/old-api-log/components/modal.vue
View File

@@ -32,7 +32,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="Api访问日志详情">
<Modal class="w-[80%] h-[80%]" title="Api访问日志详情">
<div class="flex flex-col gap-4">
<Descriptions
:column="{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }"

2
apps/web-antd/src/views/log/op-log/components/modal.vue
View File

@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
});
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="操作日志详情">
<Modal class="w-[80%] h-[80%]" title="操作日志详情">
<div class="flex flex-col gap-4">
<Descriptions
:column="{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }"

2
apps/web-antd/src/views/log/order-log/components/modal.vue
View File

@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
});
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="订单日志详情">
<Modal class="w-[80%] h-[80%]" title="订单日志详情">
<div class="flex flex-col gap-4">
<Descriptions
:column="{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }"

2
apps/web-antd/src/views/log/prescription-log/components/modal.vue
View File

@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
});
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="处方日志详情">
<Modal class="w-[80%] h-[80%]" title="处方日志详情">
<div class="flex flex-col gap-4">
<Descriptions
:column="{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }"

2
apps/web-antd/src/views/pharmacist/audit-prescription/components/source.vue
View File

@@ -37,7 +37,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-[80%] md:w-[50%] lg:w-[30%] h-[60%]" title="处方溯源">
<Modal class="w-[80%] h-[80%]" title="处方溯源">
<PrescriptionSourceContent :data="data" />
</Modal>
</template>