From e2252dc0e77477dd2f5709c9131437f64d641f3f Mon Sep 17 00:00:00 2001
From: jiangwei <jiangwei.feewee.cn>
Date: Mon, 9 Jan 2023 15:12:53 +0800
Subject: [PATCH] 财富报销设置外勤参数变动

---
 src/pages/finance/Reimburse/FieldService/api.ts               | 4 ++--
 src/pages/finance/Reimburse/FieldService/components/Modal.tsx | 8 ++++----
 src/pages/finance/Reimburse/FieldService/index.tsx            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/finance/Reimburse/FieldService/api.ts b/src/pages/finance/Reimburse/FieldService/api.ts
index f59a1d4..6eff4cd 100644
--- a/src/pages/finance/Reimburse/FieldService/api.ts
+++ b/src/pages/finance/Reimburse/FieldService/api.ts
@@ -7,8 +7,8 @@ type P<T> = http.PromiseResp<T>;
 export interface Item {
   id?: number; //	ID
   groupId?: number; //	集团ID
-  outsideId?: number; //	外勤类型id
-  outsideType?: string; //	外勤类型
+  outsideType?: number; //	外勤类型id
+  outsideTypeName?: string; //	外勤类型
   isAllowReimburse?: boolean; //	是否允许报销
   createBy?: number // 创建人
   updateBy?: number // 修改人
diff --git a/src/pages/finance/Reimburse/FieldService/components/Modal.tsx b/src/pages/finance/Reimburse/FieldService/components/Modal.tsx
index eb8786e..5d3e94c 100644
--- a/src/pages/finance/Reimburse/FieldService/components/Modal.tsx
+++ b/src/pages/finance/Reimburse/FieldService/components/Modal.tsx
@@ -21,7 +21,7 @@ function CreateModal(props: Props) {
     if (visiable && current?.id) {
       form.setFieldsValue({
         isAllowReimburse: current.isAllowReimburse,
-        outsideId: current.outsideId,
+        outsideType: current.outsideType,
         breakfast: current.breakfast,
         lunch: current.lunch,
         dinner: current.dinner,
@@ -34,8 +34,8 @@ function CreateModal(props: Props) {
   const submit = (item:any) => {
     const params = {
       id: current?.id || undefined,
-      outsideId: item.outsideId,
-      outsideType: data.find(i => i.id == item.outsideId)?.name,
+      outsideType: item.outsideType,
+      outsideTypeName: data.find(i => i.id == item.outsideType)?.name,
       isAllowReimburse: item.isAllowReimburse,
       breakfast: item.breakfast,
       lunch: item.lunch,
@@ -83,7 +83,7 @@ function CreateModal(props: Props) {
           </Radio.Group>
         </FormItem>
         <FormItem
-          name="outsideId"
+          name="outsideType"
           label="外勤类型"
           rules={[{ required: true, message: "请选择外勤类型" }]}
         >
diff --git a/src/pages/finance/Reimburse/FieldService/index.tsx b/src/pages/finance/Reimburse/FieldService/index.tsx
index 5b74d98..fa0d971 100644
--- a/src/pages/finance/Reimburse/FieldService/index.tsx
+++ b/src/pages/finance/Reimburse/FieldService/index.tsx
@@ -49,7 +49,7 @@ const CateringSubsidies = () => {
           loading={loading}
           pagination={false}
         >
-          <Column title="外勤类型" dataIndex="outsideType" align="center" />
+          <Column title="外勤类型" dataIndex="outsideTypeName" align="center" />
           <Column title="是否允许报销" align="center" render={r => (r.isAllowReimburse ? '允许' : '不允许')} />
           <Column 
             title="餐费补贴" 
--
libgit2 0.22.2