@@ -204,60 +222,63 @@ export default class CompareDetail extends React.Component {
);
};
return (
-
-
-
-
-
{getLabel(18125, "公式")}=
-
{getLabel(543280, "系统值")}；{getLabel(543281, "线下值")}；{getLabel(543282, "差值")}
+
+
+
+
+
+ {getLabel(18125, "公式")}=
+ {getLabel(543280, "系统值")}；{getLabel(543281, "线下值")}；{getLabel(543282, "差值")}
+
-
- {
- this.pageInfo.current = value;
- this.handleDataPageChange(value);
- }}
- onShowSizeChange={(current, pageSize) => {
- this.pageInfo = { current, pageSize };
- this.handleShowSizeChange(this.pageInfo);
- }}
- />
-
+
+ {
+ this.pageInfo.current = value;
+ this.handleDataPageChange(value);
+ }}
+ onShowSizeChange={(current, pageSize) => {
+ this.pageInfo = { current, pageSize };
+ this.handleShowSizeChange(this.pageInfo);
+ }}
+ />
+
- {
- importModalVisible && {
- this.handleComparisonFinish();
- }}
- onCancel={() => {
- this.setState({
- importModalVisible: false
- });
- }}
- />
- }
-
+ {
+ importModalVisible &&
{
+ this.handleComparisonFinish();
+ }}
+ onCancel={() => {
+ this.setState({
+ importModalVisible: false
+ });
+ }}
+ />
+ }
+
+
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
index f2b10150..8e68aa1d 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -17,8 +17,10 @@ import {
import { convertToUrlString, getQueryString } from "../../util/url";
import AcctResultImportModal from "./acctResult/importModal/acctResultImportModal";
import ProgressModal from "../../components/progressModal";
+import { salaryacctAcctresultCheckAuth } from "../../apis/calculate";
import Authority from "../mySalary/authority";
+
const { ButtonSelect } = WeaDropdown;
const getLabel = WeaLocaleProvider.getLabel;
@inject("calculateStore", "salaryFileStore", "taxAgentStore")
@@ -43,23 +45,39 @@ export default class CalculateDetail extends React.Component {
progressVisible: false,
progress: 0,
accountIds: [],
- accountExceptInfo: ""
+ accountExceptInfo: "",
+ calculateAuth: false
};
this.id = "";
this.timer = null;
}
- componentWillMount() {
+ async componentWillMount() {
let id = getQueryString("id");
this.id = id;
const { calculateStore: { checkTaxAgent }, salaryFileStore } = this.props;
const { commonEnumList } = salaryFileStore;
+ this.salaryacctAcctresultCheckAuth({ salaryAcctRecordId: id });
checkTaxAgent(this.id);
let modalParam = { ...this.state.modalParam, salaryAcctRecordId: id };
this.setState({ modalParam });
commonEnumList("user", { enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" });
}
+ salaryacctAcctresultCheckAuth = (params) => {
+ const { taxAgentStore: { getPermission } } = this.props;
+ getPermission().then(({ data }) => {
+ const { isOpenDevolution } = data;
+ if (isOpenDevolution) {
+ salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
+ this.setState({ calculateAuth: data && status });
+ });
+ } else {
+ this.setState({ calculateAuth: true });
+ }
+ });
+ };
+
Input = (value, key) => {
const { employeeName, workcode } = this.state.searchItemsValue;
return (
@@ -273,7 +291,7 @@ export default class CalculateDetail extends React.Component {
};
render() {
- const { selectedKey, acctResultImportVisiable, showSearchAd } = this.state;
+ const { selectedKey, acctResultImportVisiable, showSearchAd, calculateAuth } = this.state;
const { taxAgentStore: { payrollPermission } } = this.props;
const menu = (
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
index 607d2d42..0f85d51d 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
@@ -33,7 +33,8 @@ export default class PhoneTemplate extends React.Component {
}
componentDidMount() {
- if (this.props.isMsgPreview && this.props.salaryItemSet && window.em) {
+ // && window.em
+ if (this.props.isMsgPreview && this.props.salaryItemSet) {
this.setState({
salaryItemSet: JSON.parse(this.props.salaryItemSet),
salaryTemplateShowSet: JSON.parse(this.props.salaryTemplateShowSet)
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js b/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js
index 1711e103..9e986510 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js
@@ -1,10 +1,10 @@
import React from "react";
import { inject, observer } from "mobx-react";
-import { Radio, Spin } from "antd";
-import { WeaTableNew } from "comsMobx";
-
-const WeaTable = WeaTableNew.WeaTable;
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { toJS } from "mobx";
+import { Dropdown, Menu, Radio, Spin } from "antd";
+const getLabel = WeaLocaleProvider.getLabel;
@inject("payrollStore")
@observer
export default class TemplateSettingList extends React.Component {
@@ -15,23 +15,23 @@ export default class TemplateSettingList extends React.Component {
}
// 编辑操作按钮
- onEdit(record) {
+ onEdit = (record) => {
this.props.onEdit && this.props.onEdit(record);
- }
+ };
// 复制操作按钮
- onCopy(record) {
+ onCopy = (record) => {
this.props.onCopy && this.props.onCopy(record);
- }
+ };
// 删除操作按钮
- onDelete(record) {
+ onDelete = (record) => {
this.props.onDelete && this.props.onDelete(record);
- }
+ };
// 操作按钮
- onOperatesClick = (record, index, operate, flag) => {
- switch (operate.index.toString()) {
+ onOperatesClick = (record, operate) => {
+ switch (operate) {
case "0": // 编辑
this.onEdit(record);
break;
@@ -45,21 +45,22 @@ export default class TemplateSettingList extends React.Component {
};
// 默认使用配置
- recordItemChange(record) {
+ recordItemChange = (record) => {
const { payrollStore } = this.props;
const { changePayrollDefaultUse, getPayrollTemplateList } = payrollStore;
changePayrollDefaultUse(record.id).then(() => {
getPayrollTemplateList();
});
- }
+ };
// 增加编辑功能，重写columns绑定事件
- getColumns = columns => {
- const { showOperateBtn } = this.props;
- let newColumns = "";
- newColumns = columns.map(column => {
+ getColumns = () => {
+ const { showOperateBtn, payrollStore } = this.props;
+ const { templateTableColumns: columns } = payrollStore;
+ let newColumns = [];
+ newColumns = _.filter(toJS(columns), item => item.dataIndex !== "id").map(column => {
let newColumn = column;
- newColumn.render = (text, record, index) => {
+ newColumn.render = (text, record) => {
//前端元素转义
let valueSpan =
record[newColumn.dataIndex + "span"] !== undefined
@@ -70,10 +71,8 @@ export default class TemplateSettingList extends React.Component {
return (
{
- this.recordItemChange(record);
- }}
+ checked={record.useType === "1"}
+ onChange={() => this.recordItemChange(record)}
/>
);
default:
@@ -82,25 +81,79 @@ export default class TemplateSettingList extends React.Component {
};
return newColumn;
});
- return newColumns;
+ return [
+ ...newColumns,
+ {
+ dataIndex: "operate",
+ title: getLabel(30585, "操作"),
+ width: 150,
+ render: (_, record) => {
+ return
+ this.onOperatesClick(record, "0")}>{getLabel(501169, "编辑")}
+ this.onOperatesClick(record, "1")}>{getLabel(77, "复制")}
+ this.onOperatesClick(record, "2")}>
+ {getLabel(535052, "删除")}
+
+ }>
+
+
+ ;
+ }
+ }
+ ];
};
render() {
const { payrollStore } = this.props;
- const { templateStore, loading } = payrollStore;
+ const {
+ templateTableDataSource,
+ loading,
+ templateTablePageInfo,
+ setTemplateTablePageInfo,
+ getPayrollTemplateList,
+ templateTableSelectedRowKeys,
+ setTemplateTableSelectedRowKeys
+ } = payrollStore;
+ const pagination = {
+ ...templateTablePageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ setTemplateTablePageInfo({ ...templateTablePageInfo, current, pageSize }, () => {
+ getPayrollTemplateList();
+ });
+ },
+ onChange: current => {
+ setTemplateTablePageInfo({ ...templateTablePageInfo, current }, () => {
+ getPayrollTemplateList();
+ });
+ }
+ };
+ const rowSelection = {
+ selectedRowKeys: toJS(templateTableSelectedRowKeys),
+ onChange: selectedRowKeys => setTemplateTableSelectedRowKeys(selectedRowKeys)
+ };
return (
- {loading
- ?
-
-
- :
}
+ {
+ loading
+ ?
+
+
+ :
+ }
+
水印预览效果
+
水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果
+
水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果
+
水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果
+
水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果
+
水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果
+
水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果
+