Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -422,6 +422,7 @@ class Trainingjobsetting extends Component {
 
 		if (this.state.jobsettingsdata.data.unified_setting === true) {
 			if (this.state.unifiedsetting === true) {
+				//统一设置
 				if (this.state.releasetime === undefined || this.state.releasetime === null || this.state.releasetime === "") {
 					// this.props.showNotification(`请选择发布时间`);
 
@@ -544,13 +545,28 @@ class Trainingjobsetting extends Component {
 				}
 
 			} else {
+				//分班设置
+				// console.log("分班设置");
+				// console.log(this.$pollDetailTabForthRules);
+
+				const  result=this.$pollDetailTabForthRules.notUnifiedSettingCheck(this.state.rules);
+				this.setState({
+					rules: result.rules
+				})
+
+				if(result.validate==false){
+
+
+						this.scrollToAnchor("publishtimeid");
+
+					this.props.showNotification(`分班发布设置不能为空`);
+					return false;
+				}
 				let rulesdata = this.state.rulesdata;
-				if (
-					rulesdata.length === 0) {
+				if (rulesdata.length === 0) {
 					this.props.showNotification(`分班发布设置不能为空`);
 					return;
 				}
-				//
 			}
 		}
 
@@ -2396,7 +2412,7 @@ class Trainingjobsetting extends Component {
 					modalSave={modalSave}
 				></Modals>
 
-				<div className={"educontent"}>
+				<div className={"educontent"} id={"publishtimeid"}>
 					{
 						!flagPageEdit && this.props.isAdmin() === true ?
 							""
@@ -2454,7 +2470,7 @@ class Trainingjobsetting extends Component {
 								</style>
 								{
 									unifiedsetting === undefined ? "" : unifiedsetting === true ?
-										<div>
+										<div 	>
 											<div className="clearfix mb5 ml15">
 												<span className="font-16  fl mt3" style={{color: "#999999"}}>发布时间：</span>
 												<Tooltip placement="bottom"
@@ -2536,6 +2552,9 @@ class Trainingjobsetting extends Component {
 											<PollDetailTabForthRules
 												{...this.props}
 												{...this.state}
+												ref={dom => {
+													this.$pollDetailTabForthRules = dom;
+												}}
 												teacherdatapage={this.props.teacherdatapage}
 												rules={rules}
 												moduleName={"作业"}