From b407adc724fb7ae2331526254e972a134253d487 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Tue, 14 Jun 2022 16:21:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/stepForm/showSettingForm.js     | 15 ++++++++++-----
 .../socialSecurityBenefits/standingBook/index.js  |  6 +++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index 10f914c5..7a83336c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Row, Col, Upload, Icon, Radio, Switch } from 'antd'
-import { WeaInput } from 'ecCom'
+import { WeaInput, WeaDraggable  } from 'ecCom'
 import { inject, observer } from 'mobx-react';
 import BackgroundUpload from '../components/backgroundUpload'
 import RequiredLabelTip from '../../../components/requiredLabelTip';
@@ -68,6 +68,11 @@ export default class ShowSettingForm extends React.Component {
         setSalaryItemSet(resultSalaryItemSet)
     }
 
+    handleDrag(data1, data2) {
+        console.log("data1:", data1);
+        console.log("data2:", data2);
+    }
+
     render() {
         const { payrollStore } = this.props;
         const { salaryTemplateShowSet } = payrollStore;
@@ -169,20 +174,20 @@ export default class ShowSettingForm extends React.Component {
                     <div className="itemContent">
                         {
                             salaryItemSet.map((group, index) => (
-                                <div className="configItemWrapper">
+                                <div className="configItemWrapper" >
                                     <div className="configTitle">{group.groupName} 
                                         {
                                             index < salaryItemSet.length - 1 && 
-                                            <Icon type="caret-down" style={{marginLeft: "10px" , cursor: "pointer"}}
+                                            <Icon type="caret-down" style={{marginLeft: "10px" , cursor: "pointer", color: "#666"}}
                                                 onClick={() => {this.handleDownClick(index)}} 
                                             />
                                         }
                                         
                                         {
-                                            index > 0 && <Icon type="caret-up" style={{marginLeft: "10px", cursor: 'pointer'}}
+                                            index > 0 && <Icon type="caret-up" style={{marginLeft: "10px", cursor: 'pointer', color: "#666"}}
                                             onClick={() => {this.handleUpClick(index)}}/>
                                         }
-                                        </div>
+                                    </div>
                                     <div className="configContent">
                                         {group.items.map(item => (
                                             <span className="editItem">{item.name} <Icon type="cross" style={{cursor: "pointer"}} onClick={() => {this.handleDeleteItem(group, item)}}/></span> 
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index 4bed2c92..f8580d31 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -449,7 +449,10 @@ export default class StandingBook extends React.Component {
             </div>
             <CustomPaginationTable 
               loading={loading}
-              columns={_.filter(columns, (it) => it.dataIndex !== "id")}
+              columns={_.filter(columns, (it) => it.dataIndex !== "id").map(item => {
+                item.width = "150px"
+                return item
+              })}
               dataSource={list}
               total={total}
               current={this.state.current}
@@ -461,6 +464,7 @@ export default class StandingBook extends React.Component {
                 this.pageInfo = {current, pageSize}
                 this.handleShowSizeChange(this.pageInfo)
               }}
+              scroll={{x: 2300}}
             />
 
             {dialogProps.visible && (

From a39b9d606abf60bd26c7f9dcd754cdd4c6a54434 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Tue, 14 Jun 2022 16:51:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/stepForm/showSettingForm.js | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index 7a83336c..60e774fe 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import { Row, Col, Upload, Icon, Radio, Switch } from 'antd'
-import { WeaInput, WeaDraggable  } from 'ecCom'
+import { Row, Col, Upload, Icon, Radio, Switch, Modal } from 'antd'
+import { WeaInput, WeaDraggable } from 'ecCom'
 import { inject, observer } from 'mobx-react';
 import BackgroundUpload from '../components/backgroundUpload'
 import RequiredLabelTip from '../../../components/requiredLabelTip';
@@ -73,6 +73,21 @@ export default class ShowSettingForm extends React.Component {
         console.log("data2:", data2);
     }
 
+    handleDeleteClick(index) {
+        Modal.confirm({
+            title: '信息确认',
+            content: '确认删除',
+            onOk:() => {
+              const {payrollStore: {salaryItemSet, setSalaryItemSet}} = this.props;
+              let resultSalaryItemSet = [...salaryItemSet]
+              resultSalaryItemSet.splice(index, 1)
+              setSalaryItemSet(resultSalaryItemSet)
+            },
+            onCancel: () => {
+            },
+          });
+    }
+
     render() {
         const { payrollStore } = this.props;
         const { salaryTemplateShowSet } = payrollStore;
@@ -187,6 +202,10 @@ export default class ShowSettingForm extends React.Component {
                                             index > 0 && <Icon type="caret-up" style={{marginLeft: "10px", cursor: 'pointer', color: "#666"}}
                                             onClick={() => {this.handleUpClick(index)}}/>
                                         }
+
+                                        <i className="icon-coms-Delete" style={{cursor: "pointer", color: '#666', marginLeft: "10px"}} onClick={() => {
+                                            this.handleDeleteClick(index)
+                                        }}/>
                                     </div>
                                     <div className="configContent">
                                         {group.items.map(item => (