Kaynağa Gözat

fix: 软件锁相关

outaozhen 5 yıl önce
ebeveyn
işleme
033da584cd

+ 31 - 2
src/pages/Customer/Company/components/CompanyDetail/CompanyTabList.jsx

@@ -8,7 +8,7 @@ import consts from '@/consts'
 import ProTable from '@ant-design/pro-table'
 import { queryContact } from '@/services/contact'
 
-const CompanyTabList = ({ initData, customerId }) => {
+const CompanyTabList = ({ initData, customerId, software }) => {
   const { TabPane } = Tabs
   const tRef = useRef()
   const columns = [
@@ -33,6 +33,24 @@ const CompanyTabList = ({ initData, customerId }) => {
       dataIndex: 'qq'
     }
   ]
+  const columnLongle = [
+    {
+      title: '锁号',
+      dataIndex: 'keyNum'
+    },
+    {
+      title: '产品',
+      dataIndex: 'product'
+    },
+    {
+      title: '状态',
+      dataIndex: 'statusT'
+    },
+    {
+      title: '责任人',
+      dataIndex: 'client'
+    }
+  ]
   const [state, setState] = useState({
     id: '',
     params: {},
@@ -80,7 +98,18 @@ const CompanyTabList = ({ initData, customerId }) => {
             </div>
           </TabPane>
           <TabPane tab="软件锁" key="软件锁">
-            <div className="sheet-right-panel">软件锁</div>
+            <div className="sheet-right-panel">
+              <ProTable
+                columns={columnLongle}
+                search={false}
+                toolBarRender={false}
+                params={state.params}
+                actionRef={tRef}
+                rowKey={record => record.id}
+                // dataSource={software.longle}
+                pagination={false}
+              />
+            </div>
           </TabPane>
         </Tabs>
       </div>

+ 5 - 4
src/pages/Customer/Company/components/CompanyDetail/index.jsx

@@ -12,12 +12,13 @@ const Index = props => {
   const [state, setState] = useState({
     loading: false,
     customer: {},
-    log: []
+    log: [],
+    software: {}
   })
   const initData = async () => {
     setState({ ...state, loading: true })
     const {
-      data: { customer = {}, log = [] },
+      data: { customer = {}, log = [], software = {} },
       code = -1
     } = await apiCompanyDetail(id)
     if (code === consts.RET_CODE.SUCCESS) {
@@ -27,7 +28,7 @@ const Index = props => {
           payload: 'company'
         })
       }
-      setState({ ...state, customer, log, loading: false })
+      setState({ ...state, customer, log, software, loading: false })
     }
   }
   useEffect(() => {
@@ -50,7 +51,7 @@ const Index = props => {
             </div>
           </Col>
           <Col span={12} flex={{ flexDirection: 'column' }}>
-            <CompanyTabList initData={initData} customerId={id} />
+            <CompanyTabList initData={initData} customerId={id} software={state.software} />
             <CompanyLowerList log={state.log} />
           </Col>
         </Row>

+ 0 - 4
src/pages/Customer/Contact/components/ContactDetail/ContanctTabList.jsx

@@ -89,10 +89,6 @@ const ContanctTabList = ({ clientId, software }) => {
                 //   } = await apiContactDetail({ ...params, ...sort, ...filter })
                 //   return {
                 //     data: longle,
-                //     data: { software = {}, total = 0 }
-                //   } = await apiContactDetail({ ...params, ...sort, ...filter })
-                //   return {
-                //     data: software.longle,
                 //     success: code === consts.RET_CODE.SUCCESS,
                 //     total
                 //   }

+ 1 - 1
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList.jsx

@@ -60,7 +60,7 @@ const LockTabList = props => {
                   <List.Item>
                     <Row className="zh-width-100P">
                       <Col span="8">
-                        {servicelogEnum[item.status]} <a>{item.responsible}</a>
+                        {servicelogEnum[item.status]} <a>{item.client}</a>
                         <br />
                         <a>@{item.operator}</a>{' '}
                         <span className="zh-gray">

+ 16 - 3
src/pages/Product/Lock/Lockstore/index.jsx

@@ -26,6 +26,18 @@ export const ProductLabel = ({ data }) => {
   )
 }
 
+const longleStatusNum = {
+  1: '生成',
+  2: '接收',
+  3: '借出',
+  4: '销售',
+  5: '升级',
+  6: '更换',
+  7: '收回',
+  8: '备注',
+  9: '赠送'
+}
+
 const Lockstore = () => {
   const [selectKeys, setSelectKeys] = useState([])
   const { toggleDrawer, setDrawerProps } = useModal()
@@ -118,9 +130,10 @@ const Lockstore = () => {
     },
     {
       title: '状态',
-      dataIndex: 'statusT',
-      key: 'statusT',
-      width: 150
+      dataIndex: 'status',
+      key: 'status',
+      width: 150,
+      render: status => <>{longleStatusNum[status]}</>
     },
     {
       title: '联系人',