'对接销售订单进来的物流单新增和查看详情'

src/pages/logistics/components/orderSearchDetail.tsx

@@ -222,6 +222,7 @@ const detailInfo: React.FC<{}> = () => {
     const id = history.location.query.id
     setid(id)
 
+    //待新增
     if (pathname === '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil') {
       PublicApi.getLogisticsOrderSubmitGet({ id: id }).then(res => {
         setdataInfo(res.data)
@@ -500,7 +501,7 @@ const detailInfo: React.FC<{}> = () => {
           <div className={style['mainCol-title']}>
             外部流转记录
           </div>
-          <OrderLog id={id} pathName={history.location.pathname}/>
+          {/* <OrderLog id={id} pathName={history.location.pathname}/> */}
           {/* <StandardTable
             tableProps={{rowKey:'id'}}
             currentRef={ref}

src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-07-28 11:25:30
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-25 19:29:51
+ * @LastEditTime: 2020-09-26 11:51:05
  */
 
 import React, { Component, useEffect, useRef, useState, ReactNode } from 'react'
@@ -99,7 +99,8 @@ const Deatail: React.FC<{}> = () => {
   let [companyList, setCompanyList] = useState([])
   const [initialValues, setInitialValues] = useState<any>({})
   const [relevanceType,setrelevanceType] = useState('1')//对应单据类型 1-订单 2-换货申请单(退货发货) 3-换货申请单(换货发货) 4-退货申请单
-  const [shipmentOrderID, setShipmentOrderID] = useState(null)
+  const [shipmentOrderID, setShipmentOrderID] = useState<any>(null)//发货单
+  const [invoicesId,setInvoicesId] = useState<any>(null)
   const [headerTitle, setHeaderTitle] = useState<string>('')
   let [shipperAddress, setshipperAddress] = useState([])
   let [receiverAddress, setReceiverAddress] = useState('')
@@ -304,25 +305,36 @@ const Deatail: React.FC<{}> = () => {
         setshipmentOrderCode(query.shipmentOrderCode)
         // setinitOrderObj({...initOrderObj,shipmentOrderCode: query.shipmentOrderCode})
       }
-      //设置地址
-      if(query.orderDeliveryDetailsId){
+      //设置地址  发货单id  逻辑有物流单的用物流单优先 无物流单用订单 二选一 
+      if(query.orderDeliveryDetailsId){//发货单
         PublicApi.getWarehouseInvoicesList({current: '1',
           pageSize: '100000'}).then(res => {
           if(res.code === 1000){
             setShipmentOrderID(query.orderDeliveryDetailsId)//发货单id
             let v = res.data.data.filter(v => v.id == query.orderDeliveryDetailsId).map(v => v)
-            console.log('v',v)
             let {memberName,fullAddress,deliveryAddresId} = v[0] || {}
             actions.setFieldValue('receiverName',memberName)
             actions.setFieldValue('receiverAddressId',deliveryAddresId)
             actions.setFieldValue('receiverFullAddress',fullAddress)
           }
         })
+      }else{//订单
+        PublicApi.getOrderLogisticsOrderList({current: '1',
+        pageSize: '100000'}).then(res => {
+        if(res.code === 1000){
+          setInvoicesId(query.invoicesId)//订单id
+          let v = res.data.data.filter(v => v.id == query.invoicesId).map(v => v)
+          let {memberName,fullAddress,deliveryAddresId} = v[0] || {}
+          actions.setFieldValue('receiverName',memberName)
+          actions.setFieldValue('receiverAddressId',deliveryAddresId)
+          actions.setFieldValue('receiverFullAddress',fullAddress)
+        }
+      })
       }
+      
 
       //订单号
       if(query.invoicesNo){
-        console.log('进来')
         setinvoicesNo(query.invoicesNo)
         // setinitOrderObj({...initOrderObj,invoicesNo: query.invoicesNo})
       }
@@ -435,17 +447,18 @@ const Deatail: React.FC<{}> = () => {
    */
   const FormSubmit = (values: any) => {
     let value = { ...values }
-    console.log('value', value, JSON.stringify(value))
+   
     if(query.orderId){//销售订单过来的
-      value['orderId'] = query.orderId
-      value['orderDeliveryDetailsId'] = query.orderDeliveryDetailsId
+      // value['orderId'] = query.orderId
+      // value['orderDeliveryDetailsId'] = query.orderDeliveryDetailsId
       value['shipmentOrderId'] = query.orderDeliveryDetailsId
       value['shipmentOrderCode'] = query.shipmentOrderCode
       value['relevanceType'] = Number(query.invoicesTypeId) 
-      // value['relevanceOrderId']
+      value['relevanceOrderId'] = query.invoicesId
       value['receiverName'] = actions.getFieldValue('receiverName')
       value['receiverAddressId'] = actions.getFieldValue('receiverAddressId')
       value['invoicesNo'] = query.invoicesNo //对应单据编号
+      console.log('value', value, JSON.stringify(value))
       PublicApi.postOrderLogisticsOrderAdd(value).then(res => {
         if (res.code === 1000) {
           setTimeout(() => {
@@ -567,18 +580,30 @@ const Deatail: React.FC<{}> = () => {
     console.log(type, values,'参数：',params)
 
     console.log(actions);
-    let { id, orderNo, address } = values[0]
+    let { id, orderNo,deliveryAddresId, fullAddress,memberName } = values[0]
     switch (type) {
       case 1://订单
         setrelevanceType(params.orderType)//订单类型
         actions.setFieldValue('invoicesNo', orderNo)
         actions.setFieldValue('relevanceOrderId',id)
-        setReceiverAddress(address)
+        // setReceiverAddress(address)
+        // deliveryAddresId
+        setInvoicesId(id)
+        //需求 发货人和发货地址已发货单为准
+        if(!actions.getFieldValue('receiverAddressId')){
+          actions.setFieldValue("receiverAddressId",deliveryAddresId)
+        }
+        if(!actions.getFieldValue('receiverFullAddress')){
+          actions.setFieldValue("receiverFullAddress",fullAddress)
+        }
+        if(!actions.getFieldValue('receiverName')){
+          actions.setFieldValue("receiverName",memberName)
+        }
+
         setvisibleObj({ ...visibleObj, ModalSeletOrder1: false })
         break;
       case 2://发货单
         // memberName 收货方
-        let {deliveryAddresId, fullAddress,memberName, } = values[0]
         setShipmentOrderID(id)
         actions.setFieldValue('shipmentOrderCode', orderNo)
         actions.setFieldValue("receiverName",memberName)
@@ -629,22 +654,22 @@ const Deatail: React.FC<{}> = () => {
    * @return {type} 
    */
   const fetchProductList = async (params) => {
-    if(shipmentOrderID === null){//发货单id
-      // message.error('请先选择发货单')
-      return
-    }
-    // const res = await PublicApi.getOrderProcurementOrderProductPageList({...params,id: shipmentOrderID })
-    // return res.data
-    return new Promise((resolve, reject) => {
-      const queryResult = data.find(v => v.key === params.keywords)
-      setTimeout(() => {
-        resolve({
-          code: 200,
-          message: '',
-          data: queryResult ? [queryResult] : data2
-        })
-      }, 1000)
-    })
+    // if(shipmentOrderID === null){//发货单id
+    //   message.error('请先选择发货单')
+    //   return
+    // }
+    const res = await PublicApi.getOrderProcurementOrderProductPageList({...params,id: shipmentOrderID })
+    return res.data
+    // return new Promise((resolve, reject) => {
+    //   const queryResult = data.find(v => v.key === params.keywords)
+    //   setTimeout(() => {
+    //     resolve({
+    //       code: 200,
+    //       message: '',
+    //       data: queryResult ? [queryResult] : data2
+    //     })
+    //   }, 1000)
+    // })
   }
 
 
@@ -726,10 +751,11 @@ const Deatail: React.FC<{}> = () => {
                       {({ state, mutators }) => {
                         // const onAdd = () => mutators.push()
                         const selectGoods = () => {
-                          if(!shipmentOrderID){
+                          if(!shipmentOrderID && !invoicesId){
                              message.error('请先选择发货单')
                              return
                           }
+                          
                           setvisibleObj({ ...visibleObj, ModalSeletOrder3: true })
                         }
                         return (

src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx

@@ -105,7 +105,7 @@ export const useSelfTable = () => {
 
   const handlePreview = async (record) => {
     const logisticsId = record.logisticsId
-    history.push(`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSubmitDetail?id=${logisticsId}`)
+    history.push(`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitDeatil?id=${logisticsId}&invoicesTypeId=2`)
   }
 
   return {