From 4bb31c879f83d40f3b3f7e7d62096fb7d7f1242a Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Mon, 20 Nov 2023 08:49:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E7=94=A8=E4=BE=8B=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseMain/index.ts | 18 +- src/api/wms/purchasePlanMain/index.ts | 29 +- .../supplierdeliver/purchaseMain/index.vue | 572 ++++++++-------- .../purchasePlanMain/index.vue | 617 ++++++++++-------- .../purchasePlanMain/purchasePlanMain.data.ts | 38 +- 5 files changed, 676 insertions(+), 598 deletions(-) diff --git a/src/api/wms/purchaseMain/index.ts b/src/api/wms/purchaseMain/index.ts index 62648ea7a..a833a5427 100644 --- a/src/api/wms/purchaseMain/index.ts +++ b/src/api/wms/purchaseMain/index.ts @@ -54,6 +54,22 @@ export const deletePurchaseMain = async (id: number) => { return await request.delete({ url: `/wms/purchase-main/delete?id=` + id }) } +// 关闭采购订单主 +export const closePurchaseMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-main/close?id=` + id }) +} +// 打开采购订单主 +export const openPurchaseMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-main/open?id=` + id }) +} +// 发布采购订单主 +export const publishPurchaseMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-main/publish?id=` + id }) +} +// 下架采购订单主 +export const witPurchaseMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-main/wit?id=` + id }) +} // 导出采购订单主 Excel export const exportPurchaseMain = async (params) => { return await request.download({ url: `/wms/purchase-main/export-excel`, params }) @@ -62,4 +78,4 @@ export const exportPurchaseMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchase-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts index 03e16f972..df18a82d6 100644 --- a/src/api/wms/purchasePlanMain/index.ts +++ b/src/api/wms/purchasePlanMain/index.ts @@ -49,6 +49,33 @@ export const deletePurchasePlanMain = async (id: number) => { return await request.delete({ url: `/wms/purchase-plan-main/delete?id=` + id }) } +// 关闭要货计划主 +export const closePurchasePlanMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-plan-main/close?id=` + id }) +} +// 打开要货计划主 +export const openPurchasePlanMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-plan-main/open?id=` + id }) +} +// 发布要货计划主 +export const publishPurchasePlanMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-plan-main/publish?id=` + id }) +} +// 下架要货计划主 +export const witPurchasePlanMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-plan-main/wit?id=` + id }) +} + +// 接受要货计划主 +export const accPurchasePlanMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-plan-main/acc?id=` + id }) +} + +// 驳回要货计划主 +export const rejPurchasePlanMain = async (id: number) => { + return await request.post({ url: `/wms/purchase-plan-main/rej?id=` + id }) +} + // 导出要货计划主 Excel export const exportPurchasePlanMain = async (params) => { return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params }) @@ -57,4 +84,4 @@ export const exportPurchasePlanMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchase-plan-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 21f0712bf..501f83388 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -4,29 +4,16 @@ - - + + - + }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" + v-model:sort="tableObject.sort"> diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 05b0cf519..da26c53c4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -4,29 +4,17 @@ - - + + -
+ }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" + v-model:sort="tableObject.sort"> diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index e6e26b3f0..9d55ccfc5 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -90,7 +90,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ label: '状态', field: 'status', sort: 'custom', - dictType: DICT_TYPE.PURCHASE_PLAN_STATUS, + dictType: DICT_TYPE.PURCHASE_PLAN_STATUS , dictClass: 'string', isTable: true, isSearch: true, @@ -98,7 +98,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ width: 150 }, form: { - value: 'PLAN_PURCHASE_READY', + value: '1', componentProps: { disabled: true } @@ -107,46 +107,18 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ { label: '开始时间', field: 'beginTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, isForm: false, }, { label: '结束时间', field: 'endTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, isForm: false, }, @@ -554,4 +526,4 @@ export const PurchasePlanDetailRules = reactive({ planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' } ], -}) \ No newline at end of file +})