Skip to content

J
jinfa-admin
Commit cf9951d2 authored by GuanHua's avatar GuanHua
Browse files
Options

Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into mobileEdit

parents 3f441df5 241a7fad
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 61 deletions
src/pages/capitalAccount/checkWithdraw/checkDetails.tsx
View file @ cf9951d2
......@@ -41,7 +41,10 @@ const CheckDetail: React.FC<{}> = () => {
const { code, data } = res
setDetails(data)
if(code === 1000) {
let bankRes: any = await PublicApi.getSettleAccountsPlatformConfigGetPlatformAccountConfig()
let bankRes: any = await PublicApi.getSettleAccountsGetMemberAccountConfig({
memberId: data.memberId,
roleId: data.memberRoleId,
})
setBankDetail(bankRes.data)
}
}
......
src/pages/logistics/detail.tsx
View file @ cf9951d2
......@@ -181,8 +181,8 @@ const OrderSearchDetail: React.FC<{}> = (props) => {
{
dataInfo.status == 1 ? <><span style={statuStyle.default}>待提交</span></> :
dataInfo.status == 2 ? <><span style={statuStyle.confirm}>待确认</span></> :
dataInfo.status == 3 ? <><span style={statuStyle.success}>接受物流单</span></> :
<><span style={statuStyle.warn}>不接受物流单</span></>
dataInfo.status == 3 ? <><span style={statuStyle.success}>不接受物流单</span></> :
<><span style={statuStyle.warn}>接受物流单</span></>
}
</div>
</div>
......
src/pages/logistics/index.tsx
View file @ cf9951d2
......@@ -42,6 +42,11 @@ const OrderSearchList: React.FC<{}> = (props) => {
dataIndex: 'relevanceOrderCode'
},
{
title: '物流服务商',
key: 'companyName',
dataIndex: 'companyName'
},
{
title: '发货方',
key: 'shipperMemberName',
dataIndex: 'shipperMemberName'
......
src/pages/logistics/schema/index.tsx
View file @ cf9951d2
......@@ -62,7 +62,7 @@ export const logisticsSearchSchema: ISchema = {
"x-component-props": {
placeholder: '物流服务商',
className: 'fixed-ant-selected-down',
fetchSearch: PublicApi.getLogisticsSelectListMemberCompanyQuery,
fetchSearch: PublicApi.getLogisticsPlatformSelectListMemberCompanyQuery,
style: {
width: 160
}
......
src/pages/platformSettlement/accountPayable/info.tsx
View file @ cf9951d2
......@@ -14,24 +14,41 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ISchema, createFormActions } from '@formily/antd';
import { StandardTable } from 'god';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { detailSchema } from './schema'
import { usePageStatus } from '@/hooks/usePageStatus';
import StatusTag from '../components/StatusTag';
import { timeRange } from '@/utils/index';
import moment from 'moment';
import { PublicApi } from '@/services/api';
import add from '@/asserts/add.png';
import subtraction from '@/asserts/subtraction.png';
const formActions = createFormActions();
const columns = [
const inintColumns = [
{title: '单据号', dataIndex: 'orderNo'},
{title: '单据摘要', dataIndex: 'orderAbstract'},
{title: '单据类型', dataIndex: 'settlementOrderTypeName'},
{title: '单据时间', dataIndex: 'orderTime'},
{title: '订单类型', dataIndex: 'orderTypeName'},
{title: '单据总额', dataIndex: 'orderAmount'},
{title: '代收金额', dataIndex: 'collectAmount'},
{
title: '单据总额',
dataIndex: 'orderAmount',
render: (text) => {
return "￥" + text;
}
},
{
title: '代收金额',
dataIndex: 'collectAmount',
render: (text) => {
return (
<div style={{display: "flex", flexDirection: "row", alignItems: 'center'}}>
<img src={text > 0 ? add : subtraction} width={16} height={16} />
<span style={{marginLeft: '8px'}}>{text}</span>
</div>
)
}
},
{title: '支付时间', dataIndex: 'payTime'},
{
title: '佣金比率',
......@@ -40,15 +57,37 @@ const columns = [
return (record.ratio + '%');
}
},
{title: '扣减佣金', dataIndex: 'brokerage'},
{title: '本期结算金额', dataIndex: 'settlementAmount'},
{
title: '扣减佣金',
dataIndex: 'brokerage',
render: (text) => {
return (
<div style={{display: "flex", flexDirection: "row", alignItems: 'center'}}>
<img src={text > 0 ? add : subtraction} width={16} height={16} />
<span style={{marginLeft: '8px'}}>{text}</span>
</div>
)
}
},
{
title: '本期结算金额',
dataIndex: 'settlementAmount',
render: (text) => {
return (
<div style={{display: "flex", flexDirection: "row", alignItems: 'center'}}>
<img src={text > 0 ? add : subtraction} width={16} height={16} />
<span style={{marginLeft: '8px'}}>{text}</span>
</div>
)
}
},
]
// 如果佣金设置有效则显示这两列
const blackList = ["brokerage", "ratio"];
const logisticsDetail: React.FC = () => {
const ref = useRef<any>({});
const { id } = usePageStatus();
const [columns, setColumns] = useState(inintColumns);
const [infoDetail, setInfoDetail] = useState<any>();
const fetchListData = async (params) => {
const postData = {
......@@ -90,6 +129,15 @@ const logisticsDetail: React.FC = () => {
ref.current.reload({...rest, payStartTime, payEndTime, orderStartTime, orderEndTime});
}
useEffect(() => {
PublicApi.getSettleAccountsPlatformSettlementIsExistsBrokerage()
.then(({data, code}) => {
if(code === 1000 && !data) {
setColumns(inintColumns.filter((item) => blackList.includes(item.dataIndex)))
}
})
}, [])
return (
<PageHeaderWrapper
title={
......@@ -101,10 +149,10 @@ const logisticsDetail: React.FC = () => {
<AvatarWrap
info={{
aloneTxt: '单',
name: "结算单号:"
name: ""
}}
extra={(
<span style={{ fontSize: 12, fontWeight: 'normal' }}>{infoDetail?.settlementNo}</span>
<span style={{ fontSize: 16, fontWeight: 'bold', color: "#303133" }}>结算单号: {infoDetail?.settlementNo}</span>
)}
/>
}
......@@ -115,11 +163,11 @@ const logisticsDetail: React.FC = () => {
padding: '0 32px',
}}
>
<Descriptions.Item label="结算日期：">{infoDetail?.settlementDate}</Descriptions.Item>
<Descriptions.Item label="结算单数：">{infoDetail?.totalCount }</Descriptions.Item>
<Descriptions.Item label="结算金额：">￥{infoDetail?.amount}</Descriptions.Item>
<Descriptions.Item label="结算方式：">{infoDetail?.settlementWayName}</Descriptions.Item>
<Descriptions.Item label="结算状态：">
<Descriptions.Item label="结算日期">{infoDetail?.settlementDate}</Descriptions.Item>
<Descriptions.Item label="结算单数">{infoDetail?.totalCount }</Descriptions.Item>
<Descriptions.Item label="结算金额">￥{infoDetail?.amount}</Descriptions.Item>
<Descriptions.Item label="结算方式">{infoDetail?.settlementWayName}</Descriptions.Item>
<Descriptions.Item label="结算状态">
<StatusTag text={infoDetail?.statusName} />
</Descriptions.Item>
</Descriptions>
......
src/pages/platformSettlement/components/StatusActions/index.tsx
View file @ cf9951d2
......@@ -186,7 +186,7 @@ const UploadVoucher: React.FC<UploadVocherProps> = (props) => {
}
const handleComfirm = (params) => {
props.handleUpload({onCancel: params.cancel, id: params.id, fileList: params.fileList})
props.handleUpload({onCancel: params.onCancel, id: params.id, fileList: params.fileList})
}
return (
......@@ -196,6 +196,7 @@ const UploadVoucher: React.FC<UploadVocherProps> = (props) => {
return (
<>
<Modal
destroyOnClose
width={548}
title="上传付款凭证"
onCancel={cancel}
......
src/pages/platformSettlement/components/Voucher/index.tsx
View file @ cf9951d2
......@@ -7,6 +7,9 @@
import React from 'react';
import styles from './index.less'
import image_icon from '@/asserts/image_icon.png';
// import Icon from '@ant-design/icons';
import {DeleteOutlined} from '@ant-design/icons';
interface VoucherFileProps {
name: string,
......@@ -14,7 +17,7 @@ interface VoucherFileProps {
}
interface Iprops {
files: VoucherFileProps[]
onRemove: (item) => void
onRemove?: null | ((item) => void)
}
const Voucher: React.FC<Iprops> = (props) => {
......@@ -37,9 +40,17 @@ const Voucher: React.FC<Iprops> = (props) => {
<div className={styles.text}>
<a href={item.proveUrl} target={"_blank"}>{item.name}</a>
</div>
<div className={styles.view}>
<a onClick={() => handleRemove(item)}>删除</a>
</div>
{
props.onRemove &&
(
<div className={styles.view}>
<a onClick={() => handleRemove(item)}>
<DeleteOutlined />
</a>
</div>
)
}
</div>
)
})
......
src/pages/platformSettlement/score/info/index.tsx
View file @ cf9951d2
......@@ -40,7 +40,13 @@ const columns = [
return (record.ratio + '%');
}
},
{title: '本期结算金额', dataIndex: 'settlementAmount'},
{
title: '本期结算金额',
dataIndex: 'settlementAmount',
render: (text, record) => (
"￥" + record.ratio
)
},
]
......@@ -93,7 +99,6 @@ const ScoreInfo: React.FC = () => {
return (
<PageHeaderWrapper
// onBack={() => history.goBack()}
title={
<>
<PageHeader
......@@ -103,10 +108,10 @@ const ScoreInfo: React.FC = () => {
<AvatarWrap
info={{
aloneTxt: '单',
name: "结算单号:"
name: ""
}}
extra={(
<span style={{ fontSize: 12, fontWeight: 'normal' }}>{infoDetail?.settlementNo}</span>
<span style={{ fontSize: 16, fontWeight: 'bold', color: "#303133" }}>结算单号: {infoDetail?.settlementNo}</span>
)}
/>
}
......@@ -117,11 +122,11 @@ const ScoreInfo: React.FC = () => {
padding: '0 32px',
}}
>
<Descriptions.Item label="结算日期：">{infoDetail?.settlementDate}</Descriptions.Item>
<Descriptions.Item label="结算单数：">{infoDetail?.totalCount }</Descriptions.Item>
<Descriptions.Item label="结算金额：">￥{infoDetail?.amount}</Descriptions.Item>
<Descriptions.Item label="结算方式：">{infoDetail?.settlementWayName}</Descriptions.Item>
<Descriptions.Item label="外部状态：">
<Descriptions.Item label="结算日期">{infoDetail?.settlementDate}</Descriptions.Item>
<Descriptions.Item label="结算单数">{infoDetail?.totalCount }</Descriptions.Item>
<Descriptions.Item label="结算金额">￥{infoDetail?.amount}</Descriptions.Item>
<Descriptions.Item label="结算方式">{infoDetail?.settlementWayName}</Descriptions.Item>
<Descriptions.Item label="外部状态">
<StatusTag text={infoDetail?.statusName} />
</Descriptions.Item>
</Descriptions>
......
src/pages/productionNotice/query/index.tsx
View file @ cf9951d2
......@@ -70,7 +70,7 @@ const Query: React.FC<IProps> = () => {
let searchData = {
...rest,
startTime: st,
endTtime: et
endTime: et
}
ref.current.reload(searchData)
......
src/pages/productionNotice/query/schema.tsx
View file @ cf9951d2
......@@ -17,7 +17,7 @@ export const commonTimeList = [
export const docTime = [{label: '单据时间（全部）', value: 0}].concat(commonTimeList);
/**
/**
* @author: Bill
* @description: 指派生产通知单查询页 schema - 生产通知单查询
*/
......@@ -33,8 +33,8 @@ export const querySchema: ISchema = {
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索',
align: 'flex-left',
tip: '输入通知单号进行搜索',
align: 'flex-left',
tip: '输入通知单号进行搜索',
},
},
[FORM_FILTER_PATH]: {
......@@ -47,11 +47,18 @@ export const querySchema: ISchema = {
columns: 6,
},
properties: {
memberName: {
summary: {
type: 'string',
'x-component-props': {
placeholder: '通知单摘要',
allowClear: true,
},
},
processName: {
type: 'string',
'x-component-props': {
placeholder: '加工企业名',
allowClear: true,
placeholder: '加工企业名',
allowClear: true,
},
},
docTime: {
......@@ -59,8 +66,8 @@ export const querySchema: ISchema = {
default: 0,
enum: docTime,
'x-component-props': {
placeholder: '单据时间(全部)',
allowClear: true,
placeholder: '单据时间(全部)',
allowClear: true,
},
},
outerStatus: {
......@@ -68,8 +75,8 @@ export const querySchema: ISchema = {
default: undefined,
enum: [],
'x-component-props': {
placeholder: '外部状态(全部)',
allowClear: true,
placeholder: '外部状态(全部)',
allowClear: true,
},
},
submit: {
......
src/pages/rfq/details/index.less
View file @ cf9951d2
......@@ -51,7 +51,7 @@
&-option {
flex : 1;
font-size : 14px;
font-size : 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
......@@ -83,7 +83,7 @@
&-options {
flex : 1;
font-size : 14px;
font-size : 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
......@@ -170,7 +170,7 @@
display : flex;
width : calc(100% / 3);
margin-bottom: 17px;
font-size : 14px;
font-size : 12px;
font-family : PingFangSC-Regular, PingFang SC;
font-weight : 400;
color : #909399;
......@@ -251,13 +251,13 @@
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
\ No newline at end of file
}
src/pages/rfqOffer/details/index.less
View file @ cf9951d2
......@@ -51,7 +51,7 @@
&-option {
flex : 1;
font-size : 14px;
font-size : 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
......@@ -83,7 +83,7 @@
&-options {
flex : 1;
font-size : 14px;
font-size : 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
......@@ -170,7 +170,7 @@
display : flex;
width : calc(100% / 3);
margin-bottom: 17px;
font-size : 14px;
font-size : 12px;
font-family : PingFangSC-Regular, PingFang SC;
font-weight : 400;
color : #909399;
......@@ -251,13 +251,13 @@
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
\ No newline at end of file
}
src/pages/rfqOffer/details/index.tsx
View file @ cf9951d2
......@@ -224,7 +224,7 @@ const Details: React.FC<{}> = (props) => {
progressDot
current={Number(data.externalState - 1)}
>
{Object.keys(data).length > 0 && data.externalRequisitionFormResponses.map((item, index) => {
{Object.keys(data).length > 0 && data.externalQuotationStateResponses.map((item, index) => {
return (
<Step
key={index}
......
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