diff --git a/src/api/wms/customerreceiptRequestMain/index.ts b/src/api/wms/customerreceiptRequestMain/index.ts
index 715c940fa..71944e655 100644
--- a/src/api/wms/customerreceiptRequestMain/index.ts
+++ b/src/api/wms/customerreceiptRequestMain/index.ts
@@ -65,9 +65,4 @@ export const deleteCustomerreceiptRequestMain = async (id: number) => {
// 导出客户收货申请主 Excel
export const exportCustomerreceiptRequestMain = async (params) => {
return await request.download({ url: `/wms/customerreceipt-request-main/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
- return request.download({ url: '/wms/customerreceipt-request-main/get-import-template' })
}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnJobMain/index.ts b/src/api/wms/customerreturnJobMain/index.ts
index 1450c8c8d..7151aea2d 100644
--- a/src/api/wms/customerreturnJobMain/index.ts
+++ b/src/api/wms/customerreturnJobMain/index.ts
@@ -81,10 +81,35 @@ export const deleteCustomerreturnJobMain = async (id: number) => {
// 导出客户退货任务主 Excel
export const exportCustomerreturnJobMain = async (params) => {
- return await request.download({ url: `/wms/customerreturn-job-main/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/customerreturn-job-main/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/customerreturn-job-main/export-excel`, params })
+ }
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/customerreturn-job-main/get-import-template' })
+}
+
+// 承接客户退货任务主 Excel
+export const submitCustomerreturnJobMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-job-main/accept?id=` + id })
+}
+
+// 取消承接客户退货任务主 Excel
+export const agreeCustomerreturnJobMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-job-main/abandon?id=` + id })
+}
+
+// 取消客户退货任务主 Excel
+export const refusedCustomerreturnJobMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-job-main/close?id=` + id })
+}
+
+// 执行客户退货任务主
+export const executeCustomerreturnJobMain = async (data: CustomerreturnJobMainVO) => {
+ return await request.put({ url: `/wms/customerreturn-job-main/execute`, data })
}
\ No newline at end of file
diff --git a/src/api/wms/customerreturnRequestMain/index.ts b/src/api/wms/customerreturnRequestMain/index.ts
index 5aefdd71f..89c850dca 100644
--- a/src/api/wms/customerreturnRequestMain/index.ts
+++ b/src/api/wms/customerreturnRequestMain/index.ts
@@ -66,10 +66,45 @@ export const deleteCustomerreturnRequestMain = async (id: number) => {
// 导出客户退货申请主 Excel
export const exportCustomerreturnRequestMain = async (params) => {
- return await request.download({ url: `/wms/customerreturn-request-main/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/customerreturn-request-main/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/customerreturn-request-main/export-excel`, params })
+ }
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/customerreturn-request-main/get-import-template' })
+}
+
+// 关闭客户退货申请主 Excel
+export const closeProductreceiptRequestMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-request-main/close?id=` + id })
+}
+
+// 重新添加客户退货申请主 Excel
+export const reAddProductreceiptRequestMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-request-main/reAdd?id=` + id })
+}
+
+// 提交客户退货申请主 Excel
+export const submitProductreceiptRequestMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-request-main/submit?id=` + id })
+}
+
+// 审批通过客户退货申请主 Excel
+export const agreeProductreceiptRequestMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-request-main/agree?id=` + id })
+}
+
+// 审批驳回客户退货申请主 Excel
+export const refusedProductreceiptRequestMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-request-main/refused?id=` + id })
+}
+
+// 处理驳回客户退货申请主 Excel
+export const handleProductreceiptRequestMain = async (id) => {
+ return await request.put({ url: `/wms/customerreturn-request-main/handle?id=` + id })
}
\ No newline at end of file
diff --git a/src/api/wms/deliverJobMain/index.ts b/src/api/wms/deliverJobMain/index.ts
index 207757248..04d2f938c 100644
--- a/src/api/wms/deliverJobMain/index.ts
+++ b/src/api/wms/deliverJobMain/index.ts
@@ -82,10 +82,34 @@ export const deleteDeliverJobMain = async (id: number) => {
// 导出发货任务主 Excel
export const exportDeliverJobMain = async (params) => {
- return await request.download({ url: `/wms/deliver-job-main/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/deliver-job-main/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/deliver-job-main/export-excel`, params }) }
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/deliver-job-main/get-import-template' })
+}
+
+// 承接客户退货任务主 Excel
+export const submitDeliverJobMain = async (id) => {
+ return await request.put({ url: `/wms/deliver-job-main/accept?id=` + id })
+}
+
+// 取消承接客户退货任务主 Excel
+export const agreeDeliverJobMain = async (id) => {
+ return await request.put({ url: `/wms/deliver-job-main/abandon?id=` + id })
+}
+
+// 取消客户退货任务主 Excel
+export const refusedDeliverJobMain = async (id) => {
+ return await request.put({ url: `/wms/deliver-job-main/close?id=` + id })
+}
+
+// 执行客户退货任务主
+export const executeDeliverJobMain = async (data: DeliverJobMainVO) => {
+ return await request.put({ url: `/wms/deliver-job-main/execute`, data })
}
\ No newline at end of file
diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts
index 04021ab44..ea2a7993f 100644
--- a/src/api/wms/deliverPlanMain/index.ts
+++ b/src/api/wms/deliverPlanMain/index.ts
@@ -73,8 +73,8 @@ export const open = (id) => {
}
// 驳回
-export const refies = (id) => {
- return request.put({ url: '/wms/deliver-plan-main/refies?id=' + id })
+export const reject = (id) => {
+ return request.put({ url: '/wms/deliver-plan-main/reject?id=' + id })
}
// 通过
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index aa73585b1..9c3a59af3 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -72,10 +72,7 @@
:Echo="Echo"
/>
-
-
-
+