Merge remote-tracking branch 'origin/master' into ehr

王强
2 parents 19326b63 1cf36756
Showing 23 changed files with 633 additions and 72 deletions
config/routers/finance.ts
src/pages/approval/ApprovalSetting/api.ts
src/pages/approval/ApprovalSetting/subpages/components/CommonSettingForm.tsx
src/pages/approval/ApprovalSetting/subpages/components/DefaultFlowNewOrEdit.tsx
src/pages/approval/ApprovalSetting/subpages/components/Selectors/ApprovalRolesSelector.tsx
src/pages/approval/ApprovalSetting/subpages/components/Selectors/index.ts
src/pages/approval/FlowSetting/api.ts
src/pages/approval/FlowSetting/components/PostsSelectorByAll.tsx
src/pages/approval/FlowSetting/subpages/CommonSetting/components/CustomFlowNewOrEdit.tsx
src/pages/approval/FlowSetting/subpages/CommonSetting/components/CustomFlows.tsx
src/pages/approval/FlowSetting/subpages/CommonSetting/components/DefaultFlows.tsx
src/pages/approval/FlowSetting/subpages/ConditionSetting/components/CustomFlowNewOrEdit.tsx
src/pages/approval/FlowSetting/subpages/ConditionSetting/components/CustomFlows.tsx
src/pages/approval/FlowSetting/subpages/ConditionSetting/components/DefaultFlows.tsx
src/pages/approval/FlowSetting/subpages/ConditionSetting/components/RolesSettingForm.tsx
src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx
src/pages/finance/proactiveReimbursement/api.ts
src/pages/finance/proactiveReimbursement/components/ApitalModal.tsx
src/pages/finance/proactiveReimbursement/components/Filter.tsx
src/pages/finance/proactiveReimbursement/components/List.tsx
@@ -168,7 +168,7 @@ export default [
     path: '/finance2/poundageConfig/posAuth', //pos机授权
     component: './finance/PoundageConfig/POSAuth',
   },
-  
+
   {
     path: '/finance2/financeInvestor', //投资主体（旧）
     component: './finance/FinanceInvestor',
@@ -254,7 +254,7 @@ export default [
     component: './finance/PayDataImport/EditComfirm/index',
   },
  
- //款项归属配置
+  //款项归属配置
   {
     path: '/finance2/allocationOfFunds',
     component: './finance/AllocationOfFunds',
@@ -263,4 +263,8 @@ export default [
     path: '/finance2/kt/itemamount/config', //事项款设置
     component: './contract/ItemAmountSetting',
   },
+  {
+    path: '/finance2/proactiveReimbursement', //主动报销款项配置
+    component: './finance/proactiveReimbursement',
+  },
 ];
@@ -53,7 +53,7 @@ export function getPreconditionTypes(): http.PromiseResp&lt;ApprovalSetting.Option[
  
 export interface GetCanApproveRolesReq {
   configuredRoleCodes?: string;
-  shopBizTypes?: string;
+  // shopBizTypes?: string; // 审批配置（霏微配置）不传此参数
 }
 /**
  * 查询所有角色列表
 import React, { useEffect, useState } from 'react';
 import { Button, Form, InputNumber, Modal, Popconfirm, Radio, Row, Space, Table } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import SelectorWithFull from '@/components/SelectorWithFull';
 import { getCanApproveRoles } from '@/pages/approval/ApprovalSetting/api';
 import _ from 'lodash';
 import { geneRandomNum } from '@/utils/tools';
 import { useRequest } from 'umi';
 import { getRolesByGroup } from '@/pages/approval/FlowSetting/api';
+import { ApprovalRolesSelector } from './Selectors';
  
 const { Column } = Table;
  
@@ -257,7 +257,7 @@ export default function CommonSettingForm({ small = false, shopBizTypes, roles, 
       >
         <Form form={roleForm}>
           <Form.Item name="role" rules={[{ required: true, message: '请选择至少一个审批角色' }]}>
-            <SelectorWithFull
+            {/* <SelectorWithFull
               showSearch
               treeNodeFilterProp="label"
               maxTagCount={100}
@@ -272,6 +272,16 @@ export default function CommonSettingForm({ small = false, shopBizTypes, roles, 
                 });
               }}
               data={roleList.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
+            /> */}
+            <ApprovalRolesSelector
+              value={current.roles?.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
+              list={roleList}
+              onChange={(value) => {
+                setCurrent({
+                  ...current,
+                  roles: value.map((item: ApprovalSetting.Option) => ({ roleCode: item.value, roleName: item.label })),
+                });
+              }}
             />
           </Form.Item>
         </Form>
@@ -191,6 +191,10 @@ export default function DefaultSettingNewOrEdit(props: Props) {
   const clearRoles = (newCondVals: ApprovalSetting.ConditionVal[]) => {
     const oldShopBizTypes = [...shopBizTypes];
     const newShopBizTypes = getShopBizTypes(newCondVals);
+    if (newShopBizTypes.length === 1 && newShopBizTypes[0] === -1) {
+      // 【全部门店】时不清空审批角色
+      return;
+    }
     oldShopBizTypes.forEach((i) => {
       if (!newShopBizTypes.includes(i)) {
         // 清空已添加审批角色列表
+import React, { useState } from 'react';
+import SelectorWithFull from '@/components/SelectorWithFull';
+import type { LabeledValue } from 'antd/lib/select';
+
+interface Props {
+  value: any;
+  list: CommonApi.RoleCodeVO[];
+  onChange: (value: any) => void;
+}
+
+// 审批角色
+export const ApprovalRolesSelector = ({ value = [], list, onChange }: Props) => {
+  const [searchValue, setSearchValue] = useState('');
+
+  const getFilteredData = () => {
+    const oriOptions = list.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }));
+    if (searchValue.trim() === '') {
+      return oriOptions;
+    }
+    return oriOptions.filter((i) => i.label!.toString().toLowerCase().includes(searchValue.trim().toLowerCase()));
+  };
+
+  const handleSelect = (_: LabeledValue, option: any) => {
+    const oriNames = value.length > 0 ? value.map((i: any) => i.label) : [];
+    // value 更新为异步，需手动拼接最新选择值以判断当前筛选值是否已被勾选完
+    oriNames.push(option.label);
+    const valueMatchArr = oriNames.filter((i: string) => i.toLowerCase().includes(searchValue.trim().toLowerCase()));
+    const filteredData = getFilteredData();
+    if (valueMatchArr.length === filteredData.length) {
+      setSearchValue('');
+    }
+  };
+
+  return (
+    <SelectorWithFull
+      showSearch
+      searchValue={searchValue}
+      onSearch={(value) => {
+        setSearchValue(value);
+      }}
+      onSelect={handleSelect}
+      treeNodeFilterProp="label"
+      maxTagCount={100}
+      labelInValue
+      value={value}
+      multiple
+      placeholder="请选择角色或输入关键字筛选"
+      onChange={onChange}
+      data={list.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
+    />
+  );
+};
@@ -16,3 +16,4 @@ export { BizTypeSelector } from &#39;./BizTypeSelector&#39;;
 export { ShopBizTypeSelector } from './ShopBizTypeSelector';
 export { OfficeWordTypeSelector } from './OfficeWordTypeSelector';
 export { ContractTypeSelector } from './ContractTypeSelector';
+export { ApprovalRolesSelector } from './ApprovalRolesSelector';
@@ -201,7 +201,7 @@ export function getIndicatorList(params: any): http.PromiseResp&lt;IndicatorItem[]&gt;
  
 export interface GetRolesByGroupReq {
   configuredRoleCodes?: string;
-  shopBizTypes?: string;
+  shopBizTypes?: string; // 为空：全业态角色；-1：全业态角色＋特定业态角色
 }
  
 /**
@@ -7,23 +7,15 @@ import usePagination from &#39;@/hooks/usePagination&#39;;
 interface Props {
   value?: LabelInValueType[];
   onChange?: (value: LabelInValueType[]) => void;
-  disabled?: boolean;
-  disabledTip?: string;
   defaultTip?: string;
   style?: React.CSSProperties;
 }
  
-export default function PostsSelectorByAll({
-  value = [],
-  onChange,
-  disabled = false,
-  disabledTip = '请选择岗位',
-  defaultTip = '请选择岗位',
-  style,
-}: Props) {
+export default function PostsSelectorByAll({ value = [], onChange, defaultTip = '请选择发起人岗位或输入关键字筛选', style }: Props) {
   const [delay, setDelay] = useState(true);
   const [postList, setPostList] = useState<any[]>([]);
   const { list, setParams, loading } = usePagination(getPost, {}, { delay });
+  const [searchValue, setSearchValue] = useState('');
  
   useEffect(() => {
     if (list && list.length > 0) {
@@ -40,9 +32,38 @@ export default function PostsSelectorByAll({
     setDelay(false);
   }, []);
  
+  const getFilteredData = () => {
+    const oriOptions = postList.map((item) => ({ key: item.id, value: item.id, label: item.postName }));
+    if (searchValue.trim() === '') {
+      return oriOptions;
+    }
+    return oriOptions.filter((i) => i.label.toString().toLowerCase().includes(searchValue.trim().toLowerCase()));
+  };
+
+  const handleSelect = (currValue: any) => {
+    // 【全部】时清空
+    if (currValue.value === -1) {
+      setSearchValue('');
+      return;
+    }
+    const oriNames = value.length > 0 ? value.map((i: any) => i.label) : [];
+    // value 更新为异步，需手动拼接最新选择值以判断当前筛选值是否已被勾选完
+    oriNames.push(currValue.label);
+    const valueMatchArr = oriNames.filter((i: string) => i.toLowerCase().includes(searchValue.trim().toLowerCase()));
+    const filteredData = getFilteredData();
+    if (valueMatchArr.length === filteredData.length) {
+      setSearchValue('');
+    }
+  };
+
   return (
-    <Spin spinning={loading && !disabled}>
+    <Spin spinning={loading}>
       <Select
+        searchValue={searchValue}
+        onSearch={(value) => {
+          setSearchValue(value);
+        }}
+        onSelect={handleSelect}
         labelInValue
         value={value}
         mode="multiple"
@@ -55,10 +76,9 @@ export default function PostsSelectorByAll({
         }}
         style={style || { flex: 1 }}
         allowClear
-        placeholder={disabled ? disabledTip : defaultTip}
+        placeholder={defaultTip}
         showSearch
         optionFilterProp="children"
-        disabled={disabled}
         // getPopupContainer={(triggerNode) => triggerNode.parentNode}
       >
         {postList.map((post) => (
@@ -69,7 +69,7 @@ export default function CustomFlowNewOrEdit(props: Props) {
       <Form form={form}>
         <Form.Item name="id" hidden />
         <Form.Item label="发起人岗位" name="posts" rules={[{ required: true, message: '请选择发起人岗位' }]}>
-          <PostsSelectorByAll defaultTip="请选择发起人岗位或输入关键字筛选" />
+          <PostsSelectorByAll />
         </Form.Item>
         <RolesSettingForm shopBizTypes={[]} roles={roles} setRoles={setRoles} />
       </Form>
@@ -6,7 +6,7 @@ import * as API from &#39;../../../api&#39;;
 import usePagination from '@/hooks/usePagination';
 import { useRequest } from 'umi';
 import st from '@/pages/approval/style.less';
-import { useDebounceEffect } from 'ahooks';
+import _ from 'lodash';
  
 const { Column } = Table;
  
@@ -17,7 +17,6 @@ interface Props {
 export default function ConditionSettingForm({ approvalConfigId }: Props) {
   const [visible, setVisible] = useState<boolean>(false);
   const [current, setCurrent] = useState<FlowSetting.ProcessItem>();
-  const [customSearch, setCustomSearch] = useState('');
   const [condValModal, setCondValModal] = useState<{ visible: boolean; title?: string; value?: string[] }>({ visible: false });
  
   const { list: customProcessList, loading, innerParams, setParams } = usePagination(API.getCustomFlowList, { configId: approvalConfigId });
@@ -34,15 +33,9 @@ export default function ConditionSettingForm({ approvalConfigId }: Props) {
   });
  
   // 搜索过滤
-  useDebounceEffect(
-    () => {
-      setParams({ ...innerParams, name: customSearch }, true);
-    },
-    [customSearch],
-    {
-      wait: 1000,
-    },
-  );
+  const onChange = _.debounce((newParams) => {
+    setParams({ ...innerParams, ...newParams, current: 1 }, true);
+  }, 1000);
  
   const onDelete = (id: number) => {
     const hide = message.loading('删除中');
@@ -112,7 +105,7 @@ export default function ConditionSettingForm({ approvalConfigId }: Props) {
     <Card title="自定义审批流程">
       <Row align="middle" justify="space-between" style={{ marginBottom: 20 }}>
         <div style={{ width: 260 }}>
-          <Input.Search allowClear placeholder="搜索流程名称" value={customSearch} onChange={(e) => setCustomSearch(e.target.value)} />
+          <Input.Search allowClear placeholder="搜索流程名称" onChange={(e) => onChange({ name: e.target.value })} />
         </div>
         <Button
           type="primary"
 import React, { useEffect, useState } from 'react';
 import { Button, Card, Form, InputNumber, Modal, Popconfirm, Radio, Row, Space, Table, message } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import SelectorWithFull from '@/components/SelectorWithFull';
 import { getRolesByGroup } from '@/pages/approval/FlowSetting/api';
 import _ from 'lodash';
 import { geneRandomNum } from '@/utils/tools';
@@ -9,6 +8,7 @@ import usePagination from &#39;@/hooks/usePagination&#39;;
 import * as API from '../../../api';
 import { useRequest } from 'umi';
 import PreviewProcessModal from '@/pages/approval/components/PreviewProcessModal';
+import { ApprovalRolesSelector } from '@/pages/approval/ApprovalSetting/subpages/components/Selectors';
  
 const { Column } = Table;
  
@@ -311,7 +311,17 @@ export default function DefaultFlows({ approvalConfigId }: Props) {
       >
         <Form form={roleForm}>
           <Form.Item name="role" rules={[{ required: true, message: '请选择至少一个审批角色' }]}>
-            <SelectorWithFull
+            <ApprovalRolesSelector
+              value={current.roles?.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
+              list={roleList}
+              onChange={(value) => {
+                setCurrent({
+                  ...current,
+                  roles: value.map((item: ApprovalSetting.Option) => ({ roleCode: item.value, roleName: item.label })),
+                });
+              }}
+            />
+            {/* <SelectorWithFull
               showSearch
               treeNodeFilterProp="label"
               maxTagCount={100}
@@ -326,7 +336,7 @@ export default function DefaultFlows({ approvalConfigId }: Props) {
                 });
               }}
               data={roleList.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
-            />
+            /> */}
           </Form.Item>
         </Form>
       </Modal>
@@ -204,6 +204,10 @@ export default function CustomFlowNewOrEdit(props: Props) {
   const clearRoles = (newCondVals: FlowSetting.ConditionVal[]) => {
     const oldShopBizTypes = [...shopBizTypes];
     const newShopBizTypes = getShopBizTypes(newCondVals);
+    if (newShopBizTypes.length === 1 && newShopBizTypes[0] === -1) {
+      // 【全部门店】时不清空审批角色
+      return;
+    }
     oldShopBizTypes.forEach((i) => {
       if (!newShopBizTypes.includes(i)) {
         // 清空已添加审批角色列表
@@ -456,7 +460,7 @@ export default function CustomFlowNewOrEdit(props: Props) {
         })}
  
         <Form.Item label="发起人岗位" name="posts" rules={[{ required: true, message: '请选择发起人岗位' }]}>
-          <PostsSelectorByAll defaultTip="请选择发起人岗位或输入关键字筛选" />
+          <PostsSelectorByAll />
         </Form.Item>
         <RolesSettingForm shopBizTypes={shopBizTypes} roles={roles} setRoles={setRoles} />
       </Form>
@@ -10,7 +10,6 @@ import * as API from &#39;../../../api&#39;;
 import { Judge_Rule_Enum } from '@/pages/approval/ApprovalSetting/subpages/components/PreSettingForm/entity';
 import { formatConditions } from '../../../entity';
 import st from '@/pages/approval/style.less';
-import { useDebounceEffect } from 'ahooks';
 import TextWithMore from '@/components/TextWithMore';
  
 const { Column } = Table;
@@ -25,8 +24,6 @@ export default function CustomFlows({ approvalConfigId, conds }: Props) {
   const [visible, setVisible] = useState<boolean>(false);
   const [current, setCurrent] = useState<FlowSetting.ProcessItemFE>();
  
-  const [customSearch, setCustomSearch] = useState<API.GetGroupDefaultFlowListReq>({});
-
   const {
     list: customProcessList,
     loading,
@@ -72,15 +69,9 @@ export default function CustomFlows({ approvalConfigId, conds }: Props) {
   };
  
   // 搜索过滤
-  useDebounceEffect(
-    () => {
-      setParams({ ...innerParams, name: customSearch.name }, true);
-    },
-    [customSearch.name],
-    {
-      wait: 1000,
-    },
-  );
+  const onChange = _.debounce((newParams) => {
+    setParams({ ...innerParams, ...newParams, current: 1 }, true);
+  }, 1000);
  
   const onDelete = (id: number) => {
     const hide = message.loading('删除中');
@@ -132,23 +123,21 @@ export default function CustomFlows({ approvalConfigId, conds }: Props) {
             <Input.Search
               allowClear
               placeholder="搜索流程名称"
-              value={customSearch.name}
-              onChange={(e) => setCustomSearch({ ...customSearch, name: e.target.value })}
+              onChange={(e) => {
+                onChange({ name: e.target.value });
+              }}
             />
           </div>
           <div style={{ width: 260, marginLeft: 20 }}>
             <Select
               allowClear
-              value={customSearch.postId}
               placeholder="筛选岗位"
               style={{ width: 250, marginRight: 10 }}
               onSelect={(value) => {
-                setCustomSearch({ ...customSearch, postId: value });
-                setParams({ ...innerParams, postId: value }, true);
+                onChange({ postId: value });
               }}
               onClear={() => {
-                setCustomSearch({ ...customSearch, postId: undefined });
-                setParams({ ...innerParams, postId: undefined }, true);
+                onChange({ postId: undefined });
               }}
               showSearch
               optionFilterProp="children"
@@ -10,7 +10,6 @@ import { Judge_Rule_Enum } from &#39;@/pages/approval/ApprovalSetting/subpages/compo
 import { formatConditions } from '../../../entity';
 import PreviewProcessModal from '@/pages/approval/components/PreviewProcessModal';
 import st from '@/pages/approval/style.less';
-import { useDebounceEffect } from 'ahooks';
 import TextWithMore from '@/components/TextWithMore';
  
 const { Column } = Table;
@@ -24,7 +23,6 @@ export default function DefaultFlows({ approvalConfigId, conds }: Props) {
   const [visible, setVisible] = useState<boolean>(false);
   const [current, setCurrent] = useState<ApprovalSetting.ProcessItemFE>();
  
-  const [defaultSearch, setDefaultSearch] = useState('');
   const [previewModal, setPreviewModal] = useState<{ visible: boolean; value?: ApprovalSetting.ProcessItem }>({ visible: false });
  
   const {
@@ -65,15 +63,9 @@ export default function DefaultFlows({ approvalConfigId, conds }: Props) {
   };
  
   // 搜索过滤
-  useDebounceEffect(
-    () => {
-      setParams({ ...innerParams, name: defaultSearch }, true);
-    },
-    [defaultSearch],
-    {
-      wait: 1000,
-    },
-  );
+  const onChange = _.debounce((newParams) => {
+    setParams({ ...innerParams, ...newParams, current: 1 }, true);
+  }, 1000);
  
   const onDelete = (id: number) => {
     const hide = message.loading('删除中');
@@ -126,7 +118,7 @@ export default function DefaultFlows({ approvalConfigId, conds }: Props) {
     <Card title="默认审批流程">
       <Row align="middle" justify="space-between" style={{ marginBottom: 20 }}>
         <div style={{ width: 260 }}>
-          <Input.Search allowClear placeholder="搜索流程名称" value={defaultSearch} onChange={(e) => setDefaultSearch(e.target.value)} />
+          <Input.Search allowClear placeholder="搜索流程名称" onChange={(e) => onChange({ name: e.target.value })} />
         </div>
         <Button
           type="primary"
 import React, { useEffect, useState } from 'react';
 import { Button, Form, Modal, Popconfirm, Row, Space, Table } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import SelectorWithFull from '@/components/SelectorWithFull';
 import { getRolesByGroup } from '@/pages/approval/FlowSetting/api';
 import _ from 'lodash';
 import { geneRandomNum } from '@/utils/tools';
 import { useRequest } from 'umi';
+import { ApprovalRolesSelector } from '@/pages/approval/ApprovalSetting/subpages/components/Selectors';
  
 const { Column } = Table;
  
@@ -167,7 +167,18 @@ export default function RolesSettingForm({ shopBizTypes, roles, setRoles: onChan
       >
         <Form form={roleForm}>
           <Form.Item name="role" rules={[{ required: true, message: '请选择至少一个审批角色' }]}>
-            <SelectorWithFull
+            <ApprovalRolesSelector
+              value={current.roles?.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
+              list={roleList}
+              onChange={(value) => {
+                console.log(value);
+                setCurrent({
+                  ...current,
+                  roles: value.map((item: ApprovalSetting.Option) => ({ roleCode: item.value, roleName: item.label })),
+                });
+              }}
+            />
+            {/* <SelectorWithFull
               showSearch
               treeNodeFilterProp="label"
               maxTagCount={100}
@@ -182,7 +193,7 @@ export default function RolesSettingForm({ shopBizTypes, roles, setRoles: onChan
                 });
               }}
               data={roleList.map((item) => ({ key: item.roleCode, value: item.roleCode, label: item.roleName }))}
-            />
+            /> */}
           </Form.Item>
         </Form>
       </Modal>
@@ -137,7 +137,7 @@ export default function CreateModal() {
  
   return (
     <Modal
-      title={`${current.compId ? "编辑" : "新增"}厂家往来银行`}
+      title={`${current.compId ? "编辑" : "新增"}库存融资银行`}
       open={visible}
       confirmLoading={saveLoading}
       onOk={form.submit}
@@ -216,7 +216,11 @@ export default function CreateModal() {
             <Radio value={3}>一般户90% </Radio>
           </Radio.Group>
         </FormItem> */}
-        <FormItem name="depositAccount" label="还款保证金账户">
+        <FormItem
+          name="depositAccount"
+          label="还款保证金账户"
+          rules={[{ required: true, message: "请选择还款保证金账户" }]}
+        >
           <Select labelInValue placeholder="请选择账户" showSearch optionFilterProp="children" allowClear>
             {accountList.map((item) => (
               <Option key={item.id} value={item.id}>
+import { http } from "@/typing/http";
+import request from "@/utils/request";
+import { FINANCE2_HOST } from "@/utils/host";
+
+type PrRes<T> = http.PromiseResp<T>;
+type PrRageRes<T> = http.PromisePageResp<T>;
+
+export interface RpTypesItem {
+  value?: number;
+  name?: string; //名称
+}
+
+interface Params {
+  type?: number; //类型(See: 收支类型枚举
+  parent?: string; //父级
+  typeName?: string; //款项名称模糊搜索
+}
+
+/**
+ * 获取款项配置列表
+ * /rp/type/config/list
+ */
+export function getRpTypeConfigApi(params: RpTypeConfig.TypeListParams): PrRageRes<RpTypeConfig.TypeListItems> {
+  return request.get(`${FINANCE2_HOST}/rp/type/config/list`, { params });
+}
+
+/**
+ *  删除款项配置
+ * /rp/type/config/delete/{id}
+ * /rp/type/config/delete/{id}
+ */
+export function typeConfigDeleteApi(id?: number): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/rp/type/config/delete/${id}`);
+}
+
+/**
+ *  查询收支类型
+ * /common/rpTypes
+ */
+export function commonRpTypesApi(params: Params): PrRes<RpTypesItem[]> {
+  return request.get(`${FINANCE2_HOST}/common/rpTypes`, { params });
+}
+
+interface SavaParams {
+  groupId?: number; //集团id
+  userId?: number; //用户id
+  userName?: string; //用户名称
+  id?: number; //配置项id，编辑时不为空
+  typeValue?: number; //款项
+  configType?: number; //配置类型：1 收入录入，2 付款申请，3 缴费申请，4 事项申请(See: 财务款项配置类型)
+  processMode?: number; //款项处理：1 默认收付，2 冲应付款，3 挂应收(See: 款项处理方式)
+  roles?: string[];//可申请角色
+  companyTypes?: number[]; //往来单位业务类型
+}
+
+/**
+ * 保存款项配置
+ * /rp/type/config/save
+ */
+export function getRpTypeConfigSaveApi(params: SavaParams): PrRageRes<null> {
+  return request.post(`${FINANCE2_HOST}/rp/type/config/save`, params);
+}
+import React, { useState, useEffect } from "react";
+import { Modal, Form, Select, message, Radio } from "antd";
+import { useStore } from "../index";
+import { getRpTypeConfigSaveApi, commonRpTypesApi, RpTypesItem } from "@/pages/finance/PaymentAllocation/api";
+import useInitial from "@/hooks/useInitail";
+import { ProcessMode2, ProcessModeEnum } from '@/pages/finance/entitys';
+import { getCompanyBusinessTypesApi } from "@/pages/finance/TradeCompany/api";
+import { getAllRoleCodeApi } from "@/common/api";
+
+const FormItem = Form.Item;
+const { Option } = Select;
+
+
+export default function CreateModal() {
+  const { visible, setVisible, current, setCurrent, setLoading, } =
+    useStore();
+  /**查询收支类型(款项);type:1收 2支
+   * 配置类型configType：1 收入录入，2 付款申请，3 缴费申请，4 事项申请
+   * 
+  */
+  const { data } = useInitial<RpTypesItem[], any>(commonRpTypesApi, [], { type: 2, configType: 5 });
+  const [form] = Form.useForm();
+  const [saveLoading, setSaveLoading] = useState(false);
+
+  // 往来单位业务类型列表
+  const { data: comBussinessList, loading: comBussinessLoading } = useInitial(getCompanyBusinessTypesApi, [], null);
+  // 查询所有角色列表
+  const { data: roleList, loading } = useInitial(getAllRoleCodeApi, [], {});
+
+  useEffect(() => {
+    if (visible && current) {
+      const res = toFormData(current);
+      form.setFieldsValue({ ...current, ...res, typeValue: { label: current.typeName, value: current.typeValue } });
+    }
+  }, [visible]);
+
+  function toFormData(data: ApitalAccount.ApitalList) {
+    const res = {};
+    if (data.compTypeList && data.compTypeList.length) {
+      res.companyTypes = data.compTypeList.map((item) => ({ label: item.name, value: item.id }));
+    }
+    if (data.roleList && data.roleList.length) {
+      res.roles = data.roleList.map((item) => ({ label: item.name, value: item.id }));
+    }
+    return res;
+  }
+
+  function transformDTO(item: any) {
+    const res = {};
+    if (item.roles && item.roles.length) {
+      res.roles = item.roles.map((it) => it.value);
+    }
+    if (item.companyTypes && item.companyTypes.length) {
+      res.companyTypes = item.companyTypes.map((it) => it.value);
+    }
+    return res;
+  }
+
+  function submit(item: any) {
+    const res = transformDTO(item);
+    const params = {
+      ...item,
+      ...res,
+      configType: 5,
+      id: current.id,
+      typeValue: item.typeValue && item.typeValue.value
+    };
+    setSaveLoading(true);
+    const saveApi = getRpTypeConfigSaveApi;
+    saveApi(params)
+      .then(() => {
+        message.success("保存成功");
+        setSaveLoading(false);
+        setVisible(false);
+        setLoading(true);
+      })
+      .catch((e) => {
+        message.error(e.message);
+        setSaveLoading(false);
+      });
+  }
+
+  function onCancel() {
+    setVisible(false);
+  }
+
+  return (
+    <Modal
+      title={`${current.id ? '编辑' : '新增'}主动报销款项配置`}
+      open={visible}
+      onOk={() => form.submit()}
+      onCancel={onCancel}
+      maskClosable={false}
+      confirmLoading={saveLoading}
+      afterClose={() => {
+        form.resetFields();
+        setCurrent({});
+      }}
+    >
+      <Form form={form} onFinish={submit} labelCol={{ span: 7 }} wrapperCol={{ span: 16 }}>
+        <FormItem name="typeValue" label="主动报销款项" rules={[{ required: true, message: '请选择款项' }]}>
+          <Select placeholder="请选择主动报销款项" labelInValue showSearch optionFilterProp="children" disabled={!!current.id}>
+            {data.map((item) => (
+              <Option key={item.value} value={item.value}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        </FormItem>
+
+        <FormItem name="processMode" label="款项处理" rules={[{ required: true, message: '请选择款项处理方式' }]}>
+          <Select placeholder="请选择款项处理方式" showSearch optionFilterProp="children">
+            {ProcessMode2.map((item) => (
+              <Option key={item.value} value={item.value}>
+                {item.label}
+              </Option>
+            ))}
+          </Select>
+        </FormItem>
+        <FormItem noStyle shouldUpdate={(prevValues, curValues) => prevValues.processMode !== curValues.processMode}>
+          {({ getFieldValue }) => {
+            const _processMode = getFieldValue('processMode') || {};
+            console.log('_processMode999:', _processMode);
+            return _processMode === ProcessModeEnum['冲应付款'] ? (
+              <FormItem label="是否提前导入应付款" initialValue={false} name="mustImport" rules={[{ required: true, message: '请选择' }]}>
+                <Radio.Group>
+                  <Radio value>是</Radio>
+                  <Radio value={false}>否</Radio>
+                </Radio.Group>
+              </FormItem>
+            ) : null;
+          }}
+        </FormItem>
+        <FormItem name="companyTypes" label="往来单位业务类型">
+          <Select
+            placeholder="请选择往来单位业务类型"
+            mode="multiple"
+            labelInValue
+            showSearch
+            optionFilterProp="children"
+            loading={comBussinessLoading}
+          >
+            {comBussinessList.map((item) => (
+              <Option key={item.id} value={item.id}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        </FormItem>
+        <FormItem name="roles" label="可申请角色">
+          <Select
+            placeholder="请选择角色"
+            mode="multiple"
+            labelInValue
+            showSearch
+            optionFilterProp="children"
+            loading={loading}
+            autoClearSearchValue={false}
+          >
+            {roleList.map((item) => (
+              <Option key={item.roleCode} value={item.roleCode}>
+                {item.roleName}
+              </Option>
+            ))}
+          </Select>
+        </FormItem>
+      </Form>
+    </Modal>
+  );
+}
+import React from 'react';
+import { Button, Row, Input, Col } from 'antd';
+import { debounce } from 'lodash';
+const Search = Input.Search;
+import { useStore } from '../index';
+
+export default function AccountList() {
+  const { setVisible, setParams } = useStore();
+
+  const fetchListByName = debounce(value => {
+    setParams({ keywords: value }, true);
+  }, 500);
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        marginBottom: 20,
+      }}
+    >
+      <Row style={{ display: "flex", flex: 1 }}>
+        <Col span={8}>
+          <Search
+            allowClear
+            placeholder="搜索主动报销款项"
+            onChange={(e) => fetchListByName(e.target.value || undefined)}
+            style={{ width: 260, marginLeft: 10 }}
+          />
+        </Col>
+      </Row>
+      <Button type="primary" onClick={() => setVisible(true)}>
+        新增
+      </Button>
+    </div>
+  );
+};
+import React, { useState } from "react";
+import { Table, Button, Popconfirm, Divider, message } from "antd";
+import { useStore } from "../index";
+import { ProcessModeEnum } from "@/pages/finance/entitys";
+import PersonModal from "./PersonModal";
+import { typeConfigDeleteApi } from "../api";
+const { Column } = Table;
+export default function AccountList() {
+  const {
+    typeConifgList,
+    loading,
+    paginationConfig,
+    modalVisible,
+    setModalVisible,
+    setCurrent,
+    setVisible,
+    setLoading,
+  } = useStore();
+  // 删除
+  async function handleDelete(id?: number) {
+    try {
+      const { result, success } = await typeConfigDeleteApi(id);
+      if (!success) {
+        message.error(result);
+        return;
+      }
+      message.success(result, 1.5);
+      setLoading(true);
+    } catch (e: any) {
+      message.error(e.message, 1.5);
+    }
+  }
+  return (
+    <>
+      <Table dataSource={typeConifgList} rowKey="id" loading={loading} pagination={paginationConfig}>
+        <Column title="主动报销款项" dataIndex="typeName" />
+        <Column title="款项处理" dataIndex="processMode" render={(mode) => ProcessModeEnum[mode]} />
+        <Column title="是否提前导入应付款" dataIndex="mustImport" render={(value: string) => (value ? '是' : '否')} />
+        <Column
+          title="往来单位业务类型"
+          dataIndex="compTypeList"
+          render={(comptype: any[], record: ApitalAccount.ApitalList) =>
+            comptype && comptype.length > 0 ? (
+              <Button
+                type="link"
+                onClick={() => {
+                  setModalVisible({ visible: true, data: comptype });
+                }}
+              >
+                查看
+              </Button>
+            ) : (
+              '--'
+            )
+          }
+        />
+        <Column
+          title="可申请角色"
+          dataIndex="compTypeList"
+          render={(roles: any[]) =>
+            roles && roles.length > 0 ? (
+              <Button
+                type="link"
+                onClick={() => {
+                  setModalVisible({ visible: true, data: roles });
+                }}
+              >
+                查看
+              </Button>
+            ) : (
+              '--'
+            )
+          }
+        />
+        <Column
+          title="操作"
+          align="center"
+          render={(_, record: ApitalAccount.ApitalList) => (
+            <>
+              <Button
+                type="link"
+                onClick={() => {
+                  setCurrent(record);
+                  setVisible(true);
+                }}
+              >
+                编辑
+              </Button>
+              <Divider type="vertical" />
+              <Popconfirm title={`是否删除【${record.typeName}】?`} onConfirm={() => handleDelete(+record.id!)} okText="确定" cancelText="取消">
+                <a href="">删除</a>
+              </Popconfirm>
+            </>
+          )}
+        />
+      </Table>
+      <PersonModal item={modalVisible} setShopModal={setModalVisible} />
+    </>
+  );
+}
+import React from "react";
+import { List, Modal } from "antd";
+
+interface Props {
+  item: RpTypeConfig.PersonModal;
+  setShopModal: Function;
+}
+
+export default function PersonModal({ item, setShopModal }: Props) {
+  const { visible, data } = item;
+
+  return (
+    <Modal
+      title="查看"
+      centered
+      open={visible}
+      onCancel={() => setShopModal({ data: [], visible: false })}
+      footer={null}
+    >
+      <List
+        size="small"
+        bordered
+        style={{ maxHeight: 400, overflow: "auto" }}
+        dataSource={data}
+        renderItem={(item: { id: number; name: string }, index) => (
+          <List.Item>
+            {`${index + 1}.`}
+            {item.name}
+          </List.Item>
+        )}
+      />
+    </Modal>
+  );
+}
+import React from 'react';
+import { Card } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import Filter from './components/Filter';
+import List from './components/List';
+import { createStore } from '@/hooks/moz';
+import store from './useStore';
+import ApitalModal from './components/ApitalModal';
+export const { Provider, useStore } = createStore(store);
+
+function ProactiveReimbursement() {
+    return (
+        <PageHeaderWrapper title="主动报销款项配置">
+            <Card>
+                <Filter />
+                <List />
+            </Card>
+            <ApitalModal />
+        </PageHeaderWrapper>
+    );
+}
+export default () => {
+    return (
+        <Provider>
+            <ProactiveReimbursement />
+        </Provider>
+    )
+};
+import { useState } from "react";
+import usePagination from "@/hooks/usePagination";
+import * as api from "./api";
+
+export default function useStore() {
+  const [visible, setVisible] = useState(false);
+  const [modalVisible, setModalVisible] = useState<{ visible: boolean; data: any[] }>({ visible: false, data: [] });
+  //款项配置列表
+  const {
+    list: typeConifgList,
+    loading,
+    setLoading,
+    paginationConfig,
+    innerParams,
+    setParams,
+  } = usePagination<RpTypeConfig.TypeListItems>(api.getRpTypeConfigApi, {configType: 5});
+ 
+  const [current, setCurrent] = useState<ApitalAccount.ApitalList>({});
+
+  return {
+    visible,
+    setVisible,
+    current,
+    setCurrent,
+    modalVisible,
+    setModalVisible,
+    typeConifgList,
+    loading,
+    setLoading,
+    paginationConfig,
+    innerParams,
+    setParams,
+  };
+}