From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/api/cnas/process/sampleDisposal.js |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/api/cnas/process/sampleDisposal.js b/src/api/cnas/process/sampleDisposal.js
index 9eef314..68c22a8 100644
--- a/src/api/cnas/process/sampleDisposal.js
+++ b/src/api/cnas/process/sampleDisposal.js
@@ -1,6 +1,6 @@
-// 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�
 import request from "@/utils/request";
 
+// 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�
 // 淇敼
 export function doProcessDeal(data) {
   return request({
@@ -10,7 +10,7 @@
   });
 }
 
-// 鏂板
+// 鏂板璇︽儏
 export function addProcessDeal(data) {
   return request({
     url: "/processDeal/addProcessDeal",
@@ -27,11 +27,19 @@
     data: data,
   });
 }
+// 鎻愪氦鍘嗗彶  浼犲弬id
+export function addProcessTotaldeal(data) {
+  return request({
+    url: "/processTotaldeal/addProcessTotaldeal",
+    method: "post",
+    data: data,
+  });
+}
 
 //鏌ヨ璇︽儏  鍒嗛〉鏌ヨ閲岄潰totaldealId  浼犲弬鍘嗗彶鐨刬d
-export function pageProcessDeal(query) {
+export function getProcessDeal(query) {
   return request({
-    url: "/processDeal/pageProcessDeal",
+    url: "/processDeal/getProcessDeal",
     method: "get",
     params: query,
   });
@@ -63,3 +71,56 @@
     params: query,
   });
 }
+
+//鏌ョ湅鍘嗗彶
+export function pageProcessTotaldeal(query) {
+  return request({
+    url: "/processTotaldeal/pageProcessTotaldeal",
+    method: "get",
+    params: query,
+  });
+}
+
+//鏍峰搧澶勭悊瀵煎嚭
+export function exportProcessTotaldeal(query) {
+  return request({
+    url: "/processTotaldeal/exportProcessTotaldeal",
+    method: "get",
+    responseType: "blob",
+    params: query,
+  });
+}
+
+// 鏍峰搧鎺ユ敹-鍒嗛〉鏌ヨ
+export function pageProcessSample(query) {
+  return request({
+    url: "/processSample/pageProcessSample",
+    method: "get",
+    params: query,
+  });
+}
+// 鏍峰搧鎺ユ敹-鏂板/淇敼
+export function addProcessSample(query) {
+  return request({
+    url: "/processSample/addProcessSample",
+    method: "post",
+    data: query,
+  });
+}
+// 鏍峰搧鎺ユ敹-鍒犻櫎
+export function delProcessSample(query) {
+  return request({
+    url: "/processSample/delProcessSample",
+    method: "delete",
+    params: query,
+  });
+}
+// 鏍峰搧鎺ユ敹-瀵煎嚭
+export function exportProcessSample(query) {
+  return request({
+    url: "/processSample/exportProcessSample",
+    method: "get",
+    responseType: "blob",
+    params: query,
+  });
+}

--
Gitblit v1.9.3