From cc266a1e4080bb3ecc47ea4a202dd549545111e1 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期六, 29 四月 2023 16:10:52 +0800
Subject: [PATCH] 贸易合规20230429
---
force-app/main/default/pages/LostReportEdit.page | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/LostReportEdit.page b/force-app/main/default/pages/LostReportEdit.page
index 93b3f8c..1f07a22 100644
--- a/force-app/main/default/pages/LostReportEdit.page
+++ b/force-app/main/default/pages/LostReportEdit.page
@@ -2,8 +2,8 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="/soap/ajax/46.0/connection.js"/>
-<apex:includeScript value="/soap/ajax/46.0/apex.js"/>
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<style>
.dateFormat {
display: none;
@@ -269,7 +269,11 @@
<div style="margin-top: 1%" class="startInventory">
<apex:commandButton styleClass="hiddenPrint" value="杩斿洖" rerender="allForm" onclick="returnjs();return false;"/>
<!-- <apex:commandButton value="濉啓閬楀け鎶ュ憡涔�" rerender="allForm" onclick="inventory_lost_report();return false;" /> -->
- <apex:commandButton styleClass="hiddenPrint" value="淇濆瓨" id="saveData" rendered="{! pBean.islock == false && pBean.hasApprovedFlag == false }" style="float: right;" rerender="allForm" oncomplete="unblockUI();" onclick="blockme()" action="{!saveLR}" />
+ <!-- 20211215 ljh SFDC-C933NJ update start -->
+ <!-- <apex:commandButton styleClass="hiddenPrint" value="淇濆瓨" id="saveData" rendered="{! pBean.islock == false && pBean.hasApprovedFlag == false }" style="float: right;" rerender="allForm" oncomplete="unblockUI();" onclick="blockme()" action="{!saveLR}" /> -->
+ <apex:commandButton styleClass="hiddenPrint" value="淇濆瓨" id="saveData" rendered="{! (pBean.islock == false && pBean.hasApprovedFlag == false)|| pBean.bzCanEdit == true}" style="float: right;" rerender="allForm" oncomplete="unblockUI();" onclick="blockme()" action="{!saveLR}" />
+ <apex:outputText rendered="{!pBean.bzCanEdit == true}" style="float: right;height: 30px;line-height: 30px;color: red;" value="銆愭槸鍚︾綒鍒欏璞°�戝繀椤诲～鍐欎繚瀛樺悗鎵嶈兘瀹℃壒"/>
+ <!-- 20211215 ljh SFDC-C933NJ update end -->
<apex:commandButton styleClass="hiddenPrint" value="淇濆瓨骞舵彁浜ゅ鎵�" id="saveData1" rendered="{! pBean.islock == false && pBean.hasApprovedFlag == false}" style="float: right;" rerender="allForm, process" oncomplete="unblockUI();" onclick="saveLRjs('1'); return false;" />
<!-- <apex:commandButton value="淇濆瓨" id="saveData" style="margin-left: 25%;" rerender="allForm" oncomplete="unblockUI();" action="{!saveData}" onclick="unvalid()" /> -->
<!-- <apex:commandButton value="鐩稿叧浜哄憳纭" rendered="{!IF(ihObj.InventoryCheck_PIC__c!=$User.Id, false, true)}" rerender="allForm" onclick="relevant_confirm();return false;" /> -->
@@ -435,17 +439,25 @@
</tr>
</table>
<table class="inventoryReportTable" border="2" style="width: 100%;">
+ <!-- 20211213 ljh SFDC-C933NJ update -->
+ <!-- <col style="width: 20%;" />
<col style="width: 20%;" />
<col style="width: 20%;" />
<col style="width: 20%;" />
- <col style="width: 20%;" />
- <col style="width: 20%;" />
+ <col style="width: 20%;" /> -->
<tr>
- <td >浜у搧鍨嬪彿</td>
+ <!-- <td >浜у搧鍨嬪彿</td>
<td >鏈鸿韩鍙�</td>
<td >鍥哄畾璧勪骇缂栧彿(Key)</td>
<td >璧勬湰鍖栨棩鏈�</td>
- <td >娈嬪�硷紙鍏冿級</td>
+ <td >娈嬪�硷紙鍏冿級</td> -->
+ <td style="width: {!IF(pBean.isShowPunish == true,'18%;','20%;')}">浜у搧鍨嬪彿</td>
+ <td style="width: {!IF(pBean.isShowPunish == true,'15%;','20%;')}">鏈鸿韩鍙�</td>
+ <td style="width: {!IF(pBean.isShowPunish == true,'17%;','20%;')}">鍥哄畾璧勪骇缂栧彿(Key)</td>
+ <td style="width: {!IF(pBean.isShowPunish == true,'16%;','20%;')}">璧勬湰鍖栨棩鏈�</td>
+ <td style="width: {!IF(pBean.isShowPunish == true,'18%;','20%;')}">娈嬪�硷紙鍏冿級</td>
+ <td style="width: 16%;display: {!IF(pBean.isShowPunish == true,'','none;')}" >鏄惁缃氬垯瀵硅薄</td>
+ <!-- 20211213 ljh SFDC-C933NJ end -->
</tr>
<apex:repeat value="{!pBean.rowList}" var="row">
<tr>
@@ -466,6 +478,12 @@
<apex:inputField required="{!DESC_RW['Asset_Value__c'] == 'wm'}" rendered="{!DESC_RW['Asset_Value__c'] == 'w' || DESC_RW['Asset_Value__c'] == 'wm'}" value="{!row.lrd.Asset_Value__c}"/>
<apex:outputText rendered="{!DESC_RW['Asset_Value__c'] == 'r'}" value="{!row.lrd.Asset_Value__c}"/>
</td>
+ <!-- 20211213 ljh SFDC-C933NJ add start-->
+ <td style="display: {!IF(pBean.isShowPunish == true,'','none;')}">
+ <apex:inputField required="{!DESC_RW['IsPunishObj__c'] == 'wm'}" rendered="{!DESC_RW['IsPunishObj__c'] == 'w' || DESC_RW['IsPunishObj__c'] == 'wm'}" value="{!row.lrd.IsPunishObj__c}"/>
+ <apex:outputText rendered="{!DESC_RW['IsPunishObj__c'] == 'r'}" value="{!row.lrd.IsPunishObj__c}"/>
+ </td>
+ <!-- 20211213 ljh SFDC-C933NJ add end-->
</tr>
</apex:repeat>
</table>
@@ -652,9 +670,9 @@
</apex:outputText>
</td>
</tr>
- <!-- 鍓疌L4 楂樼骇鎬荤洃 -->
+ <!-- 鍓疌L4 楂樼骇鎬荤洃-->
<tr>
- <!-- 20220414 ljh 鍓疌L4 楂樼骇鎬荤洃->CL4 楂樼骇鎬荤洃 -->
+ <!-- 20220414 ljh 鍓疌L4 楂樼骇鎬荤洃->CL4 楂樼骇鎬荤洃 -->
<td class="topb2 leftb2 rightb2">CL4 楂樼骇鎬荤洃锛�</td>
</tr>
<tr>
@@ -687,7 +705,7 @@
</apex:outputText>
</td>
</tr>
- <!-- CL3 鍓�昏 -->
+ <!-- CL3 鍓�昏-->
<tr>
<td class="topb2 leftb2 rightb2">CL3 鍓�昏锛�</td>
</tr>
--
Gitblit v1.9.1