From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 06 八月 2025 10:15:12 +0800
Subject: [PATCH] :测试提交“
---
api/system/report.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/api/system/report.js b/api/system/report.js
index 564be95..5540129 100644
--- a/api/system/report.js
+++ b/api/system/report.js
@@ -34,17 +34,42 @@
}
// 鏌ヨ浜插弸浣撴鎶ュ憡鍒楄〃
+<<<<<<< HEAD
+export function getRelativeReportList(data) {
+ return request({
+ url: `/api/getCusInfo`,
+ method: 'post',
+=======
export function getRelativeReportList(cusName, cusIdcard) {
return request({
url: `/cus/getReport/getRelativeReportList?cusName=${cusName}&cusIdcard=${cusIdcard}`,
method: 'get',
+>>>>>>> master
/* params:{
cusName:search.cusName,
cusIdcard:search.cusIdcard
} */
+<<<<<<< HEAD
+ data: data
+ })
+}
+// export function PDF(tjNum) {
+// return request({
+// url: `/api/viewReport`,
+// method: 'post',
+// /* params:{
+// cusName:search.cusName,
+// cusIdcard:search.cusIdcard
+// } */
+// data: tjNum,
+// responseType: 'arraybuffer'
+// })
+// }
+=======
})
}
+>>>>>>> master
// 鏌ヨ浣撴鎶ュ憡瀛樺偍璇︾粏
export function getReportByTjNumber(tjNumber) {
return request({
@@ -56,7 +81,20 @@
})
}
+<<<<<<< HEAD
+// 鏌ヨ鍩虹鏁版嵁
+export function getShenGaoTiZhong1(tjNumber) {
+ return request({
+ url: '/api/getShenGaoTiZhong',
+ method: 'get',
+ params: {
+ tjNumber: tjNumber
+ }
+ })
+}
+=======
+>>>>>>> master
// 鏌ヨ鍩虹鏁版嵁
export function getShenGaoTiZhong(tjNumber) {
return request({
@@ -89,6 +127,23 @@
}
})
}
+<<<<<<< HEAD
+export function PDF(tjNum) {
+ return request({
+ url: `/api/viewReportUrl`,
+ method: 'post',
+ data: tjNum,
+ })
+}
+// 鏌ヨ浣撴鎶ュ憡瀛樺偍璇︾粏
+export function getreportData(data) {
+ return request({
+ url: '/api/reportData',
+ method: 'post',
+ data:data
+ })
+}
+=======
// 涓嬭浇
// export function downloadReport(tjNumber) {
@@ -99,4 +154,5 @@
// tjNumber: tjNumber
// }
// })
-// }
\ No newline at end of file
+// }
+>>>>>>> master
--
Gitblit v1.8.0