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

fix: 处理采购订单手工下单阶梯价格商品模式下没有提交price字段

parent 6744ba22
...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [ ...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [ ...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [ ...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [ ...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [ ...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [ ...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -90,10 +90,9 @@ export const outReocrdCols: any[] = [ ...@@ -90,10 +90,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -145,10 +144,9 @@ export const insideRecordCols: any[] = [ ...@@ -145,10 +144,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [ ...@@ -35,10 +35,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [ ...@@ -90,10 +89,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -84,10 +84,9 @@ export const outReocrdCols: any[] = [ ...@@ -84,10 +84,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -139,10 +138,9 @@ export const insideRecordCols: any[] = [ ...@@ -139,10 +138,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -96,10 +96,9 @@ export const outReocrdCols: any[] = [ ...@@ -96,10 +96,9 @@ export const outReocrdCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -151,10 +150,9 @@ export const insideRecordCols: any[] = [ ...@@ -151,10 +150,9 @@ export const insideRecordCols: any[] = [
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -137,12 +137,12 @@ const BidDetailSection:React.FC<BidDetailSectionProps> = ({ ...@@ -137,12 +137,12 @@ const BidDetailSection:React.FC<BidDetailSectionProps> = ({
} }
return ( return (
// formContext.data && formContext.data &&
<Skeleton active loading={!(formContext.externalWorkflowFlowRecordLogResponses || formContext.interiorWorkflowFlowRecordLogResponses)}> // <Skeleton active loading={!(formContext.externalWorkflowFlowRecordLogResponses || formContext.interiorWorkflowFlowRecordLogResponses)}>
<div className={[style.anchorContentWrap, "anchorContent"].join(' ')}> <div className={[style.anchorContentWrap, "anchorContent"].join(' ')}>
<RenderDetailSection componentList={anchorList} /> <RenderDetailSection componentList={anchorList} />
</div> </div>
</Skeleton> // </Skeleton>
) )
} }
......
...@@ -46,10 +46,9 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => { ...@@ -46,10 +46,9 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidOutOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
...@@ -100,10 +99,9 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => { ...@@ -100,10 +99,9 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'operation', dataIndex: 'operationValue',
align: 'center', align: 'center',
key: 'operation', key: 'operationValue',
render: text => BidInOpeartTexts[text]
}, },
{ {
title: '操作时间', title: '操作时间',
......
...@@ -275,8 +275,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => { ...@@ -275,8 +275,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
deliveryTime: moment(value.deliveryTime).valueOf(), deliveryTime: moment(value.deliveryTime).valueOf(),
// 没用的字段 // 没用的字段
orderProductRequests: _orderProductRequests.map(v => { orderProductRequests: _orderProductRequests.map(v => {
// v.price = 1 v.price = v.money / v.purchaseCount / v.memberPrice
v.price = v.price
v.isMemberPrice = Number(v.isMemberPrice) || 0 v.isMemberPrice = Number(v.isMemberPrice) || 0
v.memberPrice = v.memberPrice v.memberPrice = v.memberPrice
v.imgUrl = v.mainPic ? v.mainPic : v.imgUrl v.imgUrl = v.mainPic ? v.mainPic : v.imgUrl
...@@ -641,6 +640,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => { ...@@ -641,6 +640,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
const { value, editable } = state const { value, editable } = state
// 报价单的值 等同于是否填写过报价单 // 报价单的值 等同于是否填写过报价单
// @tofix 此处模式变动 table前缀按钮无法显示 // @tofix 此处模式变动 table前缀按钮无法显示
console.log(pageStatus, value, '666')
const quotationOrderValue = ctx.getFieldValue('quotationNo') const quotationOrderValue = ctx.getFieldValue('quotationNo')
if ( if (
value === OrderModalType.HAND_ORDER || value === OrderModalType.HAND_ORDER ||
...@@ -663,7 +663,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => { ...@@ -663,7 +663,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
value === OrderModalType.PURCHASE_TENDER_CONTRACT_ORDER value === OrderModalType.PURCHASE_TENDER_CONTRACT_ORDER
) { ) {
// 判断合同下单 // 判断合同下单
// setTimeout(() => { setTimeout(() => {
addSchemaAction.setFieldState('orderProductRequests', productState => { addSchemaAction.setFieldState('orderProductRequests', productState => {
productState.props["x-component-props"] = { productState.props["x-component-props"] = {
...productState.props["x-component-props"], ...productState.props["x-component-props"],
...@@ -671,7 +671,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => { ...@@ -671,7 +671,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
} }
}) })
// }, 500) }, 500)
showContractColumn() showContractColumn()
} else { } else {
// setTimeout(() => { // setTimeout(() => {
......
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