修改物流单选择商品传错id的问题

src/pages/logistics/addLogistics/index.tsx

@@ -186,7 +186,7 @@ const AddLogistics: React.FC<{}> = () => {
               relevanceOrderCode: res.data.orderNo,
               voucherTime: res.data.transactionTime,
               externalState: res.data.state,
-              shipmentOrderId: res.data.invoicesTypeId,
+              shipmentOrderId: res.data.id,
               relevanceOrderId: res.data.relevanceInvoicesId,
             }
             form.setFieldsValue(obj);
@@ -332,7 +332,7 @@ const AddLogistics: React.FC<{}> = () => {
         case 1:
         case 2:
         case 3:
-          PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: id }).then((res: any) => {
+          PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.shipmentOrderId }).then((res: any) => {
             if (res.code === 1000) {
               res.data.data.forEach(item => {
                 item.category = item.categoryName
@@ -344,21 +344,21 @@ const AddLogistics: React.FC<{}> = () => {
           })
           break;
         case 4:
-          PublicApi.getAsReplaceGoodsPageReturnCommodityByLogistics({ ...params, dataId: id }).then(res => {
+          PublicApi.getAsReplaceGoodsPageReturnCommodityByLogistics({ ...params, dataId: query.relevanceOrderId }).then(res => {
             if (res.code === 1000) {
               resolve(res.data)
             }
           })
           break;
         case 5:
-          PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: id }).then(res => {
+          PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: query.relevanceOrderId}).then(res => {
             if (res.code === 1000) {
               resolve(res.data)
             }
           })
           break;
         case 6:
-          PublicApi.getAsReturnGoodsPageCommodityByLogistics({ ...params, dataId: id }).then(res => {
+          PublicApi.getAsReturnGoodsPageCommodityByLogistics({ ...params, dataId: query.relevanceOrderId }).then(res => {
             if (res.code === 1000) {
               resolve(res.data)
             }

src/pages/logistics/components/confirmModal.tsx

-import React, { Component, useState, useEffect } from 'react';
-import { Modal, Button, Form } from 'antd'
-import {
-  SchemaForm, SchemaMarkupField as Field,
-  createFormActions,
-  FormEffectHooks
-} from '@formily/antd'
-import { Input, Radio, FormMegaLayout, NumberPicker } from '@formily/antd-components'
-import { PublicApi } from '@/services/api'
-import { PATTERN_MAPS } from '@/constants/regExp'
-export interface Params {
-  id: number | string;
-  dialogVisible: boolean;
-  onCancel: Function;
-  onOK?: Function;
-  freightPrice?: any;
-  dontReceive?: boolean; //默认展示
-}
-const actions = createFormActions()
-const { onFieldChange$ } = FormEffectHooks
-const comfirmDialog: React.FC<Params> = (props) => {
-  console.log(props.dialogVisible)
-  const handleCancel = () => {
-  }
-  const handletOk = (values: any) => {
-    let value = { ...values }
-    value.id = props.id
-    if(props.freightPrice) {
-      value.freightPrice = props.freightPrice
-    }
-    PublicApi.postLogisticsOrderWaitConfirmConfirm(value).then(res => {
-      if (res.code === 1000) {
-        props.onOK()
-      }
-    })
-
-  }
-  useEffect(() => {
-    return () => {
-    }
-  }, [])
-  const useFormEffects = () => {
-    const { setFieldState } = createFormActions()
-    onFieldChange$('status').subscribe(({ value }) => {
-      setFieldState('remark', state => {
-        if (value == 4) {
-          state.visible = false
-        } else {
-          state.visible = true
-        }
-      })
-      setFieldState('freightPrice', state => {
-        if (value != 4) {
-          state.visible = false
-        } else {
-          state.visible = true
-        }
-      })
-    })
-
-  }
-  return (
-    <>
-      <Modal
-        title='单据确认'
-        width={800}
-        visible={props.dialogVisible}
-        onOk={() => actions.submit()}
-        onCancel={() => props.onCancel()}
-        destroyOnClose
-        afterClose={() => actions.reset()}
-        okText='确定'
-        cancelText='取消'
-      >
-        <SchemaForm
-          labelCol={3}
-          components={{
-            Input, Radio: Radio.Group, TextArea: Input.TextArea, NumberPicker
-          }}
-          actions={actions}
-          effects={() => useFormEffects()}
-          onSubmit={(values) => handletOk(values)}
-          initialValues={{
-            status: 4
-          }}
-        >
-          <Field
-            enum={
-              [
-                { label: '接受物流单', value: 4 },
-                { label: '不接受物流单', value: 3 }
-              ]}
-            name='status'
-            required
-            x-component="Radio"
-          />
-
-          {props.dontReceive &&
-            <>
-              {/* <FormMegaLayout name='remarkOption' label='不接受原因' full required labelCol={2} labelAlign="top"> */}
-              <Field
-                title='不接受原因'
-                name="remark"
-                x-component="TextArea"
-                required
-                x-component-props={{
-                  placeholder: '在此输入你的内容，最多60个汉字'
-                }}
-                x-mega-prop={{
-                  labelAlign: 'left'
-                }}
-                x-rules={{
-                  max: 60,
-                  // maximum:10,//最大数值
-                  message: '原因最多60个汉字'
-                }}
-              />
-
-
-            </>
-          }
-        </SchemaForm>
-      </Modal>
-    </>
-  )
-}
-comfirmDialog.defaultProps = {
-  dontReceive: true
-}
-export default comfirmDialog
\ No newline at end of file
+import React, { Component, useState, useEffect } from 'react';
+import { Modal, Button, Form } from 'antd'
+import {
+  SchemaForm, SchemaMarkupField as Field,
+  createFormActions,
+  FormEffectHooks
+} from '@formily/antd'
+import { Input, Radio, FormMegaLayout, NumberPicker } from '@formily/antd-components'
+import { PublicApi } from '@/services/api'
+import { PATTERN_MAPS } from '@/constants/regExp'
+export interface Params {
+  id: number | string;
+  dialogVisible: boolean;
+  onCancel: Function;
+  onOK?: Function;
+  freightPrice?: any;
+  dontReceive?: boolean; //默认展示
+}
+const actions = createFormActions()
+const { onFieldChange$ } = FormEffectHooks
+const comfirmDialog: React.FC<Params> = (props) => {
+  console.log(props.dialogVisible)
+  const handleCancel = () => {
+  }
+  const handletOk = (values: any) => {
+    let value = { ...values }
+    value.id = props.id
+    if(props.freightPrice) {
+      value.freightPrice = props.freightPrice
+    }
+    PublicApi.postLogisticsOrderWaitConfirmConfirm(value).then(res => {
+      if (res.code === 1000) {
+        props.onOK()
+      }
+    }).catch(error => {
+      console.log(error)
+      props.onOK()
+    })
+
+  }
+  useEffect(() => {
+    return () => {
+    }
+  }, [])
+  const useFormEffects = () => {
+    const { setFieldState } = createFormActions()
+    onFieldChange$('status').subscribe(({ value }) => {
+      setFieldState('remark', state => {
+        if (value == 4) {
+          state.visible = false
+        } else {
+          state.visible = true
+        }
+      })
+      setFieldState('freightPrice', state => {
+        if (value != 4) {
+          state.visible = false
+        } else {
+          state.visible = true
+        }
+      })
+    })
+
+  }
+  return (
+    <>
+      <Modal
+        title='单据确认'
+        width={800}
+        visible={props.dialogVisible}
+        onOk={() => actions.submit()}
+        onCancel={() => props.onCancel()}
+        destroyOnClose
+        afterClose={() => actions.reset()}
+        okText='确定'
+        cancelText='取消'
+      >
+        <SchemaForm
+          labelCol={3}
+          components={{
+            Input, Radio: Radio.Group, TextArea: Input.TextArea, NumberPicker
+          }}
+          actions={actions}
+          effects={() => useFormEffects()}
+          onSubmit={(values) => handletOk(values)}
+          initialValues={{
+            status: 4
+          }}
+        >
+          <Field
+            enum={
+              [
+                { label: '接受物流单', value: 4 },
+                { label: '不接受物流单', value: 3 }
+              ]}
+            name='status'
+            required
+            x-component="Radio"
+          />
+
+          {props.dontReceive &&
+            <>
+              {/* <FormMegaLayout name='remarkOption' label='不接受原因' full required labelCol={2} labelAlign="top"> */}
+              <Field
+                title='不接受原因'
+                name="remark"
+                x-component="TextArea"
+                required
+                x-component-props={{
+                  placeholder: '在此输入你的内容，最多60个汉字'
+                }}
+                x-mega-prop={{
+                  labelAlign: 'left'
+                }}
+                x-rules={{
+                  max: 60,
+                  // maximum:10,//最大数值
+                  message: '原因最多60个汉字'
+                }}
+              />
+
+
+            </>
+          }
+        </SchemaForm>
+      </Modal>
+    </>
+  )
+}
+comfirmDialog.defaultProps = {
+  dontReceive: true
+}
+export default comfirmDialog

src/pages/logistics/list/addCompany.tsx

@@ -180,6 +180,7 @@ const company: React.FC<parmas> = (props) => {
     let { memberId, roleId, name } = selectRow
     menuForm.setFieldsValue({
       companyMemberId: memberId,
+      companyRoleId: roleId,
       name: name
     })
     setsVisible(false)