对接结算策略

src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx

@@ -24,7 +24,7 @@ import { PublicApi } from '@/services/api';
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { history, Prompt } from 'umi'
 import { useLinkageUtils } from '@/utils/formEffectUtils'
-const { onFormInit$ } = FormEffectHooks
+const { onFormInit$, onFieldValueChange$ } = FormEffectHooks
 
 export const fetchOptions = (service) => {
   return async function() {
@@ -61,6 +61,7 @@ const MemberSettleAdd: React.FC = () => {
   const [visible,  setVisible] = useState(false)
   const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'memberId' });
   const [initialValue, setInitialValue] = useState({});
+  const [cacheMember, setCacheMember] = useState([]);
   const { id, preview } = usePageStatus();
   const [submitLoading, setSubmitLoading ] = useState(false);
   const [unsaved, setUnsaved] = useState(true);
@@ -122,10 +123,9 @@ const MemberSettleAdd: React.FC = () => {
         }
       });
     })
-  
-   
   }
 
+
   // 使用会员弹框确认
   const handleOkAddMember = () => {
     formActions.setFieldValue('Tabs.memberTab.someLists', memberRowCtl.selectRow);
@@ -144,10 +144,11 @@ const MemberSettleAdd: React.FC = () => {
     const tempData = {
       name: value.name,
       settlementOrderType: value.settlementOrderType,
-      memberList: memberList,
+      memberList: value.isDefault ? [] : memberList,
       settlementWay: value.settlementWay.active,
       settlementDays: value.settlementWay.otherValues[0],
       settlementDate: value.settlementWay.otherValues[1],
+      isDefault: value.isDefault
     }
     const serviceActions = isAdd
     ? PublicApi.postSettleAccountsPlatformConfigAddPlatformSettlementStrategy
@@ -211,13 +212,15 @@ const MemberSettleAdd: React.FC = () => {
         if(res.code === 1000) {
           setInitialValue({
             name: res.data.name,
-            // settlementOrderType: res.data.settlementOrderType,
+            settlementOrderType: res.data.settlementOrderType,
             memberList: res.data.memberList,
             settlementWay: {
               active: res.data.settlementWay,
               otherValues: [res.data.settlementDays, res.data.settlementDate],
-            }
+            },
+            
           })
+          formActions.setFieldValue('Tabs.memberTab.layout.isDefault', res.data.isDefault)
           formActions.setFieldValue('Tabs.memberTab.someLists', res.data.memberList);
           // 必须设置key
           memberRowCtl.setSelectRow(res.data.memberList);
@@ -253,10 +256,10 @@ const MemberSettleAdd: React.FC = () => {
           schema={addSchema}
           effects={() =>  {
             // 获取单据类型
-            // useAsyncSelect( 
-            //   "settlementOrderType", 
-            //   fetchOptions(PublicApi.getSettleAccountsCommonGetStrategySettlementOrderType)
-            // )
+            useAsyncSelect( 
+              "settlementOrderType", 
+              fetchOptions(PublicApi.getSettleAccountsCommonGetPlatformStrategySettlementOrderType )
+            )
           }}
         />
         

src/pages/ruleSettingManage/platformSettlementStrategy/info/schema.tsx

@@ -61,14 +61,14 @@ export const addSchema: ISchema = {
                     }
                   }
                 },
-                // settlementOrderType: {
-                //   type: 'string',
-                //   enum: [],
-                //   title: '结算单据',
-                //   'x-rules': [
-                //     {required: true, message: '请填写策略名称'},
-                //   ]
-                // }
+                settlementOrderType: {
+                  type: 'string',
+                  enum: [],
+                  title: '结算单据',
+                  'x-rules': [
+                    {required: true, message: '请填写策略名称'},
+                  ]
+                }
               },
             }
           }
@@ -89,11 +89,11 @@ export const addSchema: ISchema = {
                 labelAlign: 'left'
               },
               properties: {
-                isAllMember: {
+                isDefault: {
                   type: 'radio',
                   enum: [
                     {label: '所有会员(默认)', value: 1},
-                    {label: '指定会员', value: 2},
+                    {label: '指定会员', value: 0},
                   ],
                   default: 1,
                   title: '适用会员',
@@ -101,7 +101,7 @@ export const addSchema: ISchema = {
                     {
                       type: 'value:visible',
                       target: '*(someLists)',
-                      condition: '{{$value === 2}}'
+                      condition: '{{$value === 0}}'
                     }
                   ]
                 }

src/pages/ruleSettingManage/platformSettlementStrategy/list/index.tsx

@@ -53,8 +53,8 @@ const MemberSettle: React.FC<{}> = () => {
         )
       }
     },
-    { title: '结算方式', dataIndex: 'settlementOrderTypeName'},
-    { title: '结算单据',dataIndex: 'settlementWayName'},
+    { title: '结算方式', dataIndex: 'settlementWayName'},
+    { title: '结算单据',dataIndex: 'settlementOrderTypeName'},
     {
       title: '状态',
       dataIndex: 'status',