From 4a5f5b6e7a80f2cade340cf1edf53a8c65a64c3d 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, 12 Aug 2024 09:56:58 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E6=B5=AE=E5=8A=A8?=
 =?UTF-8?q?=E8=96=AA=E9=85=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variableSalary/components/salaryFileDialog/index.js     | 6 +++---
 pc4mobx/hrmSalary/pages/variableSalary/index.js             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index f38f45a4..ce530850 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -46,7 +46,7 @@ class Index extends Component {
           ..._.map(salaryFileConditions, item => ({
             ...item,
             items: _.map(item.items, o => ({
-              ...o, viewAttr: !_.isEmpty(detail) ? 1 : 2, label: getLabel(o.lanId, o.label),
+              ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
               value: detail[getKey(o)] || ""
             }))
           })),
@@ -83,7 +83,7 @@ class Index extends Component {
       if (!_.isNaN(parseInt(cur))) {
         return { ...pre, itemValueList: [{ variableItemId: cur, itemValue: payload[cur] }] };
       }
-      return { ...pre, [cur]: payload[cur] };
+      return { ...pre, [cur]: payload[cur], itemValueList: [...pre.itemValueList] };
     }, {});
   };
   save = () => {
@@ -91,7 +91,7 @@ class Index extends Component {
     VSSalaryFileForm.validateForm().then(f => {
       if (f.isValid) {
         const payload = VSSalaryFileForm.getFormParams();
-        console.log(payload);
+        console.log(payload, this.convertPayload(payload));
         return;
         this.setState({ loading: true });
         API.createVariableSalary({ ...payload, id })
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index ff883269..4210d4c1 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -72,7 +72,7 @@ class Index extends Component {
       {
         title: getLabel(111, "薪资档案"), key: "salaryFile",
         buttons: showOperateBtn ? [
-          // <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
+          <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
           <Button type="ghost" onClick={() => this.handleOperate("import")}>{getLabel(111, "导入")}</Button>,
           <Button type="primary" onClick={() => this.handleOperate("export")}>{getLabel(111, "导出")}</Button>,
           <WeaDatePicker format="YYYY-MM" value={salaryMonth}