From 15791f058aef8363b7bc690f49325e8fa1241287 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期一, 29 五月 2023 16:32:13 +0800
Subject: [PATCH] 目标录入页面修改
---
force-app/main/default/pages/SetPersonalProductTarget.page | 65 +++++++---
force-app/main/default/pages/SetPersonalTarget.page | 141 +++++++++++++++++-----
force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls | 3
force-app/main/default/pages/SetProductTarget.page | 62 +++++++--
force-app/main/default/pages/AccountTargetTab.page | 2
force-app/main/default/pages/SetProvinceTarget.page | 57 +++++++--
force-app/main/default/pages/AccountTargetHospital.page | 14 +-
7 files changed, 252 insertions(+), 92 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls b/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls
index d809cbf..046d92e 100644
--- a/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls
+++ b/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls
@@ -1,7 +1,4 @@
public with sharing class RentalApplyESetRefreshStatusController {
- public RentalApplyESetRefreshStatusController() {
-
- }
@AuraEnabled
public static String eSetRefreshStatus(String raeSetId) {
return eSetRefreshStatusBatch(new List<String> {raeSetId});
diff --git a/force-app/main/default/pages/AccountTargetHospital.page b/force-app/main/default/pages/AccountTargetHospital.page
index 2ac9673..67b93ad 100644
--- a/force-app/main/default/pages/AccountTargetHospital.page
+++ b/force-app/main/default/pages/AccountTargetHospital.page
@@ -37,25 +37,25 @@
<!-- 骞村害姣庛伄銉囥兗銈裤倰琛ㄧず -->
<apex:tabPanel value="{!selectedTab}" tabClass="activeTab" inactiveTabClass="inactiveTab" rendered="{!IF(recordDeveloperName <> 'HP', true, false)}">
<apex:tab label="{!historyList[0].year_c}" name="{!historyList[0].rec.Id}" rendered="{!IF(historyCount > 0, true, false)}" >
- <iframe src="/apex/AccountTargetTab?id={!historyList[0].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[0].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[1].year_c}" name="{!historyList[1].rec.Id}" rendered="{!IF(historyCount > 1, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[1].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[1].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[2].year_c}" name="{!historyList[2].rec.Id}" rendered="{!IF(historyCount > 2, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[2].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[2].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[3].year_c}" name="{!historyList[3].rec.Id}" rendered="{!IF(historyCount > 3, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[3].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[3].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[4].year_c}" name="{!historyList[4].rec.Id}" rendered="{!IF(historyCount > 4, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[4].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[4].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[5].year_c}" name="{!historyList[5].rec.Id}" rendered="{!IF(historyCount > 5, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[5].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[5].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label=" + " name="new">
- <iframe src="/apex/AccountTargetTab?id=&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id=&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
</apex:tabPanel>
</apex:form>
diff --git a/force-app/main/default/pages/AccountTargetTab.page b/force-app/main/default/pages/AccountTargetTab.page
index 8fdd432..3e3369f 100644
--- a/force-app/main/default/pages/AccountTargetTab.page
+++ b/force-app/main/default/pages/AccountTargetTab.page
@@ -36,7 +36,7 @@
</script>
<apex:form id="Form">
- <div style="height: 265px; overflow-y: auto;">
+ <div style="height: 250px;overflow-y: scroll;">
<apex:pageMessages />
<apex:outputPanel layout="none" rendered="{!NOT(ISNULL(history))}">
diff --git a/force-app/main/default/pages/SetPersonalProductTarget.page b/force-app/main/default/pages/SetPersonalProductTarget.page
index 9d8b487..24ecf1a 100644
--- a/force-app/main/default/pages/SetPersonalProductTarget.page
+++ b/force-app/main/default/pages/SetPersonalProductTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="allPage" showHeader="false" sidebar="false" Controller="SetPersonalProductTargetController" action="{!init}">
+<apex:page id="allPage" showHeader="false" sidebar="false" Controller="SetPersonalProductTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鎷呭綋鑰呴噸鐐逛骇鍝佺洰鏍囪瀹�</title>
<!-- 2018骞�7鏈�25鏃� SWAG-B2Z344 by 寮犵帀灞�
@@ -8,6 +8,34 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<style type="text/css">
+
+
+
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+
+
+ #crossTable th ,#topTable th, #topTable ,#bodyTable{
+ border-right: 1px solid #c9c9c9;
+ }
+
+ #leftTable , #crossTable {
+ border-left: 1px solid #c9c9c9;
+ }
+
+ #leftTable,#bodyTable {
+ border-bottom: 1px solid #c9c9c9;
+ }
+
+
+
.StandLeft{
}
@@ -139,7 +167,7 @@
// 2018骞�7鏈�6鏃� SWAG-AZHBH7 娣诲姞UpdateJs 璋冪敤Apex 涓璘pdate鍑芥暟 by 寮犵帀灞�
function UpdateJs() {
blockme_dark();
- if (window.confirm('纭畾瑕佸弽搴斿埌鐩爣鍚楋紵')) {
+ if (window.confirm('纭畾瑕佸弽鏄犲埌鐩爣鍚楋紵')) {
Update();
} else {
unblockUI();
@@ -244,7 +272,7 @@
}
//CHAN-BDQBLX 20210129 ljh end
/*****************************/
-var heightAjustment = 160;
+var heightAjustment = 180;
var widthAjustment = 15;
function windowResize() {
blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:headBlock')).height() - j$('div#MessageBlock').height() - heightAjustment;
@@ -394,7 +422,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; " />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -416,32 +444,32 @@
<table id="ButtonTable" border="0" >
<tr>
<td>
- 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
- 鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:90px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
+ 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
+ 鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:90px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
<script type="text/javascript">
var isadmin = {!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)};
if (!isadmin) {
j$(escapeVfId('allPage:allForm:headBlock:province')).attr("disabled",true);
}
</script>
- 鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.Job_Category__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
+ 鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.Job_Category__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!userJobCategorys}"/>
- </apex:selectList>
- {!$ObjectType.User.fields.Consumable_sales__c.Label} <apex:inputField value="{!loginUser.Consumable_sales__c}" style="width:80px;" onchange="searchByFilterJs();return false;"></apex:inputField>
- 浜у搧鎷呭綋
+ </apex:selectList>
+ {!$ObjectType.User.fields.Consumable_sales__c.Label} <apex:inputField value="{!loginUser.Consumable_sales__c}" style="width:80px;" onchange="searchByFilterJs();return false;"></apex:inputField>
+ 浜у搧鎷呭綋
<apex:selectList value="{!productUser}" size="1" style="width:100px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!productUserOptions}"/>
- </apex:selectList>
- <!-- xiongyl閲嶇偣浜у搧
+ </apex:selectList>
+ <!-- xiongyl閲嶇偣浜у搧
<apex:selectList value="{!opp.Important_Key_product_category__c}" id="impKey" size="1" style="width:280px;" onchange="searchByImpKeyJs();return false;">
<apex:selectOptions value="{!impProductOptions}"/>
- </apex:selectList> !-->
- <apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="searchByFilterJs(); false;"/><apex:outputLabel value="缁忕悊浠ヤ笅" for="checkAll"/>
+ </apex:selectList> !-->
+ <apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="searchByFilterJs(); false;"/><apex:outputLabel value="缁忕悊浠ヤ笅" for="checkAll"/>
<input type="hidden" id="targetCategory" value="{!target_category}"/>
<input type="hidden" id="titileSize" value="{titileSize}"/>
</td>
<td align="right" width="10%">
- <apex:commandButton value="鍙嶅簲鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs();return false;" rendered="{!Not(isPast)}"/>
+ <apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs();return false;" rendered="{!Not(isPast)}"/>
</td>
<!--CHAN-BDQBLX 20210129 ljh start -->
<td>
@@ -511,7 +539,7 @@
</table>
</div>
<div id="out_Div">
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="topTable">
+ <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;width:100%;" border="0" cellspacing="0" cellpadding="0" id="topTable">
<thead>
<tr class="headerRow" id="header_R">
<apex:repeat value="{!opportunity_category}" var="oc" id="opportunityCategoryRepeat_R_2">
@@ -536,8 +564,9 @@
</tbody>
</table>
</div>
+ <div style="clear:both;height:0px;"></div>
<div id="in_Div_L" >
- <table class="list" style="border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="leftTable">
+ <table class="list" style="table-layout:fixed;" cellspacing="0" cellpadding="0" id="leftTable">
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat_L">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" id="dataRow_L">
@@ -557,7 +586,7 @@
</div>
<div id="in_Div">
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="bodyTable">
+ <table class="list" style="border-collapse: collapse;table-layout:fixed;" cellspacing="0" cellpadding="0" id="bodyTable">
<tbody>
</tbody>
diff --git a/force-app/main/default/pages/SetPersonalTarget.page b/force-app/main/default/pages/SetPersonalTarget.page
index 54c94d3..d43ad4a 100644
--- a/force-app/main/default/pages/SetPersonalTarget.page
+++ b/force-app/main/default/pages/SetPersonalTarget.page
@@ -1,11 +1,34 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetPersonalTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetPersonalTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>閮ㄩ棬鎷呭綋鑰呯洰鏍囪瀹氾紙鍖婚櫌鎷呭綋锛�</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<!-- <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/> -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/>
+<!-- <apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/> -->
+<style>
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ #Page\:Form\:editBlock > div.pbBody {
+ height: 420px;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+
+
+ #MainTable th {
+ border-right: 1px solid #c9c9c9;
+ }
+ #MainTable {
+ border: 1px solid #c9c9c9;
+ }
+</style>
<script type="text/javascript">
//CHAN-BDQBLX 20210125 you start
@@ -77,12 +100,15 @@
datarows -= 2;
}
var allSum = 0;
- var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202303443108 20230407 you start 澧炲姞涓�涓�0
+ var cols = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202303443108 20230407 you start
// 琛�
for (var i = 0; i < datarows; i++) {
var rowSum = 0;
// 鍒�
- for (var j = 0; j < 8; j++) {
+ //DB202303443108 20230407 you start 8鏀规垚9 鍥犱负鍙樻垚浜�9鍒�
+ for (var j = 0; j < 9; j++) {
var amount = 0;
var raw = j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + i + ':amountRepeat:' + j + ':inAmountValue')).value();
@@ -96,7 +122,7 @@
j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + i + ':totalrow')).text(toNumComma(rowSum));
}
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));
}
// 绶忚▓
@@ -155,6 +181,15 @@
} else {
prev(false);
}
+}
+function checkOwner(val, id, rownum) {
+ // changeFlg銈汇儍銉�
+ j$(escapeVfId('Page:Form:dataBlock:changeFlg')).val(1);
+ var ids = id.split(":");
+ var isChangedid = ids[0] + ":" + ids[1] + ":" + ids[2] + ":" + ids[3] + ":" + ids[4] + ":isChanged";
+ console.log('zheli:'+isChangedid);
+ j$(escapeVfId(isChangedid)).val("1");
+ j$(escapeVfId(id))[0].style.background="#FFFF33";
}
function searchByDptJs() {
@@ -259,7 +294,7 @@
<apex:outputPanel id="MessageP">
<apex:pagemessages />
</apex:outputPanel>
-<font style="font-size:15px;font-weight:700;">褰曞叆鎷呭綋鑰呭悇鑷殑鐩爣 锛堟敞锛氳杈撳叆鍚◣閲戦锛�</font>
+<font style="font-size:15px;font-weight:700;">褰曞叆鎷呭綋鑰呭悇鑷殑鐩爣 锛堟敞锛氳杈撳叆鍚◣閲戦锛�</font>
<!--CHAN-BDQBLX 20210125 you start -->
<apex:actionFunction name="exportcsv" action="{!exportBycsv}"/>
<apex:actionFunction name="passToController" action="{!importCSVFile}" rerender="Form, MessageP" oncomplete="unblockUI();">
@@ -290,7 +325,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%;"/>
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -301,13 +336,16 @@
<table id="ConditionTable" border="0" width="100%">
<tr>
<!-- <apex:outputPanel rendered="{!loginUser.ProfileId == $Label.ProfileId_SystemAdmin}" layout="none"> -->
- <td width="170">鏈儴 <apex:selectList id="accTypeOptsId" value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103 || loginUser.ProfileId == $Label.ProfileId_2s6dashboard )}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}" />
- <!--<apex:inputHidden id="salesDptOpts1" value="{!salesDptOpts}" />-->
+ <!--DB202303443108 20230410 you start-->
+ <td width="170">鏈儴 <apex:selectList id="accTypeOptsId" value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103 || loginUser.ProfileId == $Label.ProfileId_2s6dashboard )}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}" />
+
+ <!--<apex:inputHidden id="salesDptOpts1" value="{!salesDptOpts}" />-->
</apex:selectList>
</td>
- <!-- </apex:outputPanel> -->
- <td width="179">鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:140px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
+ <!--DB202303443108 20230410 you end -->
+
+ <td width="179">鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:140px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
<script type="text/javascript">
var isadmin = {!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103 || loginUser.ProfileId == $Label.ProfileId_2s6dashboard)};
if (!isadmin) {
@@ -315,19 +353,21 @@
}
</script>
</td>
- <td width="300">
- 鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.Job_Category__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
+ <td width="350">
+ <!--DB202303443108 20230407 you start-->
+ SFDC鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.SFDCPosition_C__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!userJobCategorys}"/>
- </apex:selectList>
- 鍖婚櫌鎷呭綋
+ </apex:selectList>
+ <!--DB202303443108 20230407 you end-->
+ 鍖婚櫌鎷呭綋
<apex:selectList value="{!productUser}" id="productUserid" size="1" style="width:100px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!productUserOptions}"/>
- </apex:selectList>
+ </apex:selectList>
</td>
- <td width="60"><apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="checkAll(this);return false;"/><apex:outputLabel value="鍏ㄩ��" for="checkAll"/></td>
+ <td width="60"><apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="checkAll(this);return false;" selected="true"/><apex:outputLabel value="鍏ㄩ��" for="checkAll"/></td>
<td>
<apex:repeat value="{!plist}" var="p" id="postRepeat">
- <apex:inputCheckBox value="{!p.check}" id="post" onchange="searchByFilterJs();return false;"/><apex:outputLabel value="{!p.positionName}" for="post"/>
+ <apex:inputCheckBox value="{!p.check}" id="post" onchange="searchByFilterJs();return false;"/><apex:outputLabel value="{!p.positionName}" for="post"/>
</apex:repeat>
</td>
<!-- 20220613 WLIG-CER9NQ you 椤甸潰涓嬁鎺夋敼鎴恇atch鎵ц
@@ -337,11 +377,11 @@
</td>
-->
<!--CHAN-BDQBLX 20210125 you start -->
- <td width="80">
+ <td width="108">
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘">
</apex:commandbutton>
</td>
- <td width="40">
+ <td width="60">
<apex:commandButton onclick="openPopupCSV(); return false;" value="瀵煎叆" rerender="Form"/>
</td>
<!--CHAN-BDQBLX 20210125 you end -->
@@ -373,21 +413,25 @@
<!-- 銉愩儍銈伌銇儜銉┿儭銉笺偪銈掑銈勩仐銇熴亸銇亜銇熴倎銆侊紤銇仾銈屻仾銇勩儜銉┿儭銉笺偪銈掑叆銈屻伨銇� -->
<!-- 銇撱亾銇�ゃ伅锛戙亱銇┿亞銇嬨伄鍒ゆ柇銇伩銇т娇銇勩伨銇� -->
<apex:inputHidden id="changeFlg" value="{!saveFlg}"/>
- <table class="list" style="border-bottom-width: 0px;" border="0" cellspacing="0" cellpadding="0" id="MainTable">
+ <table class="list" style="width:100%;" cellspacing="0" cellpadding="0" id="MainTable">
<thead>
<tr class="headerRow">
- <th width="70px" class="headerRow booleanColumn">鏈儴</th>
- <th width="70px" class="headerRow booleanColumn">鐪�</th>
- <th class="headerRow booleanColumn">瑙掕壊</th>
- <th width="70px" class="headerRow booleanColumn">鎷呭綋</th>
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鏈儴</th>
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鐪�</th>
+ <!--<th class="headerRow booleanColumn">瑙掕壊</th>-->
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鎷呭綋</th>
<th width="70px" class="headerRow booleanColumn">HR閫氱敤鑱岀骇</th> <!-- 20220517 lt SWAG-CD28H3 Update -->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堜富锛�</th>
<!--wangweipeng 20210615-->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堝吋锛�</th>
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鐩爣绫诲瀷</th>
<apex:repeat value="{!opportunity_category}" var="oc" id="opportunityCategoryRepeat">
<th width="75px" class="headerRow booleanColumn"><apex:outputText id="categoryValue" value="{!oc}"></apex:outputText></th>
</apex:repeat>
<th width="85" class="headerRow booleanColumn" style="background-color:#AAAACC;">鍚堣</th>
+ <!-- 20230510 ljh start -->
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">澶囨敞</th>
+ <!-- 20230510 ljh end -->
</tr>
</thead>
<tbody>
@@ -395,10 +439,11 @@
<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"></td>
+ <!--鏆傛椂闅愯棌<td class="dataCell"></td>-->
<td class="dataCell"></td>
<td class="dataCell"></td>
<!--wangweipeng 20210615-->
+ <td class="dataCell"></td>
<td class="dataCell"></td>
<td class="dataCell" style="text-align:center;">鍚堣</td>
<td class="dataCell" style="text-align:right;" id="totalcol0"></td>
@@ -409,22 +454,38 @@
<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>
+ <!--DB202303443108 20230407 you start-->
+ <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <!--DB202303443108 20230407 you end-->
<td class="dataCell" style="text-align:right;" id="totalAll"></td>
+ <!-- 20230510 ljh start -->
+ <td class="dataCell" style="text-align:right;" id="totalcol9"></td>
+ <!-- 20230510 ljh end -->
</tr>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}">
- <td class="dataCell">{!dbs.user.Salesdepartment__c}</td>
+ <td class="dataCell">{!dbs.user.Salesdepartment__c}<!--{!dbs.user.Dept__c}--></td>
<td class="dataCell">{!dbs.user.Province__c}</td>
- <td class="dataCell">{!dbs.user.UserRole.Name}</td>
+ <!--鏆傛椂闅愯棌<td class="dataCell">{!dbs.user.UserRole.Name}</td>-->
<td class="dataCell">{!dbs.user.Alias}</td>
<td class="dataCell">{!dbs.user.HR_Post__c}</td> <!-- 20220517 lt SWAG-CD28H3 Update -->
- <td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}</td>
+ <td class="dataCell" style="word-wrap:break-word;">{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}</td>
<!--wangweipeng 20210615-->
- <td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}</td>
+ <td class="dataCell" style="word-wrap:break-word;">{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}</td>
+ <td class="dataCell"> <apex:inputField id="inTargetType" value="{!dbs.opportunity.TargetType__c}" style="width:100%;text-align:left;" onchange="checkOwner(this.value, this.id, {!cnt});"></apex:inputField>
+ <script type="text/javascript">
+ var ispast = {!isPast};
+ if (ispast) {
+ j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + {!cnt-1} + ':inTargetType')).attr("disabled",true);
+ }
+ //j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + {!cnt-1} + ':inTargetType')).val('涓汉');
+ </script>
+ </td>
+
<apex:variable value="{!1}" var="cnt2" />
<apex:repeat value="{!dbs.amount}" var="amount" id="amountRepeat">
<td class="dataCell" style="text-align:right;">
- <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:92%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
+ <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:100%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
<script type="text/javascript">
var ispast = {!isPast};
if (ispast) {
@@ -435,11 +496,23 @@
<apex:variable value="{!cnt2 + 1}" var="cnt2" />
</apex:repeat>
<td class="dataCell" style="text-align:right; background-color:#AAAACC;">
- <apex:outputText id="totalrow" style="width:92%;" value="{0,number,#,##0.00}">
+ <apex:outputText id="totalrow" style="width:100%;" value="{0,number,#,##0.00}">
<apex:param value="" />
</apex:outputText>
<apex:inputHidden id="isChanged" value="{!dbs.isChanged}"/>
</td>
+ <!-- 20230510 ljh start -->
+ <td class="dataCell" style="word-wrap:break-word;">
+ <apex:inputField id="inRemarks" value="{!dbs.opportunity.remarks__c}" style="width:100%;text-alig:left;" onchange="checkOwner(this.value, this.id, {!cnt});" onkeyup="if(value.length>15)value=value.slice(0,15)"/>
+ <script type="text/javascript">
+ var ispast = {!isPast};
+ if (ispast) {
+ j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + {!cnt-1} + ':inRemarks')).attr("disabled",true);
+ }
+ </script>
+ <!-- 鏄ョ湢涓嶈鏅撳澶勯椈鍟奸笩澶滄潵椋庨洦澹� -->
+ </td>
+ <!-- 20230510 ljh end -->
</tr>
<apex:variable value="{!cnt + 1}" var="cnt" />
</apex:repeat>
@@ -447,8 +520,8 @@
</table>
<script type="text/javascript">
j$(function() {
- var blockHeight = j$(window).innerHeight() - j$(escapeVfId('Page:Form:headBlock')).height() - 60;
- j$(escapeVfId('MainTable')).tablefix({height: blockHeight, fixRows: 2, fixCols: 0});
+ // var blockHeight = j$(window).innerHeight() - j$(escapeVfId('Page:Form:headBlock')).height() - 60;
+ // j$(escapeVfId('MainTable')).tablefix({height: blockHeight, fixRows: 2, fixCols: 0});
});
calc();
</script>
diff --git a/force-app/main/default/pages/SetProductTarget.page b/force-app/main/default/pages/SetProductTarget.page
index 1d7d87f..d2e1352 100644
--- a/force-app/main/default/pages/SetProductTarget.page
+++ b/force-app/main/default/pages/SetProductTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProductTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProductTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鍚勭渷閲嶇偣浜у搧鐩爣璁惧畾</title>
@@ -6,6 +6,33 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/>
+<style>
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+ /*#Page\:Form\:editBlock > div.pbBody {
+ height: 500px;
+ }*/
+
+ #crossTable th ,#topTable th, #topTable ,#bodyTable{
+ border-right: 1px solid #c9c9c9;
+ }
+
+ #leftTable , #crossTable {
+ border-left: 1px solid #c9c9c9;
+ }
+
+ #leftTable,#bodyTable {
+ border-bottom: 1px solid #c9c9c9;
+ }
+
+</style>
<script type="text/javascript">
window.onload = function getInfo() {
@@ -247,7 +274,7 @@
for(var i = 0; i< tbl.rows.length;i++){
if(document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner_mlktp")){
document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner_mlktp").style.display="none";
- document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner").style.width="80%";
+ document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner").style.width="99%";
}
//j$("Page:Form:dataBlock:dbRepeat_L:"+i+":owner_mlktp").attr('display','none');
//j$("Page:Form:dataBlock:dbRepeat_L:"+i+":owner").css("width","80%");
@@ -315,14 +342,16 @@
// }
passToController(this.result);
popupBox.hide();
- }
+ }
+
+
}
}
//CHAN-BDQBLX 20210205 ljh end
</script>
<style>
.TestCss{
- width:80%;
+ width:99%;
}
div#out_Div {
position:relative;
@@ -395,7 +424,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; " />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -405,10 +434,10 @@
<table id="ButtonTable" border="0" width="100%">
<tr>
<td>
- 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
- 鐪� <apex:inputField value="{!opp.SAP_Province__c}" id="province" style="width:140px" onchange="searchByProvinceJs();return false;"></apex:inputField>
- <!-- 閲嶇偣鐩爣鍒嗙被 <apex:selectList value="{!target_category}" size="1" style="width:140px" onchange="searchByCategoryJs();return false;"><apex:selectOptions value="{!targetOpts}"/></apex:selectList>
- 閲嶇偣浜у搧
+ 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
+ 鐪� <apex:inputField value="{!opp.SAP_Province__c}" id="province" style="width:140px" onchange="searchByProvinceJs();return false;"></apex:inputField>
+ <!-- 閲嶇偣鐩爣鍒嗙被 <apex:selectList value="{!target_category}" size="1" style="width:140px" onchange="searchByCategoryJs();return false;"><apex:selectOptions value="{!targetOpts}"/></apex:selectList>
+ 閲嶇偣浜у搧
<apex:selectList value="{!opp.Important_Key_product_category__c}" id="impKey" size="1" style="width:200px;" onchange="searchByImpKeyJs();return false;">
<apex:selectOptions value="{!impProductOptions}"/>
</apex:selectList>-->
@@ -418,7 +447,7 @@
<!-- ljh 鏍峰紡璋冩暣 20210204 start -->
<!--CHAN-BDQBLX 20210204 ljh end -->
<td align="right">
- <apex:commandButton value="鍙嶅簲鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
+ <apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘"></apex:commandbutton>
<apex:commandButton onclick="openPopupCSV(); return false;" value="瀵煎叆" rerender="Form"/>
</td>
@@ -447,7 +476,7 @@
<apex:inputHidden id="changeFlg" value="{!saveFlg}"/>
<div id="Div_all">
<div id="out_Div_L">
- <table class="list" style="border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="crossTable">
+ <table class="list" style="border-bottom-width: 0px;table-layout:fixed;" cellspacing="0" cellpadding="0" id="crossTable">
<thead>
<tr class="headerRow" id="Head_L">
<th width="140px" class="headerRow booleanColumn">閿�鍞湰閮�</th>
@@ -466,7 +495,7 @@
</table>
</div>
<div id="out_Div" >
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" id="topTable">
+ <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;width:100%;" id="topTable">
<thead>
<tr class="headerRow" id="header_R">
<apex:repeat value="{!opportunity_category}" var="oc" id="opportunityCategoryRepeat">
@@ -488,15 +517,16 @@
</tbody>
</table>
</div>
+ <div style="clear:both;height:0px;"></div>
<div id="in_Div_L">
- <table class="list" style="table-layout:fixed;border-bottom-width: 0px;" border="0" cellspacing="0" cellpadding="0" id="leftTable">
+ <table class="list" style="table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="leftTable">
<tbody>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat_L">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}">
<td class="dataCell" width="140px">{!dbs.department}</td>
<td class="dataCell" width="110px"><apex:outputField value="{!dbs.opportunity.SAP_Province__c}"></apex:outputField></td>
- <td class="dataCell" width="160px"><apex:inputField id="owner" value="{!dbs.opportunity.Owner_System__c}" onchange="checkOwner(this.value, this.id, {!cnt});" style="width:80%;"></apex:inputField>
+ <td class="dataCell" width="160px"><apex:inputField id="owner" value="{!dbs.opportunity.Owner_System__c}" onchange="checkOwner(this.value, this.id, {!cnt});" style="width:99%;"></apex:inputField>
<script type="text/javascript">
var ispast = {!isPast};
if (ispast) {
@@ -511,7 +541,7 @@
</div>
<div id="in_Div" >
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" id="bodyTable">
+ <table class="list" style="border-collapse: collapse;table-layout:fixed;width:100%;" id="bodyTable">
<tbody>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
@@ -559,4 +589,4 @@
</script>
</apex:pageBlock>
</apex:form>
-</apex:page>
\ No newline at end of file
+</apex:page>
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index dcd8e4d..1da0caa 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>
@@ -6,6 +6,28 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/>
+
+<style>
+
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+
+
+ #MainTable th {
+ border-right: 1px solid #c9c9c9;
+ }
+ #MainTable {
+ border: 1px solid #c9c9c9;
+ }
+</style>
+
<script type="text/javascript">
function DisableAllButtons (actionText) {
@@ -15,7 +37,7 @@
}
function UpdateJs(actionText) {
blockme();
- if (window.confirm('纭畾瑕佸弽搴斿埌鐩爣鍚楋紵')) {
+ if (window.confirm('纭畾瑕佸弽鏄犲埌鐩爣鍚楋紵')) {
Update();
DisableAllButtons(actionText);
} else {
@@ -44,7 +66,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 +79,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 +106,7 @@
}
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));
}
// 绶忚▓
@@ -233,7 +261,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; " />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -248,7 +276,7 @@
<!--CHAN-BDQBLX 20210129 you start -->
<td align="center" width="10%">
- <apex:commandButton value="鍙嶅簲鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
+ <apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘">
</apex:commandbutton>
<apex:commandButton onclick="openPopupCSV(); return false;" value="瀵煎叆" rerender="Form"/>
@@ -279,7 +307,7 @@
<!-- 銉愩儍銈伌銇儜銉┿儭銉笺偪銈掑銈勩仐銇熴亸銇亜銇熴倎銆侊紤銇仾銈屻仾銇勩儜銉┿儭銉笺偪銈掑叆銈屻伨銇� -->
<!-- 銇撱亾銇�ゃ伅锛戙亱銇┿亞銇嬨伄鍒ゆ柇銇伩銇т娇銇勩伨銇� -->
<apex:inputHidden id="changeFlg" value="{!saveFlg}"/>
- <table class="list" style="border-bottom-width: 0px;" border="0" cellspacing="0" cellpadding="0" id="MainTable">
+ <table class="list" cellspacing="0" cellpadding="0" id="MainTable">
<thead>
<tr class="headerRow">
<th width="110px" class="headerRow booleanColumn" id="baseName">閿�鍞湰閮�</th>
@@ -301,7 +329,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 +339,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">
@@ -326,7 +357,7 @@
<apex:variable value="{!1}" var="cnt2" />
<apex:repeat value="{!dbs.amount}" var="amount" id="amountRepeat">
<td class="dataCell" style="text-align:right;">
- <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:92%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
+ <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:100%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
<script type="text/javascript">
var ispast = {!isPast};
if (ispast) {
@@ -337,7 +368,7 @@
<apex:variable value="{!cnt2 + 1}" var="cnt2" />
</apex:repeat>
<td class="dataCell" style="text-align:right; background-color:#AAAACC;">
- <apex:outputText id="totalrow" style="width:92%;" value="{0,number,#,##0.00}">
+ <apex:outputText id="totalrow" style="width:100%;" value="{0,number,#,##0.00}">
<apex:param value="" />
</apex:outputText>
<apex:inputHidden id="isChanged" value="{!dbs.isChanged}"/>
@@ -358,4 +389,4 @@
</script>
</apex:pageBlock>
</apex:form>
-</apex:page>
\ No newline at end of file
+</apex:page>
--
Gitblit v1.9.1