修复validatorEndTime方法实现错误
parent
0d714ccd5c
commit
9c85f9ee9a
|
|
@ -3,7 +3,8 @@
|
||||||
"baseUrl": "src",
|
"baseUrl": "src",
|
||||||
"paths": {
|
"paths": {
|
||||||
"~/*": ["*"]
|
"~/*": ["*"]
|
||||||
}
|
},
|
||||||
|
"jsx": "react"
|
||||||
},
|
},
|
||||||
"include": ["src"]
|
"include": ["src"]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-to-print": "^3.2.0",
|
"react-to-print": "^3.2.0",
|
||||||
"zy-react-library": "^1.2.3"
|
"zy-react-library": "^1.2.35"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
"@antfu/eslint-config": "^5.4.1",
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,8 @@ function Add(props) {
|
||||||
pageSize: 999,
|
pageSize: 999,
|
||||||
});
|
});
|
||||||
setHiddenList(hiddenList);
|
setHiddenList(hiddenList);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
inspectorList: [{
|
inspectorList: [{
|
||||||
departmentId: userInfo.departmentId,
|
departmentId: userInfo.departmentId,
|
||||||
|
|
@ -232,7 +233,7 @@ function Add(props) {
|
||||||
if (hiddenList[index].hiddenPartType === "input") {
|
if (hiddenList[index].hiddenPartType === "input") {
|
||||||
const { data } = await props["partAdd"]({
|
const { data } = await props["partAdd"]({
|
||||||
hiddenregion: hiddenList[index].hiddenPart,
|
hiddenregion: hiddenList[index].hiddenPart,
|
||||||
corpinfoId: form.getFieldValue(["personUnderInspection", "corpId"])
|
corpinfoId: form.getFieldValue(["personUnderInspection", "corpId"]),
|
||||||
});
|
});
|
||||||
hiddenList[index].hiddenPart = data;
|
hiddenList[index].hiddenPart = data;
|
||||||
}
|
}
|
||||||
|
|
@ -439,7 +440,7 @@ function Add(props) {
|
||||||
span: 8,
|
span: 8,
|
||||||
render: FORM_ITEM_RENDER_ENUM.DATETIME,
|
render: FORM_ITEM_RENDER_ENUM.DATETIME,
|
||||||
formItemProps: { labelCol: { span: 6 } },
|
formItemProps: { labelCol: { span: 6 } },
|
||||||
rules: [validatorEndTime(timeStart)],
|
rules: [validatorEndTime({ startTime: timeStart })],
|
||||||
},
|
},
|
||||||
{ label: "检查人员", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
|
{ label: "检查人员", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
|
||||||
{
|
{
|
||||||
|
|
@ -553,7 +554,8 @@ function Add(props) {
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
if (record.hiddenId) {
|
if (record.hiddenId) {
|
||||||
getCurrentHiddenInfo(record.id, record.hiddenId);
|
getCurrentHiddenInfo(record.id, record.hiddenId);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
setCurrentHiddenInfo({ ...record });
|
setCurrentHiddenInfo({ ...record });
|
||||||
}
|
}
|
||||||
setHiddenDiscovererUserList(getHiddenDiscovererUserList());
|
setHiddenDiscovererUserList(getHiddenDiscovererUserList());
|
||||||
|
|
@ -626,7 +628,8 @@ function Add(props) {
|
||||||
onConfirm={(values) => {
|
onConfirm={(values) => {
|
||||||
if (currentHiddenIndex.current === -1) {
|
if (currentHiddenIndex.current === -1) {
|
||||||
setHiddenList([...hiddenList, values]);
|
setHiddenList([...hiddenList, values]);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
setHiddenList(
|
setHiddenList(
|
||||||
hiddenList.map((item, index) => {
|
hiddenList.map((item, index) => {
|
||||||
if (index === currentHiddenIndex.current)
|
if (index === currentHiddenIndex.current)
|
||||||
|
|
|
||||||
|
|
@ -313,7 +313,7 @@ const AddModalComponent = (props) => {
|
||||||
name: "planEndTime",
|
name: "planEndTime",
|
||||||
label: "计划结束时间",
|
label: "计划结束时间",
|
||||||
render: FORM_ITEM_RENDER_ENUM.DATE,
|
render: FORM_ITEM_RENDER_ENUM.DATE,
|
||||||
rules: [validatorEndTime(planStartTime)],
|
rules: [validatorEndTime({ startTime: planStartTime })],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "corpId",
|
name: "corpId",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue