diff --git a/package.json b/package.json index 2cfcdd2..fd4abbd 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "relation-graph": "^2.2.11", - "zy-react-library": "^1.0.153" + "zy-react-library": "^1.1.10" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/main.js b/src/main.js index c1cdccb..7f79acf 100644 --- a/src/main.js +++ b/src/main.js @@ -6,6 +6,7 @@ import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; require("antd/dist/reset.css"); +require("zy-react-library/css/common.less"); dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); diff --git a/src/pages/Container/BusinessLicense/index.js b/src/pages/Container/BusinessLicense/index.js index a57c058..0680744 100644 --- a/src/pages/Container/BusinessLicense/index.js +++ b/src/pages/Container/BusinessLicense/index.js @@ -67,7 +67,7 @@ function Department(props) { onFinish={getData} /> ( <> */} - {/* )} */} + {info.lrMobile } + {/* { (info.lrMobile && info.lrMobile.label) */} + {/* && ( */} + {/* */} + {/* )} */} - - ), - }, - { - label: "主要负责人", - children: info.contacts, - }, - { - label: "主要负责人手机号", - children: ( -
+
+ ), + }, + { + label: "主要负责人", + children: info.contacts, + }, + { + label: "主要负责人手机号", + children: ( +
- { info.contactsPhone } - {/* { (info.contactsPhone && info.contactsPhone.label) */} - {/* && ( */} - {/* */} - {/* )} */} + { info.contactsPhone } + {/* { (info.contactsPhone && info.contactsPhone.label) */} + {/* && ( */} + {/* */} + {/* )} */} -
- ), + + ), - }, - { - label: "安全负责人", - children: info.safetyName, - }, - { - label: "安全负责人手机号", - children: ( -
- {info.lrMobile && info.lrMobile.label} - {info.safetyPhone } - {/* { (info.safetyPhone && info.safetyPhone.label) */} - {/* && ( */} - {/* */} - {/* )} */} + }, + { + label: "安全负责人", + children: info.safetyName, + }, + { + label: "安全负责人手机号", + children: ( +
+ {info.lrMobile && info.lrMobile.label} + {info.safetyPhone } + {/* { (info.safetyPhone && info.safetyPhone.label) */} + {/* && ( */} + {/* */} + {/* )} */} -
- ), - }, - { - label: "是否规模以上", - children: ( -
- {info.scaleType === 1 - ? "是" - : info.scaleType === 0 - ? "否" - : ""} -
- ), - }, - { - label: "企事业单位经营地址", - children: info.addressBusiness, - }, - { - label: "营业执照", - children: , - }, - { - label: "营业执照有效期", - children: info.licenseStart ? ` ${info.licenseStart} 至 ${info.licenseEnd}` : "", - }, - ]} - column={2} - loading={getFileLoading} - labelStyle={{ - width: 200, - }} - /> - {/* 企业相关属性 */} - {/* {info.whetherHygieneFlag === 1 ? "是" : "否"} }, */} - {/* { label: "有无重大危险源", children: {info.whetherHazardsFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否有稀缺大型应急物资和设施", children: {info.whetherScarceFlag === 1 ? "是" : "否"} }, */} - {/* { label: "有无涉及危化品", children: {info.whetherChemicalsFlag === 1 ? "是" : "否"} }, */} - {/* { label: "有无特种设备", children: {info.whetherSpecialequipmentFlag === 1 ? "是" : "否"} }, */} - {/* { label: "有无特种工作人员", children: {info.whetherSpecialpeopleFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否涉及煤气", children: {info.whetherCoalgasFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否属于消防重点单位", children: {info.whetherFireFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否在有限空间作业", children: {info.whetherConfinedFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否存在涉爆粉尘作业", children: {info.whetherPowderFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否涉及防雷防静电", children: {info.whetherLightningFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否持有放射源", children: {info.whetherActinogenFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否涉及液氨制冷", children: {info.whetherLiquidammoniaFlag === 1 ? "是" : "否"} }, */} - {/* { label: "是否涉及危险品管道", children: {info.whetherPipelineFlag === 1 ? "是" : "否"} }, */} - {/* ]} */} - {/* /> */} -
- {props.permission("qyxx-edit") +
+ ), + }, + { + label: "是否规模以上", + children: ( +
+ {info.scaleType === 1 + ? "是" + : info.scaleType === 0 + ? "否" + : ""} +
+ ), + }, + { + label: "企事业单位经营地址", + children: info.addressBusiness, + }, + { + label: "营业执照", + children: , + }, + { + label: "营业执照有效期", + children: info.licenseStart ? ` ${info.licenseStart} 至 ${info.licenseEnd}` : "", + }, + ]} + column={2} + confirmLoading={getFileLoading} + labelStyle={{ + width: 200, + }} + /> + {/* 企业相关属性 */} + {/* {info.whetherHygieneFlag === 1 ? "是" : "否"} }, */} + {/* { label: "有无重大危险源", children: {info.whetherHazardsFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否有稀缺大型应急物资和设施", children: {info.whetherScarceFlag === 1 ? "是" : "否"} }, */} + {/* { label: "有无涉及危化品", children: {info.whetherChemicalsFlag === 1 ? "是" : "否"} }, */} + {/* { label: "有无特种设备", children: {info.whetherSpecialequipmentFlag === 1 ? "是" : "否"} }, */} + {/* { label: "有无特种工作人员", children: {info.whetherSpecialpeopleFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否涉及煤气", children: {info.whetherCoalgasFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否属于消防重点单位", children: {info.whetherFireFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否在有限空间作业", children: {info.whetherConfinedFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否存在涉爆粉尘作业", children: {info.whetherPowderFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否涉及防雷防静电", children: {info.whetherLightningFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否持有放射源", children: {info.whetherActinogenFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否涉及液氨制冷", children: {info.whetherLiquidammoniaFlag === 1 ? "是" : "否"} }, */} + {/* { label: "是否涉及危险品管道", children: {info.whetherPipelineFlag === 1 ? "是" : "否"} }, */} + {/* ]} */} + {/* /> */} +
+ {props.permission("qyxx-edit") + && ( + + )} +
+ {isModalOpen && ( - - )} -
- {isModalOpen - && ( - setIsModalOpen(false)} - > -
- - - - + + + - - - )} + + + )} + ); } diff --git a/src/pages/Container/Enterprise/CorpInfo/Update/index.js b/src/pages/Container/Enterprise/CorpInfo/Update/index.js index c3e68a3..a833d62 100644 --- a/src/pages/Container/Enterprise/CorpInfo/Update/index.js +++ b/src/pages/Container/Enterprise/CorpInfo/Update/index.js @@ -2,14 +2,13 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import Map from "zy-react-library/components/Map"; +import Page from "zy-react-library/components/Page"; import AreaSelect from "zy-react-library/components/SelectTree/Area"; import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import IndustrySelect from "zy-react-library/components/SelectTree/Industry"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; - import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useGetFile from "zy-react-library/hooks/useGetFile"; @@ -256,249 +255,246 @@ function Update(props) { } return ( <> - -
- +
+ - setCityData(nodes)} - /> - ), - }, - { - label: "邮政编码", - name: "postalCode", - required: false, - rules: [ - { - pattern: POSTAL_CODE, - message: "请输入正确的邮政编码", - }, - ], - }, - { - label: "规模", - name: "scale", - required: false, - render: ( - { - setScaleData(data); - }} - /> - ), - }, - { - label: "成立时间", - name: "createDate", - required: false, - render: FORM_ITEM_RENDER_ENUM.DATE, - }, - { - label: "企业状态", - name: "corpState", - required: false, - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: ENTERPRISE_STATUS, + }, + { + label: "所属区域", + span: 24, + name: "region", + render: ( + + setCityData(nodes)} + /> + ), + }, + { + label: "邮政编码", + name: "postalCode", + required: false, + rules: [ + { + pattern: POSTAL_CODE, + message: "请输入正确的邮政编码", + }, + ], + }, + { + label: "规模", + name: "scale", + required: false, + render: ( + { + setScaleData(data); + }} + /> + ), + }, + { + label: "成立时间", + name: "createDate", + required: false, + render: FORM_ITEM_RENDER_ENUM.DATE, + }, + { + label: "企业状态", + name: "corpState", + required: false, + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: ENTERPRISE_STATUS, - }, - { - name: "map", - customizeRender: true, - render: , - span: 24, - }, - { - label: "职工人数（人）", - name: "employees", - required: false, - render: FORM_ITEM_RENDER_ENUM.NUMBER, - }, - { - label: "占地面积(㎡)", - name: "areaCovered", - required: false, - render: FORM_ITEM_RENDER_ENUM.NUMBER, - }, - { - label: "注册资金（万元）", - name: "regcapital", - required: false, - render: FORM_ITEM_RENDER_ENUM.NUMBER, - }, - { - label: "资产总额（万元）", - name: "totalAssets", - required: false, - render: FORM_ITEM_RENDER_ENUM.NUMBER, - }, - // { - // label: "开户人", - // name: "createName", - // required: false, - // componentProps: { - // disabled: true, - // }, - // }, - { - label: "所属行业", - name: "INDUSTRYALL", - span: 24, - render: ( - { - setIndustryData(data); - }} - /> - ), - }, - { - label: "法定代表人", - name: "lrName", - required: false, - }, - { - label: "法定代表人手机号", - name: "lrMobile", - required: false, - rules: [ - { - pattern: PHONE, - message: "请输入正确的手机号", - }, - ], - }, - { - label: "主要负责人", - name: "contacts", - }, - { - label: "主要负责人手机号", - name: "contactsPhone", - rules: [ - { - pattern: PHONE, - message: "请输入正确的手机号", - }, - ], - }, - { - label: "安全负责人", - name: "safetyName", - required: false, - }, - { - label: "安全负责人电话手机号", - name: "safetyPhone", - required: false, - rules: [ - { - pattern: PHONE, - message: "请输入正确的手机号", - }, - ], - }, - { - label: "是否规模以上", - name: "scaleType", - required: false, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: WHETHER_ENUM, - }, - { - label: "企事业单位经营地址", - name: "addressBusiness", - }, - { - label: "营业执照", - name: "licenseFile", - render: ( - { - setDeleteLicenseImageFiles([ - ...deleteLicenseImageFiles, - file, - ]); - }} - /> - ), - }, - { - label: "营业执照有效期", - name: "license", - render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, - }, + }, + { + name: "map", + customizeRender: true, + render: , + span: 24, + }, + { + label: "职工人数（人）", + name: "employees", + required: false, + render: FORM_ITEM_RENDER_ENUM.NUMBER, + }, + { + label: "占地面积(㎡)", + name: "areaCovered", + required: false, + render: FORM_ITEM_RENDER_ENUM.NUMBER, + }, + { + label: "注册资金（万元）", + name: "regcapital", + required: false, + render: FORM_ITEM_RENDER_ENUM.NUMBER, + }, + { + label: "资产总额（万元）", + name: "totalAssets", + required: false, + render: FORM_ITEM_RENDER_ENUM.NUMBER, + }, + // { + // label: "开户人", + // name: "createName", + // required: false, + // componentProps: { + // disabled: true, + // }, + // }, + { + label: "所属行业", + name: "INDUSTRYALL", + span: 24, + render: ( + { + setIndustryData(data); + }} + /> + ), + }, + { + label: "法定代表人", + name: "lrName", + required: false, + }, + { + label: "法定代表人手机号", + name: "lrMobile", + required: false, + rules: [ + { + pattern: PHONE, + message: "请输入正确的手机号", + }, + ], + }, + { + label: "主要负责人", + name: "contacts", + }, + { + label: "主要负责人手机号", + name: "contactsPhone", + rules: [ + { + pattern: PHONE, + message: "请输入正确的手机号", + }, + ], + }, + { + label: "安全负责人", + name: "safetyName", + required: false, + }, + { + label: "安全负责人电话手机号", + name: "safetyPhone", + required: false, + rules: [ + { + pattern: PHONE, + message: "请输入正确的手机号", + }, + ], + }, + { + label: "是否规模以上", + name: "scaleType", + required: false, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: WHETHER_ENUM, + }, + { + label: "企事业单位经营地址", + name: "addressBusiness", + }, + { + label: "营业执照", + name: "licenseFile", + render: ( + { + setDeleteLicenseImageFiles([ + ...deleteLicenseImageFiles, + file, + ]); + }} + /> + ), + }, + { + label: "营业执照有效期", + name: "license", + render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, + }, - { - label: "办公地址", - required: false, - name: "addressOffice", - }, + { + label: "办公地址", + required: false, + name: "addressOffice", + }, // { label: "企业相关属性", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, // { // label: "有无职业卫生信息", @@ -599,14 +595,16 @@ function Update(props) { // render: FORM_ITEM_RENDER_ENUM.RADIO, // items: WHETHER_ENUM, // }, - ]} - labelCol={{ - span: 6, - }} - onFinish={onSubmit} - onValuesChange={onValuesChange} - /> -
+ ]} + labelCol={{ + span: 6, + }} + onFinish={onSubmit} + onValuesChange={onValuesChange} + /> +
+ + ); } diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js index 49bad76..5af3648 100644 --- a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js +++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js @@ -1,11 +1,11 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; - +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; -import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; +import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; import { NS_USER } from "~/enumerate/namespace"; @@ -20,7 +20,7 @@ const ENTERPRISE_TYPE = [ name: "集团单位", }, ]; -function List(props) { +function ChangeList(props) { const [form] = Form.useForm(); const queryParams = useGetUrlQuery(); const { tableProps, getData } = useTable(props["userEmploymentLogAll"], { @@ -35,12 +35,8 @@ function List(props) { }); return (
- -
+ + ( @@ -108,8 +105,8 @@ function List(props) { ]} {...tableProps} /> -
+
); } -export default Connect([NS_USER], true)(List); +export default Connect([NS_USER], true)(Permission(ChangeList)); diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js index a965625..0326793 100644 --- a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js +++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js @@ -1,10 +1,9 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; - import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace"; function ChangeView(props) { @@ -64,12 +63,8 @@ function ChangeView(props) { return (
- -
+ + 变更前信息 -
+ { queryParams["type"] === "disposal" diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js index 1076324..7445a5c 100644 --- a/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js +++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js @@ -1,15 +1,16 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { useEffect, useState } from "react"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; -import Search from "zy-react-library/components/Search"; +import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; -import { getLabelName } from "zy-react-library/utils"; +import { getLabelName } from "zy-react-library/utils"; import { NS_USER } from "~/enumerate/namespace"; import { UseDecodeIdCard } from "~/utils"; @@ -105,10 +106,10 @@ function List(props) { title: "手机号", dataIndex: "phone", }, - { - title: "中台是否存在", - dataIndex: "name", - }, + // { + // title: "中台是否存在", + // dataIndex: "name", + // }, { title: "状态", dataIndex: "name", @@ -124,7 +125,7 @@ function List(props) { }, { title: "操作", - width: 180, + width: 220, render: (_, record) => ( - - + { + props.permission("qyd-qyyhzt-record") + + && ( + + ) + } + { + props.permission("qyd-qyyhzt-disposal") + && ( + + ) + } ), }, @@ -303,4 +315,4 @@ function AddModalComponent(props) { ); } const AddModal = AddModalComponent; -export default Connect([NS_USER], true)(List); +export default Connect([NS_USER], true)(Permission(List)); diff --git a/src/pages/Container/Enterprise/OrganizationStructure/index.js b/src/pages/Container/Enterprise/OrganizationStructure/index.js index ecd3d6d..adb4ecd 100644 --- a/src/pages/Container/Enterprise/OrganizationStructure/index.js +++ b/src/pages/Container/Enterprise/OrganizationStructure/index.js @@ -277,6 +277,7 @@ function AddModalComponent(props) { width={800} onOk={() => form.submit()} onCancel={onCancel} + confirmLoading={props.loding} > diff --git a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/List/index.js b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/List/index.js index 13cad23..e74fc6b 100644 --- a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/List/index.js +++ b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/List/index.js @@ -5,13 +5,13 @@ import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import AreaSelect from "zy-react-library/components/SelectTree/Area"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; - import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { getLabelName } from "zy-react-library/utils"; import { NS_ENTERPRISE } from "~/enumerate/namespace"; @@ -103,189 +103,187 @@ function List(props) { form.setFieldValue("cityRecord", []); }; return ( -
+
+ - onFinish()} - onReset={onReset} - options={[ - { - name: "likecorpName", - label: "企业名称", - }, - { - name: "cityData", - label: "属地", - render: ( - - setCityData(nodes)} - /> - ), - }, - { - name: "CreateTime", - label: "开户时间", - render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, - }, - { - name: "eqType", - label: "相关方类型", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: ENTERPRISE_TYPE, - }, - { - name: "cityRecord", - label: "属地", - render: FORM_ITEM_RENDER_ENUM.SELECT, - onlyForLabel: true, - }, - - ]} - - /> - -
( - <> + onFinish()} + onReset={onReset} + options={[ { - props.permission("qyd-xgf-zhgl-add") - && ( - - ) - } - - )} - columns={[ - { - title: "企业名称", - dataIndex: "corpName", - }, - { - title: "属地", - dataIndex: "cityName", - width: 300, - render: (_, record) => ( -
{getAreaNamePath(record)}
- ), - }, - { - title: "创建单位", - dataIndex: "createName", - }, - { - title: "开户人", - dataIndex: "accountContactName", - }, - { - title: "统一社会信用代码", - dataIndex: "code", - width: 190, - }, - { - title: "开户时间", - dataIndex: "createTime", - width: 120, - }, - { - title: "相关方类型", - dataIndex: "type", - width: 120, - render: (_, record) => ( - getLabelName({ - status: record.type, - list: ENTERPRISE_TYPE, - }) - ), + name: "likecorpName", + label: "企业名称", + }, + { + name: "cityData", + label: "属地", + render: ( + + setCityData(nodes)} + /> + ), + }, + { + name: "CreateTime", + label: "开户时间", + render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, + }, + { + name: "eqType", + label: "相关方类型", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: ENTERPRISE_TYPE, + }, + { + name: "cityRecord", + label: "属地", + render: FORM_ITEM_RENDER_ENUM.SELECT, + onlyForLabel: true, + }, - }, - { - title: "操作", - width: 300, - render: (_, record) => ( - - { - props.permission("qyd-xgf-zhgl-info") - && ( - - ) - } - { + ]} - props.permission("qyd-xgf-zhgl-edit") - && ( - - ) - } - {props.permission("qyd-xgf-resetPassword") - && ( - - )} - {props.permission("qyd-xgf-zhgl-delete") - && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - {addModalOpen && ( - { - setAddModalOpen(false); - setCurrentId(""); - }} /> - )} + +
( + <> + { + props.permission("qyd-xgf-zhgl-add") + && ( + + ) + } + + )} + columns={[ + { + title: "企业名称", + dataIndex: "corpName", + }, + { + title: "属地", + dataIndex: "cityName", + width: 300, + render: (_, record) => ( +
{getAreaNamePath(record)}
+ ), + }, + { + title: "创建单位", + dataIndex: "createName", + }, + { + title: "开户人", + dataIndex: "accountContactName", + }, + { + title: "统一社会信用代码", + dataIndex: "code", + width: 190, + }, + { + title: "开户时间", + dataIndex: "createTime", + width: 120, + }, + { + title: "相关方类型", + dataIndex: "type", + width: 120, + render: (_, record) => ( + getLabelName({ + status: record.type, + list: ENTERPRISE_TYPE, + }) + ), + + }, + { + title: "操作", + width: 300, + render: (_, record) => ( + + { + props.permission("qyd-xgf-zhgl-info") + && ( + + ) + } + { + + props.permission("qyd-xgf-zhgl-edit") + && ( + + ) + } + {props.permission("qyd-xgf-resetPassword") + && ( + + )} + {props.permission("qyd-xgf-zhgl-delete") + && ( + + )} + + ), + }, + ]} + {...tableProps} + /> + {addModalOpen && ( + { + setAddModalOpen(false); + setCurrentId(""); + }} + /> + )} + ); } @@ -422,7 +420,7 @@ function AddModalComponent(props) { form={form} span={24} - loading={props.loading} + confirmLoading={props.loading} options={[ { name: "corpName", diff --git a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js index 0c603fc..5884d41 100644 --- a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js +++ b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js @@ -1,14 +1,14 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, Form, Input, Modal, QRCode } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import PreviewImg from "zy-react-library/components/PreviewImg"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import { getLabelName } from "zy-react-library/utils"; +import { getLabelName } from "zy-react-library/utils"; import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { getAreaNamePath, getCorpTypeNamePath } from "~/utils"; @@ -74,12 +74,12 @@ function View(props) { }; return (
- -
+ 基本信息 -
+ {corpInfoQrCodeOpen && ( - onFinish()} - onReset={onReset} - options={[ - { - name: "likeCorpName", - label: "企业名称", - }, - { - name: "cityData", - label: "属地", - render: ( - - setCityData(nodes)} - /> - ), - }, - { name: "eqType", label: "相关方类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE }, - { - name: "cityRecord", - label: "属地", - render: FORM_ITEM_RENDER_ENUM.SELECT, - onlyForLabel: true, - }, - ]} - /> -
+ + onFinish()} + onReset={onReset} + options={[ + { + name: "likeCorpName", + label: "企业名称", + }, + { + name: "cityData", + label: "属地", + render: ( + + setCityData(nodes)} + /> + ), + }, + { name: "eqType", label: "相关方类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE }, + { + name: "cityRecord", + label: "属地", + render: FORM_ITEM_RENDER_ENUM.SELECT, + onlyForLabel: true, + }, + ]} + /> +
( - getLabelName({ - status: record.type, - list: ENTERPRISE_TYPE, - }) - ), - width: 120, - }, - { - title: "属地", - dataIndex: "cityName", - render: (_, record) => ( -
{getAreaNamePath(record)}
- ), - }, - { - title: "创建单位", - dataIndex: "tenantName", - }, - { - title: "企业人数", - dataIndex: "userCount", - width: 120, - render: (_, record) => ( -
{record.userCount ? record.userCount : "0"}
- ), - }, - { - title: "安全人员信息数", - dataIndex: "safetyUserCount", - width: 140, - }, - { - title: "特种作业人数", - dataIndex: "specialUserCount", - width: 120, - }, - // { title: "公司状态", dataIndex: "corpStateName" }, + }, + { + title: "相关方类型", + dataIndex: "type", + render: (_, record) => ( + getLabelName({ + status: record.type, + list: ENTERPRISE_TYPE, + }) + ), + width: 120, + }, + { + title: "属地", + dataIndex: "cityName", + render: (_, record) => ( +
{getAreaNamePath(record)}
+ ), + }, + { + title: "创建单位", + dataIndex: "tenantName", + }, + { + title: "企业人数", + dataIndex: "userCount", + width: 120, + render: (_, record) => ( +
{record.userCount ? record.userCount : "0"}
+ ), + }, + { + title: "安全人员信息数", + dataIndex: "safetyUserCount", + width: 140, + }, + { + title: "特种作业人数", + dataIndex: "specialUserCount", + width: 120, + }, + // { title: "公司状态", dataIndex: "corpStateName" }, - // { title: "启用状态", dataIndex: "useFlag", render: (_, record) => ( - // {record.useFlag === 1 ? "停用" : record.useFlag === 0 ? "启用" : ""} - // ) }, + // { title: "启用状态", dataIndex: "useFlag", render: (_, record) => ( + // {record.useFlag === 1 ? "停用" : record.useFlag === 0 ? "启用" : ""} + // ) }, - { - title: "操作", - width: 150, - hidden: !(props.permission("qyd-xgf-yhgl-userList")), - render: (_, record) => ( - - - - ), - }, - ]} - {...tableProps} - /> + { + title: "操作", + width: 150, + hidden: !(props.permission("qyd-xgf-yhgl-userList")), + render: (_, record) => ( + + + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Enterprise/StakeholderUnit/User/UserList/index.js b/src/pages/Container/Enterprise/StakeholderUnit/User/UserList/index.js index 19d1bce..10d7f8e 100644 --- a/src/pages/Container/Enterprise/StakeholderUnit/User/UserList/index.js +++ b/src/pages/Container/Enterprise/StakeholderUnit/User/UserList/index.js @@ -2,15 +2,14 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; -import PreviewImg from "zy-react-library/components/PreviewImg"; +import Page from "zy-react-library/components/Page"; +import PreviewImg from "zy-react-library/components/PreviewImg"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; - import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; @@ -61,6 +60,22 @@ function List(props) { }, }); }; + + // 清除伪类 + useEffect(() => { + const style = document.createElement("style"); + style.innerHTML = ` + .search-layout::after { + content: none !important; + display: none !important; + } + `; + document.head.appendChild(style); + // 清理函数，在组件卸载时移除样式 + return () => { + document.head.removeChild(style); + }; + }, []); const onTreeChange = (selectedKeys) => { const key = selectedKeys[0] || null; setSelectedNodeId(key); @@ -68,23 +83,21 @@ function List(props) { }; return (
- -
+ +
( - {/* { */} - {/* props.permission("qyd-xgf-yhgl-info") */} - {/* && ( */} - - {/* // */} - {/* // ) */} - {/* // } */} - {/* {props.permission("qyd-xgf-yhgl-resetPassword") */} - {/* && ( */} - - {/* )} */} + { + props.permission("xgf-yhgl-userList-info") + && ( + + + ) + } + {props.permission("xgf-yhgl-userList-resetPassword") + && ( + + )} ), @@ -175,7 +190,7 @@ function List(props) { }} /> )} - + ); } diff --git a/src/pages/Container/Enterprise/User/Add/index.js b/src/pages/Container/Enterprise/User/Add/index.js index 5fd65fa..a9c3cf7 100644 --- a/src/pages/Container/Enterprise/User/Add/index.js +++ b/src/pages/Container/Enterprise/User/Add/index.js @@ -2,10 +2,9 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import Upload from "zy-react-library/components/Upload"; - import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -263,190 +262,195 @@ function Add(props) { }; return ( <> - -
- + +
- ), - - }, - { - name: "postId", - label: "所属岗位", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: postData, - componentProps: { - disabled: queryParams["id"], - }, - itemsField: { - labelKey: "postName", - valueKey: "id", - }, - }, - { - name: "phone", - label: "手机号", - tip: "* 手机号为用户名，修改手机号，登录密码则会变成初始密码“Aa@12345678", - rules: [ - { - pattern: PHONE, - message: "请输入正确的手机号", + > + + ), + + }, + { + name: "postId", + label: "所属岗位", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: postData, + componentProps: { + disabled: queryParams["id"], + }, + itemsField: { + labelKey: "postName", + valueKey: "id", }, - ], - }, - { - name: "nation", - label: "民族", - required: false, - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: nation, - }, - { - name: "sex", - label: "性别", - required: false, - render: FORM_ITEM_RENDER_ENUM.SELECT, - componentProps: { - disabled: true, }, - items: SEX, - }, - { - name: "faceFile", - label: "上传人脸照片", - required: false, - span: 24, - render: ( - -
* 图像格式：JPG、JPEG、PNG
-
* 图像大小：不超过4M。
-
* 照片大小: 推荐 500*500
-
* 人脸无遮挡（如戴帽子、口罩、眼镜等）、无修图
-
* 人脸需双眼睁开、表情自然、露额，头发不要遮挡
-
- )} - onRemove={() => { - form.setFieldValue("faceFile"); - return false; - }} - /> - ), - }, - { - name: "sort", - label: "部门排序", - required: false, - render: FORM_ITEM_RENDER_ENUM.NUMBER, - - rules: [ - { - validator: (_, value) => { - if (value === undefined || value === null || value === "") { - return Promise.resolve(); // 如果非必填可移除 required，这里允许空 - } - const num = Number(value); - if (!Number.isInteger(num) || num <= 0) { - return Promise.reject(new Error("请输入大于0的正整数")); - } - return Promise.resolve(); + { + name: "phone", + label: "手机号", + tip: "* 手机号为用户名，修改手机号，登录密码则会变成初始密码“Aa@12345678", + rules: [ + { + pattern: PHONE, + message: "请输入正确的手机号", }, + ], + }, + { + name: "name", + label: "姓名", + }, + + { + name: "personnelType", + label: "人员类型", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: userTypeData, + itemsField: { + labelKey: "dictLabel", + valueKey: "dictValue", }, - ], - }, - // { name: "rank_level", label: "人员职级", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: rankData, itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, - { - name: "email", - label: "邮箱", - required: false, - rules: [ - { - type: "email", - message: "请输入正确的邮箱", + }, + { + name: "userIdCard", + label: "身份证号", + rules: [ + { + pattern: ID_NUMBER, + message: "请输入正确的身份证号", + }, + ], + }, + { + name: "nation", + label: "民族", + required: false, + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: nation, + }, + { + name: "sex", + label: "性别", + required: false, + render: FORM_ITEM_RENDER_ENUM.SELECT, + componentProps: { + disabled: true, }, - ], - }, - { - name: "remarks", - label: "备注", - span: 24, - required: false, - render: FORM_ITEM_RENDER_ENUM.TEXTAREA, - }, - { - name: "departmentLeaderFlag", - label: "是否为部门负责人", - required: false, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: WHETHER_ENUM, - }, - ]} - labelCol={{ - span: 6, - }} - onFinish={onSubmit} - onValuesChange={onValuesChange} - /> -
+ items: SEX, + }, + { + name: "faceFile", + label: "上传人脸照片", + required: false, + span: 24, + render: ( + +
* 图像格式：JPG、JPEG、PNG
+
* 图像大小：不超过4M。
+
* 照片大小: 推荐 500*500
+
* 人脸无遮挡（如戴帽子、口罩、眼镜等）、无修图
+
* 人脸需双眼睁开、表情自然、露额，头发不要遮挡
+ + )} + onRemove={() => { + form.setFieldValue("faceFile"); + return false; + }} + /> + ), + }, + { + name: "sort", + label: "部门排序", + required: false, + render: FORM_ITEM_RENDER_ENUM.NUMBER, + + rules: [ + { + validator: (_, value) => { + if (value === undefined || value === null || value === "") { + return Promise.resolve(); // 如果非必填可移除 required，这里允许空 + } + const num = Number(value); + if (!Number.isInteger(num) || num <= 0) { + return Promise.reject(new Error("请输入大于0的正整数")); + } + return Promise.resolve(); + }, + }, + ], + }, + // { name: "rank_level", label: "人员职级", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: rankData, itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, + { + name: "email", + label: "邮箱", + required: false, + rules: [ + { + type: "email", + message: "请输入正确的邮箱", + }, + ], + }, + { + name: "remarks", + label: "备注", + span: 24, + required: false, + render: FORM_ITEM_RENDER_ENUM.TEXTAREA, + }, + { + name: "departmentLeaderFlag", + label: "是否为部门负责人", + required: false, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: WHETHER_ENUM, + }, + ]} + labelCol={{ + span: 6, + }} + onFinish={onSubmit} + onValuesChange={onValuesChange} + /> + + + + ); } diff --git a/src/pages/Container/Enterprise/User/List/index.js b/src/pages/Container/Enterprise/User/List/index.js index 28e7cae..b7152b2 100644 --- a/src/pages/Container/Enterprise/User/List/index.js +++ b/src/pages/Container/Enterprise/User/List/index.js @@ -135,7 +135,7 @@ function List(props) {
} + ghost onClick={() => { setImportOpen(true); }} @@ -194,6 +195,7 @@ function List(props) {
- -
-
+ ); } diff --git a/src/pages/Container/Stakeholder/User/List/index.js b/src/pages/Container/Stakeholder/User/List/index.js index f792ca8..0e217ef 100644 --- a/src/pages/Container/Stakeholder/User/List/index.js +++ b/src/pages/Container/Stakeholder/User/List/index.js @@ -99,7 +99,7 @@ function List(props) {
关闭 diff --git a/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js b/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js index 8b563f5..3f840cc 100644 --- a/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js +++ b/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js @@ -116,7 +116,7 @@ function SecurityPersonnel(props) { onFinish={getData} />
( <> { @@ -316,7 +316,7 @@ function AddModalComponent(props) { open={props.open} title={props.currentId ? "编辑" : "新增"} width={800} - loading={ + confirmLoading={ deleteFileLoading || uploadFileLoading || getFileLoading || props.loding } onOk={form.submit} diff --git a/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js b/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js index 5dd50de..a521550 100644 --- a/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js +++ b/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js @@ -118,7 +118,7 @@ function SpecialPersonnel(props) { onFinish={getData} />
( <> { @@ -350,7 +350,7 @@ function AddModalComponent(props) { open={props.open} title={props.currentId ? "编辑" : "新增"} width={800} - loading={ + confirmLoading={ deleteFileLoading || uploadFileLoading || getFileLoading || props.loding } onOk={form.submit} diff --git a/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js b/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js index cfcb317..9a670db 100644 --- a/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js +++ b/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js @@ -4,14 +4,14 @@ import { Button, Form, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; +// import { getLabelName } from "zy-react-library/utils"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; -// import { getLabelName } from "zy-react-library/utils"; - import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { useDebounce } from "~/utils"; @@ -134,11 +134,7 @@ function List(props) { }); }; return ( -
+
( <> { @@ -350,7 +346,7 @@ function List(props) { }} /> )} - + ); } function AddModalComponent(props) { @@ -467,7 +463,7 @@ function AddModalComponent(props) { - -
企业信息 -
+ ); } diff --git a/src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js b/src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js index 0d59da5..53a8ebb 100644 --- a/src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js +++ b/src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js @@ -1,11 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; -import useTable from "zy-react-library/hooks/useTable"; +import useTable from "zy-react-library/hooks/useTable"; import { NS_ENTERPRISE } from "~/enumerate/namespace"; const ENTERPRISE_TYPE = [ @@ -62,22 +63,9 @@ function List(props) { }, }); return ( -
-
-
+ +
+
( @@ -173,7 +161,7 @@ function List(props) { />
-
+ ); } export default Connect([NS_ENTERPRISE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/BranchCompany/DepartmentManage/View/index.js b/src/pages/Container/Supervision/BranchCompany/DepartmentManage/View/index.js index 9017287..6d2fa4c 100644 --- a/src/pages/Container/Supervision/BranchCompany/DepartmentManage/View/index.js +++ b/src/pages/Container/Supervision/BranchCompany/DepartmentManage/View/index.js @@ -2,9 +2,8 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; - import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -36,12 +35,7 @@ function View(props) { }; return (
- -
+
(
+
); } diff --git a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js index 180b524..3d54310 100644 --- a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js +++ b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js @@ -4,6 +4,7 @@ import { Button, Form, message, Space } from "antd"; import { useState } from "react"; import MapSelector from "zy-react-library/components/Map/MapSelector"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -83,11 +84,7 @@ function List(props) { // props. }; return ( -
+ setVisible(false)} onConfirm={handleConfirm} /> -
+ ); } export default Connect([NS_ENTERPRISE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js index 02f83d0..1648830 100644 --- a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js +++ b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js @@ -1,8 +1,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions, Divider, Form, Input, Modal } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import PreviewImg from "zy-react-library/components/PreviewImg"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetFile from "zy-react-library/hooks/useGetFile"; @@ -46,17 +46,13 @@ function View(props) { return (
- -
+ +
基本信息 */}
-
+ {isModalOpen && ( +
(
+ ); } function AddModalComponent(props) { @@ -335,4 +333,4 @@ function AddModalComponent(props) { ); } const AddModal = AddModalComponent; -export default Connect([NS_USER], true)(List); +export default Connect([NS_USER], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js b/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js index e6609c7..87bb508 100644 --- a/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js +++ b/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js @@ -1,11 +1,11 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; -import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; +import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; import { NS_USER } from "~/enumerate/namespace"; @@ -33,11 +33,9 @@ function List(props) { }); return (
- -
-
+
); } diff --git a/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeView/index.js b/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeView/index.js index a965625..ad0d995 100644 --- a/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeView/index.js +++ b/src/pages/Container/Supervision/EnterpriseMiddleground/ChangeView/index.js @@ -1,10 +1,10 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, message, Modal } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; -import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; +import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace"; function ChangeView(props) { @@ -64,11 +64,9 @@ function ChangeView(props) { return (
- -
变更前信息 -
+ { queryParams["type"] === "disposal" diff --git a/src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js b/src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js index 09e38f2..ef5a03f 100644 --- a/src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js +++ b/src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js @@ -1,12 +1,13 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; -import { getLabelName } from "zy-react-library/utils"; +import { getLabelName } from "zy-react-library/utils"; import { NS_ENTERPRISE } from "~/enumerate/namespace"; const ENTERPRISE_TYPE = [ @@ -32,11 +33,7 @@ function List(props) { }); return ( -
+ -
+ ); } export default Connect([NS_ENTERPRISE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js b/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js index 0ffa8c4..fef3b77 100644 --- a/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js +++ b/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js @@ -1,17 +1,18 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; -import Search from "zy-react-library/components/Search"; +import Page from "zy-react-library/components/Page"; +import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; + import useTable from "zy-react-library/hooks/useTable"; import { getLabelName } from "zy-react-library/utils"; - import { NS_USER } from "~/enumerate/namespace"; import { UseDecodeIdCard } from "~/utils"; @@ -44,6 +45,21 @@ function List(props) { }; }, }); + // 清除伪类 + useEffect(() => { + const style = document.createElement("style"); + style.innerHTML = ` + .search-layout::after { + content: none !important; + display: none !important; + } + `; + document.head.appendChild(style); + // 清理函数，在组件卸载时移除样式 + return () => { + document.head.removeChild(style); + }; + }, []); const onTreeChange = (selectedKeys) => { const key = selectedKeys[0] || null; setSelectedNodeId(key); @@ -51,12 +67,9 @@ function List(props) { }; return (
- - -
查看 - - + { + props.permission("qyyuzt-info-record") + && ( + + ) + } + { + props.permission("qyyuzt-info-disposal") + && ( + + ) + } ), }, @@ -178,7 +201,7 @@ function List(props) { setCurrentId(""); }} /> -
+
); } @@ -309,4 +332,4 @@ function AddModalComponent(props) { ); } const AddModal = AddModalComponent; -export default Connect([NS_USER], true)(List); +export default Connect([NS_USER], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js index 6338ebb..c7d7cec 100644 --- a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js +++ b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js @@ -241,7 +241,7 @@ function View(props) { }, ]} column={2} - loading={getFileLoading} + confirmLoading={getFileLoading} labelStyle={{ width: 200, }} diff --git a/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js b/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js index 32fd770..2c3ea73 100644 --- a/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js +++ b/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js @@ -113,7 +113,7 @@ function Department(props) { onFinish={getData} />
( // <> //
( // <> // - - + { + props.permission("jgd-yhgl-userList-resetPassword") + && ( + + ) + } + { + props.permission("jgd-yhgl-userList-info") + && ( + + ) + } ), @@ -165,7 +188,7 @@ function List(props) { }} /> )} - + ); } diff --git a/src/pages/Container/Supervision/Supervision/CorpInfo/Update/index.js b/src/pages/Container/Supervision/Supervision/CorpInfo/Update/index.js index 091daf7..a7c36f0 100644 --- a/src/pages/Container/Supervision/Supervision/CorpInfo/Update/index.js +++ b/src/pages/Container/Supervision/Supervision/CorpInfo/Update/index.js @@ -2,10 +2,9 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import AreaSelect from "zy-react-library/components/SelectTree/Area"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; - import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { UNIFIED_SOCIAL_CREDIT_CODE, @@ -126,16 +125,14 @@ function Update(props) { return ( <> - -
-
+ ); } diff --git a/src/pages/Container/Supervision/Supervision/Department/index.js b/src/pages/Container/Supervision/Supervision/Department/index.js index 5a8c9bd..440f82d 100644 --- a/src/pages/Container/Supervision/Supervision/Department/index.js +++ b/src/pages/Container/Supervision/Supervision/Department/index.js @@ -330,7 +330,7 @@ function AddModalComponent(props) { open={props.open} title={props.currentId ? "编辑" : "新增"} width={800} - loading={props.loading} + confirmLoading={props.loading} onOk={form.submit} onCancel={onCancel} > diff --git a/src/pages/Container/Supervision/Supervision/Post/index.js b/src/pages/Container/Supervision/Supervision/Post/index.js index deb8131..0ffbfca 100644 --- a/src/pages/Container/Supervision/Supervision/Post/index.js +++ b/src/pages/Container/Supervision/Supervision/Post/index.js @@ -227,7 +227,7 @@ function AddModalComponent(props) { open={props.open} title={props.currentId ? "编辑" : "新增"} width={800} - loading={props.loading} + confirmLoading={props.loading} onOk={form.submit} onCancel={onCancel} > diff --git a/src/pages/Container/Supervision/Supervision/User/Add/index.js b/src/pages/Container/Supervision/Supervision/User/Add/index.js index e97c2e5..81cef8e 100644 --- a/src/pages/Container/Supervision/Supervision/User/Add/index.js +++ b/src/pages/Container/Supervision/Supervision/User/Add/index.js @@ -2,22 +2,21 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; -import Upload from "zy-react-library/components/Upload"; +import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; import nation from "zy-react-library/json/nation.json"; import { ID_NUMBER, PHONE } from "zy-react-library/regular"; -import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils"; +import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils"; import { NS_USER } from "~/enumerate/namespace"; import { useDebounce, UseDecodeIdCard } from "~/utils"; - // import useGetFile from "zy-react-library/hooks/useGetFile"; const WHETHER_ENUM = [ @@ -262,18 +261,16 @@ function Add(props) { }; return ( <> - -
-
+ ); } diff --git a/src/pages/Container/Supervision/Supervision/User/List/index.js b/src/pages/Container/Supervision/Supervision/User/List/index.js index c1fb825..0969754 100644 --- a/src/pages/Container/Supervision/Supervision/User/List/index.js +++ b/src/pages/Container/Supervision/Supervision/User/List/index.js @@ -168,7 +168,7 @@ function List(props) { />
setSelectedRowKeys(selectedRowKeys), @@ -195,6 +195,7 @@ function List(props) { && ( - // ) + props.permission("zhgl-import") + && ( + + ) } { props.permission("zhgl-export") && (