master
parent
d97a24ed2b
commit
e70974e76e
|
|
@ -46,7 +46,7 @@ module.exports = {
|
||||||
// 开发服务
|
// 开发服务
|
||||||
server: {
|
server: {
|
||||||
// 监听端口号
|
// 监听端口号
|
||||||
port: "8081",
|
port: "8082",
|
||||||
// 服务地址
|
// 服务地址
|
||||||
host: "127.0.0.1",
|
host: "127.0.0.1",
|
||||||
// 是否自动打开浏览器
|
// 是否自动打开浏览器
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,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.0.119"
|
"zy-react-library": "^1.0.124"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
"@antfu/eslint-config": "^5.4.1",
|
||||||
|
|
|
||||||
|
|
@ -117,8 +117,8 @@ const AddModalComponent = (props) => {
|
||||||
render: (
|
render: (
|
||||||
<DepartmentSelectTree
|
<DepartmentSelectTree
|
||||||
onChange={() => {
|
onChange={() => {
|
||||||
form.setFieldValue("userId", "");
|
form.setFieldValue("userId", []);
|
||||||
form.setFieldValue("confirmUsers", "");
|
form.setFieldValue("confirmUsers", []);
|
||||||
}}
|
}}
|
||||||
onGetLabel={(label) => {
|
onGetLabel={(label) => {
|
||||||
form.setFieldValue("deptName", label);
|
form.setFieldValue("deptName", label);
|
||||||
|
|
|
||||||
|
|
@ -336,10 +336,10 @@ function Add(props) {
|
||||||
label: "隐患确认人",
|
label: "隐患确认人",
|
||||||
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
||||||
items: confirmUserList,
|
items: confirmUserList,
|
||||||
itemsField: { valueKey: "id", labelKey: "userName" },
|
itemsField: { valueKey: "userId", labelKey: "userName" },
|
||||||
componentProps: {
|
componentProps: {
|
||||||
onChange: (value) => {
|
onChange: (value) => {
|
||||||
const findItem = confirmUserList.find(item => item.id === value);
|
const findItem = confirmUserList.find(item => item.userId === value);
|
||||||
form.setFieldValue("confirmUserName", findItem.userName);
|
form.setFieldValue("confirmUserName", findItem.userName);
|
||||||
form.setFieldValue("confirmDeptName", findItem.deptName);
|
form.setFieldValue("confirmDeptName", findItem.deptName);
|
||||||
form.setFieldValue("confirmDeptId", findItem.deptId);
|
form.setFieldValue("confirmDeptId", findItem.deptId);
|
||||||
|
|
|
||||||
|
|
@ -186,7 +186,7 @@ const AddModalComponent = (props) => {
|
||||||
form.setFieldsValue(data);
|
form.setFieldsValue(data);
|
||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getData();
|
props.id && getData();
|
||||||
}, []);
|
}, []);
|
||||||
const onSubmit = async (values) => {
|
const onSubmit = async (values) => {
|
||||||
const { success } = await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id });
|
const { success } = await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id });
|
||||||
|
|
@ -215,7 +215,7 @@ const AddModalComponent = (props) => {
|
||||||
showActionButtons={false}
|
showActionButtons={false}
|
||||||
onFinish={onSubmit}
|
onFinish={onSubmit}
|
||||||
options={[
|
options={[
|
||||||
{ name: "parentName", label: "上级区域/设备名称", required: false, render: <Tag color="blue">{props.parentName}</Tag> },
|
{ name: "parentName", label: "上级区域/设备名称", required: false, render: <Tag color="blue">{props.parentName || "无"}</Tag> },
|
||||||
{ name: "hiddenregion", label: "区域/设备名称" },
|
{ name: "hiddenregion", label: "区域/设备名称" },
|
||||||
{
|
{
|
||||||
name: "responsibleDeptId",
|
name: "responsibleDeptId",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue