From bc3632e0542967c4450d42a9dab8a51488fff39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 4 Sep 2023 18:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E5=8F=91?=
 =?UTF-8?q?=E8=96=AA=E5=91=98=E5=B7=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E8=96=AA=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryFile/salaryArchiveEditAdjLogRecord.js      |  7 ++++---
 .../pages/salaryFile/salaryItemChangeList.js         | 12 +++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js
index cceb5f89..a1656d53 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js
@@ -120,7 +120,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
         const { list } = salaryArchiveItemDetail;
         let payload = {
           ...adjForm.getFormParams(), salaryArchiveId,
-          effectiveTime: moment(adjForm.getFormParams().effectiveTime).format("YYYY-MM-DD"),
+          effectiveTime: moment(new Date(adjForm.getFormParams().effectiveTime)).format("YYYY-MM-DD"),
           salaryArchiveItems: _.map(list, o => ({ salaryItemId: o.salaryItem, adjustValue: o.adjustAfter }))
         };
         if (salaryArchiveItemId) {
@@ -173,7 +173,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
         title: getLabel(111, "调整后"),
         dataIndex: "adjustAfter",
         key: "adjustAfter",
-        com: [{ label: "", type: "INPUTNUMBER", precision: 3, viewAttr: 3, key: "adjustAfter" }],
+        com: [{ label: "", type: "INPUTNUMBER", otherParams: { precision: 3 }, viewAttr: 3, key: "adjustAfter" }],
         colSpan: 1,
         width: "30%"
       }
@@ -184,7 +184,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
         scalable hasScroll className="declareResultDialog" initLoadCss
         style={{
           width: 800,
-          height: 606.6,
+          height: 406.6,
           minHeight: 200,
           minWidth: 380,
           maxHeight: "80%",
@@ -202,6 +202,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
                 <WeaTableEdit
                   ref={dom => this.tableEdit = dom} deleteConfirm
                   columns={adjColumns} datas={list} showCopy={false}
+                  showAdd={!id} showDelete={!id}
                   onChange={o => this.setState({
                     salaryArchiveItemDetail: {
                       ...salaryArchiveItemDetail, list: o
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
index 410e4a6d..21b8042a 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { Menu, message, Modal, Popover } from "antd";
+import { message, Modal } from "antd";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
 import { inject, observer } from "mobx-react";
 import { deleteSalaryItem } from "../../apis/archive";
@@ -89,14 +89,8 @@ export default class SalaryItemChangeList extends React.Component {
           render: (text, record) => {
             return <div className="optWrapper">
               <a href="javascript:void(0);" className="mr10" onClick={() => this.handleEdit(record)}>编辑</a>
-              <Popover
-                overlayClassName="moreIconWrapper"
-                placement="bottomRight"
-                content={<Menu onClick={(e) => this.deleteSalaryItem(record.id)}>
-                  <Menu.Item key="delete">删除</Menu.Item>
-                </Menu>} title="">
-                <i className="icon-coms-more"/>
-              </Popover>
+              <a href="javascript:void(0);"
+                 onClick={() => this.deleteSalaryItem(record.id)}>{getLabel(535052, "删除")}</a>
             </div>;
           }
         }];