src/gl/finalTreatment/reckoning/list/index.js

@@ -638,26 +638,18 @@ 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) {
-			temp=""
+			toast({content: self.state.json['20020RECON-000038'], color: 'warning'});/* 国际化处理： 请先选择会计科目*/
-		}else{
+			return false;
-			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": [temp],
+			"pk_accasoa": [pk_accountingbook.value],
 			// "pk_accountingbook":["1001A110000000001PFH"],
 			// "pk_accasoa": ["1001A1100000000017L8"],
-			// "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,
@@ -673,16 +665,16 @@ class Reckon extends Component {
 				//渲染已有账表数据遮罩
 				if (success) {
 					if (response.data) {
-						// data.forEach((item, i) => {
+						data.forEach((item, i) => {
-						// 	if (i != 0) {
+							if (i != 0) {
-						// 		if (data[i - 1].pacccode == item.pacccode) {
+								if (data[i - 1].pacccode == item.pacccode) {
-						// 			item.paccname = ''
+									item.paccname = ''
-						// 		}
+								}
-						// 		if (data[i - 1].acccode == item.acccode) {
+								if (data[i - 1].acccode == item.acccode) {
-						// 			item.accname = ''
+									item.accname = ''
-						// 		}
+								}
-						// 	}
+							}
-						// })
+						})
 						reportData = data
 						reportData.unshift({
 							pacccode: "会计科目编码", //总账余额表-会计科目编码