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/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 28c996130..1b0e5640e 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -762,4 +762,112 @@ export const SaleDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) + +/** + * @returns {Array} 销售订单主子表合并数据 + */ +export const SaleDetailAndMain = useCrudSchemas(reactive([ + { + label: '销售订单号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '销售订单行', + field: 'lineNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + }, + { + label: '客户库位', + field: 'fromLocationCode', + sort: 'custom', + isSearch: true, + isTableForm: true, + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select' + } + } +])) \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 97a295c57..df789bd3d 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -150,17 +150,6 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { - var isHave =SaleShipmentMainRecord.allSchemas.formSchema.some(function (item) { - return item.field === 'activeTime' || item.field === 'expireTime'; - }); - if(isHave){ - if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') - return; - } - } - if(data.activeTime==0)data.activeTime = null; - if(data.expireTime==0)data.expireTime = null; if (formType === 'create') { await SaleShipmentMainRecordApi.createSaleShipmentMainRecord(data) message.success(t('common.createSuccess')) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 735180412..c2bce7085 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -28,7 +28,7 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > -