Browse Source

时间修改

1178232204@qq.com 3 years ago
parent
commit
751437a2c4

+ 2 - 2
src/components/BlockLossManage/editBlock.js

@@ -19,11 +19,11 @@ function EditBlock(props) {
     const initialValues = blockDetail;
     const onFinish = values => {
         values.startDate = moment(values.startDate).format('YYYY-MM-DD 00:00:00');
-        values.endDate = moment(values.endDate).format('YYYY-MM-DD 23:23:59');
+        values.endDate = moment(values.endDate).format('YYYY-MM-DD 23:59:59');
         if (values.startDate > values.endDate) {
             message.warning('开始时间不能大于结束时间');
             return
-        } else if(!limit && getDaysBetween(values.startDate, values.endDate)>7){
+        } else if(!limit && getDaysBetween(values.startDate, values.endDate)>30){
             message.warning('开始时间与结束时间相差不能超过7天');
             return
         }

+ 4 - 4
src/components/BlockLossManage/index.js

@@ -31,7 +31,7 @@ function BlockLossManage() {
         asc: ['status'],
         desc: ['gmt_modified'],
         startDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        endDate: getCurrentData().split('/').join('-') + ' 23:23:59'
+        endDate: getCurrentData().split('/').join('-') + ' 23:59:59'
     });
     const [form] = Form.useForm();
     let data = {
@@ -41,11 +41,11 @@ function BlockLossManage() {
         asc: ['status'],
         desc: ['gmt_modified'],
         startDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        endDate: getCurrentData().split('/').join('-') + ' 23:23:59'
+        endDate: getCurrentData().split('/').join('-') + ' 23:59:59'
     }
     let date = {
         startDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        endDate: getCurrentData().split('/').join('-') + ' 23:23:59'
+        endDate: getCurrentData().split('/').join('-') + ' 23:59:59'
     }
     //表格数据
     function getBlockLossPage(param) {
@@ -107,7 +107,7 @@ function BlockLossManage() {
     }
     const onFinish = (value) => {
         value.startDate = moment(value.startDate).format('YYYY-MM-DD 00:00:00');
-        value.endDate = moment(value.endDate).format('YYYY-MM-DD 23:23:59');
+        value.endDate = moment(value.endDate).format('YYYY-MM-DD 23:59:59');
         if (value.startDate > value.endDate) {
             message.warning('开始时间不能大于结束时间');
             return

+ 3 - 3
src/components/DutyRecord/index.js

@@ -22,7 +22,7 @@ function DutyRecord() {
 	const [current, setCurrent] = useState(1);
 	const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 	const [params, setParams] = useState({
-		changeTimeEnd:today.split('/').join('-') + ' 23:23:59',
+		changeTimeEnd:today.split('/').join('-') + ' 23:59:59',
 		changeTimeStart:lastmonthday.split('/').join('-') + ' 00:00:00',
 		pages: 1,
 		current: 1,
@@ -34,7 +34,7 @@ function DutyRecord() {
 		'2': '职称变更'
 	};
 	let data = {
-		changeTimeEnd:today.split('/').join('-') + ' 23:23:59',
+		changeTimeEnd:today.split('/').join('-') + ' 23:59:59',
 		changeTimeStart:lastmonthday.split('/').join('-') + ' 00:00:00',
 		pages: 1,
 		current: 1,
@@ -109,7 +109,7 @@ function DutyRecord() {
 	};
 	const onFinish = (value) => {
 		value.changeTimeStart = moment(value.changeTimeStart).format('YYYY-MM-DD 00:00:00');
-		value.changeTimeEnd = moment(value.changeTimeEnd).format('YYYY-MM-DD 23:23:59');
+		value.changeTimeEnd = moment(value.changeTimeEnd).format('YYYY-MM-DD 23:59:59');
 		if (value.changeTimeStart > value.changeTimeEnd) {
 		    message.warning('开始时间不能大于结束时间');
 		    return

+ 3 - 3
src/components/FieldProblem/editProblem.js

@@ -19,11 +19,11 @@ function EditBlock(props) {
     const initialValues = problemDetail;
     const onFinish = values => {
         values.startDate = moment(values.startDate).format('YYYY-MM-DD 00:00:00');
-        values.endDate = moment(values.endDate).format('YYYY-MM-DD 23:23:59');
+        values.endDate = moment(values.endDate).format('YYYY-MM-DD 23:59:59');
         if (values.startDate > values.endDate) {
             message.warning('开始时间不能大于结束时间');
             return
-        } else if (!limit && getDaysBetween(values.startDate, values.endDate) > 7) {
+        } else if (!limit && getDaysBetween(values.startDate, values.endDate) > 30) {
             message.warning('开始时间与结束时间相差不能超过7天');
             return
         }
@@ -253,7 +253,7 @@ function EditBlock(props) {
                     type == 1 ?
                         <div style={{ color: '#1690FF' }}>
                             提示:<br />
-                            1、1、数据补录时间较长,请耐心等待。<br />
+                            1、数据校验时间较长,请耐心等待。<br />
                             2、当输入住院序号时,校验将不受时间范围限制。<br />
                         </div>
                         : ''

+ 4 - 4
src/components/FieldProblem/index.js

@@ -33,7 +33,7 @@ function FieldProblem() {
         asc: ['isSolved'],
         desc: ['solveTime', 'behospitalCode'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
+        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:59:59'
     });
     const [form] = Form.useForm();
     let data = {
@@ -43,11 +43,11 @@ function FieldProblem() {
         asc: ['isSolved'],
         desc: ['solveTime', 'behospitalCode'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
+        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:59:59'
     }
     let date = {
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
+        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:59:59'
     }
     //表格数据
     function getColumnResultPage(param) {
@@ -120,7 +120,7 @@ function FieldProblem() {
     }
     const onFinish = (value) => {
         value.behospitalStartDate = moment(value.behospitalStartDate).format('YYYY-MM-DD 00:00:00');
-        value.behospitalEndDate = moment(value.behospitalEndDate).format('YYYY-MM-DD 23:23:59');
+        value.behospitalEndDate = moment(value.behospitalEndDate).format('YYYY-MM-DD 23:59:59');
         if (value.behospitalStartDate > value.behospitalEndDate) {
             message.warning('开始时间不能大于结束时间');
             return

+ 1 - 1
src/components/MedicalTeam/index.js

@@ -143,7 +143,7 @@ function MedicalTeam() {
 	const onFinish = (value) => {
 		if (value.time) {
 			value.startDate = moment(value.time[0]).format('YYYY-MM-DD 00:00:00');
-			value.endDate = moment(value.time[1]).format('YYYY-MM-DD 23:23:59');
+			value.endDate = moment(value.time[1]).format('YYYY-MM-DD 23:59:59');
 		}
 		const param = {
 			...data,