Skip to content

J
jinfa-platform
Commit 2ce65571 authored by GuanHua's avatar GuanHua
Browse files
Options

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

parents 298e77f3 11b8ab10
Hide whitespace changes
Inline Side-by-side
Showing with 471 additions and 83 deletions
src/pages/authConfig/memberSystem/memberDetail.tsx
View file @ 2ce65571
......@@ -366,7 +366,7 @@ const MemberDetail: React.FC<{}> = () => {
rows: 4,
},
},
hasImAuth: {
imFlag: {
type: 'number',
title: '是否具有IM通讯权限',
'x-component': 'CheckboxSingle',
......
src/pages/channel/memberList/index.tsx
View file @ 2ce65571
......@@ -133,7 +133,7 @@ const ChannelMember: React.FC<{}> = () => {
name: {
type: 'Search',
"x-component-props": {
placeholder: '请输入角色名称'
placeholder: '请输入姓名'
}
}
}
......
src/pages/contract/components/detailCard/PaymentCard/index.tsx
View file @ 2ce65571
......@@ -15,6 +15,9 @@ export interface Iprops extends IAntdSchemaFormProps {
payPlanList: any,
basics: any,
contractId: any,
children?: React.ReactNode,
title?: string,
}
......@@ -23,8 +26,9 @@ const PaymentCard: React.FC<Iprops> = ({
payPlanList,
basics,
contractId,
children,
title
}) => {
console.log(IsShow, '1111111111111')
/* 非手工单进入请款 */
const like = (sourceType, item) => {
sessionStorage.setItem('basics', JSON.stringify(basics));
......@@ -35,7 +39,7 @@ const PaymentCard: React.FC<Iprops> = ({
<div className='ant-card-head'>
<div className='ant-card-head-wrapper'>
<div className='ant-card-head-wrapper'>
付款计划
{title ? title : '付款计划'}
</div>
</div>
</div>
......@@ -50,8 +54,9 @@ const PaymentCard: React.FC<Iprops> = ({
<div className={style.proportion}>{item.payRatio}%</div>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
<div className={style.Price}>¥{item.payAmount}</div>
{/* IsShow && <div onClick={() => like(1, item)} style={{ cursor: 'pointer', fontSize: 12, backgroundColor: '#00B37A', color: '#fff', padding: '4px 8px' }}>请款</div> */}
{
!IsShow && <div onClick={() => like(1, item)} style={{ cursor: 'pointer', fontSize: 12, backgroundColor: '#00B37A', color: '#fff', padding: '4px 8px' }}>请款</div>
children
}
</div>
<div className={style.warp_List}>
......
src/pages/contract/coordination/details/components/Popup.tsx 0 → 100644
View file @ 2ce65571
/* 查看付款明细弹出 */
import React, { useRef, useState } from 'react';
import {
Button,
Drawer,
Space,
Typography,
Table,
} from 'antd';
import { IAntdSchemaFormProps } from '@formily/antd'
import { StandardTable } from 'god';
import style from '../index.less'
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
export interface Iprops extends IAntdSchemaFormProps {
popupshow: any,
basicInfo?: any,
setDrawerModal: Function
}
const { Text } = Typography;
const PopupDrawer: React.FC<Iprops> = ({
popupshow,
basicInfo,
setDrawerModal
}) => {
console.log(popupshow)
const ref = useRef<any>({});
const columns: ColumnType<any>[] = [{
title: '单据号/摘要',
dataIndex: 'applyNo',
align: 'left',
render: (text: any, record: any) => {
return (
<div>
<EyePreview
url={`/memberCenter/contract/funds/levelpayment/details?applyId=${record.id}&type=PageToBeExamineOne`}
>
{text}
</EyePreview>
<p>{record.applyAbstract}</p>
</div>
);
},
}, {
title: '单据类型',
dataIndex: 'orderTime',
align: 'left',
}, {
title: '单据时间',
dataIndex: 'payeeMemberName',
align: 'left',
},
{
title: '单据状态',
dataIndex: 'payeeMemberName',
align: 'left',
},
{
dataIndex: 'contractNo',
title: (
<Space direction='vertical'>
<Text>单据金额</Text>
<Text>合计: ￥9999</Text>
</Space>
),
},
{
title: '含税/税率',
dataIndex: 'payeeMemberName',
align: 'left'
},
{
dataIndex: 'contractNo',
align: 'left',
title: (
<Space direction='vertical'>
<Text>付款金额</Text>
<Text>合计: ￥9999</Text>
</Space>
),
},
]
// 模拟请求
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
return new Promise((resolve, reject) => {
// PublicApi.getContractApplyAmountPageToBeExamineOne({
// ...params,
// }).then(res => {
resolve([])
// })
})
}
return (
<Drawer
visible={popupshow}
onClose={() => setDrawerModal()}
title="合同付款详情"
width={900}
footer={
<div
style={{
textAlign: 'right',
}}
>
<Button onClick={() => setDrawerModal()} style={{ marginRight: 8 }}>
取消
</Button>
<Button type="primary" onClick={() => setDrawerModal()} >
确定
</Button>
</div>
}
destroyOnClose
>
<div className={style.PopupTitle}>基本信息</div>
<div className={style.menu}>
<div className={style.memuItem}>
<div className={style.menuCard}>
<div className={style.menulabel}>收款账户：</div>
<div className={style.card}>广州白马皮具交易中心</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>银行账号：</div>
<div className={style.card}>622202 110868 11424 45</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>开户行：</div>
<div className={style.card}>中国建设银行广州市分行营业部</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>付款阶段：</div>
<div className={style.card}>合同中期款</div>
</div>
</div>
<div className={style.memuItem}>
<div className={style.menuCard}>
<div className={style.menulabel}>付款金额：</div>
<div className={style.card}>¥ 36.000.00</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>付款时间：</div>
<div className={style.card}>2020-08-25 08:58</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>付款方式：</div>
<div className={style.card}>账期：30天</div>
</div>
</div>
<div className={style.memuItem}>
<div className={style.menuCard}>
<div className={style.menulabel}>支付方式：</div>
<div className={style.card}>线下支付方式：线下支付线上确认</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>发票编号：</div>
<div className={style.card}>40122826</div>
</div>
<div className={style.menuCard}>
<div className={style.menulabel}>开票日期：</div>
<div className={style.card}>2020-08-25</div>
</div>
</div>
</div>
<div className={style.PopupTitle}>付款明细</div>
<Table
rowKey="id"
style={{
width: "100%"
}}
pagination={false}
columns={columns}
// fetchTableData={(params: any) => fetchData(params)}
/>
</Drawer>
)
}
PopupDrawer.defaultProps = {
popupshow: false,
basicInfo: {},
}
export default PopupDrawer;
src/pages/contract/coordination/details/index.css
View file @ 2ce65571
......@@ -189,3 +189,47 @@
font-weight: 400;
color: #303133;
}
/**付款明细弹出样式*/
.PopupTitle {
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #909399;
position: relative;
}
.PopupTitle::before {
content: '';
position: absolute;
background-color: #00B37A;
width: 4px;
height: 17px;
left: -8px;
}
.menu {
display: flex;
justify-content: space-between;
margin-bottom: 20px;
}
.menu .memuItem .menuCard {
display: flex;
align-items: center;
height: 30px;
}
.menu .memuItem .menuCard .menulabel {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
}
.menu .memuItem .menuCard .card {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #303133;
}
.nowrap {
width: 400px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
src/pages/contract/coordination/details/index.less
View file @ 2ce65571
......@@ -217,3 +217,51 @@
}
}
}
/**付款明细弹出样式*/
.PopupTitle{
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #909399;
position: relative;
}
.PopupTitle::before{
content: '';
position: absolute;
background-color: #00B37A;
width: 4px;
height: 17px;
left: -8px;
}
.menu{
display: flex;
justify-content: space-between;
margin-bottom: 20px;
.memuItem{
.menuCard{
display: flex;
align-items: center;
height: 30px;
.menulabel{
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
}
.card{
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #303133;
}
}
}
}
.nowrap{
width: 400px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
src/pages/contract/coordination/details/index.tsx
View file @ 2ce65571
......@@ -14,13 +14,12 @@ import CirculationList from './circulationList'
import DetailedList from './detailedList'
import SituationList from './situationList'
import { Download } from '../../constants/utils'
import PopupDrawer from './components/Popup'
import {
FileWordFilled
} from '@ant-design/icons'
const { Link } = Anchor;
const activeAnchorClassName = 'ant-anchor-link-active'
const Details = (props: any) => {
const [form] = Form.useForm();
const [Visible, setIsModalVisible] = useState<boolean>(false)
......@@ -49,20 +48,17 @@ const Details = (props: any) => {
* @param payPlanList 付款计划
* @param contractText 合同文档
*/
const [outerTaskStepList, setouterTaskStepList] = useState<any>([])
const [innerTaskStepList, setinnerTaskStepList] = useState<any>([])
const [ListData, setListData] = useState<any>([])
const [payPlanList, setpayPlanList] = useState<any>([])
const [contractText, setcontractText] = useState<any>([])
const [signatureLogId, setsignatureLogId] = useState<any>('') // 签署地址id
const [state, setstate] = useState<any>(false);
const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined);
const [contractAbstract, setcontractAbstract] = useState('');
const [tabPane, settabPane] = useState([])
const [Popup, setPopup] = useState<any>(false);
/* 获取详情的数据 */
const getDetail = () => {
PublicApi.getContractCoordinationGetDetail({ contractId }).then(res => {
......@@ -121,26 +117,27 @@ const Details = (props: any) => {
tab.push(
{ id: 'process', title: '基本流程' },
{ id: 'docking', title: '执行情况' },
{ id: 'conditions', title: '付款计划' },
{ id: 'record', title: '请款统计' },
{ id: 'conditions', title: '付款统计' },
)
} else {
// { id: 'conditions', title: '付款计划' },
tab.push(
{ id: 'progress', title: '流转进度' },
{ id: 'process', title: '基本流程' },
{ id: 'materials', title: '采购材料' },
{ id: 'conditions', title: '付款计划' },
{ id: 'docking', title: '电子合同' },
{ id: 'record', title: '流转记录' },
)
}
console.log(type, '1231', tab)
settabPane(tab)
setTargetOffset(window.innerHeight / tab.length);
getDetail()
}, []);
/* 查看付款明细回调 */
const setDrawerModal = () => {
console.log(131312);
setPopup(!Popup)
}
const handleAnchorClick = (e) => {
e.preventDefault()
}
......@@ -321,7 +318,7 @@ const Details = (props: any) => {
</div>
{
type &&
type != 'implement' &&
<div className="btn" style={{ marginRight: "20px" }}>
<Button type="primary" onClick={() => submitExamine()}>{type === 'Sign' ? '签订合同' : '审核'}</Button>
</div>
......@@ -342,8 +339,24 @@ const Details = (props: any) => {
}
{/* 付款计划 */}
{
type != 'implement' &&
<PaymentCard IsShow={true} payPlanList={payPlanList} basics={basicInfo} contractId={contractId} />
type == 'implement' &&
<PaymentCard
children={
<span style={{
color: '#00B37A',
background: '#F4F5F7',
display: 'inline-block',
padding: '5px',
borderRadius: 5,
cursor: 'pointer'
}}
onClick={setDrawerModal}
>查看详情</span>}
title="付款统计"
payPlanList={payPlanList}
basics={basicInfo}
contractId={contractId}
/>
}
{/* 交易条件 */}
{
......@@ -371,10 +384,9 @@ const Details = (props: any) => {
}
{/* 流转记录 */}
{
type != 'implement' ? <CirculationList contractId={contractId} /> : <DetailedList contractId={contractId} />
type != 'implement' ? <CirculationList contractId={contractId} /> : null
// <DetailedList contractId={contractId} />
}
{/* 请款统计 */}
</div>
{/* 提交审核 */}
<Modal footer={null} title={type == 'Sign' ? '签订合同' : '提交审核'} visible={Visible} onOk={() => setIsModalVisible(!Visible)} onCancel={() => setIsModalVisible(!Visible)}>
......@@ -418,6 +430,9 @@ const Details = (props: any) => {
</div>
</Form>
</Modal>
{/* 查看付款计划明细弹出组建 */}
{/* Popup */}
<PopupDrawer popupshow={Popup} basicInfo={basicInfo} setDrawerModal={setDrawerModal} />
</div>
)
}
......
src/pages/contract/coordination/details/purchaseList.tsx
View file @ 2ce65571
......@@ -87,7 +87,7 @@ const purchaseList: React.FC<Iprops> = ({
</div>
<div className={style.text}>
<p>商品编号：{record.associatedMaterielNo}</p>
<p>商品名称：{record.associatedGoods}</p>
<p className={style.nowrap}>商品名称：{record.associatedGoods}</p>
</div>
<div className={style.text}>
<p>规格型号：{record.associatedType}</p>
......@@ -206,7 +206,7 @@ const purchaseList: React.FC<Iprops> = ({
<div className='ant-card-head-wrapper'>
<div className='ant-card-head-wrapper'>
采购材料
</div>
</div>
</div>
</div>
<div className='ant-card-body' >
......
src/pages/contract/coordination/details/situationList.tsx
View file @ 2ce65571
......@@ -195,9 +195,10 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
startTime: "",
endTime: "",
current: current,
pageSize: size,
pageSize: pageSize,
}
console.log(data)
setSize(pageSize)
console.log(data, pageSize, current)
getContracInfoList(data)
};
return (
......@@ -206,7 +207,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
<div className='ant-card-head-wrapper' style={{ display: 'flex', justifyContent: 'space-between' }}>
<div className='ant-card-head-wrapper'>
执行情况
</div>
</div>
<div className={style.wrapper}>
<Input.Search
style={{ width: 240 }}
......@@ -227,6 +228,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
loading={listLoading}
pagination={
{
pageSize: size,
total,
onChange: handlePaginationChange
......
src/pages/contract/coordination/pageToBeSubmitExamine/index.tsx
View file @ 2ce65571
......@@ -69,7 +69,7 @@ const pageToBeSubmitExamine = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
{
......
src/pages/contract/manage/add/components/fromtable.tsx
View file @ 2ce65571
import React, { useRef, useState, useEffect, useImperativeHandle, forwardRef } from 'react';
import { Button, Card, Tabs, Table, Input, Select, DatePicker, Popconfirm, Form, Checkbox, Drawer, Typography, Modal, InputNumber } from 'antd'
import React, { useState, useEffect, forwardRef } from 'react';
import { Button, Table, Input, Select, DatePicker, InputNumber } from 'antd'
import {
PlusOutlined
} from '@ant-design/icons'
import styles from '../index.less'
const { TextArea, Search } = Input
const { TextArea } = Input
const { Option } = Select;
import moment from 'moment';
const FormList = (props: any) => {
console.log(props)
const { fromData, currentRef, fetchdata } = props;
const [payNumArr, setpayNumArr] = useState<any>([1,])
const [options, setoptions] = useState<any>([
{
value: 1,
disabled: true
}
])
const [id, setId] = useState<any>(''); // 记录上次的id
const [PlanList, setPlanList] = useState<any>([
{
payNum: '1',
......@@ -22,21 +29,15 @@ const FormList = (props: any) => {
payWay: '1',
payParam: '',
id: 0,
rowId: 1,
},
]);
/* 显示模态框 */
const tabcolumns: any = [
{
title: '付款次数', dataIndex: 'payNum', align: 'center',
render: (_, item, index) => {
const options = [];
for (let i = 0; i < PlanList.length; i++) {
let Index = payNumArr.indexOf(i + 1);
options.push({
value: i + 1,
disabled: Index == -1 ? false : true
});
}
return (
<Select
style={{ width: 200 }}
......@@ -125,6 +126,7 @@ const FormList = (props: any) => {
render: (_, item, index) => <a onClick={() => Delete(item, index)}>删除</a>,
},
];
/* 添加 */
const addtable = () => {
const data = [...PlanList];
......@@ -138,35 +140,48 @@ const FormList = (props: any) => {
payWay: '1',
payParam: '',
id: 0,
rowId: data.length + 1,
},
)
console.log(data)
let optionsData = [];
data.map((item, index) => {
console.log(item.payNum, index + 1)
optionsData.push({
value: index + 1,
disabled: item.payNum ? true : false,
})
})
console.log(optionsData, 'optionsDataadd', options)
setPlanList(data)
setoptions(optionsData)
};
/* 删除 */
const Delete = (elm, idx) => {
const dataSource = [...PlanList];
const arr = [...payNumArr]
let List = dataSource.filter((item, index) => index !== idx);
let numberArr = arr.filter((item, index) => elm.payNum !== item);
console.log(numberArr);
setpayNumArr(numberArr)
setPlanList(List)
let optionsData = options.map((keys => {
if (elm.payNum == keys.value) {
keys.disabled = false;
}
return {
...keys
}
}))
console.log(optionsData, 'del')
setoptions(optionsData)
};
/* 选中设置值 */
const onSelectChange = (e, name, idx) => {
let item = [...PlanList];
let NumArr = [...payNumArr]
console.log(e, name, idx, item);
// return;
switch (name) {
case 'payWay':
item[idx].payWay = e;
break;
case 'payNum':
item[idx].payNum = e;
NumArr.push(e);
setId(e);
break;
case 'expectPayTime':
item[idx].expectPayTime = moment(e).format('YYYY-MM-DD HH:mm:ss');
......@@ -184,8 +199,30 @@ const FormList = (props: any) => {
item[idx].payParam = e;
break;
}
NumArr = Array.from(new Set(NumArr))
setpayNumArr(NumArr)
let optionsData = [];
if (id) {
optionsData = options.map((keys => {
if (id == keys.value) {
keys.disabled = false;
}
if (keys.value == e) {
keys.disabled = true;
}
return {
...keys
}
}))
} else {
optionsData = options.map((keys => {
if (keys.value == e) {
keys.disabled = true;
}
return {
...keys
}
}))
}
setoptions(optionsData)
setPlanList(item)
}
useEffect(() => {
......@@ -209,7 +246,7 @@ const FormList = (props: any) => {
<Table
columns={tabcolumns}
dataSource={PlanList}
rowKey="id"
rowKey="rowId"
style={{
width: "100%"
}}
......
src/pages/contract/manage/details/index.css
View file @ 2ce65571
......@@ -161,3 +161,9 @@
margin-left: 19px;
color: #c0c4cc;
}
.nowrap {
width: 400px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
src/pages/contract/manage/details/index.less
View file @ 2ce65571
......@@ -182,3 +182,9 @@
.nowrap{
width: 400px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
src/pages/contract/manage/details/index.tsx
View file @ 2ce65571
......@@ -284,7 +284,7 @@ const Details = (props: any) => {
</div>
<div className={style.text}>
<p>商品编号：{record.associatedMaterielNo}</p>
<p>商品名称：{record.associatedMaterielName}</p>
<p className={style.nowrap}>商品名称：{record.associatedGoods}</p>
</div>
<div className={style.text}>
<p>规格型号：{record.associatedType}</p>
......
src/pages/contract/manage/editing/components/FormList.tsx
View file @ 2ce65571
......@@ -163,9 +163,9 @@ const FormList = (props: any) => {
associatedGoods: item.associatedGoods ? item.associatedGoods : '',
associatedDataId: item.associatedDataId ? item.associatedDataId : '',
associatedMaterielNo: item.associatedMaterielNo ? item.associatedMaterielNo : '',
associatedType: item.type ? item.type : '',
associatedCategory: item.customerCategory != null ? item.customerCategory.name : '',
associatedBrand: item.brand != null ? item.brand.name : '',
associatedType: item.associatedType ? item.associatedType : '',
associatedCategory: item.associatedCategory ? item.associatedCategory : '',
associatedBrand: item.associatedBrand ? item.associatedBrand : '',
})
})
resolve({
......
src/pages/contract/manage/editing/components/fromtable.tsx
View file @ 2ce65571
......@@ -129,6 +129,7 @@ const FormList = (props: any) => {
payWay: '1',
payParam: '1',
id: 0,
rowId: data.length + 1,
},
)
console.log(data)
......@@ -147,9 +148,10 @@ const FormList = (props: any) => {
/* 选中设置值 */
const onSelectChange = (e, name, idx) => {
console.log(e, name, idx)
let item = [...PlanList];
let NumArr = [...payNumArr]
console.log(e, name, idx, item);
console.log(item, '哈哈');
// return;
switch (name) {
case 'payWay':
......@@ -204,7 +206,7 @@ const FormList = (props: any) => {
<Table
columns={tabcolumns}
dataSource={PlanList}
rowKey="id"
rowKey="rowId"
style={{
width: "100%"
}}
......
src/pages/transaction/components/TableModal/index.tsx
View file @ 2ce65571
......@@ -137,6 +137,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
{...otherProps}
>
<StandardTable
keepAlive={false}
columns={columns}
tableProps={{
...tableProps,
......
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/addForm.tsx
View file @ 2ce65571
......@@ -33,6 +33,7 @@ const AddQuotes: React.FC<parmas> = (props) => {
PublicApi.getTransactionProductQuotationDetails({ id }).then(res => {
if (res.code === 1000) {
setEditData(res.data);
console.log(res.data, 123)
setInquiryLNo({
orderNo: res.data.inquiryListNo,
orderId: res.data.inquiryListId
......
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/basicInfo.tsx
View file @ 2ce65571
......@@ -115,7 +115,7 @@ const BasicInfo: React.FC<queryProps> = (props) => {
details: editData.details
})
setinquiryNo({
orderId: editData.id,
orderId: editData.inquiryListId || editData.id ,
orderNo: editData.inquiryListNo
});
}
......
src/pages/transaction/purchaseAbility/components/modalOperate/index.tsx
View file @ 2ce65571
......@@ -256,6 +256,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
case 'audit':
return 'auditOpinion';
case 'planAudit':
case 'billBack':
return 'cause'
default:
return 'reason'
......
src/pages/transaction/purchaseAbility/demandPlan/demandPlanAdded/components/material.tsx
View file @ 2ce65571
......@@ -62,7 +62,6 @@ const Material: React.FC<Materialprops> = (props: any) => {
<Form.Item
style={{ marginBottom: 0 }}
name={`needCount${index}`}
initialValue={text}
rules={[
{
required: true,
......@@ -102,7 +101,7 @@ const Material: React.FC<Materialprops> = (props: any) => {
<Form.Item
style={{ marginBottom: 0 }}
name={`arriveTime${index}`}
initialValue={text && moment(text)}
rules={[{ required: true, message: '请选择到货日期', }]}
>
<DatePicker
style={{ width: '100%' }}
......@@ -141,7 +140,12 @@ const Material: React.FC<Materialprops> = (props: any) => {
const handleArriveTime = (val, index) => {
const data = [...dataSource];
data[index].arriveTime = val.format('x');
if (val) {
console.log(val)
data[index].arriveTime = val.format('x');
} else {
data[index].arriveTime = undefined
}
setDataSource(data)
}
......@@ -157,8 +161,8 @@ const Material: React.FC<Materialprops> = (props: any) => {
number: item.code,
name: item.name,
model: item.type,
category: !isEmpty(item.customerCategory) && item.customerCategory.name,
brand: !isEmpty(item.brand) && item.brand.name,
category: !isEmpty(item.customerCategory) ? item.customerCategory.name : null,
brand: !isEmpty(item.brand) ? item.brand.name : null,
unit: item.unitName,
needCount: item.needCount ? item.needCount : null,
costPrice: item.costPrice,
......@@ -180,10 +184,12 @@ const Material: React.FC<Materialprops> = (props: any) => {
const data = [...dataSource];
data.splice(index, 1);
message.success('删除成功')
form.resetFields();
data.forEach((item, index) => {
console.log(moment(Number(item.arriveTime)))
form.setFieldsValue({
[`needCount${index}`]: item.needCount ? item.needCount : undefined,
[`arriveTime${index}`]: item.arriveTime ? moment(item.arriveTime) : undefined,
[`arriveTime${index}`]: item.arriveTime ? moment(Number(item.arriveTime)) : undefined,
})
})
setDataSource(data)
......@@ -197,6 +203,7 @@ const Material: React.FC<Materialprops> = (props: any) => {
state: true,
name: 'material',
data: {
addType: _res.addType,
details: dataSource,
},
})
......@@ -214,6 +221,13 @@ const Material: React.FC<Materialprops> = (props: any) => {
/**编辑回显数据 */
if (!isEmpty(fetchdata.details)) {
const data = [...fetchdata.details];
form.resetFields();
data.forEach((item, index) => {
form.setFieldsValue({
[`needCount${index}`]: item.needCount ? item.needCount : undefined,
[`arriveTime${index}`]: item.arriveTime ? moment(item.arriveTime) : undefined,
})
})
setDataSource([...data])
}
}, [fetchdata.details])
......@@ -222,12 +236,13 @@ const Material: React.FC<Materialprops> = (props: any) => {
<Form {...layout} form={form}>
<Form.Item
label='添加方式'
name='materielMode'
name='addType'
rules={[{ required: true, message: '请选择添加方式' }]}
initialValue={1}
>
<Radio.Group>
<Radio value={1}>选择货品生成</Radio>
<Radio value={2}>导入计划采购物料</Radio>
{/* <Radio value={2}>导入计划采购物料</Radio> */}
</Radio.Group>
</Form.Item>
<Button
......
src/pages/transaction/purchaseAbility/demandPlan/detail/index.tsx
View file @ 2ce65571
......@@ -68,7 +68,7 @@ const DemandDetailed = () => {
const params = {
id,
}
await PublicApi.getPurchaseNeedPlanDetails({ ...params }).then(res => {
await PublicApi.getPurchaseNeedPlanDetails({ ...params }).then((res: any) => {
if (res.code !== 1000) {
history.goBack();
return;
......@@ -92,6 +92,7 @@ const DemandDetailed = () => {
createRoleId: item.needPlanId,
createTime: item.operateTime,
department: item.department,
stateName: item.status,
id: item.id,
memberId: null,
memberRoleId: null,
......
src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/components/basic.tsx
View file @ 2ce65571
......@@ -226,6 +226,10 @@ const BasicInfo: React.FC<Iprops> = (props: any) => {
<Input maxLength={60} placeholder='最长60个字符，30个汉字' />
</Form.Item>
<Form.Item
rules={[
{ required: true, message: '请添加适用地市' },
]}
required
label={<Tooltip placement="right" title='设置了归属地市后，此商品可根据地市进行筛选，未设置时默认为所有地市'>适用地市<QuestionCircleOutlined style={{ marginLeft: '5px' }} /></Tooltip>}
style={{ marginBottom: '0' }}
>
......
src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/components/bidRequirement.tsx
View file @ 2ce65571
......@@ -147,7 +147,7 @@ const BidRequirement: React.FC<Iprops> = (props: any) => {
label="报名要求"
name="demand"
rules={[
{ required: true, message: '请输入报名要求' },
// { required: true, message: '请输入报名要求' },
{
validator: (r, v) => validatorByte(v, 200)
}
......@@ -158,7 +158,7 @@ const BidRequirement: React.FC<Iprops> = (props: any) => {
<Form.Item
label="报名要求附件"
name="demandUrls"
rules={[{ required: true, message: '请上传报名要求附件' }]}
// rules={[{ required: true, message: '请上传报名要求附件' }]}
>
<div className={styles.upload_data}>
{files.length > 0 && files.map((v, index) => (
......
src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/components/condition.tsx
View file @ 2ce65571
......@@ -145,7 +145,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
label="报价要求"
name="offer"
rules={[
{ required: true, message: '请输入报价要求' },
// { required: true, message: '请输入报价要求' },
{
validator: (r, v) => validatorByte(v, 100)
}
......@@ -157,7 +157,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
label="付款方式"
name="paymentType"
rules={[
{ required: true, message: '请输入付款方式' },
// { required: true, message: '请输入付款方式' },
{
validator: (r, v) => validatorByte(v, 100)
}
......@@ -169,7 +169,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
label="税费要求"
name="taxes"
rules={[
{ required: true, message: '请输入税费要求' },
// { required: true, message: '请输入税费要求' },
{
validator: (r, v) => validatorByte(v, 100)
}
......@@ -181,7 +181,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
label="物流要求"
name="logistics"
rules={[
{ required: true, message: '请输入物流要求' },
// { required: true, message: '请输入物流要求' },
{
validator: (r, v) => validatorByte(v, 100)
}
......@@ -193,7 +193,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
label="包装要求"
name="packRequire"
rules={[
{ required: true, message: '请输入包装要求' },
// { required: true, message: '请输入包装要求' },
{
validator: (r, v) => validatorByte(v, 100)
}
......@@ -205,7 +205,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
label="其他要求"
name="otherRequire"
rules={[
{ required: true, message: '请输入其他要求' },
// { required: true, message: '请输入其他要求' },
{
validator: (r, v) => validatorByte(v, 100)
}
......
src/pages/transaction/purchaseAbility/purchaseBid/validator/index.ts
View file @ 2ce65571
export const validatorByte = (value: any, limitNumber: number) => {
let _str = value;
_str = _str.replace(/[\u4E00-\u9FA5]/g, "AA");
_str = _str ? _str.replace(/[\u4E00-\u9FA5]/g, "AA") : '';
if (_str.length > limitNumber) {
return Promise.reject(new Error(`最长${limitNumber}个字符，${limitNumber/2}个汉字`));
} else {
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/demand.tsx
View file @ 2ce65571
......@@ -182,6 +182,7 @@ const Demand: React.FC<Iprops> = (props: any) => {
type: 2,
})
})
form.setFieldsValue({ "rowCol": data })
setRowCtl(data);
}
}
......@@ -240,6 +241,7 @@ const Demand: React.FC<Iprops> = (props: any) => {
setValue(fetchdata.type);
fetchdata.shopIds && handleStoreIds(fetchdata.shopIds);
fetchdata.demandMembers && setRowCtl([...fetchdata.demandMembers]);
fetchdata.demandMembers && form.setFieldsValue({ "rowCol": fetchdata.demandMembers })
}
}, [fetchdata])
......@@ -296,7 +298,7 @@ const Demand: React.FC<Iprops> = (props: any) => {
)}
{value === 3
&& (
<Form.Item noStyle>
<Form.Item wrapperCol={{ span: 24 }} name="rowCol" rules={[{ required: true, message: "请选择会员" }]}>
<Button
type='dashed'
block
......
src/pages/transaction/purchaseAbility/purchasePlan/demand/index.tsx
View file @ 2ce65571
......@@ -66,7 +66,7 @@ const DemandDetailed = () => {
const params = {
id,
}
await PublicApi.getPurchaseNeedPlanDetails({ ...params }).then(res => {
await PublicApi.getPurchaseNeedPlanDetails({ ...params }).then((res: any) => {
if (res.code !== 1000) {
history.goBack();
return;
......@@ -90,11 +90,12 @@ const DemandDetailed = () => {
createRoleId: item.needPlanId,
createTime: item.operateTime,
department: item.department,
stateName: item.status,
id: item.id,
memberId: null,
memberRoleId: null,
operation: item.operate,
position: '',
position: item.jobTitle,
purchaseInquiryId: null,
roleName: item.operator,
state: item.step + 1,
......
src/pages/transaction/purchaseAbility/purchasePlan/detail/index.tsx
View file @ 2ce65571
......@@ -136,14 +136,15 @@ const PurchasePlanDetailed = () => {
createRoleId: item.needPlanId,
createTime: item.operateTime,
department: item.department,
stateName: item.status,
id: item.id,
memberId: null,
memberRoleId: null,
operation: item.operate,
position: '',
position: item.jobTitle,
purchaseInquiryId: null,
roleName: item.operator,
state: item.status,
state: item.step + 1,
step: item.step,
})
})
......
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