diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 912e2ebe..7b5cf863 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -66,57 +66,9 @@ let getLocaleLabel = WeaLocaleProvider.getLocaleLabel.bind(this, "hrmSalary"); getLocaleLabel = function (nextState, replace, callback) { callback(); }; - -const Home = (props) => props.children; - const SocialSecurityBenefits = (props) => props.children; const DataAcquisition = (props) => props.children; -// historicalPayroll 历史工资单查看 -// salaryAdjustmentRecords 调薪记录查看 - -// mySalaryMobile 我的薪资福利-移动端 -// mySalaryMobile 我的薪资福利-移动端 -// mySalary 我的薪资福利 -// mySalaryView 我的薪资福利-查看工资单 -// socialSecurityBenefits 社保福利 -// programme 社保福利方案 -// archives 社保福利档案 -// standingBook 社保福利台账 -// sbofflineComparison 社保福利台账线下对比 -// salaryItem 薪资项目管理 -// salaryFile 薪资档案 -// dataAcquisition 数据采集 -// CumDeduct 累计专项附加扣除 -// otherDeduct 其他免税扣除 -// cumSituation 往期累计情况 -// attendance 考勤引用 -// specialAddDeduction 专项附件扣除 -// ledger 薪资账套 -// calculate 薪资核算 -// calculateDetail 核算详情 -// DoCalcDetail 核算详情页面-新 -// CalcView 核算查看页面-新 -// OfflineCompare 薪资核算线下对比-新 -// placeOnFileDetail 核算归档详情 -// compareDetail 线下线上对比 -// payroll 工资单发放 -// declare 个税申报表 -// generateDeclarationDetail 个税单详情 -// taxRate 个税税率表 -// taxAgent 个税扣缴义务人 -// mobilepayroll 移动端工资单 -// sysconfig 系統配置 -// sysconfig-1 规则配置 -// appconfig 应用配置 -// fieldManagement 字段管理 -// analysisOfSalaryStatistics 薪酬统计分析 -// reportView 薪酬报表查看 -// externalPersonManage 非系统人员管理 -// adjustSalaryManage 档案管理 -// supplementaryCalc 补算 -// variableSalary 浮动薪酬 - const Routes = ( diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js index bfee4532..bcacf2ec 100644 --- a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js +++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js @@ -65,9 +65,10 @@ class Index extends Component { this.setState({ name: nextProps.name, selectedKey: nextProps.selectedKey || "baseinfo" }, () => { - this.state.selectedKey === "auth.MemberTargetTypeEnum" && this.getEnumList(); - this.state.selectedKey === "auth.MemberTargetTypeEnum" && this.getSettingRoler(nextProps.roleId); + !["auth.AuthTargetTypeEnum", "baseinfo"].includes(this.state.selectedKey) && this.getEnumList(); + !["auth.AuthTargetTypeEnum", "baseinfo"].includes(this.state.selectedKey) && this.getSettingRoler(nextProps.roleId); this.state.selectedKey === "baseinfo" && this.getRole(nextProps.roleId); + this.state.selectedKey === "auth.DataTargetTypeEnum" && this.getConnectSymbol(); }); } else { this.setState({ diff --git a/pc4mobx/hrmSalary/pages/roleManagement/index.js b/pc4mobx/hrmSalary/pages/roleManagement/index.js index 0e4f7fb2..b9a95a6d 100644 --- a/pc4mobx/hrmSalary/pages/roleManagement/index.js +++ b/pc4mobx/hrmSalary/pages/roleManagement/index.js @@ -26,7 +26,7 @@ class Index extends Component { this.state = { query: { name: "" }, dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false, selectedRowKeys: [], addRoleDialog: { taxAgentId: "", visible: false }, - roleSetDialog: { visible: false, roleId: "", name: "" } + roleSetDialog: { visible: false, roleId: "", name: "", selectedKey: "" } }; } @@ -44,7 +44,26 @@ class Index extends Component { const { list: dataSource, columns, pageNum: current, pageSize, total } = data; this.setState({ dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, - columns: [...columns, { + columns: [..._.map(columns, o => { + if ( + o.dataIndex === "resources" || o.dataIndex === "members" || + o.dataIndex === "opts" || o.dataIndex === "datas" + ) { + const tabsKey = { + resources: "baseinfo", + members: "auth.MemberTargetTypeEnum", + opts: "auth.AuthTargetTypeEnum", + datas: "auth.DataTargetTypeEnum" + }; + return { + ...o, render: (text, record) => ( + this.showRoleSetDialog({ + ...record, selectedKey: tabsKey[o.dataIndex] + })}>{text}) + }; + } + return { ...o }; + }), { title: getLabel(111, "操作"), width: 150, dataIndex: "action", render: (__, record) => ( diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js index 1035015a..c7ee09b6 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js @@ -60,8 +60,9 @@ class Index extends Component { getList = (props) => { const { programmeStore: { planSearchForm }, selectedKey: welfareTypeEnum, customQuery, - taxAgentStore: { showOperateBtn } + taxAgentStore: { PageAndOptAuth } } = props; + const showOperateBtn = PageAndOptAuth.opts.includes("admin"); const { pageInfo } = this.state; const originPayload = { ...pageInfo, welfareTypeEnum }, customPayload = { welfareTypeEnum: customQuery }, welfarePayload = { ...planSearchForm.getFormParams() }; @@ -239,7 +240,8 @@ class Index extends Component { render() { const { dataSource, columns, pageInfo, loading, copyDialog, customDialog, welfarePlanEditSlide } = this.state; - const { selectedKey, taxAgentStore: { showOperateBtn } } = this.props; + const { selectedKey, taxAgentStore: { PageAndOptAuth } } = this.props; + const showOperateBtn = PageAndOptAuth.opts.includes("admin"); const pagination = { ...pageInfo, showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js index 4f7028ad..69382697 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js @@ -62,7 +62,8 @@ class Index extends Component { }; render() { - const { taxAgentStore: { showOperateBtn } } = this.props; + const { taxAgentStore: { PageAndOptAuth } } = this.props; + const showOperateBtn = PageAndOptAuth.opts.includes("admin"); const { logDialogVisible, filterConditions, selectedKey, showSearchAd, isQuery, customQuery } = this.state; const tabs = _.map(tabWelfarePlanList, o => ({ ...o, title: getLabel(o.lanId, o.title) })); return (