Skip to content

J
jinfa-platform
Commit 6273460a authored by Bill's avatar Bill
Browse files
Options

Merge branch 'fix418' into 'v2-220418'

处理送货计划-详情相关UI问题 See merge request linkseeks-design/pro-platform!444
parents c15e5608 9a9fe840
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 117 deletions
src/locales/en-US/priceManage.ts
View file @ 6273460a
......@@ -51,6 +51,7 @@ export default {
'priceManage.priceStrategy.setStrategy.title1':'View commodity price strategy',
'priceManage.priceStrategy.setStrategy.title2':'New product price strategy',
'priceManage.priceStrategy.setStrategy.title3':'Edit commodity price strategy',
'priceManage.priceStrategy.setStrategy.error1': 'Please set the price',
'priceManage.priceStrategy.setStrategy.extra':'Save',
'priceManage.priceStrategy.memberModal.modalTitle':'Select a member',
'priceManage.priceStrategy.priceModal.unitPrice':'Unit price',
......
src/locales/ko-KR/priceManage.ts
View file @ 6273460a
......@@ -51,6 +51,7 @@ export default {
'priceManage.priceStrategy.setStrategy.title1' : '상품 가격 전략 보기',
'priceManage.priceStrategy.setStrategy.title2' : '새 상품 가격 전략',
'priceManage.priceStrategy.setStrategy.title3' : '상품 가격 정책 편집',
'priceManage.priceStrategy.setStrategy.error1': '가격을 설정하십시오',
'priceManage.priceStrategy.setStrategy.extra' : '보존',
'priceManage.priceStrategy.memberModal.modalTitle' : '회원 선택',
'priceManage.priceStrategy.priceModal.unitPrice' : '단가',
......
src/locales/zh-CN/priceManage.ts
View file @ 6273460a
......@@ -51,6 +51,7 @@ export default {
'priceManage.priceStrategy.setStrategy.title1': '查看商品价格策略',
'priceManage.priceStrategy.setStrategy.title2': '新建商品价格策略',
'priceManage.priceStrategy.setStrategy.title3': '编辑商品价格策略',
'priceManage.priceStrategy.setStrategy.error1': '请设置价格',
'priceManage.priceStrategy.setStrategy.extra': '保存',
'priceManage.priceStrategy.memberModal.modalTitle': '选择会员',
'priceManage.priceStrategy.memberModal.modalTitle1': '选择会员等级',
......
src/pages/order/constants/anchors.ts
View file @ 6273460a
......@@ -77,7 +77,7 @@ const PlanGood: AnchorsItem = {
const PlannedDelivery: AnchorsItem = {
key: 'PlannedDelivery',
name: "计划送货"
name: "计划送货商品"
}
const DeliveryGood: AnchorsItem = {
......
src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/schema/index.tsx
View file @ 6273460a
......@@ -12,28 +12,13 @@ export const deliveryPlanCollaborationAwaitSchema: ISchema = {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
planCode: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
planCode: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
allowClear: true,
placeholder: '请输入计划编号查询'
},
},
allowClear: true,
align: 'flex-left',
placeholder: '请输入计划编号查询'
},
},
[FORM_FILTER_PATH]: {
......@@ -42,9 +27,10 @@ export const deliveryPlanCollaborationAwaitSchema: ISchema = {
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
justifyContent: 'flex-start',
},
colStyle: {
marginLeft: 20,
marginRight: 20,
},
},
properties: {
......
src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/schema/index.tsx
View file @ 6273460a
......@@ -12,28 +12,13 @@ export const deliveryPlanCollaborationQuerySchema: ISchema = {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
planNo: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
planNo: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
allowClear: true,
placeholder: '请输入计划编号查询'
},
},
allowClear: true,
align: 'flex-left',
placeholder: '请输入计划编号查询'
},
},
[FORM_FILTER_PATH]: {
......@@ -42,9 +27,10 @@ export const deliveryPlanCollaborationQuerySchema: ISchema = {
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
justifyContent: 'flex-start',
},
colStyle: {
marginLeft: 20,
marginRight: 20,
},
},
properties: {
......@@ -83,4 +69,4 @@ export const deliveryPlanCollaborationQuerySchema: ISchema = {
}
}
}
}
\ No newline at end of file
}
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/details.tsx
View file @ 6273460a
......@@ -3,43 +3,46 @@
* @author: Gavin
*/
import React, { useEffect, useState } from 'react'
import { history } from 'umi'
import { getIntl, history } from 'umi'
import _ from 'lodash'
import moment from 'moment'
import { Steps, Table, Tag } from 'antd'
import AnchorPage, { AnchorsItem } from "@/components/AnchorPage"
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { BaseInfo as base_Info, Circulation, ConfirmDeliveryPlan, ExternalRoamRecord, ExternalState, PlannedDelivery, PlanningCycle, PlanNumber, PlanSummary, Purchaser, SubmitDeliveryPlan, Supplier, SupplyMember, SupplyMembersLabel, } from '../../constants'
import { BaseInfo as base_Info, Circulation, ConfirmDeliveryPlan, ExternalRoamRecord, ExternalState, PlanMaterial, PlannedDelivery, PlanningCycle, PlanNumber, PlanSummary, Purchaser, SubmitDeliveryPlan, Supplier, SupplyMember, SupplyMembersLabel, } from '../../constants'
import { ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
import { BrandColumn, ClassColumn, CommodityNoColumn, ConsigneeNumColumn, DeliveredNumColumn, MaterialModelColumn, MaterialNameColumn, MaterialNoColumn, OrderCreatedAtColumn, OrderNoColumn, OrderNumColumn, OrderSummaryColumn, PlannedDeliveryNumColumn, TradeNameColumn, TransitNumColumn, UntilColumn } from '../../constants/table-column'
import { getDayAll, godAtob, integrationArrToObj, integrationOjb, TagStatus } from '../../utils'
import { getOrderDeliveryPlanDeliveryHistory, getOrderDeliveryPlanDetail, getOrderDeliveryPlanDetailProductPage } from '@/services/OrderNewV2Api'
import CustomizedTableItem from '../../components/CustomizedTableItem'
import styles from './index.less'
const intl = getIntl();
const columnB2B = [
{ ...CommodityNoColumn, dataIndex: 'skuId', width: 80, },
{ ...TradeNameColumn, dataIndex: 'productName', width: 192, },
{ ...ClassColumn, dataIndex: 'category', width: 96, },
{ ...BrandColumn, dataIndex: 'brand', width: 96, },
{ ...UntilColumn, dataIndex: 'unit', width: 64, },
{ ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, },
{ ...ConsigneeNumColumn, dataIndex: 'receiveCountSum', width: 96, },
{ ...TransitNumColumn, dataIndex: 'transitCountSum', width: 96, },
{ ...DeliveredNumColumn, dataIndex: 'leftCountSum', width: 96, },
{ ...PlannedDeliveryNumColumn, dataIndex: 'planCountSum', width: 128, },
{ ...CommodityNoColumn, dataIndex: 'skuId', width: 80, align: 'left', },
{ ...TradeNameColumn, dataIndex: 'productName', width: 192, align: 'left', },
{ ...ClassColumn, dataIndex: 'category', width: 96, align: 'left', },
{ ...BrandColumn, dataIndex: 'brand', width: 96, align: 'left', },
{ ...UntilColumn, dataIndex: 'unit', width: 64, align: 'left', },
{ ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, align: 'left', },
{ ...ConsigneeNumColumn, dataIndex: 'receiveCountSum', width: 96, align: 'left', },
{ ...TransitNumColumn, dataIndex: 'transitCountSum', width: 96, align: 'left', },
{ ...DeliveredNumColumn, dataIndex: 'leftCountSum', width: 96, align: 'left', },
{ ...PlannedDeliveryNumColumn, dataIndex: 'planCountSum', width: 128, align: 'left', },
]
const columnSRM = [
{ ...MaterialNoColumn, dataIndex: 'skuId', width: 80, },
{ ...MaterialNameColumn, dataIndex: 'productName', width: 192, },
{ ...MaterialModelColumn, dataIndex: 'productName', width: 128, },
{ ...ClassColumn, dataIndex: 'category', width: 96, },
{ ...BrandColumn, dataIndex: 'brand', width: 96, },
{ ...UntilColumn, dataIndex: 'unit', width: 64, },
{ ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, },
{ ...ConsigneeNumColumn, dataIndex: 'receiveCountSum', width: 96, },
{ ...TransitNumColumn, dataIndex: 'transitCountSum', width: 96, },
{ ...DeliveredNumColumn, dataIndex: 'leftCountSum', width: 96, },
{ ...PlannedDeliveryNumColumn, dataIndex: 'planCountSum', width: 128, },
{ ...MaterialNoColumn, dataIndex: 'skuId', width: 80, align: 'left', },
{ ...MaterialNameColumn, dataIndex: 'productName', width: 192, align: 'left', },
{ ...MaterialModelColumn, dataIndex: 'spec', width: 128, align: 'left', },
{ ...ClassColumn, dataIndex: 'category', width: 96, align: 'left', },
{ ...BrandColumn, dataIndex: 'brand', width: 96, align: 'left', },
{ ...UntilColumn, dataIndex: 'unit', width: 64, align: 'left', },
{ ...OrderNumColumn, dataIndex: 'purchaseCountSum', width: 96, align: 'left', },
{ ...ConsigneeNumColumn, dataIndex: 'receiveCountSum', width: 96, align: 'left', },
{ ...TransitNumColumn, dataIndex: 'transitCountSum', width: 96, align: 'left', },
{ ...DeliveredNumColumn, dataIndex: 'leftCountSum', width: 96, align: 'left', },
{ ...PlannedDeliveryNumColumn, dataIndex: 'planCountSum', width: 128, align: 'left', },
]
const tagStatus = new TagStatus()
......@@ -60,15 +63,17 @@ const DeliveryPlanManagementDetails: React.FC = () => {
// 动态 TableColumn
const [tableColumn, setTableColumn] = useState<any>([])
// 动态 expandIconColumn
const dynamicWidth = deliveryPlanType === '1' ? 214 : 342
console.log(dynamicWidth)
const [expandIconColumn, setExpandIconColumn] = useState<any>([
{ ...OrderNoColumn, dataIndex: 'orderNo', width: 80, },
{ ...OrderSummaryColumn, dataIndex: 'orderDigest', width: 200, },
{ ...OrderCreatedAtColumn, dataIndex: 'createTime', width: 160, },
{ ...OrderNumColumn, dataIndex: 'purchaseCount', width: 96, },
{ ...ConsigneeNumColumn, dataIndex: 'receiveCount', width: 96, },
{ ...TransitNumColumn, dataIndex: 'transitCount', width: 96, },
{ ...DeliveredNumColumn, dataIndex: 'leftCount', width: 96, },
{ ...PlannedDeliveryNumColumn, dataIndex: 'planCount', width: 128, },
{ ...OrderNoColumn, dataIndex: 'orderNo', width: 80, align: 'left', },
{ ...OrderSummaryColumn, dataIndex: 'orderDigest', width: 192, align: 'left', },
{ ...OrderCreatedAtColumn, dataIndex: 'createTime', width: dynamicWidth, align: 'left', },
{ ...OrderNumColumn, dataIndex: 'purchaseCount', width: 96, align: 'left', },
{ ...ConsigneeNumColumn, dataIndex: 'receiveCount', width: 96, align: 'left', },
{ ...TransitNumColumn, dataIndex: 'transitCount', width: 96, align: 'left', },
{ ...DeliveredNumColumn, dataIndex: 'leftCount', width: 96, align: 'left', },
{ ...PlannedDeliveryNumColumn, dataIndex: 'planCount', width: 128, align: 'left', },
])
const expandedRowRender = (record) => {
return <Table rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" />
......@@ -147,14 +152,14 @@ const DeliveryPlanManagementDetails: React.FC = () => {
return (
<AnchorPage
title={details?.planNo}
title={`${details?.digest}|${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
>
<BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={details?.status === 4 ? 1 : 0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
<Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
<Steps.Step title={SubmitDeliveryPlan} description={Purchaser} className={styles.customStepCss} />
<Steps.Step title={ConfirmDeliveryPlan} description={Supplier} className={styles.customStepCss} />
</Steps>
</BaseInfo>
<BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>
......@@ -162,17 +167,17 @@ const DeliveryPlanManagementDetails: React.FC = () => {
<BaseInfo.BaseInfoItem label={SupplyMembersLabel}> {details?.vendorMemberName} </BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={PlanningCycle}> {moment(details?.planStartTime).format('YYYY-MM-DD')} ~ {moment(details?.planEndTime).format('YYYY-MM-DD')} </BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={PlanSummary}> {details?.digest} </BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={PlanningCycle}> {moment(details?.planStartTime).format('YYYY-MM-DD')} {intl.formatMessage({ id: 'common.text.to', defaultMessage: '至' })} {moment(details?.planEndTime).format('YYYY-MM-DD')} </BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ExternalState}>
<Tag color={tagStatus.getTagStyle(details?.status).bgColor}>
<span style={{ color: tagStatus.getTagStyle(details?.status).fontColor }}>{statusTxt.get(details?.status)}</span>
</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
<BaseInfo className='mt-16' title={deliveryPlanType === '1' ? PlannedDelivery.name : PlanMaterial.name} id={PlannedDelivery.key} cols={1}>
{/* B2B 显示计划送货物料，SRM显示计划送货商品 */}
<Table
// defaultExpandAllRows
......
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/index.less 0 → 100644
View file @ 6273460a
.customStepCss {
:global {
.ant-steps-item-title {
font-size: 12px;
color: rgba(0, 0, 0, 0.45) !important;
}
.ant-steps-item-description {
font-size: 12px;
color: rgba(0, 0, 0, 0.45) !important;
}
}
}
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/index.tsx
View file @ 6273460a
......@@ -28,11 +28,6 @@ const DeliveryPlanManagementQuery: React.FC = () => {
const ref = useRef<any>({})
const formActions = createFormActions()
const controllerBtns = (
<Space>
{/* 杰哥说没有新增按钮 */}
</Space>
)
const renderOptionButton = (record: any) => {
const btnAuthOfOperationTextMap = {
'查看': 'deliveryPlanManagement.looking',
......@@ -108,9 +103,6 @@ const DeliveryPlanManagementQuery: React.FC = () => {
<NiceForm
actions={formActions}
onSubmit={values => ref.current.reload(values)}
expressionScope={{
controllerBtns,
}}
effects={($, actions) => {
useStateFilterSearchLinkageEffect(
$,
......@@ -127,4 +119,4 @@ const DeliveryPlanManagementQuery: React.FC = () => {
</PageHeaderWrapper>)
}
export default DeliveryPlanManagementQuery
\ No newline at end of file
export default DeliveryPlanManagementQuery
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/schema/index.tsx
View file @ 6273460a
......@@ -12,28 +12,14 @@ export const deliveryPlanManagementQuerySchema: ISchema = {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
planNo: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
planNo: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
allowClear: true,
placeholder: '请输入计划编号查询'
},
},
allowClear: true,
align: 'flex-left',
placeholder: '请输入计划编号查询'
},
},
[FORM_FILTER_PATH]: {
......@@ -42,9 +28,10 @@ export const deliveryPlanManagementQuerySchema: ISchema = {
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
justifyContent: 'flex-start',
},
colStyle: {
marginLeft: 20,
marginRight: 20,
},
},
properties: {
......
src/pages/priceManage/priceStrategy/setStrategy.tsx
View file @ 6273460a
import React, { useCallback, useState } from 'react'
import { Button, Card, } from 'antd'
import { Button, Card, message, } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { history, useIntl } from "umi"
import ReutrnEle from '@/components/ReturnEle'
......@@ -33,10 +33,17 @@ const SetStrategy: React.FC<{}> = () => {
// } else {
const { params } = transformParamsForApi(values, addSchemaAction)
// 校验价格填写
if(params.memberUnitPriceList.some(item => JSON.stringify(item['unitPrice']) === '{}')) {
setBtnLoading(false)
return message.error(intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.error1' }))
}
let _params = {}
if (id) {
_params["id"] = Number(id)
}
console.log(params)
let res = await postProductCommoditySaveOrUpdateUnitPriceStrategy({ ...params, ..._params })
if (res.code === 1000) {
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