From 139ba4f5e3a2e8242d25a3219f86b75bb1cfdec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 15 Nov 2019 20:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/Exercisesetting.js       |  1 +
 .../exercise/Testpapersettinghomepage.js      |  4 ++--
 .../courses/poll/PollDetailTabForthRules.js   | 19 ++++++++++++++++++-
 .../shixunHomework/ShixunHomeworkPage.js      |  2 +-
 .../shixunHomework/Trainingjobsetting.js      |  1 +
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 2190ac001..c7333824d 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -713,6 +713,7 @@ class Exercisesetting extends Component{
                                             course_group={course_group}
                                             flagPageEdit={flagPageEdit}
                                             rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
+																					Commonheadofthetestpaper
                                         ></PollDetailTabForthRules>
                                 }
                             </div>
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 1398e18c1..c848e8bb0 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -475,7 +475,7 @@ class Testpapersettinghomepage extends Component{
                     }
                     {
 
-                        parseInt(tab[0])==3 ? <WrappedExercisesetting {...this.props} {...this.state} triggerRef={this.bindRef}></WrappedExercisesetting>:""
+                        parseInt(tab[0])==3 ? <WrappedExercisesetting  Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} {...this.props} {...this.state} triggerRef={this.bindRef}></WrappedExercisesetting>:""
                     }
                 </div>
             </div>
@@ -483,4 +483,4 @@ class Testpapersettinghomepage extends Component{
     }
 }
 
-export default Testpapersettinghomepage;
\ No newline at end of file
+export default Testpapersettinghomepage;
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index df3b06f99..90ec27cce 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -478,7 +478,24 @@ class PollDetailTabForthRules extends Component{
                   {rule.p_timeflag===undefined?r > 0&&rule.publish_time===null?<Tooltip title="删除">
                       <a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
                     </Tooltip>
-                    :"":
+                    :(
+											this.props.Commonheadofthetestpaper?
+												(this.props.Commonheadofthetestpaper.exercise_status===1&&r > 0?
+													<Tooltip title="删除">
+														<a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
+													</Tooltip>
+													:"")
+												:this.props.teacherdatapage?
+												(
+													this.props.teacherdatapage.homework_status[0]==="未发布"&&r > 0?
+														<Tooltip title="删除">
+															<a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
+														</Tooltip>
+														:""
+												):
+
+												""
+										):
 										r > 0 && rule.p_timeflag == false ?
                     <Tooltip title="删除">
                       <a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index d8440ed45..5073a6e9c 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -354,7 +354,7 @@ class ShixunHomeworkPage extends Component {
 						{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
 						{parseInt(tab) === 1 ?<Workquestionandanswer  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i)=>this.Showupdateinstructionsboolfalse(i)}></Workquestionandanswer>:""}
 						{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
-						{parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
+						{parseInt(tab) === 3 ?<Trainingjobsetting  teacherdatapage={this.state.teacherdatapage}  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
 					</Spin>
 				</div>
 			</div>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 1c218b734..0a76ae339 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -2503,6 +2503,7 @@ class Trainingjobsetting extends Component {
 											<PollDetailTabForthRules
 												{...this.props}
 												{...this.state}
+												teacherdatapage={this.props.teacherdatapage}
 												rules={rules}
 												moduleName={"作业"}
 												course_group={rulest}