Skip to content

J
jinfa-platform
Commit 761e7c9a authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

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

parents 047c8a69 4f6cbcf8
Show whitespace changes
Inline Side-by-side
Showing with 202 additions and 178 deletions
src/pages/commodity/products/index.tsx
View file @ 761e7c9a
......@@ -53,7 +53,7 @@ const Products: React.FC<{}> = () => {
const [isBatch, setIsBatch] = useState<boolean>(false) // 是否批量上下架操作
const [upDownModal, setUpDownModal] = useState<boolean>(false)
const [shopsOption, setShopsOption] = useState<GetProductCommodityGetShopResponse>([])
const [currentOptionId, setCurrentOptionId] = useState<number>()
const [currentOptionRow, setCurrentOptionRow] = useState<any>()
const [isDisabledOKbtn, setIsDisabledOKbtn] = useState<boolean>(false)
const [exportQrcodeModal, setExportQrcodeModal] = useState<boolean>(false)
const [exportVisible, setExportVisible] = useState<boolean>(false)
......@@ -216,8 +216,8 @@ const Products: React.FC<{}> = () => {
[intl.formatMessage({ id: 'commodity.products.operationHandler.2' })]: () => clickSubmitCheck(record),
[intl.formatMessage({ id: 'commodity.products.operationHandler.3' })]: () => clickModify(record.id),
[intl.formatMessage({ id: 'commodity.products.operationHandler.4' })]: () => confirmDelete(record.id),
[intl.formatMessage({ id: 'commodity.products.operationHandler.5' })]: () => clickUp(1, record.id),
[intl.formatMessage({ id: 'commodity.products.operationHandler.6' })]: () => clickUp(0, record.id),
[intl.formatMessage({ id: 'commodity.products.operationHandler.5' })]: () => clickUp(1, record),
[intl.formatMessage({ id: 'commodity.products.operationHandler.6' })]: () => clickUp(0, record),
[intl.formatMessage({ id: 'commodity.products.operationHandler.7' })]: () => previewUpper(record.upperCommodityId),
}
......@@ -376,11 +376,11 @@ const Products: React.FC<{}> = () => {
console.log('取消删除')
}
const clickUp = (param: number, id: number) => { // param: 0 下架 1上架 id为null批量上架
setCurrentOptionId(id)
const fn = id ? getProductCommodityGetShop : postProductCommodityGetShopBatch
const clickUp = (param: number, record: any) => { // param: 0 下架 1上架 record.id为null批量上架
setCurrentOptionRow(record)
const fn = record?.id ? getProductCommodityGetShop : postProductCommodityGetShopBatch
// @ts-ignore
fn(id ? { id } : { idList: currentCtrlRef.current.selectedRowKeys }, { ctlType: 'none' }).then(({data}) => {
fn(record?.id ? { id: record.id } : { idList: currentCtrlRef.current.selectedRowKeys }, { ctlType: 'none' }).then(({data}) => {
setShopsOption(data.sort((a, b) => a.shopId - b.shopId))
let initValue = {}
data.forEach(item => {
......@@ -403,7 +403,7 @@ const Products: React.FC<{}> = () => {
// 1. 判断是否有店铺
const hasShop = await judgeStop(checkShops)
if(hasShop) {
const params = isBatch ? currentCtrlRef.current.selectedRowKeys: [currentOptionId]
const params = isBatch ? currentCtrlRef.current.selectedRowKeys: [currentOptionRow.id]
// 2. 判断是否库存
const hasStore = await judgeStore(params)
if(hasStore) {
......@@ -465,7 +465,8 @@ const Products: React.FC<{}> = () => {
item.skuIdList.forEach(_item => {
products.push({
productId: item.commodityId,
skuId: _item
skuId: _item,
crossBorder: isBatch ? currentCtrlRef.current.selectRow.filter(i => i.id === item.commodityId)[0]['isCrossBorder'] : currentOptionRow['isCrossBorder']
})
})
})
......@@ -502,7 +503,7 @@ const Products: React.FC<{}> = () => {
const upShops = shopsOption.filter(item => values[item.shopId])
setIsDisabledOKbtn(true)
let params = {
id: currentOptionId,
id: currentOptionRow?.id,
shopList: upShops
}
if (isUp) {
......
src/pages/contract/contractexecution/details/components/DetailedList.tsx
View file @ 761e7c9a
......@@ -9,7 +9,7 @@ import { getIntl } from 'umi';
const intl = getIntl();
export interface Iprops extends IAntdSchemaFormProps {
/* 显示隐藏 */
contractId: any,
contractId: Number,
}
const DetailedList: React.FC<Iprops> = ({
contractId
......@@ -30,7 +30,7 @@ const DetailedList: React.FC<Iprops> = ({
return (
<div>
<EyePreview
url={`/memberCenter/contract/funds/bill/details?applyId=${record.id}&type=pageDetailList`}
url={`/memberCenter/balance/businessRequestFunds/search/preview?id=${record.id}&no=${record.applyNo}`}
>
{text}
</EyePreview>
......
src/pages/contract/contractexecution/details/components/DrawerModal.tsx
View file @ 761e7c9a
......@@ -7,12 +7,13 @@ import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { getContractExecuteExecuteInfoPayDetailList } from '@/services/ContractV2Api'
import { getIntl } from 'umi';
import { getSettleAccountsBusinessApplyAmountBuyerApplyAmountList } from '@/services/SettleV2Api';
const intl = getIntl();
export interface Iprops extends IAntdSchemaFormProps {
/* 显示隐藏 */
visible: any,
visible: boolean,
item: any,
contractId: any,
contractId: number,
setDrawerModal: Function
}
const DrawerModal: React.FC<Iprops> = ({
......@@ -21,7 +22,6 @@ const DrawerModal: React.FC<Iprops> = ({
setDrawerModal,
contractId,
}) => {
console.log(item)
const ref = useRef({});
const [selectRow, setSelectRow] = useState<any[]>([]) // 抽屉选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
......@@ -40,10 +40,10 @@ const DrawerModal: React.FC<Iprops> = ({
},
{ title: intl.formatMessage({id: 'contract.zhuangtai'}), dataIndex: 'statusName', align: 'left', },
{
title: intl.formatMessage({id: 'contract.qingkuanshijian'}), dataIndex: 'orderTime', align: 'left',
render: (text: any, record: any) => (
<div>{moment(Number(text)).format('YYYY-MM-DD')}</div>
)
title: intl.formatMessage({id: 'contract.qingkuanshijian'}), dataIndex: 'createTime', align: 'left',
// render: (text: any, record: any) => (
// <div>{moment(Number(text)).format('YYYY-MM-DD')}</div>
// )
},
{
title: intl.formatMessage({id: 'contract.qingkuanjine'}), dataIndex: 'applyAmount', align: 'left',
......@@ -53,14 +53,14 @@ const DrawerModal: React.FC<Iprops> = ({
},
{
title: intl.formatMessage({id: 'contract.fukuanshijian'}), dataIndex: 'payTime', align: 'left',
render: (text: any, record: any) => (
<div>{moment(Number(text)).format('YYYY-MM-DD')}</div>
)
// render: (text: any, record: any) => (
// <div>{moment(Number(text)).format('YYYY-MM-DD')}</div>
// )
},
{
title: intl.formatMessage({id: 'contract.fukuanjine'}), dataIndex: 'payAmount', align: 'left',
render: (text: any, record: any) => (
<div>{intl.formatMessage({ id: 'common.money' })}{text ? text : 0}</div>
<div>{intl.formatMessage({ id: 'common.money' })}{record.status === 3 ? record.applyAmount : text ? text :0}</div>
)
},
]
......@@ -75,14 +75,16 @@ const DrawerModal: React.FC<Iprops> = ({
/* 请求查看付款明细 */
const fetchTableData = (params) => {
return new Promise((resolve, reject) => {
getContractExecuteExecuteInfoPayDetailList({
// /settle/accounts/business/apply/amount/buyer/apply/amount/list
// getContractExecuteExecuteInfoPayDetailList
getSettleAccountsBusinessApplyAmountBuyerApplyAmountList({
...params,
executeId: item.id,
contractId,
}).then(res => {
console.log(res,'res')
if (res.code === 1000) {
console.log(res.data, '请求查看付款明细')
resolve(res)
resolve(res.data)
}
}).catch((err) => {
resolve([])
......
src/pages/contract/contractexecution/details/components/PopModal.tsx
View file @ 761e7c9a
......@@ -9,7 +9,7 @@ const Option = Select.Option;
const intl = getIntl();
export interface Iprops extends IAntdSchemaFormProps {
/* 显示隐藏 */
ModalVisible: any,
ModalVisible: boolean,
payType: any,
selectRowList: any,
contractId: any,
......
src/pages/contract/contractexecution/details/index.tsx
View file @ 761e7c9a
import React, { useEffect, useState, useRef } from 'react';
import { Anchor, Table, Input, Space, Typography, message, Button, } from 'antd';
import { Anchor, Table,DatePicker, Input, Space, Typography, message, Button } from 'antd';
import style from './index.less';
import { ArrowLeftOutlined } from '@ant-design/icons';
const { Link } = Anchor;
......@@ -17,6 +17,13 @@ import PopModal from './components/PopModal';
import { getContractExecuteGetDetail, getContractExecutePageExecuteInfoList, getContractManageGetContractInfoByApplyAmountOrder } from '@/services/ContractV2Api'
const intl = getIntl();
const PAGE_SIZE = 8;
const { RangePicker } = DatePicker
type FromProps = {
orderNo:string,
orderAbstract:string,
startTime:string,
endTime:string,
}
const Details = (props: any) => {
const ref = useRef({});
const [currLink, setCurrLink] = useState(activeAnchorClassName)
......@@ -91,16 +98,48 @@ const Details = (props: any) => {
}).finally(() => {
setListLoading(false);
}).catch((err) => {
resolve([])
});
}
/* 执行请款的选中 */
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
// 设置提交数据
const [from,setfrom] = useState<FromProps>({
orderNo :'',
orderAbstract:'',
startTime:'',
endTime:'',
})
// 设置搜索的值
const setvalue = (e,name)=>{
const value = e.target.value;
from[name] = value;
console.log(value,name,from)
setfrom({...from})
}
const onChange = (value, dateString) => {
console.log(moment(value[0]).format('YYYY-MM-DD HH:mm:ss') ,'111')
// moment(value).format('YYYY-MM-DD HH:mm:ss') : ''
from.startTime = moment(value[0]).format('YYYY-MM-DD HH:mm:ss')
from.endTime = moment(value[1]).format('YYYY-MM-DD HH:mm:ss')
console.log(from)
setfrom(from)
}
const query = ()=>{
const data = {
contractId,
...from,
current: page,
pageSize: size,
}
getContracInfoList(data)
}
/* 获取详情的数据 */
const getDetail = () => {
console.log(contractId)
getContractExecuteGetDetail({ contractId }).then(res => {
getContractExecuteGetDetail({ contractId }).then((res:any) => {
if (res.code === 1000) {
let { basics, payPlanList } = res.data
setcontractNo(basics.contractNo)
......@@ -151,10 +190,7 @@ const Details = (props: any) => {
setTargetOffset(window.innerHeight / 4);
const data = {
contractId,
orderNo: '',
orderAbstract: '',
startTime: "",
endTime: "",
...from,
current: page,
pageSize: size,
}
......@@ -260,26 +296,31 @@ const Details = (props: any) => {
title: intl.formatMessage({id: 'contract.caozuo'}), dataIndex: 'type', align: 'left',
render: (text, record) => {
// 已付款大于0或已请款待付款大于0的才显示查看付款明细按钮。
let node = null;
if (record.payAmount !== 0) {
node =
return(
<div>
<a onClick={() => getPayment(record)} className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a>
<a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>{intl.formatMessage({id: 'contract.qingkuan'})}</a>
</div>
return node;
} else if (record.unPayApplyAmount > 0) {
node = <div>
<a onClick={() => getPayment(record)} className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a>
<a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>{intl.formatMessage({id: 'contract.qingkuan'})}</a>
</div>
return node;
} else {
node = <div>
<a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>{intl.formatMessage({id: 'contract.qingkuan'})}</a>
</div>
return node;
}
)
// if (record.payAmount !== 0) {
// node =
// <div>
// <a onClick={() => getPayment(record)} className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a>
// {/* <a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>{intl.formatMessage({id: 'contract.qingkuan'})}</a> */}
// </div>
// return node;
// } else if (record.unPayApplyAmount > 0) {
// node = <div>
// <a onClick={() => getPayment(record)} className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a>
// {/* <a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>{intl.formatMessage({id: 'contract.qingkuan'})}</a> */}
// </div>
// return node;
// } else {
// node = null
// // <div>
// // <a onClick={() => onModal(record, false)} style={{ marginLeft: 10 }} className={style.gesture}>{intl.formatMessage({id: 'contract.qingkuan'})}</a>
// // </div>
// return node;
// }
}
},
];
......@@ -287,33 +328,6 @@ const Details = (props: any) => {
const [ModalVisible, setIsModalVisible] = useState<boolean>(false)
const [payType, setpayType] = useState<any>([])
/* 显示模态款 */
const onModal = (record, Multiple) => {
if (!Multiple) {
const List = [];
List.push(record)
setSelectRow(List)
}
getContractManageGetContractInfoByApplyAmountOrder({ contractId }).then(res => {
if (res.code == 1000) {
setpayType(res.data.payPlanList)
setIsModalVisible(!ModalVisible)
}
})
}
/* 批量 */
const onselect = () => {
if (selectRow.length != 0) {
onModal({}, true)
} else {
console.log('1231321')
const msg = message.loading({
content: intl.formatMessage({id: 'contract.qinggouxuanqingkuanzhangdan'}),
duration: 0,
});
msg();
}
}
/* 点击显示弹出 */
const getPayment = (item) => {
setitem(item)
......@@ -328,35 +342,8 @@ const Details = (props: any) => {
setSelectRow(selectedRows)
}
};
const [values, setvalues] = useState('');
/* 搜素 */
const onSearch = (values) => {
const data = {
contractId,
orderNo: values,
orderAbstract: '',
startTime: "",
endTime: "",
current: 1,
pageSize: 5,
}
setvalues(values)
getContracInfoList(data)
}
/* 重置 */
const Reset = () => {
setvalues('');
const data = {
contractId,
orderNo: '',
orderAbstract: '',
startTime: "",
endTime: "",
current: 1,
pageSize: 5,
}
getContracInfoList(data)
}
/* 查看付款明细回调 */
const setDrawerModal = () => {
setVisible(!visible)
......@@ -365,26 +352,19 @@ const Details = (props: any) => {
const setDrawerPopModal = () => {
setIsModalVisible(!ModalVisible)
}
// 分页
const handlePaginationChange = (current: number, pageSize: number) => {
const data = {
contractId,
orderNo: '',
orderAbstract: '',
startTime: "",
endTime: "",
...from,
current: current,
pageSize: pageSize,
}
setSize(pageSize)
console.log(current, pageSize, size)
getContracInfoList(data)
};
const like = (sourceType, item) => {
console.log(sourceType, item);
// sessionStorage.setItem('basics', JSON.stringify(basics));
// history.push('/memberCenter/contract/funds/addbill/Add?applyId=' + contractId + '&sourceType=' + sourceType + '&paymentId=' + item.id)
}
return (
<div className={style.anchorWrap}>
<Anchor
......@@ -433,7 +413,7 @@ const Details = (props: any) => {
<BasicInfo basicInfo={basicInfo} />
{/* 付款计划 */}
<PaymentCard
IsShow={true}
IsShow={false}
payPlanList={payPlanList} basics={basics} contractId={contractId} />
{/* 执行情况 */}
<div id='docking' className='ant-card ant-card-bordered'>
......@@ -443,20 +423,34 @@ const Details = (props: any) => {
{intl.formatMessage({id: 'contract.zhixingqingkuang'})}
</div>
<div className={style.wrapper}>
<Input.Search
style={{ width: 240 }}
placeholder={intl.formatMessage({id: 'contract.sousu'})}
<Input
style={{ width: 240 ,marginRight:10}}
placeholder={intl.formatMessage({id: 'contract.qingshurudanjuhao'})}
allowClear
value={from.orderNo}
onChange={(e)=>setvalue(e,'orderNo')}
/>
<Input
style={{ width: 240 ,marginRight:10}}
placeholder={intl.formatMessage({id: 'contract.qingshurudanzaiyao'})}
allowClear
onSearch={onSearch}
value={values}
onChange={e => setvalues(e.target.value)}
value={from.orderAbstract}
onChange={(e)=>setvalue(e,'orderAbstract')}
/>
<Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }} onClick={Reset}> {intl.formatMessage({id: 'contract.zhongzhi'})} </Button>
<Button type="primary" onClick={() => onselect()}>{intl.formatMessage({id: 'contract.piliangqingkuan'})}</Button>
<RangePicker
showTime={{ format: 'HH:mm' }}
format="YYYY-MM-DD HH:mm"
onChange={onChange}
/>
<Button type="primary" onClick={query}>
{intl.formatMessage({id: 'contract.chaxun'})}
</Button>
</div>
</div>
</div>
<div className='ant-card-body'>
<Table
rowKey='keyId'
rowSelection={rowSelection}
......
src/pages/contract/coordination/details/components/Popup.tsx
View file @ 761e7c9a
......@@ -16,20 +16,23 @@ import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { getContractExecuteExecuteInfoPayDetailInfoPagePayDetail } from '@/services/ContractV2Api'
import { getIntl } from 'umi';
import { getSettleAccountsBusinessApplyAmountApplyAmountRowList, getSettleAccountsBusinessApplyAmountDetailApplyAmount } from '@/services/SettleV2Api';
const intl = getIntl();
export interface Iprops extends IAntdSchemaFormProps {
popupshow: any,
basicData?: any,
setDrawerModal: Function,
applyId: any
applyId: any,
applyNo: string,
}
const { Text } = Typography;
const PopupDrawer: React.FC<Iprops> = ({
popupshow,
basicData,
setDrawerModal,
applyId
applyId,
applyNo
}) => {
console.log(basicData, applyId)
const ref = useRef<any>({});
......@@ -37,57 +40,57 @@ const PopupDrawer: React.FC<Iprops> = ({
const [orderAmount, setorderAmount] = useState(0) // 订单金额
const columns: ColumnType<any>[] = [{
title: intl.formatMessage({ id: 'contract.danjuhaozhaiyao' }),
dataIndex: 'orderNO',
dataIndex: 'billNo',
align: 'left',
render: (text: any, record: any) => {
return (
<div>
<EyePreview
url="button"
url={record.billType === 1 ? `/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${record.billId}` : `/memberCenter/afterService/returnManage/returnQuery/detail?id=${record.billId}`}
>
{text}
</EyePreview>
<p>{record.orderAbstract}</p>
{/* <p>{record.}</p> */}
</div>
);
},
}, {
title: intl.formatMessage({ id: 'contract.danjuleixing' }),
dataIndex: 'orderTypeName',
dataIndex: 'billTypeName',
align: 'left',
}, {
title: intl.formatMessage({ id: 'contract.danjushijian' }),
dataIndex: 'orderTime',
dataIndex: 'billTime',
align: 'left',
},
{
title: intl.formatMessage({ id: 'contract.danjuzhuangtai' }),
dataIndex: 'payeeMemberName',
dataIndex: 'billStatus',
align: 'left',
},
{
dataIndex: 'orderAmount',
dataIndex: 'billRowAmount',
title: (
<Space direction='vertical'>
<Text>{intl.formatMessage({ id: 'contract.danjujine' })}</Text>
<Text>{intl.formatMessage({ id: 'contract.heji' })}: {intl.formatMessage({ id: 'common.money' })}{orderAmount}</Text>
{/* <Text>{intl.formatMessage({ id: 'contract.heji' })}: {intl.formatMessage({ id: 'common.money' })}{orderAmount}</Text> */}
</Space>
),
},
{
title: intl.formatMessage({ id: 'contract.hanshuishuil' }),
dataIndex: 'isHasTaxName',
dataIndex: 'hasTaxName',
align: 'left'
},
{
dataIndex: 'payAmount',
dataIndex: 'applyPayment',
align: 'left',
title: (
<Space direction='vertical'>
<Text>{intl.formatMessage({ id: 'contract.fukuanjine' })}</Text>
<Text>{intl.formatMessage({ id: 'contract.heji' })}: {intl.formatMessage({ id: 'common.money' })}{payAmount}</Text>
{/* <Text>{intl.formatMessage({ id: 'contract.heji' })}: {intl.formatMessage({ id: 'common.money' })}{payAmount}</Text> */}
</Space>
),
},
......@@ -96,16 +99,20 @@ const PopupDrawer: React.FC<Iprops> = ({
// 模拟请求
const fetchData = (params?: any) => {
return new Promise((resolve, reject) => {
getContractExecuteExecuteInfoPayDetailInfoPagePayDetail({
applyId,
// /settle/accounts/business/apply/amount/detail/apply/amount
// getContractExecuteExecuteInfoPayDetailInfoPagePayDetail
// /api/settle/accounts/business/apply/amount/apply/amount/row/list
getSettleAccountsBusinessApplyAmountApplyAmountRowList({
applyAmountId: applyId,
applyNo,
...params,
}).then(res => {
if (res.code === 1000) {
resolve(res.data)
let payAmount = 0, orderAmount = 0;
res.data.data.map((item: any) => {
payAmount += item.payAmount;
orderAmount += item.orderAmount
payAmount += item.billRowAmount;
orderAmount += item.applyPayment
})
console.log(payAmount, orderAmount)
setpayAmount(payAmount)
......@@ -145,7 +152,7 @@ const PopupDrawer: React.FC<Iprops> = ({
<div className={style.memuItem}>
<div className={style.menuCard}>
<div className={style.menulabel}>{intl.formatMessage({ id: 'contract.shoukuanzhanghu' })}：</div>
<div className={style.card}>{basicData.payeeName}</div>
<div className={style.card}>{basicData.accountName}</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>{intl.formatMessage({ id: 'contract.yinhangzhanghao' })}：</div>
......@@ -164,7 +171,7 @@ const PopupDrawer: React.FC<Iprops> = ({
<div className={style.memuItem}>
<div className={style.menuCard}>
<div className={style.menulabel}>{intl.formatMessage({ id: 'contract.fukuanjine' })}：</div>
<div className={style.card}>{intl.formatMessage({id: 'common.money'})} {basicData.payAmount}</div>
<div className={style.card}>{intl.formatMessage({ id: 'common.money' })} {basicData.applyAmount}</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>{intl.formatMessage({ id: 'contract.fukuanshijian' })}：</div>
......@@ -194,7 +201,7 @@ const PopupDrawer: React.FC<Iprops> = ({
</div>
</div>
</div>
<div className={style.PopupTitle}>{intl.formatMessage({id: 'contract.fukuanmingxi'})}</div>
<div className={style.PopupTitle}>{intl.formatMessage({ id: 'contract.fukuanmingxi' })}</div>
<StandardTable
rowKey="id"
style={{
......
src/pages/contract/coordination/details/components/SituationList.tsx
View file @ 761e7c9a
......@@ -98,7 +98,8 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
return (
<div>
<EyePreview
url={`/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/preview?id=${record.orderId}`}
url={record.orderType === 1 ? `/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${record.orderId}` : `/memberCenter/afterService/returnManage/returnQuery/detail?id=${record.orderId}`}
// url={`/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/preview?id=${record.orderId}`}
>
{text}
</EyePreview>
......@@ -176,21 +177,21 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
<span>{intl.formatMessage({ id: 'common.money' })}{text}</span>
)
},
{
title: intl.formatMessage({ id: 'contract.caozuo' }), dataIndex: 'type', align: 'center',
render: (text, record) => {
// 已付款大于0或已请款待付款大于0的才显示查看付款明细按钮。
return (
<div>
{
// onClick = {() => getPayment(record.id)}
record.payAmount > 0 || record.unPayApplyAmount > 0 && <a className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a>
}
// {
// title: intl.formatMessage({ id: 'contract.caozuo' }), dataIndex: 'type', align: 'center',
// render: (text, record) => {
// // 已付款大于0或已请款待付款大于0的才显示查看付款明细按钮。
// return (
// <div>
// {
// // onClick = {() => getPayment(record.id)}
// record.payAmount > 0 || record.unPayApplyAmount > 0 && <a className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a>
// }
</div>
)
}
},
// </div>
// )
// }
// },
];
const handlePaginationChange = (current: number, pageSize: number) => {
const data = {
......@@ -247,7 +248,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
value={value}
onChange={(e) => setvalue(e.target.value)}
/>
<Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }} onClick={Reset}> {intl.formatMessage({id: 'contract.zhongzhi'})} </Button>
<Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }} onClick={Reset}> {intl.formatMessage({ id: 'contract.zhongzhi' })} </Button>
</div>
</div>
</div>
......
src/pages/contract/coordination/details/index.tsx
View file @ 761e7c9a
......@@ -18,6 +18,7 @@ import {
FileWordFilled
} from '@ant-design/icons'
import { getContractCoordinationGetDetail, getContractExecuteExecuteInfoPayDetailInfo, getContractSignatureGetHandSignatureUrl, postContractCoordinationExamineStepOne, postContractCoordinationExamineStepTwo, postContractCoordinationSign, postContractCoordinationSubmitExamine } from '@/services/ContractV2Api'
import { getSettleAccountsBusinessApplyAmountDetailApplyAmount } from '@/services/SettleV2Api';
const { Link } = Anchor;
const activeAnchorClassName = 'ant-anchor-link-active'
const Details = (props: any) => {
......@@ -83,7 +84,7 @@ const Details = (props: any) => {
],
col3: [
{ label: intl.formatMessage({ id: 'contract.hetongyouxiaoqi' }), extra: `${basics.startTime}${intl.formatMessage({id: 'common.text.to'})}${basics.endTime}` },
{ label: intl.formatMessage({ id: 'contract.hetongyouxiaoqi' }), extra: `${basics.startTime}${intl.formatMessage({ id: 'common.text.to' })}${basics.endTime}` },
],
}
if (type) {
......@@ -298,20 +299,25 @@ const Details = (props: any) => {
}
const [applyId, setapplyId] = useState<any>('')
const [applyNo, setapplyNo] = useState<any>('')
/* 点击查看详情回调 */
const setkey = (item) => {
setDrawerModal()
if (item.id) {
setapplyId(item.id)
getContractExecuteExecuteInfoPayDetailInfo({
contractId,
applyId: item.id
}).then(res => {
setapplyNo(item.applyAmountNo)
// api/settle/accounts/business/apply/amount/detail/apply/amount
// getContractExecuteExecuteInfoPayDetailInfo
getSettleAccountsBusinessApplyAmountDetailApplyAmount({
applyNo: item.applyAmountNo,
applyAmountId: item.id,
}).then((res: any) => {
console.log(res);
if (res.code === 1000) {
console.log(res.data)
res.data.invoiceProveVOList = res.data.invoiceProveVOList ? res.data.invoiceProveVOList : [];
setbasicData(res.data)
setDrawerModal()
}
})
}
......@@ -499,7 +505,7 @@ const Details = (props: any) => {
</Form>
</Modal>
{/* 查看付款计划明细弹出组建 */}
<PopupDrawer popupshow={Popup} basicData={basicData} setDrawerModal={setDrawerModal} applyId={applyId} />
<PopupDrawer popupshow={Popup} applyNo={applyNo} basicData={basicData} setDrawerModal={setDrawerModal} applyId={applyId} />
</div>
)
}
......
src/pages/member/memberEvaluate/schema/add.tsx
View file @ 761e7c9a
......@@ -250,7 +250,7 @@ export const evaluateAddSchema: ISchema = {
required: true,
},
{
pattern: /\d+/,
pattern: /^\d+$/,
message: intl.formatMessage({ id: 'member.evaluate.validate.number', defaultMessage: '请填写正整数' }),
}
]
......@@ -261,7 +261,7 @@ export const evaluateAddSchema: ISchema = {
required: false,
},
{
pattern: /\d+/,
pattern: /^\d+$/,
message: intl.formatMessage({ id: 'member.evaluate.validate.number', defaultMessage: '请填写正整数' }),
}
]
......
src/pages/mobileTemplate/categoryNavigation/components/CommodityDrawer/index.tsx
View file @ 761e7c9a
......@@ -29,6 +29,9 @@ interface CommodityDrawerProps {
}
const _returnCategoryList = (list: any, obj: any) => {
if (!obj) {
return;
}
obj.name && list.unshift(obj.name);
if (obj.category) {
_returnCategoryList(list, obj.category);
......
src/pages/mobileTemplate/categoryNavigation/components/EditPanel/editPanel.tsx
View file @ 761e7c9a
......@@ -224,7 +224,7 @@ const EditPanel = () => {
};
const currentProps = type === 0 && componentType.includes('suggestProduct') ? formValueToProps['suggestProduct'] : formValueToProps[componentType];
if(componentType.includes('suggestProduct') && type === 0) {
if(componentType.includes('suggestProduct') && values.type) {
setType(values.type);
}
changeProps({
......
src/pages/repositories/addRepository.tsx
View file @ 761e7c9a
......@@ -13,6 +13,7 @@ import { omit } from '@/utils'
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'
import PositionSetting from './components/positionSetting'
import { postProductFreightSpaceAdd } from '@/services/ProductV2Api'
import { returnClear } from './effects'
// import styled from 'styled-components'
// const WrapperLayout = styled(props => <div {...props} />)`
......@@ -63,7 +64,7 @@ const AddRepository: React.FC<{}> = (props) => {
return (
<PageHeaderWrapper
onBack={() => history.goBack()}
onBack={() => returnClear()}
backIcon={<ReutrnEle description={intl.formatMessage({ id: 'repositories.addRepository.back' })} />}
className='addRepository'
title={pageStatus === PageStatus.PREVIEW ? intl.formatMessage({ id: 'repositories.addRepository.title.1' }) : intl.formatMessage({ id: 'repositories.addRepository.title.2' })}
......
src/pages/repositories/adjustRepository.tsx
View file @ 761e7c9a
......@@ -16,7 +16,7 @@ import { getStepNumber } from '@/utils'
import { usePageStatus } from '@/hooks/usePageStatus'
import { useInitValue } from '@/formSchema/effects/useInitValue'
import { useLinkageUtils } from '@/utils/formEffectUtils'
import { useUnitPreview } from './effects'
import { returnClear, useUnitPreview } from './effects'
import PositionSetting from './components/positionSetting'
import { useHttpRequest } from '@/hooks/useHttpRequest'
import { getProductFreightSpaceAllotFoldLog, getProductFreightSpaceDetails, getProductFreightSpaceListByProductid, postProductFreightSpaceAllotExport, postProductFreightSpaceAllotFold, postProductFreightSpaceUpdata } from '@/services/ProductV2Api'
......@@ -198,7 +198,7 @@ const AddRepository: React.FC<{}> = (props) => {
})
await postProductFreightSpaceUpdata(params)
setTimeout(() => {
history.goBack(-1)
history.goBack()
}, 1000)
}
......@@ -207,7 +207,7 @@ const AddRepository: React.FC<{}> = (props) => {
}
return (
<PageHeaderWrapper
onBack={() => history.goBack()}
onBack={() => returnClear()}
backIcon={<ReutrnEle description={intl.formatMessage({ id: 'repositories.adjustRepository.back' })} />}
className='addRepository'
title={intl.formatMessage({ id: 'repositories.adjustRepository.title' })}
......
src/pages/repositories/batchAddRepository.tsx
View file @ 761e7c9a
......@@ -12,6 +12,7 @@ import { createFormActions } from '@formily/antd'
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'
import BatchPositionSetting from './components/batchPositionSetting'
import { postProductFreightSpaceAddBatch } from '@/services/ProductV2Api'
import { returnClear } from './effects'
const addSchemaAction = createFormActions()
......@@ -68,7 +69,7 @@ const BatchAddRepository: React.FC<{}> = () => {
return (
<PageHeaderWrapper
onBack={() => history.goBack()}
onBack={() => returnClear()}
backIcon={<ReutrnEle description={intl.formatMessage({ id: 'repositories.batchAddRepository.back' })} />}
className='addRepository'
title={pageStatus === PageStatus.PREVIEW ? intl.formatMessage({ id: 'repositories.batchAddRepository.title.1' }) : intl.formatMessage({ id: 'repositories.batchAddRepository.title.2' })}
......
src/pages/repositories/effects/index.tsx
View file @ 761e7c9a
import { useEffect } from 'react'
import { history } from 'umi'
import { ISchemaFormActions, FormEffectHooks } from '@formily/antd';
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import { getProductCustomerGetCustomerCategoryTree, getProductInventoryByItemNo, getProductSelectGetSelectBrand, getProductWarehouseAll } from '@/services/ProductV2Api';
import { clearModalParams } from '@/utils';
const { onFieldValueChange$ } = FormEffectHooks
export const useWarehouseSelect = (context: ISchemaFormActions) => {
......@@ -77,3 +79,9 @@ export const searchCustomerCategoryOptionEffect = (context: any, fieldName: stri
})
})
}
/* 对于二级页面返回 清空筛选条件 */
export const returnClear = () => {
clearModalParams()
history.goBack()
}
src/pages/transaction/purchaseOrder/orderCollectCash/apis/index.ts
View file @ 761e7c9a
......@@ -27,7 +27,7 @@ export const fetchOrderApi = {
/** 获取会员列表 */
async getMemberListByModelType(params) {
const { data } = BASE_CONFIG.global.siteInfo.enableMultiTenancy ? await getMemberManageUpperProviderMerchantPage(params) : await getMemberManageOrderBuyerMembers(params)
const { data } = await getMemberManageOrderBuyerMembers(params)
return data
},
......
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