From bee1d73eb7f3ae25c166d17697dbc0455bd581c3 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Oct 2024 16:33:26 +0800
Subject: [PATCH 1/4] release/2.15.2.2409.01

---
 .../payrollRelease/components/payrollTempNormalSet/formRender.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
index f3734cbc..50df1c24 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
@@ -1,3 +1,4 @@
+import React, { Component } from "react";
 import { WeaSwitch } from "comsMobx";
 import { WeaButtonIcon, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
 

From 0a447773b851f14fc5b4f7853143464dba15625f Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 16 Oct 2024 14:42:57 +0800
Subject: [PATCH 2/4] feature/2.15.2.2409.01

---
 .../components/salaryFileList/index.js        | 89 ++++++++++---------
 .../hrmSalary/pages/variableSalary/index.js   |  2 +-
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
index 01969697..11ab542d 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
@@ -24,14 +24,18 @@ const WeaTableComx = WeaTableNew.WeaTable;
 const getLabel = WeaLocaleProvider.getLabel;
 const getKey = WeaTools.getKey;
 
-@inject("baseTableStore")
-@observer
+@inject("baseTableStore") @observer
 class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false, dataSource: [], columns: [],
-      selectedRowKeys: [], condtions: [], showSearchAd: false
+      pageInfo: { current: 1, pageSize: 10, total: 0 },
+      loading: false,
+      dataSource: [],
+      columns: [],
+      selectedRowKeys: [],
+      condtions: [],
+      showSearchAd: false
     };
   }
 
@@ -43,7 +47,8 @@ class Index extends Component {
           ...item, items: _.map(item.items, child => {
             if (getKey(child) === "taxAgentIds") {
               return {
-                ...child, label: getLabel(child.lanId, child.label),
+                ...child,
+                label: getLabel(child.lanId, child.label),
                 options: _.map(taxAgentOption, o => ({ key: o.id, showname: o.content }))
               };
             }
@@ -112,9 +117,8 @@ class Index extends Component {
         const { pageInfo: result } = data;
         const { list: dataSource, pageNum: current, pageSize, total } = result;
         this.setState({
-            pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
-          }
-        );
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
+        });
       }
     });
   };
@@ -125,9 +129,7 @@ class Index extends Component {
   };
   handleDelete = (ids) => {
     Modal.confirm({
-      title: getLabel(111, "信息确认"),
-      content: getLabel(111, "确认删除吗?"),
-      onOk: () => {
+      title: getLabel(111, "信息确认"), content: getLabel(111, "确认删除吗?"), onOk: () => {
         API.deleteVariableSalary({ ids }).then(({ status, errormsg }) => {
           if (status) {
             message.success(getLabel(111, "删除成功"));
@@ -142,21 +144,27 @@ class Index extends Component {
   getColumns = () => {
     const { baseTableStore: { SFTableStore }, showOperateBtn } = this.props;
     const columns = _.map(_.filter(toJS(SFTableStore.columns), (item) => item.display === "true"), (it, idx) => ({
-      dataIndex: it.dataIndex, title: it.title, align: "left",
-      width: 150, ellipsis: true
+      dataIndex: it.dataIndex, title: it.title, align: "left", width: 150, ellipsis: true
     }));
     if (!_.isEmpty(columns)) {
       this.postMessageToChild({
-        columns, showOperateBtn, dataSource: this.state.dataSource, scrollHeight: 95,
-        pageInfo: this.state.pageInfo, unitTableType: "variableSalary", selectedRowKeys: this.state.selectedRowKeys
+        columns,
+        showOperateBtn,
+        dataSource: this.state.dataSource,
+        scrollHeight: 95,
+        pageInfo: this.state.pageInfo,
+        unitTableType: "variableSalary",
+        selectedRowKeys: this.state.selectedRowKeys
       });
     }
     return columns;
   };
   postMessageToChild = (payload = {}) => {
     const i18n = {
-      "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"),
-      "共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
+      "操作": getLabel(30585, "操作"),
+      "编辑": getLabel(111, "编辑"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
       "删除": getLabel(111, "删除")
     };
     const childFrameObj = document.getElementById("unitTable");
@@ -172,30 +180,29 @@ class Index extends Component {
     if (dom && dataSource.length > 0) {
       height = (parseFloat(dom.style.height) > 620 && dataSource.length === 10) ? dataSource.length * 46 + 108 : dataSource.length < 10 ? dataSource.length * 46 + 108 : parseFloat(dom.style.height) - 62;
     }
-    return (
-      <React.Fragment>
-        <div className="extraFormQuery form-dialog-layout">
-          {getSearchs(VExtraSalryForm, condtions, 2, false, () => this.getVariableSalaryList())}
-          <AdvanceInputBtn searchType="advance" onOpenAdvanceSearch={() => this.openAdvanceSearch()}
-                           onAdvanceSearch={() => this.getVariableSalaryList()}/>
-        </div>
-        <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
-          <SearchPannel onCancel={() => this.setState({ showSearchAd: false })} onAdSearch={this.handleAdvanceSearch}/>
-        </div>
-        <div style={{ height: height + "px" }}>
-          <Spin spinning={loading}>
-            <iframe
-              style={{ border: 0, width: "100%", height: "100%" }}
-              // src="http://localhost:7607/#/unitTable"
-              src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
-              id="unitTable"
-            />
-          </Spin>
-        </div>
-        <WeaTableComx style={{ display: "none" }} comsWeaTableStore={SFTableStore} needScroll={true}
-                      columns={this.getColumns()}/>
-      </React.Fragment>
-    );
+    return (<React.Fragment>
+      <div className="extraFormQuery form-dialog-layout">
+        {getSearchs(VExtraSalryForm, condtions, 2, false, () => this.getVariableSalaryList())}
+        <AdvanceInputBtn searchType="advance" onOpenAdvanceSearch={() => this.openAdvanceSearch()}
+                         onAdvanceSearch={this.getVariableSalaryList}/>
+      </div>
+      <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
+        <SearchPannel onCancel={() => this.setState({ showSearchAd: false })}
+                      onAdSearch={this.getVariableSalaryList}/>
+      </div>
+      <div style={{ height: height + "px" }}>
+        <Spin spinning={loading}>
+          <iframe
+            style={{ border: 0, width: "100%", height: "100%" }}
+            // src="http://localhost:7607/#/unitTable"
+            src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
+            id="unitTable"
+          />
+        </Spin>
+      </div>
+      <WeaTableComx style={{ display: "none" }} comsWeaTableStore={SFTableStore} needScroll={true}
+                    columns={this.getColumns()}/>
+    </React.Fragment>);
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index ad71a3bb..6eb00d27 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -44,7 +44,7 @@ class Index extends Component {
         this.setState({
           SFDialog: {
             ...this.state.SFDialog, visible: true, detail,
-            title: _.isEmpty(detail) ? getLabel(111, "新增薪资档案") : getLabel(111, "编辑薪资档案")
+            title: _.isEmpty(detail) ? getLabel(111, "新增浮动数据") : getLabel(111, "编辑浮动数据")
           }
         });
         break;

From 600bba86198c46d836d7472c69dbd6ae796348e3 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 16 Oct 2024 15:23:21 +0800
Subject: [PATCH 3/4] feature/2.15.2.2409.01

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

diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index d0b0d7f4..380f9228 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -137,7 +137,7 @@ class Index extends Component {
     return (<WeaSlideModal
       className="variable_salary_file_dialog" {...this.props} direction="right" onClose={() => onClose()}
       top={0} width={800} height={100} measureT="%" measureX="px" measureY="%" title={this.renderTitle()}
-      content={<div className="form-dialog-layout">{getSearchs(VSSalaryFileForm, conditions)}</div>}
+      content={<div className="form-dialog-layout">{getSearchs(VSSalaryFileForm, conditions, 2, false)}</div>}
     />);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
index 11ab542d..9f583eee 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
@@ -188,7 +188,10 @@ class Index extends Component {
       </div>
       <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
         <SearchPannel onCancel={() => this.setState({ showSearchAd: false })}
-                      onAdSearch={this.getVariableSalaryList}/>
+                      onAdSearch={() => {
+                        this.openAdvanceSearch();
+                        this.getVariableSalaryList();
+                      }}/>
       </div>
       <div style={{ height: height + "px" }}>
         <Spin spinning={loading}>
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/conditions.js b/pc4mobx/hrmSalary/pages/variableSalary/conditions.js
index 53277c67..56ce7208 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/conditions.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/conditions.js
@@ -157,7 +157,7 @@ export const salaryFileConditions = [
         labelcol: 8,
         value: "",
         options: [],
-        rules: "required|string",
+        rules: "required",
         viewAttr: 3
       },
       {

From 1a0f594753abb0d44f17905d84bead48d3303eab Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 16 Oct 2024 16:18:32 +0800
Subject: [PATCH 4/4] release/2.15.2.2409.01

---
 .../components/salaryFileDialog/index.js      | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index 380f9228..7813cde7 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -18,8 +18,7 @@ import * as API from "../../../../apis/variableSalary";
 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("baseTableStore")
-@observer
+@inject("baseTableStore") @observer
 class Index extends Component {
   constructor(props) {
     super(props);
@@ -43,36 +42,35 @@ class Index extends Component {
     const { data: taxAgentOption } = await API.getAdminTaxAgentList();
     API.getCreateForm().then(({ data }) => {
       this.setState({
-        conditions: [
-          ..._.map(salaryFileConditions, item => ({
-            ...item, items: _.map(item.items, o => {
-              if (getKey(o) === "taxAgentIds") {
-                return {
-                  ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
-                  value: detail[getKey(o)] || "",
-                  options: _.map(taxAgentOption, (o, i) => ({ key: o.id, showname: o.content }))
-                };
-              }
+        conditions: [..._.map(salaryFileConditions, item => ({
+          ...item, items: _.map(item.items, o => {
+            if (getKey(o) === "taxAgentIds") {
               return {
-                ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
-                value: detail[getKey(o)] || ""
+                ...o,
+                viewAttr: !_.isEmpty(detail) ? 1 : 3,
+                label: getLabel(o.lanId, o.label),
+                value: detail[getKey(o)] || "",
+                options: _.map(taxAgentOption, (o, i) => ({ key: o.id, showname: o.content }))
               };
-            })
-          })),
-          {
-            items: _.map(data, o => ({
-              conditionType: "INPUT",
-              domkey: [String(o.id)],
-              fieldcol: 14,
-              label: o.name,
-              labelcol: 6,
-              value: detail[`${String(o.id)}_variableItem`] || "",
-              viewAttr: 2
-            })),
-            title: "", col: 2,
-            defaultshow: true
-          }
-        ]
+            }
+            return {
+              ...o,
+              viewAttr: !_.isEmpty(detail) ? 1 : 3,
+              label: getLabel(o.lanId, o.label),
+              value: detail[getKey(o)] || ""
+            };
+          })
+        })), {
+          items: _.map(data, o => ({
+            conditionType: "INPUT",
+            domkey: [String(o.id)],
+            fieldcol: 14,
+            label: o.name,
+            labelcol: 6,
+            value: detail[`${String(o.id)}_variableItem`] || "",
+            viewAttr: 2
+          })), title: "", col: 2, defaultshow: true
+        }]
       }, () => {
         VSSalaryFileForm.initFormFields(this.state.conditions);
         if (!_.isEmpty(detail)) {
@@ -98,7 +96,7 @@ class Index extends Component {
     }, {});
   };
   save = () => {
-    const { baseTableStore: { VSSalaryFileForm }, onSearch, id } = this.props;
+    const { baseTableStore: { VSSalaryFileForm }, onSearch, detail: { id } } = this.props;
     VSSalaryFileForm.validateForm().then(f => {
       if (f.isValid) {
         const payload = VSSalaryFileForm.getFormParams();
@@ -119,7 +117,7 @@ class Index extends Component {
     });
   };
   renderTitle = () => {
-    const { loading } = this.state, { title, detail } = this.props;
+    const { loading } = this.state, { title } = this.props;
     return <div className="titleDialog">
       <div className="titleCol titleLeftBox">
         <div className="titleIcon"><i className="icon-coms-fa"/></div>