From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/pages/SetProvinceTarget.page | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index 12baa03..85fbdc4 100644
--- a/force-app/main/default/pages/SetProvinceTarget.page
+++ b/force-app/main/default/pages/SetProvinceTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鍚勭渷鐩爣璁惧畾</title>
@@ -43,6 +43,12 @@
}
function calc() {
+ debugger;
+ // 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');
var datarows = tbl.rows.length;
@@ -51,14 +57,20 @@
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+1;
+ var x=j;
+ if(JianDangfalg3=='true'){
+ x=j+1;
+ }
var raw = j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + i + ':amountRepeat:' + x + ':inAmountValue')).value();
raw = (raw + '').replace(/[^0-9+\-Ee.]/g, '');
@@ -72,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]));
}
// 绶忚▓
@@ -254,7 +266,7 @@
<tr>
<td width="15%"></td>
<td align="center">
- <apex:commandButton value="淇濆瓨" rerender="dummy" onclick="saveJs();return false;" rendered="{!Not(isPast) && loginUser.ProfileId == $Label.ProfileId_SystemAdmin}"/>
+ <apex:commandButton value="淇濆瓨" rerender="dummy" onclick="saveJs();return false;" rendered="{!Not(isPast) && (loginUser.ProfileId == $Label.ProfileId_SystemAdmin || JianDangfalg)}"/>
</td>
<td width="15%" align="right"><apex:commandButton action="{!backBtn}" value="杩斿洖" rerender="dummy"/></td>
</tr>
@@ -288,12 +300,15 @@
</thead>
<tbody>
<apex:variable value="{!1}" var="cnt" />
+ <apex:inputHidden id="JianDangfalg" value="{!JianDangfalg}"/>
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" bgcolor="#AAAACC">
<td class="dataCell" ></td>
<td class="dataCell" ></td>
<!-- <td class="dataCell" id="NameHold"></td> -->
<td class="dataCell" style="text-align:center;">鍚堣</td>
- <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <apex:variable value="JianDangfalg" var="JianDangfalg2" rendered="{!IF(JianDangfalg, true, false)}" >
+ <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>
<td class="dataCell" style="text-align:right;" id="totalcol2"></td>
@@ -302,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