fix
parent
bfaadb2d9f
commit
68182377e0
|
|
@ -681,9 +681,9 @@ function StaffFormModal({
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="workExperience"
|
name="workExperience"
|
||||||
label="主要学习工作经历"
|
label="主要学习工作经历"
|
||||||
rules={[{ max: 10000, message: "不能超过10000个字符" }]}
|
|
||||||
>
|
>
|
||||||
<Input.TextArea rows={3} placeholder="请输入" maxLength={10000} showCount />
|
<Input.TextArea rows={3} placeholder="请输入" maxLength={1000} showCount />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={24}>
|
<Col span={24}>
|
||||||
|
|
|
||||||
|
|
@ -96,15 +96,7 @@ export default function BasicInfoStep({ form, disabled }) {
|
||||||
label="固定资产总值(万元)"
|
label="固定资产总值(万元)"
|
||||||
rules={[
|
rules={[
|
||||||
{ required: !disabled, message: "请输入固定资产总值" },
|
{ required: !disabled, message: "请输入固定资产总值" },
|
||||||
{ type: "number", max: 100000000, min: 0, message: "请输入0-100000000之间的数字,最多9位整数" },
|
|
||||||
{
|
|
||||||
validator: (_, value) =>
|
|
||||||
value === undefined || value === null || value === ""
|
|
||||||
? Promise.resolve()
|
|
||||||
: /^\d{1,9}(\.\d{1,2})?$/.test(String(value))
|
|
||||||
? Promise.resolve()
|
|
||||||
: Promise.reject(new Error("整数最多9位,小数最多2位")),
|
|
||||||
},
|
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<InputNumber
|
<InputNumber
|
||||||
|
|
@ -122,15 +114,7 @@ export default function BasicInfoStep({ form, disabled }) {
|
||||||
label="工作场所建筑面积(㎡)"
|
label="工作场所建筑面积(㎡)"
|
||||||
rules={[
|
rules={[
|
||||||
{ required: !disabled, message: "请输入工作场所建筑面积" },
|
{ required: !disabled, message: "请输入工作场所建筑面积" },
|
||||||
{ type: "number", max: 100000000, min: 0, message: "请输入0-100000000之间的数字,最多9位整数" },
|
|
||||||
{
|
|
||||||
validator: (_, value) =>
|
|
||||||
value === undefined || value === null || value === ""
|
|
||||||
? Promise.resolve()
|
|
||||||
: /^\d{1,9}(\.\d{1,2})?$/.test(String(value))
|
|
||||||
? Promise.resolve()
|
|
||||||
: Promise.reject(new Error("整数最多9位,小数最多2位")),
|
|
||||||
},
|
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<InputNumber
|
<InputNumber
|
||||||
|
|
@ -146,17 +130,7 @@ export default function BasicInfoStep({ form, disabled }) {
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="archiveRoomArea"
|
name="archiveRoomArea"
|
||||||
label="档案室面积(㎡)"
|
label="档案室面积(㎡)"
|
||||||
rules={[
|
|
||||||
{ type: "number", max: 100000000, min: 0, message: "请输入0-100000000之间的数字,最多9位整数" },
|
|
||||||
{
|
|
||||||
validator: (_, value) =>
|
|
||||||
value === undefined || value === null || value === ""
|
|
||||||
? Promise.resolve()
|
|
||||||
: /^\d{1,9}(\.\d{1,2})?$/.test(String(value))
|
|
||||||
? Promise.resolve()
|
|
||||||
: Promise.reject(new Error("整数最多9位,小数最多2位")),
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
>
|
>
|
||||||
<InputNumber
|
<InputNumber
|
||||||
style={{ width: "100%" }}
|
style={{ width: "100%" }}
|
||||||
|
|
@ -171,7 +145,7 @@ export default function BasicInfoStep({ form, disabled }) {
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="fulltimeEvaluatorCount"
|
name="fulltimeEvaluatorCount"
|
||||||
label="专职安全评价师数量(人)"
|
label="专职安全评价师数量(人)"
|
||||||
rules={[{ type: "number", max: 100000000, min: 0, message: "请输入0-100000000之间的数字,最多9位" }]}
|
|
||||||
>
|
>
|
||||||
<InputNumber style={{ width: "100%" }} min={0} max={100000000} maxLength={9} placeholder="人" />
|
<InputNumber style={{ width: "100%" }} min={0} max={100000000} maxLength={9} placeholder="人" />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
@ -180,7 +154,7 @@ export default function BasicInfoStep({ form, disabled }) {
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="registeredEngineerCount"
|
name="registeredEngineerCount"
|
||||||
label="注册安全工程师数量(人)"
|
label="注册安全工程师数量(人)"
|
||||||
rules={[{ type: "number", max: 100000000, min: 0, message: "请输入0-100000000之间的数字,最多9位" }]}
|
|
||||||
>
|
>
|
||||||
<InputNumber style={{ width: "100%" }} min={0} max={100000000} maxLength={9} placeholder="人" />
|
<InputNumber style={{ width: "100%" }} min={0} max={100000000} maxLength={9} placeholder="人" />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,14 @@
|
||||||
import { Button, Modal, Space, Table } from "antd";
|
import { Button, Modal, Space, Table } from "antd";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import StaffViewModal from "~/components/StaffViewModal";
|
import StaffViewModal from "~/components/StaffViewModal";
|
||||||
|
|
||||||
import OrgPersonnelSelectModal from "./OrgPersonnelSelectModal";
|
import OrgPersonnelSelectModal from "./OrgPersonnelSelectModal";
|
||||||
|
|
||||||
export default function PersonnelStep({
|
const PersonnelStep=({
|
||||||
personnelList = [],
|
personnelList = [],
|
||||||
disabled,
|
disabled,
|
||||||
onAdd,
|
onAdd,
|
||||||
onRemove,
|
onRemove,
|
||||||
}) {
|
})=> {
|
||||||
const [selectOpen, setSelectOpen] = useState(false);
|
const [selectOpen, setSelectOpen] = useState(false);
|
||||||
const [viewId, setViewId] = useState("");
|
const [viewId, setViewId] = useState("");
|
||||||
|
|
||||||
|
|
@ -32,6 +31,7 @@ export default function PersonnelStep({
|
||||||
size="small"
|
size="small"
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
pagination={false}
|
pagination={false}
|
||||||
|
scroll={{ y: 400 }}
|
||||||
dataSource={personnelList}
|
dataSource={personnelList}
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "序号", width: 60, render: (_, __, index) => index + 1 },
|
{ title: "序号", width: 60, render: (_, __, index) => index + 1 },
|
||||||
|
|
@ -77,3 +77,5 @@ export default function PersonnelStep({
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default PersonnelStep;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue