From a5b39251a49730bcba23a9769c1321ef9cf0b2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 1 Jun 2023 17:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/fieldManagement/components/fieldSlide.js  | 13 ++++++++++++-
 pc4mobx/hrmSalary/pages/salaryItem/columns.js       |  7 +++++++
 .../hrmSalary/pages/salaryItem/salaryItemForm.js    |  9 +++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 2d40f912..d3cbd517 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -6,7 +6,7 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaCheckbox, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaSlideModal, WeaTextarea } from "ecCom";
+import { WeaCheckbox, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaSlideModal, WeaTextarea, WeaInputNumber } from "ecCom";
 import { message, Modal } from "antd";
 import SlideModalTitle from "../../../components/slideModalTitle";
 import { getSalaryFieldForm, saveSalaryField } from "../../../apis/fieldManage";
@@ -29,6 +29,7 @@ class FieldSlide extends Component {
       dataType: "number",
       roundingMode: "1",
       pattern: "2",
+      sortedIndex: "",
       description: ""
     };
   }
@@ -56,6 +57,7 @@ class FieldSlide extends Component {
           useInEmployeeSalary,
           dataType,
           description,
+          sortedIndex,
           sharedType,
           roundingMode,
           taxAgentIds,
@@ -68,6 +70,7 @@ class FieldSlide extends Component {
           useDefault: useDefault ? useDefault.toString() : "0",
           dataType,
           description,
+          sortedIndex,
           sharedType: sharedType ? sharedType.toString() : "0",
           roundingMode: roundingMode ? roundingMode.toString() : "0",
           taxAgentIds,
@@ -120,6 +123,7 @@ class FieldSlide extends Component {
       useInEmployeeSalary,
       dataType,
       description,
+      sortedIndex,
       sharedType,
       roundingMode,
       taxAgentIds,
@@ -131,6 +135,7 @@ class FieldSlide extends Component {
       useDefault: Number(useDefault),
       dataType,
       description,
+      sortedIndex,
       sharedType,
       roundingMode: Number(roundingMode),
       taxAgentIds,
@@ -168,6 +173,7 @@ class FieldSlide extends Component {
       dataType: "number",
       roundingMode: "1",
       pattern: "2",
+      sortedIndex: "",
       description: ""
     });
   };
@@ -191,6 +197,7 @@ class FieldSlide extends Component {
       dataType,
       roundingMode,
       pattern,
+      sortedIndex,
       description
     } = this.state;
     return (
@@ -283,6 +290,10 @@ class FieldSlide extends Component {
                 onChange={value => this.handleChangeFields("pattern", value)}
               />
             </WeaFormItem>
+            <WeaFormItem label="显示顺序" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
+              <WeaInputNumber value={sortedIndex} precision={0}
+                              onChange={value => this.handleChangeFields("sortedIndex", value)}/>
+            </WeaFormItem>
             <WeaFormItem label="备注" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
               <WeaTextarea
                 value={description}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
index 2d2bf75d..573795b4 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
@@ -126,6 +126,13 @@ export const salaryItemFields = [
     viewAttr: 2,
     tip: ''
   },
+  {
+    key: "sortedIndex",
+    label: "显示顺序",
+    type: "INPUTNUMBER",
+    viewAttr: 2,
+    tip: ""
+  },
   {
     key: 'description',
     label: '备注',
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 97411b6a..1f09d059 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -5,7 +5,7 @@
  * Date: 2023/2/9
  */
 import React, { Component } from "react";
-import { WeaCheckbox, WeaFormItem, WeaInput, WeaSearchGroup, WeaSelect, WeaTextarea } from "ecCom";
+import { WeaCheckbox, WeaFormItem, WeaInput, WeaSearchGroup, WeaSelect, WeaTextarea, WeaInputNumber } from "ecCom";
 import { salaryItemFields, valTakeOptions } from "./columns";
 
 class SalaryItemForm extends Component {
@@ -127,7 +127,12 @@ class SalaryItemForm extends Component {
                           <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
                             <WeaTextarea value={value} viewAttr={viewAttr} minRows={3}
                                          onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
-                          </WeaFormItem> : null
+                          </WeaFormItem> :
+                          (type === "INPUTNUMBER" && display) ?
+                            <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
+                              <WeaInputNumber value={value} viewAttr={viewAttr} precision={0}
+                                           onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
+                            </WeaFormItem> : null
               }
             </React.Fragment>;
           })