From 54e9fce17758136f2f5223038d30eeb32439c603 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期四, 08 十二月 2022 11:01:29 +0800
Subject: [PATCH] 转ET科室事项优化-
---
force-app/main/default/pages/FollowPage.page | 98 ++++++++++++++++++++++++++++++------------------
1 files changed, 61 insertions(+), 37 deletions(-)
diff --git a/force-app/main/default/pages/FollowPage.page b/force-app/main/default/pages/FollowPage.page
index e118b29..49c3962 100644
--- a/force-app/main/default/pages/FollowPage.page
+++ b/force-app/main/default/pages/FollowPage.page
@@ -2,47 +2,71 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="/soap/ajax/29.0/connection.js"/>
-<apex:includeScript value="/soap/ajax/29.0/apex.js"/>
- <head>
- <title>璺熻繘</title>
- </head>
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+ <head>
+ <title>璺熻繘</title>
+ </head>
<script type="text/javascript">
- function save(){
- var content = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:content')).value();
- var contentOther = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:contentOther')).value();
- if ((content == '' || content == null) && (contentOther.trim() == null || contentOther.trim() == '')) {
- alert('璺熻繘鍐呭涓嶈兘涓虹┖锛�');
+ function save(){
+ var content = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:content')).value();
+ var contentOther = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:contentOther')).value();
+ //20220606 LLIU-CEGCRB you
+ var Redistribution = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:Redistribution')).value();
+ var GotoDepartment = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:GotoDepartment')).value();
+
+ var ProductOwner = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:ProductOwner')).value();
+ /**if ((content == '' || content == null) && (contentOther.trim() == null || contentOther.trim() == '')) {
+ alert('璺熻繘鍐呭涓嶈兘涓虹┖锛�');
return;
- }else if (content == '鍏朵粬' && (contentOther.trim() == '' || contentOther.trim() == null)) {
- alert('璺熻繘鍐呭锛堝叾浠栵級涓嶈兘涓虹┖锛�');
+ }else **/if (content == '鍏朵粬' && (contentOther.trim() == '' || contentOther.trim() == null)) {
+ alert('璺熻繘鍐呭锛堝叾浠栵級涓嶈兘涓虹┖锛�');
return;
- }else if (content == '' || content == null) {
- alert('璺熻繘鍐呭涓嶈兘涓虹┖锛�');
+ }/**else if (content == '' || content == null) {
+ alert('璺熻繘鍐呭涓嶈兘涓虹┖锛�');
return;
- }else{
- blockme();
- allSave();
- }
- }
- function check(){
- window.opener.location.href = "/{!Inquiryform.id}";
- window.close();
- }
+ }**/
+ /**20220726 LLIU-CGK3D2 you **/
+ else if(content == '浠呴渶鏈嶅姟瀵瑰簲,钀ヤ笟鏈嶅姟鍏卞悓瀵瑰簲'){
+ alert('浠呴渶鏈嶅姟瀵瑰簲鍜岃惀涓氭湇鍔″叡鍚屽搴斿彧鑳介�夋嫨涓�椤癸紒');
+ return;
+ }else if((Redistribution == '' || Redistribution == null) && (null!=GotoDepartment && ''!=GotoDepartment)){
+ alert('鏈嬀閫夋椂涓嶈兘濉啓杞嚦绉戝!');
+ }else if(('' !=Redistribution && null !=Redistribution) && (null==GotoDepartment || GotoDepartment == '')){
+ alert('鍕鹃�夋椂蹇呴』濉啓杞嚦绉戝!');
+ }else if((content == '' || content == null) && (contentOther.trim() == null || contentOther.trim() == '') && (Redistribution == '' || Redistribution == null) && (null==GotoDepartment || GotoDepartment == '') && (ProductOwner == '' || ProductOwner == null) ){
+ alert('璺熻繘鍐呭鎴栧凡杞崲蹇呴』鏈変竴涓湁鍊�');
+ }else{
+ blockme();
+ allSave();
+ }
+ }
+ function check(){
+ window.opener.location.href = "/{!Inquiryform.id}";
+ window.close();
+ }
</script>
- <apex:form id="allForm">
- <apex:actionfunction action="{!savefo}" name="allSave" onComplete="check();unblockUI();"></apex:actionfunction>
- <apex:pageBlock id="pageBlock">
- <apex:pageBlockSection id="pageBlockSection">
- <apex:inputField id="content" value="{!Inquiryform.Follow_Content__c}" />
- <br />
- <apex:inputField id="contentOther" value="{!Inquiryform.Follow_Content_Other__c}" style="width: 150px"/>
- <br />
- </apex:pageBlockSection>
+ <apex:form id="allForm">
+ <apex:actionfunction action="{!savefo}" name="allSave" onComplete="check();unblockUI();"></apex:actionfunction>
+ <apex:pageBlock id="pageBlock">
+ <apex:pageBlockSection id="pageBlockSection">
+ <apex:pageBlockSectionItem ><font color="red">澶囨敞锛氶渶鏈汉瀵瑰簲锛岃鍦ㄦ杩涜鎿嶄綔銆�</font></apex:pageBlockSectionItem><br /><br />
+ <apex:inputField id="content" value="{!Inquiryform.Follow_Content__c}" />
+ <br />
+ <apex:inputField id="contentOther" value="{!Inquiryform.Follow_Content_Other__c}" style="width: 150px"/>
+ <br />
+ <apex:pageBlockSectionItem ><font color="red">澶囨敞锛氶潪鏈汉瀵瑰簲锛岃鍦ㄦ閫夋嫨闇�瀵瑰簲鐨勬垬鐣ョ瀹わ紝杩涜杞垎閰嶃��</font></apex:pageBlockSectionItem><br /><br />
+ <apex:inputField id="Redistribution" value="{!Inquiryform.Redistribution__c}" />
+ <br />
+ <apex:inputField id="GotoDepartment" value="{!Inquiryform.GotoDepartment__c}" style="width: 150px"/>
+ <br />
+ <apex:inputField id="ProductOwner" value="{!Inquiryform.Product_Owner__c}"/>
+ <br />
+ </apex:pageBlockSection>
- <apex:pageblockbuttons location="bottom">
- <apex:commandButton onclick="save();return false;" value="淇濆瓨"></apex:commandButton>
- </apex:pageblockbuttons>
- </apex:pageBlock>
- </apex:form>
+ <apex:pageblockbuttons location="bottom">
+ <apex:commandButton onclick="save();return false;" value="淇濆瓨"></apex:commandButton>
+ </apex:pageblockbuttons>
+ </apex:pageBlock>
+ </apex:form>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1