From 8c30972d0a0f71c42a90f07993b03c5497c5a7e9 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Mon, 24 Mar 2025 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E8=B4=A6=E7=9B=B8?=
 =?UTF-8?q?=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gl/finalTreatment/reckoning/list/index.js | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/gl/finalTreatment/reckoning/list/index.js b/src/gl/finalTreatment/reckoning/list/index.js
index f7eb87d..4e5d8d4 100644
--- a/src/gl/finalTreatment/reckoning/list/index.js
+++ b/src/gl/finalTreatment/reckoning/list/index.js
@@ -638,24 +638,32 @@ class Reckon extends Component {
 			toast({content: self.state.json['20020RECON-000010'], color: 'warning'});/* 国际化处理： 请先选择核算账簿*/
 			return false;
 		}
+		let temp="";
 		if (pk_accountingbook.value == "" || pk_accountingbook.value == undefined) {
-			toast({content: self.state.json['20020RECON-000038'], color: 'warning'});/* 国际化处理： 请先选择会计科目*/
-			return false;
+			temp=""
+		}else{
+			temp=pk_accountingbook.value;
 		}
 		let url = '/nccloud/gl/accountrep/accountbalancetotal.do';
 		// let pk_accpont = {"pk_accountingbook":accountingbook.value};
 		let enddate = this.getMonthDays(periodData.presentYear, periodData.presentMonth)
 		let pk_accpont = {
 			"pk_accountingbook": [accountingbook.value],
-			"pk_accasoa": [pk_accountingbook.value],
+			"pk_accasoa": [temp],
 			// "pk_accountingbook":["1001A110000000001PFH"],
 			// "pk_accasoa": ["1001A1100000000017L8"],
-			"startyear": periodData.presentYear,
-			"endyear": periodData.presentYear,
-			"startperiod": periodData.presentMonth,
-			"endperiod": periodData.presentMonth,
-			"startdate": periodData.presentYear + '-' + periodData.presentMonth + "-01",
-			"enddate": periodData.presentYear + '-' + periodData.presentMonth + '-' + enddate
+			"startyear": "2024",
+			"endyear": "2024",
+			"startperiod": "01",
+			"endperiod":"10",
+			"startdate": "2024-01-01",
+			"enddate":"2024-10-31"
+			// "startyear": periodData.presentYear,
+			// "endyear": periodData.presentYear,
+			// "startperiod": periodData.presentMonth,
+			// "endperiod": periodData.presentMonth,
+			// "startdate": periodData.presentYear + '-' + periodData.presentMonth + "-01",
+			// "enddate": periodData.presentYear + '-' + periodData.presentMonth + '-' + enddate
 		}
 		ajax({
 			url: url,
@@ -665,16 +673,16 @@ class Reckon extends Component {
 				//渲染已有账表数据遮罩
 				if (success) {
 					if (response.data) {
-						data.forEach((item, i) => {
-							if (i != 0) {
-								if (data[i - 1].pacccode == item.pacccode) {
-									item.paccname = ''
-								}
-								if (data[i - 1].acccode == item.acccode) {
-									item.accname = ''
-								}
-							}
-						})
+						// data.forEach((item, i) => {
+						// 	if (i != 0) {
+						// 		if (data[i - 1].pacccode == item.pacccode) {
+						// 			item.paccname = ''
+						// 		}
+						// 		if (data[i - 1].acccode == item.acccode) {
+						// 			item.accname = ''
+						// 		}
+						// 	}
+						// })
 						reportData = data
 						reportData.unshift({
 							pacccode: "会计科目编码", //总账余额表-会计科目编码