Commit caf2c415 authored by alwayOnlie's avatar alwayOnlie

修改bug

parent 6ebb871e
......@@ -254,10 +254,14 @@ const table = (props: any) => {
params.contractId = id;
return new Promise(resolve => {
PublicApi.getContractApplyAmountContractOrderPageList({ ...params }).then(res => {
res.data.data.findIndex((item, index) => {
item.orderTime = item.orderTime ? moment().format('YYYY-MM-DD') : '';
item.keyId = index + 1;
})
if (res.code == 1000) {
if (res.data.data) {
res.data.data.findIndex((item, index) => {
item.orderTime = item.orderTime ? moment().format('YYYY-MM-DD') : '';
item.keyId = index + 1;
})
}
}
resolve(res.data)
})
})
......
......@@ -129,6 +129,9 @@ const QueryList = () => {
{
record.outerStatus == 6 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => like(record)}>合同变更</span> : <span> </span>
}
{/* {
record.outerStatus == 9 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} >合同已到期</span> : <span> </span>
} */}
</div>
)
}
......
......@@ -12,7 +12,7 @@ const { Option } = Select;
const { Text } = Typography;
const FormList = (props: any) => {
const { currentRef, Row, sourceType } = props;
const { currentRef, Row, sourceType, onBadge } = props;
console.log(sourceType)
const refs = useRef({});
/* 显示模态框 */
......@@ -81,7 +81,7 @@ const FormList = (props: any) => {
}
console.log(sourceType)
console.log(parmas, '请求参数是啥')
fn(parmas).then(res => {
console.log(res);
if (res.code === 1000) {
......@@ -108,7 +108,7 @@ const FormList = (props: any) => {
associatedGoods: sourceType == '1' ? item.productAttributeJson : sourceType == '2' ? item.commodityName : ''// 关联品牌
}
})
console.log(data, '拉拉')
setData(data)
}
})
......@@ -358,6 +358,7 @@ const FormList = (props: any) => {
<Button block type='dashed'><PlusOutlined />选择采购物料</Button>
</div>
}
<Table
rowKey={'index'}
dataSource={dataList}
......
import React, { useRef, useState, useEffect, forwardRef } from 'react';
import { Button, Input, Select, DatePicker, Form, Drawer } from 'antd'
import { Button, Input, Select, DatePicker, Form, Drawer, message } from 'antd'
import {
LinkOutlined,
} from '@ant-design/icons'
......@@ -206,7 +206,7 @@ const Information = (props: any) => {
})
}).catch(error => {
if (error && error.errorFields) {
message.info('请输入基本资料必填内容')
}
})
})
......
......@@ -91,6 +91,7 @@ const Add: React.FC<{}> = (props: any) => {
/* 提交*/
const submit = async () => {
/* 基本信息 */
console.log('basicsVO', '拉拉')
const basicsVO = await currentBasic.current.get();
let totalAmount = 0;
if (basicsVO.data.sourceId == undefined || basicsVO.data.sourceId == '') {
......
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