diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js index eed764dd..4fb296c1 100644 --- a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js +++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js @@ -8,13 +8,14 @@ * @description: */ import React, { Component } from "react"; -import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaTable } from "ecCom"; +import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaTable, WeaTransfer } from "ecCom"; import { Button, Col, Row, Spin } from "antd"; import CustomBrowserMutiLeft from "./customBrowserMutiLeft"; import CustomBrowserMutiRight from "./customBrowserMutiRight"; import CustomBrowserOperation from "./customBrowserOperation"; import { postFetch } from "../../../util/request"; +const WeaTransferList = WeaTransfer.list; const getLabel = WeaLocaleProvider.getLabel; class CustomBrowserDialog extends Component { @@ -171,45 +172,52 @@ class CustomBrowserDialog extends Component { if (rightDatas && rightDatas.length > 0) rightAllActive = true; let dom =
-
- - - this.setState({ query: { ...query, [searchParamsKey]: value } })} - /> - - -
- - - -
-
-
- this.moveTo("right")} - moveToLeft={() => this.moveTo("left")} - moveAllToRight={() => this.moveTo("allToRight")} - moveAllToLeft={() => this.moveTo("allToLeft")} - /> -
-
- this.setState({ rightCheckedKeys })} - onDoubleClick={this.onRightDoubleClick} - /> -
+ { + !isSingle ? +
+ + + this.setState({ query: { ...query, [searchParamsKey]: value } })} + /> + + +
+ + + +
+
+
+ this.moveTo("right")} + moveToLeft={() => this.moveTo("left")} + moveAllToRight={() => this.moveTo("allToRight")} + moveAllToLeft={() => this.moveTo("allToLeft")} + /> +
+
+ this.setState({ rightCheckedKeys })} + onDoubleClick={this.onRightDoubleClick} + /> +
+
: + this.handleRowClick(_.find(listDatas, item => item.id === id))} + checkedKeys={[]}/> + }
; if (dialogType === "table") { diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/index.less b/pc4mobx/hrmSalary/components/CustomBrowser/index.less index ff1844c7..8cf2ce40 100644 --- a/pc4mobx/hrmSalary/components/CustomBrowser/index.less +++ b/pc4mobx/hrmSalary/components/CustomBrowser/index.less @@ -20,5 +20,32 @@ height: 100% !important; } } + + .wea-transfer-list-wrapper { + border: none !important; + + .transfer-tree { + padding: 0 !important; + + & > li { + margin: 0; + cursor: pointer; + width: 100%; + position: relative; + padding: 6px 0 6px 20px !important; + border-bottom: 1px solid #e9e9e9; + color: #333; + overflow: hidden; + + .ant-tree-switcher { + display: none !important; + } + + .tree-title { + line-height: 30px; + } + } + } + } } } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index 823018ec..0edc9aee 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -90,7 +90,11 @@ class LedgerBaseSetting extends Component { const { settingBaseInfo } = this.state; let tmpV = {}; _.map(Object.keys(settingBaseInfo), key => { - tmpV[key] = !_.isNil(basicForm[key]) ? basicForm[key].toString() : ""; + if (key === "taxAgentId") { + tmpV[key] = _.map(basicForm["taxAgentIds"], it => it.toString()).join(","); + } else { + tmpV[key] = !_.isNil(basicForm[key]) ? basicForm[key].toString() : ""; + } }); this.setState({ settingBaseInfo: { diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js index 543cf535..4ab9f000 100644 --- a/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js +++ b/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js @@ -73,7 +73,7 @@ class Index extends Component { const { taxAgentStore: { roleForm } } = this.props; return ( this.save()}>{getLabel(111, "保存")}, , - + ]; selectedKey === "auth.AuthTargetTypeEnum" && buttons.shift(); selectedKey !== "auth.AuthTargetTypeEnum" && buttons.pop(); return ( - + this.setState({ dataTargetSettings: { ...dataTargetSettings, sortedIndex }