Commit e2252dc0e77477dd2f5709c9131437f64d641f3f
1 parent
f02065e0
财富报销设置外勤参数变动
Showing
3 changed files
with
7 additions
and
7 deletions
src/pages/finance/Reimburse/FieldService/api.ts
| @@ -7,8 +7,8 @@ type P<T> = http.PromiseResp<T>; | @@ -7,8 +7,8 @@ type P<T> = http.PromiseResp<T>; | ||
| 7 | export interface Item { | 7 | export interface Item { |
| 8 | id?: number; // ID | 8 | id?: number; // ID |
| 9 | groupId?: number; // 集团ID | 9 | groupId?: number; // 集团ID |
| 10 | - outsideId?: number; // 外勤类型id | ||
| 11 | - outsideType?: string; // 外勤类型 | 10 | + outsideType?: number; // 外勤类型id |
| 11 | + outsideTypeName?: string; // 外勤类型 | ||
| 12 | isAllowReimburse?: boolean; // 是否允许报销 | 12 | isAllowReimburse?: boolean; // 是否允许报销 |
| 13 | createBy?: number // 创建人 | 13 | createBy?: number // 创建人 |
| 14 | updateBy?: number // 修改人 | 14 | updateBy?: number // 修改人 |
src/pages/finance/Reimburse/FieldService/components/Modal.tsx
| @@ -21,7 +21,7 @@ function CreateModal(props: Props) { | @@ -21,7 +21,7 @@ function CreateModal(props: Props) { | ||
| 21 | if (visiable && current?.id) { | 21 | if (visiable && current?.id) { |
| 22 | form.setFieldsValue({ | 22 | form.setFieldsValue({ |
| 23 | isAllowReimburse: current.isAllowReimburse, | 23 | isAllowReimburse: current.isAllowReimburse, |
| 24 | - outsideId: current.outsideId, | 24 | + outsideType: current.outsideType, |
| 25 | breakfast: current.breakfast, | 25 | breakfast: current.breakfast, |
| 26 | lunch: current.lunch, | 26 | lunch: current.lunch, |
| 27 | dinner: current.dinner, | 27 | dinner: current.dinner, |
| @@ -34,8 +34,8 @@ function CreateModal(props: Props) { | @@ -34,8 +34,8 @@ function CreateModal(props: Props) { | ||
| 34 | const submit = (item:any) => { | 34 | const submit = (item:any) => { |
| 35 | const params = { | 35 | const params = { |
| 36 | id: current?.id || undefined, | 36 | id: current?.id || undefined, |
| 37 | - outsideId: item.outsideId, | ||
| 38 | - outsideType: data.find(i => i.id == item.outsideId)?.name, | 37 | + outsideType: item.outsideType, |
| 38 | + outsideTypeName: data.find(i => i.id == item.outsideType)?.name, | ||
| 39 | isAllowReimburse: item.isAllowReimburse, | 39 | isAllowReimburse: item.isAllowReimburse, |
| 40 | breakfast: item.breakfast, | 40 | breakfast: item.breakfast, |
| 41 | lunch: item.lunch, | 41 | lunch: item.lunch, |
| @@ -83,7 +83,7 @@ function CreateModal(props: Props) { | @@ -83,7 +83,7 @@ function CreateModal(props: Props) { | ||
| 83 | </Radio.Group> | 83 | </Radio.Group> |
| 84 | </FormItem> | 84 | </FormItem> |
| 85 | <FormItem | 85 | <FormItem |
| 86 | - name="outsideId" | 86 | + name="outsideType" |
| 87 | label="外勤类型" | 87 | label="外勤类型" |
| 88 | rules={[{ required: true, message: "请选择外勤类型" }]} | 88 | rules={[{ required: true, message: "请选择外勤类型" }]} |
| 89 | > | 89 | > |
src/pages/finance/Reimburse/FieldService/index.tsx
| @@ -49,7 +49,7 @@ const CateringSubsidies = () => { | @@ -49,7 +49,7 @@ const CateringSubsidies = () => { | ||
| 49 | loading={loading} | 49 | loading={loading} |
| 50 | pagination={false} | 50 | pagination={false} |
| 51 | > | 51 | > |
| 52 | - <Column title="外勤类型" dataIndex="outsideType" align="center" /> | 52 | + <Column title="外勤类型" dataIndex="outsideTypeName" align="center" /> |
| 53 | <Column title="是否允许报销" align="center" render={r => (r.isAllowReimburse ? '允许' : '不允许')} /> | 53 | <Column title="是否允许报销" align="center" render={r => (r.isAllowReimburse ? '允许' : '不允许')} /> |
| 54 | <Column | 54 | <Column |
| 55 | title="餐费补贴" | 55 | title="餐费补贴" |