Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -92,7 +92,6 @@ class GraduationTaskssettinglist extends Component{
 				if (worklists.length != 0) {
 
 					for (var i = 0; i < worklists.length; i++) {
-debugger
 						datalist.push({
 							name: worklists[i].name,
 							number: (parseInt(page)-1)*parseInt(limit)+(i+1),
@@ -1176,6 +1175,9 @@ debugger
                     render: operation => (
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
+															console.log("1179");
+															console.log(key);
+															console.log(tag);
                                 return(
 																     <div key={key}>
 

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

@@ -637,11 +637,14 @@ class Trainingjobsetting extends Component {
 
     //允许补交
     onChanges = (e) => {
+        // debugger
         if(e.target.value ==="允许补交"){
              if(this.state.end_time !== null && this.state.end_time!== undefined){
+                 // console.log(this.state.end_time);
+                 var times = this.state.end_time.format('YYYY-MM-DD HH:mm');
                  this.setState({
-                     late_time:moment(handleDateString(this.state.end_time)).add(1, 'months'),
-                     late_times:moment(handleDateString(this.state.end_time)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
+                     late_time:moment(handleDateString(times)).add(1, 'months'),
+                     late_times:moment(handleDateString(times)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
                  })
              }
 
@@ -1080,7 +1083,7 @@ class Trainingjobsetting extends Component {
 
             }
             // console.log(value);
-            // console.log(dateString);
+            console.log(dateString);
             // console.log(handleDateString(dateString));
             this.onChangedata('publish_time', value, dateString);
             if(this.state.allowreplenishment === "允许补交") {