From 25b7a2341ef798968ad06cdd40f951713b988353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 5 Aug 2024 11:05:25 +0800 Subject: [PATCH 1/3] hotfix/2.15.1.2407.01 --- .../doCalc/components/salaryEditCalc/index.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less index 3d23810b..e2d8ce9b 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less @@ -28,6 +28,15 @@ display: flex; align-items: center; width: 100%; + + & > span:first-child { + display: inline-block; + min-width: 44px; + } + + & > span:last-child { + flex: 1; + } } } From 334a582d62ab274d3b01bbc6bd0c8fd0be90c712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 7 Aug 2024 11:11:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?hotfix/2.15.1.2407.01=20=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E5=BC=95=E7=94=A8=EF=BC=8C=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataAcquisition/attendance/columns.js | 7 ++-- .../components/attendanceRefrenceDataModal.js | 30 +++++++++------- pc4mobx/hrmSalary/style/index.less | 34 +++++++++++++++++++ pc4mobx/hrmSalary/util/index.js | 4 +-- 4 files changed, 57 insertions(+), 18 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js index dc082d76..658d0808 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js @@ -128,7 +128,7 @@ export const conditions = [ isQuickSearch: false, label: "类型", labelcol: 6, - valueList:[], + valueList: [], options: [ { key: "NUMBER", @@ -185,13 +185,14 @@ export const reFrenceConditions = [ { colSpan: 1, conditionType: "SELECT", - domkey: ["salarySobId"], + domkey: ["salarySobIds"], fieldcol: 18, isQuickSearch: false, label: "薪资账套", labelcol: 6, - valueList:[], + valueList: [], options: [], + multiple: true, rules: "required|string", viewAttr: 3 }, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js index 14de4956..c8fdb4b9 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js @@ -55,7 +55,7 @@ class AttendanceRefrenceDataModal extends Component { ...item, items: _.map(items, child => { const { domkey } = child; - if (domkey[0] === "salarySobId") { + if (domkey[0] === "salarySobIds") { return { ...child, options: _.map(data, it => ({ key: it.id, showname: it.content })) }; } return { ...child }; @@ -77,19 +77,23 @@ class AttendanceRefrenceDataModal extends Component { refenceform.validateForm().then(f => { if (f.isValid) { const payload = refenceform.getFormParams(); - const checkPayload = { salaryYearMonthStr: payload.salaryYearMonth, salarySobId: payload.salarySobId }; + const checkPayload = { + salaryYearMonthStr: payload.salaryYearMonth, + salarySobIds: payload.salarySobIds.split(",") + }; this.setState({ loading: true }); checkOperation(checkPayload).then(({ status, errormsg: errormessage }) => { if (status) { - syncAttendanceRefer(payload).then(({ status, errormsg }) => { - this.setState({ loading: false }); - if (status) { - message.success("同步成功"); - onCancel(true); - } else { - message.error(errormsg || "同步失败"); - } - }).catch(() => this.setState({ loading: false })); + syncAttendanceRefer({ ...payload, salarySobIds: payload.salarySobIds.split(",") }) + .then(({ status, errormsg }) => { + this.setState({ loading: false }); + if (status) { + message.success("同步成功"); + onCancel(true); + } else { + message.error(errormsg || "同步失败"); + } + }).catch(() => this.setState({ loading: false })); } else { this.setState({ loading: false }); message.error(errormessage); @@ -212,9 +216,9 @@ class AttendanceRefrenceDataModal extends Component { ]; return ( - +
- {getSearchs(refenceform, condition, 1)} + {getSearchs(refenceform, condition, 1, false, null, "", "multiple_select")}
{/* 表头设置 */} { }; // 渲染form表单: 一般对form的渲染都统一使用该方法 -export const getSearchs = (form, condition, col, isCenter, onChange = () => void (0), title) => { +export const getSearchs = (form, condition, col, isCenter, onChange = () => void (0), title, classnames = "") => { const { isFormInit } = form; const formParams = form.getFormParams(); let group = []; @@ -41,7 +41,7 @@ export const getSearchs = (form, condition, col, isCenter, onChange = () => void wrapperCol={{ span: `${fields.fieldcol}` }} // 右侧控件占一行比例 error={form.getError(fields)} // 错误提示: 处理表单中有必填项,保存的校验 tipPosition="bottom" // 错误提示的显示位置: top/bottom - className={(fields.domkey[0] === "subcompanyName" || fields.domkey[0] === "departmentName") ? "hideFormItem" : ""} + className={(fields.domkey[0] === "subcompanyName" || fields.domkey[0] === "departmentName") ? "hideFormItem" : classnames} > Date: Wed, 7 Aug 2024 14:05:32 +0800 Subject: [PATCH 3/3] hotfix/2.15.1.2407.01 --- .../attendance/components/attendanceDataViewSlide.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js index 634d36fe..f1e9b4fd 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js @@ -27,6 +27,7 @@ class AttendanceDataViewSlide extends Component { this.viewAttendQuote({}, nextProps); } else if (nextProps.visible !== this.props.visible && !nextProps.visible) { document.querySelector(".attendanceRefWrapper").classList.remove("zIndex0-attendance"); + this.setState({ pageInfo: { current: 1, pageSize: 10, total: 0 } }); } } @@ -41,7 +42,7 @@ class AttendanceDataViewSlide extends Component { this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, // o.dataIndex === "username" ? "left" : - columns: _.map(columns, o => ({ ...o, width: 150, fixed: null })) + columns: _.map(columns, o => ({ ...o, width: 150, fixed: null })) }); } }).catch(() => this.setState({ loading: { ...loading, query: false } }));