From 5f8c97f8716088019ad9a0302c5dea461bc668b1 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期一, 07 八月 2023 15:35:56 +0800
Subject: [PATCH] CIC相关按钮
---
force-app/main/default/pages/SetProvinceTarget.page | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index dcd8e4d..e479398 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>
@@ -243,12 +271,12 @@
<apex:pageBlock id="headBlock" tabStyle="Report">
<table id="ButtonTable" border="0" width="100%">
- <tr>
+ <tr style='height: 40px;'>
<td width="15%">鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchJs(this.value);return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList></td>
<!--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}"/>
--
Gitblit v1.9.1