From c1291aa38a0dcb287b2d648461eba56cfc7c1217 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Tue, 30 Dec 2025 09:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Container/Enterprise/BusPromiseTemplate/Add/index.js     | 2 +-
 .../Container/Enterprise/BusPromiseTemplate/List/index.js    | 4 ++--
 src/pages/Container/Enterprise/Management/Add/index.js       | 4 ++--
 .../Container/Supervise/BusPromiseTemplate/Add/index.js      | 2 +-
 src/pages/Container/Supervise/Management/Add/index.js        | 4 ++--
 src/pages/Container/Supervise/Management/List/index.js       | 5 -----
 .../Container/Supervise/components/DetailModal/index.js      | 2 +-
 7 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/pages/Container/Enterprise/BusPromiseTemplate/Add/index.js b/src/pages/Container/Enterprise/BusPromiseTemplate/Add/index.js
index ee9947c..dc3f0a9 100644
--- a/src/pages/Container/Enterprise/BusPromiseTemplate/Add/index.js
+++ b/src/pages/Container/Enterprise/BusPromiseTemplate/Add/index.js
@@ -30,7 +30,7 @@ function Add(props) {
       isRegulatory: 1,
     });
     if (success) {
-      message.success("操作成功");
+      message.success(`${query.id ? "编辑" : "新增"}成功`);
       props.history.goBack();
     }
   };
diff --git a/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js b/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js
index 2c434ac..d2bf5c1 100644
--- a/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js
+++ b/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js
@@ -73,12 +73,12 @@ function List(props) {
                 >
                   查看
                 </Button>
-                {props.permission("qy-promise-template-disable") && (
+                {(props.permission("qy-promise-template-disable") && record.isRegulatory === 1) && (
                   <Button type="link" onClick={() => updateState(record.id, record.state)}>
                     {record.state === 0 ? "禁用" : "启用"}
                   </Button>
                 )}
-                {props.permission("qy-promise-template-edit") && (
+                {(props.permission("qy-promise-template-edit") && record.isRegulatory === 1) && (
                   <Button
                     type="link"
                     onClick={() => {
diff --git a/src/pages/Container/Enterprise/Management/Add/index.js b/src/pages/Container/Enterprise/Management/Add/index.js
index 1beec7d..3d27aa0 100644
--- a/src/pages/Container/Enterprise/Management/Add/index.js
+++ b/src/pages/Container/Enterprise/Management/Add/index.js
@@ -78,7 +78,7 @@ function Add(props) {
 
   const onSubmit = async (values) => {
     await isExistenceDuplicateSelection({ data: values.promisePersons, key: "postId", message: `承诺人岗位不能重复` });
-    const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + item.userName.length, 0);
+    const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + (Array.isArray(item.userName) ? item.userName.length : 1), 0);
     const persons = values.promisePersons.map(item => ({
       ...item,
       userName: item.userName.join(","),
@@ -104,7 +104,7 @@ function Add(props) {
       peopleNumInvolved,
     });
     if (success) {
-      message.success("操作成功");
+      message.success(`${query.id ? "编辑" : "新增"}成功`);
       props.history.goBack();
     }
   };
diff --git a/src/pages/Container/Supervise/BusPromiseTemplate/Add/index.js b/src/pages/Container/Supervise/BusPromiseTemplate/Add/index.js
index f6da192..91fd451 100644
--- a/src/pages/Container/Supervise/BusPromiseTemplate/Add/index.js
+++ b/src/pages/Container/Supervise/BusPromiseTemplate/Add/index.js
@@ -35,7 +35,7 @@ function Add(props) {
       isRegulatory: 0,
     });
     if (success) {
-      message.success("操作成功");
+      message.success(`${query.id ? "编辑" : "新增"}成功`);
       props.history.goBack();
     }
   };
diff --git a/src/pages/Container/Supervise/Management/Add/index.js b/src/pages/Container/Supervise/Management/Add/index.js
index 55a743d..f50f756 100644
--- a/src/pages/Container/Supervise/Management/Add/index.js
+++ b/src/pages/Container/Supervise/Management/Add/index.js
@@ -91,7 +91,7 @@ function Add(props) {
       ...item,
       isPromisePeople: 1,
     }));
-    const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + item.userName.length, 0);
+    const peopleNumInvolved = values.promisePersons.reduce((acc, item) => acc + (Array.isArray(item.userName) ? item.userName.length : 1), 0);
     const persons = values.promisePersons.map(item => ({
       ...item,
       userName: Array.isArray(item.userName) ? item.userName.join(",") : item.userName,
@@ -107,7 +107,7 @@ function Add(props) {
       peopleNumInvolved,
     });
     if (success) {
-      message.success("操作成功");
+      message.success(`${query.id ? "编辑" : "新增"}成功`);
       props.history.goBack();
     }
   };
diff --git a/src/pages/Container/Supervise/Management/List/index.js b/src/pages/Container/Supervise/Management/List/index.js
index e274fe4..cc0bd23 100644
--- a/src/pages/Container/Supervise/Management/List/index.js
+++ b/src/pages/Container/Supervise/Management/List/index.js
@@ -123,11 +123,6 @@ function List(props) {
             render: (_, record) => getLabelName({ list: PROMISE_TYPE_ENUM, status: record.promiseType }),
           },
           { title: "安全承诺级别", dataIndex: "levelName", hidden: query.releasePlatform === "2" },
-          {
-            title: "下发对象",
-            dataIndex: "releasePlatform",
-            render: (_, record) => getLabelName({ list: RELEASE_PLATFORM_ENUM, status: record.releasePlatform }),
-          },
           { title: "签订单位", dataIndex: "corpName", hidden: query.releasePlatform === "2" },
           { title: "适用期限", render: (_, record) => `${record.promiseTermStart}至${record.promiseTermEnd}` },
           { title: "涉及岗位", dataIndex: "postNames" },
diff --git a/src/pages/Container/Supervise/components/DetailModal/index.js b/src/pages/Container/Supervise/components/DetailModal/index.js
index 37a224c..dc64ffd 100644
--- a/src/pages/Container/Supervise/components/DetailModal/index.js
+++ b/src/pages/Container/Supervise/components/DetailModal/index.js
@@ -78,7 +78,7 @@ const DetailModal = (props) => {
               <div className="hairdresser">
                 <div className="promiser">
                   发状人：
-                  {form.promisePeople}
+                  {typeof form.promisePeople === "string" ? form.promisePeople : form.promisePeople.userName}
                 </div>
               </div>
             )}