diff --git a/src/api/wms/invoicingcalendar/index.ts b/src/api/wms/invoicingcalendar/index.ts new file mode 100644 index 000000000..fe8ee7e8f --- /dev/null +++ b/src/api/wms/invoicingcalendar/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface InvoicingcalendarVO { + id: number + beginDay: string + endDay: string + descriiption: string + available: string + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询开票日历列表 +export const getInvoicingcalendarPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/invoicingcalendar/senior', data }) + } else { + return await request.get({ url: `/wms/invoicingcalendar/page`, params }) + } +} + +// 查询开票日历详情 +export const getInvoicingcalendar = async (id: number) => { + return await request.get({ url: `/wms/invoicingcalendar/get?id=` + id }) +} + +// 新增开票日历 +export const createInvoicingcalendar = async (data: InvoicingcalendarVO) => { + return await request.post({ url: `/wms/invoicingcalendar/create`, data }) +} + +// 修改开票日历 +export const updateInvoicingcalendar = async (data: InvoicingcalendarVO) => { + return await request.put({ url: `/wms/invoicingcalendar/update`, data }) +} + +// 删除开票日历 +export const deleteInvoicingcalendar = async (id: number) => { + return await request.delete({ url: `/wms/invoicingcalendar/delete?id=` + id }) +} + +// 导出开票日历 Excel +export const exportInvoicingcalendar = async (params) => { + return await request.download({ url: `/wms/invoicingcalendar/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/invoicingcalendar/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 1960d423a..4d7182995 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -83,4 +83,15 @@ export const selectBusinessTypeToLocation = async (params) => { } else { return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params }) } +} + + +export const selectConfigToLocation = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/location/pageConfigToLocationSenior', data }) + } else { + return request.get({ url: `/wms/location/pageConfigToLocation`, params }) + } } \ No newline at end of file diff --git a/src/api/wms/saleShipmentDetail/index.ts b/src/api/wms/saleShipmentDetail/index.ts index 50dd3e242..88f1b443f 100644 --- a/src/api/wms/saleShipmentDetail/index.ts +++ b/src/api/wms/saleShipmentDetail/index.ts @@ -28,38 +28,38 @@ export const getSaleShipmentDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/sale-shipment-detail/senior', data }) + return await request.post({ url: '/wms/sale-shipment-detail-request/senior', data }) } else { - return await request.get({ url: `/wms/sale-shipment-detail/page`, params }) + return await request.get({ url: `/wms/sale-shipment-detail-request/page`, params }) } } // 查询销售发运申请子详情 export const getSaleShipmentDetail = async (id: number) => { - return await request.get({ url: `/wms/sale-shipment-detail/get?id=` + id }) + return await request.get({ url: `/wms/sale-shipment-detail-request/get?id=` + id }) } // 新增销售发运申请子 export const createSaleShipmentDetail = async (data: SaleShipmentDetailVO) => { - return await request.post({ url: `/wms/sale-shipment-detail/create`, data }) + return await request.post({ url: `/wms/sale-shipment-detail-request/create`, data }) } // 修改销售发运申请子 export const updateSaleShipmentDetail = async (data: SaleShipmentDetailVO) => { - return await request.put({ url: `/wms/sale-shipment-detail/update`, data }) + return await request.put({ url: `/wms/sale-shipment-detail-request/update`, data }) } // 删除销售发运申请子 export const deleteSaleShipmentDetail = async (id: number) => { - return await request.delete({ url: `/wms/sale-shipment-detail/delete?id=` + id }) + return await request.delete({ url: `/wms/sale-shipment-detail-request/delete?id=` + id }) } // 导出销售发运申请子 Excel export const exportSaleShipmentDetail = async (params) => { - return await request.download({ url: `/wms/sale-shipment-detail/export-excel`, params }) + return await request.download({ url: `/wms/sale-shipment-detail-request/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/wms/sale-shipment-detail/get-import-template' }) + return request.download({ url: '/wms/sale-shipment-detail-request/get-import-template' }) } \ No newline at end of file diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts index c8768bea2..c2b08c819 100644 --- a/src/api/wms/saleShipmentMain/index.ts +++ b/src/api/wms/saleShipmentMain/index.ts @@ -64,31 +64,31 @@ export const importTemplate = () => { } // 关闭-销售发运申请 -export const closeSaleShipmentMain = async (id) => { +export const close = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/close?id=` + id }) } // 重新添加-销售发运申请 -export const reAddSaleShipmentMain = async (id) => { +export const reAdd = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/reAdd?id=` + id }) } // 提交审批-销售发运申请 -export const submitSaleShipmentMain = async (id) => { +export const submit = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/submit?id=` + id }) } // 审批驳回-销售发运申请 -export const refusedSaleShipmentMain = async (id) => { +export const refused = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/refused?id=` + id }) } // 审批通过-销售发运申请 -export const agreeSaleShipmentMain = async (id) => { +export const agree = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/agree?id=` + id }) } // 处理-销售发运申请 -export const handleSaleShipmentMain = async (id) => { +export const handle = async (id) => { return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index f3846f143..89ef00539 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -56,6 +56,12 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => { return await request.delete({ url: `/wms/supplierinvoice-request-main/delete?id=` + id }) } +// 校验控制是否可以开票逻辑 +export const checkInvoicingCalendar = async (params) => { + return await request.get({ url: `/wms/supplierinvoice-request-main/checkInvoicingCalendar`, params }) +} + + // 打开供应商发货申请主 export const opeSupplierinvoiceRequestMain = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-request-main/open?id=` + id }) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index cc20819b4..19cbf932f 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -274,12 +274,7 @@ const props = defineProps({ required: false, default: false }, - // TableForm 的第几列按钮 (后续用 fieldTableColumn替换 ,indexTableColumn容易出问题) - indexTableColumn :{ - type: Number, - required: false, - default: 0 - }, + fieldTableColumn:{ type: String, required: false, @@ -515,11 +510,7 @@ const handleAddTable = () => { tableFormKeys[item.field] = item.default ? item.default : '' }) if(props.fieldTableColumn!=''){ - console.log('handleAddTable',tableAllSchemas.value.tableFormColumns.find(item=>item.field==props.fieldTableColumn)) inpuFocus(tableAllSchemas.value.tableFormColumns.find(item=>item.field==props.fieldTableColumn),tableFormKeys,0) - }else{ - inpuFocus(tableAllSchemas.value.tableFormColumns[props.indexTableColumn],tableFormKeys,0) - } }else{ emit('handleAddTable') diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 535381792..ab9d65aa2 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -173,8 +173,15 @@ export default defineComponent({ // 如果是 Divider 组件,需要自己占用一行 const isDivider = item.component === 'Divider' const Com = componentMap['Divider'] as ReturnType + let labelName = item?.label || '' + if(item?.label){ + labelName = t(`ts.${item?.label}`) + if(labelName === 'ts.' + item?.label){ + labelName = item?.label + } + } return isDivider ? ( - {item?.label} + {labelName} ) : isCol ? ( // 如果需要栅格,需要包裹 ElCol {renderFormItem(item)} @@ -218,13 +225,28 @@ export default defineComponent({ const formItemSlots: Recordable = setFormItemSlots(slots, item.field) // 如果有 labelMessage,自动使用插槽渲染 if (item?.labelMessage) { + let labelName = item.label || '' + if(item.label){ + labelName = t(`ts.${item.label}`) + if(labelName === 'ts.' + item.label){ + labelName = item.label + } + } + + let labelMessage = item.labelMessage || '' + if(item.labelMessage){ + labelMessage = t(`ts.${item.labelMessage}`) + if(labelMessage === 'ts.' + item.labelMessage){ + labelMessage = item.labelMessage + } + } formItemSlots.label = () => { return ( <> - {item.label} + {labelName} {{ - content: () => , + content: () => , default: () => ( { return ( <> - { + { if(event.keyCode === 13){ //回车 emit('onEnter',item.field,formModel.value[item.field],event) @@ -293,7 +314,7 @@ export default defineComponent({ formItemSlotsSearchList[item.field] = () => { return ( <> - { + { if(event.keyCode === 13){ //回车 emit('onEnter',item.field,formModel.value[item.field],event) diff --git a/src/components/Form/src/components/useRenderSelect.tsx b/src/components/Form/src/components/useRenderSelect.tsx index 59b72e687..4a8a18a79 100644 --- a/src/components/Form/src/components/useRenderSelect.tsx +++ b/src/components/Form/src/components/useRenderSelect.tsx @@ -3,6 +3,7 @@ import { ComponentOptions } from '@/types/components' import { ElOption, ElOptionGroup } from 'element-plus' import { getSlot } from '@/utils/tsxHelper' import { Slots } from 'vue' +const { t } = useI18n() export const useRenderSelect = (slots: Slots) => { // 渲染 select options @@ -33,11 +34,16 @@ export const useRenderSelect = (slots: Slots) => { const valueAlias = item?.componentProps?.optionsAlias?.valueField const { label, value, ...other } = option + const zhName = labelAlias ? option[labelAlias] : label;//中文名称 + let labelName = t(`ts.${zhName}`) + if(labelName === 'ts.' + zhName){ + labelName = zhName + } return ( {{ diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue index 29ed5d067..03c91faa9 100644 --- a/src/components/ImportForm/src/ImportForm.vue +++ b/src/components/ImportForm/src/ImportForm.vue @@ -1,6 +1,6 @@