优化.对接物流明细

src/pages/logistics/components/orderSearchDetail.tsx

@@ -38,9 +38,9 @@ interface dataInfoType{
 }
 
 const detailInfo: React.FC<{}> = () => {
-  const ref = useRef({})
+  const ref = useRef<any>({})
   let [isextraOption, setIsextraOption] = useState(false)
-  let [dataInfo, setdataInfo] = useState<dataInfoType>({
+  let [dataInfo, setdataInfo] = useState<any>({
     status: '',
     digest: '',
     logisticsOrderNo:'',
@@ -54,7 +54,7 @@ const detailInfo: React.FC<{}> = () => {
     freightPrice: 0,
     settlementWay: ''
   })
-  const [id, setid] = useState('')
+  const [id, setid] = useState(history.location.query.id)
   let [visible, setvisible] = useState(false)
   const [pagination, setPagination] = useState({
     current: 1,
@@ -179,19 +179,24 @@ const detailInfo: React.FC<{}> = () => {
     {
       title: '状态',
       dataIndex: 'status',
-      align: 'center',
+      align: 'left',
       key: 'status',
-      render: (text: any, record: any) => {
+      render: (text: number, record: any) => {
         let component: ReactNode = null;
-        component = <Badge color="#FFC400" text="待审核" />;
+        text === 1 ? component = <Badge status='default' text="待提交" />:
+        text === 2 ? component = <Badge status='processing' text="待确认" />:
+        text === 3 ? component = <Badge status='success' text="接受物流单" />:
+        component = <Badge status='error' text="不接受物流单" />
         return component;
       },
     },
     {
       title: '操作',
-      dataIndex: 'operation',
+      dataIndex: 'type',
       align: 'center',
-      key: 'operation',
+      key: 'type',
+      render: (text: number ,record:any) => 
+      <>{text === 1 ?'提交物流单':'确认物流单'}</>
     },
     {
       title: '操作时间',
@@ -208,6 +213,7 @@ const detailInfo: React.FC<{}> = () => {
       width: 300
     },
   ];
+
   //在这做逻辑判断  判断路由 是由哪个页面进来的
   useEffect(() => {
     let pathname = history.location.pathname
@@ -243,12 +249,15 @@ const detailInfo: React.FC<{}> = () => {
 
     //待确认物流单
     if (pathname === '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil') {
-      setIsextraOption(true)
+    
       PublicApi.getLogisticsOrderWaitConfirmGet({ id: id }).then(res => {
         setdataInfo(res.data)
         let current = 0
-        if(res.data.status <= 2){
+        if(res.data.status == 1){
           current = 0
+        }else if(res.data.status == 2){
+          current = 0
+          setIsextraOption(true)
         }else if(res.data.status == 3 || res.data.status == 4){
           current = 1
         }
@@ -261,17 +270,27 @@ const detailInfo: React.FC<{}> = () => {
   }, [])
   const fetchData = (params: any) => {
     return new Promise((resolve, reject) => {
-      const queryResult = data.find(v => v.key === params.keywords);
-      setTimeout(() => {
-        resolve({
-          code: 200,
-          message: '',
-          data: dataInfo.detailList//dataInfo.logList
-        });
-      }, 1000);
+      PublicApi.getLogisticsOrderWaitSubmitPageOrderLog({...params,orderId:id}).then(res => {
+        if(res.code === 1000){
+          resolve(res.data)
+        }
+      })
+      // const queryResult = data.find(v => v.key === params.keywords);
+      // setTimeout(() => {
+      //   resolve({
+      //     code: 200,
+      //     message: '',
+      //     data: dataInfo.detailList//dataInfo.logList
+      //   });
+      // }, 1000);
     });
   };
   
+  const handleModalOK = () => {
+    setvisible(false)
+    ref.current.reload()
+  }
+
 
   return (
     <PageHeaderWrapper
@@ -364,7 +383,7 @@ const detailInfo: React.FC<{}> = () => {
                 (item: any, index: number) => {
                   return (
                     <div className={style['cols-main']} key={index}>
-                      <div className={style['cols-main-options']}>
+                      <div className={style['cols-main-options']} style={{flex:'1.5 1'}}>
                         {item.title}
                       </div>
                       <div className={style['cols-main-options']}>
@@ -485,7 +504,14 @@ const detailInfo: React.FC<{}> = () => {
           <div className={style['mainCol-title']}>
             外部流转记录
           </div>
-          <Table dataSource={dataInfo.logList}  columns={columns} pagination={pagination} />
+          <StandardTable
+            tableProps={{rowKey:'id'}}
+            currentRef={ref}
+            columns={columns}
+            fetchTableData={(params: any) => fetchData(params)}
+
+          />
+          {/* <Table dataSource={dataInfo.logList}  columns={columns} pagination={pagination} /> */}
 
 
         </Col>
@@ -494,6 +520,7 @@ const detailInfo: React.FC<{}> = () => {
         id={id}
         dialogVisible={visible}
         onCancel={() => setvisible(false)}
+        onOK = {() =>handleModalOK}
       />
 
     </PageHeaderWrapper>

src/pages/logistics/list/addCompany.css

-.btn-wrap .ant-input-group .ant-input-group-addon {
+.selectBtn {
+  padding: 0 !important;
+}
+.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .ant-input-group-wrapper .ant-input-wrapper .ant-input-group-addon,
+.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .selectBtn .ant-input-wrapper .ant-input-group-addon,
+.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .ant-input-group-wrapper .ant-input-group .ant-input-group-addon,
+.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .selectBtn .ant-input-group .ant-input-group-addon {
   padding: 0 !important;
 }

src/pages/logistics/list/addCompany.less

-.btn-wrap{
-  .ant-input-group{
-    .ant-input-group-addon{
-      padding: 0 !important;
+.selectBtn{
+
+
+  padding: 0 !important;
+  
+  
+}
+.ant-form-item-control{
+  .ant-form-item-control-input{
+    .ant-form-item-control-input-content{
+      .ant-input-group-wrapper, .selectBtn{
+        .ant-input-wrapper ,.ant-input-group{
+          .ant-input-group-addon{
+            padding: 0 !important;
+          }
+        }
+      }
     }
   }
-}
+}
\ No newline at end of file

src/pages/logistics/list/addCompany.tsx

@@ -69,7 +69,7 @@ const { Option } = Select;
 const defaultValue = 'lucy'
 const company: React.FC<{}> = () => {
   //hook只能写在函数组件的顶级作用域
-  const ref = useRef({})
+  const ref = useRef<any>({})
   const [menuForm] = Form.useForm();
   const [headerTitle, setHeaderTitle] = useState('新建物流公司')
   const [Code, setCode] = useState('')
@@ -224,7 +224,7 @@ const company: React.FC<{}> = () => {
                             }
                           ]}
                         >
-                          <Input className={style['btn-wrap']} disabled maxLength={20} addonAfter={selectBtn}/>
+                          <Input className={style['selectBtn']} disabled maxLength={20} addonAfter={selectBtn}/>
                         </Form.Item>
                         :
                         <Form.Item

src/pages/logistics/list/company.tsx

 /*
  * @Date: 2020-07-13 15:01:40
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-30 10:06:44
+ * @LastEditTime: 2020-08-03 16:52:53
  */
 
 import React, { ReactNode, useRef } from 'react'
@@ -50,7 +50,7 @@ const fetchData = (params?: any) => {
 }
 
 const Company: React.FC<{}> = () => {
-  const ref = useRef({})
+  const ref = useRef<any>({})
 
   const columns: ColumnType<any>[] = [
     {

src/pages/logistics/list/components/addressForm.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-15 10:31:55
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-28 10:56:07
+ * @LastEditTime: 2020-08-03 17:59:56
  */
 import React, { Component, useState, useEffect } from 'react';
 import ReactDOM from 'react-dom'
@@ -175,7 +175,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
       setOptions(TelCodeList)
     })
     const getAllCode  = setTimeout(()=> {
-      PublicApi.getWarehouseAreaByPcodeAll({ pcode: '100000' }).then(res => {
+      PublicApi.getManageAreaByPcodeAll({ pcode: '100000' }).then(res => {
         let list = []
         res.data.forEach((item: any, index: number) => {
           list.push({ label: item.name, value: `${item.code}-${item.name}`  })
@@ -259,7 +259,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
         state.value = ''
         let list = []
         let pcode = value && value.split('-').length > 1 ? value.split('-')[0] : value
-        PublicApi.getWarehouseAreaByPcodeAll({ pcode: pcode }).then(res => {
+        PublicApi.getManageAreaByPcodeAll({ pcode: pcode }).then(res => {
           res.data.forEach((item: any, index: number) => {
             // list.push({ label: item.name, value: item.code })
             list.push({ label: item.name, value: `${item.code}-${item.name}`  })
@@ -277,7 +277,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
         state.value = ''
         let list = []
         let pcode = value &&  value.split('-').length > 1 ? value.split('-')[0] : value
-        PublicApi.getWarehouseAreaByPcodeAll({ pcode: pcode }).then(res => {
+        PublicApi.getManageAreaByPcodeAll({ pcode: pcode }).then(res => {
           res.data.forEach((item: any, index: number) => {
             // list.push({ label: item.name, value: item.code })
             list.push({ label: item.name, value: `${item.code}-${item.name}`  })

src/pages/logistics/list/components/templateForm.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-15 10:31:55
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-30 19:37:57
+ * @LastEditTime: 2020-08-03 18:02:39
  */
 import React, { Component, useState, useEffect } from 'react';
 import ReactDOM from 'react-dom'
@@ -105,7 +105,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
     }
     // console.log(id,typeof id,history.location.query.isSee,typeof history.location.query.isSee)
     setHeaderTitle(`${_title}运费模板`)
-    PublicApi.getWarehouseAreaByPcodeAll({ pcode: '100000' }).then(res => {
+    PublicApi.getManageAreaByPcodeAll({ pcode: '100000' }).then(res => {
       let list = []
       res.data.forEach((item: any, index: number) => {
         list.push({ label: item.name, value: Number(item.code)  })
@@ -152,10 +152,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
       history.goBack()
     },1000)
   }
-  const addStyle = {
-    padding: '2px 0',
-    textAlign: 'center'
-  }
+
   const onSearch = () => {
 
   }
@@ -335,7 +332,8 @@ const diaLogForm: React.FC<ListProps> = (props) => {
                           operations: {
                             title: '操作'
                           },
-                          renderAddition: () => <div style={addStyle}>+添加指定地区</div>,
+                          renderAddition: () => 
+                          <div style={{padding: '2px 0',textAlign: 'center'}}>+添加指定地区</div>,
                           renderMoveDown: () => null,
                           renderMoveUp: () => null,
                           renderRemove: (idx: any) => {

src/pages/logistics/list/template.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-14 15:07:34
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-24 20:08:29
+ * @LastEditTime: 2020-08-03 11:19:53
  */
 import React, { Component, ReactNode, useRef, useState } from 'react'
 import { history } from 'umi'
@@ -111,7 +111,7 @@ const EditableCell: React.FC<EditableCellProps> = ({
  */
 const Template: React.FC<ListProps> = (props) => {
   console.log(props)
-  const ref = useRef({})
+  const ref = useRef<any>({})
   const [form] = Form.useForm();
   const [table, setTable] = useState([])
   const [editingKey, setEditingKey] = useState('');

src/pages/logistics/logisticsResult/toOrderComfirmList.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-14 15:07:34
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-01 11:10:57
+ * @LastEditTime: 2020-08-03 15:48:15
  */
 import React, { Component, ReactNode, useRef, useState, useEffect } from 'react'
 import { history } from 'umi'
@@ -199,7 +199,7 @@ const OrderList: React.FC<ListProps> = (props) => {
     },
     {
       title: '外部状态',
-      align: 'center',
+      align: 'left',
       dataIndex: 'status',
       key: 'status',
       filters: statusList,
@@ -360,17 +360,6 @@ const OrderList: React.FC<ListProps> = (props) => {
                           })
                         }
                       </Select>
-                      <Select
-                        className={style.select}
-                        value={searchForm.status}
-                        onChange={(val) => setSearchForm({ ...searchForm, status: val })}
-                      >
-                        {
-                          outSideStatusList.map((item,index) => {
-                            return <Option key={index} value={item.value}>{item.label}</Option>
-                          })
-                        }
-                      </Select>
                     </Space>
                   </Col>
                 }

src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx

@@ -2,9 +2,9 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-28 11:25:30
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-07-30 17:37:44
+ * @LastEditTime: 2020-08-03 16:48:12
  */ 
-import React, { Component, useEffect, useRef, useState } from 'react'
+import React, { Component, useEffect, useRef, useState,ReactNode } from 'react'
 import { Card, Row, Col, Tabs, Button, Input as SelectInput, Badge } from 'antd'
 import { LinkOutlined } from '@ant-design/icons'
 import { StandardTable } from 'god'
@@ -82,17 +82,17 @@ const Deatail: React.FC<{}> = () => {
     },
     {
       title: '状态',
-      align: 'center',
+      align: 'left',
       dataIndex: 'name',
       key: 'name',
-      render: (_: any, record) => {
-        return (
-          <>
-            <Badge color="#6C9CEB" text='待确认' />
-            <Badge status='error' text='不接受物流单' />
-          </>
-        )
-      }
+      render: (text: number, record: any) => {
+        let component: ReactNode = null;
+        text === 1 ? component = <Badge status='default' text="待提交" />:
+        text === 2 ? component = <Badge status='processing' text="待确认" />:
+        text === 3 ? component = <Badge status='success' text="接受物流单" />:
+        component = <Badge status='error' text="不接受物流单" />
+        return component;
+      },
     },
     {
       title: '操作',

src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-14 15:07:34
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-01 11:12:49
+ * @LastEditTime: 2020-08-03 15:49:51
  */
 import React, { Component, ReactNode, useRef, useState, useEffect } from 'react'
 import { history } from 'umi'
@@ -159,7 +159,7 @@ const OrderList: React.FC<ListProps> = (props) => {
     },
     {
       title: '外部状态',
-      align: 'center',
+      align: 'left',
       dataIndex: 'status',
       key: 'status',
       filters: statusList,