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

fix: 移除资金账户列表会员等级列,处理编辑订单id和productId数据异常

parent 99d38b3e
......@@ -53,12 +53,12 @@ const AccountLists: React.FC<{}> = () => {
dataIndex: 'memberRoleName',
key: 'memberRoleName',
},
{
title: '会员等级',
dataIndex: 'memberLevel',
key: 'memberLevel',
render: (t, r) => <LevelBrand level={r.level} />
},
// {
// title: '会员等级',
// dataIndex: 'memberLevel',
// key: 'memberLevel',
// render: (t, r) => <LevelBrand level={r.level} />
// },
{
title: '账户余额',
dataIndex: 'accountBalance',
......
......@@ -43,12 +43,12 @@ const AccountLists: React.FC<{}> = () => {
dataIndex: 'memberRoleName',
key: 'memberRoleName',
},
{
title: '所属会员等级',
dataIndex: 'memberLevel',
key: 'memberLevel',
render: (t, r) => <LevelBrand level={r.memberLevel} />
},
// {
// title: '所属会员等级',
// dataIndex: 'memberLevel',
// key: 'memberLevel',
// render: (t, r) => <LevelBrand level={r.memberLevel} />
// },
{
title: '会员等级类型',
dataIndex: 'memberLevelType',
......
......@@ -15,6 +15,13 @@ export interface OrderDetailSectionProps {
}
const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type = 'purchaseOrder'}) => {
// console.log(findLastIndexFlowState(formContext.data.interiorWorkflowFlowRecordLogResponses) - 1)
// console.log(formContext.data.interiorWorkflowFlowRecordLogResponses ?
// formContext.data.interiorWorkflowFlowRecordLogResponses.map(item => ({
// ...item,
// status: item.isExecute ? 'finish' : 'wait',
// })) :
// [])
return (
formContext.data && <div className='gray-wrap'>
<AuditProcess
......
......@@ -68,7 +68,7 @@ export const MoneyTotalBox = ({ dataSource, preview }) => {
// // 筛选配送方式为物流的商品并且使用了运费模板
// const logsiticsDataMaps = orderProductRequests.filter(v => v.logistics && v.logistics.useTemplate && v.logistics.deliveryType === 1)
// if (logsiticsDataMaps.length > 0) {
// PublicApi.postLogisticsFreightRemoteAddDetail({
// PublicApi.postLogisticsFreightTemplateCalFreightPrice({
// orderProductList: logsiticsDataMaps.map(v => ({
// templateId: v.templateId,
// weight: v.weight
......
......@@ -107,7 +107,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
// 筛选配送方式为物流的商品并且使用了运费模板
const logsiticsDataMaps = orderProductRequests.filter(v => v.logistics && v.logistics.useTemplate && v.logistics.deliveryType === 1)
if (logsiticsDataMaps.length > 0) {
PublicApi.postLogisticsFreightRemoteAddDetail({
PublicApi.postLogisticsFreightTemplateCalFreightPrice({
orderProductList: logsiticsDataMaps.map(v => ({
templateId: v.templateId,
weight: v.weight
......
......@@ -65,7 +65,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
// 筛选配送方式为物流的商品并且使用了运费模板
const logsiticsDataMaps = data.filter(v => v.logistics && v.logistics.useTemplate && v.logistics.deliveryType === 1)
if (logsiticsDataMaps.length > 0) {
PublicApi.postLogisticsFreightRemoteAddDetail({
PublicApi.postLogisticsFreightTemplateCalFreightPrice({
orderProductList: logsiticsDataMaps.map(v => ({
templateId: v.logistics.templateId,
weight: v.logistics.weight
......@@ -160,6 +160,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}, [])
const handleSubmit = async (value) => {
console.log(value,'value')
try {
let fnResult = null
// 可做新增/修改的判断
......@@ -209,8 +210,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
if(judgement.includes(false)){
throw new Error('请选择支付方式或者支付渠道')
}
setBtnLoading(true)
fnResult = id ? await PublicApi.postOrderProcurementOrderUpdate({...params, id}) : await PublicApi.postOrderProcurementOrderAddReinsurancePolicy(params)
// setBtnLoading(true)
// fnResult = id ? await PublicApi.postOrderProcurementOrderUpdate({...params, id}) : await PublicApi.postOrderProcurementOrderAddReinsurancePolicy(params)
break;
}
}
......
......@@ -81,7 +81,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
const index = newData.findIndex(item => row.id === item.id);
const item = newData[index];
row['money'] = getUnitPriceTotal(row)
row['productId'] = row.id
row['productId'] = row.productId
newData.splice(index, 1, {
...item,
...row,
......
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