Commit d8b0d18c17df89ebb02f5043fd8ae1e27eaf1f9b
Merge branch 'finance' into 'master'
Finance See merge request !262
Showing
2 changed files
with
19 additions
and
1 deletions
src/pages/finance/FinanceConfig/api.ts
... | ... | @@ -18,6 +18,8 @@ export interface Configs { |
18 | 18 | release_car_before_days?: number; // 票转贷锁车账期恢复,票据日期到期前的天数 |
19 | 19 | pay_employee_trigger_amount?: number; // 月度累计应付金额;允许两位小数,大于等于0,小于1亿 |
20 | 20 | pay_employee_day_of_month?: number; // 次月支付日;大于等于1小于等于31 |
21 | + | |
22 | + financing_repayment_latest?: string; //融资还款截止时间 | |
21 | 23 | } |
22 | 24 | |
23 | 25 | /** | ... | ... |
src/pages/finance/FinanceConfig/index.tsx
1 | 1 | import React, { useEffect, useState } from "react"; |
2 | -import { Card, Form, InputNumber, Button, message, Popconfirm, Result, Radio, Row, Col } from "antd"; | |
2 | +import { Card, Form, InputNumber, Button, message, Popconfirm, Result, Radio, Row, Col, TimePicker } from "antd"; | |
3 | 3 | import { PageHeaderWrapper } from "@ant-design/pro-layout"; |
4 | 4 | import useInitial from "@/hooks/useInitail"; |
5 | 5 | import { getConfigApi, DetailParams, Configs, saveConfigApi } from "./api"; |
6 | +import moment from "moment"; | |
6 | 7 | |
7 | 8 | const FormItem = Form.Item; |
8 | 9 | |
... | ... | @@ -18,12 +19,14 @@ export default function ReimburseConfig() { |
18 | 19 | "ticket_to_loans_backlog_days", |
19 | 20 | "pay_employee_trigger_amount", |
20 | 21 | "pay_employee_day_of_month", |
22 | + "financing_repayment_latest", | |
21 | 23 | ], |
22 | 24 | } |
23 | 25 | ); |
24 | 26 | const [disabled, setDisabled] = useState(true); |
25 | 27 | const [submitLoading, setSubmitLoading] = useState(false); |
26 | 28 | const [form] = Form.useForm(); |
29 | + const format = "HH:mm"; | |
27 | 30 | |
28 | 31 | useEffect(() => { |
29 | 32 | initData(); |
... | ... | @@ -39,6 +42,8 @@ export default function ReimburseConfig() { |
39 | 42 | ...data, |
40 | 43 | online_backtrack_refund: |
41 | 44 | typeof data.online_backtrack_refund == "undefined" ? undefined : data.online_backtrack_refund == "true" ? 1 : 0, |
45 | + financing_repayment_latest: | |
46 | + (data.financing_repayment_latest && moment(data.financing_repayment_latest, format)) || null, | |
42 | 47 | }); |
43 | 48 | } |
44 | 49 | |
... | ... | @@ -48,6 +53,8 @@ export default function ReimburseConfig() { |
48 | 53 | config: { |
49 | 54 | ...feildValue, |
50 | 55 | online_backtrack_refund: !!feildValue.online_backtrack_refund, |
56 | + financing_repayment_latest: | |
57 | + (feildValue.financing_repayment_latest && feildValue.financing_repayment_latest.format(format)) || null, | |
51 | 58 | }, |
52 | 59 | }; |
53 | 60 | saveConfigApi(params) |
... | ... | @@ -173,6 +180,15 @@ export default function ReimburseConfig() { |
173 | 180 | </FormItem> |
174 | 181 | <span>天</span> |
175 | 182 | </FormItem> |
183 | + <FormItem | |
184 | + required | |
185 | + label="融资车还款截止时间" | |
186 | + name="financing_repayment_latest" | |
187 | + style={{ width: "50%", marginLeft: "25%" }} | |
188 | + > | |
189 | + <TimePicker format="HH:mm" disabled={disabled} /> | |
190 | + </FormItem> | |
191 | + | |
176 | 192 | <FormItem wrapperCol={{ offset: 7, span: 14 }} style={{ width: "50%", marginLeft: "25%", marginTop: 40 }}> |
177 | 193 | <Popconfirm title="确定取消?取消将重置数据" onConfirm={() => onHandleCancel(true)}> |
178 | 194 | <Button hidden={disabled} style={{ marginRight: 30 }}> | ... | ... |