diff --git a/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts b/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts index fa81b169b..be6a38a6d 100644 --- a/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts +++ b/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts @@ -38,9 +38,9 @@ export namespace MallDeliveryExpressTemplateApi { /** 排序 */ sort: number; /** 计费区域列表 */ - templateCharge: TemplateCharge[]; + charges: TemplateCharge[]; /** 包邮区域列表 */ - templateFree: TemplateFree[]; + frees: TemplateFree[]; } /** 运费模板精简信息 */ diff --git a/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts b/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts index b97f2c3d5..321df41fb 100644 --- a/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts +++ b/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts @@ -29,21 +29,18 @@ export namespace MallDeliveryPickUpStoreApi { longitude: number; /** 状态 */ status: number; - /** 绑定用户编号组数 */ - verifyUserIds: number[]; /** 营业时间 用于fieldMappingTime */ rangeTime: any[]; + /** 绑定用户编号组数 */ + verifyUserIds?: number[]; + verifyUsers?: any[]; } /** 绑定自提店员请求 */ - export interface BindStaffRequest { + export interface DeliveryPickUpBindReqVO { id?: number; - /** 门店名称 */ - name: string; - /** 门店编号 */ - storeId: number; /** 用户编号列表 */ - userIds: number[]; + verifyUserIds: number[]; } } @@ -89,8 +86,8 @@ export function deleteDeliveryPickUpStore(id: number) { } /** 绑定自提店员 */ -export function bindStoreStaffId( - data: MallDeliveryPickUpStoreApi.BindStaffRequest, +export function bindDeliveryPickUpStore( + data: MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO, ) { return requestClient.post('/trade/delivery/pick-up-store/bind', data); } diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/data.ts b/apps/web-antd/src/views/mall/trade/delivery/express/data.ts index 28db3aaa5..7b3fe0512 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/express/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/express/data.ts @@ -21,12 +21,18 @@ export function useFormSchema(): VbenFormSchema[] { component: 'Input', fieldName: 'code', label: '公司编码', + componentProps: { + placeholder: '请输入快递编码', + }, rules: 'required', }, { component: 'Input', fieldName: 'name', label: '公司名称', + componentProps: { + placeholder: '请输入快递名称', + }, rules: 'required', }, { @@ -34,6 +40,7 @@ export function useFormSchema(): VbenFormSchema[] { fieldName: 'logo', label: '公司 logo', rules: 'required', + help: '推荐 180x180 图片分辨率', }, { fieldName: 'sort', @@ -41,6 +48,7 @@ export function useFormSchema(): VbenFormSchema[] { component: 'InputNumber', componentProps: { min: 0, + placeholder: '请输入显示顺序', }, rules: 'required', }, @@ -65,17 +73,26 @@ export function useGridFormSchema(): VbenFormSchema[] { fieldName: 'name', label: '快递公司名称', component: 'Input', + componentProps: { + placeholder: '请输入快递公司名称', + allowClear: true, + }, }, { fieldName: 'code', label: '快递公司编号', component: 'Input', + componentProps: { + placeholder: '请输入快递公司编号', + allowClear: true, + }, }, { fieldName: 'status', label: '状态', component: 'Select', componentProps: { + placeholder: '请选择状态', allowClear: true, options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), }, @@ -89,18 +106,22 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '编号', + minWidth: 100, }, { field: 'code', title: '公司编码', + minWidth: 120, }, { field: 'name', title: '公司名称', + minWidth: 150, }, { field: 'logo', title: '公司 logo', + minWidth: 120, cellRender: { name: 'CellImage', }, @@ -108,10 +129,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'sort', title: '显示顺序', + minWidth: 100, }, { field: 'status', title: '状态', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -120,6 +143,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/index.vue b/apps/web-antd/src/views/mall/trade/delivery/express/index.vue index c2fcc7c28..ea1df37e6 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/express/index.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/express/index.vue @@ -24,7 +24,7 @@ const [FormModal, formModalApi] = useVbenModal({ }); /** 刷新表格 */ -function onRefresh() { +function handleRefresh() { gridApi.query(); } @@ -51,11 +51,9 @@ async function handleDelete(row: MallDeliveryExpressApi.DeliveryExpress) { duration: 0, }); try { - await deleteDeliveryExpress(row.id as number); - message.success({ - content: $t('ui.actionMessage.deleteSuccess', [row.name]), - }); - onRefresh(); + await deleteDeliveryExpress(row.id!); + message.success($t('ui.actionMessage.deleteSuccess', [row.name])); + handleRefresh(); } finally { hideLoading(); } @@ -82,6 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true, @@ -93,7 +92,7 @@ const [Grid, gridApi] = useVbenVxeGrid({