From 0f44cb1a0b7b36860e9ce81c1eac9e395d87f0b4 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 13:53:18 +0800
Subject: [PATCH] mergecode into lex dtt
---
force-app/main/default/pages/SetProvinceTarget.page | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index 7518058..85fbdc4 100644
--- a/force-app/main/default/pages/SetProvinceTarget.page
+++ b/force-app/main/default/pages/SetProvinceTarget.page
@@ -44,7 +44,10 @@
function calc() {
debugger;
- var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();
+ // DB202305259561 fy 20230517 start
+ // var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();
+ var JianDangfalg3 = '{!JianDangfalg}';
+ // DB202305259561 fy 20230517 end
// alert('sss= '+s);
var isorgtbl = j$('div[name=bodyTable]');
var tbl = document.getElementById('MainTable');
@@ -54,12 +57,15 @@
datarows -= 2;
}
var allSum = 0;
- var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202305277681 fy 20230517 start
+ // var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ var cols = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202305277681 fy 20230517 end
// 琛�
for (var i = 0; i < datarows; i++) {
var rowSum = 0;
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
var amount = 0;
var x=j;
if(JianDangfalg3=='true'){
@@ -78,7 +84,7 @@
}
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));
}
// 绶忚▓
@@ -301,7 +307,7 @@
<!-- <td class="dataCell" id="NameHold"></td> -->
<td class="dataCell" style="text-align:center;">鍚堣</td>
<apex:variable value="JianDangfalg" var="JianDangfalg2" rendered="{!IF(JianDangfalg, true, false)}" >
- <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <td class="dataCell" style="text-align:right;" id="totalcol9"></td>
</apex:variable>
<td class="dataCell" style="text-align:right;" id="totalcol0"></td>
<td class="dataCell" style="text-align:right;" id="totalcol1"></td>
@@ -311,6 +317,9 @@
<td class="dataCell" style="text-align:right;" id="totalcol5"></td>
<td class="dataCell" style="text-align:right;" id="totalcol6"></td>
<td class="dataCell" style="text-align:right;" id="totalcol7"></td>
+ <!-- DB202305277681 fy 20230517 start -->
+ <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <!-- DB202305277681 fy 20230517 end -->
<td class="dataCell" style="text-align:right;" id="totalAll"></td>
</tr>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
--
Gitblit v1.9.1