Skip to content

J
jinfa-platform
Commit 8a9629ed authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

Merge branch 'dev' into test

parents 75d1182b abaf37d3
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 36 deletions
src/layouts/BasicLayout.tsx
View file @ 8a9629ed
......@@ -15,6 +15,7 @@ import logo from '../../mockStatic/logo.png'
import MenuSlider from './components/MenuSlider'
import { getMatchMenu } from '@umijs/route-utils';
import { useGlobal } from '@/models/useGlobal';
import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons';
export interface BasicLayoutProps extends ProLayoutProps {
breadcrumbNameMap: {
......@@ -71,9 +72,13 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
const [collapsed, setCollapsed] = useState(false)
const [selectedKeys, setSelectedKeys] = useState<string[] | undefined>([]);
// 获取全局状态
const [globalState, globalDispatch] = useGlobal()
const [globalState, globalDispatch] = useGlobal();
const isHome = location.pathname === '/memberCenter/home'
const handleMenuCollapse = (payload: boolean): void => {
if(isHome) {
return ;
}
setCollapsed(payload)
if (payload) {
setOpenKeys([])
......@@ -131,17 +136,24 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
}, [currentRouter, collapsed])
useLayoutEffect(() => {
if(location.pathname === '/memberCenter/home') {
if(isHome) {
setCollapsed(true)
} else {
setCollapsed(false);
}
}, [location.pathname])
const prolayoutStyle = isHome
? {
minHeight: '100vh',
minWidth: '1280px'
}
: {}
return (
<ProLayout
pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
style={{ minHeight: '100vh', minWidth: "1500px" }}
style={prolayoutStyle}
logo={logo}
formatMessage={formatMessage}
menuHeaderRender={(logoDom, titleDom) => (
......@@ -151,6 +163,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
</Link>
)}
collapsed={collapsed}
collapsedButtonRender={(flag) => (isHome ? null : flag ? <MenuUnfoldOutlined /> : <MenuFoldOutlined/>) }
onCollapse={handleMenuCollapse}
disableContentMargin={currentRouter?.noMargin !== undefined}
breadcrumbRender={(routers = []) => [
......
src/pages/balance/accountsPayable/settlementList/index.tsx
View file @ 8a9629ed
......@@ -159,6 +159,10 @@ const SettlementList = () => {
}}
schema={schema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......
src/pages/balance/accountsPayable/settlementList/schema/index.tsx
View file @ 8a9629ed
......@@ -40,14 +40,17 @@ export const schema: ISchema = {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: "结算时间（开始时间）"
}
},
endTime: {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: "结算时间（结束时间）"
}
},
status: {
......
src/pages/balance/accountsReceivable/invoice/index.tsx
View file @ 8a9629ed
......@@ -183,6 +183,7 @@ const SettlementList = () => {
}}
schema={schema}
onSubmit={reload}
/>
}
/>
......
src/pages/balance/accountsReceivable/settlementList/index.tsx
View file @ 8a9629ed
......@@ -170,6 +170,10 @@ const SettlementList = () => {
}}
schema={schema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......
src/pages/balance/accountsReceivable/settlementList/logisticsDetail.tsx
View file @ 8a9629ed
......@@ -148,6 +148,10 @@ const logisticsDetail: React.FC = () => {
}}
schema={logisticsDetailSchema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......
src/pages/balance/accountsReceivable/settlementList/productNoticeSettlementDetail.tsx
View file @ 8a9629ed
......@@ -152,6 +152,12 @@ const ProductNoticeSettlementDetail: React.FC = () => {
}}
schema={detailSchema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
formActions.setFieldValue('receiveStartTime', null);
formActions.setFieldValue('receiveEndTime', null);
}}
/>
}
/>
......
src/pages/balance/accountsReceivable/settlementList/schema/index.tsx
View file @ 8a9629ed
......@@ -40,14 +40,17 @@ export const schema: ISchema = {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: '结算日期（开始时间）'
}
},
endTime: {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: '结算日期（开始时间）'
}
},
status: {
......
src/pages/balance/platformSettlement/accountReceivable/index.tsx
View file @ 8a9629ed
......@@ -167,6 +167,10 @@ const AccountReceivable = () => {
}}
schema={schema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......
src/pages/balance/platformSettlement/accountReceivable/schema/index.tsx
View file @ 8a9629ed
......@@ -36,14 +36,16 @@ export const schema: ISchema = {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: '结算日期（开始时间）'
}
},
endTime: {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: '结算日期（结束时间）'
}
},
status: {
......
src/pages/balance/platformSettlement/integral/index.tsx
View file @ 8a9629ed
......@@ -168,6 +168,10 @@ const Integral: React.FC = () => {
}}
schema={schema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......
src/pages/balance/platformSettlement/integral/schema/index.tsx
View file @ 8a9629ed
......@@ -41,14 +41,16 @@ export const schema: ISchema = {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: '结算日期（开始时间）'
}
},
endTime: {
type: 'string',
'x-component': 'DatePicker',
'x-component-props': {
allowClear: true
allowClear: true,
placeholder: '结算日期（结束时间）'
}
},
status: {
......
src/pages/balance/settleRules/memberSettle/index.tsx
View file @ 8a9629ed
......@@ -73,6 +73,9 @@ const MemberSettle: React.FC<{}> = () => {
{
title: '操作',
render: (text, record) => {
if(record.status == 1) {
return null
}
return (
<Space>
<Link to={`/memberCenter/balance/settleRules/memberSettleList/edit?id=${record.id}`}>修改</Link>
......
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @ 8a9629ed
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-16 15:16:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-22 18:04:58
* @LastEditTime: 2020-12-23 20:20:35
* @Description: 联动逻辑相关
*/
import { Modal } from 'antd';
......@@ -140,8 +140,6 @@ const getParams = type => {
basicParams.columns = getAfterSaleColumns(true);
basicParams.fetchTableData = getRefundDeliveryList;
basicParams.formilyProps.ctx.schema = afterSaleBillSchema(true);
basicParams.tableProps.rowKey = 'applyNo';
basicParams.tableProps.lableKey = 'applyNo';
break;
}
......@@ -151,8 +149,6 @@ const getParams = type => {
basicParams.columns = getAfterSaleColumns(false);
basicParams.fetchTableData = getRefundWarehousingList;
basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false);
basicParams.tableProps.rowKey = 'applyNo';
basicParams.tableProps.lableKey = 'applyNo';
break;
}
......@@ -162,8 +158,6 @@ const getParams = type => {
basicParams.columns = getAfterSaleColumns(true);
basicParams.fetchTableData = getExchangeReturnDeliveryList;
basicParams.formilyProps.ctx.schema = afterSaleBillSchema(true);
basicParams.tableProps.rowKey = 'applyNo';
basicParams.tableProps.lableKey = 'applyNo';
break;
}
......@@ -173,8 +167,6 @@ const getParams = type => {
basicParams.columns = getAfterSaleColumns(false);
basicParams.fetchTableData = getExchangeReturnWarehousingList;
basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false);
basicParams.tableProps.rowKey = 'applyNo';
basicParams.tableProps.lableKey = 'applyNo';
break;
}
......@@ -184,8 +176,6 @@ const getParams = type => {
basicParams.columns = getAfterSaleColumns(true);
basicParams.fetchTableData = getExchangeDeliveryList;
basicParams.formilyProps.ctx.schema = afterSaleBillSchema(true);
basicParams.tableProps.rowKey = 'applyNo';
basicParams.tableProps.lableKey = 'applyNo';
break;
}
......@@ -195,8 +185,6 @@ const getParams = type => {
basicParams.columns = getAfterSaleColumns(false);
basicParams.fetchTableData = getExchangeWarehousingList;
basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false);
basicParams.tableProps.rowKey = 'applyNo';
basicParams.tableProps.lableKey = 'applyNo';
break;
}
......
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @ 8a9629ed
......@@ -448,12 +448,11 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplyMembersName: supplierName,
supplyMembersId: parentMemberId,
supplyMembersRoleId: parentMemberRoleId,
deliveryType: returnGoodsAddress.deliveryType,
}
] :
[]
,
deliveryType: returnGoodsAddress.deliveryType,
transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],
});
}).finally(() => {
setInfoLoading(false);
......@@ -495,12 +494,11 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplyMembersName: supplierName,
supplyMembersId: parentMemberId,
supplyMembersRoleId: parentMemberRoleId,
deliveryType: returnGoodsAddress.deliveryType,
}
] :
[]
,
deliveryType: returnGoodsAddress.deliveryType,
transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],
});
}).finally(() => {
setInfoLoading(false);
......@@ -543,12 +541,11 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplyMembersName: supplierName,
supplyMembersId: parentMemberId,
supplyMembersRoleId: parentMemberRoleId,
deliveryType: returnGoodsAddress.deliveryType,
}
] :
[]
,
deliveryType: returnGoodsAddress.deliveryType,
transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],
});
}).finally(() => {
setInfoLoading(false);
......@@ -590,12 +587,11 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplyMembersName: supplierName,
supplyMembersId: parentMemberId,
supplyMembersRoleId: parentMemberRoleId,
deliveryType: returnGoodsAddress.deliveryType,
}
] :
[]
,
deliveryType: returnGoodsAddress.deliveryType,
transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],
});
}).finally(() => {
setInfoLoading(false);
......@@ -616,6 +612,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplierName,
consumerName,
returnGoodsAddress,
replaceGoodsAddress,
applyNo,
parentMemberId,
parentMemberRoleId,
......@@ -638,12 +635,11 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplyMembersName: supplierName,
supplyMembersId: parentMemberId,
supplyMembersRoleId: parentMemberRoleId,
deliveryType: replaceGoodsAddress.deliveryType,
}
] :
[]
,
deliveryType: returnGoodsAddress.deliveryType,
transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],
});
}).finally(() => {
setInfoLoading(false);
......@@ -663,6 +659,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
const {
supplierName,
returnGoodsAddress,
replaceGoodsAddress,
applyNo,
parentMemberId,
parentMemberRoleId,
......@@ -685,12 +682,11 @@ const BillsForm: React.FC<BillsFormProps> = ({
supplyMembersName: supplierName,
supplyMembersId: parentMemberId,
supplyMembersRoleId: parentMemberRoleId,
deliveryType: replaceGoodsAddress.deliveryType,
}
] :
[]
,
deliveryType: returnGoodsAddress.deliveryType,
transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],
});
}).finally(() => {
setInfoLoading(false);
......
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