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

config/routes/index.ts

@@ -5,7 +5,7 @@
  * @LastEditTime: 2021-04-21 16:53:13
  */
 // import CommodityRoute from './commodityRoute' // 商品能力路由
-// import MemberRoute from './memberRoute' // 会员能力路由
+// import MemberRoute from './memberRoute' //  会员能力路由
 // import ShopRoute from './shopRoute' // 店铺能力路由
 // import ChannelRoute from './channelRoute' // 渠道能力路由
 // import TranactionRoute from './tranactionRoute' // 交易能力路由

config/routes/memberRoute.ts

@@ -767,6 +767,11 @@ const MemberRoute: RouterChild = {
           path: '/memberCenter/memberAbility/memberWarning/tobeHandle',
           name: '待处理预警',
           component: '@/pages/member/memberWarning/tobeHandleWarning'
+        },
+        {
+          path: '/memberCenter/memberAbility/memberWarning/ruleSetting',
+          name: '预警规则设置',
+          component: '@/pages/member/memberWarning/ruleSetting'
         }
       ]
     },

src/pages/home/components/Centers/AfterSoldCenter.tsx

@@ -5,7 +5,7 @@ import Authorize from '../Authorize';
 import useViewRequest from '../../hooks/useViewRequest';
 import { GetReportMemberHomeGetAfterSaleTallyResponse } from '@/services/ReportApi';
 import Layout from './layout';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 
 interface Iprops {};
 

src/pages/home/components/Centers/ChannelMallCenter.tsx

@@ -10,7 +10,7 @@ import { getAuth } from '@/utils/auth';
 import useViewRequest from '../../hooks/useViewRequest';
 import { GetTemplateWebMemberChannelWebFindCurrMemberChannelResponse } from '@/services/TemplateV2Api';
 import Layout from './layout';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops {}
 
 const SHOP_CENTER = '/memberCenter/channelAbility/infoManage'

src/pages/home/components/Centers/Contract.tsx

@@ -3,9 +3,8 @@ import Layout, { IDataListProps } from './layout';
 import useViewRequest from '../../hooks/useViewRequest';
 import { PublicApi } from '@/services/api';
 import { GetReportMemberHomeGetContractTallyResponse } from '@/services/ReportApi';
-import styles from './center.less'
 import { Link } from 'umi';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 import Authorize from '../Authorize';
 
 const { StaticsDataList, AlertTip } = Layout

src/pages/home/components/Centers/FundCenter.tsx

@@ -11,7 +11,7 @@ import { getAuth } from '@/utils/auth';
 import useViewRequest from '../../hooks/useViewRequest';
 import Layout, { IDataListProps } from './layout';
 import { GetReportMemberHomeGetAccountTallyResponse } from '@/services/ReportApi';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops {};
 
 const KEY_TO_TITLE = {

src/pages/home/components/Centers/LogisticsCenter.tsx

@@ -12,7 +12,7 @@ import { getAuth } from '@/utils/auth';
 import useViewRequest from '../../hooks/useViewRequest';
 import Layout from './layout';
 import { GetReportMemberHomeGetLogisticsTallyResponse } from '@/services/ReportApi/id3280';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 
 interface Iprops {};
 

src/pages/home/components/Centers/MemberCenter.tsx

@@ -5,7 +5,7 @@ import Layout, { IDataListProps } from './layout';
 import Authorize from '../Authorize';
 import useViewRequest from '../../hooks/useViewRequest';
 import { GetReportMemberHomeGetMemberTallyResponse, GetReportMemberHomeGetPurchaseTallyResponse } from '@/services/ReportV2Api';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops {};
 
 const { StaticsDataList } = Layout

src/pages/home/components/Centers/OrderCenter.tsx

@@ -5,7 +5,7 @@ import Layout from './layout';
 import Authorize from '../Authorize';
 import useViewRequest from '../../hooks/useViewRequest';
 import { GetReportMemberHomeGetOrderTallyResponse, GetReportMemberHomeGetPurchaseTallyResponse } from '@/services/ReportV2Api';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops {};
 
 const { StaticsDataList } = Layout

src/pages/home/components/Centers/ProcessCenter.tsx

@@ -5,7 +5,7 @@ import { Link } from 'umi'
 import Layout from './layout';
 import Authorize from '../Authorize';
 import useViewRequest from '../../hooks/useViewRequest';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 import { GetReportMemberHomeGetEnhanceTallyResponse } from '@/services/ReportV2Api';
 interface Iprops {};
 

src/pages/home/components/Centers/ProductCenter.tsx

@@ -6,7 +6,7 @@ import { Link } from 'umi';
 import Authorize from '../Authorize';
 import useViewRequest from '../../hooks/useViewRequest';
 import Layout from './layout';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 import { GetReportMemberHomeGetCommodityTallyResponse } from '@/services/ReportV2Api';
 
 interface Iprops {};

src/pages/home/components/Centers/PurchaseCenter.tsx

@@ -8,8 +8,7 @@ import useViewRequest from '../../hooks/useViewRequest';
 import { GetReportMemberHomeGetPurchaseTallyResponse } from '@/services/ReportV2Api';
 import { BellOutlined } from '@ant-design/icons';
 import {Button} from 'antd';
-import { getAuth } from '@/utils/auth';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops {};
 
 const { StaticsDataList } = Layout

src/pages/home/components/Centers/SettlementCenter.tsx

@@ -8,7 +8,7 @@ import { PublicApi } from '@/services/api'
 import useViewRequest from '../../hooks/useViewRequest';
 import { GetReportMemberHomeGetSettleAccountTallyResponse } from '@/services/ReportApi';
 import Layout from './layout';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops {};
 
 const KEY_TITLE = {

src/pages/home/components/Centers/TradeCenter.tsx

@@ -4,7 +4,7 @@ import { Link } from 'umi'
 import Authorize from '../Authorize';
 import useViewRequest from '../../hooks/useViewRequest';
 import Layout from './layout';
-import useGetAuth from '../../hooks/uesGetAuth';
+import useGetAuth from '../../hooks/useGetAuth';
 import { GetReportMemberHomeGetTradeTallyResponse } from '@/services/ReportV2Api';
 
 interface Iprops {};

src/pages/home/hooks/uesGetAuth.tsx → src/pages/home/hooks/useGetAuth.tsx

@@ -42,7 +42,7 @@ const collection2Obj = <T, >(list: T[], name: string, isCover?: boolean) => {
 const useGetAuth = () => {
   const userAuth = getAuth();
   const cacheAuth = useMemo(() => userAuth, [userAuth]);
-  const urls = useMemo(() => cacheAuth.urls, [])
+  const urls = useMemo(() => cacheAuth.urls, [cacheAuth])
 
   const abilityUrls = useMemo(() => {
     return {

src/pages/home/index.tsx

@@ -12,7 +12,7 @@ import { TradeCenter, FundCenter,  ShopCenter, ProductCenter, SettlementCenter,
 import styles from './index.less'
 import { CompassFilled } from '@ant-design/icons';
 import { PublicApi } from '@/services/api';
-import useGetAuth from './hooks/uesGetAuth';
+import useGetAuth from './hooks/useGetAuth';
 
 const ComponentSelect = {
   "会员中心": MemberCenter,

src/pages/member/memberWarning/common/columns/ruleColumns.tsx

+import { ColumnsType } from 'antd/es/table';
+
+/**
+ * 列表页column
+ */
+
+const listColumns: ColumnsType<any> = [
+  {
+    title: '序号',
+    dataIndex: 'no',
+  },
+  {
+    title: '预警条件',
+    dataIndex: 'memberName',
+  },
+  {
+    title: '预警提示语',
+    dataIndex: 'project',
+  },
+  {
+    title: '预警提示语',
+    dataIndex: 'notice',
+  },
+]
+export default listColumns;

src/pages/member/memberWarning/common/schema/querySchema.tsx

@@ -12,9 +12,9 @@ const querySchema: ISchema = {
           type: 'string',
           'x-component': 'Search',
           'x-component-props': {
-            placeholder: '搜索',
+            placeholder: '搜索会员名称',
             align: 'flex-left',
-            tip: '输入用户名进行搜索',
+            tip: '输入会员名称进行搜索',
           },
         },
         [FORM_FILTER_PATH]: {
@@ -27,13 +27,39 @@ const querySchema: ISchema = {
             columns: 6,
           },
           properties: {
-            summary: {
+            handler: {
               type: 'string',
               'x-component-props': {
-                placeholder: '通知单摘要',
-                allowClear: true,
+                placeholder: "处理热闹"
               },
             },
+            project: {
+              type: "string",
+              enum: [],
+              'x-component-props': {
+                placeholder: "预警项目"
+              },
+            },
+            level: {
+              type: 'string',
+              enum: [],
+              'x-component-props': {
+                placeholder: '预警级别'
+              },
+            },
+            rangeDate: {
+              type: 'daterange',
+              'x-component-props': {
+                placeholder: ["预警开始日期", "预警截止日期"]
+              }
+            },
+            handleDate: {
+              type: 'daterange',
+              'x-component-props': {
+                placeholder: ["处理开始日期", "处理截止日期"]
+              }
+            },
+
             submit: {
               'x-component': 'Submit',
               'x-component-props': {

src/pages/member/memberWarning/common/schema/tobeHandleQuerySchema.tsx

+import { FORM_FILTER_PATH } from '@/formSchema/const';
+import { ISchema } from '@formily/antd';
+
+const querySchema: ISchema = {
+  type: 'object',
+  properties: {
+    megaLayout: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      properties: {
+        name: {
+          type: 'string',
+          'x-component': 'Search',
+          'x-component-props': {
+            placeholder: '搜索会员名称',
+            align: 'flex-left',
+            tip: '输入会员名称进行搜索',
+          },
+        },
+        [FORM_FILTER_PATH]: {
+          type: 'object',
+          'x-component': 'mega-layout',
+          'x-component-props': {
+            grid: true,
+            full: true,
+            autoRow: true,
+            columns: 6,
+          },
+          properties: {
+
+            project: {
+              type: "string",
+              enum: [],
+              'x-component-props': {
+                placeholder: "预警项目"
+              },
+            },
+            level: {
+              type: 'string',
+              enum: [],
+              'x-component-props': {
+                placeholder: '预警级别'
+              },
+            },
+            rangeDate: {
+              type: 'daterange',
+              'x-component-props': {
+                placeholder: ["预警开始日期", "预警截止日期"]
+              }
+            },
+            submit: {
+              'x-component': 'Submit',
+              'x-component-props': {
+                children: '查询',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+export default querySchema

src/pages/member/memberWarning/ruleSetting/index.tsx

+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Card, Input, Select, Table } from 'antd';
+import ruleColumns from '../common/columns/ruleColumns';
+import { PublicApi } from '@/services/api';
+import { ColumnsType } from 'antd/es/table';
+import { useDebounceFn } from '@umijs/hooks';
+
+
+const AllQuery = () => {
+  const [dataSource, setDataSource] = useState([]);
+  const [page, setPage] = useState<number>(1);
+  const [pageSize, setPageSize] = useState<number>(10);
+
+
+  const handleSetValue = (params: { dataIndex: string, value: string, index: number }) => {
+    const { index, dataIndex, value } = params;
+
+  }
+
+  const columns = useMemo<ColumnsType<any>>(() => {
+    return [
+      {
+        title: '序号',
+        dataIndex: 'no',
+      },
+      {
+        title: '预警条件',
+        dataIndex: 'memberName',
+      },
+      {
+        title: '预警提示语',
+        dataIndex: 'project',
+      },
+      {
+        title: '预警提示语',
+        dataIndex: 'notice',
+      },
+      {
+        title: '预警值',
+        dataIndex: 'value',
+        render: (text, record, index) => {
+          return <Input value={text} onChange={(e) => handleSetValue({ dataIndex: 'value', value: e.target.value, index: index})}/>
+        }
+      },
+      {
+        title: '预警值',
+        dataIndex: 'value',
+        render: (text, record) => {
+          return <Select  value={text} />
+        }
+      }
+    ]
+  }, [])
+
+  return (
+    <PageHeaderWrapper
+      title={'预警规则设置'}
+    >
+      <Card>
+        <Table
+          columns={columns}
+          dataSource={dataSource}
+        ></Table>
+      </Card>
+    </PageHeaderWrapper>
+  )
+}
+
+export default AllQuery

src/pages/member/memberWarning/tobeHandleWarning/index.tsx

 import React from 'react';
 import { Card, Space, Button } from 'antd'
 import tobeHandleColumns from '../common/columns/tobeHandleColumns';
-import querySchema from '../common/schema/querySchema';
+import querySchema from '../common/schema/tobeHandleQuerySchema';
 import useFetchList from '../../memberEvaluate/hooks/useFetchList';
-import { PlusOutlined } from '@ant-design/icons';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { PublicApi } from '@/services/api';

src/pages/transaction/dealAbility/inquiryOffer/detail/index.tsx

@@ -98,7 +98,7 @@ const InquiryOfferDetail = () => {
           {
             label: '附件',
             extra: <>
-              {data.enclosureUrls.map((item: any, index: number) => (
+              {data.enclosureUrls && data.enclosureUrls.map((item: any, index: number) => (
                 <Typography.Link
                   style={{ display: 'block', paddingBottom: '8px' }}
                   key={`link_${index + 1}`}

src/pages/transaction/dealAbility/inquiryOffer/preview/index.tsx

@@ -96,7 +96,7 @@ const InquiryOfferPreview = () => {
           {
             label: '附件',
             extra: <>
-              {data.enclosureUrls.map((item: any, index: number) => (
+              {data.enclosureUrls && data.enclosureUrls.map((item: any, index: number) => (
                 <Typography.Link
                   style={{ display: 'block', paddingBottom: '8px' }}
                   key={`link_${index + 1}`}

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/addForm.tsx

@@ -193,7 +193,7 @@ export default AddQuotes
 //   /** 提交的接口 */
 //   fetchRequest?: () => Promise<unknown>,
 //   /** 本地缓存的名称 */
-//   spam?: string,
+//   spam?: string | boolean,
 //   /** 标题 */
 //   title?: string,
 // }

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/basicInfo.tsx

@@ -138,7 +138,7 @@ const BasicInfo: React.FC<queryProps> = (props) => {
         </Form.Item>
         <Form.Item label='对应询价单号' name='inquiryListNo' rules={[{ required: true, message: '请选择被询价会员' }]}>
           <Search disabled={type === 3} value={Object.keys(inquiryNo).length > 0 ? inquiryNo.orderNo : undefined} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setVisibleChannelMember(true)} />
-          {Object.keys(inquiryNo).length > 0 && <Button type='link' onClick={() => window.open(`/memberCenter/tranactionAbility/inquiryQuote/enquiryOrder/rfq/preview?id=${inquiryNo.orderId}`)}>查看询价单详情</Button>}
+          {Object.keys(inquiryNo).length > 0 && <Button type='link' onClick={() => window.open(`/memberCenter/tranactionAbility/inquiryOffer/inquirySearch/inquiry/preview?id=${inquiryNo.orderId}`)}>查看询价单详情</Button>}
         </Form.Item>
         <Form.Item label='报价单号' name='quotationNo'>
           <span>{Object.keys(editData).length > 0 ? editData.quotationNo : '-'}</span>

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/edit.tsx

@@ -10,4 +10,4 @@ const EditQuote: React.FC<{}> = () => {
     />
   )
 }
-export default EditQuote;
\ No newline at end of file
+export default EditQuote;

src/pages/transaction/purchaseAbility/offter/addOffter/components/offer.tsx

@@ -130,6 +130,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
           rules={[{ required: true, message: '请选择' }]}
         >
           <Select
+            defaultValue={1}
             style={{ width: 100 }}
             onChange={(e) => handleEdit(e, 'isTax', index)}
             disabled={fetchdata && (count !== tabs[0])}

src/pages/transaction/purchaseAbility/purchasDoor/purchasInfo/index.tsx

@@ -385,10 +385,22 @@ const PurchasInfo: React.FC<PurchasInfoPropsType> = (props) => {
     setFormIsHalfFilledOut(true)
   }
 
+  const checkUrl = (url) => {
+    if (url && typeof url === 'string') {
+      if (url.indexOf('/') > -1) {
+        return url.replace('/', '').trim()
+      } else {
+        return `${url}`.trim()
+      }
+    }
+  }
+
   /** 获取店铺链接 */
   const handleMallSelectChange = (val, option) => {
     setDoor(option.children);
-    setResUrl(`${siteUrl}${option.url}`)
+    if (option.url) {
+      setResUrl(`${siteUrl}/${checkUrl(option.url)}`)
+    }
   }
 
   return (