Przeglądaj źródła

fix: cld2BasicTable组件枚举的调整

outaozhen 4 lat temu
rodzic
commit
d839b7f2a6

+ 9 - 8
src/pages/Hr/AddressBook/index.jsx

@@ -16,49 +16,49 @@ const AddressBook = () => {
       title: '工号',
       title: '工号',
       dataIndex: 'jobNumber',
       dataIndex: 'jobNumber',
       search: false,
       search: false,
-      width: 50
+      width: 100
     },
     },
     {
     {
       title: '姓名',
       title: '姓名',
       dataIndex: 'username',
       dataIndex: 'username',
       search: false,
       search: false,
-      width: 50
+      width: 80
     },
     },
     {
     {
       title: '手机',
       title: '手机',
       dataIndex: 'telephone',
       dataIndex: 'telephone',
       search: false,
       search: false,
-      width: 50
+      width: 120
     },
     },
     {
     {
       title: 'QQ',
       title: 'QQ',
       dataIndex: 'qq',
       dataIndex: 'qq',
       search: false,
       search: false,
-      width: 50
+      width: 150
     },
     },
     {
     {
       title: '部门',
       title: '部门',
       dataIndex: 'departmentName',
       dataIndex: 'departmentName',
       search: false,
       search: false,
-      width: 50
+      width: 70
     },
     },
     {
     {
       title: '岗位',
       title: '岗位',
       dataIndex: 'position',
       dataIndex: 'position',
       search: false,
       search: false,
-      width: 50
+      width: 100
     },
     },
     {
     {
       title: '生日',
       title: '生日',
       dataIndex: 'birthday',
       dataIndex: 'birthday',
       search: false,
       search: false,
-      width: 50
+      width: 150
     },
     },
     {
     {
       title: '入职时间',
       title: '入职时间',
       dataIndex: 'hiredate',
       dataIndex: 'hiredate',
       search: false,
       search: false,
-      width: 50
+      width: 150
     }
     }
   ]
   ]
   return (
   return (
@@ -68,6 +68,7 @@ const AddressBook = () => {
         <div className="ml-8 shadow-hex-3e2c5a">
         <div className="ml-8 shadow-hex-3e2c5a">
           {state.params.id && (
           {state.params.id && (
             <BasicTable
             <BasicTable
+              mainMenuType="hr"
               columnStateType="ADDRESSBOOK"
               columnStateType="ADDRESSBOOK"
               params={{ departmentId: state.params.id }}
               params={{ departmentId: state.params.id }}
               rowKey={record => record.id}
               rowKey={record => record.id}

+ 1 - 0
src/pages/Hr/Employee/index.jsx

@@ -86,6 +86,7 @@ const Employee = props => {
         <div className="ml-8 shadow-hex-3e2c5a">
         <div className="ml-8 shadow-hex-3e2c5a">
           {state.params.id && (
           {state.params.id && (
             <BasicTable
             <BasicTable
+              mainMenuType="hr"
               columnStateType="EMPLOYEE"
               columnStateType="EMPLOYEE"
               params={{ departmentId: state.params.id }}
               params={{ departmentId: state.params.id }}
               rowKey={record => record.id}
               rowKey={record => record.id}

+ 4 - 2
src/pages/Product/Road/Enterprise/index.jsx

@@ -48,7 +48,7 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
       title: '企业名称',
       title: '企业名称',
       dataIndex: 'name',
       dataIndex: 'name',
       key: 'name',
       key: 'name',
-      width: 110,
+      width: 180,
       fixed: 'left',
       fixed: 'left',
       render: (text, record) => (
       render: (text, record) => (
         <span
         <span
@@ -118,12 +118,14 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
       title: '注册时间',
       title: '注册时间',
       dataIndex: 'createTime',
       dataIndex: 'createTime',
       key: 'createTime',
       key: 'createTime',
-      width: 110,
+      width: 150,
       renderText: text => dayjsFormat(text, 'YYYY-MM-DD HH:mm')
       renderText: text => dayjsFormat(text, 'YYYY-MM-DD HH:mm')
     }
     }
   ]
   ]
   return (
   return (
     <BasicTable
     <BasicTable
+      mainMenuType="product"
+      columnStateType="ENTERPRISE"
       rowKey={record => record.ID}
       rowKey={record => record.ID}
       actionRef={tRef}
       actionRef={tRef}
       columns={columns}
       columns={columns}

+ 2 - 0
src/pages/Product/Road/Personal/index.jsx

@@ -197,6 +197,8 @@ const Personal = props => {
   }
   }
   return (
   return (
     <BasicTable
     <BasicTable
+      mainMenuType="product"
+      columnStateType="PERSONAL"
       actionRef={tRef}
       actionRef={tRef}
       rowKey={record => record.ID}
       rowKey={record => record.ID}
       columns={columns}
       columns={columns}

+ 7 - 1
src/utils/cache/cacheEnum.ts

@@ -54,6 +54,8 @@ export enum ColumnStateEnum {
   LOCKSTORE = 'LOCKSTORE',
   LOCKSTORE = 'LOCKSTORE',
   /** @name 部门与员工 */
   /** @name 部门与员工 */
   EMPLOYEE = 'EMPLOYEE',
   EMPLOYEE = 'EMPLOYEE',
+  /** @name 通讯录 */
+  ADDRESSBOOK = 'ADDRESSBOOK',
   /** @name  养护云造价 */
   /** @name  养护云造价 */
   CURING = 'CURING',
   CURING = 'CURING',
   /** @name  大司空云计价 */
   /** @name  大司空云计价 */
@@ -61,7 +63,11 @@ export enum ColumnStateEnum {
   /** @name  公路云造价 */
   /** @name  公路云造价 */
   HIGHWAY = 'HIGHWAY',
   HIGHWAY = 'HIGHWAY',
   /** @name  大司空概算 */
   /** @name  大司空概算 */
-  GS = 'GS'
+  GS = 'GS',
+  /** @name  大司空2.0个人版 */
+  PERSONAL = 'PERSONAL',
+  /** @name  大司空2.0企业版 */
+  ENTERPRISE = 'ENTERPRISE'
 }
 }
 export enum CacheTypeEnum {
 export enum CacheTypeEnum {
   SESSION,
   SESSION,