内测bug修复：隐患打回之后重新获取一下相关方的负责人，隐患确认验收人显示不正确

package.json

@@ -32,7 +32,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-to-print": "^3.2.0",
-    "zy-react-library": "^1.1.28"
+    "zy-react-library": "^1.2.6"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/main.js

@@ -2,19 +2,22 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib";
 import { setup } from "@cqsjjb/jjb-dva-runtime";
 import { message } from "antd";
 import dayjs from "dayjs";
+import { getFileUrlFromServer } from "zy-react-library/utils";
 import "dayjs/locale/zh-cn";
 import "../blessed_by_buddha";
 
 require("antd/dist/reset.css");
 require("zy-react-library/css/common.less");
+
 window.mapLongitude = "119.69457721306945";
 window.mapLatitude = "39.940504336846665";
+window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr";
 
 dayjs.locale("zh-cn");
 setJJBCommonAntdMessage(message);
 
 const app = setup();
-
+getFileUrlFromServer();
 // 非底座环境运行
 if (!window.__POWERED_BY_QIANKUN__) {
   // 云组件默认依赖

src/pages/Container/BranchCompany/Average/Confirm/Review/index.js

@@ -75,7 +75,8 @@ function Confirm(props) {
           ...commonDeptUserFields,
           { name: "rectificationDeadline", label: "整改完成期限", render: FORM_ITEM_RENDER_ENUM.DATE, span: 24 },
         ];
-      } else {
+      }
+      else {
         return [
           {
             name: "rectificationType",
@@ -101,8 +102,8 @@ function Confirm(props) {
             hidden: formValues => !(formValues.rectificationType === 1),
             render: (
               <DepartmentSelectTree
-                isNeedCorpInfoId={data.isRelated === 1}
+                // isNeedCorpInfoId={data.isRelated === 1}
-                params={{eqCorpinfoId: data.isRelated === 1 ? data.hiddenFindDept : ""}}
+                // params={{ eqCorpinfoId: data.isRelated === 1 ? data.hiddenFindDept : "" }}
                 onChange={() => {
                   form.setFieldValue("checkUserId", "");
                   form.setFieldValue("checkUserName", "");
@@ -168,10 +169,10 @@ function Confirm(props) {
               form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName);
               form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId);
               form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName);
-              form.setFieldValue("checkDeptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept);
+              form.setFieldValue("checkDeptId", hiddenUserPresetsCO.checkDeptId || data.hiddenFindDept);
-              form.setFieldValue("checkDeptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName);
+              form.setFieldValue("checkDeptName", hiddenUserPresetsCO.checkDeptName || data.hiddenFindDeptName);
-              form.setFieldValue("checkUserId", hiddenUserPresetsCO.rectifyUserId || data.creatorId);
+              form.setFieldValue("checkUserId", hiddenUserPresetsCO.checkUserId || data.creatorId);
-              form.setFieldValue("checkUserName", hiddenUserPresetsCO.rectifyUserName || data.creatorName);
+              form.setFieldValue("checkUserName", hiddenUserPresetsCO.checkUserName || data.creatorName);
             }
           }}
         />
@@ -187,8 +188,8 @@ function Confirm(props) {
                     submitButtonText="通过"
                     onFinish={onSubmit}
                     extraActionButtons={[
-                    !isFromInspection &&
+                      !isFromInspection
-                    <Button key="reject" type="primary" danger onClick={() => setRejectModalOpen(true)}>打回</Button>,
+                      && <Button key="reject" type="primary" danger onClick={() => setRejectModalOpen(true)}>打回</Button>,
                     ]}
                     values={{
                       rectificationType: 1,

src/pages/Container/BranchCompany/Average/Ledger/Add/index.js

@@ -60,6 +60,15 @@ function Add(props) {
   const { loading: uploadFileLoading, uploadFile } = useUploadFile();
   const { loading: getFileLoading, getFile } = useGetFile();
 
+  const getXgfProjectInfo = async (id) => {
+    const { data } = await props["xgfProjectInfo"]({ id });
+    xgfProjectInfo.current = data;
+    form.setFieldValue("rectificationDeptId", xgfProjectInfo.current.corpinfoId);
+    form.setFieldValue("rectificationUserId", xgfProjectInfo.current.userId);
+    form.setFieldValue("rectificationDeptName", xgfProjectInfo.current.corpinfoName);
+    form.setFieldValue("rectificationUserName", xgfProjectInfo.current.userName);
+  };
+
   const getData = async () => {
     if (query.id) {
       const { data } = await props["hiddenView"]({ id: query.id });
@@ -94,6 +103,9 @@ function Add(props) {
         // checkUserName: hiddenAcceptUserCO.userName,
         rectificationDescr: hiddenRectifyUserCO.descr,
       });
+      if (data.isRelated === 1) {
+        getXgfProjectInfo(data.projectId);
+      }
     }
     else {
       userInfo.current = await getUserInfo();
@@ -116,11 +128,6 @@ function Add(props) {
     setXgfProjectList(data);
   };
 
-  const getXgfProjectInfo = async (id) => {
-    const { data } = await props["xgfProjectInfo"]({ id });
-    xgfProjectInfo.current = data;
-  };
-
   useEffect(() => {
     getData();
     getConfirmUserList();
@@ -425,18 +432,14 @@ function Add(props) {
                 labelKey: "projectName",
               },
               componentProps: {
-                onChange: async (value) => {
+                onChange: (value) => {
                   form.setFieldValue("projectName", getLabelName({
                     list: xgfProjectList,
                     status: value,
                     idKey: "id",
                     nameKey: "projectName",
                   }));
-                  await getXgfProjectInfo(value);
+                  getXgfProjectInfo(value);
-                  form.setFieldValue("rectificationDeptId", xgfProjectInfo.current.corpinfoId);
-                  form.setFieldValue("rectificationUserId", xgfProjectInfo.current.userId);
-                  form.setFieldValue("rectificationDeptName", xgfProjectInfo.current.corpinfoName);
-                  form.setFieldValue("rectificationUserName", xgfProjectInfo.current.userName);
                 },
               },
             },