Compare commits

..

No commits in common. "63c936d8af9cd3ecb62d4d6919f7eb49e1ce2a48" and "4991d5ca8a5344c989c3b9b657ccc1fe2b693925" have entirely different histories.

46 changed files with 1331 additions and 1335 deletions

View File

@ -32,7 +32,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"relation-graph": "^2.2.11", "relation-graph": "^2.2.11",
"zy-react-library": "^1.1.10" "zy-react-library": "^1.0.153"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

View File

@ -6,7 +6,6 @@ import "dayjs/locale/zh-cn";
import "../blessed_by_buddha"; import "../blessed_by_buddha";
require("antd/dist/reset.css"); require("antd/dist/reset.css");
require("zy-react-library/css/common.less");
dayjs.locale("zh-cn"); dayjs.locale("zh-cn");
setJJBCommonAntdMessage(message); setJJBCommonAntdMessage(message);

View File

@ -67,7 +67,7 @@ function Department(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={props.businessLicense.corpQualificationLoading} loading={props.businessLicense.corpQualificationLoading}
toolBarRender={() => ( toolBarRender={() => (
<> <>
<Button <Button
@ -184,7 +184,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={props.loding} loading={props.loding}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
> >

View File

@ -1,9 +1,8 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, Form, Input, Modal } from "antd";
import { Button, Descriptions, Divider, Form, Input, Modal } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
import PreviewImg from "zy-react-library/components/PreviewImg"; import PreviewImg from "zy-react-library/components/PreviewImg";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
@ -48,248 +47,251 @@ function Info(props) {
} }
}; };
return ( return (
<div> <div
<Page isShowAllAction={false}> style={{
<Divider orientation="left">基本信息</Divider> padding: 20,
<Descriptions }}
bordered >
items={[ <Divider orientation="left">基本信息</Divider>
{ <Descriptions
label: "企业名称", bordered
children: info.corpName && info.corpName, items={[
}, {
{ label: "企业名称",
label: "统一社会信用代码", children: info.corpName && info.corpName,
children: info.code, },
}, {
label: "统一社会信用代码",
children: info.code,
},
{ {
label: "所属区域", label: "所属区域",
children: <div>{getAreaNamePath(info)}</div>, children: <div>{getAreaNamePath(info)}</div>,
}, },
{ {
label: "邮政编码", label: "邮政编码",
children: info.postalCode, children: info.postalCode,
}, },
{ {
label: "成立时间", label: "成立时间",
children: info.createDate, children: info.createDate,
}, },
{ {
label: "企业状态", label: "企业状态",
children: info.corpStateName, children: info.corpStateName,
}, },
{ {
label: "规模", label: "规模",
children: info.scaleName, children: info.scaleName,
}, },
{ {
label: "经度/纬度", label: "经度/纬度",
children: info.longitude && `${info.longitude}/${info.latitude}`, children: info.longitude && `${info.longitude}/${info.latitude}`,
}, },
{ {
label: "职工人数(人)", label: "职工人数(人)",
children: info.employees, children: info.employees,
}, },
{ {
label: "占地面积(㎡)", label: "占地面积(㎡)",
children: info.areaCovered, children: info.areaCovered,
}, },
{ {
label: "注册资金(万元)", label: "注册资金(万元)",
children: info.regcapital, children: info.regcapital,
}, },
{ {
label: "资产总额(万元)", label: "资产总额(万元)",
children: info.totalAssets, children: info.totalAssets,
}, },
// //
// { // {
// label: "经济类型", // label: "经济类型",
// children: info.ecoTypeName, // children: info.ecoTypeName,
// }, // },
{ {
label: "所属行业", label: "所属行业",
children: <div>{getCorpTypeNamePath(info)}</div>, children: <div>{getCorpTypeNamePath(info)}</div>,
}, },
{ {
label: "法定代表人", label: "法定代表人",
children: info.lrName, children: info.lrName,
}, },
{ {
label: "法定代表人手机号", label: "法定代表人手机号",
children: ( children: (
<div> <div>
{info.lrMobile } {info.lrMobile }
{/* { (info.lrMobile && info.lrMobile.label) */} {/* { (info.lrMobile && info.lrMobile.label) */}
{/* && ( */} {/* && ( */}
{/* <Button */} {/* <Button */}
{/* type="link" */} {/* type="link" */}
{/* onClick={() => { */} {/* onClick={() => { */}
{/* setIsModalOpen(true); */} {/* setIsModalOpen(true); */}
{/* setViewType("lrMobile"); */} {/* setViewType("lrMobile"); */}
{/* setViewData(""); */} {/* setViewData(""); */}
{/* setEncrypted(info.lrMobile); */} {/* setEncrypted(info.lrMobile); */}
{/* form.resetFields(); */} {/* form.resetFields(); */}
{/* }} */} {/* }} */}
{/* > */} {/* > */}
{/* 点击查看 */} {/* 点击查看 */}
{/* </Button> */} {/* </Button> */}
{/* )} */} {/* )} */}
</div> </div>
), ),
}, },
{ {
label: "主要负责人", label: "主要负责人",
children: info.contacts, children: info.contacts,
}, },
{ {
label: "主要负责人手机号", label: "主要负责人手机号",
children: ( children: (
<div> <div>
{ info.contactsPhone } { info.contactsPhone }
{/* { (info.contactsPhone && info.contactsPhone.label) */} {/* { (info.contactsPhone && info.contactsPhone.label) */}
{/* && ( */} {/* && ( */}
{/* <Button */} {/* <Button */}
{/* type="link" */} {/* type="link" */}
{/* onClick={() => { */} {/* onClick={() => { */}
{/* setIsModalOpen(true); */} {/* setIsModalOpen(true); */}
{/* setViewType("contactsPhone"); */} {/* setViewType("contactsPhone"); */}
{/* setViewData(""); */} {/* setViewData(""); */}
{/* setEncrypted(info.contactsPhone); */} {/* setEncrypted(info.contactsPhone); */}
{/* form.resetFields(); */} {/* form.resetFields(); */}
{/* }} */} {/* }} */}
{/* > */} {/* > */}
{/* 点击查看 */} {/* 点击查看 */}
{/* </Button> */} {/* </Button> */}
{/* )} */} {/* )} */}
</div> </div>
), ),
}, },
{ {
label: "安全负责人", label: "安全负责人",
children: info.safetyName, children: info.safetyName,
}, },
{ {
label: "安全负责人手机号", label: "安全负责人手机号",
children: ( children: (
<div> <div>
{info.lrMobile && info.lrMobile.label} {info.lrMobile && info.lrMobile.label}
{info.safetyPhone } {info.safetyPhone }
{/* { (info.safetyPhone && info.safetyPhone.label) */} {/* { (info.safetyPhone && info.safetyPhone.label) */}
{/* && ( */} {/* && ( */}
{/* <Button */} {/* <Button */}
{/* type="link" */} {/* type="link" */}
{/* onClick={() => { */} {/* onClick={() => { */}
{/* setIsModalOpen(true); */} {/* setIsModalOpen(true); */}
{/* setViewType("safetyPhone"); */} {/* setViewType("safetyPhone"); */}
{/* setViewData(""); */} {/* setViewData(""); */}
{/* setEncrypted(info.safetyPhone); */} {/* setEncrypted(info.safetyPhone); */}
{/* form.resetFields(); */} {/* form.resetFields(); */}
{/* }} */} {/* }} */}
{/* > */} {/* > */}
{/* 点击查看 */} {/* 点击查看 */}
{/* </Button> */} {/* </Button> */}
{/* )} */} {/* )} */}
</div> </div>
), ),
}, },
{ {
label: "是否规模以上", label: "是否规模以上",
children: ( children: (
<div> <div>
{info.scaleType === 1 {info.scaleType === 1
? "是" ? "是"
: info.scaleType === 0 : info.scaleType === 0
? "否" ? "否"
: ""} : ""}
</div> </div>
), ),
}, },
{ {
label: "企事业单位经营地址", label: "企事业单位经营地址",
children: info.addressBusiness, children: info.addressBusiness,
}, },
{ {
label: "营业执照", label: "营业执照",
children: <PreviewImg files={info.licenseFile} />, children: <PreviewImg files={info.licenseFile} />,
}, },
{ {
label: "营业执照有效期", label: "营业执照有效期",
children: info.licenseStart ? ` ${info.licenseStart}${info.licenseEnd}` : "", children: info.licenseStart ? ` ${info.licenseStart}${info.licenseEnd}` : "",
}, },
]} ]}
column={2} column={2}
loding={getFileLoading} loading={getFileLoading}
labelStyle={{ labelStyle={{
width: 200, width: 200,
}} }}
/> />
{/* <Divider orientation="left">企业相关属性</Divider> */} {/* <Divider orientation="left">企业相关属性</Divider> */}
{/* <Descriptions */} {/* <Descriptions */}
{/* labelStyle={{ width: 200 }} */} {/* labelStyle={{ width: 200 }} */}
{/* column={2} */} {/* column={2} */}
{/* bordered */} {/* bordered */}
{/* items={[ */} {/* items={[ */}
{/* { label: "有无职业卫生信息", children: <span>{info.whetherHygieneFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "有无职业卫生信息", children: <span>{info.whetherHygieneFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "有无重大危险源", children: <span>{info.whetherHazardsFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "有无重大危险源", children: <span>{info.whetherHazardsFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否有稀缺大型应急物资和设施", children: <span>{info.whetherScarceFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否有稀缺大型应急物资和设施", children: <span>{info.whetherScarceFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "有无涉及危化品", children: <span>{info.whetherChemicalsFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "有无涉及危化品", children: <span>{info.whetherChemicalsFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "有无特种设备", children: <span>{info.whetherSpecialequipmentFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "有无特种设备", children: <span>{info.whetherSpecialequipmentFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "有无特种工作人员", children: <span>{info.whetherSpecialpeopleFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "有无特种工作人员", children: <span>{info.whetherSpecialpeopleFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否涉及煤气", children: <span>{info.whetherCoalgasFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否涉及煤气", children: <span>{info.whetherCoalgasFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否属于消防重点单位", children: <span>{info.whetherFireFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否属于消防重点单位", children: <span>{info.whetherFireFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否在有限空间作业", children: <span>{info.whetherConfinedFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否在有限空间作业", children: <span>{info.whetherConfinedFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否存在涉爆粉尘作业", children: <span>{info.whetherPowderFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否存在涉爆粉尘作业", children: <span>{info.whetherPowderFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否涉及防雷防静电", children: <span>{info.whetherLightningFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否涉及防雷防静电", children: <span>{info.whetherLightningFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否持有放射源", children: <span>{info.whetherActinogenFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否持有放射源", children: <span>{info.whetherActinogenFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否涉及液氨制冷", children: <span>{info.whetherLiquidammoniaFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否涉及液氨制冷", children: <span>{info.whetherLiquidammoniaFlag === 1 ? "是" : "否"}</span> }, */}
{/* { label: "是否涉及危险品管道", children: <span>{info.whetherPipelineFlag === 1 ? "是" : "否"}</span> }, */} {/* { label: "是否涉及危险品管道", children: <span>{info.whetherPipelineFlag === 1 ? "是" : "否"}</span> }, */}
{/* ]} */} {/* ]} */}
{/* /> */} {/* /> */}
<div <div
style={{ style={{
marginTop: 10, marginTop: 10,
textAlign: "center", textAlign: "center",
}} }}
> >
{props.permission("qyxx-edit") {props.permission("qyxx-edit")
&& (
<Button
type="primary"
onClick={() => {
props.history.push(`./update?id=${info.id}`);
}}
>
编辑
</Button>
)}
</div>
{isModalOpen
&& ( && (
<Modal <Button
title="查看" type="primary"
open={isModalOpen} onClick={() => {
onOk={handleOk} props.history.push(`./update?id=${info.id}`);
onCancel={() => setIsModalOpen(false)} }}
> >
<Form 编辑
name="basic" </Button>
form={form} )}
> </div>
<Form.Item {isModalOpen
label="请输入登录密码" && (
name="password" <Modal
hidden={ title="查看"
viewData open={isModalOpen}
} onOk={handleOk}
onCancel={() => setIsModalOpen(false)}
>
<Form
name="basic"
form={form}
>
<Form.Item
label="请输入登录密码"
name="password"
hidden={
viewData
}
// rules={[ // rules={[
// { // {
// required: true, // required: true,
@ -316,33 +318,32 @@ function Info(props) {
// }, // },
// }, // },
// ]} // ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="主要负责人手机号码" label="主要负责人手机号码"
hidden={!(viewType === "contactsPhone" && viewData)} hidden={!(viewType === "contactsPhone" && viewData)}
> >
{viewData} {viewData}
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="法定代表人手机号码" label="法定代表人手机号码"
hidden={!(viewType === "lrMobile" && viewData)} hidden={!(viewType === "lrMobile" && viewData)}
> >
{viewData} {viewData}
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="安全负责人手机号码" label="安全负责人手机号码"
hidden={!(viewType === "safetyPhone" && viewData)} hidden={!(viewType === "safetyPhone" && viewData)}
> >
{viewData} {viewData}
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>
)} )}
</Page>
</div> </div>
); );
} }

View File

@ -2,13 +2,14 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; 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 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 AreaSelect from "zy-react-library/components/SelectTree/Area";
import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
import IndustrySelect from "zy-react-library/components/SelectTree/Industry"; import IndustrySelect from "zy-react-library/components/SelectTree/Industry";
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 { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
@ -255,246 +256,249 @@ function Update(props) {
} }
return ( return (
<> <>
<HeaderBack title="编辑" />
<div
style={{
padding: 20,
}}
>
<FormBuilder
form={form}
values={{
scaleType: 0,
whetherHygieneFlag: 0,
whetherHazardsFlag: 0,
whetherScarceFlag: 0,
whetherChemicalsFlag: 0,
whetherSpecialequipmentFlag: 0,
whetherSpecialpeopleFlag: 0,
whetherCoalgasFlag: 0,
whetherFireFlag: 0,
whetherConfinedFlag: 0,
whetherPowderFlag: 0,
whetherLightningFlag: 0,
whetherActinogenFlag: 0,
whetherLiquidammoniaFlag: 0,
whetherPipelineFlag: 0,
}}
loading={
deleteFileLoading
|| uploadFileLoading
|| getFileLoading
|| props.enterprise.enterpriseLoading
}
options={[
{
label: "基本信息",
render: FORM_ITEM_RENDER_ENUM.DIVIDER,
},
{
label: "企业名称",
name: "corpName",
required: false,
<Page headerTitle="编辑" isShowFooter={false}> span: 24,
<div> componentProps: {
<FormBuilder disabled: true,
form={form}
values={{
scaleType: 0,
whetherHygieneFlag: 0,
whetherHazardsFlag: 0,
whetherScarceFlag: 0,
whetherChemicalsFlag: 0,
whetherSpecialequipmentFlag: 0,
whetherSpecialpeopleFlag: 0,
whetherCoalgasFlag: 0,
whetherFireFlag: 0,
whetherConfinedFlag: 0,
whetherPowderFlag: 0,
whetherLightningFlag: 0,
whetherActinogenFlag: 0,
whetherLiquidammoniaFlag: 0,
whetherPipelineFlag: 0,
}}
confirmLoading={
deleteFileLoading
|| uploadFileLoading
|| getFileLoading
|| props.enterprise.enterpriseLoading
}
options={[
{
label: "基本信息",
render: FORM_ITEM_RENDER_ENUM.DIVIDER,
}, },
{ },
label: "企业名称", {
name: "corpName", label: "统一社会信用代码",
required: false, name: "code",
required: false,
span: 24, componentProps: {
componentProps: { disabled: true,
disabled: true, },
span: 24,
rules: [
{
pattern: UNIFIED_SOCIAL_CREDIT_CODE,
message: "请输入正确的统一社会信用代码",
}, },
}, ],
{
label: "统一社会信用代码", },
name: "code", {
required: false, label: "所属区域",
componentProps: { span: 24,
disabled: true, name: "region",
render: (
<AreaSelect
onGetNodePaths={nodes =>
setCityData(nodes)}
/>
),
},
{
label: "邮政编码",
name: "postalCode",
required: false,
rules: [
{
pattern: POSTAL_CODE,
message: "请输入正确的邮政编码",
}, },
span: 24, ],
rules: [ },
{ {
pattern: UNIFIED_SOCIAL_CREDIT_CODE, label: "规模",
message: "请输入正确的统一社会信用代码", name: "scale",
}, required: false,
], render: (
<DictionarySelect
dictValue="scale"
onGetData={(data) => {
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: "所属区域", name: "map",
span: 24, customizeRender: true,
name: "region", render: <Map />,
render: ( span: 24,
<AreaSelect },
onGetNodePaths={nodes => {
setCityData(nodes)} label: "职工人数(人)",
/> name: "employees",
), required: false,
}, render: FORM_ITEM_RENDER_ENUM.NUMBER,
{ },
label: "邮政编码", {
name: "postalCode", label: "占地面积(㎡)",
required: false, name: "areaCovered",
rules: [ required: false,
{ render: FORM_ITEM_RENDER_ENUM.NUMBER,
pattern: POSTAL_CODE, },
message: "请输入正确的邮政编码", {
}, label: "注册资金(万元)",
], name: "regcapital",
}, required: false,
{ render: FORM_ITEM_RENDER_ENUM.NUMBER,
label: "规模", },
name: "scale", {
required: false, label: "资产总额(万元)",
render: ( name: "totalAssets",
<DictionarySelect required: false,
dictValue="scale" render: FORM_ITEM_RENDER_ENUM.NUMBER,
onGetData={(data) => { },
setScaleData(data); // {
}} // label: "开户人",
/> // name: "createName",
), // required: false,
}, // componentProps: {
{ // disabled: true,
label: "成立时间", // },
name: "createDate", // },
required: false, {
render: FORM_ITEM_RENDER_ENUM.DATE, label: "所属行业",
}, name: "INDUSTRYALL",
{ span: 24,
label: "企业状态", render: (
name: "corpState", <IndustrySelect
required: false, onGetNodePaths={(data) => {
render: FORM_ITEM_RENDER_ENUM.SELECT, setIndustryData(data);
items: ENTERPRISE_STATUS, }}
/>
),
},
{
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: (
<Upload
onGetRemoveFile={(file) => {
setDeleteLicenseImageFiles([
...deleteLicenseImageFiles,
file,
]);
}}
/>
),
},
{
label: "营业执照有效期",
name: "license",
render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
},
}, {
{ label: "办公地址",
name: "map", required: false,
customizeRender: true, name: "addressOffice",
render: <Map />, },
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: (
<IndustrySelect
onGetNodePaths={(data) => {
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: (
<Upload
onGetRemoveFile={(file) => {
setDeleteLicenseImageFiles([
...deleteLicenseImageFiles,
file,
]);
}}
/>
),
},
{
label: "营业执照有效期",
name: "license",
render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
},
{
label: "办公地址",
required: false,
name: "addressOffice",
},
// { label: "企业相关属性", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, // { label: "企业相关属性", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
// { // {
// label: "有无职业卫生信息", // label: "有无职业卫生信息",
@ -595,16 +599,14 @@ function Update(props) {
// render: FORM_ITEM_RENDER_ENUM.RADIO, // render: FORM_ITEM_RENDER_ENUM.RADIO,
// items: WHETHER_ENUM, // items: WHETHER_ENUM,
// }, // },
]} ]}
labelCol={{ labelCol={{
span: 6, span: 6,
}} }}
onFinish={onSubmit} onFinish={onSubmit}
onValuesChange={onValuesChange} onValuesChange={onValuesChange}
/> />
</div> </div>
</Page>
</> </>
); );
} }

View File

@ -1,11 +1,11 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
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 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { NS_USER } from "~/enumerate/namespace"; import { NS_USER } from "~/enumerate/namespace";
@ -20,7 +20,7 @@ const ENTERPRISE_TYPE = [
name: "集团单位", name: "集团单位",
}, },
]; ];
function ChangeList(props) { function List(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
const { tableProps, getData } = useTable(props["userEmploymentLogAll"], { const { tableProps, getData } = useTable(props["userEmploymentLogAll"], {
@ -35,8 +35,12 @@ function ChangeList(props) {
}); });
return ( return (
<div> <div>
<HeaderBack title="变更记录列表" />
<Page headerTitle="变更记录列表"> <div
style={{
padding: 20,
}}
>
<Search <Search
form={form} form={form}
options={[ options={[
@ -87,7 +91,6 @@ function ChangeList(props) {
{ {
title: "操作", title: "操作",
width: 200, width: 200,
hidden: !(props.permission("qyyhzt-bgjl-info")),
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
@ -105,8 +108,8 @@ function ChangeList(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</Page> </div>
</div> </div>
); );
} }
export default Connect([NS_USER], true)(Permission(ChangeList)); export default Connect([NS_USER], true)(List);

View File

@ -1,9 +1,10 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, message, Modal } from "antd"; import { Button, Descriptions, Divider, message, Modal } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import Table from "zy-react-library/components/Table"; 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"; import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace";
function ChangeView(props) { function ChangeView(props) {
@ -63,30 +64,11 @@ function ChangeView(props) {
return ( return (
<div> <div>
<HeaderBack title="变更记录" />
<Page <div
headerTitle="变更记录" style={{
extraActionButtons={ padding: 20,
}}
queryParams["type"] === "disposal"
&& (
<div>
<Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
驳回
</Button>
<Button
type="primary"
onClick={onSubmit}
>
通过
</Button>
</div>
)
}
> >
<Divider orientation="left">变更前信息</Divider> <Divider orientation="left">变更前信息</Divider>
<Descriptions <Descriptions
@ -175,7 +157,33 @@ function ChangeView(props) {
]} ]}
dataSource={info.userJobHandoverCOList} dataSource={info.userJobHandoverCOList}
/> />
</Page> </div>
{
queryParams["type"] === "disposal"
&& (
<div style={{ textAlign: "center", height: 50, marginTop: 20 }} className="no-print">
<Button style={{ marginRight: 20 }} onClick={onGoBack}>
取消
</Button>
<Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
驳回
</Button>
<Button
type="primary"
onClick={onSubmit}
>
通过
</Button>
</div>
)
}
</div> </div>

View File

@ -1,16 +1,15 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; 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 Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
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 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 { NS_USER } from "~/enumerate/namespace";
import { UseDecodeIdCard } from "~/utils"; import { UseDecodeIdCard } from "~/utils";
@ -106,10 +105,10 @@ function List(props) {
title: "手机号", title: "手机号",
dataIndex: "phone", dataIndex: "phone",
}, },
// { {
// title: "中台是否存在", title: "中台是否存在",
// dataIndex: "name", dataIndex: "name",
// }, },
{ {
title: "状态", title: "状态",
dataIndex: "name", dataIndex: "name",
@ -125,7 +124,7 @@ function List(props) {
}, },
{ {
title: "操作", title: "操作",
width: 220, width: 180,
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
<Button <Button
@ -138,32 +137,21 @@ function List(props) {
> >
查看 查看
</Button> </Button>
{ <Button
props.permission("qyd-qyyhzt-record") type="link"
onClick={() =>
&& ( props.history.push(`./ChangeList?id=${record.id}`)}
<Button >
type="link" 变更记录
onClick={() => </Button>
props.history.push(`./ChangeList?id=${record.id}`)} <Button
> type="link"
变更记录 danger
</Button> onClick={() =>
) props.history.push(`./ChangeView?id=${record.id}&type=disposal`)}
} >
{ 变更处置
props.permission("qyd-qyyhzt-disposal") </Button>
&& (
<Button
type="link"
danger
onClick={() =>
props.history.push(`./ChangeView?id=${record.id}&type=disposal`)}
>
变更处置
</Button>
)
}
</Space> </Space>
), ),
}, },
@ -315,4 +303,4 @@ function AddModalComponent(props) {
); );
} }
const AddModal = AddModalComponent; const AddModal = AddModalComponent;
export default Connect([NS_USER], true)(Permission(List)); export default Connect([NS_USER], true)(List);

View File

@ -277,7 +277,6 @@ function AddModalComponent(props) {
width={800} width={800}
onOk={() => form.submit()} onOk={() => form.submit()}
onCancel={onCancel} onCancel={onCancel}
confirmLoading={props.loding}
> >
<FormBuilder <FormBuilder
form={form} form={form}

View File

@ -225,7 +225,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={props.loding} loading={props.loding}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
> >

View File

@ -5,13 +5,13 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; 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 Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import AreaSelect from "zy-react-library/components/SelectTree/Area"; import AreaSelect from "zy-react-library/components/SelectTree/Area";
import Table from "zy-react-library/components/Table"; 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 useTable from "zy-react-library/hooks/useTable";
import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
import { getLabelName } from "zy-react-library/utils"; import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
@ -103,187 +103,189 @@ function List(props) {
form.setFieldValue("cityRecord", []); form.setFieldValue("cityRecord", []);
}; };
return ( return (
<div> <div
<Page isShowAllAction={false}> style={{
padding: 20,
}}
>
<Search <Search
form={form} form={form}
onFinish={() => onFinish()} onFinish={() => onFinish()}
onReset={onReset} onReset={onReset}
options={[ options={[
{ {
name: "likecorpName", name: "likecorpName",
label: "企业名称", label: "企业名称",
}, },
{ {
name: "cityData", name: "cityData",
label: "属地", label: "属地",
render: ( render: (
<AreaSelect <AreaSelect
onGetNodePaths={nodes => onGetNodePaths={nodes =>
setCityData(nodes)} setCityData(nodes)}
/> />
), ),
}, },
{ {
name: "CreateTime", name: "CreateTime",
label: "开户时间", label: "开户时间",
render: FORM_ITEM_RENDER_ENUM.DATE_RANGE, render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
}, },
{ {
name: "eqType", name: "eqType",
label: "相关方类型", label: "相关方类型",
render: FORM_ITEM_RENDER_ENUM.SELECT, render: FORM_ITEM_RENDER_ENUM.SELECT,
items: ENTERPRISE_TYPE, items: ENTERPRISE_TYPE,
}, },
{ {
name: "cityRecord", name: "cityRecord",
label: "属地", label: "属地",
render: FORM_ITEM_RENDER_ENUM.SELECT, render: FORM_ITEM_RENDER_ENUM.SELECT,
onlyForLabel: true, onlyForLabel: true,
}, },
]} ]}
/> />
<Table <Table
toolBarRender={() => ( toolBarRender={() => (
<> <>
{
props.permission("qyd-xgf-zhgl-add")
&& (
<Button
type="primary"
icon={<AddIcon />}
onClick={() => {
setAddModalOpen(true);
}}
>
新增
</Button>
)
}
</>
)}
columns={[
{ {
title: "企业名称", props.permission("qyd-xgf-zhgl-add")
dataIndex: "corpName", && (
}, <Button
{ type="primary"
title: "属地", icon={<AddIcon />}
dataIndex: "cityName", onClick={() => {
width: 300, setAddModalOpen(true);
render: (_, record) => ( }}
<div>{getAreaNamePath(record)}</div> >
), 新增
}, </Button>
{ )
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) => (
<Space>
{
props.permission("qyd-xgf-zhgl-info")
&& (
<Button
type="link"
onClick={() => props.history.push(`./View?id=${record.id}`)}
>
查看
</Button>
)
}
{
props.permission("qyd-xgf-zhgl-edit")
&& (
<Button
type="link"
onClick={() => {
setAddModalOpen(true);
setCurrentId(record.id);
}}
>
编辑
</Button>
)
}
{props.permission("qyd-xgf-resetPassword")
&& (
<Button
type="link"
onClick={() => onResetPassword(record.id)}
>
重置密码
</Button>
)}
{props.permission("qyd-xgf-zhgl-delete")
&& (
<Button
danger
type="link"
onClick={() => onDelete(record.id)}
>
删除
</Button>
)}
</Space>
),
},
]}
{...tableProps}
/>
{addModalOpen && (
<AddModal
open={addModalOpen}
getData={getData}
currentId={currentId}
requestAdd={props["corpInfoAdd"]}
requestEdit={props["corpInfoEdit"]}
requestDetails={props["corpInfoDetails"]}
requestChangeCompanyName={props["corpInfoChangeCompanyName"]}
requestCorplnfoCheckCorpcode={props["corplnfoCheckCorpcode"]}
requestCorplnfoCheckCorpName={props["corplnfoCheckCorpName"]}
loading={props.enterprise.enterpriseLoading}
onCancel={() => {
setAddModalOpen(false);
setCurrentId("");
}}
/>
)} )}
</Page> columns={[
{
title: "企业名称",
dataIndex: "corpName",
},
{
title: "属地",
dataIndex: "cityName",
width: 300,
render: (_, record) => (
<div>{getAreaNamePath(record)}</div>
),
},
{
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) => (
<Space>
{
props.permission("qyd-xgf-zhgl-info")
&& (
<Button
type="link"
onClick={() => props.history.push(`./View?id=${record.id}`)}
>
查看
</Button>
)
}
{
props.permission("qyd-xgf-zhgl-edit")
&& (
<Button
type="link"
onClick={() => {
setAddModalOpen(true);
setCurrentId(record.id);
}}
>
编辑
</Button>
)
}
{props.permission("qyd-xgf-resetPassword")
&& (
<Button
type="link"
onClick={() => onResetPassword(record.id)}
>
重置密码
</Button>
)}
{props.permission("qyd-xgf-zhgl-delete")
&& (
<Button
danger
type="link"
onClick={() => onDelete(record.id)}
>
删除
</Button>
)}
</Space>
),
},
]}
{...tableProps}
/>
{addModalOpen && (
<AddModal
open={addModalOpen}
getData={getData}
currentId={currentId}
requestAdd={props["corpInfoAdd"]}
requestEdit={props["corpInfoEdit"]}
requestDetails={props["corpInfoDetails"]}
requestChangeCompanyName={props["corpInfoChangeCompanyName"]}
requestCorplnfoCheckCorpcode={props["corplnfoCheckCorpcode"]}
requestCorplnfoCheckCorpName={props["corplnfoCheckCorpName"]}
loading={props.enterprise.enterpriseLoading}
onCancel={() => {
setAddModalOpen(false);
setCurrentId("");
}}
/>
)}
</div> </div>
); );
} }
@ -420,7 +422,7 @@ function AddModalComponent(props) {
form={form} form={form}
span={24} span={24}
confirmLoading={props.loading} loading={props.loading}
options={[ options={[
{ {
name: "corpName", name: "corpName",

View File

@ -1,14 +1,14 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, Form, Input, Modal, QRCode } from "antd"; import { Button, Descriptions, Divider, Form, Input, Modal, QRCode } from "antd";
import { useEffect, useState } from "react"; 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 PreviewImg from "zy-react-library/components/PreviewImg";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; 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 { NS_ENTERPRISE } from "~/enumerate/namespace";
import { getAreaNamePath, getCorpTypeNamePath } from "~/utils"; import { getAreaNamePath, getCorpTypeNamePath } from "~/utils";
@ -74,12 +74,12 @@ function View(props) {
}; };
return ( return (
<div> <div>
<HeaderBack title="查看" />
<Page <div
headerTitle="查看" style={{
isShowFooter={false} padding: 20,
}}
> >
<Divider orientation="left">基本信息</Divider> <Divider orientation="left">基本信息</Divider>
<Descriptions <Descriptions
bordered bordered
@ -241,7 +241,7 @@ function View(props) {
}, },
]} ]}
column={2} column={2}
loding={getFileLoading} loading={getFileLoading}
labelStyle={{ labelStyle={{
width: 200, width: 200,
}} }}
@ -266,7 +266,7 @@ function View(props) {
}} }}
contentStyle={{ width: "40%" }} contentStyle={{ width: "40%" }}
/> />
</Page> </div>
{corpInfoQrCodeOpen && ( {corpInfoQrCodeOpen && (
<CorpInfoQrCode <CorpInfoQrCode
row={info} row={info}

View File

@ -3,16 +3,16 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import AreaSelect from "zy-react-library/components/SelectTree/Area"; import AreaSelect from "zy-react-library/components/SelectTree/Area";
import Table from "zy-react-library/components/Table"; 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 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"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
import { getAreaNamePath } from "~/utils"; import { getAreaNamePath } from "~/utils";
// import { getLabelName } from "zy-react-library/utils"; // import { getLabelName } from "zy-react-library/utils";
const ENTERPRISE_TYPE = [ const ENTERPRISE_TYPE = [
@ -61,109 +61,111 @@ function List(props) {
form.setFieldValue("cityRecord", []); form.setFieldValue("cityRecord", []);
}; };
return ( return (
<div> <div
<Page isShowAllAction={false}> style={{
<Search padding: 20,
form={form} }}
onFinish={() => onFinish()} >
onReset={onReset} <Search
options={[ form={form}
{ onFinish={() => onFinish()}
name: "likeCorpName", onReset={onReset}
label: "企业名称", options={[
}, {
{ name: "likeCorpName",
name: "cityData", label: "企业名称",
label: "属地", },
render: ( {
<AreaSelect name: "cityData",
onGetNodePaths={nodes => label: "属地",
setCityData(nodes)} render: (
/> <AreaSelect
), onGetNodePaths={nodes =>
}, setCityData(nodes)}
{ name: "eqType", label: "相关方类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE }, />
{ ),
name: "cityRecord", },
label: "属地", { name: "eqType", label: "相关方类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE },
render: FORM_ITEM_RENDER_ENUM.SELECT, {
onlyForLabel: true, name: "cityRecord",
}, label: "属地",
]} render: FORM_ITEM_RENDER_ENUM.SELECT,
/> onlyForLabel: true,
<Table },
columns={[ ]}
{ />
title: "企业名称", <Table
dataIndex: "corpName", columns={[
{
title: "企业名称",
dataIndex: "corpName",
}, },
{ {
title: "相关方类型", title: "相关方类型",
dataIndex: "type", dataIndex: "type",
render: (_, record) => ( render: (_, record) => (
getLabelName({ getLabelName({
status: record.type, status: record.type,
list: ENTERPRISE_TYPE, list: ENTERPRISE_TYPE,
}) })
), ),
width: 120, width: 120,
}, },
{ {
title: "属地", title: "属地",
dataIndex: "cityName", dataIndex: "cityName",
render: (_, record) => ( render: (_, record) => (
<div>{getAreaNamePath(record)}</div> <div>{getAreaNamePath(record)}</div>
), ),
}, },
{ {
title: "创建单位", title: "创建单位",
dataIndex: "tenantName", dataIndex: "tenantName",
}, },
{ {
title: "企业人数", title: "企业人数",
dataIndex: "userCount", dataIndex: "userCount",
width: 120, width: 120,
render: (_, record) => ( render: (_, record) => (
<div>{record.userCount ? record.userCount : "0"}</div> <div>{record.userCount ? record.userCount : "0"}</div>
), ),
}, },
{ {
title: "安全人员信息数", title: "安全人员信息数",
dataIndex: "safetyUserCount", dataIndex: "safetyUserCount",
width: 140, width: 140,
}, },
{ {
title: "特种作业人数", title: "特种作业人数",
dataIndex: "specialUserCount", dataIndex: "specialUserCount",
width: 120, width: 120,
}, },
// { title: "公司状态", dataIndex: "corpStateName" }, // { title: "公司状态", dataIndex: "corpStateName" },
// { title: "启用状态", dataIndex: "useFlag", render: (_, record) => ( // { title: "启用状态", dataIndex: "useFlag", render: (_, record) => (
// <span>{record.useFlag === 1 ? "停用" : record.useFlag === 0 ? "启用" : ""}</span> // <span>{record.useFlag === 1 ? "停用" : record.useFlag === 0 ? "启用" : ""}</span>
// ) }, // ) },
{ {
title: "操作", title: "操作",
width: 150, width: 150,
hidden: !(props.permission("qyd-xgf-yhgl-userList")), hidden: !(props.permission("qyd-xgf-yhgl-userList")),
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
<Button <Button
type="link" type="link"
onClick={() => onClick={() =>
props.history.push(`./UserList?id=${record.id}`)} props.history.push(`./UserList?id=${record.id}`)}
> >
人员列表 人员列表
</Button> </Button>
</Space> </Space>
), ),
}, },
]} ]}
{...tableProps} {...tableProps}
/> />
</Page>
</div> </div>
); );
} }

View File

@ -2,14 +2,15 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd"; import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd";
import { useEffect, useState } from "react"; 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 LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Page from "zy-react-library/components/Page";
import PreviewImg from "zy-react-library/components/PreviewImg"; import PreviewImg from "zy-react-library/components/PreviewImg";
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 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 { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -60,22 +61,6 @@ 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 onTreeChange = (selectedKeys) => {
const key = selectedKeys[0] || null; const key = selectedKeys[0] || null;
setSelectedNodeId(key); setSelectedNodeId(key);
@ -83,21 +68,23 @@ function List(props) {
}; };
return ( return (
<div> <div>
<HeaderBack title="相关方企业人员列表" />
<Page headerTitle="相关方企业人员列表" isShowFooter={false}> <div
style={{
padding: 20,
}}
>
<div <div
style={{ style={{
display: "flex", display: "flex",
gap: 20, gap: 20,
}} }}
> >
<LeftTree onSelect={onTreeChange} params={{ eqCorpinfoId: queryParams["id"] }} /> <LeftTree onSelect={onTreeChange} params={{ eqCorpinfoId: queryParams["id"] }} />
<div <div
style={{ style={{
flex: 1, flex: 1,
}} }}
> >
<Search <Search
form={form} form={form}
@ -114,10 +101,8 @@ function List(props) {
}, },
]} ]}
onFinish={getData} onFinish={getData}
/> />
<Table <Table
columns={[ columns={[
{ {
title: "用户名", title: "用户名",
@ -143,30 +128,30 @@ function List(props) {
title: "操作", title: "操作",
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
{ {/* { */}
props.permission("xgf-yhgl-userList-info") {/* props.permission("qyd-xgf-yhgl-info") */}
&& ( {/* && ( */}
<Button <Button
type="link" type="link"
onClick={() => { onClick={() => {
setAddModalOpen(true); setAddModalOpen(true);
setCurrentId(record.id); setCurrentId(record.id);
}} }}
> >
查看 查看
</Button> </Button>
{/* // */}
) {/* // ) */}
} {/* // } */}
{props.permission("xgf-yhgl-userList-resetPassword") {/* {props.permission("qyd-xgf-yhgl-resetPassword") */}
&& ( {/* && ( */}
<Button <Button
type="link" type="link"
onClick={() => onResetPassword(record.id)} onClick={() => onResetPassword(record.id)}
> >
重置密码 重置密码
</Button> </Button>
)} {/* )} */}
</Space> </Space>
), ),
@ -190,7 +175,7 @@ function List(props) {
}} }}
/> />
)} )}
</Page> </div>
</div> </div>
); );
} }

View File

@ -2,9 +2,10 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
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 { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@ -262,195 +263,190 @@ function Add(props) {
}; };
return ( return (
<> <>
<HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
<Page headerTitle={queryParams["id"] ? "编辑" : "新增"} isShowFooter={false}> <div
style={{
<div paddingBottom: 10,
style={{ }}
paddingBottom: 10, >
<FormBuilder
form={form}
values={{
departmentLeaderFlag: 0,
}} }}
> loading={uploadFileLoading || props.user.userLoading}
<FormBuilder options={[
form={form} {
values={{ name: "roleId",
departmentLeaderFlag: 0, label: "用户角色",
}} render: FORM_ITEM_RENDER_ENUM.SELECT,
confirmLoading={uploadFileLoading || props.user.userLoading} items: rolesData,
options={[ itemsField: {
{ labelKey: "roleName",
name: "roleId", valueKey: "id",
label: "用户角色",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: rolesData,
itemsField: {
labelKey: "roleName",
valueKey: "id",
},
}, },
{ },
name: "departmentId", {
label: "所属部门", name: "departmentId",
render: ( label: "所属部门",
<DepartmentSelectTree onGetNodePaths={fnChoiceDepartment} disabled={queryParams["id"]} /> render: (
), <DepartmentSelectTree onGetNodePaths={fnChoiceDepartment} disabled={queryParams["id"]} />
),
},
{
name: "postId",
label: "所属岗位",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: postData,
componentProps: {
disabled: queryParams["id"],
}, },
{ itemsField: {
name: "postId", labelKey: "postName",
label: "所属岗位", valueKey: "id",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: postData,
componentProps: {
disabled: queryParams["id"],
},
itemsField: {
labelKey: "postName",
valueKey: "id",
},
}, },
{ },
name: "phone", {
label: "手机号", name: "phone",
tip: "* 手机号为用户名修改手机号登录密码则会变成初始密码“Aa@12345678", label: "手机号",
rules: [ tip: "* 手机号为用户名修改手机号登录密码则会变成初始密码“Aa@12345678",
{ rules: [
pattern: PHONE, {
message: "请输入正确的手机号", pattern: PHONE,
message: "请输入正确的手机号",
},
],
},
{
name: "name",
label: "姓名",
},
{
name: "personnelType",
label: "人员类型",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: userTypeData,
itemsField: {
labelKey: "dictLabel",
valueKey: "dictValue",
},
},
{
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,
},
items: SEX,
},
{
name: "faceFile",
label: "上传人脸照片",
required: false,
span: 24,
render: (
<Upload
size={4}
maxCount={1}
fileType="image"
tipContent={(
<div
style={{
lineHeight: 1.6,
color: "red",
fontSize: 12,
}}
>
<div>* 图像格式JPGJPEGPNG</div>
<div>* 图像大小不超过4M</div>
<div>* 照片大小: 推荐 500*500</div>
<div>* 人脸无遮挡如戴帽子口罩眼镜等无修图</div>
<div>* 人脸需双眼睁开表情自然露额头发不要遮挡</div>
</div>
)}
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: "name",
label: "姓名",
},
{
name: "personnelType",
label: "人员类型",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: userTypeData,
itemsField: {
labelKey: "dictLabel",
valueKey: "dictValue",
}, },
}, ],
{ },
name: "userIdCard", // { name: "rank_level", label: "人员职级", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: rankData, itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } },
label: "身份证号", {
rules: [ name: "email",
{ label: "邮箱",
pattern: ID_NUMBER, required: false,
message: "请输入正确的身份证号", rules: [
}, {
], type: "email",
}, 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,
}, },
items: SEX, ],
}, },
{ {
name: "faceFile", name: "remarks",
label: "上传人脸照片", label: "备注",
required: false, span: 24,
span: 24, required: false,
render: ( render: FORM_ITEM_RENDER_ENUM.TEXTAREA,
<Upload },
size={4} {
maxCount={1} name: "departmentLeaderFlag",
fileType="image" label: "是否为部门负责人",
tipContent={( required: false,
<div render: FORM_ITEM_RENDER_ENUM.RADIO,
style={{ items: WHETHER_ENUM,
lineHeight: 1.6, },
color: "red", ]}
fontSize: 12, labelCol={{
}} span: 6,
> }}
<div>* 图像格式JPGJPEGPNG</div> onFinish={onSubmit}
<div>* 图像大小不超过4M</div> onValuesChange={onValuesChange}
<div>* 照片大小: 推荐 500*500</div> />
<div>* 人脸无遮挡如戴帽子口罩眼镜等无修图</div> </div>
<div>* 人脸需双眼睁开表情自然露额头发不要遮挡</div>
</div>
)}
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}
/>
</div>
</Page>
</> </>
); );
} }

View File

@ -135,7 +135,7 @@ function List(props) {
<div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}> <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
<Search <Search
form={form} form={form}
labelCol={{ span: 3 }} labelCol={{ span: 8 }}
options={[ options={[
{ {
name: "likeName", name: "likeName",
@ -180,7 +180,6 @@ function List(props) {
<Button <Button
type="primary" type="primary"
icon={<ImportIcon />} icon={<ImportIcon />}
ghost
onClick={() => { onClick={() => {
setImportOpen(true); setImportOpen(true);
}} }}
@ -195,7 +194,6 @@ function List(props) {
<Button <Button
type="primary" type="primary"
icon={<ExportIcon />} icon={<ExportIcon />}
ghost
onClick={() => onExportExcel()} onClick={() => onExportExcel()}
> >
导出Excel 导出Excel

View File

@ -187,7 +187,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={props.loding} loading={props.loding}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
> >

View File

@ -4,18 +4,17 @@ import { Button, Form, message, Modal, QRCode } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import Map from "zy-react-library/components/Map"; 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 AreaSelect from "zy-react-library/components/SelectTree/Area";
import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
import IndustrySelect from "zy-react-library/components/SelectTree/Industry"; import IndustrySelect from "zy-react-library/components/SelectTree/Industry";
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 { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useUploadFile from "zy-react-library/hooks/useUploadFile"; import useUploadFile from "zy-react-library/hooks/useUploadFile";
import { import {
PHONE, PHONE,
UNIFIED_SOCIAL_CREDIT_CODE, UNIFIED_SOCIAL_CREDIT_CODE,
@ -285,11 +284,15 @@ function CorpInfo(props) {
}; };
return ( return (
<> <>
<Page isShowAllAction={false}> <div
style={{
paddingBottom: 10,
}}
>
<FormBuilder <FormBuilder
showCancelButton={false} showCancelButton={false}
form={form} form={form}
confirmLoading={ loading={
deleteFileLoading deleteFileLoading
|| uploadFileLoading || uploadFileLoading
|| getFileLoading || getFileLoading
@ -495,7 +498,7 @@ function CorpInfo(props) {
onValuesChange={onValuesChange} onValuesChange={onValuesChange}
/> />
</Page> </div>
{corpInfoQrCodeOpen && ( {corpInfoQrCodeOpen && (
<CorpInfoQrCode <CorpInfoQrCode
row={info} row={info}

View File

@ -312,7 +312,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={props.loading} loading={props.loading}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
> >

View File

@ -83,7 +83,7 @@ function Department(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={getFileLoading} loading={getFileLoading}
columns={[ columns={[
{ {
title: "姓名", title: "姓名",

View File

@ -83,7 +83,7 @@ function Department(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={getFileLoading} loading={getFileLoading}
columns={[ columns={[
{ {
title: "姓名", title: "姓名",

View File

@ -2,21 +2,21 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; 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 { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useUploadFile from "zy-react-library/hooks/useUploadFile"; import useUploadFile from "zy-react-library/hooks/useUploadFile";
import nation from "zy-react-library/json/nation.json"; import nation from "zy-react-library/json/nation.json";
import { ID_NUMBER, PHONE } from "zy-react-library/regular"; 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 { NS_USER } from "~/enumerate/namespace";
import { getAgeByIdCard, getBirthDateFromIdCard, useDebounce, UseDecodeIdCard } from "~/utils"; import { getAgeByIdCard, getBirthDateFromIdCard, useDebounce, UseDecodeIdCard } from "~/utils";
@ -274,14 +274,15 @@ function Add(props) {
}; };
return ( return (
<> <>
<HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
<Page <div
headerTitle={queryParams["id"] ? "编辑" : "新增"} style={{
isShowFooter={false} paddingBottom: 10,
}}
> >
<FormBuilder <FormBuilder
form={form} form={form}
confirmLoading={ loading={
deleteFileLoading deleteFileLoading
|| uploadFileLoading || uploadFileLoading
|| getFileLoading || getFileLoading
@ -463,9 +464,6 @@ function Add(props) {
{ {
name: "flowFlag", name: "flowFlag",
label: "是否流动人员", label: "是否流动人员",
componentProps: {
disabled: queryParams["id"],
},
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM, items: WHETHER_ENUM,
@ -630,7 +628,7 @@ function Add(props) {
onFinish={onSubmit} onFinish={onSubmit}
onValuesChange={onValuesChange} onValuesChange={onValuesChange}
/> />
</Page> </div>
</> </>
); );
} }

View File

@ -6,6 +6,7 @@ import AddIcon from "zy-react-library/components/Icon/AddIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import PreviewImg from "zy-react-library/components/PreviewImg"; import PreviewImg from "zy-react-library/components/PreviewImg";
// import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; // import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
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 Table from "zy-react-library/components/Table";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
@ -98,7 +99,7 @@ function List(props) {
<div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}> <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
<Search <Search
form={form} form={form}
labelCol={{ span: 3 }} labelCol={{ span: 8 }}
options={[ options={[
{ {
name: "likeName", name: "likeName",
@ -399,7 +400,7 @@ function AddModalComponent(props) {
}} }}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
confirmLoading={getFileLoading} loading={getFileLoading}
footer={[ footer={[
<Button key="return" onClick={onCancel}> <Button key="return" onClick={onCancel}>
关闭 关闭

View File

@ -1,7 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, message, Modal } from "antd"; import { Button, Descriptions, Divider, message, Modal } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import Table from "zy-react-library/components/Table"; 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_USER } from "~/enumerate/namespace"; import { NS_USER } from "~/enumerate/namespace";
@ -61,24 +61,17 @@ function ResignationReview(props) {
}); });
}; };
const onGoBack = () => {
window.history.back();
};
return ( return (
<div> <div>
<HeaderBack title="信息确认" />
<Page <div
headerTitle="信息确认" style={{
extraActionButtons={( padding: 20,
<div> }}
<Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
驳回
</Button>
<Button
type="primary"
onClick={onSubmit}
>
通过
</Button>
</div>
)}
> >
<Divider orientation="left">人员信息</Divider> <Divider orientation="left">人员信息</Divider>
<Descriptions <Descriptions
@ -134,7 +127,27 @@ function ResignationReview(props) {
]} ]}
dataSource={info.userJobHandoverCOList} dataSource={info.userJobHandoverCOList}
/> />
</Page> </div>
<div style={{ textAlign: "center", height: 50, marginTop: 20 }} className="no-print">
<Button style={{ marginRight: 20 }} onClick={onGoBack}>
取消
</Button>
<Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
驳回
</Button>
<Button
type="primary"
onClick={onSubmit}
>
通过
</Button>
</div>
</div> </div>

View File

@ -116,7 +116,7 @@ function SecurityPersonnel(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={getFileLoading} loading={getFileLoading}
toolBarRender={() => ( toolBarRender={() => (
<> <>
{ {
@ -316,7 +316,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={ loading={
deleteFileLoading || uploadFileLoading || getFileLoading || props.loding deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
} }
onOk={form.submit} onOk={form.submit}

View File

@ -118,7 +118,7 @@ function SpecialPersonnel(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={getFileLoading} loading={getFileLoading}
toolBarRender={() => ( toolBarRender={() => (
<> <>
{ {
@ -350,7 +350,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={ loading={
deleteFileLoading || uploadFileLoading || getFileLoading || props.loding deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
} }
onOk={form.submit} onOk={form.submit}

View File

@ -4,14 +4,14 @@ import { Button, Form, message, Modal, Space } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; 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 Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; 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 useTable from "zy-react-library/hooks/useTable";
import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
// import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
import { useDebounce } from "~/utils"; import { useDebounce } from "~/utils";
@ -134,7 +134,11 @@ function List(props) {
}); });
}; };
return ( return (
<Page isShowAllAction={false}> <div
style={{
padding: 20,
}}
>
<Search <Search
form={form} form={form}
options={[ options={[
@ -162,7 +166,7 @@ function List(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={props.enterprise.enterpriseLoading} loading={props.enterprise.enterpriseLoading}
toolBarRender={() => ( toolBarRender={() => (
<> <>
{ {
@ -346,7 +350,7 @@ function List(props) {
}} }}
/> />
)} )}
</Page> </div>
); );
} }
function AddModalComponent(props) { function AddModalComponent(props) {
@ -463,7 +467,7 @@ function AddModalComponent(props) {
<FormBuilder <FormBuilder
form={form} form={form}
span={24} span={24}
confirmLoading={props.loading} loading={props.loading}
options={[ options={[
{ {
name: "corpName", name: "corpName",

View File

@ -1,7 +1,8 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Divider } from "antd"; import { Descriptions, Divider } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import { getLabelName } from "zy-react-library/utils"; import { getLabelName } from "zy-react-library/utils";
@ -48,9 +49,11 @@ function View(props) {
}, []); }, []);
return ( return (
<div> <div>
<Page <HeaderBack title="查看" />
headerTitle="查看" <div
isShowFooter={false} style={{
padding: 20,
}}
> >
<Divider orientation="left">企业信息</Divider> <Divider orientation="left">企业信息</Divider>
<Descriptions <Descriptions
@ -94,7 +97,7 @@ function View(props) {
width: 200, width: 200,
}} }}
/> />
</Page> </div>
</div> </div>
); );
} }

View File

@ -1,12 +1,11 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
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 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 useTable from "zy-react-library/hooks/useTable";
import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
const ENTERPRISE_TYPE = [ const ENTERPRISE_TYPE = [
@ -63,9 +62,22 @@ function List(props) {
}, },
}); });
return ( return (
<Page isShowAllAction={false}> <div
<div> style={{
<div> padding: 20,
}}
>
<div
style={{
display: "flex",
gap: 20,
}}
>
<div
style={{
flex: 1,
}}
>
<Search <Search
form={form} form={form}
options={[ options={[
@ -142,7 +154,7 @@ function List(props) {
}, },
{ {
title: "操作", title: "操作",
width: 120, width: 200,
hidden: !(props.permission("zgsbmgl-list")), hidden: !(props.permission("zgsbmgl-list")),
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
@ -161,7 +173,7 @@ function List(props) {
/> />
</div> </div>
</div> </div>
</Page> </div>
); );
} }
export default Connect([NS_ENTERPRISE], true)(Permission(List)); export default Connect([NS_ENTERPRISE], true)(Permission(List));

View File

@ -2,8 +2,9 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useEffect, useState } from "react"; 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 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 Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@ -35,7 +36,12 @@ function View(props) {
}; };
return ( return (
<div> <div>
<Page headerTitle="查看" isShowFooter={false}> <HeaderBack title="查看" />
<div
style={{
padding: 20,
}}
>
<div <div
style={{ style={{
display: "flex", display: "flex",
@ -72,7 +78,7 @@ function View(props) {
{ {
title: "操作", title: "操作",
width: 200, width: 200,
hidden: !(props.permission("jgd-bmgl-info-info")), hidden: !(props.permission("zgsbmgl-info")),
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
<Button <Button
@ -102,7 +108,7 @@ function View(props) {
setCurrentId(""); setCurrentId("");
}} }}
/> />
</Page> </div>
</div> </div>
); );
} }

View File

@ -4,7 +4,6 @@ import { Button, Form, message, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import MapSelector from "zy-react-library/components/Map/MapSelector"; 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 Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table"; 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";
@ -84,7 +83,11 @@ function List(props) {
// props. // props.
}; };
return ( return (
<Page isShowAllAction={false}> <div
style={{
padding: 20,
}}
>
<Search <Search
form={form} form={form}
options={[ options={[
@ -198,7 +201,7 @@ function List(props) {
onClose={() => setVisible(false)} onClose={() => setVisible(false)}
onConfirm={handleConfirm} onConfirm={handleConfirm}
/> />
</Page> </div>
); );
} }
export default Connect([NS_ENTERPRISE], true)(Permission(List)); export default Connect([NS_ENTERPRISE], true)(Permission(List));

View File

@ -1,8 +1,8 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Divider, Form, Input, Modal } from "antd"; import { Descriptions, Divider, Form, Input, Modal } from "antd";
import { useEffect, useState } from "react"; 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 PreviewImg from "zy-react-library/components/PreviewImg";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
@ -46,13 +46,17 @@ function View(props) {
return ( return (
<div> <div>
<HeaderBack title="查看" />
<Page headerTitle="查看" isShowFooter={false}> <div
style={{
padding: 20,
}}
>
<div> <div>
<Divider orientation="left">基本信息</Divider> <Divider orientation="left">基本信息</Divider>
<Descriptions <Descriptions
bordered bordered
loding={getFileLoading} loading={getFileLoading}
items={[ items={[
{ {
label: "公司名称", label: "公司名称",
@ -295,7 +299,7 @@ function View(props) {
{/* ]} */} {/* ]} */}
{/* /> */} {/* /> */}
</div> </div>
</Page> </div>
{isModalOpen {isModalOpen
&& ( && (
<Modal <Modal

View File

@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Input, Modal, Space } from "antd"; import { Button, Descriptions, Form, Input, Modal, Space } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Page from "zy-react-library/components/Page";
import PreviewImg from "zy-react-library/components/PreviewImg"; import PreviewImg from "zy-react-library/components/PreviewImg";
import Table from "zy-react-library/components/Table"; 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 useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -11,7 +11,6 @@ import { getLabelName } from "zy-react-library/utils";
import { NS_USER } from "~/enumerate/namespace"; import { NS_USER } from "~/enumerate/namespace";
import { UseDecodeIdCard } from "~/utils"; import { UseDecodeIdCard } from "~/utils";
import {Permission} from "@cqsjjb/jjb-common-decorator/permission";
function List(props) { function List(props) {
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
@ -37,7 +36,11 @@ function List(props) {
getData(); getData();
}; };
return ( return (
<Page headerTitle="查看" isShowFooter={false}> <div
style={{
padding: 20,
}}
>
<div <div
style={{ style={{
display: "flex", display: "flex",
@ -67,7 +70,6 @@ function List(props) {
{ {
title: "操作", title: "操作",
width: 300, width: 300,
hidden: !(props.permission("jgd-yhgl-info-info")),
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
<Button <Button
@ -100,7 +102,7 @@ function List(props) {
setCurrentId(""); setCurrentId("");
}} }}
/> />
</Page> </div>
); );
} }
function AddModalComponent(props) { function AddModalComponent(props) {
@ -333,4 +335,4 @@ function AddModalComponent(props) {
); );
} }
const AddModal = AddModalComponent; const AddModal = AddModalComponent;
export default Connect([NS_USER], true)(Permission(List)); export default Connect([NS_USER], true)(List);

View File

@ -1,11 +1,11 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; 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 Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table"; 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 useTable from "zy-react-library/hooks/useTable";
import { NS_USER } from "~/enumerate/namespace"; import { NS_USER } from "~/enumerate/namespace";
@ -33,9 +33,11 @@ function List(props) {
}); });
return ( return (
<div> <div>
<Page <HeaderBack title="变更记录列表" />
headerTitle="变更记录列表" <div
isShowFooter={false} style={{
padding: 20,
}}
> >
<Search <Search
form={form} form={form}
@ -104,7 +106,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</Page> </div>
</div> </div>
); );
} }

View File

@ -1,10 +1,10 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, message, Modal } from "antd"; import { Button, Descriptions, Divider, message, Modal } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import Table from "zy-react-library/components/Table"; 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"; import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace";
function ChangeView(props) { function ChangeView(props) {
@ -64,9 +64,11 @@ function ChangeView(props) {
return ( return (
<div> <div>
<Page <HeaderBack title="变更记录" />
headerTitle="变更记录" <div
isShowFooter={false} style={{
padding: 20,
}}
> >
<Divider orientation="left">变更前信息</Divider> <Divider orientation="left">变更前信息</Divider>
<Descriptions <Descriptions
@ -155,7 +157,7 @@ function ChangeView(props) {
]} ]}
dataSource={info.userJobHandoverCOList} dataSource={info.userJobHandoverCOList}
/> />
</Page> </div>
{ {
queryParams["type"] === "disposal" queryParams["type"] === "disposal"

View File

@ -1,13 +1,12 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
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 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 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"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
const ENTERPRISE_TYPE = [ const ENTERPRISE_TYPE = [
@ -33,7 +32,11 @@ function List(props) {
}); });
return ( return (
<Page isShowAllAction={false}> <div
style={{
padding: 20,
}}
>
<Search <Search
form={form} form={form}
options={[ options={[
@ -108,7 +111,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</Page> </div>
); );
} }
export default Connect([NS_ENTERPRISE], true)(Permission(List)); export default Connect([NS_ENTERPRISE], true)(Permission(List));

View File

@ -1,18 +1,17 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useEffect, useState } from "react"; 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 LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Page from "zy-react-library/components/Page";
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 Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; 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 { NS_USER } from "~/enumerate/namespace";
import { UseDecodeIdCard } from "~/utils"; import { UseDecodeIdCard } from "~/utils";
@ -45,21 +44,6 @@ 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 onTreeChange = (selectedKeys) => {
const key = selectedKeys[0] || null; const key = selectedKeys[0] || null;
setSelectedNodeId(key); setSelectedNodeId(key);
@ -67,9 +51,12 @@ function List(props) {
}; };
return ( return (
<div> <div>
<Page <HeaderBack title="列表" />
headerTitle="列表"
isShowFooter={false} <div
style={{
padding: 20,
}}
> >
<div <div
style={{ style={{
@ -156,31 +143,21 @@ function List(props) {
> >
查看 查看
</Button> </Button>
{ <Button
props.permission("qyyuzt-info-record") type="link"
&& ( onClick={() =>
<Button props.history.push(`./ChangeList?id=${record.id}`)}
type="link" >
onClick={() => 变更记录
props.history.push(`./ChangeList?id=${record.id}`)} </Button>
> <Button
变更记录 type="link"
</Button> danger
) onClick={() =>
} props.history.push(`./ChangeView?id=${record.id}&type=disposal`)}
{ >
props.permission("qyyuzt-info-disposal") 变更处置
&& ( </Button>
<Button
type="link"
danger
onClick={() =>
props.history.push(`./ChangeView?id=${record.id}&type=disposal`)}
>
变更处置
</Button>
)
}
</Space> </Space>
), ),
}, },
@ -201,7 +178,7 @@ function List(props) {
setCurrentId(""); setCurrentId("");
}} }}
/> />
</Page> </div>
</div> </div>
); );
} }
@ -332,4 +309,4 @@ function AddModalComponent(props) {
); );
} }
const AddModal = AddModalComponent; const AddModal = AddModalComponent;
export default Connect([NS_USER], true)(Permission(List)); export default Connect([NS_USER], true)(List);

View File

@ -241,7 +241,7 @@ function View(props) {
}, },
]} ]}
column={2} column={2}
loding={getFileLoading} loading={getFileLoading}
labelStyle={{ labelStyle={{
width: 200, width: 200,
}} }}

View File

@ -113,7 +113,7 @@ function Department(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={getFileLoading} loading={getFileLoading}
// toolBarRender={() => ( // toolBarRender={() => (
// <> // <>
// <Button // <Button
@ -290,7 +290,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={ loading={
deleteFileLoading || uploadFileLoading || getFileLoading || props.loding deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
} }
onOk={form.submit} onOk={form.submit}

View File

@ -113,7 +113,7 @@ function Department(props) {
onFinish={getData} onFinish={getData}
/> />
<Table <Table
loding={getFileLoading} loading={getFileLoading}
// toolBarRender={() => ( // toolBarRender={() => (
// <> // <>
// <Button // <Button
@ -318,7 +318,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
loding={ loading={
deleteFileLoading || uploadFileLoading || getFileLoading || props.loding deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
} }
onOk={form.submit} onOk={form.submit}

View File

@ -2,15 +2,15 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd"; import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd";
import { useEffect, useState } from "react"; 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 LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Page from "zy-react-library/components/Page";
import PreviewImg from "zy-react-library/components/PreviewImg"; import PreviewImg from "zy-react-library/components/PreviewImg";
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 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 { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -45,7 +45,6 @@ function List(props) {
bianma: 0, bianma: 0,
}, },
]; ];
const onResetPassword = (id) => { const onResetPassword = (id) => {
Modal.confirm({ Modal.confirm({
title: "提示", title: "提示",
@ -62,21 +61,6 @@ 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 onTreeChange = (selectedKeys) => {
const key = selectedKeys[0] || null; const key = selectedKeys[0] || null;
setSelectedNodeId(key); setSelectedNodeId(key);
@ -84,10 +68,11 @@ function List(props) {
}; };
return ( return (
<div> <div>
<HeaderBack title="相关方企业人员列表" />
<Page <div
headerTitle="相关方企业人员列表" style={{
isShowFooter={false} padding: 20,
}}
> >
<div <div
style={{ style={{
@ -140,31 +125,23 @@ function List(props) {
title: "操作", title: "操作",
render: (_, record) => ( render: (_, record) => (
<Space> <Space>
{
props.permission("jgd-yhgl-userList-resetPassword") <Button
&& ( type="link"
<Button onClick={() => onResetPassword(record.id)}
type="link" >
onClick={() => onResetPassword(record.id)} 重置密码
> </Button>
重置密码
</Button> <Button
) type="link"
} onClick={() => {
{ setAddModalOpen(true);
props.permission("jgd-yhgl-userList-info") setCurrentId(record.id);
&& ( }}
<Button >
type="link" 查看
onClick={() => { </Button>
setAddModalOpen(true);
setCurrentId(record.id);
}}
>
查看
</Button>
)
}
</Space> </Space>
), ),
@ -188,7 +165,7 @@ function List(props) {
}} }}
/> />
)} )}
</Page> </div>
</div> </div>
); );
} }

View File

@ -2,9 +2,10 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import AreaSelect from "zy-react-library/components/SelectTree/Area"; import AreaSelect from "zy-react-library/components/SelectTree/Area";
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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import { import {
UNIFIED_SOCIAL_CREDIT_CODE, UNIFIED_SOCIAL_CREDIT_CODE,
@ -125,14 +126,16 @@ function Update(props) {
return ( return (
<> <>
<Page <HeaderBack title="编辑" />
headerTitle="编辑" <div
isShowFooter={false} style={{
padding: 20,
}}
> >
<FormBuilder <FormBuilder
form={form} form={form}
confirmLoading={ loading={
props.enterprise.enterpriseLoading props.enterprise.enterpriseLoading
} }
@ -190,7 +193,7 @@ function Update(props) {
onFinish={onSubmit} onFinish={onSubmit}
onValuesChange={onValuesChange} onValuesChange={onValuesChange}
/> />
</Page> </div>
</> </>
); );
} }

View File

@ -330,7 +330,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={props.loading} loading={props.loading}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
> >

View File

@ -227,7 +227,7 @@ function AddModalComponent(props) {
open={props.open} open={props.open}
title={props.currentId ? "编辑" : "新增"} title={props.currentId ? "编辑" : "新增"}
width={800} width={800}
confirmLoading={props.loading} loading={props.loading}
onOk={form.submit} onOk={form.submit}
onCancel={onCancel} onCancel={onCancel}
> >

View File

@ -2,21 +2,22 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import Page from "zy-react-library/components/Page"; import HeaderBack from "zy-react-library/components/HeaderBack";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; 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 { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useUploadFile from "zy-react-library/hooks/useUploadFile"; import useUploadFile from "zy-react-library/hooks/useUploadFile";
import nation from "zy-react-library/json/nation.json"; import nation from "zy-react-library/json/nation.json";
import { ID_NUMBER, PHONE } from "zy-react-library/regular"; 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 { NS_USER } from "~/enumerate/namespace";
import { useDebounce, UseDecodeIdCard } from "~/utils"; import { useDebounce, UseDecodeIdCard } from "~/utils";
// import useGetFile from "zy-react-library/hooks/useGetFile"; // import useGetFile from "zy-react-library/hooks/useGetFile";
const WHETHER_ENUM = [ const WHETHER_ENUM = [
@ -261,16 +262,18 @@ function Add(props) {
}; };
return ( return (
<> <>
<Page <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
headerTitle={queryParams["id"] ? "编辑" : "新增"} <div
isShowFooter={false} style={{
paddingBottom: 10,
}}
> >
<FormBuilder <FormBuilder
form={form} form={form}
values={{ values={{
departmentLeaderFlag: 0, departmentLeaderFlag: 0,
}} }}
confirmLoading={uploadFileLoading || props.user.userLoading} loading={uploadFileLoading || props.user.userLoading}
options={[ options={[
{ {
name: "roleId", name: "roleId",
@ -459,7 +462,7 @@ function Add(props) {
onFinish={onSubmit} onFinish={onSubmit}
onValuesChange={onValuesChange} onValuesChange={onValuesChange}
/> />
</Page> </div>
</> </>
); );
} }

View File

@ -168,7 +168,7 @@ function List(props) {
/> />
<Table <Table
loding={props.user.userLoading} loading={props.user.userLoading}
rowSelection={{ rowSelection={{
selectedRowKeys, selectedRowKeys,
onChange: selectedRowKeys => setSelectedRowKeys(selectedRowKeys), onChange: selectedRowKeys => setSelectedRowKeys(selectedRowKeys),
@ -195,7 +195,6 @@ function List(props) {
&& ( && (
<Button <Button
danger danger
ghost
type="primary" type="primary"
icon={<DeleteIcon />} icon={<DeleteIcon />}
onClick={() => { onClick={() => {
@ -222,26 +221,24 @@ function List(props) {
) )
} }
{ {
props.permission("zhgl-import") // props.permission("zhgl-import")
&& ( // && (
<Button <Button
ghost type="primary"
type="primary" icon={<ImportIcon />}
icon={<ImportIcon />} onClick={() => {
onClick={() => { setImportOpen(true);
setImportOpen(true); }}
}} >
> 导入
导入 </Button>
</Button> // )
)
} }
{ {
props.permission("zhgl-export") props.permission("zhgl-export")
&& ( && (
<Button <Button
type="primary" type="primary"
ghost
icon={<ExportIcon />} icon={<ExportIcon />}
onClick={() => onExportExcel()} onClick={() => onExportExcel()}
> >