zy-react-library 1.0.116 → 1.0.118

package/components/HiddenInfo/gwj/index.js

@@ -33,6 +33,7 @@ function HiddenInfo(props) {
     },
     hiddenConfirmUserCO: {},
     hiddenAcceptUserCO: {},
+    hiddenInspecCO: {},
     hiddenSpecialList: [],
     hiddenExtensionList: [],
   });
@@ -41,7 +42,9 @@ function HiddenInfo(props) {
   const [afterRectificationImageFiles, setAfterRectificationImageFiles] = useState([]);
   const [rectificationPlanImageFiles, setRectificationPlanImageFiles] = useState([]);
   const [acceptImageFiles, setAcceptImageFiles] = useState([]);
+  const [inspectionAcceptImageFiles, setInspectionAcceptImageFiles] = useState([]);
   const [loading, setLoading] = useState(true);
+
   const { getFile } = useGetFile();
   const query = useGetUrlQuery();
   const { loading: downloadFileLoading, downloadFile } = useDownloadFile();
@@ -72,7 +75,15 @@ function HiddenInfo(props) {
       const acceptImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["5"], eqForeignKey: hiddenId || query[hiddenIdKey] });
       setAcceptImageFiles(acceptImageFiles);
     }
-  }
+
+    if (info.hiddenInspecCO && Object.keys(info.hiddenInspecCO).length > 0) {
+      const inspectionAcceptImageFiles = await getFile({
+        eqType: UPLOAD_FILE_TYPE_ENUM["146"],
+        eqForeignKey: info.hiddenInspecCO.foreignKey,
+      });
+      setInspectionAcceptImageFiles(inspectionAcceptImageFiles);
+    }
+  };
 
   const getData = async () => {
     request(`/hidden/hidden/${id || query[idKey]}`, "get").then((res) => {
@@ -388,19 +399,27 @@ function HiddenInfo(props) {
                 )
               : null
           }
-          <Divider orientation="left">安全环保验收信息</Divider>
-          <Descriptions
-            bordered
-            column={1}
-            labelStyle={{ width: 200 }}
-            items={[
-              { label: "验收人", children: "todo" },
-              { label: "验收时间", children: "todo" },
-              { label: "是否合格", children: "todo" },
-              { label: "验收描述", children: "todo" },
-              { label: "验收图片", children: "todo" },
-            ]}
-          />
+          {
+            (info.hiddenInspecCO && Object.keys(info.hiddenInspecCO).length > 0)
+              ? (
+                  <>
+                    <Divider orientation="left">安全环保验收信息</Divider>
+                    <Descriptions
+                      bordered
+                      column={1}
+                      labelStyle={{ width: 200 }}
+                      items={[
+                        { label: "验收人", children: info.hiddenInspecCO.finalCheckOr },
+                        { label: "验收时间", children: info.hiddenInspecCO.finalCheckTime },
+                        { label: "是否合格", children: info.hiddenInspecCO.finalCheck === 1 ? "合格" : "不合格" },
+                        { label: "验收描述", children: info.hiddenInspecCO.finalCheckDesc },
+                        { label: "验收图片", children: <PreviewImg files={inspectionAcceptImageFiles} /> },
+                      ]}
+                    />
+                  </>
+                )
+              : null
+          }
         </div>
       </Spin>
     </div>

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

@@ -14,6 +14,8 @@ export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "t
   isNeedCorpInfoId?: boolean;
   /** 是否需要父级部门id，默认 false */
   isNeedParentId?: boolean;
+  /** 查询当前登陆人部门还是所有企业部门，all 的话 isNeedCorpInfoId、isNeedParentId、params 不生效 */
+  searchType?: "current" | "all";
 }
 
 /**

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

@@ -11,6 +11,7 @@ function DepartmentSelectTree(props) {
     placeholder = "部门",
     isNeedCorpInfoId = false,
     isNeedParentId = false,
+    searchType = "current",
     ...restProps
   } = props;
 
@@ -19,19 +20,21 @@ function DepartmentSelectTree(props) {
   const getData = async () => {
     setTreeData([]);
 
-    // 根据参数决定是否发送请求
-    if (isNeedCorpInfoId && !params.eqCorpinfoId)
-      return;
-    if (isNeedParentId && !params.eqParentId)
-      return;
+    if (searchType === "current") {
+      // 根据参数决定是否发送请求
+      if (isNeedCorpInfoId && !params.eqCorpinfoId)
+        return;
+      if (isNeedParentId && !params.eqParentId)
+        return;
+    }
 
-    const { data } = await request("/basic-info/department/listTree", "post", params);
+    const { data } = await request(searchType === "current" ? "/basic-info/department/listTree" : "/basic-info/department/listAllTree", "post", params);
     setTreeData(data);
   };
 
   useEffect(() => {
     getData();
-  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedParentId]);
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedParentId, searchType]);
 
   return (
     <BasicSelectTree treeData={treeData} placeholder={placeholder} childrenKey="childrenList" {...restProps} />

package/package.json

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