From 8109230b3e3aab9f6ae0781e373d86ed3c1a6b75 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 25 Apr 2025 09:33:25 +0800
Subject: [PATCH] release/2.19.1.2501.01

---
 .../attendance/components/attendanceDataEditSlide.js  |  4 +++-
 .../attendance/components/attendanceDataViewSlide.js  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataEditSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataEditSlide.js
index 4a64fbfd..995e5eea 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataEditSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataEditSlide.js
@@ -29,6 +29,7 @@ class AttendanceDataEditSlide extends Component {
       this.getAttendQuoteData(nextProps);
     } else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
       form.resetForm();
+      this.setState({ conditions: [], loading: false });
     }
   }
 
@@ -92,7 +93,8 @@ class AttendanceDataEditSlide extends Component {
   render() {
     const { record } = this.props, { username } = record, { conditions, loading } = this.state;
     const btns = [
-      <Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "保存")}</Button>
+      <Button type="primary" disabled={_.isEmpty(conditions)} onClick={this.save}
+              loading={loading}>{getLabel(111, "保存")}</Button>
     ];
     return (<WeaSlideModal {...this.props} className="editAttendanceSlide" top={0} height={100} width={1000}
                            measureX="px" measureT="%" measureY="%" direction="right"
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index 529817b7..9b7e1113 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -37,6 +37,9 @@ class AttendanceDataViewSlide extends Component {
         case "PAGEINFO":
           this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.viewAttendQuote());
           break;
+        case "EDIT":
+          this.setState({ attendanceSlide: { visible: true, record: params } });
+          break;
         default:
           break;
       }
@@ -65,7 +68,13 @@ class AttendanceDataViewSlide extends Component {
           pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
         }, () => this.postMessageToChild({
           pageInfo: this.state.pageInfo, dataSource, showRowSelection: false, unitTableType: "attendanceView",
-          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : false }))
+          columns: [
+            ..._.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : false })),
+            {
+              title: getLabel(111, "操作"), dataIndex: "operate", fixed: "right",
+              operateType: [{ key: "EDIT", label: getLabel(111, "编辑") }]
+            }
+          ]
         }));
       }
     }).catch(() => this.setState({ loading: { ...loading, query: false } }));