From 47c7a0503a119572bd1b9e2812510dd6792d95f0 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Tue, 31 Mar 2020 12:14:44 +0800
Subject: [PATCH] 1
---
SunshineIns/src/page/CareListEdit.jsx | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/SunshineIns/src/page/CareListEdit.jsx b/SunshineIns/src/page/CareListEdit.jsx
index 60aaea1..f34510a 100644
--- a/SunshineIns/src/page/CareListEdit.jsx
+++ b/SunshineIns/src/page/CareListEdit.jsx
@@ -130,6 +130,16 @@
message.warning("任务地点不能为空");
return;
}
+ if (moment(savedate.startTime) < moment(new Date())) {
+ message.warning("开始时间必须大于当前时间");
+ console.log(moment(savedate.startTime))
+ console.log(moment(new Date()))
+ return;
+ }
+ if (moment(savedate.endTime) < moment(savedate.startTime)) {
+ message.warning("结束时间必须大于开始时间");
+ return;
+ }
if (!savedate.taskRequire) {
message.warning("任务要求不能为空");
return;
@@ -294,7 +304,7 @@
submitLContent = () => {
// 在编辑器获得焦点时按下ctrl+s会执行此方法
// 编辑器内容提交到服务端之前，可直接调用editorState.toHTML()来获取HTML格式的内容
- const htmlContent = this.state.editorState.toHTML()
+ const htmlContent = this.state.editorStatetaskProcess.toHTML()
this.setState(({ savedate }) => ({
savedate: {
...savedate,
@@ -310,6 +320,7 @@
handleEditorLChange = (editorStatetaskProcess) => {
this.setState({ editorStatetaskProcess })
}
+
handleCancel = () => this.setState({ previewVisible: false })
render() {
@@ -408,7 +419,7 @@
<Row type="flex" align='middle' justify="space-around">
<Col span={6} pull={0} style={{ textAlign: 'center' }}><span>任务类型</span></Col>
<Col span={6} push={0} >
- <Select disabled={disabled} value={taskType || 1} style={{ width: "300px" }} onChange={(value) => this.saveInputChange({ target: { name: 'taskType', value } })}>
+ <Select disabled={disabled} value={savedate.taskType || 1} style={{ width: "300px" }} onChange={(value) => this.saveInputChange({ target: { name: 'taskType', value } })}>
<Option value={1}>跟踪帮教</Option>
<Option value={2}>合适成年人</Option>
<Option value={3}>社会调查</Option>
@@ -514,8 +525,8 @@
<div style={divStyle}>
<Row type="flex" align='middle' justify="space-around">
<Col span={6} pull={0} style={{ textAlign: 'center' }}><span>任务汇报</span></Col>
- <Col span={6} push={0} >
- <TextArea disabled={disabled} rows={4} style={{ width: '92%' }} value={socialTaskObject.taskReport || ""} onChange={this.saveInputChange} name='taskReport' />
+ <Col span={18} push={0} >
+ <TextArea disabled={disabled} rows={4} value={socialTaskObject.taskReport || ""} onChange={this.saveInputChange} name='taskReport' />
</Col>
<Col span={12} pull={0}></Col>
</Row>
@@ -573,3 +584,8 @@
}
}
+
+function disabledDate(current) {
+ // Can not select days before today and today
+ return current && current < moment().endOf('day');
+}
--
Gitblit v1.8.0