From da36ed3aa9c9a63e5753f0f60ed337f0a38d01ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sun, 8 Oct 2023 10:51:26 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/index.js | 2 +-
pc4mobx/hrmSalary/pages/payroll/index.less | 2 +-
pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index 38a5eba4..dfe0fa4c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -286,7 +286,7 @@ export default class Payroll extends React.Component {
viewcondition: "1"
},
{
- title: getLabel(111, "工资单模板基础设置"),
+ title: getLabel(111, "工资单基础设置"),
viewcondition: "2"
}
];
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.less b/pc4mobx/hrmSalary/pages/payroll/index.less
index 2c05bd82..e0f417dd 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/index.less
@@ -27,7 +27,7 @@
border-bottom: 1px solid #e5e5e5;
.wea-input-number {
- width: inherit !important;
+ width: 80px !important;
margin: 0 10px;
}
}
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index f894b6b3..6cd7f5b6 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -180,6 +180,10 @@ class TemplateBaseSettings extends Component {
}
})}/>
{getLabel(111, "个月内的工资单")}
+