diff --git a/pc4mobx/hrmSalary/apis/ruleconfig.js b/pc4mobx/hrmSalary/apis/ruleconfig.js index 09f8ebba..13f2e0eb 100644 --- a/pc4mobx/hrmSalary/apis/ruleconfig.js +++ b/pc4mobx/hrmSalary/apis/ruleconfig.js @@ -31,6 +31,10 @@ export const queryAppsetting = (params) => { export const saveEncryptSetting = (params) => { return postFetch('/api/bs/hrmsalary/sys/app/setting/saveEncryptSetting', params); } +//加密配置保存 +export const appSettingSave = (params) => { + return postFetch('/api/bs/hrmsalary/sys/app/setting/save', params); +} //获取加密进度条 export const getEncryptProgress = params => { return WeaTools.callApi('/api/bs/hrmsalary/sys/app/getEncryptProgress', 'GET', params); diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index 5051c138..80474093 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -16,7 +16,6 @@ import SlideModalTitle from "../../components/slideModalTitle"; import CopyFormModal from "./copyFormModal"; import "./index.less"; - @inject("ledgerStore", "taxAgentStore") @observer export default class Ledger extends React.Component { diff --git a/pc4mobx/hrmSalary/pages/ledger/index.less b/pc4mobx/hrmSalary/pages/ledger/index.less index f735565b..219586a4 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.less +++ b/pc4mobx/hrmSalary/pages/ledger/index.less @@ -326,3 +326,7 @@ border-radius: 0; } } + +//.ant-modal-body { +// overflow: auto; +//} diff --git a/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js b/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js index 58645741..b55ed5a4 100644 --- a/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js +++ b/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js @@ -50,6 +50,7 @@ export default class SlideRefereUser extends React.Component { } = this.props; getLedgerPersonRangeInclude({ salarySobId: salarySobId }); if (edit) getLedgerBasicForm(); + // window.setLayoutWindow=window; } onSelectChange = selectedRowKeys => { diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index b79884ca..bee13a3e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -414,12 +414,14 @@ class Index extends Component { ...columns], (item, index) => { if (index === 0) { // , fixed: "left" - return { ...item, width: item.oldWidth }; + // , width: item.oldWidth + return { ...item }; } if (item.dataIndex === "operate") { return { - ...item, fixed: "right", - width: 150, + ...item, + // fixed: "right", + // width: 150, render: (text, record) => { if (!showOperateBtn) { return
@@ -471,7 +473,8 @@ class Index extends Component { } }; } - return { ...item, width: item.oldWidth }; + // , width: item.oldWidth + return { ...item }; }); }; handleEdit = (record) => { @@ -551,7 +554,7 @@ class Index extends Component { handleSave = () => { const { paysetParams, selectedKey } = this.state; const { salaryFileStore: { adjustSalaryItems, detailForm } } = this.props; - if ((selectedKey === "pending" && _.isEmpty(paysetParams.payStartDate)) || (selectedKey !== "pending" && _.isEmpty(paysetParams.payEndDate))) { + if ((selectedKey === "pending" && _.isEmpty(paysetParams.payStartDate)) || (selectedKey === "suspend" && _.isEmpty(paysetParams.payEndDate))) { Modal.warning({ title: "信息确认", content: "必要信息不完整，红色*为必填项！" @@ -722,7 +725,7 @@ class Index extends Component { columns={this.getColumns()} dataSource={dataSource} pagination={pagination} // rowClassName={(record) => record.archiveStatus === "ARCHIVE" ? "archiveRow" : ""} rowSelection={rowSelection} - scroll={{ x: 1200 }} + // scroll={{ x: 1200 }} /> 保存
} showGroup center items={importItems}/> - - 加密规则 - - - } showGroup center items={enctryItems}/> + {/**/} + {/* 加密规则*/} + {/* */} + {/* */} + {/* } showGroup center items={enctryItems}/>*/} { this.state.progressVisible && { - if(key === "addMember"){ + content={ { + if (key === "addMember") { this.stayAddToPay([record.baseInfo]); - }else{ + } else { Modal.warning({ title: "信息确认", content: `确定要删除该条待办人员吗？`, @@ -200,23 +200,23 @@ export default class Archives extends React.Component { } // 保存 - handleEditSlideSave() { + handleEditSlideSave = () => { const { selectedTab } = this.state; const { archivesStore: { save } } = this.props; if (selectedTab == 1) { - save("SOCIAL_SECURITY"); + save("SOCIAL_SECURITY").then(() => { + this.query(); + }); } else if (selectedTab == 2) { - save("ACCUMULATION_FUND"); + save("ACCUMULATION_FUND").then(() => { + this.query(); + }); } else if (selectedTab == 3) { - save("OTHER"); + save("OTHER").then(() => { + this.query(); + }); } - } - - handlePageChnage(value) { - const { archivesStore: { form, getTableDatas } } = this.props; - this.pageInfo.current = value; - getTableDatas(this.pageInfo); - } + }; // 导入 handleBtnImport(runStatus) { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less index 0acd026f..10130c20 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less @@ -1,6 +1,5 @@ .standingbookWrapper { .wea-new-top-content { - padding: 0 16px; .wea-new-table { .ant-table-row:hover { .more { @@ -23,6 +22,7 @@ display: flex; align-items: center; height: 46px; + padding: 0 16px; .to { padding: 0 8px; } diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index fda157e0..f7024ec0 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -43,6 +43,7 @@ export default class TaxAgent extends React.Component { const { doInit } = taxAgentStore; doInit(); this.getPermission(); + // window.setLayoutWindow=window; } getPermission = () => { diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js index b01de4fe..db02436d 100644 --- a/pc4mobx/hrmSalary/stores/archives.js +++ b/pc4mobx/hrmSalary/stores/archives.js @@ -1,17 +1,17 @@ -import { observable, action, toJS } from 'mobx'; -import { message } from 'antd'; -import { WeaForm, WeaTableNew } from 'comsMobx'; -import { removePropertyCondition } from '../util/response' +import { action, observable } from "mobx"; +import { message } from "antd"; +import { WeaForm, WeaTableNew } from "comsMobx"; +import { removePropertyCondition } from "../util/response"; -import * as API from '../apis/welfareArchive'; // 引入API接口文件 +import * as API from "../apis/welfareArchive"; // 引入API接口文件 const { TableStore } = WeaTableNew; export class ArchivesStore { @observable tableStore = new TableStore( - // {dataHandle: (datas) => { - // return dataSource; - // }} + // {dataHandle: (datas) => { + // return dataSource; + // }} ); @observable form = new WeaForm(); // nrew 一个form @observable condition = []; // 存储后台得到的form数据 @@ -22,9 +22,9 @@ export class ArchivesStore { @observable dataSource = []; // Slide 表单 - @observable baseFormData = {} - @observable socialSecurityForm = {} // 社保表单 - @observable accumulationFundForm = {} // 公积金表单 + @observable baseFormData = {}; + @observable socialSecurityForm = {}; // 社保表单 + @observable accumulationFundForm = {}; // 公积金表单 @observable otherForm = {}; // 其他福利表单 // 基数表单 @@ -34,35 +34,35 @@ export class ArchivesStore { @observable pageInfo = {}; // 导入预览 - @observable previewCurDataList = {} - @observable previewCurDataColumns = [] - @observable previewCurDataDataSource = [] - @observable importResult = {} + @observable previewCurDataList = {}; + @observable previewCurDataColumns = []; + @observable previewCurDataDataSource = []; + @observable importResult = {}; @action initImportParams = () => { this.previewCurDataList = {}; this.previewCurDataColumns = []; this.previewCurDataDataSource = []; - this.importResult = {} - } + this.importResult = {}; + }; // ** 设置导入参数 start ** @action setPreviewCurDataColumns = (previewCurDataColumns) => { - this.previewCurDataColumns = previewCurDataColumns - } + this.previewCurDataColumns = previewCurDataColumns; + }; @action setPreviewCurDataDataSource = (previewCurDataDataSource) => { - this.previewCurDataDataSource = previewCurDataDataSource - } + this.previewCurDataDataSource = previewCurDataDataSource; + }; @action setImportResult = (importResult) => { - this.importResult = importResult - } + this.importResult = importResult; + }; // ** 设置导入参数 end ** // 社保表单 @@ -71,66 +71,66 @@ export class ArchivesStore { // 公积金表单 @action - setAccumulationFundForm = accumulationFundForm => this.accumulationFundForm = accumulationFundForm + setAccumulationFundForm = accumulationFundForm => this.accumulationFundForm = accumulationFundForm; // 其他福利表单 @action - setOtherForm = otherForm => this.otherForm = otherForm + setOtherForm = otherForm => this.otherForm = otherForm; // 社保表单 @action - setSocialSecurityPaymentForm = socialSecurityPaymentForm => this.socialSecurityPaymentForm = socialSecurityPaymentForm + setSocialSecurityPaymentForm = socialSecurityPaymentForm => this.socialSecurityPaymentForm = socialSecurityPaymentForm; // 公积金表单 @action - setAccumulationFundPaymentForm = accumulationFundPaymentForm => this.accumulationFundPaymentForm = accumulationFundPaymentForm + setAccumulationFundPaymentForm = accumulationFundPaymentForm => this.accumulationFundPaymentForm = accumulationFundPaymentForm; // 其他福利基数表单 @action - setOtherPaymentForm = otherPaymentForm => this.otherPaymentForm = otherPaymentForm + setOtherPaymentForm = otherPaymentForm => this.otherPaymentForm = otherPaymentForm; // 初始化操作 @action doInit = () => { this.getCondition(); // this.getTableDatas(); - } + }; // 获得高级搜索表单数据 @action getCondition = () => { API.getCondition().then(action(res => { if (res.status) { // 接口请求成功/失败处理 - let condition = removePropertyCondition(res.data.condition) + let condition = removePropertyCondition(res.data.condition); this.condition = condition; this.form.initFormFields(condition); // 渲染高级搜索form表单 } else { - message.error(res.msg || '接口调用失败！') + message.error(res.msg || "接口调用失败！"); } })); - } + }; // 渲染table数据 @action getTableDatas = (params = {}) => { this.loading = true; const formParams = this.form.getFormParams() || {}; - params = {...formParams, ...params}; + params = { ...formParams, ...params }; API.getTable(params).then(action(res => { if (res.status) { // 接口请求成功/失败处理 this.dataSource = res.data.datas.map(item => { - item = {...item} - item.key = item.employeeId + item = { ...item }; + item.key = item.employeeId; return item; - }) + }); // this.columns = res.data.columns; - this.tableStore.getDatas(res.data.dataKey.datas) - this.pageInfo = res.data.pageInfo + this.tableStore.getDatas(res.data.dataKey.datas); + this.pageInfo = res.data.pageInfo; } else { - message.error(res.msg || '接口调用失败！') + message.error(res.msg || "接口调用失败！"); } this.loading = false; })); - } + }; @action setShowSearchAd = bool => this.showSearchAd = bool; @@ -139,124 +139,128 @@ export class ArchivesStore { @action doSearch = () => { this.getTableDatas(); this.showSearchAd = false; - } + }; // 查询档案基本信息表单 @action - getBaseForm = (employeeId, welfareTypeEnum ="", paymentOrganization="") => { - API.getBaseForm({employeeId, welfareTypeEnum, paymentOrganization}).then(action(res => { - if(res.status) { - if(welfareTypeEnum == "") { - this.baseFormData = res.data.data - } else if(welfareTypeEnum == "SOCIAL_SECURITY"){ - this.socialSecurityForm = res.data - } else if(welfareTypeEnum == "ACCUMULATION_FUND") { - this.accumulationFundForm = res.data - } else if(welfareTypeEnum == "OTHER") { - this.otherForm = res.data - } - // if(res.data && res.data.data && res.data.data.id) { - // this.getPaymentForm(employeeId, welfareTypeEnum, res.data.data.id) - // } - } else { - message.error(res.errormsg || "获取失败") + getBaseForm = (employeeId, welfareTypeEnum = "", paymentOrganization = "") => { + API.getBaseForm({ employeeId, welfareTypeEnum, paymentOrganization }).then(action(res => { + if (res.status) { + if (welfareTypeEnum == "") { + this.baseFormData = res.data.data; + } else if (welfareTypeEnum == "SOCIAL_SECURITY") { + this.socialSecurityForm = res.data; + } else if (welfareTypeEnum == "ACCUMULATION_FUND") { + this.accumulationFundForm = res.data; + } else if (welfareTypeEnum == "OTHER") { + this.otherForm = res.data; } - })) - } + // if(res.data && res.data.data && res.data.data.id) { + // this.getPaymentForm(employeeId, welfareTypeEnum, res.data.data.id) + // } + } else { + message.error(res.errormsg || "获取失败"); + } + })); + }; // 查询档案缴纳基数表单 @action - getPaymentForm = (employeeId, welfareTypeEnum, schemeId, paymentOrganization="") => { - API.getPaymentForm({employeeId, welfareTypeEnum, schemeId, paymentOrganization}).then(res => { - if(welfareTypeEnum == "SOCIAL_SECURITY") { - this.socialSecurityPaymentForm = res.data - } else if(welfareTypeEnum == "ACCUMULATION_FUND") { - this.accumulationFundPaymentForm = res.data - } else if(welfareTypeEnum == "OTHER") { - this.otherPaymentForm = res.data + getPaymentForm = (employeeId, welfareTypeEnum, schemeId, paymentOrganization = "") => { + API.getPaymentForm({ employeeId, welfareTypeEnum, schemeId, paymentOrganization }).then(res => { + if (welfareTypeEnum == "SOCIAL_SECURITY") { + this.socialSecurityPaymentForm = res.data; + } else if (welfareTypeEnum == "ACCUMULATION_FUND") { + this.accumulationFundPaymentForm = res.data; + } else if (welfareTypeEnum == "OTHER") { + this.otherPaymentForm = res.data; } - }) - } + }); + }; // 保存表单 @action save = (welfareType) => { - let baseForm = "" - let paymentForm = "" - if(welfareType == "SOCIAL_SECURITY") { - baseForm = JSON.stringify(this.socialSecurityForm.data) - paymentForm = JSON.stringify(this.socialSecurityPaymentForm.data) - } else if(welfareType == "ACCUMULATION_FUND") { - baseForm = JSON.stringify(this.accumulationFundForm.data) - paymentForm = JSON.stringify(this.accumulationFundPaymentForm.data) - } else if(welfareType == "OTHER") { - baseForm = JSON.stringify(this.otherForm.data) - paymentForm = JSON.stringify(this.otherPaymentForm.data) + let baseForm = ""; + let paymentForm = ""; + if (welfareType == "SOCIAL_SECURITY") { + baseForm = JSON.stringify(this.socialSecurityForm.data); + paymentForm = JSON.stringify(this.socialSecurityPaymentForm.data); + } else if (welfareType == "ACCUMULATION_FUND") { + baseForm = JSON.stringify(this.accumulationFundForm.data); + paymentForm = JSON.stringify(this.accumulationFundPaymentForm.data); + } else if (welfareType == "OTHER") { + baseForm = JSON.stringify(this.otherForm.data); + paymentForm = JSON.stringify(this.otherPaymentForm.data); } - API.save({welfareType, baseForm, paymentForm}).then(res => { - if(res.status) { - message.success("保存成功", 1) - this.getTableDatas() - } else { - message.error(res.errormsg || "保存失败", 1) - } - }) - } + return new Promise((resolve, reject) => { + API.save({ welfareType, baseForm, paymentForm }).then(res => { + if (res.status) { + message.success("保存成功", 1); + resolve(); + // this.getTableDatas() + } else { + message.error(res.errormsg || "保存失败", 1); + reject(); + } + }); + }); + }; // 导入模板下载 @action exportTempateDownload = (params = {}) => { - API.exportCurData(params) - } + API.exportCurData(params); + }; // 导入预览 @action previewCurData = (params) => { API.previewCurData(params).then(res => { - if(res.status) { - this.previewCurDataList = res.data + if (res.status) { + this.previewCurDataList = res.data; this.previewCurDataColumns = res.data.headers.map((item, index) => { - let column = {} + let column = {}; column.title = item; column.dataIndex = "" + index; - column.key = index + "" - return column - }) + column.key = index + ""; + return column; + }); this.previewCurDataDataSource = res.data.list.map((item) => { - let data = {} + let data = {}; item.map((i, index) => { - data[index + ''] = i - }) - return data - }) + data[index + ""] = i; + }); + return data; + }); } else { message.error(res.errormsg || "获取失败", 1); } - }) - } + }); + }; // 导入 @action importBatch = (params) => { return new Promise((resolve, reject) => { API.importBatch(params).then(res => { - if(res.status) { - this.importResult = res.data + if (res.status) { + this.importResult = res.data; resolve(); } else { - message.error(res.errormsg || "导入失败", 1) + message.error(res.errormsg || "导入失败", 1); reject(); } - }) - }) + }); + }); - } + }; // 导出档案 @action exportArchives = (ids = "") => { - API.exportArchives(ids) - } + API.exportArchives(ids); + }; }