From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/api/plan/customerorder.js | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index 3c851b7..2dc7524 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -8,6 +8,13 @@
})
}
+export function getCustomerMainAndOrderBycNo(contractNo) {
+ return request({
+ url: '/mes/plan/customerOrder/getCustomerMainAndOrderBycNo/' + contractNo,
+ method: 'get',
+ })
+}
+
export function addCustomerOrder(obj) {
return request({
url: '/mes/plan/customerOrder',
@@ -257,6 +264,15 @@
})
}
+export function downloadProduct(data){
+ return request({
+ url: '/mes/plan/customerOrder/getProduct',
+ method: 'post',
+ responseType: 'blob',
+ data: data
+ })
+}
+
export function downloadProcessConfigFile(filename, bucket, originalFileName) {
return request({
url: '/mes/plan/customerOrder/processConfig/' + bucket + '/' + filename,
@@ -401,20 +417,8 @@
return request({
url: '/mes/plan/customerOrder/package',
method: 'post',
- params: data,
+ data: data,
responseType: 'blob'
- }).then((response) => {
- // 澶勭悊杩斿洖鐨勬枃浠舵祦
- const blob = response.data
- const link = document.createElement('a')
- link.href = URL.createObjectURL(blob)
- link.download = data.originalFileName
- document.body.appendChild(link)
- link.click()
- window.setTimeout(function() {
- URL.revokeObjectURL(blob)
- document.body.removeChild(link)
- }, 0)
})
}
--
Gitblit v1.9.3