Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

* 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform: fix: 修复上级渠道id拿不到的问题 🐞 fix(): 修改采购询价报价bug chore: 修改代理城市为必填 chore: 删除 columns 居中对齐 fix: 修复日期查询格式不对的问题 chore: 添加字符长度限制

Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm
b34ec73d · 卢均锐 · 8c2e7cdf · a3d7a9ec · b34ec73d · b34ec73d
Commit b34ec73d authored Jul 12, 2021 by 卢均锐
44 changed files
--- a/src/pages/member/common/columns/verifyChangeColumn.tsx
+++ b/src/pages/member/common/columns/verifyChangeColumn.tsx
@@ -40,17 +40,14 @@ const columns = (target = '/memberCenter/memberAbility/manage/memberPrSubmit/det
  {
    title: '会员类型',
    dataIndex: 'memberTypeName',
-    align: 'center',
  },
  {
    title: '会员角色',
    dataIndex: 'roleName',
-    align: 'center',
  },
  {
    title: '外部状态',
    dataIndex: 'outerStatusName',
-    align: 'center',
    render: (text, record) => (
      <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
    ),
@@ -58,7 +55,6 @@ const columns = (target = '/memberCenter/memberAbility/manage/memberPrSubmit/det
  {
    title: '内部状态',
    dataIndex: 'innerStatusName',
-    align: 'center',
    render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />,
  },
 ]);

--- a/src/pages/member/common/columns/verifyComingColumn.tsx
+++ b/src/pages/member/common/columns/verifyComingColumn.tsx
@@ -41,17 +41,14 @@ const columns = (target = '/memberCenter/memberAbility/manage/memberPrSubmit/det
  {
    title: '会员类型',
    dataIndex: 'memberTypeName',
-    align: 'center',
  },
  {
    title: '会员角色',
    dataIndex: 'roleName',
-    align: 'center',
  },
  {
    title: '申请来源/时间',
    dataIndex: 'sourceName',
-    align: 'center',
    render: (text, record) => (
      <>
        <div>{text}</div>
@@ -62,7 +59,6 @@ const columns = (target = '/memberCenter/memberAbility/manage/memberPrSubmit/det
  {
    title: '外部状态',
    dataIndex: 'outerStatusName',
-    align: 'center',
    render: (text, record) => (
      <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
    ),
@@ -70,7 +66,6 @@ const columns = (target = '/memberCenter/memberAbility/manage/memberPrSubmit/det
  {
    title: '内部状态',
    dataIndex: 'innerStatusName',
-    align: 'center',
    render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus] || '#606266'} text={text} />,
  },
 ]);

--- a/src/pages/member/components/LevelInfo/index.tsx
+++ b/src/pages/member/components/LevelInfo/index.tsx
@@ -59,27 +59,22 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '获取项目',
      dataIndex: 'ruleName',
-      align: 'center',
    },
    {
      title: '获取分值',
      dataIndex: 'score',
-      align: 'center',
    },
    {
      title: '获取时间',
      dataIndex: 'createTime',
-      align: 'center',
    },
    {
      title: '备注',
      dataIndex: 'remark',
-      align: 'center',
      ellipsis: true,
    },
  ];

--- a/src/pages/member/components/MemberActivePointRecords/index.tsx
+++ b/src/pages/member/components/MemberActivePointRecords/index.tsx
@@ -62,27 +62,22 @@ const MemberActivePointRecords: React.FC<IProps> = (props: IProps) => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '获取项目',
      dataIndex: 'ruleName',
-      align: 'center',
    },
    {
      title: '获取分值',
      dataIndex: 'score',
-      align: 'center',
    },
    {
      title: '获取时间',
      dataIndex: 'createTime',
-      align: 'center',
    },
    {
      title: '备注',
      dataIndex: 'remark',
-      align: 'center',
      ellipsis: true,
    },
  ];

--- a/src/pages/member/components/MemberEvaluation/index.tsx
+++ b/src/pages/member/components/MemberEvaluation/index.tsx
@@ -88,27 +88,22 @@ const MemberOrderEvaluation: React.FC<IProps> = (props: IProps) => {
    {
      title: ' ',
      dataIndex: 'title',
-      align: 'center',
    },
    {
      title: '最近7天',
      dataIndex: 'last7days',
-      align: 'center',
    },
    {
      title: '最近30天',
      dataIndex: 'last30days',
-      align: 'center',
    },
    {
      title: '最近180天',
      dataIndex: 'last180days',
-      align: 'center',
    },
    {
      title: '180天前',
      dataIndex: 'before180days',
-      align: 'center',
    },
  ];

@@ -164,7 +159,6 @@ const MemberOrderEvaluation: React.FC<IProps> = (props: IProps) => {
    {
      title: '评论',
      dataIndex: 'star',
-      align: 'center',
      filters: [
        {
          text: '差评',
@@ -185,30 +179,25 @@ const MemberOrderEvaluation: React.FC<IProps> = (props: IProps) => {
    {
      title: '评价内容',
      dataIndex: 'comment',
-      align: 'center',
      ellipsis: true, 
    },
    {
      title: '商品名称/数量',
      dataIndex: 'product',
-      align: 'center', 
      ellipsis: true,
      render: (text, record) => `${text}/${record.purchaseCount}`,
    },
    {
      title: '评价方',
      dataIndex: 'byMemberName',
-      align: 'center',
    },
    {
      title: '交易时间',
      dataIndex: 'createTime',
-      align: 'center',
    },
    {
      title: '订单号',
      dataIndex: 'orderNo',
-      align: 'center',
    },
  ];


--- a/src/pages/member/components/MemberFeedbackRecords/index.tsx
+++ b/src/pages/member/components/MemberFeedbackRecords/index.tsx
@@ -115,19 +115,16 @@ const MemberFeedbackRecords: React.FC<IProps> = (props: IProps) => {
    {
      title: '事件时间',
      dataIndex: 'eventTime',
-      align: 'center',
      ellipsis: true,
    },
    {
      title: '处理时间',
      dataIndex: 'handleTime',
-      align: 'center',
      ellipsis: true,
    },
    {
      title: '处理结果',
      dataIndex: 'result',
-      align: 'center',
      ellipsis: true,
    },
  ];

--- a/src/pages/member/components/MemberRightsRecords/index.tsx
+++ b/src/pages/member/components/MemberRightsRecords/index.tsx
@@ -103,27 +103,22 @@ const MemberRightsRecords: React.FC<IProps> = (props: IProps) => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '会员权益名称',
      dataIndex: 'rightTypeName',
-      align: 'center',
    },
    {
      title: '获取数量',
      dataIndex: 'point',
-      align: 'center',
    },
    {
      title: '获取时间',
      dataIndex: 'createTime',
-      align: 'center',
    },
    {
      title: '备注',
      dataIndex: 'remark',
-      align: 'center',
      ellipsis: true, 
    },
  ];
@@ -132,32 +127,26 @@ const MemberRightsRecords: React.FC<IProps> = (props: IProps) => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '会员权益名称',
      dataIndex: 'rightTypeName',
-      align: 'center',
    },
    {
      title: '会员权益使用名称',
      dataIndex: 'spendTypeName',
-      align: 'center',
    },
    {
      title: '使用数量',
      dataIndex: 'point',
-      align: 'center',
    },
    {
      title: '使用时间',
      dataIndex: 'createTime',
-      align: 'center',
    },
    {
      title: '备注',
      dataIndex: 'remark',
-      align: 'center',
      ellipsis: true, 
    },
  ];

--- a/src/pages/member/components/ModifyChannelDrawer/index.tsx
+++ b/src/pages/member/components/ModifyChannelDrawer/index.tsx
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2021-07-07 13:47:02
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-07 15:16:50
+ * @LastEditTime: 2021-07-12 10:41:15
 * @Description: 修改渠道信息 抽屉
 */
 import React, { useEffect } from 'react';
@@ -159,7 +159,7 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
    // 渠道上级id，如果没有也是返回只有一项的数组
    if (upperMembers.length === 1 && !upperMembers[0].upperRelationId) {
      formActions.setFieldState('upperRelationId', state => {
-        FormPath.setIn(state, 'visible', false);
+        FormPath.setIn(state, 'display', false);
      });
    } else {
      const upperMembersOptions = upperMembers.map(item => ({ label: item.name, value: item.upperRelationId }));

--- a/src/pages/member/components/ModifyChannelDrawer/schema.ts
+++ b/src/pages/member/components/ModifyChannelDrawer/schema.ts
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2021-07-07 13:48:35
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-07 13:48:36
+ * @LastEditTime: 2021-07-12 10:23:41
 * @Description: 
 */
 import { ISchema } from '@formily/antd';
@@ -51,6 +51,7 @@ export const schema: ISchema = {
            areaCodes: {
              type: 'array',
              title: '代理城市',
+              required: true, 
              'x-component': 'CustomAddArray',
              default: [],
              items: {

--- a/src/pages/member/components/ModifyClassifyDrawer/schema.ts
+++ b/src/pages/member/components/ModifyClassifyDrawer/schema.ts
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2021-07-07 15:23:11
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-09 18:11:26
+ * @LastEditTime: 2021-07-12 09:58:03
 * @Description: 
 */
 import { ISchema } from '@formily/antd';
@@ -75,6 +75,10 @@ export const schema: ISchema = {
                  pattern: PATTERN_MAPS.money,
                  message: '请输入数值，最多支持小数点后两位',
                },
+                {
+                  max: 8,
+                  message: '最多支持8个字符',
+                },
              ],
            },
            areaCodes: {

--- a/src/pages/member/constant.tsx
+++ b/src/pages/member/constant.tsx
@@ -123,18 +123,15 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
  {
    title: '序号',
    dataIndex: 'index',
-    align: 'center',
    render: (text, record, index) => index + 1,
  },
  {
    title: '操作角色',
    dataIndex: 'operatorRoleName',
-    align: 'center',
  },
  {
    title: '状态',
    dataIndex: 'outerStatusName',
-    align: 'center', 
    render: (text, record) => (
      <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
    ),
@@ -142,18 +139,15 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
  {
    title: '操作',
    dataIndex: 'operation',
-    align: 'center',
  },
  {
    title: '操作时间',
    dataIndex: 'createTime',
-    align: 'center',
    ellipsis: true, 
  },
  {
    title: '审核意见',
    dataIndex: 'remark',
-    align: 'center',
    ellipsis: true, 
  },
 ];
@@ -162,28 +156,23 @@ export const MEMBER_INNER_COLUMNS: EditableColumns[] = [
  {
    title: '序号',
    dataIndex: 'index',
-    align: 'center',
    render: (text, record, index) => index + 1,
  },
  {
    title: '操作人',
    dataIndex: 'operatorName',
-    align: 'center',
  },
  {
    title: '部门',
    dataIndex: 'operatorOrgName',
-    align: 'center',
  },
  {
    title: '职位',
    dataIndex: 'operatorJobTitle',
-    align: 'center',
  },
  {
    title: '状态',
    dataIndex: 'innerStatusName',
-    align: 'center', 
    render: (text, record) => (
      <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus]} text={text} />
    ),
@@ -191,18 +180,15 @@ export const MEMBER_INNER_COLUMNS: EditableColumns[] = [
  {
    title: '操作',
    dataIndex: 'operation',
-    align: 'center',
  },
  {
    title: '操作时间',
    dataIndex: 'createTime',
-    align: 'center',
    ellipsis: true, 
  },
  {
    title: '审核意见',
    dataIndex: 'remark',
-    align: 'center',
    ellipsis: true, 
  },
 ];
\ No newline at end of file
--- a/src/pages/member/memberFlowRule/components/FlowRuleForm/components/ComingConfigTable/index.tsx
+++ b/src/pages/member/memberFlowRule/components/FlowRuleForm/components/ComingConfigTable/index.tsx
@@ -54,7 +54,6 @@ const ComingConfigTable = (props) => {
      title: '操作',
      dataIndex: 'option',
      width: '20%',
-      align: 'center',
      render: (_, record: any) => (
        <>
          {editable && (

--- a/src/pages/member/memberFlowRule/components/FlowRuleForm/components/PlatformConfigTable/index.tsx
+++ b/src/pages/member/memberFlowRule/components/FlowRuleForm/components/PlatformConfigTable/index.tsx
@@ -56,7 +56,6 @@ const PlatformConfigTable = (props: IProps) => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '中文名称',

--- a/src/pages/member/memberFlowRule/index.tsx
+++ b/src/pages/member/memberFlowRule/index.tsx
@@ -89,7 +89,6 @@ const MemberFlowRule: React.FC<[]> = () => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '流程规则名称',
@@ -107,22 +106,18 @@ const MemberFlowRule: React.FC<[]> = () => {
    {
      title: '会员角色',
      dataIndex: 'roleName',
-      align: 'center',
    },
    {
      title: '角色类型',
      dataIndex: 'roleTypeName',
-      align: 'center',
    },
    {
      title: '会员类型',
      dataIndex: 'memberTypeName',
-      align: 'center',
    },
    {
      title: '业务类型',
      dataIndex: 'businessTypeName',
-      align: 'center',
    },
    {
      title: '操作时间',
@@ -131,7 +126,6 @@ const MemberFlowRule: React.FC<[]> = () => {
    {
      title: '状态',
      dataIndex: 'status',
-      align: 'center',
      render: (_, record) => (
        <StatusSwitch
          fieldNames="status"
@@ -144,7 +138,6 @@ const MemberFlowRule: React.FC<[]> = () => {
      title: '操作',
      dataIndex: 'option',
      width: '20%',
-      align: 'center',
      render: (_, record: any) => (
        <>
          <Button

--- a/src/pages/member/memberImport/components/MemberForm/index.tsx
+++ b/src/pages/member/memberImport/components/MemberForm/index.tsx
@@ -157,7 +157,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
    // 渠道上级id，如果没有也是返回只有一项的数组
    if (upperMembers.length === 1 && !upperMembers[0].upperRelationId) {
      formActions.setFieldState('upperRelationId', state => {
-        FormPath.setIn(state, 'visible', false);
+        FormPath.setIn(state, 'display', false);
      });
    } else {
      const upperMembersOptions = upperMembers.map(item => ({ label: item.name, value: item.upperRelationId }));

--- a/src/pages/member/memberImport/components/MemberForm/schema/index.ts
+++ b/src/pages/member/memberImport/components/MemberForm/schema/index.ts
@@ -157,6 +157,7 @@ export const initDetailSchema = (props: GroupItem[]) => {
              areas: {
                type: 'array',
                title: '代理城市',
+                required: true, 
                'x-component': 'CustomAddArray',
                default: [],
                items: {

--- a/src/pages/member/memberImport/index.tsx
+++ b/src/pages/member/memberImport/index.tsx
@@ -129,7 +129,6 @@ const MemberMaintain: React.FC<[]> = () => {
    {
      title: '外部状态',
      dataIndex: 'outerStatusName',
-      align: 'center',
      render: (text, record) => (
        <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
      ),
@@ -138,7 +137,6 @@ const MemberMaintain: React.FC<[]> = () => {
      title: '操作',
      dataIndex: 'option',
      width: '20%',
-      align: 'center',
      render: (text: any, record: any) => (
        <>
          {/* 外部审核状态等于 待提交 可进行提交操作 */}

--- a/src/pages/member/memberLevel/components/DetailInfo/index.tsx
+++ b/src/pages/member/memberLevel/components/DetailInfo/index.tsx
@@ -77,39 +77,32 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '会员权益名称',
      dataIndex: 'name',
-      align: 'center',
    },
    {
      title: '会员权益说明',
      dataIndex: 'remark',
-      align: 'center',
    },
    {
      title: '权益获取方式',
      dataIndex: 'acquireWay',
-      align: 'center',
    },
    {
      title: '参数设置方式',
      dataIndex: 'paramWay',
-      align: 'center',
    },
    {
      title: '参数',
      dataIndex: 'param',
-      align: 'center',
      width: '20%',
      editable: isEdit, 
    },
    {
      title: '状态',
      dataIndex: 'status',
-      align: 'center',
      render: (_, record: any) => (
        isEdit ? (
          <StatusSwitch

--- a/src/pages/member/memberLevel/index.tsx
+++ b/src/pages/member/memberLevel/index.tsx
@@ -32,12 +32,10 @@ const MemberLevel: React.FC<[]> = () => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
    },
    {
      title: '会员等级',
      dataIndex: 'level',
-      align: 'center',
      render: (text: any, record: any) => (
        <div className={styles[`levelIcon${record.level}`]}></div>
      ),
@@ -45,7 +43,6 @@ const MemberLevel: React.FC<[]> = () => {
    {
      title: '会员等级标签',
      dataIndex: 'levelTag',
-      align: 'center',
      key: 'levelTag',
      render: (text: any, record: any) => (
        <EyePreview
@@ -58,37 +55,30 @@ const MemberLevel: React.FC<[]> = () => {
    {
      title: '会员等级类型',
      dataIndex: 'memberLevelTypeName',
-      align: 'center',
    },
    {
      title: '升级分值标签',
      dataIndex: 'scoreTag',
-      align: 'center',
    },
    {
      title: '会员角色名称',
      dataIndex: 'roleName',
-      align: 'center',
    },
    {
      title: '角色类型',
      dataIndex: 'roleTypeName',
-      align: 'center',
    },
    {
      title: '会员类型',
      dataIndex: 'memberTypeName',
-      align: 'center',
    },
    {
      title: '升级阈值',
      dataIndex: 'point',
-      align: 'center',
    },
    {
      title: '状态',
      dataIndex: 'status',
-      align: 'center',
      render: (text: any, record: any) => (
        <StatusSwitch
          handleConfirm={() => handleModify(record)}
@@ -100,7 +90,6 @@ const MemberLevel: React.FC<[]> = () => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (text: any, record: any) => (
        <Button
          type="link"

--- a/src/pages/member/memberMaintain/index.tsx
+++ b/src/pages/member/memberMaintain/index.tsx
@@ -93,14 +93,12 @@ const MemberMaintain: React.FC<[]> = () => {
      title: '会员状态',
      dataIndex: 'statusName',
      filters: [],
-      align: 'center',
      onFilter: (value, record) => record.status === value,
    },
    {
      title: '外部状态',
      dataIndex: 'outerStatusName',
      filters: [],
-      align: 'center',
      onFilter: (value, record) => record.outerStatus === value,
      render: (text, record) => (
        <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
@@ -110,14 +108,12 @@ const MemberMaintain: React.FC<[]> = () => {
      title: '内部状态',
      dataIndex: 'innerStatusName',
      filters: [],
-      align: 'center',
      onFilter: (value, record) => record.innerStatus === value,
      render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus] || '#606266'} text={text} />,
    },
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <>
          {record.showFreeze && (

--- a/src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/schema/index.ts
+++ b/src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/schema/index.ts
@@ -75,6 +75,10 @@ export const schema: ISchema = {
                  pattern: PATTERN_MAPS.money,
                  message: '请输入数值，最多支持小数点后两位',
                },
+                {
+                  max: 8,
+                  message: '最多支持8个字符',
+                },
              ],
            },
            areaCodes: {

--- a/src/pages/member/memberPrComingClassify/index.tsx
+++ b/src/pages/member/memberPrComingClassify/index.tsx
@@ -34,7 +34,6 @@ const MemberPrComingClassify: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrComingInvestigate/index.tsx
+++ b/src/pages/member/memberPrComingInvestigate/index.tsx
@@ -34,7 +34,6 @@ const MemberPrComingInvestigate: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyChange1/index.tsx
+++ b/src/pages/member/memberPrVerifyChange1/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyChange1: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyChange2/index.tsx
+++ b/src/pages/member/memberPrVerifyChange2/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyChange2: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyChangeConfirm/index.tsx
+++ b/src/pages/member/memberPrVerifyChangeConfirm/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyComing1/index.tsx
+++ b/src/pages/member/memberPrVerifyComing1/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyComing1: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyComing2/index.tsx
+++ b/src/pages/member/memberPrVerifyComing2/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyComing2: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyComingConfirm/index.tsx
+++ b/src/pages/member/memberPrVerifyComingConfirm/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyComingConfirm: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/index.tsx
+++ b/src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/index.tsx
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2021-05-24 17:47:32
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-08 11:03:50
+ * @LastEditTime: 2021-07-12 10:38:39
 * @Description: 审核Form抽屉
 */
 import React, { useEffect } from 'react';
@@ -167,7 +167,7 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
    // 渠道上级id，如果没有也是返回只有一项的数组
    if (upperMembers.length === 1 && !upperMembers[0].upperRelationId) {
      formActions.setFieldState('upperRelationId', state => {
-        FormPath.setIn(state, 'visible', false);
+        FormPath.setIn(state, 'display', false);
      });
    } else {
      const upperMembersOptions = upperMembers.map(item => ({ label: item.name, value: item.upperRelationId }));

--- a/src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/schema.ts
+++ b/src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/schema.ts
@@ -51,6 +51,7 @@ export const schema: ISchema = {
            areaCodes: {
              type: 'array',
              title: '代理城市',
+              required: true, 
              'x-component': 'CustomAddArray',
              default: [],
              items: {

--- a/src/pages/member/memberPrVerifyComingData/index.tsx
+++ b/src/pages/member/memberPrVerifyComingData/index.tsx
@@ -38,7 +38,6 @@ const MemberPrVerifyComingData: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberPrVerifyComingQualifications/index.tsx
+++ b/src/pages/member/memberPrVerifyComingQualifications/index.tsx
@@ -38,7 +38,6 @@ const memberPrVerifyComingQualifications: React.FC<{}> = props => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <Button 
          type="link" 

--- a/src/pages/member/memberQuery/index.tsx
+++ b/src/pages/member/memberQuery/index.tsx
@@ -10,6 +10,7 @@ import {
  PlusOutlined,
 } from '@ant-design/icons';
 import { StandardTable } from 'god';
+import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
 import { createFormActions } from '@formily/antd';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
@@ -31,15 +32,24 @@ import AddRoleDrawer from './components/AddRoleDrawer';

 const formActions = createFormActions();

+const fetchData = async (params: any) => {
+  const { startDate = null, endDate = null } = params;
+  const payload = { ...params };
+
+  if (startDate) {
+    payload.startDate = moment(+startDate).format('YYYY-MM-DD');
+  }
+  if (endDate) {
+    payload.endDate = moment(+endDate).format('YYYY-MM-DD');
+  }
+  let res = await PublicApi.getMemberAbilityInfoPage(payload);
+  return res.data;
+};
+
 const MemberQuery: React.FC<{}> = () => {
  const ref = useRef<any>({});
  const [modalVisible, setModalVisible] = useState(false);

-  const fetchData = async (params: any) => {
-    let res = await PublicApi.getMemberAbilityInfoPage(params);
-    return res.data;
-  };
-
  // 跳转变更会员入库信息
  const handleJumpChangeDeposit = record => {
    history.push(`/memberCenter/memberAbility/profile/query/changeDeposit?validateId=${record.validateId}`);
@@ -59,7 +69,6 @@ const MemberQuery: React.FC<{}> = () => {
    {
      title: '会员归属',
      dataIndex: 'name',
-      align: 'center',
      render: (text, record) => (
      <EyePreview
        url={`/memberCenter/memberAbility/profile/query/detail?validateId=${record.validateId}`}
@@ -71,33 +80,27 @@ const MemberQuery: React.FC<{}> = () => {
    {
      title: '会员类型',
      dataIndex: 'memberTypeName',
-      align: 'center',
    },
    {
      title: '会员角色',
      dataIndex: 'roleName',
-      align: 'center',
    },
    {
      title: '会员等级',
      dataIndex: 'level',
-      align: 'center',
      render: text => <LevelBrand level={text} />,
    },
    {
      title: '会员等级类型',
      dataIndex: 'levelTypeName',
-      align: 'center',
    },
    {
      title: '申请时间',
      dataIndex: 'registerTime',
-      align: 'center',
    },
    {
      title: '入库时间',
      dataIndex: 'depositTime',
-      align: 'center',
    },
    {
      title: '会员状态',
@@ -114,7 +117,6 @@ const MemberQuery: React.FC<{}> = () => {
    {
      title: '操作',
      dataIndex: 'option',
-      align: 'center',
      render: (_, record) => (
        <>
          {/* 渠道会员， 且外部审核状态为不通过才可以 变更信息 */}

--- a/src/pages/member/memberUpgradeRule/index.tsx
+++ b/src/pages/member/memberUpgradeRule/index.tsx
@@ -44,32 +44,27 @@ const MemberUpgradeRule: React.FC<[]> = () => {
    {
      title: 'ID',
      dataIndex: 'id',
-      align: 'center',
      width: '15%',
    },
    {
      title: '升级规则',
      dataIndex: 'ruleName',
-      align: 'center',
      width: '15%',
    },
    {
      title: '升级规则说明',
      dataIndex: 'remark',
-      align: 'center',
      ellipsis: true, 
      render: text => <Tooltip title={text}>{text}</Tooltip>, 
    },
    {
      title: '适用会员等级类型',
      dataIndex: 'levelTypeName',
-      align: 'center',
      width: '15%',
    },
    {
      title: '可获取的分值',
      dataIndex: 'score',
-      align: 'center',
      width: '15%',
      editable: true, 
    },

--- a/src/pages/transaction/purchaseAbility/components/detail/components/materialLayout/index.tsx
+++ b/src/pages/transaction/purchaseAbility/components/detail/components/materialLayout/index.tsx
@@ -142,7 +142,7 @@ const MaterialLayout: React.FC<IPROPS> = (props: any) => {
 }

 MaterialLayout.defaultProps = {
-  layoutTitle : '采购材料'
+  layoutTitle : '采购物料'
 }

 export default MaterialLayout;
--- a/src/pages/transaction/purchaseAbility/confirmOffer/demand/index.tsx
+++ b/src/pages/transaction/purchaseAbility/confirmOffer/demand/index.tsx
@@ -30,7 +30,7 @@ const ICON_STYLE: any = {
 const TABLINK = [
  { id: 'progressLayout', title: '流转进度' },
  { id: 'basicLayout', title: '基本流程' },
-  { id: 'materialLayout', title: '采购材料' },
+  { id: 'materialLayout', title: '采购物料' },
  { id: 'conditionLayout', title: '交易条件' },
  { id: 'demandLayout', title: '需求对接' },
  { id: 'recordLyout', title: '流转记录' },

--- a/src/pages/transaction/purchaseAbility/offter/demand/index.tsx
+++ b/src/pages/transaction/purchaseAbility/offter/demand/index.tsx
@@ -26,7 +26,7 @@ const ICON_STYLE: any = {
 const TABLINK = [
  { id: 'progressLayout', title: '流转进度' },
  { id: 'basicLayout', title: '基本流程' },
-  { id: 'materialLayout', title: '采购材料' },
+  { id: 'materialLayout', title: '采购物料' },
  { id: 'conditionLayout', title: '交易条件' },
  { id: 'recordLyout', title: '流转记录' },
 ]

--- a/src/pages/transaction/purchaseAbility/offter/offter/index.tsx
+++ b/src/pages/transaction/purchaseAbility/offter/offter/index.tsx
@@ -73,8 +73,8 @@ const Offter = () => {
    )
  }, {
    title: '是否中标',
-    key: 'iSprize',
-    dataIndex: 'iSprize',
+    key: 'isPrize',
+    dataIndex: 'isPrize',
    render: (text: any) => (text ? <Text type='success'>是</Text> : <Text type='warning'>否</Text>)
  }, {
    title: '外部状态',

--- a/src/pages/transaction/purchaseAbility/onlineBid/search/index.tsx
+++ b/src/pages/transaction/purchaseAbility/onlineBid/search/index.tsx
@@ -90,4 +90,4 @@ const Search = () => {
        />
    )
 }
-export default Search
\ No newline at end of file
+export default Search
--- a/src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/add.tsx
+++ b/src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/add.tsx
@@ -173,7 +173,7 @@ const AddForm = () => {
            />
          </TabPane>
          {/* 添加采购物料 */}
-          <TabPane key='2' tab={<TabFormErrors dot={badge[1]}>添加商品</TabFormErrors>} forceRender>
+          <TabPane key='2' tab={<TabFormErrors dot={badge[1]}>添加采购物料</TabFormErrors>} forceRender>
            <Material
              currentRef={currentMaterial}
              fetchdata={material}

--- a/src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/demand.tsx
+++ b/src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/demand.tsx
@@ -93,7 +93,7 @@ const Demand: React.FC<Iprops> = (props: any) => {
      key: 'membershipOrNot',
      dataIndex: 'membershipOrNot',
      render: (_text: any, _record: any) => <>
-        { value === 3 && <Typography.Text type='success'>是</Typography.Text>}
+        { (value === 3 || (value === 2 && _record.isSubMember === 1)) && <Typography.Text type='success'>是</Typography.Text>}
      </>
    },
    {
@@ -153,7 +153,7 @@ const Demand: React.FC<Iprops> = (props: any) => {
  /** 系统匹配 */
  const fetchSystemMateData = (params: any) => {
    return new Promise(resolve => {
-      PublicApi.postPurchasePurchaseInquirySystemMatchingMemberInitializeList({ categoryIds: [], areaRequestList: [], attributeList: [], ...params }).then(res => {
+      PublicApi.postPurchasePurchaseInquirySystemMatchingMemberInitializeList({ ...params }, { ctlType: 'none' }).then(res => {
        if (res.code === 1000) {
          resolve(res.data)
        }

--- a/src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/modal/drawerWrite.tsx
+++ b/src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/modal/drawerWrite.tsx
@@ -238,7 +238,7 @@ const DrawerWrite: React.FC<Iprops> = (props: any) => {
  return (
    <>
      <Drawer
-        title='选择货品'
+        title='选择货品生成'
        visible={flag}
        placement='right'
        width="45%"

--- a/src/pages/transaction/purchaseAbility/purchaseInquiry/detail/index.tsx
+++ b/src/pages/transaction/purchaseAbility/purchaseInquiry/detail/index.tsx
@@ -29,7 +29,7 @@ const ICON_STYLE: any = {
 const TABLINK = [
  { id: 'progressLayout', title: '流转进度' },
  { id: 'basicLayout', title: '基本信息' },
-  { id: 'materialLayout', title: '采购材料' },
+  { id: 'materialLayout', title: '采购物料' },
  { id: 'conditionLayout', title: '交易条件' },
  { id: 'demandLayout', title: '需求对接' },
  { id: 'recordLyout', title: '流转记录' },