zy-react-library 1.1.22 → 1.1.24

package/components/Select/Personnel/Gwj/index.d.ts

@@ -17,10 +17,10 @@ export interface Params {
  * 额外请求参数
  */
 export interface ExtraParams {
-  /** 返回值是否存在主账号 */
-  noMain: 1 | "";
+  /** 返回值是否存在主账号，1 不返回主账号，默认有主账号 */
+  noMain?: 1 | "";
   /** 入职状态 */
-  eqEmploymentFlag: number;
+  eqEmploymentFlag?: number;
 }
 
 /**

package/components/SelectTree/Department/Gwj/index.d.ts

@@ -1,7 +1,18 @@
 import type { FC } from "react";
-import type { Params } from "../../../LeftTree/Department/Gwj";
 import type { BasicSelectTreeProps } from "../../Basic";
 
+/**
+ * 请求参数
+ */
+export interface Params {
+  /** 企业id */
+  eqCorpinfoId?: string;
+  /** 父级部门id */
+  eqParentId?: string;
+  /** 企业类型 */
+  corpinfoTypeList?: number[];
+}
+
 /**
  * 组件属性
  */
@@ -14,8 +25,8 @@ export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "t
   isNeedCorpInfoId?: boolean;
   /** 是否需要父级部门id，默认 false */
   isNeedParentId?: boolean;
-  /** 查询当前登陆人部门还是所有企业部门，all 的话 isNeedCorpInfoId、isNeedParentId、params 不生效 */
-  searchType?: "current" | "all";
+  /** 查询当前登陆人部门还是所有企业部门 */
+  searchType?: "current" | "all" | "company";
 }
 
 /**

package/components/SelectTree/Department/Gwj/index.js

@@ -1 +1 @@
-import{request as e}from"@cqsjjb/jjb-common-lib/http.js";import{useState as r,useEffect as t}from"react";import a from"../../Basic/index.js";import{jsx as i}from"react/jsx-runtime";function n(n){const{params:o={},placeholder:s="部门",isNeedCorpInfoId:c=!1,isNeedParentId:p=!1,searchType:d="current",...m}=n,[f,l]=r([]);return t(()=>{(async()=>{if(l([]),"current"===d){if(c&&!o.eqCorpinfoId)return;if(p&&!o.eqParentId)return}const{data:r}=await e("current"===d?"/basicInfo/department/listTree":"/basicInfo/department/listAllTree","post",o);l(r)})()},[JSON.stringify(o),c,p,d]),i(a,{treeData:f,placeholder:s,childrenKey:"childrenList",...m})}n.displayName="DepartmentSelectTree";export{n as default};
+import{request as e}from"@cqsjjb/jjb-common-lib/http.js";import{useState as r,useEffect as t}from"react";import a from"../../Basic/index.js";import{jsx as n}from"react/jsx-runtime";function i(i){const{params:o={},placeholder:s="部门",isNeedCorpInfoId:c=!1,isNeedParentId:p=!1,searchType:l="current",...m}=i,[d,f]=r([]);return t(()=>{(async()=>{if(f([]),"current"===l){if(c&&!o.eqCorpinfoId)return;if(p&&!o.eqParentId)return}let r="";"current"===l&&(r="/basicInfo/department/listTree"),"all"===l&&(r="/basicInfo/department/listAllTree"),"company"===l&&(r="/basicInfo/department/listAllTreeByCorpType");const{data:t}=await e(r,"post",o);f(t)})()},[JSON.stringify(o),c,p,l]),n(a,{treeData:d,placeholder:s,childrenKey:"childrenList",...m})}i.displayName="DepartmentSelectTree";export{i as default};

package/enum/hidden/gwj/index.d.ts

@@ -21,7 +21,7 @@ export declare const HIDDEN_STATE_ENUM: [
   { bianma: "302"; name: "验收打回" },
   { bianma: "99"; name: "强制关闭（人员变动）" },
   { bianma: "98"; name: "安全环保检查/清单排查暂存" },
-  { bianma: "102"; name: "安全环保检查，隐患带指派" },
+  { bianma: "102"; name: "安全环保检查，隐患待指派" },
 ];
 
 // 隐患整改类型

package/enum/hidden/gwj/index.js

@@ -1 +1 @@
-const a=[{bianma:"1",name:"隐患快报"},{bianma:"2",name:"清单排查"},{bianma:"4",name:"安全环保检查(监管端)"},{bianma:"5",name:"安全环保检查(企业端)"},{bianma:"6",name:"消防检查"}],n=[{bianma:"100",name:"待确认"},{bianma:"97",name:"已过期"},{bianma:"200",name:"未整改"},{bianma:"300",name:"已整改"},{bianma:"301",name:"已验收"},{bianma:"101",name:"已忽略"},{bianma:"202",name:"待处理特殊处置"},{bianma:"400",name:"已处理特殊处置"},{bianma:"201",name:"确认打回"},{bianma:"302",name:"验收打回"},{bianma:"99",name:"强制关闭（人员变动）"},{bianma:"98",name:"安全环保检查/清单排查暂存"},{bianma:"102",name:"安全环保检查，隐患带指派"}],m=[{bianma:1,name:"立即整改"},{bianma:2,name:"限期整改"}];export{m as HIDDEN_RECTIFICATION_TYPE_ENUM,a as HIDDEN_SOURCE_ENUM,n as HIDDEN_STATE_ENUM};
+const a=[{bianma:"1",name:"隐患快报"},{bianma:"2",name:"清单排查"},{bianma:"4",name:"安全环保检查(监管端)"},{bianma:"5",name:"安全环保检查(企业端)"},{bianma:"6",name:"消防检查"}],n=[{bianma:"100",name:"待确认"},{bianma:"97",name:"已过期"},{bianma:"200",name:"未整改"},{bianma:"300",name:"已整改"},{bianma:"301",name:"已验收"},{bianma:"101",name:"已忽略"},{bianma:"202",name:"待处理特殊处置"},{bianma:"400",name:"已处理特殊处置"},{bianma:"201",name:"确认打回"},{bianma:"302",name:"验收打回"},{bianma:"99",name:"强制关闭（人员变动）"},{bianma:"98",name:"安全环保检查/清单排查暂存"},{bianma:"102",name:"安全环保检查，隐患待指派"}],m=[{bianma:1,name:"立即整改"},{bianma:2,name:"限期整改"}];export{m as HIDDEN_RECTIFICATION_TYPE_ENUM,a as HIDDEN_SOURCE_ENUM,n as HIDDEN_STATE_ENUM};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.1.22",
+  "version": "1.1.24",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",