diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index 009a9bd8..1284435f 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -291,4 +291,8 @@ export const updateSobConfig = params => { return WeaTools.callApi("/api/bs/hrmsalary/salaryacct/updateSobConfig", "GET", params); }; +// 2025-12-11 核算人员--环比上月实发工资差额列表 +export const getGzceList = params => { + return postFetch("/api/bs/hrmsalary/salaryacct/getGzceList/list", params); +}; diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js index 2c37805d..18f5c324 100644 --- a/pc4mobx/hrmSalary/apis/declare.js +++ b/pc4mobx/hrmSalary/apis/declare.js @@ -39,3 +39,8 @@ export const withDrawTaxDeclaration = (params) => { }; +//个税申报表-批量撤回申报 +export const batchDeleteTaxDeclaration = (params) => { + return postFetch("/api/bs/hrmsalary/taxdeclaration/batchDeleteTaxDeclaration", params); +}; + diff --git a/pc4mobx/hrmSalary/pages/calculate/calcView/index.js b/pc4mobx/hrmSalary/pages/calculate/calcView/index.js index 6728c9a1..07e779f3 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calcView/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/calcView/index.js @@ -6,10 +6,11 @@ */ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; -import { WeaLocaleProvider, WeaTop } from "ecCom"; -import { Dropdown, Menu, message } from "antd"; +import { WeaLocaleProvider, WeaTop, WeaReqTop } from "ecCom"; +import {Button, Dropdown, Menu, message} from "antd"; import Layout from "../doCalc/layout"; import SalaryEditCalc from "../doCalc/components/salaryEditCalc"; +import SalaryCalcPersonConfirm from "../doCalc/components/salaryCalcPersonConfirm"; import AdvanceInputBtn from "../doCalc/components/advanceInputBtn"; import { convertToUrlString } from "../../../util/url"; import { getExportField } from "../../../apis/calculate"; @@ -24,6 +25,7 @@ class Index extends Component { constructor(props) { super(props); this.state = { + selectedKey: "person", showChildren: false, customExpDialog: { visible: false, salaryAcctRecordId: "", checkItems: [], itemsByGroup: [] } }; @@ -67,9 +69,50 @@ class Index extends Component { break; } }; - + renderReqBtns = () => { + const { selectedKey} = this.state; + let reqBtns = []; + switch (selectedKey) { + case "calc": + reqBtns = [ + this.handleMenuClick({ key: "exportAll" })} + overlay={ this.handleMenuClick(e)}> + {getLabel(543715, "导出所选")} + {getLabel(544270, "自定义导出")} + }>{getLabel(81272, "导出全部")}, + this.calc.openAdvanceSearch()} + onAdvanceSearch={() => this.calc.onAdSearch(false)} + /> + ]; + break; + default: + break; + } + return reqBtns; + }; + renderContent = () => { + const { selectedKey } = this.state; + let dom = null; + switch (selectedKey) { + case "person": + dom = ; + break; + case "calc": + dom = this.calc = dom}/>; + break; + default: + break; + } + return dom; + }; render() { - const { showChildren, customExpDialog } = this.state; + const tabs = [ + { key: "person", title: getLabel(543547, "人员确认") }, + { key: "calc", title: getLabel(538011, "薪资核算") } + ]; + const { calculateStore: { setOtherConditions } } = this.props; + const { showChildren, customExpDialog,selectedKey} = this.state; const btns = [ this.handleMenuClick({ key: "exportAll" })} @@ -83,11 +126,14 @@ class Index extends Component { ]; return ( - } iconBgcolor="#F14A2D" - showDropIcon={false} buttons={btns} - > -
- {showChildren && this.calc = dom}/>} +
+ } iconBgcolor="#F14A2D" + onChange={key => this.setState({ selectedKey: key }, () => setOtherConditions([]))} + buttons={this.renderReqBtns()} + > +
{this.renderContent()}
{/* 薪资核算-自定义导出*/} -
- + +
); } diff --git a/pc4mobx/hrmSalary/pages/calculate/calcView/index.less b/pc4mobx/hrmSalary/pages/calculate/calcView/index.less index 182d61f0..12e51bb0 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calcView/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/calcView/index.less @@ -1,8 +1,28 @@ -.salary-calculate-view { +.salary-calculate-do-calc { + min-width: 1000px; + overflow: auto; width: 100%; height: 100%; - background-color: #f1f1f1; - position: relative; - z-index: 0; - padding: 8px 16px; + background: #f6f6f6; + + .icon-jinggao { + color: red; + font-size: 20px; + margin-right: 10px; + cursor: pointer; + } + + .wea-new-top-req { + z-index: 0 !important; + } + + .wea-new-top-req-wapper .wea-new-top-req-title > div:last-child { + right: 16px; + } + + .salary-calculate-view { + padding: 8px 16px; + height: 100%; + } } + diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index 3a7b563d..376c4a7e 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -6,8 +6,7 @@ */ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; -import { WeaLocaleProvider, WeaTools, WeaTop } from "ecCom"; -import { WeaForm } from "comsMobx"; +import { WeaLocaleProvider, WeaTop } from "ecCom"; import { Button, message, Modal } from "antd"; import moment from "moment"; import CalculateQuery from "./components/calculateQuery"; @@ -16,15 +15,9 @@ import CalculateDialog from "./components/calculateDialog"; import ProgressModal from "../../components/progressModal"; import LogDialog from "../../components/logViewModal"; import { backCalculate, deleteSalaryacct, fileSalaryAcct, reAccounting } from "../../apis/calculate"; -import FormInfo from "../../components/FormInfo"; -import { queryConditions } from "./config"; -import { postFetch } from "../../util/request"; -import cs from "classnames"; import "./index.less"; -const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel; -const form = new WeaForm(); @inject("calculateStore", "taxAgentStore") @observer @@ -37,33 +30,19 @@ class Calculate extends Component { dateRange: [ moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).endOf("year").format("YYYY-MM") - ] - }, isRefresh: false, logDialogVisible: false, conditions: [], + ], + status:"", + }, isRefresh: false, logDialogVisible: false, progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") }, - calcDaialog: { visible: false, title: "" }, showAdvance: false + calcDaialog: { visible: false, title: "" } }; this.timer = null; this.handleDebounce = null; } - async componentDidMount() { - const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" }); - this.setState({ - conditions: _.map(queryConditions, item => ({ - ...item, items: _.map(item.items, o => { - o = { ...o, label: getLabel(o.lanId, o.label) }; - if (getKey(o) === "taxAgentIds") { - return { ...o, options: _.map(data, k => ({ key: k.id + "", showname: k.name })) }; - } - return { ...o }; - }) - })) - }, () => form.initFormFields(this.state.conditions)); - } - renderCalculateOpts = () => { const { taxAgentStore: { PageAndOptAuth } } = this.props; - const { queryParams, isRefresh, showAdvance } = this.state; + const { queryParams, isRefresh } = this.state; const admin = PageAndOptAuth.opts.includes("admin"); let calculateOpts = [ , - this.setState({ showAdvance: !showAdvance })} - onChange={v => this.setState({ - isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh, - queryParams: { ...queryParams, ...v } - })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/> + this.setState({ + isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh, + queryParams: { ...queryParams, ...v } + })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/> ]; return !admin ? calculateOpts.slice(1) : calculateOpts; }; @@ -212,9 +190,7 @@ class Calculate extends Component { }; render() { - const { - queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions, conditions, showAdvance - } = this.state; + const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions } = this.state; return ( } iconBgcolor="#F14A2D" buttons={this.renderCalculateOpts()} className="calculate-main-layout" showDropIcon @@ -226,18 +202,7 @@ class Calculate extends Component { } ]}>
-
- -
- - - -
-
- + this.setState({ calcDaialog: { ...calcDaialog, visible: false }, diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js index 0c74ccd5..0cb64a6c 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js @@ -5,7 +5,7 @@ * Date: 2023/10/9 */ import React, { Component } from "react"; -import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; +import {WeaInputSearch, WeaLocaleProvider, WeaSelect} from "ecCom"; import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide"; const getLabel = WeaLocaleProvider.getLabel; @@ -13,7 +13,7 @@ const getLabel = WeaLocaleProvider.getLabel; class Index extends Component { render() { const { queryParams } = this.props; - const { dateRange, name } = queryParams; + const { dateRange, name, status } = queryParams; return (
@@ -21,14 +21,21 @@ class Index extends Component { this.props.onChange({ dateRange: v })}/>
-
- this.props.onChange({ name: v })} - onSearch={this.props.onSearch} - /> - {getLabel(111, "高级搜索")} +
+ 状态： + this.props.onChange({ status: v })} + viewAttr={2} + value={status} + options={[{"key": "0","selected": true,"showname": ""}, {"key": "1","selected": false,"showname": "未归档"}, {"key": "2","selected": false,"showname": "已归档"}, {"key": "3","selected": false,"showname": "已申报"}]} />
+ this.props.onChange({ name: v })} + onSearch={this.props.onSearch} + />
); } diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js index 0b4ea0a0..6a57a7f5 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js @@ -29,14 +29,12 @@ class Index extends Component { } getSalaryAcctList = (props) => { - const { pageInfo } = this.state, { queryParams, form } = props; - const { taxAgentIds } = form.getFormParams(); - const { dateRange, ...extra } = queryParams; + const { pageInfo } = this.state; + const { queryParams } = props; + const { dateRange,status, ...extra } = queryParams; const [startMonthStr, endMonthStr] = dateRange || []; - const params = { startMonthStr, endMonthStr, ...extra }; - const payload = { - ...pageInfo, ...params, taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [] - }; + const params = { startMonthStr, endMonthStr, status, ...extra }; + const payload = { ...pageInfo, ...params }; this.setState({ loading: true }); getSalaryAcctList(payload).then(({ status, data }) => { this.setState({ loading: false }); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js index e06144ba..74ab9dd9 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js @@ -15,7 +15,8 @@ import { deleteAcctemployee, reducedemployeeList, refreshAcctemployee, - saveAcctemployee + saveAcctemployee, + getGzceList } from "../../../../../apis/calculate"; import { personConfirmSearchConditions } from "./condition"; import { getSearchs } from "../../../../../util"; @@ -26,7 +27,8 @@ const getLabel = WeaLocaleProvider.getLabel; const api = { range: acctemployeeList, sub: reducedemployeeList, - add: addedemployeeList + add: addedemployeeList, + gzce: getGzceList }; @inject("calculateStore") @@ -45,9 +47,11 @@ class Index extends Component { componentDidMount() { if ($) { const domTabInnerList = $(".salary-calculate-do-calc-content .ant-tabs-tab-inner"); - domTabInnerList[0].setAttribute("title", ""); - domTabInnerList[1].setAttribute("title", ""); - domTabInnerList[2].setAttribute("title", ""); + if (domTabInnerList && domTabInnerList.length > 0){ + domTabInnerList[0].setAttribute("title", ""); + domTabInnerList[1].setAttribute("title", ""); + domTabInnerList[2].setAttribute("title", ""); + } } this.setState({ searchConditions: _.map(personConfirmSearchConditions, item => { @@ -79,24 +83,34 @@ class Index extends Component { renderTabBtns = () => { const { selectedKey, selectedRowKeys } = this.state; - const { calcDetail } = this.props; + const { calcDetail,readOnly } = this.props; let tabBtns = []; switch (selectedKey) { case "range": + tabBtns = [ + this.handleDeletePCitem()}/>, + ids && this.handleUserBrowserChange(ids.split(","))} + > + + , + , + + ]; + calcDetail && tabBtns.splice(0, 2); + if (readOnly) { + tabBtns = [ + + ]; + } + break; + case "gzce": tabBtns = [ - this.handleDeletePCitem()}/>, - ids && this.handleUserBrowserChange(ids.split(","))} - > - - , - , ]; - calcDetail && tabBtns.splice(0, 2); break; case "add": case "sub": @@ -163,6 +177,9 @@ class Index extends Component { url = `${window.location.origin}/api/bs/hrmsalary/salaryacct/acctemployee/export?salaryAcctRecordId=${salaryAcctRecordId}&${convertToUrlString(PCSearchForm.getFormParams())}`; } else if (this.state.selectedKey === "sub") { url = `${window.location.origin}/api/bs/hrmsalary/salaryacct/reducedemployee/export?salaryAcctRecordId=${salaryAcctRecordId}&${convertToUrlString(PCSearchForm.getFormParams())}`; + // 2025-12-11 by ydh 新增环比上月实发工资差额页签 + } else if (this.state.selectedKey === "gzce") { + url = `${window.location.origin}/api/bs/hrmsalary/salaryacct/gzceList/export?salaryAcctRecordId=${salaryAcctRecordId}&${convertToUrlString(PCSearchForm.getFormParams())}`; } else { url = `${window.location.origin}/api/bs/hrmsalary/salaryacct/addedemployee/export?salaryAcctRecordId=${salaryAcctRecordId}&${convertToUrlString(PCSearchForm.getFormParams())}`; } @@ -239,6 +256,11 @@ class Index extends Component { style={{ marginLeft: 8 }} /> , viewcondition: "add" + }, + { + title: + 环比上月实发工资差额 + , viewcondition: "gzce" } ]; const pagination = { @@ -281,6 +303,27 @@ class Index extends Component { searchsBaseValue={PCSearchForm.getFormParams().employeeName} onAdReset={() => PCSearchForm.resetForm()} autoCalculateWidth /> + {selectedKey === "gzce" && { + let width = ""; + const {dataIndex} = item; + switch (dataIndex) { + case "taxAgentName": + case "departmentName": + width = "15%"; + break; + default: + width = "45%"; + break; + } + return {...item, width}; + }) + ]} + /> + } + {selectedKey !== "gzce" && + }
); } diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js deleted file mode 100644 index 9340de40..00000000 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js +++ /dev/null @@ -1,176 +0,0 @@ -export const editCalcSearchConditions = [ - { - items: [ - { - colSpan: 2, - conditionType: "INPUT", - domkey: ["employeeName"], - fieldcol: 12, - label: "姓名", - lanId: 25034, - labelcol: 6, - value: "", - viewAttr: 2 - }, - { - colSpan: 2, - conditionType: "INPUT", - domkey: ["workcode"], - fieldcol: 12, - label: "工号", - lanId: 1933, - labelcol: 6, - value: "", - viewAttr: 2 - }, - { - browserConditionParam: { - completeParams: {}, - conditionDataParams: {}, - dataParams: {}, - destDataParams: {}, - hasAddBtn: false, - hasAdvanceSerach: false, - idSeparator: ",", - isAutoComplete: 1, - isDetail: 0, - isMultCheckbox: false, - isSingle: false, - icon: "icon-coms-hrm", - linkUrl: "", - pageSize: 10, - quickSearchName: "", - replaceDatas: [], - title: "", - type: "164", - viewAttr: 2 - }, - colSpan: 1, - conditionType: "BROWSER", - domkey: ["subcompanyIds"], - fieldcol: 12, - label: "分部", - lanId: 33553, - labelcol: 6, - viewAttr: 2 - }, - { - browserConditionParam: { - completeParams: {}, - conditionDataParams: {}, - dataParams: {}, - destDataParams: {}, - hasAddBtn: false, - hasAdvanceSerach: false, - idSeparator: ",", - isAutoComplete: 1, - isDetail: 0, - isMultCheckbox: false, - isSingle: false, - icon: "icon-coms-hrm", - linkUrl: "", - pageSize: 10, - quickSearchName: "", - replaceDatas: [], - title: "", - type: "57", - viewAttr: 2 - }, - colSpan: 2, - conditionType: "BROWSER", - domkey: ["departmentIds"], - fieldcol: 12, - label: "部门", - lanId: 27511, - labelcol: 6, - viewAttr: 2 - }, - { - browserConditionParam: { - completeParams: {}, - conditionDataParams: {}, - dataParams: {}, - destDataParams: {}, - hasAddBtn: false, - hasAdvanceSerach: false, - idSeparator: ",", - isAutoComplete: 1, - isDetail: 0, - isMultCheckbox: false, - isSingle: false, - icon: "icon-coms-hrm", - linkUrl: "", - pageSize: 10, - quickSearchName: "", - replaceDatas: [], - title: "", - type: "24", - viewAttr: 2 - }, - colSpan: 2, - conditionType: "BROWSER", - domkey: ["positionIds"], - fieldcol: 12, - label: "岗位", - lanId: 6086, - labelcol: 6, - viewAttr: 2 - }, - { - colSpan: 2, - conditionType: "SELECT", - domkey: ["statuses"], - fieldcol: 12, - multiple: true, - label: "状态", - lanId: 535101, - labelcol: 6, - options: [], - viewAttr: 2 - }, - { - colSpan: 2, - conditionType: "CHECKBOX", - domkey: ["consolidatedTaxation"], - fieldcol: 12, - isQuickSearch: false, - label: "合并计税", - labelcol: 6, - viewAttr: 2 - } - ], - defaultshow: true, - title: "常用条件" - } -]; -export const batchUpdateConditions = [ - { - items: [ - { - colSpan: 1, - conditionType: "INPUT", - domkey: ["salaryItemName"], - fieldcol: 14, - label: "批量编辑项目", - lanId: 111, - labelcol: 6, - value: "", - viewAttr: 1 - }, - { - colSpan: 1, - conditionType: "INPUTNUMBER", - domkey: ["value"], - fieldcol: 14, - label: "批量编辑为", - lanId: 111, - labelcol: 6, - value: "", - rules: "required", - viewAttr: 3 - } - ], - defaultshow: true, - title: "" - } -]; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js deleted file mode 100644 index 4ddc7908..00000000 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Author: 黎永顺 - * name: 薪资核算-高级搜索面板 - * Description: - * Date: 2023/9/14 - */ -import React, { Component } from "react"; -import { WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaTools } from "ecCom"; -import { Button, Col, Row } from "antd"; -import { inject, observer } from "mobx-react"; -import uuidV4 from "uuid/v4"; -import { editCalcSearchConditions } from "./condition"; -import { getExportField } from "../../../../../apis/calculate"; -import { commonEnumList } from "../../../../../apis/ruleconfig"; -import { getSearchs } from "../../../../../util"; - -const getKey = WeaTools.getKey; -const getLabel = WeaLocaleProvider.getLabel; - -@inject("calculateStore") -@observer -class EditCalcAdvanceSearchPannel extends Component { - constructor(props) { - super(props); - this.state = { - searchConditions: [], salaryItems: [], - customSearchConditions: [], filterEnum: [] - }; - } - - componentDidMount() { - this.getExportField(); - this.getFilterEnumList(); - this.setState({ - searchConditions: _.map(editCalcSearchConditions, item => { - return { - ...item, - items: _.map(item.items, o => { - if (getKey(o) === "statuses") { - return { - ...o, - options: [ - { key: "0", showname: getLabel(18883, "试用") }, { key: "1", showname: getLabel(15711, "正式") }, - { key: "2", showname: getLabel(480, "临时") }, { key: "3", showname: getLabel(15844, "试用延期") }, - { key: "4", showname: getLabel(542707, "解雇") }, { key: "5", showname: getLabel(6091, "离职") }, - { key: "6", showname: getLabel(6092, "退休") } - ] - }; - } - return { ...o }; - }), - title: getLabel(32905, "常用条件") - }; - }) - }, () => { - const { calculateStore: { ECSearchForm } } = this.props; - ECSearchForm.initFormFields(this.state.searchConditions); - }); - } - - getFilterEnumList = () => { - commonEnumList({ enumClass: "com.engine.salary.enums.common.FilterEnum" }) - .then(({ status, data }) => { - if (status) { - this.setState({ - filterEnum: _.map(data, item => ({ - key: item.value, - showname: item.defaultLabel - })) - }); - } - }); - }; - getExportField = () => { - getExportField({ salaryAcctRecordId: this.props.salaryAcctRecordId }) - .then(({ status, data }) => { - if (status) { - const { itemsByGroup } = data; - this.setState({ - salaryItems: _.map(itemsByGroup, item => ({ - key: item.salarySobItemGroupId.toString(), - label: item.salarySobItemGroupName, - options: _.map(item.salaryItems, o => ({ - key: o.salaryItemId.toString(), showname: o.salaryItemName - })) - })) - }); - } - }); - }; - handleAddCustomSearchForm = () => { - const { calculateStore: { setOtherConditions } } = this.props; - const { customSearchConditions, salaryItems, filterEnum } = this.state; - const uuid = uuidV4(); - this.setState({ - customSearchConditions: [ - ...customSearchConditions, - { - com: CustomFormFields({ - uuid, salaryItems, filterEnum, onDelete: this.handleDelete, onChange: this.handleChange - }), - uuid, itemId: "", filter: "", params: "" - } - ] - }, () => { - setOtherConditions(_.map(this.state.customSearchConditions, o => ({ - itemId: o.itemId, filter: o.filter, params: o.params - }))); - }); - }; - handleChange = (uuid, params) => { - const { calculateStore: { setOtherConditions } } = this.props; - const { customSearchConditions } = this.state; - this.setState({ - customSearchConditions: _.map(customSearchConditions, o => { - if (o.uuid === uuid) { - return { ...o, ...params }; - } - return { ...o }; - }) - }, () => { - setOtherConditions(_.map(this.state.customSearchConditions, o => ({ - itemId: o.itemId, filter: o.filter, params: o.params - }))); - }); - }; - handleDelete = (uuid) => { - const { calculateStore: { setOtherConditions } } = this.props; - const { customSearchConditions } = this.state; - this.setState({ - customSearchConditions: _.filter(customSearchConditions, o => o.uuid !== uuid) - }, () => { - setOtherConditions(_.map(this.state.customSearchConditions, o => ({ - itemId: o.itemId, filter: o.filter, params: o.params - }))); - }); - }; - - render() { - const { searchConditions, customSearchConditions } = this.state; - const { calculateStore: { ECSearchForm, setOtherConditions } } = this.props; - return ( - -
- {getSearchs(ECSearchForm, searchConditions, 2, false)} - -
- -
-
- {/**/} -
-
-
-
- - - -
-
- - ); - } -} - -export default EditCalcAdvanceSearchPannel; - -const CustomFormFields = (props) => { - const { uuid, onDelete, salaryItems, filterEnum, onChange } = props; - return - - - onChange(uuid, { itemId: v })} - /> - - - - - onChange(uuid, { filter: v })}/> - - - onChange(uuid, { params: v })}/> - + ]} + > +
{getSearchs(declareForm, conditions, 1, false)}
+ + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js index 45f918f7..4ffa9ff1 100644 --- a/pc4mobx/hrmSalary/pages/declare/declare.js +++ b/pc4mobx/hrmSalary/pages/declare/declare.js @@ -12,6 +12,7 @@ import moment from "moment"; import DeclareQuery from "./components/declareQuery"; import DeclareTablelist from "./components/declareTablelist"; import DeclareDialog from "./components/declareDialog"; +import DeclareWithDrawDialog from "./components/declareWithDrawDaialog"; import LogDialog from "../../components/logViewModal"; import "./index.less"; @@ -31,6 +32,7 @@ class Calculate extends Component { ] }, isRefresh: false, declareDaialog: { visible: false, title: "" }, + declareWithDrawDaialog: { visible: false, title: "" }, // 撤回申报弹窗 logDialogVisible: false, filterConditions: "[]" }; this.handleDebounce = null; @@ -53,6 +55,14 @@ class Calculate extends Component {
} })}>{getLabel(543618, "生成申报表")}, + , this.setState({ isRefresh: _.keys(v)[0] === "taxAgentName" ? isRefresh : !isRefresh, queryParams: { ...queryParams, ...v } @@ -74,7 +84,7 @@ class Calculate extends Component { }; render() { - const { queryParams, isRefresh, declareDaialog, logDialogVisible, filterConditions } = this.state; + const { queryParams, isRefresh, declareDaialog, declareWithDrawDaialog, logDialogVisible, filterConditions } = this.state; return ( } iconBgcolor="#F14A2D" buttons={this.renderCalculateOpts()} className="declare-main-layout" showDropIcon @@ -92,6 +102,12 @@ class Calculate extends Component { isRefresh: bool === "refresh" ? !isRefresh : isRefresh })} /> + this.setState({ + declareWithDrawDaialog: { ...declareWithDrawDaialog, visible: false }, + isRefresh: bool === "refresh" ? !isRefresh : isRefresh + })} + /> {/*操作日志*/} this.setState({ logDialogVisible: false })}/> diff --git a/pc4mobx/hrmSalary/pages/declare/index.less b/pc4mobx/hrmSalary/pages/declare/index.less index 01b8fd58..142939c6 100644 --- a/pc4mobx/hrmSalary/pages/declare/index.less +++ b/pc4mobx/hrmSalary/pages/declare/index.less @@ -75,6 +75,23 @@ border-radius: 0; } + .wea-select-input{ + height: 30px; + white-space: nowrap; + min-width: 100px; + width: 100%; + display: inline-block; + padding: 4px 17px 4px 4px; + position: relative; + min-height: 30px; + border: 1px solid #d9d9d9; + } + .arrow { + position: absolute; + right: 4px; + top: 8px; + color: #666; + } .wea-content { padding: 0;