bug修复
This commit is contained in:
parent
6adf1a83fa
commit
95166a6534
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import { WeaSteps, WeaDatePicker, WeaInput, WeaSelect } from 'ecCom';
|
||||
import { Upload, Icon, Modal, Row, Col, Button } from "antd";
|
||||
import { Upload, Icon, Modal, Row, Col, Button, message } from "antd";
|
||||
import { inject, observer } from 'mobx-react';
|
||||
import { toJS } from 'mobx';
|
||||
|
||||
|
|
@ -41,7 +41,12 @@ export default class ImportModal extends React.Component {
|
|||
|
||||
|
||||
handleStep1Next() {
|
||||
this.props.setStep(1)
|
||||
if(this.state.fileId) {
|
||||
this.props.setStep(1)
|
||||
} else {
|
||||
message.warning("请上传文件")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
handlePreviewDate() {
|
||||
|
|
|
|||
|
|
@ -260,7 +260,8 @@ export default class Calculate extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: salaryListPageInfo.total,
|
||||
current: salaryListPageInfo.pageNum
|
||||
current: salaryListPageInfo.pageNum,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
}}
|
||||
/>
|
||||
</WeaTop>
|
||||
|
|
|
|||
|
|
@ -206,7 +206,8 @@ export default class CompareDetail extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: comparisonResultPageInfo.total,
|
||||
current: comparisonResultPageInfo.pageNum
|
||||
current: comparisonResultPageInfo.pageNum,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -154,6 +154,7 @@ export default class PlaceOnFileDetail extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: acctResultListPageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: acctResultListPageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -148,6 +148,7 @@ export default class SalaryDetail extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: acctResultListPageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: acctResultListPageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ export default class UserSure extends React.Component {
|
|||
userListSearchValue: '',
|
||||
}
|
||||
this.id = ""
|
||||
this.current = 1
|
||||
}
|
||||
|
||||
componentWillMount() {
|
||||
|
|
@ -28,6 +29,7 @@ export default class UserSure extends React.Component {
|
|||
salaryacctGetForm(id)
|
||||
acctemployeeList({salaryAcctRecordId: id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
reducedemployeeList({salaryAcctRecordId: id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
this.current = 1
|
||||
getSalarySobCycle(id)
|
||||
}
|
||||
|
||||
|
|
@ -39,6 +41,7 @@ export default class UserSure extends React.Component {
|
|||
saveAcctemployee(this.id, idList).then(() => {
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
this.current = 1
|
||||
checkTaxAgent(this.id)
|
||||
})
|
||||
}
|
||||
|
|
@ -67,8 +70,8 @@ export default class UserSure extends React.Component {
|
|||
content: '确认删除',
|
||||
onOk:() => {
|
||||
deleteAcctemployee(this.id, selectedRowKeys).then(() => {
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: this.current})
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: this.current})
|
||||
})
|
||||
},
|
||||
onCancel: () => {
|
||||
|
|
@ -102,14 +105,14 @@ export default class UserSure extends React.Component {
|
|||
|
||||
// 删除人员
|
||||
handleDeleteItem = (record) => {
|
||||
const { calculateStore: {deleteAcctemployee}} = this.props;
|
||||
const { calculateStore: {deleteAcctemployee, reducedemployeeList, acctemployeeList}} = this.props;
|
||||
Modal.confirm({
|
||||
title: '信息确认',
|
||||
content: '确认删除',
|
||||
onOk:() => {
|
||||
deleteAcctemployee(this.id, [record.id]).then(() => {
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue,current: 1})
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: this.current})
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue,current: this.current})
|
||||
})
|
||||
},
|
||||
onCancel: () => {
|
||||
|
|
@ -124,6 +127,7 @@ export default class UserSure extends React.Component {
|
|||
refreshTaxAgent(this.id).then(() => {
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: 1})
|
||||
acctemployeeList({salaryAcctRecordId: this.id , employeeName: this.state.userListSearchValue, current: 1})
|
||||
this.current = 1
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -134,6 +138,7 @@ export default class UserSure extends React.Component {
|
|||
// 核算人员范围分页
|
||||
handleUserListPageChange(value) {
|
||||
const { calculateStore: {acctemployeeList}} = this.props;
|
||||
this.current = value;
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: value})
|
||||
}
|
||||
|
||||
|
|
@ -141,6 +146,7 @@ export default class UserSure extends React.Component {
|
|||
handleReducedemployeeListPageChange(value) {
|
||||
const { calculateStore: { reducedemployeeList }} = this.props;
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: this.state.userListSearchValue, current: value})
|
||||
this.current = value
|
||||
}
|
||||
|
||||
// 搜索
|
||||
|
|
@ -148,8 +154,10 @@ export default class UserSure extends React.Component {
|
|||
const { calculateStore: {acctemployeeList, reducedemployeeList}} = this.props;
|
||||
if(this.state.selectedKey == 0) {
|
||||
acctemployeeList({salaryAcctRecordId: this.id, employeeName: value, current: 1})
|
||||
this.current = 1
|
||||
} else {
|
||||
reducedemployeeList({salaryAcctRecordId: this.id, employeeName: value, current: 1})
|
||||
this.current = 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -265,6 +273,7 @@ export default class UserSure extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleUserListPageChange(value)},
|
||||
total: acctemployeeListPageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: acctemployeeListPageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
@ -276,6 +285,7 @@ export default class UserSure extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleReducedemployeeListPageChange(value)},
|
||||
total: reducedemployeeListPageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: reducedemployeeListPageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ export default class Attendance extends React.Component {
|
|||
this.state = {
|
||||
value: "",
|
||||
selectedKey: "0",
|
||||
searchValue: "",
|
||||
modalParam: {
|
||||
salarySobId: "",
|
||||
salaryYearMonth: moment(new Date()).format("YYYY-MM"), // 薪资所属月
|
||||
|
|
@ -146,6 +147,10 @@ export default class Attendance extends React.Component {
|
|||
// 导入完成
|
||||
handleFinish() {
|
||||
this.setState({modalVisiable: false})
|
||||
const { attendanceStore: { getAttendanceList, step }} = this.props;
|
||||
if(step == 2) {
|
||||
this.getAttendanceList({})
|
||||
}
|
||||
}
|
||||
|
||||
// 考情引用的列
|
||||
|
|
@ -198,6 +203,13 @@ export default class Attendance extends React.Component {
|
|||
setImportResult({})
|
||||
}
|
||||
|
||||
// 引用详情列表搜索
|
||||
handleSearch(params) {
|
||||
const { attendanceStore: {viewAttendQuote}} = this.props;
|
||||
let request = {attendQuoteId: this.recordId, ...params}
|
||||
viewAttendQuote(request)
|
||||
}
|
||||
|
||||
render() {
|
||||
const { attendanceStore } = this.props;
|
||||
const { modalParam } = this.state;
|
||||
|
|
@ -333,9 +345,10 @@ export default class Attendance extends React.Component {
|
|||
return (
|
||||
<div style={{display: "inline-block"}}>
|
||||
<Dropdown.Button overlay={menu} type="primary">导出</Dropdown.Button>
|
||||
<Button type="default" style={{marginLeft: "10px", marginRight: "10px"}}>自定义列</Button>
|
||||
<WeaInputSearch
|
||||
placeholder="请输入姓名/部门/工号/手机号"
|
||||
onChange={(v) => {this.setState({searchValue: v})}}
|
||||
onSearch={(v) => {this.handleSearch({keyword: v})}}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
|
|
@ -528,6 +541,7 @@ export default class Attendance extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: attendancePageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: attendancePageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
@ -562,6 +576,7 @@ export default class Attendance extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleFieldPageChange(value)},
|
||||
total: fieldPageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: fieldPageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
@ -598,7 +613,8 @@ export default class Attendance extends React.Component {
|
|||
templateLink={() => {this.handleTemplateLinkClick()}}
|
||||
renderFormComponent={() => renderFormComponent()}
|
||||
visiable={this.state.modalVisiable}
|
||||
onCancel={() => { this.setState({modalVisiable: false})}}
|
||||
onCancel={() => {
|
||||
this.handleFinish()}}
|
||||
/>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ export default class CumDeduct extends React.Component {
|
|||
renderFormComponent() {
|
||||
const { modalParam } = this.state
|
||||
const { taxAgentStore: {taxAgentOption} } = this.props;
|
||||
let options = [...taxAgentOption]
|
||||
return (
|
||||
<Row>
|
||||
<Col span={12}>
|
||||
|
|
@ -121,6 +122,7 @@ export default class CumDeduct extends React.Component {
|
|||
style={{ width: 200, display: "inline-block" }}
|
||||
options={taxAgentOption}
|
||||
value={modalParam.taxAgentId}
|
||||
allowClear={true}
|
||||
onChange={v => {
|
||||
this.setState({ modalParam: {...modalParam, taxAgentId: v} });
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -172,6 +172,7 @@ export default class Declare extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: pageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: pageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ export default class SlideRefereUser extends React.Component {
|
|||
<div>
|
||||
<Table rowSelection={rowSelection} dataSource={list} columns={columns} pagination={{
|
||||
total: userTableStore.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: userTableStore.pageNum
|
||||
}}/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ export default class AddSalaryItemModal extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: addSalaryItemPageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: addSalaryItemPageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ export default class ValidRulesForm extends React.Component {
|
|||
{
|
||||
ledgerRuleList.list && <Table rowSelection={rowSelection} dataSource={ledgerRuleList.list} columns={columns} pagination={{
|
||||
total: ledgerRuleList.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: ledgerRuleList.pageNum
|
||||
}}/>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ export default class SalarySendList extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: pageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: pageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ export default class Payroll extends React.Component {
|
|||
this.state.editSlideVisible &&
|
||||
<WeaSlideModal visible={this.state.editSlideVisible}
|
||||
top={0}
|
||||
width={40}
|
||||
width={50}
|
||||
height={100}
|
||||
direction={'right'}
|
||||
measure={'%'}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ export default class ChangeSalaryModal extends React.Component {
|
|||
item.title = <span>{item.title}<RequiredLabelTip /></span>
|
||||
item.render = (text, record) => {
|
||||
return (
|
||||
<WeaInput type={"number"} style={{width: '150px'}} value={text} onChange={(value) => {
|
||||
<WeaInput style={{width: '150px'}} value={text} onChange={(value) => {
|
||||
this.handleSalaryAfterItemChange(record, value)
|
||||
}}/>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export default class EditAgentModal extends React.Component {
|
|||
request: {
|
||||
salaryArchiveId: this.props.currentId,
|
||||
effectiveTime: moment(new Date()).format("YYYY-MM-DD"),
|
||||
adjustReason: 'INIT',
|
||||
adjustReason: '',
|
||||
taxAgentId: ""
|
||||
}
|
||||
}
|
||||
|
|
@ -34,6 +34,7 @@ export default class EditAgentModal extends React.Component {
|
|||
item.selected = false
|
||||
return item;
|
||||
})
|
||||
console.log("adjustReasonList:", adjustReasonList);
|
||||
return adjustReasonList
|
||||
}
|
||||
|
||||
|
|
@ -98,6 +99,7 @@ export default class EditAgentModal extends React.Component {
|
|||
taxAgentId
|
||||
} = request;
|
||||
|
||||
|
||||
return (
|
||||
<Modal title="个税扣缴义务人调整" width={800} visible={this.props.visible} onClose={this.props.onCancel}
|
||||
footer={
|
||||
|
|
|
|||
|
|
@ -167,8 +167,7 @@ export default class SalaryFile extends React.Component {
|
|||
// 搜索
|
||||
handleSearch(value) {
|
||||
const { salaryFileStore: {getTableDatas, form}} = this.props;
|
||||
form.updateFields({username: value})
|
||||
getTableDatas()
|
||||
getTableDatas({username: value})
|
||||
}
|
||||
|
||||
// 初始化导入参数
|
||||
|
|
@ -326,6 +325,7 @@ export default class SalaryFile extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChange(value)},
|
||||
total: pageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: pageInfo.pageNum
|
||||
}}
|
||||
scroll={{x: 2300}}
|
||||
|
|
|
|||
|
|
@ -39,18 +39,6 @@ export default class SalaryItemChangeList extends React.Component {
|
|||
if(singleSalaryItemList.columns) {
|
||||
columns = [...singleSalaryItemList.columns]
|
||||
}
|
||||
if(columns.length > 0) {
|
||||
columns.push({
|
||||
title: '操作',
|
||||
key: "cz",
|
||||
dataIndex: "cz",
|
||||
render: (text, record) => {
|
||||
return (
|
||||
<a onClick={() => {this.handleEdit(record)}}>编辑</a>
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
return columns
|
||||
}
|
||||
|
||||
|
|
@ -70,6 +58,7 @@ export default class SalaryItemChangeList extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChange(value)},
|
||||
total: singleSalaryItemList.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: singleSalaryItemList.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ export default class SlideAgent extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChange(value)},
|
||||
total: taxAgentList.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: taxAgentList.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ export default class SlideSalaryItem extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChange(value)},
|
||||
total: salaryItemList.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: salaryItemList.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -38,18 +38,6 @@ export default class TaxAgentChangeList extends React.Component {
|
|||
if(singleTaxAgentList.columns) {
|
||||
columns = [...singleTaxAgentList.columns]
|
||||
}
|
||||
if(columns.length > 0) {
|
||||
columns.push({
|
||||
title: '操作',
|
||||
key: "cz",
|
||||
dataIndex: "cz",
|
||||
render: (text, record) => {
|
||||
return (
|
||||
<a onClick={() => {this.handleEdit(record)}}>编辑</a>
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
return columns
|
||||
}
|
||||
|
||||
|
|
@ -71,6 +59,7 @@ export default class TaxAgentChangeList extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChange(value)},
|
||||
total: singleTaxAgentList.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: singleTaxAgentList.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ export default class DeleteSalaryItemModal extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handleDataPageChange(value)},
|
||||
total: canDeleteList.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: canDeleteList.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -309,6 +309,7 @@ export default class SalaryItem extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChnage(value)},
|
||||
total: pageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: pageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -113,14 +113,16 @@ export default class Archives extends React.Component {
|
|||
|
||||
// 导入
|
||||
handleImport(params) {
|
||||
const { archivesStore: {importBatch}} = this.props;
|
||||
const { archivesStore: {importBatch, initImportParams}} = this.props;
|
||||
importBatch(params)
|
||||
|
||||
}
|
||||
|
||||
// 导入完成
|
||||
handleFinish() {
|
||||
const { archivesStore: {getTableDatas}} = this.props;
|
||||
this.setState({importVisible: false})
|
||||
const { archivesStore: {getTableDatas, initImportParams}} = this.props;
|
||||
initImportParams()
|
||||
this.setState({importVisible: false, step: 0})
|
||||
getTableDatas()
|
||||
}
|
||||
|
||||
|
|
@ -137,11 +139,21 @@ export default class Archives extends React.Component {
|
|||
this.setState({ selectedRowKeys });
|
||||
}
|
||||
|
||||
// 关闭导入框
|
||||
handleImportCancel() {
|
||||
const { archivesStore: {initImportParams, getTableDatas }} = this.props;
|
||||
|
||||
initImportParams()
|
||||
if(this.state.step == 2) {
|
||||
getTableDatas()
|
||||
}
|
||||
this.setState({importVisible: false, step: 0});
|
||||
}
|
||||
render() {
|
||||
const { archivesStore } = this.props;
|
||||
const { selectedTab, selectedRowKeys } = this.state;
|
||||
const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd,
|
||||
previewCurDataColumns, previewCurDataDataSource, importResult
|
||||
previewCurDataColumns, previewCurDataDataSource, importResult, initImportParams
|
||||
} = archivesStore;
|
||||
const { dataSource, pageInfo } = archivesStore
|
||||
if (!hasRight && !loading) { // 无权限处理
|
||||
|
|
@ -255,6 +267,7 @@ export default class Archives extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChnage(value)},
|
||||
total: pageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: pageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
@ -320,10 +333,13 @@ export default class Archives extends React.Component {
|
|||
importResult={importResult}
|
||||
onFinish={() => {this.handleFinish()}}
|
||||
previewImport={(params) => {this.handlePreviewImport(params)}}
|
||||
importFile={(params) => {this.handleImport(params)}}
|
||||
importFile={(params) => {this.handleImport(params);}}
|
||||
templateLink={() => {this.handleTemplateLinkClick()}}
|
||||
visiable={this.state.importVisible}
|
||||
onCancel={() => { this.setState({importVisible: false})}}
|
||||
onCancel={() => {
|
||||
this.handleImportCancel()
|
||||
|
||||
}}
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -274,30 +274,10 @@ export default class Programme extends React.Component {
|
|||
|
||||
}
|
||||
|
||||
const renderSearchOperationItem = () => {
|
||||
return <div>
|
||||
<Button type="primary" style={{ marginRight: '10px' }} onClick={() => {
|
||||
if(selectedKey == "custom") {
|
||||
handleCustomNewClick()
|
||||
} else {
|
||||
handleNewClick()
|
||||
}
|
||||
|
||||
}}>新建</Button>
|
||||
|
||||
{
|
||||
selectedKey == "custom" && <WeaSelect
|
||||
options={options}
|
||||
value={customSelectkey}
|
||||
style={{width: "150px"}}
|
||||
onChange={(v, showname) => {
|
||||
setCustomSelectkey(v)
|
||||
getCustomCategoryList(v)
|
||||
}}
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
// const renderSearchOperationItem = () => {
|
||||
// const { programmeStore: {setCustomSelectkey, getCustomCategoryList}} = this.props;
|
||||
// return
|
||||
// }
|
||||
|
||||
const handleOnSave = () => {
|
||||
const { programmeStore } = this.props
|
||||
|
|
@ -362,7 +342,29 @@ export default class Programme extends React.Component {
|
|||
>
|
||||
<CustomTab topTab={topTab}
|
||||
searchOperationItem={
|
||||
renderSearchOperationItem()
|
||||
<div>
|
||||
<Button type="primary" style={{ marginRight: '10px' }} onClick={() => {
|
||||
if(selectedKey == "custom") {
|
||||
handleCustomNewClick()
|
||||
} else {
|
||||
handleNewClick()
|
||||
}
|
||||
|
||||
}}>新建</Button>
|
||||
|
||||
{
|
||||
selectedKey == "custom" && <WeaSelect
|
||||
options={options}
|
||||
value={customSelectkey}
|
||||
style={{width: "150px"}}
|
||||
onChange={(v) => {
|
||||
setCustomSelectkey(v)
|
||||
getCustomCategoryList(v)
|
||||
console.log("v:", v)
|
||||
}}
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
onChange={(v) => {
|
||||
setSelectedKey(v)
|
||||
|
|
@ -396,6 +398,7 @@ export default class Programme extends React.Component {
|
|||
pagination={{
|
||||
onChange: (value) => {this.handlePageChange(value)},
|
||||
total: tablePageInfo.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
current: tablePageInfo.pageNum
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@ export default class AbnormalDrawer extends Component {
|
|||
loading={loading}
|
||||
pagination={{
|
||||
onChange: (value) => {this.props.onPageChange(value)},
|
||||
total: this.props.total
|
||||
total: this.props.total,
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
}}
|
||||
rowSelection={rowSelection}
|
||||
scroll={{ x: 1200 }}
|
||||
|
|
|
|||
|
|
@ -133,20 +133,15 @@ export default class NormalIndex extends Component {
|
|||
...it,
|
||||
width: 150,
|
||||
fixed: "left",
|
||||
|
||||
render: (text, r) => {
|
||||
const { userName, employeeId } = r;
|
||||
return (
|
||||
<WeaPopoverHrm>
|
||||
<a
|
||||
href={`javaScript:openhrm(${employeeId});`}
|
||||
onClick={(e) => window.pointerXY(e)}
|
||||
title={userName}>
|
||||
{userName}
|
||||
</a>
|
||||
</WeaPopoverHrm>
|
||||
<span>{userName}</span>
|
||||
);
|
||||
},
|
||||
};
|
||||
it.title = "姓名"
|
||||
}
|
||||
return {
|
||||
...it,
|
||||
|
|
@ -179,17 +174,11 @@ export default class NormalIndex extends Component {
|
|||
render: (text, r) => {
|
||||
const { userName, employeeId } = r;
|
||||
return (
|
||||
<WeaPopoverHrm>
|
||||
<a
|
||||
href={`javaScript:openhrm(${employeeId});`}
|
||||
onClick={(e) => window.pointerXY(e)}
|
||||
title={userName}>
|
||||
{userName}
|
||||
</a>
|
||||
</WeaPopoverHrm>
|
||||
<span>{userName}</span>
|
||||
);
|
||||
},
|
||||
};
|
||||
it.title = "姓名"
|
||||
}
|
||||
return {
|
||||
...it,
|
||||
|
|
|
|||
|
|
@ -39,6 +39,14 @@ export class ArchivesStore {
|
|||
@observable previewCurDataDataSource = []
|
||||
@observable importResult = {}
|
||||
|
||||
@action
|
||||
initImportParams = () => {
|
||||
this.previewCurDataList = {};
|
||||
this.previewCurDataColumns = [];
|
||||
this.previewCurDataDataSource = [];
|
||||
this.importResult = {}
|
||||
}
|
||||
|
||||
|
||||
// ** 设置导入参数 start **
|
||||
@action
|
||||
|
|
@ -232,13 +240,18 @@ export class ArchivesStore {
|
|||
// 导入
|
||||
@action
|
||||
importBatch = (params) => {
|
||||
API.importBatch(params).then(res => {
|
||||
if(res.status) {
|
||||
this.importResult = res.data
|
||||
} else {
|
||||
message.error(res.errormsg || "导入失败")
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
API.importBatch(params).then(res => {
|
||||
if(res.status) {
|
||||
this.importResult = res.data
|
||||
resolve();
|
||||
} else {
|
||||
message.error(res.errormsg || "导入失败")
|
||||
reject();
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
// 导出档案
|
||||
|
|
|
|||
|
|
@ -408,8 +408,8 @@ export class AttendanceStore {
|
|||
|
||||
// 考勤数据详情
|
||||
@action
|
||||
viewAttendQuote = (ids) => {
|
||||
API.viewAttendQuote(ids).then(res => {
|
||||
viewAttendQuote = (params = {}) => {
|
||||
API.viewAttendQuote(params).then(res => {
|
||||
if(res.status) {
|
||||
this.attendQuoteDetailPageInfo = res.data.pageInfo
|
||||
this.attendQuoteDetailTableStore.getDatas(res.data.dataKey.datas)
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@ export class ProgrammeStore {
|
|||
@observable tableColumns = [];
|
||||
@observable tablePageInfo = {};
|
||||
|
||||
|
||||
@action
|
||||
setCustomSelectkey = customSelectkey => this.customSelectkey = customSelectkey
|
||||
|
||||
@action
|
||||
setCustomRequest = customRequest => this.customRequest = customRequest
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,8 @@ export class TaxAgentStore {
|
|||
return new Promise((resolve, reject) => {
|
||||
API.getTaxAgentSelectList().then(action(res => {
|
||||
if(res.status) {
|
||||
this.taxAgentOption = res.data.list.map(item => {return {key: item.id, showname: item.content}})
|
||||
let options = res.data.list.map(item => {return {key: item.id, showname: item.content}})
|
||||
this.taxAgentOption = options
|
||||
resolve()
|
||||
} else {
|
||||
message.error(res.errormsg || "获取失败")
|
||||
|
|
|
|||
Loading…
Reference in New Issue