diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js
index 5c1de3b..04d0f50 100644
--- a/src/mes/common/commonOperationBarComponent/index.js
+++ b/src/mes/common/commonOperationBarComponent/index.js
@@ -10,7 +10,7 @@ import costomPageFun from "@/mes/costomPageFun";
 import * as commonConfig from "@/utils/config";
 
 import styles from "./index.less";
-import { Button, Space, Input, Modal, Dropdown } from "antd";
+import { Button, Space, Input, Modal, Dropdown, Popconfirm } from "antd";
 import { ScanOutlined } from "@ant-design/icons";
 
 const useCommonOperationBarComponentEvent = props => {
@@ -676,7 +676,7 @@ const useCommonOperationBarComponentEvent = props => {
       } else {
         rowDataValue = rowDataValue.toString();
       }
-    } catch (error) {}
+    } catch (error) { }
     switch (conditionStr) {
       case "===":
         return rowDataValue === conditionValue;
@@ -957,23 +957,23 @@ const CommonOperationBarComponent = basProps => {
       bFilter =
         searchValue !== undefined && searchValue !== ""
           ? [
-              {
-                bFilterCondition: bExactMatch ? "=" : "like",
-                bFilterName: "sWorkOrderNo",
-                bFilterValue: searchValue
-              }
-            ]
+            {
+              bFilterCondition: bExactMatch ? "=" : "like",
+              bFilterName: "sWorkOrderNo",
+              bFilterValue: searchValue
+            }
+          ]
           : undefined;
     } else {
       bFilter =
         searchValue !== undefined && searchValue !== ""
           ? [
-              {
-                bFilterCondition: bExactMatch ? "=" : "like",
-                bFilterName: searchField.sName,
-                bFilterValue: searchValue
-              }
-            ]
+            {
+              bFilterCondition: bExactMatch ? "=" : "like",
+              bFilterName: searchField.sName,
+              bFilterValue: searchValue
+            }
+          ]
           : undefined;
     }
 
@@ -1054,6 +1054,23 @@ const CommonOperationBarComponent = basProps => {
             ""
           )}
           {btnRightConfig.map(item => {
+            // 整体下班
+            if (item.sControlName === 'BtnRight.EndWork') {
+              const btnProps = props.onGetBtnPropps(item, searchField);
+              if (!btnProps.disabled) {
+                return (
+                  <Popconfirm
+                    title="是否确定整体下班"
+                    placement="topRight"
+                    overlayClassName={styles.popconfirm}
+                    onConfirm={btnProps.onClick}
+                  >
+                    <Button {...btnProps} onClick={null}>
+                      {item.showName}
+                    </Button>
+                  </Popconfirm>);
+              }
+            }
             return (
               <Button {...props.onGetBtnPropps(item, searchField)}>
                 {item.showName}