0814 需求变更

src/enumerate/constant/index.js

@@ -3,3 +3,8 @@
  */
 
 export {};
+
+export const RZ_FLAG_ENUM = [
+  { bianma: 0, name: "平台自建" },
+  { bianma: 1, name: "人资导入" },
+];

src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js

@@ -13,7 +13,7 @@ import { NS_USER } from "~/enumerate/namespace";
 const ENTERPRISE_TYPE = [
   {
     bianma: 0,
-    name: "普通企业",
+    name: "分子公司",
   },
   {
     bianma: 1,

src/pages/Container/Enterprise/StakeholderUnit/AccountManage/List/index.js

@@ -7,7 +7,6 @@ import AddIcon from "zy-react-library/components/Icon/AddIcon";
 
 import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
-import DictionarySelect from "zy-react-library/components/Select/Dictionary";
 // import AreaSelect from "zy-react-library/components/SelectTree/Area";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";

src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js

@@ -217,7 +217,6 @@ function View(props) {
             //   children: info.totalAssets,
             // },
 
-
             {
               label: "相关方类型",
               children: getLabelName({

src/pages/Container/Enterprise/StakeholderUnit/User/List/index.js

@@ -5,14 +5,12 @@ import { Button, Form, Space } from "antd";
 import { useState } from "react";
 import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
-import AreaSelect from "zy-react-library/components/SelectTree/Area";
 
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
-import { getAreaNamePath } from "~/utils";
 // import { getLabelName } from "zy-react-library/utils";
 
 const ENTERPRISE_TYPE = [

src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js

@@ -28,17 +28,20 @@ const USER_FLAG = [
 const ENTERPRISE_TYPE = [
   {
     bianma: 0,
-    name: "普通企业",
+    name: "分子公司",
   },
   {
     bianma: 1,
     name: "集团单位",
   },
+  {
+    bianma: 5,
+    name: "驻港单位",
+  },
   {
     bianma: 6,
     name: "物资中心",
   },
-
 ];
 const ENTERPRISE_STATUS = [
   {
@@ -141,12 +144,21 @@ function List(props) {
   return (
     <Page isShowAllAction={false}>
       <Search
+        values={{
+          eqType: "0",
+        }}
         form={form}
         options={[
           {
             name: "likecorpName",
             label: "分公司名称",
           },
+          {
+            name: "eqType",
+            label: "企业类型",
+            render: FORM_ITEM_RENDER_ENUM.SELECT,
+            items: ENTERPRISE_TYPE.map(item => ({ ...item, bianma: item.bianma.toString() })),
+          },
           {
             name: "eqCorpState",
             label: "分公司状态",

src/pages/Container/Supervision/BranchCompany/AccountManage/View/index.js

@@ -10,7 +10,7 @@ import { NS_ENTERPRISE } from "~/enumerate/namespace";
 const ENTERPRISE_TYPE = [
   {
     bianma: 0,
-    name: "普通企业",
+    name: "分子公司",
   },
   {
     bianma: 1,

src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js

@@ -12,12 +12,16 @@ import { NS_ENTERPRISE } from "~/enumerate/namespace";
 const ENTERPRISE_TYPE = [
   {
     bianma: 0,
-    name: "普通企业",
+    name: "分子公司",
   },
   {
     bianma: 1,
     name: "集团单位",
   },
+  {
+    bianma: 5,
+    name: "驻港单位",
+  },
   {
     bianma: 6,
     name: "物资中心",
@@ -71,12 +75,21 @@ function List(props) {
       <div>
         <div>
           <Search
+            values={{
+              eqType: "0",
+            }}
             form={form}
             options={[
               {
                 name: "likeCorpName",
                 label: "分公司名称",
               },
+              {
+                name: "eqType",
+                label: "企业类型",
+                render: FORM_ITEM_RENDER_ENUM.SELECT,
+                items: ENTERPRISE_TYPE.map(item => ({ ...item, bianma: item.bianma.toString() })),
+              },
               {
                 name: "eqCorpState",
                 label: "分公司状态",

src/pages/Container/Supervision/BranchCompany/DepartmentManage/View/index.js

@@ -4,9 +4,10 @@ import { Button, Descriptions, Form, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
 import Page from "zy-react-library/components/Page";
+import Search from "zy-react-library/components/Search";
 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 { NS_DEPARTMENT } from "~/enumerate/namespace";
 
@@ -53,6 +54,20 @@ function View(props) {
               flex: 1,
             }}
           >
+            <Search
+              form={form}
+              options={[
+                {
+                  name: "likeName",
+                  label: "部门名称",
+                },
+                {
+                  name: "likeLeaderName",
+                  label: "负责人名称",
+                },
+              ]}
+              onFinish={getData}
+            />
             <Table
               columns={[
                 {

src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js

@@ -43,6 +43,24 @@ const STATUS = [
     name: "停用",
   },
 ];
+const ENTERPRISE_TYPE = [
+  {
+    bianma: 0,
+    name: "分子公司",
+  },
+  {
+    bianma: 1,
+    name: "集团单位",
+  },
+  {
+    bianma: 5,
+    name: "驻港单位",
+  },
+  {
+    bianma: 6,
+    name: "物资中心",
+  },
+];
 function List(props) {
   const [form] = Form.useForm();
   const { tableProps, getData } = useTable(props["corpInfoList"], {
@@ -85,12 +103,21 @@ function List(props) {
   return (
     <Page isShowAllAction={false}>
       <Search
+        values={{
+          eqType: "0",
+        }}
         form={form}
         options={[
           {
             name: "likecorpName",
             label: "分公司名称",
           },
+          {
+            name: "eqType",
+            label: "企业类型",
+            render: FORM_ITEM_RENDER_ENUM.SELECT,
+            items: ENTERPRISE_TYPE.map(item => ({ ...item, bianma: item.bianma.toString() })),
+          },
           {
             label: "分公司状态",
             name: "eqCorpState",

src/pages/Container/Supervision/BranchCompany/SubsidiaryUser/List/index.js

@@ -41,6 +41,24 @@ const USER_FLAG = [
     name: "停用",
   },
 ];
+const ENTERPRISE_TYPE = [
+  {
+    bianma: 0,
+    name: "分子公司",
+  },
+  {
+    bianma: 1,
+    name: "集团单位",
+  },
+  {
+    bianma: 5,
+    name: "驻港单位",
+  },
+  {
+    bianma: 6,
+    name: "物资中心",
+  },
+];
 function List(props) {
   const [form] = Form.useForm();
   const { tableProps, getData } = useTable(props["corpUserMiddlePage"], {
@@ -59,6 +77,9 @@ function List(props) {
       }}
     >
       <Search
+        values={{
+          eqType: "0",
+        }}
         form={form}
         options={[
           {
@@ -66,6 +87,12 @@ function List(props) {
             label: "分公司名称",
             placeholder: "请输入分公司名称",
           },
+          {
+            name: "eqType",
+            label: "企业类型",
+            render: FORM_ITEM_RENDER_ENUM.SELECT,
+            items: ENTERPRISE_TYPE.map(item => ({ ...item, bianma: item.bianma.toString() })),
+          },
           {
             name: "eqCorpState",
             label: "分公司状态",

src/pages/Container/Supervision/BranchCompany/SubsidiaryUser/UserList/index.js

@@ -5,10 +5,12 @@ import { useEffect, useState } from "react";
 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 Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
+import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
-
 import { getLabelName } from "zy-react-library/utils";
 import { NS_USER } from "~/enumerate/namespace";
 import { UseDecodeIdCard } from "~/utils";
@@ -16,6 +18,7 @@ import { UseDecodeIdCard } from "~/utils";
 function List(props) {
   const queryParams = useGetUrlQuery();
   const [selectedNodeId, setSelectedNodeId] = useState();
+  const [rolesData, setRolesData] = useState([]);
   const [addModalOpen, setAddModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
   const [form] = Form.useForm();
@@ -31,6 +34,11 @@ function List(props) {
       };
     },
   });
+  useEffect(() => {
+    props.rolesAll({ pageIndex: 1, pageSize: 1000 }).then((res) => {
+      setRolesData(res.data);
+    });
+  }, []);
   const onTreeChange = (selectedKeys) => {
     const key = selectedKeys[0] || null;
     setSelectedNodeId(key);
@@ -50,6 +58,23 @@ function List(props) {
             flex: 1,
           }}
         >
+          <Search
+            form={form}
+            options={[
+              {
+                name: "likeName",
+                label: "姓名",
+              },
+              {
+                name: "eqRoleId",
+                label: "用户角色",
+                render: FORM_ITEM_RENDER_ENUM.SELECT,
+                items: rolesData,
+                itemsField: { labelKey: "roleName", valueKey: "id" },
+              },
+            ]}
+            onFinish={getData}
+          />
           <Table
             columns={[
               {
@@ -92,8 +117,8 @@ function List(props) {
         open={addModalOpen}
         getData={getData}
         currentId={currentId}
+        rolesData={rolesData}
         requestDetails={props["userDetails"]}
-        requwstRolesAll={props["rolesAll"]}
         requestGetEncryInfo={props["getEncryInfo"]}
         onCancel={() => {
           setAddModalOpen(false);
@@ -106,14 +131,10 @@ function List(props) {
 function AddModalComponent(props) {
   const [form] = Form.useForm();
   const [info, setInfo] = useState({});
-  const [rolesData, setRolesData] = useState([]);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [viewType, setViewType] = useState(false);
   const [viewData, setViewData] = useState(false);
   useEffect(() => {
-    props.requwstRolesAll({ pageIndex: 1, pageSize: 1000 }).then((res) => {
-      setRolesData(res.data);
-    });
     if (props.currentId) {
       const fetchData = async () => {
         const res = await props.requestDetails({
@@ -179,7 +200,7 @@ function AddModalComponent(props) {
                 label: "用户角色",
                 children: getLabelName({
                   status: info.roleId,
-                  list: rolesData,
+                  list: props.rolesData,
                   idKey: "id",
                   nameKey: "roleName",
                 }),

src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js

@@ -12,7 +12,7 @@ import { NS_USER } from "~/enumerate/namespace";
 const ENTERPRISE_TYPE = [
   {
     bianma: 0,
-    name: "普通企业",
+    name: "分子公司",
   },
   {
     bianma: 1,

src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js

@@ -13,7 +13,7 @@ import { NS_ENTERPRISE } from "~/enumerate/namespace";
 const ENTERPRISE_TYPE = [
   {
     bianma: 0,
-    name: "普通企业",
+    name: "分子公司",
   },
   {
     bianma: 1,

src/pages/Container/Supervision/StakeholderUnit/AccountManage/List/index.js

@@ -13,7 +13,7 @@ import useTable from "zy-react-library/hooks/useTable";
 import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
 import { getLabelName } from "zy-react-library/utils";
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
-import { getAreaNamePath, useDebounce } from "~/utils";
+import { useDebounce } from "~/utils";
 
 const ENTERPRISE_TYPE = [
   {

src/pages/Container/Supervision/StakeholderUnit/User/List/index.js

@@ -2,16 +2,13 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
 
-import { useState } from "react";
 import Search from "zy-react-library/components/Search";
-import AreaSelect from "zy-react-library/components/SelectTree/Area";
 import Table from "zy-react-library/components/Table";
 
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
-import { getAreaNamePath } from "~/utils";
 
 // import { getLabelName } from "zy-react-library/utils";
 

src/pages/Container/Supervision/Supervision/User/Add/index.js

@@ -15,6 +15,7 @@ import nation from "zy-react-library/json/nation.json";
 import { ID_NUMBER, PHONE } from "zy-react-library/regular";
 
 import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils";
+import { RZ_FLAG_ENUM } from "~/enumerate/constant";
 import { NS_USER } from "~/enumerate/namespace";
 import { useDebounce, UseDecodeIdCard } from "~/utils";
 // import useGetFile from "zy-react-library/hooks/useGetFile";
@@ -277,6 +278,7 @@ function Add(props) {
           form={form}
           values={{
             departmentLeaderFlag: 0,
+            rzFlag: 0,
           }}
           loading={uploadFileLoading || props.user.userLoading}
           options={[
@@ -457,13 +459,23 @@ function Add(props) {
                 },
               ],
             },
+            {
+              name: "rzFlag",
+              label: "人员来源",
+              required: false,
+              render: FORM_ITEM_RENDER_ENUM.SELECT,
+              items: RZ_FLAG_ENUM,
+              componentProps: {
+                disabled: true,
+              },
+            },
             {
               name: "remarks",
               label: "备注",
+              span: 24,
               required: false,
               render: FORM_ITEM_RENDER_ENUM.TEXTAREA,
             },
-
           ]}
           labelCol={{
             span: 6,

src/pages/Container/Supervision/Supervision/User/List/index.js

@@ -18,6 +18,7 @@ import useDownloadBlob from "zy-react-library/hooks/useDownloadBlob";
 import useImportFile from "zy-react-library/hooks/useImportFile";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
+import { RZ_FLAG_ENUM } from "~/enumerate/constant";
 import { NS_USER } from "~/enumerate/namespace";
 import { UseDecodeIdCard } from "~/utils";
 
@@ -570,9 +571,14 @@ function AddModalComponent(props) {
                 label: "邮箱",
                 children: info.email,
               },
+              {
+                label: "人员来源",
+                children: getLabelName({ list: RZ_FLAG_ENUM, status: info.rzFlag }),
+              },
               {
                 label: "备注",
                 children: info.remarks,
+                span: 2,
               },
             ]}
             column={2}