From c79a1ccbc5603dd649e680ed50f888ee72067f5e Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Fri, 19 Dec 2025 12:50:46 +0800
Subject: [PATCH] 删除

---
 src/components/Common/CommonHooks/useCommonBase.js       | 32 +++++++++++++++-----------------
 src/components/Common/CommonTable/index.js               |  2 +-
 src/mes/common/commonOperationBarComponent/MesToolbar.js |  3 +--
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index 8e31f65..ddac0fb 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -2722,6 +2722,7 @@ const useCommonBase = props => {
       onSuccess,
       nextProps
     } = params;
+    debugger
     const { sControlName = "", sInstruct } = config;
     const sControlLowerName = sControlName.toLowerCase();
 
@@ -3283,16 +3284,9 @@ const useCommonBase = props => {
     }
   };
   const handleDel = (obj) => {
-    const props = { ...this.props, ...this.state };
-    const onOkDel = handleOkDel;
-    confirm({
-      title: obj.title,
-      onOk() {
-        onOkDel(props);
-      },
-      onCancel() {
-      },
-    });
+    const props = { ...obj, ...state };
+    props.onCancel()
+    // handleOkDel(props);
   };
   /* 确定要删除 */
   const handleOkDel = async (props) => {
@@ -3346,18 +3340,22 @@ const useCommonBase = props => {
     const { data } = await commonServices.postValueService(token, value, url);
     if (data.code === 1) {
       /*   数据删除成功   */
-      if (this.props.app.currentPane.refresh !== undefined) {
-        this.props.app.currentPane.refresh();
-      }
+    
       if (sModelsType !== 'commonOeeBill') {
-        this.handleDelDataSuccess(props);
+        handleDelDataSuccess(props);
       } else {
-        message.info('删除成功！');
+        message.success("删除成功！");
       }
+      props.onCancel()
     } else { /*   失败   */
-      this.props.getServiceError(data);
+      props.getServiceError(data);
     }
   };
+  /* 数据删除成功跳转到新路由即pane */
+  const handleDelDataSuccess = (props) => {
+   
+  };
+
   const returnProps = {
     ...props,
     ...state,
@@ -3390,7 +3388,7 @@ const useCommonBase = props => {
     awaitPromiseReturn: awaitPromiseReturn,
     onSelectCommonPopup: handleSelectCommonPopup,
     onDropDownBlur: handleTableBlur,
-    onDel: handleDel
+    onDel: handleDel // 删除
   };
 
   // 切换页面时，加载角标数据
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 2d9390b..70b2133 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -4845,7 +4845,6 @@ class CommonTableRc extends React.Component {
                     loading={bLoading}
                     onClick={e => {
                       e.stopPropagation(); /* 阻止父级穿透 */
-
                       const onTempTableBtnClick = nextProps => {
                         props.onTableBtnClick &&
                           props.onTableBtnClick({
@@ -4868,6 +4867,7 @@ class CommonTableRc extends React.Component {
                             [`${props.name}SelectedRowKeys`]: [rowKeyId]
                           },
                           nextProps => {
+                            
                             onTempTableBtnClick(nextProps);
                           }
                         );
diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js
index f8dd3ad..614ce13 100644
--- a/src/mes/common/commonOperationBarComponent/MesToolbar.js
+++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js
@@ -25,8 +25,7 @@ const ToolbarFun = (props) => {
   } else if (btnName === 'btncancel') {
     props.onCancel()
   } else if (btnName === 'btndel') {
-    console.log(props,'jijijji');
-    
+    props.onDel(props)
   }
 
 
--
libgit2 0.22.2