From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/pages/UploadOBPM.page | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/pages/UploadOBPM.page b/force-app/main/default/pages/UploadOBPM.page
index f1176ee..56febb1 100644
--- a/force-app/main/default/pages/UploadOBPM.page
+++ b/force-app/main/default/pages/UploadOBPM.page
@@ -8,16 +8,22 @@
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<script>
sforce.connection.sessionId = '{!$Api.Session_ID}';
- function addJs(){
- blockme();
- addLine();
- }
+ // function addJs(){
+ // blockme();
+ // addLine();
+ // }
function uploadJs(){
- blockme();
- uploadOBPM();
+ var IF_Approved = j$(escapeVfId('IF_Approved')).value();
+ if(IF_Approved == 'true'){
+ blockme();
+ uploadOBPM();
+ } else{
+ alert("姝や細璁笉闇�瑕佺敵璇峰喅瑁侊紒");
+ }
}
function uploadSuccess(){
alert('涓婁紶OBPM鎴愬姛锛�');
+ window.close();
}
function closeJs(){
window.close();
@@ -36,17 +42,19 @@
<apex:actionFunction name="uploadOBPM" action="{!uploadOBPM}" rerender="allForm,allPanel,allBlock,records" oncomplete="unblockUI();uploadSuccess();">
</apex:actionFunction>
<apex:outputPanel id="allPanel">
+ <input type="hidden" id="hasError" value="{!hasError}"/>
+ <input type="hidden" id="IF_Approved" value="{!IF_Approved}"/>
<apex:pageBlock id="allBlock">
<apex:pageBlockButtons location="top">
- <apex:commandButton immediate="true" onclick="uploadJs();" value="涓婁紶OBPM" rerender="dummy"/>
- <apex:commandButton immediate="true" onclick="addJs();" value="娣诲姞琛�" rerender="dummy"/>
- <apex:commandButton immediate="true" onclick="closeJs();" value="鍏抽棴" rerender="dummy"/>
+ <apex:commandButton immediate="true" onclick="uploadJs();return false;" value="涓婁紶OBPM"/>
+ <apex:commandButton immediate="true" action="{!addLine}" onclick="blockme();" value="娣诲姞琛�"/>
+ <apex:commandButton immediate="true" onclick="closeJs();" value="鍏抽棴"/>
</apex:pageBlockButtons>
-
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
-
+ <input type="hidden" id="hasError" value="{!hasError}"/>
+ <label>鐢宠鍐宠鏃跺闇�瑕佸叡鍚岀紪杈戜汉鍜屾妱閫佷汉锛岃濉叆涓嬭〃锛�</label>
<table class="linetable" border="1" style="border-collapse: collapse;width:590px;table-layout:fixed;">
<colgroup>
<col width="40px"/>
@@ -83,7 +91,7 @@
<option value ="鍏卞悓缂栬緫浜�">鍏卞悓缂栬緫浜�</option>
<option value ="鎶勯�佷汉">鎶勯�佷汉</option>
</select> -->
- <apex:selectList value="{!OBPMInfo.Role}" size="1" style="position: absolute;transform: translate(-40px, -3px);">
+ <apex:selectList value="{!OBPMInfo.Role}" size="1" style="position: relative; top: 6px;">
<apex:selectOptions value="{!items}"/>
</apex:selectList><p/>
</td>
--
Gitblit v1.9.1