Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

src/components/Table/src/hooks/useTableScroll.ts

@@ -147,7 +147,7 @@ export function useTableScroll(
     const tableEl = tableElRef.current
 
     const tableWidth = tableEl && tableEl?.offsetWidth
-    console.log(tableWidth - 48, width)
+    // console.log(tableWidth - 48, width)
 
     return tableWidth - 48 > width ? '100%' : width
   }, [selectKeysRef, columnsRef, tableElRef?.current])

src/pages/Customer/Client/index.jsx

@@ -17,7 +17,7 @@ import { Add, Down, Check } from '@icon-park/react'
 import { apiAddClient, queryClient } from '@/services/customer'
 import { apiBatchLink } from '@/services/customer'
 import styles from './index.less'
-import { refactorFilterField, refactorSortField } from '@/utils/utils'
+import { generateFilterField, generateSortField } from '@/utils/utils'
 import { PermDataTypeEunm } from '../Company/components/PermSelect'
 import BasicTable from '@/components/Table'
 import { getPermAuthCache } from '@/utils/auth'
@@ -172,7 +172,8 @@ const Client = props => {
       render: (clientName, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {clientName}
         </span>
       ),
@@ -189,7 +190,8 @@ const Client = props => {
         record.companyId !== consts.ENCRYPTION_ZERO ? (
           <span
             onClick={() => showDrawerComapny(record.companyId)}
-            className="text-primary cursor-pointer hover:text-[#967bbd]">
+            className="text-primary cursor-pointer hover:text-[#967bbd]"
+          >
             {companyName}
           </span>
         ) : (
@@ -295,7 +297,8 @@ const Client = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -332,7 +335,8 @@ const Client = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -493,7 +497,8 @@ const Client = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagIds.length ? (
               <Button>
                 {tagState.tagIds.map(item => (
@@ -518,7 +523,8 @@ const Client = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagCooperationIds.length ? (
               <Button>
                 {tagState.tagCooperationIds.map(item => (
@@ -555,8 +561,8 @@ const Client = props => {
         rowKey={record => record.id}
         columns={columns}
         request={async (params, sort, filter) => {
-          const srotOrder = refactorSortField(sort)
-          const nFilter = refactorFilterField(filter)
+          const srotOrder = generateSortField(sort)
+          const nFilter = generateFilterField(filter)
           const {
             code = -1,
             data: { client = [], total = 0 }

src/pages/Customer/Company/index.jsx

@@ -12,7 +12,7 @@ import { TagTypeEnum, TagDataTypeEnum, LabelModeType } from './components/Person
 import { Add, Down, Check } from '@icon-park/react'
 import { apiBatchLink } from '@/services/customer'
 import styles from './index.less'
-import { refactorFilterField, refactorSortField } from '@/utils/utils'
+import { generateFilterField, generateSortField } from '@/utils/utils'
 import { PermDataTypeEunm } from './components/PermSelect'
 import BasicTable from '@/components/Table'
 import { getPermAuthCache } from '@/utils/auth'
@@ -168,7 +168,8 @@ const Company = props => {
       render: (companyName, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {companyName}
         </span>
       )
@@ -214,7 +215,8 @@ const Company = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -245,7 +247,8 @@ const Company = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -413,7 +416,8 @@ const Company = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagIds.length ? (
               <Button>
                 {tagState.tagIds.map(item => (
@@ -438,7 +442,8 @@ const Company = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagCooperationIds.length ? (
               <Button>
                 {tagState.tagCooperationIds.map(item => (
@@ -477,8 +482,8 @@ const Company = props => {
         columnStateType="COMPANY"
         params={state.params}
         request={async (params, sort, filter) => {
-          const srotOrder = refactorSortField(sort)
-          const nFilter = refactorFilterField(filter)
+          const srotOrder = generateSortField(sort)
+          const nFilter = generateFilterField(filter)
           const { code = -1, data: { customer = [], total = 0 } = { customer: [], total: 0 } } =
             await queryCompany({ ...params, ...srotOrder, ...nFilter })
           setState({ ...state, orderIds: customer.map(item => item.id) })

src/pages/Product/Cloud/index.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 import React, { useState, useEffect, useRef } from 'react'
 import BasicTable from '@/components/Table'
-import { dayjsFormat, refactorSortField } from '@/utils/utils'
+import { dayjsFormat, generateSortField } from '@/utils/utils'
 import { queryRoadpricingList } from '@/services/product'
 import { Input, Tag, Tooltip } from 'antd'
 import consts from '@/consts'
@@ -79,7 +79,8 @@ const Cloud = () => {
       render: (text, record) => (
         <span
           onClick={() => showDrawerRoadpricing(record.ssoId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {text}
         </span>
       )
@@ -160,7 +161,8 @@ const Cloud = () => {
                       )
                   )}
                 </div>
-              }>
+              }
+            >
               {record.all_online_times}
             </Tooltip>
           )
@@ -275,7 +277,7 @@ const Cloud = () => {
       columnStateType={columnStateType}
       params={state.params}
       request={async (params, sort, filter) => {
-        const sortOrder = refactorSortField(sort)
+        const sortOrder = generateSortField(sort)
         const {
           code = -1,
           data: { list = [], total = 0 }

src/pages/Product/Lock/LockStore/index.jsx

@@ -8,7 +8,7 @@ import ContactDetail from '@/pages/Customer/Client/components/ClientDetail'
 import SoftwareDetail from '@/pages/Product/Lock/LockStore/components/SoftwareDetail'
 import { useModal } from '@/components/Modal'
 import CompanyDetail from '@/pages/Customer/Company/components/CompanyDetail'
-import { refactorSortField } from '@/utils/utils'
+import { generateSortField } from '@/utils/utils'
 import ReceiveLock from './components/ReceiveLock'
 // import ReceiveNewLock from './components/ReceiveNewLock'
 import { PermDataTypeEunm } from '@/pages/Customer/Company/components/PermSelect'
@@ -197,7 +197,8 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (keyNum, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {keyNum}
         </span>
       )
@@ -312,7 +313,8 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showDrawerClient(record.clientId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {text}
         </span>
       )
@@ -326,7 +328,8 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showCompanyDrawer(record.customerId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {text}
         </span>
       )
@@ -338,7 +341,8 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showDrawerResponsible(record.responsibleId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {text}
         </span>
       )
@@ -387,7 +391,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       params={state.params}
       columns={columns}
       request={async (params, sort, filter) => {
-        const srotOrder = refactorSortField(sort)
+        const srotOrder = generateSortField(sort)
         const {
           code = -1,
           data: { longle = [], total = 0, totalOld = 0, totalNew = 0 } = {

src/pages/Statistic/Product/InvoiceTrends/index.jsx

@@ -1,7 +1,7 @@
 import BasicTable from '@/components/Table'
 import consts from '@/consts'
 import { querySoftInvoiceTrendsList } from '@/services/statistic'
-// import { Column } from '@ant-design/charts'
+import { DualAxes } from '@ant-design/charts'
 import { DatePicker, Select } from 'antd'
 import dayjs from 'dayjs'
 import React, { useRef, useState } from 'react'
@@ -15,28 +15,91 @@ const InvoiceTrends = () => {
       priceType: 'invoice',
       startMonth: [dayjs(new Date()), dayjs(new Date())]
     },
-    list: []
+    chart: []
   })
   const tRef = useRef(null)
   const columns = [
     {
       dataIndex: 'name',
       title: '姓名',
+      align: 'center',
+      render: (value, _, idx) => {
+        const obj = {
+          children: value,
+          props: {}
+        }
+        if (idx == 0) {
+          obj.props.rowSpan = 2
+        }
+        if (idx == 1) {
+          obj.props.rowSpan = 0
+        }
+        return obj
+      }
+    },
+    {
+      dataIndex: 'options',
+      title: '项',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_1',
+      title: '1月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_2',
+      title: '2月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_3',
+      title: '3月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_4',
+      title: '4月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_5',
+      title: '5月',
       align: 'center'
     },
     {
-      dataIndex: 'creditPrice',
-      title: '开票金额(元)',
+      dataIndex: 'month_6',
+      title: '6月',
       align: 'center'
     },
     {
-      dataIndex: 'receivablesPrice',
-      title: '收款金额(元)',
+      dataIndex: 'month_7',
+      title: '7月',
       align: 'center'
     },
     {
-      dataIndex: 'invoicePrice',
-      title: '入账金额(元)',
+      dataIndex: 'month_8',
+      title: '8月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_9',
+      title: '9月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_10',
+      title: '10月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_11',
+      title: '11月',
+      align: 'center'
+    },
+    {
+      dataIndex: 'month_12',
+      title: '12月',
       align: 'center'
     }
   ]
@@ -44,10 +107,71 @@ const InvoiceTrends = () => {
   const optionChange = (type, ids) =>
     setState({ ...state, params: { ...state.params, optionType: type, dataIds: ids } })
 
+  const dualAxesOptions = {
+    data: [state.chart, state.chart],
+    xField: 'monthName',
+    yField: ['price', 'ring'],
+    // appendPadding: [0, 32, 24, 32],
+    meta: {
+      price: {
+        alias: '当月开票金额(元)'
+      },
+      ring: {
+        alias: '环比增长(%)'
+      }
+      // month: {
+      //   formatter: v => `${v}月`
+      // }
+    },
+    yAxis: {
+      price: {
+        label: {
+          formatter: v => {
+            return `${v}元`
+          }
+        }
+      },
+      ring: {
+        label: {
+          formatter: v => {
+            return `${v}%`
+          }
+        }
+      }
+    },
+    legend: {
+      position: 'top',
+      itemName: {
+        formatter: (_, item) => {
+          return item.value === 'price' ? '当月开票金额(元)' : '环比增长(%)'
+        }
+      }
+    },
+    geometryOptions: [
+      {
+        geometry: 'column',
+        color: '#A7D2F9'
+      },
+      {
+        geometry: 'line',
+        smooth: true,
+        color: '#C4E9C1'
+      }
+    ],
+    interactions: [
+      {
+        type: 'element-highlight'
+      },
+      {
+        type: 'active-region'
+      }
+    ]
+  }
   return (
     <div className="flex flex-col">
       <div className="flex flex-row justify-between mb-4">
         <div className="card-transition bg-white w-full">
+          {state.chart?.length ? <DualAxes {...dualAxesOptions} /> : null}
           {/* {pieData.pieLeft ? <Pie {...leftConfig} /> : null} */}
           {/* {state.list?.length ? <Column {...columnConfig} /> : null} */}
         </div>
@@ -63,7 +187,7 @@ const InvoiceTrends = () => {
         toolbar={{
           title: [
             <OptionSelect onChange={optionChange} type="InvoiceTrends" key="op" multiple={false} />,
-            <div className="ml-1" key="pp">
+            <div className="ml-2" key="pp">
               <Select
                 options={[
                   { label: '发票', value: 'invoice' },
@@ -90,9 +214,14 @@ const InvoiceTrends = () => {
         request={async (params, sort, filter) => {
           const {
             code = -1,
-            data: { list, sum }
-          } = await querySoftInvoiceTrendsList({ ...params, ...sort, ...filter })
-          setState({ ...state, sum, list })
+            data: { list, chart }
+          } = await querySoftInvoiceTrendsList({
+            ...params,
+            ...sort,
+            ...filter
+          })
+          console.log(chart)
+          setState({ ...state, chart })
           return {
             data: list,
             success: code === consts.RET_CODE.SUCCESS,

src/pages/Statistic/components/OptionSelect.tsx

@@ -113,8 +113,6 @@ const OptionSelect: React.FC<OptionSelectProps> = ({ multiple = true, type, onCh
     return base
   }, [state.optionType, state.department, state.staff])
 
-  console.log('options', options)
-
   return (
     <div>
       <span className="mr-2">

src/pages/Workbench/Dashboard/components/BusinessChar.jsx

@@ -1,4 +1,4 @@
-import DualAxes from '@ant-design/charts/es/plots/dualAxes'
+import { DualAxes } from '@ant-design/charts'
 import { Card, Select } from 'antd'
 import { connect } from 'umi'
 import React, { useEffect } from 'react'

src/utils/utils.js

@@ -33,7 +33,7 @@ export const dayjsFormat = (date, format = 'YYYY-MM-DD HH:mm:ss') => {
 }
 
 /** 处理表格排序字段 */
-export const refactorSortField = sort => {
+export const generateSortField = sort => {
   if (!sort) return {}
   // 处理后的排序，格式{ field: 'xxxxx', order: 'desc/asc' }
   const s = { field: null, order: null }
@@ -48,7 +48,7 @@ export const refactorSortField = sort => {
 }
 
 /** 处理表格中的筛选（特殊情况） */
-export const refactorFilterField = filter => {
+export const generateFilterField = filter => {
   if (!filter) return {}
   const keys = Object.keys(filter)
   const nFiter = { ...filter }