Merge branch 'fix0318' into 'v2-220318'

src/pages/transaction/saleOrder/index.tsx

@@ -72,6 +72,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
   const serversRoles = roles.filter(item => item['roleType'] === MEMBER_ROLE_TYPE_SERVICE_CONSUMER)
   const { token } = (getAuth() || {})
   const fetchParams = useRef<any>({})
+  const cancelId = useRef()
 
   const loadingTableData = (params) => {
     fetchParams.current = {...params}
@@ -81,7 +82,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
   // 提交取消
   const handleSubmit = () => {
     destroyActions.submit().then(async ({values}: any) => {
-      const result = await run({ orderId: values.id, reason: values.cancelReason })
+      const result = await run({ orderId: values.id || cancelId.current, reason: values.cancelReason })
       if (result.code === 1000) {
         destroyActions.reset()
         destoryRef.current.setVisible(false)
@@ -170,6 +171,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
   const handleCancel = (r) => {
     destoryRef.current.setVisible(true)
     destroyActions.setFieldValue('id', r.orderId)
+    cancelId.current = r.orderId
   }
 
   const handleSuspend = (r) => {