Merge branch 'fix-v2-220418' into 'v2-220418'

src/pages/member/memberEvaluate/hooks/useEvaluateColumn.tsx

@@ -50,8 +50,8 @@ const commonColumns = [
   {
     title: `${intl.formatMessage({ id: 'member.memberEvaluate.hooks.useEvaluateColumn.innerState'})}`,
     dataIndex: 'status',
-    filters: [],
-    onFilter: (_value, record) => record.status === _value,
+    // filters: [],
+    // onFilter: (_value, record) => record.status === _value,
     render: (text, record) => {
       const offset = record.status % (TYPE.length)
       return (
@@ -128,7 +128,7 @@ function useEvaluateColumn<T extends { [key: string]: any } = any>(defaultColumn
     keys.forEach((_item: "status") => {
       map[_item] = mapKeys[_item].map((_row) => ({ text: _row.label, ..._row }))
     })
-    setColumnsWithFilterOption(map)
+    // setColumnsWithFilterOption(map)
   }, [statusOptions])
 
   return {columns, fetchStatusOptions}

src/pages/member/memberImport/components/MemberForm/index.tsx

@@ -132,6 +132,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
       outerStatusName,
       roleName,
       verifySteps,
+      level,
       ...rest
     } = infoRes.data;
     // 注册资料处理
@@ -192,6 +193,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
       areas: areaCodes,
       channelLevel: channelLevelTag,
       upperRelationId: upperMemberId,
+      level: level || undefined,
       ...detail,
     });
 
@@ -474,6 +476,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
             if (res.code === 1000) {
               const { data = [] } = res;
               const options = data.map(item => ({ label: item.levelTag, value: item.level })).filter((item) => item.value);
+              console.log('optionsoptionsoptions', options)
               linkage.enum('level', options);
             }
           }).catch((err) => {

src/pages/member/memberQuery/index.tsx

@@ -127,7 +127,7 @@ const MemberQuery: React.FC<{}> = () => {
           {/* 渠道会员， 且外部审核状态为不通过才可以 变更信息 */}
           {
             record.showModify && (
-              <AuthButton btnCode='profile.update' >
+              <AuthButton btnCode='profile.change' >
                 <Button
                   type="link"
                   onClick={() => handleJumpChangeDeposit(record)}

src/pages/member/memberRectification/common/columns/queryColumns.tsx

@@ -43,7 +43,7 @@ const listColumns: ColumnsType<GetMemberRectifySummaryPageResponseDetail> = [
       const offset = record.outerStatus % OuterStatusType.length;
       return <StatusTag type={OuterStatusType[offset] as 'success'} title={record.outerStatusName} />
     },
-    onFilter: (value, record) => { return record.outerStatus === value },
+    // onFilter: (value, record) => { return record.outerStatus === value },
   }
 ]
 

src/pages/member/memberRectification/common/hooks/useColumns.tsx

@@ -61,7 +61,7 @@ export default function useColumns<T>(columnsList: ColumnsType<T>, actionColumn?
     keys.forEach((_item: keyof typeof mapKeys) => {
       map[_item] = mapKeys[_item].map((_row) => ({ text: _row.label, ..._row }))
     })
-    setColumnsWithFilterOption(map)
+    // setColumnsWithFilterOption(map)
   }, [statusOptions])
 
 

src/pages/member/memberRectification/common/schema/index.tsx

@@ -68,17 +68,6 @@ export const rectificationListSchema: ISchema = {
                 },
               },
             },
-            outerStatus: {
-              type: 'string',
-              enum: [],
-              'x-component-props': {
-                placeholder: `${intl.formatMessage({ id: 'member.memberRectification.common.columns.queryColumns.outState'})}`,
-                allowClear: true,
-                style: {
-                  width: 160,
-                },
-              },
-            },
             submit: {
               'x-component': 'Submit',
               'x-mega-props': {

src/pages/member/memberRectification/rectificationQuery/index.tsx

@@ -39,7 +39,7 @@ const List: React.FC<Iprops> = (props: Iprops) => {
     <Card>
       <CustomizeQueryList
         columns={columns}
-        schema={querySchema}
+        schema={querySchema(true)}
         fetchListData={handleFetch}
         expressionScope={{
           controllerBtns,

src/pages/member/memberRectification/tobeConfirmRectification/index.tsx

@@ -56,7 +56,7 @@ const List: React.FC<Iprops> = (props: Iprops) => {
     <Card>
       <CustomizeQueryList
         columns={columns}
-        schema={querySchema}
+        schema={querySchema(false)}
         fetchListData={handleFetch}
         effects={($, actions) => {
           useStateFilterSearchLinkageEffect($, actions, 'name', FORM_FILTER_PATH,);

src/pages/member/memberRectification/tobeConfirmRectification/schema.tsx

@@ -77,77 +77,87 @@ export default confirmEditResultSchema
 
 /**
  * 会员考评页scheam
+ * @param visibleOuterStatus 是否可见外部状态
+ * @returns 
  */
-export const querySchema: ISchema = {
-  type: 'object',
-  properties: {
-    megaLayout: {
-      type: 'object',
-      'x-component': 'mega-layout',
-      properties: {
-        name: {
-          type: 'string',
-          'x-component': 'Search',
-          'x-component-props': {
-            placeholder: `${intl.formatMessage({ id: 'member.memberInspection.common.schema.add.searchMemberName'})}`,
-            align: 'flex-left',
-            tip: `${intl.formatMessage({ id: 'member.memberEvaluate.allQuery.schema.searchForMemberName'})}`,
-          },
+export const querySchema: (visibleOuterStatus: boolean) => ISchema = (visibleOuterStatus) => {
+  const extraProperties = {
+    subject: {
+      type: 'string',
+      'x-component-props': {
+        placeholder: `${intl.formatMessage({ id: 'member.memberRectification.common.hooks.useGetDetailCommon.rectifyTopic'})}`,
+        allowClear: true,
+        style: {
+          width: 160,
         },
-        [FORM_FILTER_PATH]: {
-          type: 'object',
-          'x-component': 'mega-layout',
-          'x-component-props': {
-            grid: true,
-            full: true,
-            autoRow: true,
-            columns: 6,
-          },
-          properties: {
-            subject: {
-              type: 'string',
-              'x-component-props': {
-                placeholder: `${intl.formatMessage({ id: 'member.memberRectification.common.hooks.useGetDetailCommon.rectifyTopic'})}`,
-                allowClear: true,
-                style: {
-                  width: 160,
-                },
-              },
-            },
-            '[rectifyDayStart,rectifyDayEnd]': {
-              type: 'daterange',
-              'x-component-props': {
-                placeholder: [`${intl.formatMessage({ id: 'member.memberRectification.common.schema.index.rectifyBeginTime'})}`, `${intl.formatMessage({ id: 'member.memberRectification.tobeConfirmRectification.schema.rectifyCompleteTime'})}`],
-                allowClear: true,
-                style: {
-                  width: 240,
-                },
-              },
-            },
-            outerStatus: {
-              type: 'string',
-              enum: [],
-              'x-component-props': {
-                placeholder: `${intl.formatMessage({ id: 'member.memberRectification.common.columns.queryColumns.outState'})}`,
-                allowClear: true,
-                style: {
-                  width: 160,
-                },
-              },
+      },
+    },
+    '[rectifyDayStart,rectifyDayEnd]': {
+      type: 'daterange',
+      'x-component-props': {
+        placeholder: [`${intl.formatMessage({ id: 'member.memberRectification.common.schema.index.rectifyBeginTime'})}`, `${intl.formatMessage({ id: 'member.memberRectification.tobeConfirmRectification.schema.rectifyCompleteTime'})}`],
+        allowClear: true,
+        style: {
+          width: 240,
+        },
+      },
+    },
+    outerStatus: {
+      type: 'string',
+      enum: [],
+      'x-component-props': {
+        placeholder: `${intl.formatMessage({ id: 'member.memberRectification.common.columns.queryColumns.outState'})}`,
+        allowClear: true,
+        style: {
+          width: 160,
+        },
+      },
+    },
+    submit: {
+      'x-component': 'Submit',
+      'x-mega-props': {
+        span: 1,
+      },
+      'x-component-props': {
+        children: `${intl.formatMessage({ id: 'member.memberInspection.common.schema.add.query'})}`,
+      },
+    },
+  };
+
+  if (!visibleOuterStatus) {
+    delete extraProperties.outerStatus;
+  }
+
+  return {
+    type: 'object',
+    properties: {
+      megaLayout: {
+        type: 'object',
+        'x-component': 'mega-layout',
+        properties: {
+          name: {
+            type: 'string',
+            'x-component': 'Search',
+            'x-component-props': {
+              placeholder: `${intl.formatMessage({ id: 'member.memberInspection.common.schema.add.searchMemberName'})}`,
+              align: 'flex-left',
+              tip: `${intl.formatMessage({ id: 'member.memberEvaluate.allQuery.schema.searchForMemberName'})}`,
             },
-            submit: {
-              'x-component': 'Submit',
-              'x-mega-props': {
-                span: 1,
-              },
-              'x-component-props': {
-                children: `${intl.formatMessage({ id: 'member.memberInspection.common.schema.add.query'})}`,
-              },
+          },
+          [FORM_FILTER_PATH]: {
+            type: 'object',
+            'x-component': 'mega-layout',
+            'x-component-props': {
+              grid: true,
+              full: true,
+              autoRow: true,
+              columns: 6,
             },
+            properties: extraProperties,
           },
         },
       },
     },
-  },
+  }
 };
 

src/pages/supplier/memberEvaluate/hooks/useEvaluateColumn.tsx

@@ -50,8 +50,8 @@ const commonColumns = [
   {
     title: `${intl.formatMessage({ id: 'member.memberEvaluate.hooks.useEvaluateColumn.innerState'})}`,
     dataIndex: 'status',
-    filters: [],
-    onFilter: (_value, record) => record.status === _value || _value===0,
+    // filters: [],
+    // onFilter: (_value, record) => record.status === _value || _value===0,
     render: (text, record) => {
       const offset = record.status % (TYPE.length)
       return (
@@ -128,7 +128,7 @@ function useEvaluateColumn<T extends { [key: string]: any } = any>(defaultColumn
     keys.forEach((_item: "status") => {
       map[_item] = mapKeys[_item].map((_row) => ({ text: _row.label, ..._row }))
     })
-    setColumnsWithFilterOption(map)
+    // setColumnsWithFilterOption(map)
   }, [statusOptions])
 
   return {columns, fetchStatusOptions}

src/pages/supplier/memberImport/components/MemberForm/index.tsx

@@ -132,6 +132,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
       outerStatusName,
       roleName,
       verifySteps,
+      level,
       ...rest
     } = infoRes.data;
     // 注册资料处理
@@ -192,6 +193,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
       areas: areaCodes,
       channelLevel: channelLevelTag,
       upperRelationId: upperMemberId,
+      level: level || undefined,
       ...detail,
     });
 

src/pages/supplier/memberQuery/index.tsx

@@ -127,7 +127,7 @@ const MemberQuery: React.FC<{}> = () => {
           {/* 渠道会员， 且外部审核状态为不通过才可以 变更信息 */}
           {
             record.showModify && (
-              <AuthButton btnCode='profile.update' >
+              <AuthButton btnCode='profile.change' >
                 <Button
                   type="link"
                   onClick={() => handleJumpChangeDeposit(record)}

src/pages/supplier/memberRectification/common/hooks/useColumns.tsx

@@ -61,7 +61,7 @@ export default function useColumns<T>(columnsList: ColumnsType<T>, actionColumn?
     keys.forEach((_item: keyof typeof mapKeys) => {
       map[_item] = mapKeys[_item].map((_row) => ({ text: _row.label, ..._row }))
     })
-    setColumnsWithFilterOption(map)
+    // setColumnsWithFilterOption(map)
   }, [statusOptions])
 
 

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponQuery/index.tsx

@@ -106,56 +106,47 @@ const MerchantCouponQuery: React.FC = () => {
       title: `${intl.formatMessage({ id: 'merchantCoupon.DealsCoupontype' })}`,
       dataIndex: 'typeName',
       align: 'center',
-      filters: [],
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.giveCouponStartTime' })}`,
       dataIndex: 'releaseTimeStart',
       align: 'center',
-      sorter: (a, b) => a.releaseTimeStart - b.releaseTimeStart,
       render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.giveCouponEndTime' })}`,
       dataIndex: 'releaseTimeEnd',
       align: 'center',
-      sorter: (a, b) => a.releaseTimeEnd - b.releaseTimeEnd,
       render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.effectiveTimeEnd' })}`,
       dataIndex: 'effectiveTimeStart',
       align: 'center',
-      sorter: (a, b) => a.effectiveTimeStart - b.effectiveTimeStart,
       render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '-',
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.effectiveTimeEnd' })}`,
       dataIndex: 'effectiveTimeEnd',
       align: 'center',
-      sorter: (a, b) => a.effectiveTimeEnd - b.effectiveTimeEnd,
       render: (text, record) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : `领取${record.invalidDay}天后失效`,
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.getWayName' })}`,
       dataIndex: 'getWayName',
       align: 'center',
-      filters: [],
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.denomination' })}`,
       dataIndex: 'denomination',
-      sorter: (a, b) => a.denomination - b.denomination,
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.Quantity' })}`,
       dataIndex: 'quantity',
-      sorter: (a, b) => a.quantity - b.quantity,
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.innerState' })}`,
       dataIndex: 'statusName',
-      filters: [],
     },
     {
       title: `${intl.formatMessage({ id: 'merchantCoupon.operation' })}`,