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/FollowPage.page |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/pages/FollowPage.page b/force-app/main/default/pages/FollowPage.page
index d775cbf..e118b29 100644
--- a/force-app/main/default/pages/FollowPage.page
+++ b/force-app/main/default/pages/FollowPage.page
@@ -11,7 +11,13 @@
     	function save(){
     		var content = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:content')).value();
     		var contentOther = j$(escapeVfId('allPage:allForm:pageBlock:pageBlockSection:contentOther')).value();
-    		if ((content.trim() == '' || content.trim() == null) && (contentOther.trim() == null || contentOther.trim() == '')) {
+    		if ((content == '' || content == null) && (contentOther.trim() == null || contentOther.trim() == '')) {
+    			alert('璺熻繘鍐呭涓嶈兘涓虹┖锛�');
+                return;
+    		}else if (content == '鍏朵粬' && (contentOther.trim() == '' || contentOther.trim() == null)) {
+    			alert('璺熻繘鍐呭锛堝叾浠栵級涓嶈兘涓虹┖锛�');
+                return;
+    		}else if (content == '' || content == null) {
     			alert('璺熻繘鍐呭涓嶈兘涓虹┖锛�');
                 return;
     		}else{
@@ -28,12 +34,14 @@
 	    <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}" style="width: 155px"/>
+					<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:pageblockbuttons >
-				<apex:commandbutton onclick="save();return false;" value="淇濆瓨"></apex:commandbutton>
+
+			<apex:pageblockbuttons location="bottom">
+				<apex:commandButton onclick="save();return false;" value="淇濆瓨"></apex:commandButton>
 			</apex:pageblockbuttons>
 		</apex:pageBlock>
 	</apex:form>

--
Gitblit v1.9.1