qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/2.9.9.2312.01' into release/2.9.9.2312.01-个税

This commit is contained in:
黎永顺 2023-12-06 16:22:19 +08:00
parent beddc62901 3dca9da904
commit a8ce369ce6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
View File

@ -47,6 +47,12 @@
box-shadow: rgba(214, 214, 214, 0.5) 0px 0px 14px 0px;
border: 3px solid #fff;
.sobItemDiv {
width: 100%;
white-space: pre-wrap;
word-break: break-all;
}
.background-wrapper {
height: 200px;
margin: 10px;

2
pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
View File

@ -245,7 +245,7 @@ export const tempNormalSetConditions = [
},
{
colSpan: 1,
conditionType: "INPUT",
conditionType: "TEXTAREA",
domkey: ["textContent"],
fieldcol: 14,
label: "文本内容",