浏览代码

feat: 云版管理详情相关

outaozhen 4 年之前
父节点
当前提交
1ef86e51f3

+ 7 - 6
src/pages/Customer/Client/components/ClientDetail/LowerList.jsx

@@ -2,17 +2,18 @@ import { Tabs, List, Row, Col } from 'antd'
 import React from 'react'
 import { dayjsFormat } from '@/utils/utils'
 
+export const servicelogEnum = {
+  1: '上门服务',
+  2: '电话拜访',
+  3: '其他事项',
+  4: '在线服务'
+}
+
 const ContanctLowerList = props => {
   const {
     log: { log: logs = [] },
     servicelist
   } = props
-  const servicelogEnum = {
-    1: '上门服务',
-    2: '电话拜访',
-    3: '其他事项',
-    4: '在线服务'
-  }
   const { TabPane } = Tabs
   return (
     <div>

+ 2 - 2
src/pages/Product/Cloud/components/Detail/LowerList.jsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import { Tabs, List, Row, Col } from 'antd'
 import { dayjsFormat } from '@/utils/utils'
+import { servicelogEnum } from '@/pages/Customer/Client/components/ClientDetail/LowerList'
 
 const RoadpricingLowerList = props => {
   const {
@@ -26,8 +27,7 @@ const RoadpricingLowerList = props => {
                     <Row className="w-full">
                       <Col span="8">
                         <a className="mr-1">@{item.staffName}</a>
-                        {item.status}
-                        {/* {servicelogEnum[item.status]} */}
+                        {servicelogEnum[item.status]}
                         <List.Item.Meta description={dayjsFormat(item.date, 'YYYY-MM-DD')} />
                       </Col>
                       <Col span="16" className="whitespace-pre-line">

+ 14 - 11
src/pages/Product/Cloud/components/Detail/TabList.jsx

@@ -2,37 +2,40 @@ import React, { useRef } from 'react'
 import { Tabs } from 'antd'
 import ProTable from '@ant-design/pro-table'
 
+export const lockEnum = {
+  1: '借出',
+  2: '销售',
+  3: '赠送'
+}
+
 const RoadpricingTabList = props => {
   const {
     compilationList,
     cloudUser: { online_list = [] }
   } = props
-  console.log(compilationList)
   const { TabPane } = Tabs
   const tRef = useRef(null)
   const columns = [
     {
       title: '产品',
       dataIndex: 'name',
-      onFilter: true,
       width: '17%'
     },
     {
       title: '状态',
       dataIndex: 'lock',
       onFilter: true,
-      width: '8%'
+      width: '8%',
+      render: lock => <span>{lockEnum[lock]}</span>
     },
     {
       title: '专业版',
       dataIndex: 'isUpgrade',
-      onFilter: true,
       width: '8%'
     },
     {
       title: '限期',
       dataIndex: 'deadline',
-      onFilter: true,
       width: '10%'
     }
   ]
@@ -40,13 +43,11 @@ const RoadpricingTabList = props => {
     {
       title: '日期',
       dataIndex: 'dateString',
-      onFilter: true,
       width: '12%'
     },
     {
       title: '时长',
-      dataIndex: 'online_time',
-      onFilter: true,
+      dataIndex: 'online_times',
       width: '17%'
     }
   ]
@@ -60,9 +61,10 @@ const RoadpricingTabList = props => {
                 size="small"
                 columns={columns}
                 search={false}
-                dataSource={compilationList}
                 toolBarRender={false}
-                rowKey={record => record.id}
+                // eslint-disable-next-line no-underscore-dangle
+                rowKey={record => record._id}
+                dataSource={compilationList}
                 pagination={false}
               />
             </div>
@@ -74,7 +76,8 @@ const RoadpricingTabList = props => {
                 columns={columnOnline}
                 search={false}
                 toolBarRender={false}
-                rowKey={record => record.id}
+                // eslint-disable-next-line no-underscore-dangle
+                rowKey={record => record._id}
                 dataSource={online_list}
                 pagination={false}
               />

+ 2 - 2
src/pages/Product/Cloud/components/Detail/index.jsx

@@ -13,14 +13,14 @@ const Detail = props => {
   const [state, setState] = useState({
     loading: false,
     cloudUser: {},
-    compilationList: {},
+    compilationList: [],
     log: [],
     serviceLog: []
   })
   const initData = async id => {
     setState({ ...state, loading: true })
     const {
-      data: { cloudUser = {}, compilationList = {}, log = [], serviceLog = [] },
+      data: { cloudUser = {}, compilationList = [], log = [], serviceLog = [] },
       code = -1
     } = await apiRoadpricingDetail({ ssoId: id, projectType })
     if (code === consts.RET_CODE.SUCCESS) {