feature/2.15.1.2407.01-权限

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 = <Spin spinning={loading}>
       <div style={{ padding: 10, height: "100%" }} className="wea-hr-muti-dialog">
-        <div className="wea-hr-muti-input-left">
-          <Row style={{ height: 35 }}>
-            <Col span="24">
-              <WeaInputSearch value={query[searchParamsKey]} onSearch={this.getData}
-                              onChange={value => this.setState({ query: { ...query, [searchParamsKey]: value } })}
-              />
-            </Col>
-          </Row>
-          <div>
-            <WeaNewScroll height={sheight}>
-              <CustomBrowserMutiLeft
-                filterData={rightDatas}
-                datas={listDatas}
-                onDoubleClick={this.onleftDoubleClick}
-                onClick={this.onLeftListCheck}
-                selectedKeys={leftListSelectedKeys}
-              />
-            </WeaNewScroll>
-          </div>
-        </div>
-        <div className="wea-transfer-opration">
-          <CustomBrowserOperation
-            rightActive={rightActive}
-            leftActive={leftActive}
-            leftAllActive={this.leftListAllActive()}
-            rightAllActive={rightAllActive}
-            moveToRight={() => this.moveTo("right")}
-            moveToLeft={() => this.moveTo("left")}
-            moveAllToRight={() => this.moveTo("allToRight")}
-            moveAllToLeft={() => this.moveTo("allToLeft")}
-          />
-        </div>
-        <div className="wea-hr-muti-input-right">
-          <CustomBrowserMutiRight
-            height={sheight} data={rightDatas} checkedKeys={rightCheckedKeys}
-            checkedCb={rightCheckedKeys => this.setState({ rightCheckedKeys })}
-            onDoubleClick={this.onRightDoubleClick}
-          />
-        </div>
+        {
+          !isSingle ? <React.Fragment>
+              <div className="wea-hr-muti-input-left">
+                <Row style={{ height: 35 }}>
+                  <Col span="24">
+                    <WeaInputSearch value={query[searchParamsKey]} onSearch={this.getData}
+                                    onChange={value => this.setState({ query: { ...query, [searchParamsKey]: value } })}
+                    />
+                  </Col>
+                </Row>
+                <div>
+                  <WeaNewScroll height={sheight}>
+                    <CustomBrowserMutiLeft
+                      filterData={rightDatas}
+                      datas={listDatas}
+                      onDoubleClick={this.onleftDoubleClick}
+                      onClick={this.onLeftListCheck}
+                      selectedKeys={leftListSelectedKeys}
+                    />
+                  </WeaNewScroll>
+                </div>
+              </div>
+              <div className="wea-transfer-opration">
+                <CustomBrowserOperation
+                  rightActive={rightActive}
+                  leftActive={leftActive}
+                  leftAllActive={this.leftListAllActive()}
+                  rightAllActive={rightAllActive}
+                  moveToRight={() => this.moveTo("right")}
+                  moveToLeft={() => this.moveTo("left")}
+                  moveAllToRight={() => this.moveTo("allToRight")}
+                  moveAllToLeft={() => this.moveTo("allToLeft")}
+                />
+              </div>
+              <div className="wea-hr-muti-input-right">
+                <CustomBrowserMutiRight
+                  height={sheight} data={rightDatas} checkedKeys={rightCheckedKeys}
+                  checkedCb={rightCheckedKeys => this.setState({ rightCheckedKeys })}
+                  onDoubleClick={this.onRightDoubleClick}
+                />
+              </div>
+            </React.Fragment> :
+            <WeaTransferList data={listDatas} height={this.dialog ? this.dialog.state.height - 20 : 260}
+                             checkedCb={([id]) => this.handleRowClick(_.find(listDatas, item => item.id === id))}
+                             checkedKeys={[]}/>
+        }
       </div>
     </Spin>;
     if (dialogType === "table") {

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;
+          }
+        }
+      }
+    }
   }
 }

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: {

pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js

@@ -73,7 +73,7 @@ class Index extends Component {
     const { taxAgentStore: { roleForm } } = this.props;
     return (
       <WeaDialog
-        {...this.props} style={{ width: 520 }} initLoadCss title={getLabel(111, "添加角色")} className="role-dialog"
+        {...this.props} style={{ width: 520 }} initLoadCss title={getLabel(111, "添加业务线")} className="role-dialog"
         buttons={[
           <Button type="primary" loading={loading} onClick={() => this.save()}>{getLabel(111, "保存")}</Button>,
           <Button type="primary" loading={loading}

pc4mobx/hrmSalary/pages/roleManagement/components/conditions.js

@@ -102,7 +102,7 @@ export const roleOperatorConditions = [
         conditionType: "INPUTNUMBER",
         domkey: ["sortedIndex"],
         fieldcol: 18,
-        label: "顺序",
+        label: "批次",
         lanId: 111,
         labelcol: 6,
         value: "",

pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js

@@ -285,13 +285,13 @@ class Index extends Component {
     };
     const buttons = [
       <Button type="primary" onClick={this.syncAuthData} loading={loading.async}>{getLabel(111, "同步")}</Button>,
-      <Button type="ghost" loading={loading.set} onClick={this.saveAuthOpt}>{getLabel(111, "保存")}</Button>
+      <Button type="primary" loading={loading.set} onClick={this.saveAuthOpt}>{getLabel(111, "保存")}</Button>
     ];
     selectedKey === "auth.AuthTargetTypeEnum" && buttons.shift();
     selectedKey !== "auth.AuthTargetTypeEnum" && buttons.pop();
     return (
       <WeaDialog
-        {...this.props} hasScroll className="tax_role_set_dialog" initLoadCss title={getLabel(111, "编辑角色")}
+        {...this.props} hasScroll className="tax_role_set_dialog" initLoadCss title={getLabel(111, "编辑业务线")}
         buttons={buttons} style={{
         width: 960, height: 606.6, minHeight: 200, minWidth: 380,
         maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
@@ -339,7 +339,7 @@ class Index extends Component {
                           </WeaFormItem>
                         </Col>
                         <Col span={12}>
-                          <WeaFormItem label={getLabel(111, "顺序")} labelCol={{ span: 8 }} wrapperCol={{ span: 14 }}>
+                          <WeaFormItem label={getLabel(111, "批次")} labelCol={{ span: 8 }} wrapperCol={{ span: 14 }}>
                             <WeaInputNumber value={dataTargetSettings.sortedIndex}
                                             onChange={sortedIndex => this.setState({
                                               dataTargetSettings: { ...dataTargetSettings, sortedIndex }