OlyMEBG.git - Gitblit

			@@ -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">