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

Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税

This commit is contained in:
lys 2025-01-03 09:13:14 +08:00
parent 457dbfab49 4212bf9ff5
commit 5e3331b9c9
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
View File

@ -53,7 +53,7 @@ class PersonalScopeModal extends Component {
if (!_.isEmpty(nextProps.record)) { if (!_.isEmpty(nextProps.record)) {
this.setState({ this.setState({
targetType: nextProps.record.targetType, targetType: nextProps.record.targetType,
targetTypeIds: String(nextProps.record.targetId), targetTypeIds: nextProps.record.targetType !== "SQL" ? String(nextProps.record.targetId) : nextProps.record.target,
targetTypeIdsNames: nextProps.record.targetName, targetTypeIdsNames: nextProps.record.targetName,
status: nextProps.record.status, status: nextProps.record.status,
statusAll: "" statusAll: ""

9
pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js
View File

@ -18,8 +18,10 @@ CodeMirror.extendMode("javascript", {
if (this.jsonMode) { if (this.jsonMode) {
return /^[\[,{]$/.test(content) || /^}/.test(textAfter) || /^]/.test(textAfter); return /^[\[,{]$/.test(content) || /^}/.test(textAfter) || /^]/.test(textAfter);
} else { } else {
if (content == ";" && state.lexical && state.lexical.type == ")") return false; if (content == ";" && state.lexical && state.lexical.type == "}") return false;
return /^[;{}]$/.test(content) && !/^;/.test(textAfter); // if (content == ";" && state.lexical && state.lexical.type == ")") return false;
return /[=,]/.test(content) || /.*\)/.test(textAfter);
// return /^[;{}]$/.test(content) && !/^;/.test(textAfter);
} }
} }
}); });
@ -94,7 +96,8 @@ CodeMirror.defineExtension("autoFormatRange", function (from, to) {
atSol = false; atSol = false;
} }
if (!atSol && inner.mode.newlineAfterToken && if (!atSol && inner.mode.newlineAfterToken &&
inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state)) // inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state))
inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos, stream.pos + 2) || text[i + 1] || "", inner.state))
newline(); newline();
} }
if (!stream.pos && outer.blankLine) outer.blankLine(state); if (!stream.pos && outer.blankLine) outer.blankLine(state);

2
pc4mobx/hrmSalary/components/pcTemplate/index.less
View File

@ -82,6 +82,8 @@
} }
.data-detail { .data-detail {
padding-bottom: 16px;
.salary-group { .salary-group {
background: #FFF; background: #FFF;

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
View File

@ -318,7 +318,7 @@ class LedgerSalaryItem extends Component {
items: [...it.items, { items: [...it.items, {
...extraItems, ...extraItems,
salaryItemGroupId: moveToItemId, salaryItemGroupId: moveToItemId,
key: moveId, key: moveId ? moveId : items.key,
sortedIndex: !_.isEmpty(it.items) ? it.items[it.items.length - 1].sortedIndex + 1 : 0 sortedIndex: !_.isEmpty(it.items) ? it.items[it.items.length - 1].sortedIndex + 1 : 0
}] }]
}; };

10
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
View File

@ -128,8 +128,10 @@ class LedgerSalaryItemTable extends Component {
formulaContent, formulaId, name, formulaContent, formulaId, name,
hideDefault: _.isNil(hideDefault) ? "0" : hideDefault, hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
valueType, roundingMode, pattern, valueType, roundingMode, pattern,
originFormulaContent, originSqlContent, useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0",
useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0" //不能改成其他空值
originFormulaContent: _.isNil(originFormulaContent) ? formulaContent : originFormulaContent,
originSqlContent: _.isNil(originSqlContent) ? formulaContent : originSqlContent
}, },
record, record,
userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@ -287,7 +289,9 @@ class LedgerSalaryItemTable extends Component {
width: 80, width: 80,
render: (text, record) => <WeaCheckbox render: (text, record) => <WeaCheckbox
value={text ? String(text) : !text ? "0" : "1"} value={text ? String(text) : !text ? "0" : "1"}
onChange={value => this.handleChangeItem(value, record.id || record.key)} onChange={value => {
this.handleChangeItem(value, record.id || record.key);
}}
/> />
}, },
{ {

2
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
View File

@ -41,7 +41,7 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange =
/> />
} }
{ {
getKey(fields) === "theme" && c.viewAttr === 3 && getKey(fields) === "theme" && fields.viewAttr === 3 &&
<div className="sft-variables"> <div className="sft-variables">
<span className="sftv-tip">{getLabel(500143, "插入变量")}：</span> <span className="sftv-tip">{getLabel(500143, "插入变量")}：</span>
<a className="sftv-item" <a className="sftv-item"

6
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
View File

@ -4,12 +4,16 @@
height: 100%; height: 100%;
background: #f6f6f6; background: #f6f6f6;
.wea-tab {
border-bottom: none !important;
}
.wea-new-top-req-wapper .wea-new-top-req { .wea-new-top-req-wapper .wea-new-top-req {
z-index: 0 !important; z-index: 0 !important;
} }
.wea-search-tab, .wea-input-focus { .wea-search-tab, .wea-input-focus {
background: #f6f6f6; background: #f1f1f1;
} }
.normalWapper { .normalWapper {