Skip to content

J
jinfa-platform
Commit 31cad53a authored by 卢均锐's avatar 卢均锐
Browse files
Options

Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

* 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform: fix: 添加结算应付实付预付搜索条件 # Conflicts: # src/locales/en-US/balance.ts # src/locales/ko-KR/balance.ts
parents cd336d2f 6a5b3d0a
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 28 deletions
src/locales/en-US/balance.ts
View file @ 31cad53a
...@@ -608,6 +608,10 @@ export default { ...@@ -608,6 +608,10 @@ export default {
'balance.businessReconciliation.detail.columns.orderNo' : 'Order number', 'balance.businessReconciliation.detail.columns.orderNo' : 'Order number',
'balance.businessReconciliation.detail.columns.expectPayTime' : 'Estimated settlement date', 'balance.businessReconciliation.detail.columns.expectPayTime' : 'Estimated settlement date',
'balance.businessReconciliation.detail.columns.deliveryBatch' : 'shipping batch', 'balance.businessReconciliation.detail.columns.deliveryBatch' : 'shipping batch',
'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime': 'prePayStartTime',
'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime': 'prePayEndTime',
'balance.accountsReceivable.settlementList.schema.schema.payStartTime': 'payStartTime',
'balance.accountsReceivable.settlementList.schema.schema.payEndTime': 'payEndTime',
'balance.businessReconciliation.detail.columns.deliveryBatch.text' : '第{data}批', 'balance.businessReconciliation.detail.columns.deliveryBatch.text' : '第{data}批',
'balance.businessReconciliation.detail.columns.deliveryNo' : 'Invoice number', 'balance.businessReconciliation.detail.columns.deliveryNo' : 'Invoice number',
'balance.businessReconciliation.detail.columns.receiveNo' : 'Receipt No.', 'balance.businessReconciliation.detail.columns.receiveNo' : 'Receipt No.',
......
src/locales/ko-KR/balance.ts
View file @ 31cad53a
...@@ -609,6 +609,10 @@ export default { ...@@ -609,6 +609,10 @@ export default {
'balance.businessReconciliation.detail.columns.orderNo' : '주문 번호', 'balance.businessReconciliation.detail.columns.orderNo' : '주문 번호',
'balance.businessReconciliation.detail.columns.expectPayTime' : '예상 결제 일자', 'balance.businessReconciliation.detail.columns.expectPayTime' : '예상 결제 일자',
'balance.businessReconciliation.detail.columns.deliveryBatch' : '출하 회수', 'balance.businessReconciliation.detail.columns.deliveryBatch' : '출하 회수',
'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime': '시작 시간 선불',
'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime': '선불 종료 시간',
'balance.accountsReceivable.settlementList.schema.schema.payStartTime': '실제 지불 시작 시간',
'balance.accountsReceivable.settlementList.schema.schema.payEndTime': '실불 종료 시간',
'balance.businessReconciliation.detail.columns.deliveryBatch.text' : '第{data}批', 'balance.businessReconciliation.detail.columns.deliveryBatch.text' : '第{data}批',
'balance.businessReconciliation.detail.columns.deliveryNo' : '송장 번호', 'balance.businessReconciliation.detail.columns.deliveryNo' : '송장 번호',
'balance.businessReconciliation.detail.columns.receiveNo' : '청구서 번호', 'balance.businessReconciliation.detail.columns.receiveNo' : '청구서 번호',
......
src/locales/zh-CN/balance.ts
View file @ 31cad53a
...@@ -870,5 +870,8 @@ export default { ...@@ -870,5 +870,8 @@ export default {
'balance.coupon.amout': '优惠券金额', 'balance.coupon.amout': '优惠券金额',
'balance.coupon.couponNo': '优惠券券码', 'balance.coupon.couponNo': '优惠券券码',
'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime': '预付开始时间',
'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime': '预付开始时间',
'balance.accountsReceivable.settlementList.schema.schema.payStartTime': '实付开始时间',
'balance.accountsReceivable.settlementList.schema.schema.payEndTime': '实付结束时间',
} }
src/pages/balance/accountsPayable/settlementList/index.tsx
View file @ 31cad53a
...@@ -44,6 +44,10 @@ interface SearchParams { ...@@ -44,6 +44,10 @@ interface SearchParams {
isSettlement: number, isSettlement: number,
startTime?: Moment, startTime?: Moment,
endTime?: Moment, endTime?: Moment,
prePayStartTime: Moment,
prePayEndTime: Moment,
payStartTime: Moment,
payEndTime: Moment,
orderType?: number, orderType?: number,
status?: number, status?: number,
current: number, current: number,
...@@ -256,9 +260,12 @@ const SettlementList = () => { ...@@ -256,9 +260,12 @@ const SettlementList = () => {
*/ */
const handleSearch = (values: SearchParams) => { const handleSearch = (values: SearchParams) => {
const format = 'YYYY-MM-DD' const format = 'YYYY-MM-DD'
const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values;
const startTime = values.startTime?.format(format); const startTime = values.startTime?.format(format);
const endTime = values.endTime ? values.endTime.endOf("days").format("YYYY-MM-DD HH:mm:ss") : ""; const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : "";
ref.current.reload({ ...values, startTime, endTime }); const withPayStartTime = payStartTime ? { payStartTime: payStartTime.valueOf(), payEndTime: payEndTime.valueOf() } : {};
const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.valueOf(), prePayEndTime: prePayEndTime.valueOf() } : {};
ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime });
} }
const handleIhadPay = () => { const handleIhadPay = () => {
...@@ -273,6 +280,7 @@ const SettlementList = () => { ...@@ -273,6 +280,7 @@ const SettlementList = () => {
tableProps={{ tableProps={{
rowKey: 'id', rowKey: 'id',
}} }}
keepAlive={false}
columns={columns} columns={columns}
currentRef={ref} currentRef={ref}
fetchTableData={(params: any) => fetchListData(params)} fetchTableData={(params: any) => fetchListData(params)}
......
src/pages/balance/accountsPayable/settlementList/schema/index.tsx
View file @ 31cad53a
...@@ -53,6 +53,38 @@ export const schema: ISchema = { ...@@ -53,6 +53,38 @@ export const schema: ISchema = {
} }
} }
}, },
/** 预计付款时间 */
"[prePayStartTime, prePayEndTime]": {
type: 'object',
"x-component": 'RangePicker',
'x-component-props': {
allowClear: true,
showTime: true,
placeholder: [
intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime'}),
intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime'})
],
style: {
minWidth: "320px"
}
}
},
/** 实际付款时间 */
"[payStartTime, payEndTime]": {
type: 'object',
"x-component": 'RangePicker',
'x-component-props': {
allowClear: true,
showTime: true,
placeholder: [
intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payStartTime'}),
intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payEndTime'})
],
style: {
minWidth: "320px"
}
}
},
status: { status: {
type: 'string', type: 'string',
enum: [], enum: [],
......
src/pages/balance/accountsReceivable/settlementList/index.tsx
View file @ 31cad53a
...@@ -28,6 +28,10 @@ type requestDataType = { ...@@ -28,6 +28,10 @@ type requestDataType = {
orderType: string | number, orderType: string | number,
startTime?: Moment, startTime?: Moment,
endTime?: Moment, endTime?: Moment,
prePayStartTime: Moment,
prePayEndTime: Moment,
payStartTime?: Moment,
payEndTime?: Moment,
settlementName: string, settlementName: string,
payName: string, payName: string,
settlementNo: number, settlementNo: number,
...@@ -110,9 +114,12 @@ const SettlementList = () => { ...@@ -110,9 +114,12 @@ const SettlementList = () => {
*/ */
const handleSearch = (values: requestDataType) => { const handleSearch = (values: requestDataType) => {
const format = 'YYYY-MM-DD' const format = 'YYYY-MM-DD'
const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values;
const startTime = values.startTime?.format(format); const startTime = values.startTime?.format(format);
const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : ""; const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : "";
ref.current.reload({ ...values, startTime, endTime }); const withPayStartTime = payStartTime ? { payStartTime: payStartTime.valueOf(), payEndTime: payEndTime.valueOf() } : {};
const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.valueOf(), prePayEndTime: prePayEndTime.valueOf() } : {};
ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime });
} }
return ( return (
...@@ -122,6 +129,7 @@ const SettlementList = () => { ...@@ -122,6 +129,7 @@ const SettlementList = () => {
tableProps={{ tableProps={{
rowKey: 'id', rowKey: 'id',
}} }}
keepAlive={false}
columns={columns} columns={columns}
currentRef={ref} currentRef={ref}
fetchTableData={(params: any) => fetchListData(params)} fetchTableData={(params: any) => fetchListData(params)}
......
src/pages/balance/accountsReceivable/settlementList/schema/index.tsx
View file @ 31cad53a
...@@ -54,29 +54,37 @@ export const schema: ISchema = { ...@@ -54,29 +54,37 @@ export const schema: ISchema = {
} }
}, },
/** 预计付款时间 */ /** 预计付款时间 */
// "[startTime, endTime]": { "[prePayStartTime, prePayEndTime]": {
// type: 'object', type: 'object',
// "x-component": 'RangePicker', "x-component": 'RangePicker',
// 'x-component-props': { 'x-component-props': {
// allowClear: true, allowClear: true,
// placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})], showTime: true,
// style: { placeholder: [
// minWidth: "320px" intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime'}),
// } intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime'})
// } ],
// }, style: {
/** 实际付款时间 */ minWidth: "320px"
// "[startTime, endTime]": { }
// type: 'object', }
// "x-component": 'RangePicker', },
// 'x-component-props': { // /** 实际付款时间 */
// allowClear: true, "[payStartTime, payEndTime]": {
// placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})], type: 'object',
// style: { "x-component": 'RangePicker',
// minWidth: "320px" 'x-component-props': {
// } allowClear: true,
// } showTime: true,
// }, placeholder: [
intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payStartTime'}),
intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payEndTime'})
],
style: {
minWidth: "320px"
}
}
},
status: { status: {
type: 'string', type: 'string',
enum: [], enum: [],
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/index.tsx
View file @ 31cad53a
...@@ -181,7 +181,7 @@ const Add = () => { ...@@ -181,7 +181,7 @@ const Add = () => {
return ( return (
<PageHeaderWrapper <PageHeaderWrapper
title={renderTitle()} title={renderTitle()}
onBack={() => history.goBack()} onBack={() => history.push('/memberCenter/marketingAbility/activityPages/management')}
backIcon={<ReutrnEle />} backIcon={<ReutrnEle />}
extra={ extra={
!isView && ( !isView && (
......
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