~huangqianlong/OlyMEBG.git

			@@ -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/29.0/connection.js"/>
			<apex:includeScript value="/soap/ajax/29.0/apex.js"/>
			<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
			<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
			<head>
			<title>跟进</title>
			</head>
			@@ -11,15 +11,31 @@
			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() == '')) {
			//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)) {
			}else **/if (content == '其他' && (contentOther.trim() == '' \|\| contentOther.trim() == null)) {
			alert('跟进内容（其他）不能为空！');
			return;
			}else if (content == '' \|\| content == null) {
			}/**else if (content == '' \|\| content == null) {
			alert('跟进内容不能为空！');
			return;
			}**/
			/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();
			@@ -34,10 +50,18 @@
			<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">