From 2aeda4f5434747c2c2a6658e89a9ca8dcaeffe98 Mon Sep 17 00:00:00 2001
From: zhangz <zhangz@xlyerp.com>
Date: Thu, 11 Dec 2025 16:00:51 +0800
Subject: [PATCH] 新增人脸添加人员功能；

---
 src/components/Common/CommonHooks/useCommonBase.js       |  4 ++--
 src/mes/common/commonOperationBarComponent/MesToolbar.js | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/mes/common/commonOperationBarComponent/index.js      |  2 +-
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index cc5778e..d9c4196 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -2136,10 +2136,10 @@ const useCommonBase = props => {
       value,
       url
     )).data;
-    const { code, msg } = returnData;
+    const { code, msg, dataset } = returnData;
     if (code === 1) {
       message.success(msg);
-      onSuccess && onSuccess(true);
+      onSuccess && onSuccess(true, dataset);
     } else if (code === -7) {
       Modal.confirm({
         title: FriendlyReminder,
diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js
index f307efa..7a65055 100644
--- a/src/mes/common/commonOperationBarComponent/MesToolbar.js
+++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js
@@ -17,6 +17,8 @@ const ToolbarFun = (props) => {
     handleSave(props);
   } else if (btnName === 'btnupd') {
     props.onSaveState({ enabled: true });
+  } else if (btnName === 'btnscanface') {
+    handleScanFace(props);
   }
 
 
@@ -61,6 +63,7 @@ const handleAdd = (props) => {
   });
 }
 
+// 保存
 const handleSave = (props) => {
   props.onExecInstructSet({
     btnConfig: {
@@ -82,4 +85,50 @@ const handleSave = (props) => {
   });
 }
 
+// 人脸数据采集
+const handleScanFace = (props) => {
+  const { btnConfig } = props;
+  const { sButtonParam: sButtonParamStr } = btnConfig;
+  const sButtonParam = commonUtils.convertStrToObj(sButtonParamStr);
+  const { addData } = sButtonParam;
+
+  props.onExecInstructSet({
+    btnConfig: {
+      showName: "保存",
+      sInstruct: JSON.stringify([
+        {
+          opr: "faceauth",
+          newDataset: "face"
+        },
+      ])
+    },
+    inscallback: (result) => {
+      const { faceData = [] } = result;
+      props.onProcedureCall({
+        btnConfig,
+        faceData: { sFaceParentId: faceData[0].sParentId, sFaceEmployeeNo: faceData[0].sEmployeeNo },
+        onSuccess: (_, dataset) => {
+          const { proData = [] } = dataset.rows[0].dataSet;
+          const { [`${addData}Data`]: tableData = [] } = props;
+          proData.forEach(item => {
+            tableData.push({
+              ...item,
+              sId: commonUtils.createSid(),
+              handleType: "add",
+              sParentId: props.masterData.sId,
+            })
+          });
+          props.onSaveState({
+            [`${addData}Data`]: tableData
+          });
+        },
+        onConfirm: () => { },
+        onError: () => { }
+      });
+    },
+  });
+
+
+}
+
 export default ToolbarFun;
\ No newline at end of file
diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js
index 22ddc14..bcc5c0f 100644
--- a/src/mes/common/commonOperationBarComponent/index.js
+++ b/src/mes/common/commonOperationBarComponent/index.js
@@ -602,7 +602,7 @@ const useCommonOperationBarComponentEvent = props => {
           defaultProps.disabled = true;
         }
       } else {
-        if (["btnsave"].includes(btnName)) {
+        if (["btnsave", "btnscanface"].includes(btnName)) {
           defaultProps.disabled = true;
         }
       }
--
libgit2 0.22.2