Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web
This commit is contained in:
commit
0acb62bd90
@ -112,7 +112,6 @@ class HM042ShowPrint extends React.Component {
|
||||
this.state.isAudit = "inline";
|
||||
}
|
||||
this.setState({ data: ret })
|
||||
this.state.data.Nav_Details = this.removeDuplicateObj(this.state.data.Nav_Details);
|
||||
if (ret.ID) {
|
||||
this.props.dispatch({
|
||||
type: 'app/getDataByPost',
|
||||
|
||||
@ -482,7 +482,7 @@ class SE018PaperPage extends React.Component {
|
||||
</tr>
|
||||
}
|
||||
{
|
||||
it.Nav_Test.TYPE !== 0 &&
|
||||
it.Nav_Test.TYPE !== 0 && it.Nav_Test.OPTION_D != "" && it.Nav_Test.OPTION_D != undefined &&
|
||||
<tr style={this.state.readonly && ((it.Nav_Test.ANSWER & 8) != 0) ? answer : null}>
|
||||
<td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 8) != 0) ? styles.answer : null}>
|
||||
{
|
||||
|
||||
@ -128,7 +128,7 @@ class SESafeSurveyTest extends React.Component {
|
||||
NAME = ret.Nav_Papers[0].Nav_Safe.NAME;
|
||||
END_TIME = ret.Nav_Papers[0].Nav_Safe.END_TIME;
|
||||
}
|
||||
if (moment().format("YYYY-MM-DD HH:mm:ss") > END_TIME) {
|
||||
if (moment().format("YYYY-MM-DD HH:mm:ss") < END_TIME) {
|
||||
message.error('已过答题截止时间!');
|
||||
this.props.dispatch({
|
||||
type: 'app/getDataByPost',
|
||||
@ -457,7 +457,7 @@ class SESafeSurveyTest extends React.Component {
|
||||
</tr>
|
||||
}
|
||||
{
|
||||
it.Nav_Test.TYPE !== 0 &&
|
||||
it.Nav_Test.TYPE !== 0 && it.Nav_Test.OPTION_D != "" && it.Nav_Test.OPTION_D != undefined &&
|
||||
<tr style={this.state.readonly && ((it.Nav_Test.ANSWER & 8) != 0) ? answer : null}>
|
||||
<td colSpan={24} rowSpan={1} className={this.state.readonly && ((it.Nav_Test.ANSWER & 8) != 0) ? styles.answer : null}>
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user