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

Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01

This commit is contained in:
黎永顺 2024-03-15 09:20:34 +08:00
parent 0a23b261b1 5e3c20edc0
commit 196763681a
22 changed files with 348 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pc4mobx/hrmSalary/components/importDialog/index.less
View File

@ -120,6 +120,54 @@
}
}
.import-option {
.screenWrapper {
padding: 0;
margin: 10px;
border: 1px solid #e5e5e5;
.wea-content {
padding: 0;
}
.wea-form-cell {
padding: 0 16px;
.wea-date-picker {
width: 85%;
}
}
.wea-helpful-tip {
padding-left: 10px;
}
}
.attendanceFormWrapper {
padding: 0 10px;
margin: 10px 0;
border: 1px solid #e5e5e5;
.wea-form-cell {
padding: 0 !important;
}
.wea-select, .ant-select-selection, .ant-select {
width: 100%;
}
.wea-select {
display: inline-block;
position: relative;
}
.ant-select-selection {
height: 30px;
border-radius: 0;
}
}
}
}
}

12
pc4mobx/hrmSalary/components/selectItemsModal/index.js
View File

@ -9,7 +9,6 @@ import { WeaCheckbox, WeaDialog, WeaInputSearch } from "ecCom";
import { Button } from "antd";
import "./index.less";
export default class SelectItemModal extends React.Component {
constructor(props) {
super(props);
@ -58,10 +57,19 @@ export default class SelectItemModal extends React.Component {
const bottomLeft = <WeaCheckbox content="只显示已选中字段" onChange={onShowOnlyChecked}/>;
return (
<WeaDialog {...extra} hasScroll title={titleComp}
style={{ width: 592, height: 248 }}
buttons={btns} moreBtn={moreBtn}
initLoadCss className="setWrapper"
bottomLeft={bottomLeft}
style={{
width: 800,
height: 606.6,
minHeight: 200,
minWidth: 380,
maxHeight: "90%",
maxWidth: "90%",
overflow: "hidden",
transform: "translate(0px, 0px)"
}}
>
{children}
</WeaDialog>

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

@ -19,7 +19,7 @@
flex-wrap: wrap;
li {
width: 124px;
width: 140px;
overflow: hidden;
padding: 4px 0;

13
pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js
View File

@ -11,21 +11,22 @@ class SelectItemsWrapper extends Component {
constructor(props) {
super(props);
this.state = {
searchVal: "",
selectItem: [],
groupItem: [],
showOnlyChecked: false
searchVal: "", selectItem: [], groupItem: [], showOnlyChecked: false
};
}
componentDidMount() {
const { dataSource } = this.props
this.initSelectItem();
}
initSelectItem = () => {
const { dataSource } = this.props;
this.setState({
selectItem: _.map(_.filter(_.reduce(dataSource, (pre, cur) => {
return [...pre, ...cur.items];
}, []), item => !!item.checked), it => it.id)
});
}
};
handleSearchItemSet = (searchVal) => this.setState({ searchVal });
handleShowOnlyChecked = (showOnlyChecked) => this.setState({ showOnlyChecked: !!Number(showOnlyChecked) });

4
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js
View File

@ -173,10 +173,10 @@ class Index extends Component {
const { routeParams: { salaryAcctRecordId } } = this.props;
saveAcctemployee({ salaryAcctRecordId, employeeIds }).then(({ status, errormsg }) => {
if (status) {
message.success(getLabel(541531, "添加成功！"));
message.success(getLabel(26712, "添加成功！"));
this.queryPCList();
} else {
message.error(errormsg || getLabel(111, "添加失败！"));
message.error(errormsg || getLabel(545246, "添加失败！"));
}
});
};

10
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
View File

@ -22,7 +22,9 @@ class AttendanceCustomFieldsModal extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
const { attendanceStore: { initForm } } = nextProps;
if (nextProps.visible !== this.props.visible && nextProps.visible) this.handleResetForm();
if (nextProps.visible !== this.props.visible && !nextProps.visible) initForm();
}
@ -62,12 +64,8 @@ class AttendanceCustomFieldsModal extends Component {
<Button type="primary" onClick={this.handleSubmitFields}>保存</Button>
];
return (
<WeaDialog
{...this.props} style={{ width: 440, height: 202 }}
buttons={buttons} hasScroll initLoadCss
className="modalWrapper"
>
{getSearchs(form, conditions, 1)}
<WeaDialog {...this.props} style={{ width: 480, height: 202 }} buttons={buttons} initLoadCss>
<div className="form-dialog-layout"> {getSearchs(form, conditions, 1)}</div>
</WeaDialog>
);
}

133
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
View File

@ -14,14 +14,13 @@ import {
getLedgerList,
getSalaryCycleAndAttendCycle,
importAttendQuoteData,
previewAttendQuote,
returnToAttendanceFieldSettingDefault,
saveAttendanceFieldSetting,
saveAttendanceFieldSettingAsDefault
} from "../../../../apis/attendance";
import ImportModal from "../../../../components/importModal";
import HeaderSet from "../../../../components/importModal/headerSet";
import ImportFormOptions from "./importFormOptions";
import ImportModal from "./importDialog";
// import HeaderSet from "../../../../components/importModal/headerSet";
// import ImportFormOptions from "./importFormOptions";
import SelectItemModal from "../../../../components/selectItemsModal";
import moment from "moment";
import SelectItemsWrapper from "../../../../components/selectItemsModal/selectItemsWrapper";
@ -45,10 +44,7 @@ class AttendanceDataComp extends Component {
pageSize: 10,
total: 0
},
importData: {
visiable: false, params: {}, step: 0,
columns: [], slideDataSource: [], importResult: []
},
importData: { visible: false, params: {} },
importFormPayload: {
salaryYearMonth: moment().format("YYYY-MM"), salarySobList: [],
salarySobId: "", salaryCycle: "", attendCycle: ""
@ -87,15 +83,24 @@ class AttendanceDataComp extends Component {
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
};
getLedgerList = () => {
getLedgerList = (importData) => {
const { importFormPayload } = this.state;
getLedgerList().then(({ status, data }) => {
if (status) {
this.setState({
importFormPayload: {
...importFormPayload,
...importFormPayload, salarySobId: _.head(data).id,
salarySobList: _.map(data, it => ({ key: it.id, showname: it.content }))
}
}, async () => {
const { importFormPayload } = this.state;
const { salaryYearMonth, salarySobId } = importFormPayload;
const payload = { salaryYearMonthStr: salaryYearMonth, salarySobId };
const { data } = await getSalaryCycleAndAttendCycle(payload);
this.setState({
importData: { ...importData, params: { salaryYearMonth, salarySobId } },
importFormPayload: { ...importFormPayload, ...data }
});
});
}
});
@ -154,64 +159,12 @@ class AttendanceDataComp extends Component {
}
});
};
handleImportAttendanceData = (importData) => {
const { importFormPayload } = this.state;
const { salaryYearMonth, salarySobId } = importFormPayload;
this.getLedgerList();
this.setState({ importData: { ...importData, params: { salaryYearMonth, salarySobId } } });
};
setStep = step => this.setState({ importData: { ...this.state.importData, step } });
handleFinish = () => {
handleImportAttendanceData = (importData) => this.getLedgerList(importData);
handleFinish = (isFresh) => {
const { importData } = this.state;
const { step } = importData;
this.setState({
importData: {
...importData, visiable: false, params: {}, step: 0,
columns: [], slideDataSource: [], importResult: []
}
});
step === 2 && this.getAttendanceList();
};
handlePreviewImport = (params) => {
const { importData } = this.state;
previewAttendQuote(params).then(({ status, data }) => {
if (status) {
const { headers, list } = data;
this.setState({
importData: {
...importData,
columns: _.map(headers, (it, dataIndex) => ({ title: it, dataIndex })),
slideDataSource: _.map(list, item => {
return _.reduce(item, (pre, cur, key) => (_.assign(pre, { [key]: cur })), {});
})
}
});
}
});
};
handleImport = (params) => {
const { importData } = this.state;
const { step } = importData;
importAttendQuoteData(params).then(({ status, data }) => {
if (status) {
this.setState({
importData: {
...importData,
step: step + 1,
importResult: data
}
});
}
});
};
handleTemplateLinkClick = () => {
const { importFormPayload } = this.state;
const { salarySobId, salaryYearMonth } = importFormPayload;
if (!salarySobId || !salaryYearMonth) {
message.warning("请完善导入选项，再下载");
return;
}
window.open(`/api/bs/hrmsalary/attendQuote/downloadTemplate?salaryYearMonth=${salaryYearMonth}&salarySobId=${salarySobId}`);
importData: { ...importData, visible: false, params: {} }
}, () => isFresh && this.getAttendanceList());
};
/*
* Author: 黎永顺
@ -236,7 +189,7 @@ class AttendanceDataComp extends Component {
onSelectItem={this.handleSelectItem}
/>
}
});
}, () => this.setItemRef && this.setItemRef.initSelectItem());
}
}).catch(() => this.setState({ loading: { ...loading, headset: false } }));
};
@ -392,46 +345,30 @@ class AttendanceDataComp extends Component {
}
}
]}
dataSource={dataSource}
pagination={pagination}
loading={loading.query}
/>
dataSource={dataSource} pagination={pagination} loading={loading.query}/>
{/* 考勤引用导入 */}
<ImportModal {...importData} setStep={this.setStep} onFinish={this.handleFinish}
previewImport={this.handlePreviewImport} importFile={this.handleImport}
templateLink={this.handleTemplateLinkClick} onCancel={this.handleFinish}
headerSetCompoent={<HeaderSet
loading={loading.headset}
onSetClick={() => this.handleHeaderSettings({ sourceType: "IMPORT" })}/>}
renderFormComponent={() => <ImportFormOptions
{...importFormPayload}
onChangeImportForm={this.handleChangeImportPayload}/>
}
<ImportModal {...importData} importFormPayload={importFormPayload} onCancel={this.handleFinish}
onChangeImportForm={this.handleChangeImportPayload} onHeaderSettings={this.handleHeaderSettings}
loading={loading.headset} previewUrl="/api/bs/hrmsalary/attendQuote/preview"
importAttendQuoteData={importAttendQuoteData}
/>
{/* 表头设置 */}
<SelectItemModal {...fieldSetPayload}
onCancel={this.handleCloseSettings}
onSearchItemSet={this.handleSearchItemSet}
onShowOnlyChecked={this.handleShowOnlyChecked}
onMoreOpts={this.handleMoreOpts} onSave={this.handleSave}
/>
onMoreOpts={this.handleMoreOpts} onSave={this.handleSave}/>
{/* 考勤数据引用 */}
<AttendanceRefrenceDataModal
{...attendanceReferencePayload}
onCancel={this.handleCloseQuoteModal}
/>
<AttendanceRefrenceDataModal {...attendanceReferencePayload} onCancel={this.handleCloseQuoteModal}/>
{/* 考勤数据查看 */}
<AttendanceDataViewSlide
{...attendanceViewPayload}
showOperateBtn={showOperateBtn}
onClose={() => this.setState({
attendanceViewPayload: {
...attendanceViewPayload,
visible: false,
attendQuoteId: ""
}
})}
/>
<AttendanceDataViewSlide {...attendanceViewPayload} showOperateBtn={showOperateBtn}
onClose={() => this.setState({
attendanceViewPayload: {
...attendanceViewPayload,
visible: false,
attendQuoteId: ""
}
})}/>
</React.Fragment>
);
}

17
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
View File

@ -13,7 +13,10 @@ import { getSearchs } from "../../../../util";
import {
checkOperation,
getAttendanceFieldSettingList,
getLedgerList, returnToAttendanceFieldSettingDefault, saveAttendanceFieldSetting, saveAttendanceFieldSettingAsDefault,
getLedgerList,
returnToAttendanceFieldSettingDefault,
saveAttendanceFieldSetting,
saveAttendanceFieldSettingAsDefault,
syncAttendanceRefer
} from "../../../../apis/attendance";
import SelectItemModal from "../../../../components/selectItemsModal";
@ -124,7 +127,7 @@ class AttendanceRefrenceDataModal extends Component {
onSelectItem={this.handleSelectItem}
/>
}
});
}, () => this.setItemRef && this.setItemRef.initSelectItem());
}
}).catch(() => this.setState({ headerSetLoading: false }));
};
@ -209,12 +212,10 @@ class AttendanceRefrenceDataModal extends Component {
<Button type="ghost" onClick={this.handleHeaderSetting} loading={headerSetLoading}>表头设置</Button>
];
return (
<WeaDialog
{...this.props} style={{ width: 440, height: 156 }}
buttons={buttons} hasScroll initLoadCss
className="modalWrapper"
>
{getSearchs(refenceform, condition, 1)}
<WeaDialog {...this.props} style={{ width: 480, height: 174 }} buttons={buttons} initLoadCss>
<div className="form-dialog-layout">
{getSearchs(refenceform, condition, 1)}
</div>
{/* 表头设置 */}
<SelectItemModal {...headerSetPayload}
onCancel={this.handleCloseSettings}

82
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js Normal file
View File

@ -0,0 +1,82 @@
/*
* Author: 黎永顺
* name:考勤数据-导入
* Description:
* Date: 2024/3/14
*/
import React, { Component } from "react";
import { WeaLocaleProvider } from "ecCom";
import { Modal } from "antd";
import ImportDialog from "../../../../components/importDialog";
import HeaderSet from "../../../../components/importModal/headerSet";
import ImportFormOptions from "./importFormOptions";
const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
constructor(props) {
super(props);
this.state = {
hasData: false,
importDialog: {
nextloading: false, link: null, importResult: {}, imageId: "", params: {},
previewUrl: ""
}
};
}
componentWillReceiveProps(nextProps, nextContext) {
const { hasData, importDialog } = this.state;
const { params, previewUrl } = nextProps;
this.setState({
importDialog: { ...importDialog, link: this.handleExportTemp, params, previewUrl, extraPreview: params }
});
}
handleExportTemp = () => {
const { hasData } = this.state;
const { importFormPayload } = this.props;
const { salarySobId, salaryYearMonth } = importFormPayload;
if (!salarySobId || !salaryYearMonth) {
Modal.warning({
title: getLabel(131329, "信息确认"),
content: getLabel(518702, "必要信息不完整，红色*为必填项！")
});
return;
}
window.open(`/api/bs/hrmsalary/attendQuote/downloadTemplate?salaryYearMonth=${salaryYearMonth}&salarySobId=${salarySobId}`);
};
handleImport = (payload) => {
const { importDialog } = this.state, { importAttendQuoteData, params } = this.props;
this.setState({ importDialog: { ...importDialog, nextloading: true } });
importAttendQuoteData({ ...payload, ...params }).then(({ data, status }) => {
this.setState({ importDialog: { ...importDialog, nextloading: false } });
if (status) {
this.setState({
importDialog: { ...importDialog, ...payload, importResult: data }
});
}
}).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } }));
};
render() {
const { importDialog } = this.state;
const {
visible, onCancel, importFormPayload, onChangeImportForm, onHeaderSettings, loading
} = this.props;
return (
<ImportDialog
visible={visible} onCancel={onCancel} {...importDialog} title={getLabel(24023, "数据导入")}
onResetImportResult={() => this.setState({
importDialog: { ...importDialog, importResult: {}, imageId: "", link: "" }
})}
importParams={<ImportFormOptions {...importFormPayload} onChangeImportForm={onChangeImportForm}/>}
exportDataDom={<HeaderSet loading={loading} onSetClick={() => onHeaderSettings({ sourceType: "IMPORT" })}/>}
nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
nextUplaodCallback={imageId => this.handleImport({ imageId })}
/>
);
}
}
export default Index;

5
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importFormOptions.js
View File

@ -40,8 +40,9 @@ class ImportFormOptions extends Component {
label: "薪资账套",
value: salarySobId || "",
onChange: this.screenChange,
options: [{ key: "", showname: "" }, ...salarySobList],
key: "salarySobId"
options: salarySobList,
key: "salarySobId",
viewAttr: 3
})
},
{ com: Input("薪资周期", salaryCycle) },

4
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
View File

@ -18,10 +18,6 @@
}
}
.attendanceFormWrapper {
padding: 0;
}
.attendanceSlideWrapper {
.wea-slide-modal-title {
height: initial;

7
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
View File

@ -57,12 +57,7 @@ class Index extends Component {
};
handleChangeSalaryMonth = (salaryMonth) => this.setState({ salaryMonth }, () => this.attendanceTableRef.getAttendanceList({ salaryYearMonth: _.compact(this.state.salaryMonth) }));
handleAddAttendFileds = () => this.fieldMangRef.handleTriggerAttendFileds();
handleImportAttendanceData = () => {
this.attendanceTableRef.handleImportAttendanceData({
visiable: true, params: {}, step: 0,
columns: [], slideDataSource: [], importResult: []
});
};
handleImportAttendanceData = () => this.attendanceTableRef.handleImportAttendanceData({ visible: true, params: {} });
handleQuoteAttendanceData = () => {
this.attendanceTableRef.handleQuoteAttendanceData({
visible: true, title: "引用考勤数据"

2
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less
View File

@ -4,7 +4,7 @@
flex-direction: column;
.wea-form-item {
padding: 8px 16px;
padding: 8px 16px 0 16px;
.to {
padding: 0 10px

2
pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js
View File

@ -32,7 +32,7 @@ class ImportFormCom extends Component {
value: taxAgentId || "",
onChange: this.screenChange,
options: [{ key: "", showname: "全部" }, ...taxAgentOption],
key: "taxAgentId"
key: "taxAgentId", viewAttr: 3
})
}
];

60
pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
View File

@ -19,14 +19,13 @@ import {
editAddUpDeduction,
getAddUpDeduction,
getCumDeductSaCondition,
importCumDeductParam,
importCumDeductPreview
importCumDeductParam
} from "../../../apis/cumDeduct";
import DataTables from "../dataTables";
import AddItems from "../addItems";
import ImportFormCom from "./components/importFormCom";
import TableRecord from "../components/tableRecord";
import { dataCollectCondition, modalColumns } from "./columns";
import { dataCollectCondition } from "./columns";
import { removePropertyCondition } from "../../../util/response";
import { convertToUrlString } from "../../../util/url";
import Layout from "../layout";
@ -59,10 +58,9 @@ class Index extends Component {
taxAgentId: ""
},
importFormComponent: null,
step: 0,
templateLink: "/api/bs/hrmsalary/addUpDeduction/downloadTemplate",
importResult: {},
slideDataSource: []
previewUrl: "/api/bs/hrmsalary/addUpDeduction/preview"
},
exportPayloadUrl: "",
exportPayloadType: false,
@ -200,41 +198,6 @@ class Index extends Component {
exportPayloadUrl: `${window.location.origin}/api/bs/hrmsalary/addUpDeduction/export?ids=${ids.join(",")}&declareMonth=${declareMonth}&taxAgentId=${taxAgentId}`
});
};
/*
* Author: 黎永顺
* Description: 导入数据采集数据
* Params:
* Date: 2023/2/20
*/
handleImportFile = (params) => {
importCumDeductParam(params).then(({ status, data }) => {
if (status) {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, importResult: data }
});
}
});
};
/*
* Author: 黎永顺
* Description: 导入数据采集-数据查看
* Params:
* Date: 2023/2/20
*/
handlePreviewImport = (params) => {
importCumDeductPreview(params).then(({ status, data, errormsg }) => {
if (status) {
const { preview = [] } = data;
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, slideDataSource: preview }
});
} else {
message.error(errormsg || "预览失败");
}
});
};
/*
* Author: 黎永顺
* Description: 数据采集-信息保存
@ -530,12 +493,6 @@ class Index extends Component {
importPayload: { ...importPayload, importOpts: { ...importOpts, [key]: value } }
});
};
handleImportSetStep = (step) => {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, step }
});
};
render() {
const { taxAgentStore: { showOperateBtn }, cumDeductStore: { form } } = this.props;
@ -551,11 +508,9 @@ class Index extends Component {
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType} logFunction="addupdeduction"
form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={importPayload} onImportFile={this.handleImportFile}
onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
onCancel={this.handleCloseImport} onImportFile={importCumDeductParam}
importPayload={importPayload} detailOptBtns={this.getDetailOptBtns()}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
columns={modalColumns}
>
<DataTables
ref={dom => this.tableRef = dom}
@ -588,9 +543,10 @@ export const DataCollectionDatePicker = (props) => {
</WeaFormItem>;
};
export const DataCollectionSelect = (props) => {
const { value, label, onChange, options, key, labelCol = 10, wrapperCol = 14 } = props;
const { value, label, onChange, options, key, labelCol = 10, wrapperCol = 14, viewAttr = 2 } = props;
return <WeaFormItem label={label} labelCol={{ span: labelCol }} wrapperCol={{ span: wrapperCol }}>
<WeaSelect value={value} onChange={(val) => onChange({ key, value: val })} options={options}/>
<WeaSelect style={{ width: 200 }} value={value} onChange={(val) => onChange({ key, value: val })} options={options}
viewAttr={viewAttr}/>
</WeaFormItem>;
};

58
pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
View File

@ -15,8 +15,7 @@ import {
editAddUpSituation,
getAddUpSituation,
getCumSituationSaCondition,
importCumSituationParam,
importCumSituationPreview
importCumSituationParam
} from "../../../apis/cumSituation";
import { removePropertyCondition } from "../../../util/response";
import DataTables from "../dataTables";
@ -27,7 +26,6 @@ import moment from "moment";
import { dataCollectCondition, taxOptions } from "./columns";
import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { situationModalColumns } from "../cumDeduct/columns";
import { convertToUrlString } from "../../../util/url";
const getKey = WeaTools.getKey;
@ -57,10 +55,9 @@ class Index extends Component {
declareMonth: moment(new Date()).format("YYYY-MM")
},
importFormComponent: null,
step: 0,
templateLink: "/api/bs/hrmsalary/addUpSituation/downloadTemplate",
importResult: {},
slideDataSource: []
previewUrl: "/api/bs/hrmsalary/addUpSituation/preview"
},
exportPayloadUrl: "",
exportPayloadType: false,
@ -126,46 +123,6 @@ class Index extends Component {
});
}
};
/*
* Author: 黎永顺
* Description: 导入数据采集数据
* Params:
* Date: 2023/2/20
*/
handleImportFile = (params) => {
const { declareMonth, ...extra } = params;
const payload = {
taxYearMonth: declareMonth,
...extra
};
importCumSituationParam(payload).then(({ status, data }) => {
if (status) {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, importResult: data }
});
}
});
};
/*
* Author: 黎永顺
* Description: 导入数据采集-数据查看
* Params:
* Date: 2023/2/20
*/
handlePreviewImport = (params) => {
importCumSituationPreview(params).then(({ status, data, errormsg }) => {
if (status) {
const { preview = [] } = data;
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, slideDataSource: preview }
});
} else {
message.error(errormsg || "预览失败");
}
});
};
/*
* Author: 黎永顺
* Description:列表操作
@ -485,12 +442,6 @@ class Index extends Component {
importPayload: { ...importPayload, importOpts: { ...importOpts, [key]: value } }
});
};
handleImportSetStep = (step) => {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, step }
});
};
/*
* Author: 黎永顺
* Description:详情页面-操作按钮
@ -555,10 +506,9 @@ class Index extends Component {
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType} logFunction="addupsituation"
form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
onCancel={this.handleCloseImport} onImportFile={importCumSituationParam}
detailOptBtns={this.getDetailOptBtns()}
importPayload={{ ...importPayload, importOpts: { taxYearMonth: importPayload.importOpts.declareMonth } }}
onImportFile={this.handleImportFile} columns={situationModalColumns}
onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
>
<DataTables

5
pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
View File

@ -35,7 +35,10 @@ class DataTables extends Component {
getTableDate = (extraPayload = {}) => {
const { loading, pageInfo } = this.state;
const { url, payload } = this.props;
const module = { ...pageInfo, url, ...payload, ...extraPayload };
const module = {
...pageInfo, url, ...payload, ...extraPayload,
departmentIds: extraPayload.departmentIds ? extraPayload.departmentIds.split(",") : []
};
this.setState({ loading: { ...loading, query: true } });
getTableDate(module).then(({ status, data }) => {
this.setState({ loading: { ...loading, query: false } });

94
pc4mobx/hrmSalary/pages/dataAcquisition/importDialog.js Normal file
View File

@ -0,0 +1,94 @@
/*
* Author: 黎永顺
* name:数据采集四个基础项-导入
* Description:
* Date: 2024/3/14
*/
import React, { Component } from "react";
import { WeaCheckbox, WeaLocaleProvider } from "ecCom";
import ImportDialog from "../../components/importDialog";
import { convertToUrlString } from "../../util/url";
const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
constructor(props) {
super(props);
this.state = {
hasData: false,
importDialog: {
nextloading: false, link: "", importResult: {}, imageId: "", params: {},
previewUrl: ""
}
};
}
componentWillReceiveProps(nextProps, nextContext) {
const { hasData, importDialog } = this.state;
const { templateLink, importOpts, importResult, previewUrl } = nextProps;
this.setState({
importDialog: {
...importDialog, link: `${templateLink}?${convertToUrlString({ ...importOpts, hasData })}`,
importResult, params: importOpts, previewUrl, extraPreview: importOpts
}
});
}
handleExportTemp = () => {
const { hasData } = this.state;
const { templateLink, importOpts } = this.props;
if (!Object.values(importOpts).every(o => !!o)) {
Modal.warning({
title: getLabel(131329, "信息确认"),
content: getLabel(518702, "必要信息不完整，红色*为必填项！")
});
return;
}
const payload = { ...importOpts, hasData };
window.open(`${templateLink}?${convertToUrlString(payload)}`, "_blank");
};
handleImport = (payload) => {
const { importDialog } = this.state, { onImportFile, importOpts } = this.props;
this.setState({ importDialog: { ...importDialog, nextloading: true } });
onImportFile({ ...payload, ...importOpts }).then(({ data, status }) => {
this.setState({ importDialog: { ...importDialog, nextloading: false } });
if (status) {
this.setState({
importDialog: { ...importDialog, ...payload, importResult: data }
});
}
}).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } }));
};
render() {
const { importDialog, hasData } = this.state;
const { visible, onCancel, importParams, templateLink, importOpts } = this.props;
return (
<ImportDialog
visible={visible} onCancel={onCancel} {...importDialog} title={getLabel(24023, "数据导入")}
importParams={importParams} onResetImportResult={() => this.setState({
importDialog: { ...importDialog, importResult: {}, imageId: "", link: "" }
})}
exportDataDom={
<WeaCheckbox
value={hasData ? "1" : "0"}
content={getLabel(543208, "导出现有数据")}
helpfulTip={getLabel(111, "提示：建议先导出现有最新数据，修改后再导入")}
onChange={val => this.setState({ hasData: val === "1" }, () => {
this.setState({
importDialog: {
...importDialog,
link: `${templateLink}?${convertToUrlString({ ...importOpts, hasData: this.state.hasData })}`
}
});
})}
/>
}
nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
nextUplaodCallback={imageId => this.handleImport({ imageId })}
/>
);
}
}
export default Index;

46
pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
View File

@ -8,11 +8,11 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
import ImportModal from "../../components/importModal";
import ImportModal from "./importDialog";
import LogDialog from "../../components/logViewModal";
import SlideModalTitle from "../../components/slideModalTitle";
import { getSearchs } from "../../util";
import "./index.less";
import LogDialog from "../../components/logViewModal";
const getLabel = WeaLocaleProvider.getLabel;
@ -78,14 +78,13 @@ class Layout extends Component {
const { showSearchAd, logDialogVisible, filterConditions } = this.state;
const {
title, btns, leftComp, children, taxAgentStore: { showOperateBtn },
slidePayload, onClose, onSave, slideLoading, form, condition,
onAdSearch, onCancel, importPayload, onImportSetStep, onImportFile,
onPreviewImport, detailOptBtns, columns, logFunction, onClearTargrtid
slidePayload, onClose, onSave, slideLoading, form, condition, onImportFile,
onAdSearch, onCancel, importPayload, detailOptBtns, logFunction, onClearTargrtid
} = this.props;
const { visible, title: subtitle, children: slideChildren } = slidePayload;
const {
visible: importVisiable, step, importFormComponent, importOpts,
importResult, slideDataSource, templateLink
visible: importVisiable, importFormComponent, importOpts,
importResult, templateLink, previewUrl
} = importPayload;
return (
<div className="layoutWrapper">
@ -115,21 +114,26 @@ class Layout extends Component {
<WeaNewScroll height="100%">{children}</WeaNewScroll>
{/*导入弹框*/}
<ImportModal
needimportSelected //下载模板需要带上导入所选项
columns={columns}
params={importOpts}
step={step}
setStep={onImportSetStep}
importResult={importResult}
onFinish={() => onCancel(true)}
slideDataSource={slideDataSource}
previewImport={onPreviewImport}
importFile={onImportFile}
templateLink={templateLink}
renderFormComponent={() => importFormComponent}
visiable={importVisiable}
onCancel={onCancel}
visible={importVisiable} onCancel={onCancel} importParams={importFormComponent}
importOpts={importOpts} importResult={importResult} templateLink={templateLink}
previewUrl={previewUrl} onImportFile={onImportFile}
/>
{/*<ImportModal*/}
{/* needimportSelected //下载模板需要带上导入所选项*/}
{/* columns={columns}*/}
{/* params={importOpts}*/}
{/* step={step}*/}
{/* setStep={onImportSetStep}*/}
{/* importResult={importResult}*/}
{/* onFinish={() => onCancel(true)}*/}
{/* slideDataSource={slideDataSource}*/}
{/* previewImport={onPreviewImport}*/}
{/* importFile={onImportFile}*/}
{/* templateLink={templateLink}*/}
{/* renderFormComponent={() => importFormComponent}*/}
{/* visiable={importVisiable}*/}
{/* onCancel={onCancel}*/}
{/*/>*/}
{/* 新增-编辑-详情弹框 */}
<WeaSlideModal
className="slideOuterWrapper"

32
pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
View File

@ -28,7 +28,6 @@ import { DataCollectionDatePicker, DataCollectionSelect } from "../cumDeduct";
import { dataCollectCondition } from "./columns";
import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { otherModalColumns } from "../cumDeduct/columns";
import { convertToUrlString } from "../../../util/url";
const getKey = WeaTools.getKey;
@ -57,10 +56,9 @@ class Index extends Component {
declareMonth: moment(new Date()).format("YYYY-MM")
},
importFormComponent: null,
step: 0,
templateLink: "/api/bs/hrmsalary/otherDeduction/downloadTemplate",
importResult: {},
slideDataSource: []
previewUrl: "/api/bs/hrmsalary/otherDeduction/preview"
},
exportPayloadUrl: "",
exportPayloadType: false,
@ -146,22 +144,6 @@ class Index extends Component {
});
}
};
/*
* Author: 黎永顺
* Description: 导入数据采集数据
* Params:
* Date: 2023/2/20
*/
handleImportFile = (params) => {
importOtherDeductionParam(params).then(({ status, data }) => {
if (status) {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, importResult: data }
});
}
});
};
/*
* Author: 黎永顺
* Description: 导入数据采集-数据查看
@ -479,12 +461,6 @@ class Index extends Component {
importPayload: { ...importPayload, importOpts: { ...importOpts, [key]: value } }
});
};
handleImportSetStep = (step) => {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, step }
});
};
/*
* Author: 黎永顺
* Description:详情页面-操作按钮
@ -549,11 +525,9 @@ class Index extends Component {
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType} logFunction="otherdeduction"
form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={importPayload} onImportFile={this.handleImportFile}
onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
onCancel={this.handleCloseImport} importPayload={importPayload}
detailOptBtns={this.getDetailOptBtns()} onImportFile={importOtherDeductionParam}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
columns={otherModalColumns}
>
<DataTables
ref={dom => this.tableRef = dom}

54
pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
View File

@ -11,8 +11,7 @@ import {
specialAddDeductionDeleteAllData,
specialAddDeductionDeleteSelectData,
specialAddDeductionEditData,
specialAddDeductionImportData,
specialAddDeductionPreview
specialAddDeductionImportData
} from "../../../apis/special";
import { removePropertyCondition } from "../../../util/response";
import { DataCollectionSelect } from "../cumDeduct";
@ -20,7 +19,6 @@ import ImportFormCom from "../cumDeduct/components/importFormCom";
import { condition } from "./components/condition";
import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { specialModalColumns } from "../cumDeduct/columns";
import { convertToUrlString } from "../../../util/url";
const getKey = WeaTools.getKey;
@ -47,10 +45,9 @@ class Index extends Component {
taxAgentId: ""
},
importFormComponent: null,
step: 0,
templateLink: "/api/bs/hrmsalary/specialAddDeduction/downloadTemplate",
importResult: {},
slideDataSource: []
previewUrl: "/api/bs/hrmsalary/specialAddDeduction/preview"
},
exportPayloadUrl: "",
exportPayloadType: false,
@ -101,41 +98,6 @@ class Index extends Component {
});
}
};
/*
* Author: 黎永顺
* Description: 导入数据采集数据
* Params:
* Date: 2023/2/20
*/
handleImportFile = (params) => {
specialAddDeductionImportData(params).then(({ status, data }) => {
if (status) {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, importResult: data }
});
}
});
};
/*
* Author: 黎永顺
* Description: 导入数据采集-数据查看
* Params:
* Date: 2023/2/20
*/
handlePreviewImport = (params) => {
specialAddDeductionPreview(params).then(({ status, data, errormsg }) => {
if (status) {
const { preview = [] } = data;
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, slideDataSource: preview }
});
} else {
message.error(errormsg || "预览失败");
}
});
};
/*
* Author: 黎永顺
* Description: 高级搜素框-表单项
@ -439,12 +401,6 @@ class Index extends Component {
importPayload: { ...importPayload, importOpts: { ...importOpts, [key]: value } }
});
};
handleImportSetStep = (step) => {
const { importPayload } = this.state;
this.setState({
importPayload: { ...importPayload, step }
});
};
render() {
const { taxAgentStore: { showOperateBtn }, specialAddStore: { advanceForm } } = this.props;
@ -460,11 +416,9 @@ class Index extends Component {
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType} logFunction="specialAddDeduction"
form={advanceForm} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={importPayload} onImportFile={this.handleImportFile}
onPreviewImport={this.handlePreviewImport} detailOptBtns={[]}
onCancel={this.handleCloseImport} detailOptBtns={[]}
importPayload={importPayload} onImportFile={specialAddDeductionImportData}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
columns={specialModalColumns}
>
<DataTables
ref={dom => this.tableRef = dom}

2
pc4mobx/hrmSalary/stores/attendanceStore.js
View File

@ -4,6 +4,8 @@ import { WeaForm } from "comsMobx";
export class AttendanceStore {
@observable form = new WeaForm();
@action("字段管理-新建字段表单初始化")
initForm = () => this.form = new WeaForm();
@observable refenceform = new WeaForm();
//薪酬统计 新增form
@observable statisticsForm = new WeaForm();