FEV2 / fw-cms

Commit 4caa7535c87ea2e1530e96cde28a6d318ddd5bc0

Authored by zhaofeng
1 parent fd743c51

feat(finance): 修复人员资金账户授权回显

Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
package.json
  View file @4caa753
... ... @@ -20,7 +20,7 @@
20 20 "site": "cross-env npm run fetch:blocks && npm run build && npm run functions:build",
21 21 "start": "cross-env REACT_APP_ENV=test NODE_OPTIONS='--max_old_space_size=4096 --openssl-legacy-provider' umi dev",
22 22 "start:dev": "cross-env REACT_APP_ENV=dev HOST=devlocal.feewee.cn NODE_OPTIONS='--max_old_space_size=4096 --openssl-legacy-provider' umi dev",
23   - "start:prod": "cross-env REACT_APP_ENV=prod HOST=local.feewee.cn NODE_OPTIONS='--max_old_space_size=4096 --openssl-legacy-provider' umi dev",
  23 + "start:prod": "cross-env REACT_APP_ENV=prod HOST=local.feewee.cn NODE_OPTIONS=\"--max_old_space_size=4096 --openssl-legacy-provider\" umi dev",
24 24 "start:test": "cross-env REACT_APP_ENV=test HOST=testlocal.feewee.cn NODE_OPTIONS=\"--max_old_space_size=4096 --openssl-legacy-provider\" umi dev",
25 25 "prepare": "husky install"
26 26 },
... ...
src/pages/finance/UserAccountAuth/components/CreateModal.tsx
  View file @4caa753
... ... @@ -21,7 +21,8 @@ export default function CreateModal() {
21 21 form.setFieldsValue({
22 22 roleCode: current.roleCode,
23 23 user: current.userId ? { label: current.userName, value: current.userId } : undefined,
24   - accountId: current.accountId,
  24 + // accountId: current.accountId,
  25 + accountId: { label: `${current.accountName}${current.accountNo ? `(${current.accountNo})` : ""}`, value: current.accountId },
25 26 });
26 27 if (current.roleCode && current.userId) {
27 28 /** 查询员工列表 */
... ... @@ -79,7 +80,7 @@ export default function CreateModal() {
79 80 roleCode: item.roleCode,
80 81 userName: item.user.label,
81 82 userId: item.user.value,
82   - accountId: item.accountId
  83 + accountId: item.accountId||item.accountId.value
83 84 };
84 85 saveUserAuthApi(param).then(res => {
85 86 message.success('保存成功');
... ... @@ -99,7 +100,7 @@ export default function CreateModal() {
99 100 return (
100 101 <Modal
101 102 title={`${current.id ? "编辑" : "新增"}人员资金账户授权`}
102   - visible={visible}
  103 + open={visible}
103 104 onOk={() => form.submit()}
104 105 onCancel={onCancel}
105 106 maskClosable={false}
... ... @@ -166,7 +167,7 @@ export default function CreateModal() {
166 167 const userId = (getFieldValue("user") || {}).value;
167 168 return userId ? (
168 169 <FormItem name="accountId" label="账户" rules={[{ required: true, message: "请选择账户" }]}>
169   - <Select placeholder="请选择账户" showSearch optionFilterProp="label" optionLabelProp="name">
  170 + <Select placeholder="请选择账户" showSearch optionFilterProp="label" optionLabelProp="name" o>
170 171 {accountList.map((item: any) => (
171 172 <Option key={item.id} value={item.id} name={item.name} label={`${item.name}${item.no}`}>
172 173 <Tag color="processing">{item.name}</Tag>
... ...