From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决

---
 src/api/purchaseManage/purchase.js |  118 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/src/api/purchaseManage/purchase.js b/src/api/purchaseManage/purchase.js
index e5d6a67..37a8b1e 100644
--- a/src/api/purchaseManage/purchase.js
+++ b/src/api/purchaseManage/purchase.js
@@ -49,49 +49,93 @@
     method: "get"
   })
 }
-// 閲囪喘鍗曞垪琛� 
-export const getPurchaseList = async (data) => {
-    return await axios.get(`/api/purchase/purchaseList`, {
-      params: data
-    })
-  }
+// 閲囪喘鍗曞垪琛�
+// export const getPurchaseList = async (data) => {
+//     return await axios.get(`/api/purchase/purchaseList`, {
+//       params: data
+//     })
+//   }
+export function getPurchaseList(data) {
+  return request({
+    url: "/api/purchase/purchaseList",
+    method: "get",
+    params: data
+  })
+}
 // 鍒涘缓閲囪喘鍗�
 export function addPurchase(data) {
-    return request({
-      url: "/api/purchase/purchase",
-      method: "post",
-      data
-    })
-  }
+  return request({
+    url: "/api/purchase/purchase",
+    method: "post",
+    data
+  })
+}
 // 鏇存柊閲囪喘鍗�
 export function updatePurchase(data) {
-    return request({
-      url: "/api/purchase/purchase",
-      method: "put",
-      data
-    })
-  }
+  return request({
+    url: "/api/purchase/purchase",
+    method: "put",
+    data
+  })
+}
 //   鑾峰彇閲囪喘鍗曚俊鎭�
 export function getPurchaseInfo(data) {
-    return request({
-      url: "/api/purchase/purchase/"+data.id,
-      method: "get",
-      data
-    })
-  }
-  //  鍒犻櫎閲囪喘鍗曚俊鎭�
+  return request({
+    url: "/api/purchase/purchase/" + data.id,
+    method: "get",
+    data
+  })
+}
+//  鍒犻櫎閲囪喘鍗曚俊鎭�
 export function deletePurchase(data) {
-    return request({
-      url: "/api/purchase/purchase/"+data.id,
-      method: "delete",
-      data
-    })
-  }
+  return request({
+    url: "/api/purchase/purchase/" + data.id,
+    method: "delete",
+    data
+  })
+}
 //   鎻愪氦閲囪喘鍗�
 export function submitPurchase(data) {
-    return request({
-      url: "/api/purchase/submit/"+data.id,
-      method: "post",
-      data
-    })
-  }
+  return request({
+    url: "/api/purchase/submit",
+    method: "post",
+    data
+  })
+}
+// 鏂板缓閲囪喘绫诲瀷
+export function savePurchaseType(data) {
+  return request({
+    url: "/api/purchase/purchaseType",
+    method: "post",
+    data
+  })
+}
+// 鑾峰彇閲囪喘绫诲瀷
+export function getPurchaseType(data) {
+  return request({
+    url: "/api/purchase/purchaseTypeList",
+    method: "get",
+    data
+  })
+}
+// 璐ㄦ鍒楄〃
+export const qualityInspectList = async (data) => {
+  return await axios.get(`/api/purchase/qualityInspectList`, {
+    params: data
+  })
+}
+//   鑾峰彇浠撳簱鍒楄〃
+export function getWarehouseInfo() {
+  return request({
+    url: "/api/purchase/getWarehouseInfo/",
+    method: "get"
+  })
+}
+//   鑾峰彇浜у搧/鏀惰揣淇℃伅
+export function getOperationInfo(data) {
+  return request({
+    url: "/api/purchase/getOperationInfo/" + data.id,
+    method: "get",
+    data
+  })
+}

--
Gitblit v1.8.0