对接授信申请单查询中

src/constants/index.ts

@@ -888,3 +888,21 @@ export const BILL_TRADE_OPERATION = {
   [BILL_TRADE_OPERATION_ORDER_RETURN]: '订单退款', 
   [BILL_TRADE_OPERATION_REPAYMENT]: '还款', 
 };
+
+// 授信内部状态
+export const CREDIT_INNER_STATUS_UNCOMMITTED = 1;              // 待提交审核
+export const CREDIT_INNER_STATUS_COMMITTED = 2;                // 提交审核
+export const CREDIT_INNER_STATUS_SUCCESS_1 = 3;                // 一级审核通过
+export const CREDIT_INNER_STATUS_SUCCESS_2 = 4;                // 二级审核通过
+export const CREDIT_INNER_STATUS_FAILED = 6;                   // 审核不通过
+export const CREDIT_INNER_STATUS_CONFIRM_SUCCESS = 7;          // 确认审核通过
+export const CREDIT_INNER_STATUS_CONFIRM_FAILED = 8;           // 确认审核不通过
+export const CREDIT_INNER_STATUS = {
+  [CREDIT_INNER_STATUS_UNCOMMITTED]: '待提交审核', 
+  [CREDIT_INNER_STATUS_COMMITTED]: '提交审核', 
+  [CREDIT_INNER_STATUS_SUCCESS_1]: '一级审核通过', 
+  [CREDIT_INNER_STATUS_SUCCESS_2]: '二级审核通过', 
+  [CREDIT_INNER_STATUS_FAILED]: '审核不通过', 
+  [CREDIT_INNER_STATUS_CONFIRM_SUCCESS]: '确认审核通过', 
+  [CREDIT_INNER_STATUS_CONFIRM_FAILED]: '确认审核不通过', 
+};
\ No newline at end of file

src/pages/payandSettle/constant.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-10-15 15:41:51
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-10-15 15:44:52
+ * @LastEditTime: 2020-10-26 14:31:13
  * @Description: 
  */
 import {
@@ -19,24 +19,13 @@ export const BILL_TRADE_STATUS_UNCONFIRMED = 1;        // 待确认还款结果
 export const BILL_TRADE_STATUS_OUTSTANDIND = 2;        // 确认未到账 
 export const BILL_TRADE_STATUS_RECEIVED = 3;           // 确认到账 
 
+// 账单状态 StatusTag map
 export const BILL_TRADE_STATUS_TAB_MAP = {
   [BILL_TRADE_STATUS_UNCONFIRMED]: 'primary', 
   [BILL_TRADE_STATUS_OUTSTANDIND]: 'danger', 
   [BILL_TRADE_STATUS_RECEIVED]: 'success', 
 };
 
-export const STATUS_COLOR_MAP = {
-  0: '#669EDE',
-  1: '#41CC9E',
-  2: '#EF6260',
-};
-
-export const STATUS_COLOR_TXT = {
-  0: '待审核',
-  1: '审核通过',
-  2: '冻结',
-};
-
 // 还款状态 StatusTag map
 export const CREDIT_REPAYMENT_STATUS_TAG_MAP = {
   [CREDIT_REPAYMENT_STATUS_OUTSTANDING]: 'default',
@@ -46,15 +35,9 @@ export const CREDIT_REPAYMENT_STATUS_TAG_MAP = {
 };
 
 // 会员状态 StatusTag map
-export const MEMBER_STATUS_TAG_MAP = {
-  [MEMBER_STATUS_NORMAL]: 'success',
-  [MEMBER_STATUS_FROZEN]: 'default'
-};
-
-// 会员状态 StatusTag map
 export const MEMBER_STATUS_BADGE_MAP = {
-  1: '#EF6260',
-  2: '#EF6260',
+  [MEMBER_STATUS_NORMAL]: '#EF6260',
+  [MEMBER_STATUS_FROZEN]: '#EF6260',
 };
 
 

src/pages/payandSettle/creditApplication/quotaFormQuery/index.tsx

@@ -4,9 +4,11 @@ import {
   ClockCircleOutlined,
 } from '@ant-design/icons';
 import { StandardTable } from 'god';
+import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { createFormActions } from '@formily/antd';
+import { PublicApi } from '@/services/api';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
@@ -53,7 +55,7 @@ const QuotaFormQuery: React.FC = () => {
   const defaultColumns: ColumnType<any>[] = [
     {
       title: '申请单号/时间',
-      dataIndex: 'orderNo',
+      dataIndex: 'applyNo',
       align: 'center',
       render: (text, record) => (
         <>
@@ -63,46 +65,46 @@ const QuotaFormQuery: React.FC = () => {
             {text}
           </EyePreview>
           <div>
-            <ClockCircleOutlined /> {record.applicationTime}
+            <ClockCircleOutlined /> {record.applyTime}
           </div>
         </>
       ),
     },
     {
       title: '会员归属',
-      dataIndex: 'memberName',
+      dataIndex: 'parentMemberName',
       align: 'center',
     },
     {
       title: '会员类型',
-      dataIndex: 'memberType',
+      dataIndex: 'memberTypeName',
       align: 'center',
     },
     {
       title: '会员角色',
-      dataIndex: 'memberRole',
+      dataIndex: 'memberRoleName',
       align: 'center',
       render: (text, record) => <>{text}</>,
     },
     {
       title: '所属会员等级',
-      dataIndex: 'memberLevel',
+      dataIndex: 'memberLevelName',
       align: 'center',
       render: (text, record) => <>{text}</>,
     },
     {
       title: '调整前额度(元)',
-      dataIndex: 'before',
+      dataIndex: 'originalQuota',
       align: 'center',
     },
     {
       title: '申请调整后额度(元)',
-      dataIndex: 'after',
+      dataIndex: 'applyQuota',
       align: 'center', 
     },
     {
       title: '外部状态',
-      dataIndex: 'outerStatus',
+      dataIndex: 'outerStatusName',
       align: 'center',
       filters: [],
       onFilter: (value, record) => record.outerStatus === value,
@@ -112,7 +114,7 @@ const QuotaFormQuery: React.FC = () => {
     },
     {
       title: '内部状态',
-      dataIndex: 'innerStatus',
+      dataIndex: 'innerStatusName',
       align: 'center',
       filters: [],
       onFilter: (value, record) => record.innerStatus === value,
@@ -123,9 +125,22 @@ const QuotaFormQuery: React.FC = () => {
   const [columns, setColumns] = useState<any[]>(defaultColumns);
 
   const fetchListData = (params: any) => {
-    return Promise.resolve({
-      total: 2,
-      data: mock,
+    const { startTime, endTime, ...rest } = params; 
+    return new Promise((resolve, reject) => {
+      PublicApi.getPayCreditApplyPageCreditApply({
+        startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null, 
+        endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null, 
+        ...rest, 
+      })
+        .then(res => {
+          if (res.code === 1000) {
+            resolve(res.data);
+          }
+          reject();
+        })
+        .catch(() => {
+          reject();
+        });
     });
   };
 

src/pages/payandSettle/creditApplication/quotaFormQuery/schema/index.ts

@@ -16,7 +16,7 @@ export const listSearchSchema: ISchema = {
       type: 'object',
       'x-component': 'mega-layout',
       properties: {
-        name: {
+        applyNo: {
           type: 'string',
           'x-component': 'Search',
           'x-component-props': {
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
             columns: 6,
           },
           properties: {
-            '[startDate, endDate]': {
+            '[startTime, endTime]': {
               type: 'string',
               default: '',
               'x-component': 'dateSelect', 
@@ -44,7 +44,7 @@ export const listSearchSchema: ISchema = {
                 allowClear: true, 
               },
             },
-            outterStatus: {
+            outerStatus: {
               type: 'string',
               default: undefined,
               enum: [],

src/pages/payandSettle/creditManage/constant.tsx

-import {
-  MEMBER_STATUS_NORMAL,
-  MEMBER_STATUS_FROZEN,
-
-  MEMBER_INNER_STATUS_REGISTERED,
-  MEMBER_INNER_STATUS_UNCOMMITTED,
-  MEMBER_INNER_STATUS_UNREVIEWED_1,
-  MEMBER_INNER_STATUS_UNREVIEWED_2,
-  MEMBER_INNER_STATUS_FAILED,
-  MEMBER_INNER_STATUS_SUCCESS,
-
-  MEMBER_OUTER_STATUS_UNCOMMITTED,
-  MEMBER_OUTER_STATUS_UNREVIEWED,
-  MEMBER_OUTER_STATUS_FAILED,
-  MEMBER_OUTER_STATUS_SUCCESS,
-} from '@/constants';
-
-export const STATUS_COLOR_MAP = {
-  0: '#669EDE',
-  1: '#41CC9E',
-  2: '#EF6260',
-};
-
-export const STATUS_COLOR_TXT = {
-  0: '待审核',
-  1: '审核通过',
-  2: '冻结',
-};
-
-// 会员状态 StatusTag map
-export const MEMBER_STATUS_TAG_MAP = {
-  [MEMBER_STATUS_NORMAL]: 'success',
-  [MEMBER_STATUS_FROZEN]: 'default'
-};
-
-// 会员内部状态 StatusTag map
-export const MEMBER_INNER_STATUS_TYPE = {
-  [MEMBER_INNER_STATUS_REGISTERED]: 'default',
-  [MEMBER_INNER_STATUS_UNCOMMITTED]: 'primary',
-  [MEMBER_INNER_STATUS_UNREVIEWED_1]: 'warnning',
-  [MEMBER_INNER_STATUS_UNREVIEWED_2]: 'warnning',
-  [MEMBER_INNER_STATUS_FAILED]: 'danger',
-  [MEMBER_INNER_STATUS_SUCCESS]: 'success',
-};
-
-// 会员外部状态 StatusTag map
-export const MEMBER_OUTER_STATUS_TYPE = {
-  [MEMBER_OUTER_STATUS_UNCOMMITTED]: 'primary',
-  [MEMBER_OUTER_STATUS_UNREVIEWED]: 'warnning',
-  [MEMBER_OUTER_STATUS_FAILED]: 'danger',
-  [MEMBER_OUTER_STATUS_SUCCESS]: 'success',
-};
-
-// 会员内部状态 Tag badge map
-export const MEMBER_INNER_STATUS_BADGE_COLOR = {
-  [MEMBER_INNER_STATUS_REGISTERED]: '#606266',
-  [MEMBER_INNER_STATUS_UNCOMMITTED]: '#669EDE',
-  [MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FFC400',
-  [MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FFC400',
-  [MEMBER_INNER_STATUS_FAILED]: '#EF6260',
-  [MEMBER_INNER_STATUS_SUCCESS]: '#41CC9E',
-};
-
-// 会员外部状态 Tag badge map
-export const MEMBER_OUTER_STATUS_BADGE_COLOR = {
-  [MEMBER_OUTER_STATUS_UNCOMMITTED]: '#669EDE',
-  [MEMBER_OUTER_STATUS_UNREVIEWED]: '#FFC400',
-  [MEMBER_OUTER_STATUS_FAILED]: '#EF6260',
-  [MEMBER_OUTER_STATUS_SUCCESS]: '#41CC9E',
-};
\ No newline at end of file