fix: 编辑合同采购订单-订单物料-配送方式切换自提问题

src/pages/transaction/purchaseOrder/orderCollectSrm/components/materialTableCell/index.tsx

@@ -3,6 +3,7 @@ import { Form, Input, Select, Popover, Row } from 'antd';
 import { EnvironmentOutlined } from '@ant-design/icons';
 import { getLogisticsSelectListMemberShipperAddress } from '@/services/LogisticsV2Api';
 import { useIntl } from 'umi';
+import type { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
 
 export interface MaterialTableCellProps {
   title: React.ReactNode;
@@ -14,6 +15,7 @@ export interface MaterialTableCellProps {
   forceEdit: boolean,
   formItem: string,
   formItemProps: any,
+  ctx: ISchemaFormActions | ISchemaFormAsyncActions
 }
 
 const EditableContext = React.createContext<any>({});
@@ -43,6 +45,7 @@ export const MaterialTableCell:React.FC<MaterialTableCellProps> = ({
   handleSave,
   forceEdit,
   formItem,
+  ctx,
   formItemProps={},
   ...restProps
 }) => {
@@ -55,9 +58,11 @@ export const MaterialTableCell:React.FC<MaterialTableCellProps> = ({
   const [receiveInfo, setReceiveInfo] = useState<any>()
 
   const getReceiveInfo = async () => {
+    const vendorMemberId = ctx.getFieldValue('vendorMemberId'),
+      vendorRoleId = ctx.getFieldValue('vendorRoleId')
     const { data: deliveryAddress} =  await getLogisticsSelectListMemberShipperAddress({
-      memberId: record.memberId,
-      roleId: record.memberRoleId
+      memberId: vendorMemberId,
+      roleId: vendorRoleId
     })
     // setReceiveInfo(() => deliveryAddress.filter(item => item.isDefault)[0])
     setReceiveInfo(() => deliveryAddress[0])

src/pages/transaction/purchaseOrder/orderCollectSrm/constant/index.tsx

@@ -45,7 +45,7 @@ export const procurmentRenderInit = (initValue: any) => {
     deliverDate: initValue.consignee.deliverDate,
     theInvoiceId: initValue.invoice?.invoiceId || null,
     hasContract: initValue.hasContract,
-    contractNo: initValue.contract.contractNo,
+    contractNo: initValue?.contract?.contractNo,
     contract: { ...initValue.contract },
     currencyType: initValue.currencyType,
     paymentType: initValue.paymentType,

src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx

@@ -195,18 +195,21 @@ const PurchaseOrderDetail: React.FC<PurchaseOrderDetailProps> = (props) => {
       getOrderBuyerCreateDetail({ orderId: `${id}` }).then(res => {
         const { data } = res
         const _orderProductRequests = procurementRenderField(data)
-        postContractFeignGetTheLastContract(
-          { contractId: data.contract?.contractId },
-          { ctlType: 'none' },
-        ).then((resolve) => {
-          if (resolve.code !== 1000) {
-            message.error(resolve?.message)
-            return
-          }
-          data.contract = { ...resolve?.data }
-        })
+        if (data.contract?.contractId) {
+          postContractFeignGetTheLastContract(
+            { contractId: data.contract?.contractId },
+            { ctlType: 'none' },
+          ).then((resolve) => {
+            if (resolve.code !== 1000) {
+              message.error(resolve?.message)
+              return
+            }
+            data.contract = { ...resolve?.data }
+          })
+        }
+
         setTimeout(() => {
-          setContractValue(data?.contract)
+          setContractValue(data?.contract || {})
           setInitFormValue(() => procurmentRenderInit(data))
           addSchemaAction.setFieldValue('products', _orderProductRequests)
           addSchemaAction.setFieldValue('contract', {

src/pages/transaction/purchaseOrder/orderCollectSrm/model/useMaterialTable.tsx

@@ -196,6 +196,7 @@ export const useMaterialTable = (
       ...col,
       onCell: record => ({
         record,
+        ctx,
         editable: ctx.getFormState().editable === false ? false : col.editable,
         dataIndex: col.dataIndex,
         title: col.title,
@@ -233,7 +234,7 @@ export const useMaterialTable = (
   //       </Button>
   //     )
   //   }
-  //   setMaterialColumns(tempColumn) 
+  //   setMaterialColumns(tempColumn)
   // }
   // useEffect(() => {
   //   material()