diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/baseLayout.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/baseLayout.js
index 30414232..2a24b7be 100644
--- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/baseLayout.js
+++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/baseLayout.js
@@ -35,7 +35,7 @@ class Layout extends Component {
init = async () => {
const [{ data: fycdgsOptions }, { data: taxAgentList }] = await Promise.all([
getffgsAllList(),
- postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+ postFetch("/api/bs/hrmsalary/taxAgent/listAll", { filterType: "QUERY_DATA" })
]);
this.setState({
conditions: _.map(baseConditions, item => ({
diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js
index 4c369fe6..e9bc5ee1 100644
--- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js
+++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js
@@ -37,9 +37,10 @@ class Layout extends Component {
render() {
const {
- title, query, onChange, listRef, isQuery, lyAuth = false, ffgsqcLabel, taxAgentStore: { salaryManager },
- companyOpts, costCompanyOpts, fycdgsqcLabel, queryDateLabel
+ title, query, onChange, listRef, isQuery, lyAuth = false, ffgsqcLabel, companyOpts, costCompanyOpts,
+ taxAgentStore: { salaryManager, PageAndOptAuth }, fycdgsqcLabel, queryDateLabel
} = this.props, { options } = this.state;
+ const { lyCanGenDel } = PageAndOptAuth;
const { salaryMonth, ffgsqc, fycdgsqc, jtStatus, ffStatus } = query;
let buttons = [
,
@@ -51,7 +52,7 @@ class Layout extends Component {
const dropMenuDatas = [
{ key: "EXPORTALL", icon: , content: getLabel(81272, "导出全部") }
];
- !salaryManager && (buttons = buttons.slice(2));
+ !lyCanGenDel && (buttons = buttons.slice(2));
(lyAuth || salaryManager) && buttons.unshift();
return (
diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryPaymentReport/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryPaymentReport/index.js
index b3ac9aab..e52d794e 100644
--- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryPaymentReport/index.js
+++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryPaymentReport/index.js
@@ -27,7 +27,8 @@ class Index extends Component {
WeaLoadingGlobal.start();
const payload = {
...form.getFormParams(),
- fycdgsqc: form.getFormParams().fycdgsqc ? form.getFormParams().fycdgsqc.split(",") : []
+ fycdgsqc: form.getFormParams().fycdgsqc ? form.getFormParams().fycdgsqc.split(",") : [],
+ taxAgentIds: form.getFormParams().taxAgentIds ? form.getFormParams().taxAgentIds.split(",") : []
};
const promise = await exportffReportList(payload);
};
diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryStatisticsReport/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryStatisticsReport/index.js
index 61f4e72a..2d0f3ca0 100644
--- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryStatisticsReport/index.js
+++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryStatisticsReport/index.js
@@ -27,7 +27,8 @@ class Index extends Component {
WeaLoadingGlobal.start();
const payload = {
...form.getFormParams(),
- fycdgsqc: form.getFormParams().fycdgsqc ? form.getFormParams().fycdgsqc.split(",") : []
+ fycdgsqc: form.getFormParams().fycdgsqc ? form.getFormParams().fycdgsqc.split(",") : [],
+ taxAgentIds: form.getFormParams().taxAgentIds ? form.getFormParams().taxAgentIds.split(",") : []
};
const promise = await exportSalaryDepartmentReportList(payload);
};
diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryTaxReturnForm/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryTaxReturnForm/index.js
index 92874aba..c4b7ce83 100644
--- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryTaxReturnForm/index.js
+++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salaryTaxReturnForm/index.js
@@ -27,7 +27,8 @@ class Index extends Component {
WeaLoadingGlobal.start();
const payload = {
...form.getFormParams(),
- fycdgsqc: form.getFormParams().fycdgsqc ? form.getFormParams().fycdgsqc.split(",") : []
+ fycdgsqc: form.getFormParams().fycdgsqc ? form.getFormParams().fycdgsqc.split(",") : [],
+ taxAgentIds: form.getFormParams().taxAgentIds ? form.getFormParams().taxAgentIds.split(",") : []
};
const promise = await exportbsReportList(payload);
};