修改相关方企业信息 二维码判定规则

.gitignore

@@ -11,4 +11,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 .idea
-yarn.lock
+yarn.lock
+basicInfo.zip

jjb.config.js

@@ -10,8 +10,8 @@ module.exports = {
       javaGitBranch: "<branch-name>",
 
       // 接口服务地址
-      API_HOST: "http://192.168.20.100:30140",
-      // API_HOST: "https://gbs-gateway.qhdsafety.com",
+      // API_HOST: "http://192.168.20.100:30140",
+      API_HOST: "https://gbs-gateway.qhdsafety.com",
     },
     production: {
       // 应用后端分支名称，部署上线需要
@@ -48,7 +48,7 @@ module.exports = {
   // 开发服务
   server: {
     // 监听端口号
-    port: "8088",
+    port: "8089",
     // 服务地址
     host: "127.0.0.1",
     // 是否自动打开浏览器

package.json

@@ -32,7 +32,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "relation-graph": "^2.2.11",
-    "zy-react-library": "^1.1.24"
+    "zy-react-library": "^1.2.3"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/main.js

@@ -2,6 +2,7 @@ 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";
 
@@ -12,9 +13,10 @@ dayjs.locale("zh-cn");
 setJJBCommonAntdMessage(message);
 
 const app = setup();
-
+getFileUrlFromServer();
 window.mapLongitude = "119.69457721306945";
 window.mapLatitude = "39.940504336846665";
+window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr";
 
 // 非底座环境运行
 if (!window.__POWERED_BY_QIANKUN__) {

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

@@ -417,7 +417,11 @@ function AddModalComponent(props) {
                 children: info.postName,
               },
               {
-                label: "用户名(手机号)",
+                label: "姓名",
+                children: info.name,
+              },
+              {
+                label: "手机号",
                 children: (
                   <div>
 
@@ -440,11 +444,6 @@ function AddModalComponent(props) {
                   </div>
                 ),
               },
-              {
-                label: "姓名",
-                children: info.name,
-              },
-
               {
                 label: "人员类型",
                 children: info.personnelTypeName,

src/pages/Container/Stakeholder/CorpInfo/index.js

@@ -146,8 +146,10 @@ function CorpInfo(props) {
 
       const allRequiredFilled = REQUIRED_FIELDS.every((field) => {
         const val = data[field];
-        return val != null && val !== "" && !(typeof val === "number");
+        // 允许0值，但排除null、undefined和空字符串
+        return val != null && val !== "";
       });
+
       setCanShowQrCode(allRequiredFilled && hasLicenseFile);
 
       const values = {

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

@@ -491,10 +491,10 @@ function AddModalComponent(props) {
                 label: "所属岗位",
                 children: info.postName,
               },
-              {
-                label: "用户名",
-                children: info.username,
-              },
+              // {
+              //   label: "用户名",
+              //   children: info.username,
+              // },
               {
                 label: "姓名",
                 children: info.name,