Commit 37febd41 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:处理商城跳转过来的下单获取信息报错,处理销售订单审核是否使用合同参数异常

parent 00c62253
...@@ -31,7 +31,7 @@ const schema: ISchema = { ...@@ -31,7 +31,7 @@ const schema: ISchema = {
title: '是否使用电子合同', title: '是否使用电子合同',
enum: [ enum: [
{ label: '是', value: 1 }, { label: '是', value: 1 },
{ label: '否', value: 2 }, { label: '否', value: 0 },
], ],
default: 1, default: 1,
"x-linkages": [ "x-linkages": [
...@@ -188,7 +188,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => { ...@@ -188,7 +188,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id']) useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id'])
} else { } else {
actions.setFieldState('usingElectronicContracts', state => { actions.setFieldState('usingElectronicContracts', state => {
state.value = 2 state.value = 0
state.props["x-component-props"] = { state.props["x-component-props"] = {
disabled: true disabled: true
} }
......
...@@ -7,7 +7,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd' ...@@ -7,7 +7,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
import { DELIVERY_TYPE, OrderModalType } from '@/constants' import { DELIVERY_TYPE, OrderModalType } from '@/constants'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { EnvironmentOutlined } from '@ant-design/icons' import { EnvironmentOutlined } from '@ant-design/icons'
import { Popover, Space, Row } from 'antd' import { Popover, Space, Row, message } from 'antd'
export interface ProductModalTableProps extends ModalTableProps { export interface ProductModalTableProps extends ModalTableProps {
type?: 'radio' | 'checkbox', type?: 'radio' | 'checkbox',
...@@ -138,13 +138,15 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => { ...@@ -138,13 +138,15 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
const handleConfirmProduct = async () => { const handleConfirmProduct = async () => {
// 判断所选择的商品是否属于同一个工作流 // 判断所选择的商品是否属于同一个工作流
const { code, data } = await PublicApi.postOrderIsWorkFlow({memberId: rowSelectionCtl.selectRow[0].memberId, productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' }) const res = await PublicApi.postOrderIsWorkFlow({memberId: rowSelectionCtl.selectRow[0].memberId, productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
if (code === 1000) { if (res.code === 1000) {
const productData = schemaAction.getFieldValue('orderProductRequests') const productData = schemaAction.getFieldValue('orderProductRequests')
schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow)) schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow))
confirmModal && confirmModal() confirmModal && confirmModal()
setVisible(false) setVisible(false)
} else {
message.error(res.message)
} }
} }
......
...@@ -151,7 +151,8 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn ...@@ -151,7 +151,8 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
isMemberPrice: !!v.memberDiscount, isMemberPrice: !!v.memberDiscount,
purchaseCount: v.count, purchaseCount: v.count,
money: v.count * v.unitPrice, money: v.count * v.unitPrice,
productId: v.id productId: v.id,
memberId: initValue.supplyMembersId, // 添加 memberId 字段
} }
}))) })))
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment