diff --git a/src/app/ui/task/four/DetailForm.tsx b/src/app/ui/task/four/DetailForm.tsx index 708ab26..5b309e0 100644 --- a/src/app/ui/task/four/DetailForm.tsx +++ b/src/app/ui/task/four/DetailForm.tsx @@ -155,6 +155,8 @@ export const DetailForm: React.FC = (props) => { if (response.status.success) { message.success("修改任务成功:" + response.data) props.handleCancel() + }else { + message.error(response.status.message) } } ) @@ -225,12 +227,14 @@ export const DetailForm: React.FC = (props) => { - name={['expectedTimeRange']} label="期望"> + name={'expectedTimeRange'} label="期望"> = (props) => { disabledTime={disabledRangeTime} placeholder={['开始时间', '结束时间']} allowEmpty={[true, true]} + needConfirm={false} showTime={{ hideDisabledOptions: true, defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('11:59:59', 'HH:mm:ss')], diff --git a/src/app/ui/task/project/DetailModelForm.tsx b/src/app/ui/task/project/DetailModelForm.tsx index 9a43fcb..b388ac1 100644 --- a/src/app/ui/task/project/DetailModelForm.tsx +++ b/src/app/ui/task/project/DetailModelForm.tsx @@ -7,7 +7,7 @@ import { ProFormText, ProFormTextArea, ProFormTreeSelect, } from '@ant-design/pro-components'; import { Button, Form, message } from 'antd'; -import React from "react"; +import React, {useState} from "react"; import { addTask, getTaskTreeResult, @@ -25,13 +25,14 @@ export type DetailModelFormProps={ description:string, reloadData?: () => void } -export type PidSelectTree= { label: string; value: number; children?: PidSelectTree[] } +export type PidSelectTree= { label: string; value: number;pPid:number; children?: PidSelectTree[] } export const DetailModelForm: React.FC = (props) => { const [form] = Form.useForm(); + const [pPid, setPPid] = useState(0); function childReduce(child:DataType[]):PidSelectTree[]{ const result:PidSelectTree[] = []; child.map(data=> { - const resultData:PidSelectTree = {label:data.name,value:data.id}; + const resultData:PidSelectTree = {label:data.name,value:data.id,pPid:data.pPid}; if (data.children){ resultData.children=childReduce(data.children); } @@ -60,7 +61,25 @@ export const DetailModelForm: React.FC = (props) => { }} // submitTimeout={2000} onFinish={async (values) => { - addTask(values).then(response => { + console.log('Received values of form: ', values); + if (values.pid===undefined){ + values.pid=0 + } + if (values.expectedTimeRange?.[0]!=undefined) { + values.expectedStartTime=dayjs(values.expectedTimeRange[0]).toDate() + } + if (values.expectedTimeRange?.[1]!=undefined) { + values.expectedEndTime=dayjs(values.expectedTimeRange[1]).toDate() + } + if (values.actualTimeRange?.[0]!=undefined) { + values.actualStartTime=dayjs(values.actualTimeRange[0]).toDate() + } + if (values.actualTimeRange?.[1]!=undefined) { + values.actualEndTime=dayjs(values.actualTimeRange[1]).toDate() + } + values.pPid=pPid; + var result:boolean=false; + await addTask(values).then(response => { console.log('response', response) if (response.status.success) { message.success("添加任务成功:" + response.data) @@ -69,10 +88,14 @@ export const DetailModelForm: React.FC = (props) => { // 如果可以直接更新列表而不请求。。。。。。 console.log('props.reloadData?.()',props.reloadData) props.reloadData?.() + result= true + }else { + message.error(response.status.message) + result= false } } - ) - return true; + ); + return result; }} >