Skip to content

J
jinfa-platform
Commit 45dc73a8 authored by 前端-许佳敏's avatar 前端-许佳敏
Browse files
Options

merge: 合并v2代码

parents 27a5fb45 aee7f089
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 97 deletions
.gitlab/issue_templates/feature.md 0 → 100644
View file @ 45dc73a8
# 新功能概况
1. 功能描述(必填)
2. 预期效果/行为是什么
3. 可能影响到的模块是什么
4. 禅道需求地址
.gitlab/issue_templates/fixbug.md 0 → 100644
View file @ 45dc73a8
# bug概况
1. 重现步骤(必填)
2. 目前的错误行为是什么
3. 预期效果/行为是什么
4. 相关日志/屏幕截图(如果可以提供的话，方便追踪)
5. 测试通过后希望同步的分支
6. 禅道bug地址
.gitlab/merge_request_templates/feature.md 0 → 100644
View file @ 45dc73a8
# 新功能概况
1. 功能描述(必填)
2. 预期效果/行为是什么
3. 可能影响到的模块是什么
4. 禅道需求地址
.gitlab/merge_request_templates/fixbug.md 0 → 100644
View file @ 45dc73a8
# bug概况
1. 重现步骤(必填)
2. 目前的错误行为是什么
3. 预期效果/行为是什么
4. 相关日志/屏幕截图(如果可以提供的话，方便追踪)
5. 测试通过后希望同步的分支
6. 禅道bug地址
src/pages/contract/components/examine/index.tsx
View file @ 45dc73a8
...@@ -33,6 +33,7 @@ const Examine: React.FC<Iprops> = ({ ...@@ -33,6 +33,7 @@ const Examine: React.FC<Iprops> = ({
}) => { }) => {
const [isPass, setIsAllMember] = useState(1) const [isPass, setIsAllMember] = useState(1)
const [state, setstate] = useState<any>(false); const [state, setstate] = useState<any>(false);
const [contractUrl, setcontractUrl] = useState('');
/* 设置选中值 */ /* 设置选中值 */
const handleIsAllMemberChange = (v: any) => { const handleIsAllMemberChange = (v: any) => {
setIsAllMember(v.target.value) setIsAllMember(v.target.value)
...@@ -91,11 +92,13 @@ const Examine: React.FC<Iprops> = ({ ...@@ -91,11 +92,13 @@ const Examine: React.FC<Iprops> = ({
/* 合同协同签订-签订合同 */ /* 合同协同签订-签订合同 */
case 'Signacontract': case 'Signacontract':
fn = postContractManageSign fn = postContractManageSign
values.contractUrl = contractUrl;
values.contractId = applyId; values.contractId = applyId;
break; break;
} }
console.log(values)
const msg = message.loading({ const msg = message.loading({
content: intl.formatMessage({id: 'contract.zhengzaicaozuo'}), content: intl.formatMessage({ id: 'contract.zhengzaicaozuo' }),
duration: 0, duration: 0,
}); });
fn(values).then(res => { fn(values).then(res => {
...@@ -136,9 +139,10 @@ const Examine: React.FC<Iprops> = ({ ...@@ -136,9 +139,10 @@ const Examine: React.FC<Iprops> = ({
}, },
onChange(info) { onChange(info) {
if (info.file.response) { if (info.file.response) {
const { code } = info.file.response; const { code, data: { url } } = info.file.response;
console.log(code); console.log(code);
message.info(intl.formatMessage({id: 'contract.shangchuanchenggong'})); setcontractUrl(url)
message.info(intl.formatMessage({ id: 'contract.shangchuanchenggong' }));
console.log(info.file) console.log(info.file)
setstate(true); setstate(true);
} }
...@@ -148,12 +152,12 @@ const Examine: React.FC<Iprops> = ({ ...@@ -148,12 +152,12 @@ const Examine: React.FC<Iprops> = ({
} }
if (info.file.status === 'done') { if (info.file.status === 'done') {
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
message.error(`${info.file.name} ${intl.formatMessage({id: 'contract.shangchuanshibai'})}`); message.error(`${info.file.name} ${intl.formatMessage({ id: 'contract.shangchuanshibai' })}`);
} }
}, },
beforeUpload(file) { beforeUpload(file) {
if (file.size / 1024 / 1024 > 20) { if (file.size / 1024 / 1024 > 20) {
message.warning(intl.formatMessage({id: 'contract.fujiandaxiaochaoguo20M'})); message.warning(intl.formatMessage({ id: 'contract.fujiandaxiaochaoguo20M' }));
return Promise.reject(); return Promise.reject();
} }
}, },
...@@ -161,13 +165,14 @@ const Examine: React.FC<Iprops> = ({ ...@@ -161,13 +165,14 @@ const Examine: React.FC<Iprops> = ({
const uploadNode = () => { const uploadNode = () => {
return ( return (
<div> <div>
<p style={{ paddingTop: 10, paddingBottom: 10, }}>{intl.formatMessage({id: 'contract.zhizhihetongyifangyi'})}</p> <p style={{ paddingTop: 10, paddingBottom: 10, }}>{intl.formatMessage({ id: 'contract.zhizhihetongyifangyi' })}</p>
<Row style={{ marginBottom: 30, }}> <Row style={{ marginBottom: 30, }}>
<Col> <Col>
<Upload <Upload
{...uploadProps} {...uploadProps}
maxCount={1}
> >
<Button icon={<UploadOutlined />}>{intl.formatMessage({id: 'contract.shangchuanfujian'})}</Button> <Button icon={<UploadOutlined />}>{intl.formatMessage({ id: 'contract.shangchuanfujian' })}</Button>
</Upload> </Upload>
</Col> </Col>
</Row> </Row>
...@@ -176,7 +181,7 @@ const Examine: React.FC<Iprops> = ({ ...@@ -176,7 +181,7 @@ const Examine: React.FC<Iprops> = ({
} }
return ( return (
<div> <div>
<Modal footer={null} title={intl.formatMessage({id: 'contract.tijiaoshenhe'})} visible={ExamineFlag} onCancel={() => fetchData('onCancel')}> <Modal footer={null} title={intl.formatMessage({ id: 'contract.tijiaoshenhe' })} visible={ExamineFlag} onCancel={() => fetchData('onCancel')}>
<Form <Form
name="basic" name="basic"
form={form} form={form}
...@@ -185,20 +190,20 @@ const Examine: React.FC<Iprops> = ({ ...@@ -185,20 +190,20 @@ const Examine: React.FC<Iprops> = ({
onFinishFailed={onFinishFailed} onFinishFailed={onFinishFailed}
> >
{type === 'Signacontract' ? uploadNode() : null} {type === 'Signacontract' ? uploadNode() : null}
<Form.Item name="isPass" label="" rules={[{ required: true, message: intl.formatMessage({id: 'contract.qingxuanzetongguofangshi'}) }]} initialValue={isPass} > <Form.Item name="isPass" label="" rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzetongguofangshi' }) }]} initialValue={isPass} >
<Radio.Group onChange={handleIsAllMemberChange}> <Radio.Group onChange={handleIsAllMemberChange}>
<Radio value={1}>{agreeText}</Radio> <Radio value={1}>{agreeText}</Radio>
<Radio value={0}>{disagree}</Radio> <Radio value={0}>{disagree}</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item label={isPass ? intl.formatMessage({id: 'contract.shenhetongguoyuanyin'}) : intl.formatMessage({id: 'contract.shenbuhetongguoyuanyin'})} rules={[{ required: true, message: intl.formatMessage({id: 'contract.qingxuanzezuofeiriqi'}) }]}> <Form.Item label={isPass ? intl.formatMessage({ id: 'contract.shenhetongguoyuanyin' }) : intl.formatMessage({ id: 'contract.shenbuhetongguoyuanyin' })} rules={[{ required: true, message: intl.formatMessage({ id: 'contract.qingxuanzezuofeiriqi' }) }]}>
</Form.Item> </Form.Item>
<Form.Item label='' name="opinion" rules={[{ required: isPass ? false : true, message: intl.formatMessage({id: 'contract.shenhetongguoyijian'}) }]}> <Form.Item label='' name="opinion" rules={[{ required: isPass ? false : true, message: intl.formatMessage({ id: 'contract.shenhetongguoyijian' }) }]}>
<TextArea placeholder={intl.formatMessage({id: 'contract.zaicishurunideyuanyin'})} maxLength={120} /> <TextArea placeholder={intl.formatMessage({ id: 'contract.zaicishurunideyuanyin' })} maxLength={120} />
</Form.Item> </Form.Item>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Button onClick={() => fetchData('onCancel')} style={{ marginRight: 10 }}>{intl.formatMessage({id: 'contract.quxiao'})}</Button> <Button onClick={() => fetchData('onCancel')} style={{ marginRight: 10 }}>{intl.formatMessage({ id: 'contract.quxiao' })}</Button>
<Button type="primary" htmlType="submit">{intl.formatMessage({id: 'contract.baocun'})}</Button> <Button type="primary" htmlType="submit">{intl.formatMessage({ id: 'contract.baocun' })}</Button>
</div> </div>
</Form> </Form>
</Modal> </Modal>
...@@ -206,8 +211,8 @@ const Examine: React.FC<Iprops> = ({ ...@@ -206,8 +211,8 @@ const Examine: React.FC<Iprops> = ({
) )
} }
Examine.defaultProps = { Examine.defaultProps = {
agreeText: intl.formatMessage({id: 'contract.tongguo'}), agreeText: intl.formatMessage({ id: 'contract.tongguo' }),
disagree: intl.formatMessage({id: 'contract.butongguo'}), disagree: intl.formatMessage({ id: 'contract.butongguo' }),
uploadNode: null uploadNode: null
} }
export default Examine; export default Examine;
src/pages/contract/contractexecution/details/index.tsx
View file @ 45dc73a8
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef } from 'react';
import { Anchor, Table,DatePicker, Input, Space, Typography, message, Button } from 'antd'; import { Anchor, Table, DatePicker, Input, Space, Typography, message, Button } from 'antd';
import style from './index.less'; import style from './index.less';
import { ArrowLeftOutlined } from '@ant-design/icons'; import { ArrowLeftOutlined } from '@ant-design/icons';
const { Link } = Anchor; const { Link } = Anchor;
...@@ -19,10 +19,10 @@ const intl = getIntl(); ...@@ -19,10 +19,10 @@ const intl = getIntl();
const PAGE_SIZE = 8; const PAGE_SIZE = 8;
const { RangePicker } = DatePicker const { RangePicker } = DatePicker
type FromProps = { type FromProps = {
orderNo:string, orderNo: string,
orderAbstract:string, orderAbstract: string,
startTime:string, startTime: string,
endTime:string, endTime: string,
} }
const Details = (props: any) => { const Details = (props: any) => {
const ref = useRef({}); const ref = useRef({});
...@@ -51,10 +51,10 @@ const Details = (props: any) => { ...@@ -51,10 +51,10 @@ const Details = (props: any) => {
const [basics, setbasics] = useState({}) const [basics, setbasics] = useState({})
const [contractAbstract, setcontractAbstract] = useState(); const [contractAbstract, setcontractAbstract] = useState();
const [tabPane] = useState([ const [tabPane] = useState([
{ id: 'process', title: intl.formatMessage({id: 'contract.jibenliucheng'}) }, { id: 'process', title: intl.formatMessage({ id: 'contract.jibenliucheng' }) },
{ id: 'conditions', title: intl.formatMessage({id: 'contract.fukuanjihua'}) }, { id: 'conditions', title: intl.formatMessage({ id: 'contract.fukuanjihua' }) },
{ id: 'docking', title: intl.formatMessage({id: 'contract.zhixingqingkuang'}) }, { id: 'docking', title: intl.formatMessage({ id: 'contract.zhixingqingkuang' }) },
{ id: 'record', title: intl.formatMessage({id: 'contract.qingkuantongji'}) }, { id: 'record', title: intl.formatMessage({ id: 'contract.qingkuantongji' }) },
]) ])
const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined); const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined);
/* 单据总金额 */ /* 单据总金额 */
...@@ -105,29 +105,29 @@ const Details = (props: any) => { ...@@ -105,29 +105,29 @@ const Details = (props: any) => {
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据 const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]) const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
// 设置提交数据 // 设置提交数据
const [from,setfrom] = useState<FromProps>({ const [from, setfrom] = useState<FromProps>({
orderNo :'', orderNo: '',
orderAbstract:'', orderAbstract: '',
startTime:'', startTime: '',
endTime:'', endTime: '',
}) })
// 设置搜索的值 // 设置搜索的值
const setvalue = (e,name)=>{ const setvalue = (e, name) => {
const value = e.target.value; const value = e.target.value;
from[name] = value; from[name] = value;
console.log(value,name,from) console.log(value, name, from)
setfrom({...from}) setfrom({ ...from })
} }
const onChange = (value, dateString) => { const onChange = (value, dateString) => {
console.log(moment(value[0]).format('YYYY-MM-DD HH:mm:ss') ,'111') console.log(moment(value[0]).format('YYYY-MM-DD HH:mm:ss'), '111')
// moment(value).format('YYYY-MM-DD HH:mm:ss') : '' // moment(value).format('YYYY-MM-DD HH:mm:ss') : ''
from.startTime = moment(value[0]).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') from.endTime = moment(value[1]).format('YYYY-MM-DD HH:mm:ss')
console.log(from) console.log(from)
setfrom(from) setfrom(from)
} }
const query = ()=>{ const query = () => {
const data = { const data = {
contractId, contractId,
...from, ...from,
...@@ -139,7 +139,7 @@ const Details = (props: any) => { ...@@ -139,7 +139,7 @@ const Details = (props: any) => {
/* 获取详情的数据 */ /* 获取详情的数据 */
const getDetail = () => { const getDetail = () => {
console.log(contractId) console.log(contractId)
getContractExecuteGetDetail({ contractId }).then((res:any) => { getContractExecuteGetDetail({ contractId }).then((res: any) => {
if (res.code === 1000) { if (res.code === 1000) {
let { basics, payPlanList } = res.data let { basics, payPlanList } = res.data
setcontractNo(basics.contractNo) setcontractNo(basics.contractNo)
...@@ -147,19 +147,19 @@ const Details = (props: any) => { ...@@ -147,19 +147,19 @@ const Details = (props: any) => {
setbasics(basics) setbasics(basics)
const basicInfo = { const basicInfo = {
col1: [ col1: [
{ label: intl.formatMessage({id: 'contract.hetongbianhao'}), extra: basics.contractNo ? basics.contractNo : '', url: `/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${basics.id}` }, { label: intl.formatMessage({ id: 'contract.hetongbianhao' }), extra: basics.contractNo ? basics.contractNo : '', url: `/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${basics.id}` },
{ label: intl.formatMessage({id: 'contract.hetongzhaiyao'}), extra: basics.contractAbstract ? basics.contractAbstract : '' }, { label: intl.formatMessage({ id: 'contract.hetongzhaiyao' }), extra: basics.contractAbstract ? basics.contractAbstract : '' },
{ label: intl.formatMessage({id: 'contract.waibuzhuangtai'}), extra: basics.outerStatusName ? basics.outerStatusName : '' }, { label: intl.formatMessage({ id: 'contract.waibuzhuangtai' }), extra: basics.outerStatusName ? basics.outerStatusName : '' },
], ],
col2: [ col2: [
{ label: intl.formatMessage({id: 'contract.xunyuanleixing'}), extra: basics.sourceTypeName ? basics.sourceTypeName : '' }, { label: intl.formatMessage({ id: 'contract.xunyuanleixing' }), extra: basics.sourceTypeName ? basics.sourceTypeName : '' },
{ label: intl.formatMessage({id: 'contract.duiyingdanju'}), extra: basics.sourceNo ? basics.sourceNo : '', url: '' }, { label: intl.formatMessage({ id: 'contract.duiyingdanju' }), extra: basics.sourceNo ? basics.sourceNo : '', url: '' },
{ label: intl.formatMessage({id: 'contract.hetongyifang'}), extra: basics.partyBName ? basics.partyBName : '' }, { label: intl.formatMessage({ id: 'contract.hetongyifang' }), extra: basics.partyBName ? basics.partyBName : '' },
], ],
col3: [ col3: [
{ label: intl.formatMessage({id: 'contract.hetongjine'}), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' }, { label: intl.formatMessage({ id: 'contract.hetongjine' }), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
{ 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 (basics.sourceId) { if (basics.sourceId) {
...@@ -209,7 +209,7 @@ const Details = (props: any) => { ...@@ -209,7 +209,7 @@ const Details = (props: any) => {
/* 查看付款明细 */ /* 查看付款明细 */
const columns: any = [ const columns: any = [
{ {
title: intl.formatMessage({id: 'contract.danjuhaozhaiyao'}), dataIndex: 'orderNO', align: 'left', title: intl.formatMessage({ id: 'contract.danjuhaozhaiyao' }), dataIndex: 'orderNO', align: 'left',
render: (text: any, record: any) => { render: (text: any, record: any) => {
return ( return (
<div> <div>
...@@ -224,11 +224,11 @@ const Details = (props: any) => { ...@@ -224,11 +224,11 @@ const Details = (props: any) => {
}, },
}, },
{ {
title: intl.formatMessage({id: 'contract.danjuleixing'}), dataIndex: 'orderTypeName', align: 'left', title: intl.formatMessage({ id: 'contract.danjuleixing' }), dataIndex: 'orderTypeName', align: 'left',
}, },
{ title: intl.formatMessage({id: 'contract.danjuzhuangtai'}), dataIndex: 'orderStatusName', align: 'left', }, { title: intl.formatMessage({ id: 'contract.danjuzhuangtai' }), dataIndex: 'orderStatusName', align: 'left', },
{ {
title: intl.formatMessage({id: 'contract.danjushijian'}), dataIndex: 'orderTime', align: 'left', title: intl.formatMessage({ id: 'contract.danjushijian' }), dataIndex: 'orderTime', align: 'left',
render: (text: any, record: any) => { render: (text: any, record: any) => {
return ( return (
<Text>{moment(Number(text)).format('YYYY-MM-DD')}</Text> <Text>{moment(Number(text)).format('YYYY-MM-DD')}</Text>
...@@ -239,8 +239,8 @@ const Details = (props: any) => { ...@@ -239,8 +239,8 @@ const Details = (props: any) => {
dataIndex: 'orderAmount', align: 'left', dataIndex: 'orderAmount', align: 'left',
title: ( title: (
<Space direction='vertical'> <Space direction='vertical'>
<Text>{intl.formatMessage({id: 'contract.danjujine'})}</Text> <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> </Space>
), ),
render: (text) => ( render: (text) => (
...@@ -248,10 +248,10 @@ const Details = (props: any) => { ...@@ -248,10 +248,10 @@ const Details = (props: any) => {
) )
}, },
{ {
title: intl.formatMessage({id: 'contract.hanshuishuil'}), dataIndex: 'taxRate', align: 'left', title: intl.formatMessage({ id: 'contract.hanshuishuil' }), dataIndex: 'taxRate', align: 'left',
render: (text, record) => ( render: (text, record) => (
<Space direction='vertical'> <Space direction='vertical'>
<Text>{record.isHasTax == 1 ? intl.formatMessage({id: 'contract.shi'}) : intl.formatMessage({id: 'contract.fou'})}</Text> <Text>{record.isHasTax == 1 ? intl.formatMessage({ id: 'contract.shi' }) : intl.formatMessage({ id: 'contract.fou' })}</Text>
<Text>{text}%</Text> <Text>{text}%</Text>
</Space> </Space>
) )
...@@ -260,8 +260,8 @@ const Details = (props: any) => { ...@@ -260,8 +260,8 @@ const Details = (props: any) => {
dataIndex: 'payAmount', align: 'left', dataIndex: 'payAmount', align: 'left',
title: ( title: (
<Space direction='vertical'> <Space direction='vertical'>
<Text>{intl.formatMessage({id: 'contract.yifukuan'})}</Text> <Text>{intl.formatMessage({ id: 'contract.yifukuan' })}</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> </Space>
), ),
render: (text) => ( render: (text) => (
...@@ -271,8 +271,8 @@ const Details = (props: any) => { ...@@ -271,8 +271,8 @@ const Details = (props: any) => {
{ {
title: ( title: (
<Space direction='vertical'> <Space direction='vertical'>
<Text>{intl.formatMessage({id: 'contract.yiqingkuandaifukuan'})}</Text> <Text>{intl.formatMessage({ id: 'contract.yiqingkuandaifukuan' })}</Text>
<Text>{intl.formatMessage({id: 'contract.heji'})}: {intl.formatMessage({ id: 'common.money' })}{unPayApplyAmount}</Text> <Text>{intl.formatMessage({ id: 'contract.heji' })}: {intl.formatMessage({ id: 'common.money' })}{unPayApplyAmount}</Text>
</Space> </Space>
), ),
dataIndex: 'unPayApplyAmount', align: 'left', dataIndex: 'unPayApplyAmount', align: 'left',
...@@ -283,8 +283,8 @@ const Details = (props: any) => { ...@@ -283,8 +283,8 @@ const Details = (props: any) => {
{ {
title: ( title: (
<Space direction='vertical'> <Space direction='vertical'>
<Text>{intl.formatMessage({id: 'contract.daiqingkuan'})}</Text> <Text>{intl.formatMessage({ id: 'contract.daiqingkuan' })}</Text>
<Text>{intl.formatMessage({id: 'contract.heji'})}: {intl.formatMessage({ id: 'common.money' })}{unApplyAmount}</Text> <Text>{intl.formatMessage({ id: 'contract.heji' })}: {intl.formatMessage({ id: 'common.money' })}{unApplyAmount}</Text>
</Space> </Space>
), ),
dataIndex: 'unApplyAmount', align: 'left', dataIndex: 'unApplyAmount', align: 'left',
...@@ -293,13 +293,13 @@ const Details = (props: any) => { ...@@ -293,13 +293,13 @@ const Details = (props: any) => {
) )
}, },
{ {
title: intl.formatMessage({id: 'contract.caozuo'}), dataIndex: 'type', align: 'left', title: intl.formatMessage({ id: 'contract.caozuo' }), dataIndex: 'type', align: 'left',
render: (text, record) => { render: (text, record) => {
// 已付款大于0或已请款待付款大于0的才显示查看付款明细按钮。 // 已付款大于0或已请款待付款大于0的才显示查看付款明细按钮。
return( return (
<div> <div>
<a onClick={() => getPayment(record)} className={style.gesture}>{intl.formatMessage({id: 'contract.zhakanfukuanmingxi'})}</a> <a onClick={() => getPayment(record)} className={style.gesture}>{intl.formatMessage({ id: 'contract.zhakanfukuanmingxi' })}</a>
</div> </div>
) )
// if (record.payAmount !== 0) { // if (record.payAmount !== 0) {
// node = // node =
...@@ -343,7 +343,7 @@ const Details = (props: any) => { ...@@ -343,7 +343,7 @@ const Details = (props: any) => {
} }
}; };
/* 查看付款明细回调 */ /* 查看付款明细回调 */
const setDrawerModal = () => { const setDrawerModal = () => {
setVisible(!visible) setVisible(!visible)
...@@ -420,37 +420,37 @@ const Details = (props: any) => { ...@@ -420,37 +420,37 @@ const Details = (props: any) => {
<div className='ant-card-head'> <div className='ant-card-head'>
<div className='ant-card-head-wrapper' style={{ display: 'flex', justifyContent: 'space-between' }}> <div className='ant-card-head-wrapper' style={{ display: 'flex', justifyContent: 'space-between' }}>
<div className='ant-card-head-wrapper'> <div className='ant-card-head-wrapper'>
{intl.formatMessage({id: 'contract.zhixingqingkuang'})} {intl.formatMessage({ id: 'contract.zhixingqingkuang' })}
</div> </div>
<div className={style.wrapper}> <div className={style.wrapper}>
<Input <Input
style={{ width: 240 ,marginRight:10}} style={{ width: 240, marginRight: 10 }}
placeholder={intl.formatMessage({id: 'contract.qingshurudanjuhao'})} placeholder={intl.formatMessage({ id: 'contract.qingshurudanjuhao' })}
allowClear allowClear
value={from.orderNo} value={from.orderNo}
onChange={(e)=>setvalue(e,'orderNo')} onChange={(e) => setvalue(e, 'orderNo')}
/> />
<Input <Input
style={{ width: 240 ,marginRight:10}} style={{ width: 240, marginRight: 10 }}
placeholder={intl.formatMessage({id: 'contract.qingshurudanzaiyao'})} placeholder={intl.formatMessage({ id: 'contract.qingshurudanzaiyao' })}
allowClear allowClear
value={from.orderAbstract} value={from.orderAbstract}
onChange={(e)=>setvalue(e,'orderAbstract')} onChange={(e) => setvalue(e, 'orderAbstract')}
/> />
<RangePicker <RangePicker
showTime={{ format: 'HH:mm' }} showTime={{ format: 'HH:mm' }}
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
onChange={onChange} onChange={onChange}
/> />
<Button type="primary" onClick={query}> <Button type="primary" onClick={query}>
{intl.formatMessage({id: 'contract.chaxun'})} {intl.formatMessage({ id: 'contract.chaxun' })}
</Button> </Button>
</div> </div>
</div> </div>
</div> </div>
<div className='ant-card-body'> <div className='ant-card-body'>
<Table <Table
rowKey='keyId' rowKey='keyId'
rowSelection={rowSelection} rowSelection={rowSelection}
......
src/pages/contract/coordination/details/index.tsx
View file @ 45dc73a8
...@@ -65,6 +65,7 @@ const Details = (props: any) => { ...@@ -65,6 +65,7 @@ const Details = (props: any) => {
const [basicData, setbasicData] = useState<any>({ const [basicData, setbasicData] = useState<any>({
invoiceProveVOList: [], invoiceProveVOList: [],
}) // 合同付款基本信息 }) // 合同付款基本信息
const [contractUrl, setcontractUrl] = useState('');
/* 获取详情的数据 */ /* 获取详情的数据 */
const getDetail = () => { const getDetail = () => {
getContractCoordinationGetDetail({ contractId }).then(res => { getContractCoordinationGetDetail({ contractId }).then(res => {
......
src/pages/contract/manage/details/index.tsx
View file @ 45dc73a8
...@@ -310,6 +310,7 @@ const Details = (props: any) => { ...@@ -310,6 +310,7 @@ const Details = (props: any) => {
window.open(res.data.url) window.open(res.data.url)
} }
} else { } else {
console.log(1111)
setIsModalVisible(!Visible) setIsModalVisible(!Visible)
} }
} }
...@@ -432,14 +433,14 @@ const Details = (props: any) => { ...@@ -432,14 +433,14 @@ const Details = (props: any) => {
<div className='ant-card-head'> <div className='ant-card-head'>
<div className='ant-card-head-wrapper'> <div className='ant-card-head-wrapper'>
<div className='ant-card-head-wrapper'> <div className='ant-card-head-wrapper'>
{intl.formatMessage({ id: 'contract.dianzihetong' })} {contractText.isUseElectronicContract ? intl.formatMessage({ id: 'contract.dianzihetong' }) : intl.formatMessage({ id: 'contract.zhizhihetong' })}
</div> </div>
</div> </div>
</div> </div>
<div className='ant-card-body'> <div className='ant-card-body'>
<div className={style.upload_item} style={{ width: 680 }}> <div className={style.upload_item} style={{ width: 680 }}>
<div className='ant-card-head-wrapper'> <div className='ant-card-head-wrapper'>
{intl.formatMessage({ id: 'contract.dianzihetong' })} {contractText.isUseElectronicContract ? intl.formatMessage({ id: 'contract.dianzihetong' }) : intl.formatMessage({ id: 'contract.zhizhihetong' })}
</div> </div>
<div className={style.upload_left} onClick={() => onDownload(contractText)} style={{ width: 600, cursor: 'pointer' }}> <div className={style.upload_left} onClick={() => onDownload(contractText)} style={{ width: 600, cursor: 'pointer' }}>
<FileWordFilled /> <FileWordFilled />
......
src/pages/contract/manage/editing/components/ContractText.tsx
View file @ 45dc73a8
...@@ -88,9 +88,10 @@ const ContractText = (props: any) => { ...@@ -88,9 +88,10 @@ const ContractText = (props: any) => {
// 上传回调 // 上传回调
const handleChange = ({ fileList }) => { const handleChange = ({ fileList }) => {
if (fileList[0].response) { if (fileList[0].response) {
console.log(fileList[0].name, fileList[0].response.data)
if (fileList[0].response.code === 1000) { if (fileList[0].response.code === 1000) {
Templatel.name = fileList[0].name Templatel.fileName = fileList[0].name
Templatel.fileUrl = fileList[0].response.data Templatel.contractUrl = fileList[0].response.data
setTemplatel({ ...Templatel }) setTemplatel({ ...Templatel })
} }
} }
......
src/pages/contract/manage/purchase/index.tsx
View file @ 45dc73a8
...@@ -23,7 +23,7 @@ const PurchaseList = () => { ...@@ -23,7 +23,7 @@ const PurchaseList = () => {
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据 const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
//表头 //表头
const columns: ColumnType<any>[] = [{ const columns: ColumnType<any>[] = [{
title: intl.formatMessage({id: 'contract.xuqiudanhaozhaiyao'}), title: intl.formatMessage({ id: 'contract.xuqiudanhaozhaiyao' }),
dataIndex: 'demandNO', dataIndex: 'demandNO',
align: 'left', align: 'left',
render: (text, record) => render: (text, record) =>
...@@ -37,7 +37,7 @@ const PurchaseList = () => { ...@@ -37,7 +37,7 @@ const PurchaseList = () => {
<p>{record.demandAbstract}</p> <p>{record.demandAbstract}</p>
</div> </div>
}, { }, {
title: intl.formatMessage({id: 'contract.xuqiufabushijian'}), title: intl.formatMessage({ id: 'contract.xuqiufabushijian' }),
dataIndex: 'demandPublishTime', dataIndex: 'demandPublishTime',
align: 'left', align: 'left',
sorter: { sorter: {
...@@ -45,12 +45,12 @@ const PurchaseList = () => { ...@@ -45,12 +45,12 @@ const PurchaseList = () => {
multiple: 1, multiple: 1,
}, },
}, { }, {
title: intl.formatMessage({id: 'contract.shoubiaohuiyuan'}), title: intl.formatMessage({ id: 'contract.shoubiaohuiyuan' }),
dataIndex: 'awardName', dataIndex: 'awardName',
align: 'left', align: 'left',
}, },
{ {
title: intl.formatMessage({id: 'contract.shoubiaoshijian'}), title: intl.formatMessage({ id: 'contract.shoubiaoshijian' }),
dataIndex: 'awardTime', dataIndex: 'awardTime',
align: 'left', align: 'left',
sorter: { sorter: {
...@@ -59,7 +59,7 @@ const PurchaseList = () => { ...@@ -59,7 +59,7 @@ const PurchaseList = () => {
}, },
}, },
{ {
title: intl.formatMessage({id: 'contract.shoubiaojine'}), title: intl.formatMessage({ id: 'contract.shoubiaojine' }),
dataIndex: 'awardAmount', dataIndex: 'awardAmount',
align: 'left', align: 'left',
sorter: { sorter: {
...@@ -75,7 +75,7 @@ const PurchaseList = () => { ...@@ -75,7 +75,7 @@ const PurchaseList = () => {
} }
}, },
{ {
title: intl.formatMessage({id: 'contract.waibuzhuangtai'}), title: intl.formatMessage({ id: 'contract.waibuzhuangtai' }),
dataIndex: 'outerStatus', dataIndex: 'outerStatus',
align: 'left', align: 'left',
...@@ -87,7 +87,7 @@ const PurchaseList = () => { ...@@ -87,7 +87,7 @@ const PurchaseList = () => {
} }
}, },
{ {
title: intl.formatMessage({id: 'contract.neibuzhuangtai'}), title: intl.formatMessage({ id: 'contract.neibuzhuangtai' }),
dataIndex: 'innerStatus', dataIndex: 'innerStatus',
align: 'left', align: 'left',
render: (text) => { render: (text) => {
...@@ -99,13 +99,13 @@ const PurchaseList = () => { ...@@ -99,13 +99,13 @@ const PurchaseList = () => {
) )
} }
}, { }, {
title: intl.formatMessage({id: 'contract.caozuo'}), title: intl.formatMessage({ id: 'contract.caozuo' }),
dataIndex: 'state', dataIndex: 'state',
align: 'left', align: 'left',
render: (_, record) => { render: (_, record) => {
return ( return (
<div> <div>
<span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => like(record)}>{intl.formatMessage({id: 'contract.chuangjiancaigouxunjiahetong'})}</span> <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => like(record)}>{intl.formatMessage({ id: 'contract.chuangjiancaigouxunjiahetong' })}</span>
</div> </div>
) )
} }
......
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