Skip to content

J
jinfa-platform
Commit cdcd0bda authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

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

parents 91735f79 e1f3c630
Hide whitespace changes
Inline Side-by-side
Showing with 1143 additions and 244 deletions
config/routes/memberRoute.ts
View file @ cdcd0bda
......@@ -98,6 +98,20 @@ const MemberRoute: RouterChild = {
component: '@/pages/member/memberMaintain/detailed/sincerityInfo',
hideInMenu: true,
},
// 会员信息-详情-档案信息
{
path: '/memberCenter/memberAbility/manage/maintain/detail/archiveInfo',
name: 'archiveInfo',
component: '@/pages/member/memberMaintain/detailed/archiveInfo',
hideInMenu: true,
},
// 会员信息-详情-变更信息
{
path: '/memberCenter/memberAbility/manage/maintain/detail/changedInfo',
name: 'changedInfo',
component: '@/pages/member/memberMaintain/detailed/changedInfo',
hideInMenu: true,
},
],
},
// 会员信息-冻结
......@@ -402,6 +416,20 @@ const MemberRoute: RouterChild = {
component: '@/pages/member/memberQuery/detailed/sincerityInfo',
hideInMenu: true,
},
// 会员信息查询-详情-档案信息
{
path: '/memberCenter/memberAbility/profile/query/detail/archiveInfo',
name: 'archiveInfo',
component: '@/pages/member/memberQuery/detailed/archiveInfo',
hideInMenu: true,
},
// 会员信息查询-详情-变更信息
{
path: '/memberCenter/memberAbility/profile/query/detail/changedInfo',
name: 'changedInfo',
component: '@/pages/member/memberQuery/detailed/changedInfo',
hideInMenu: true,
},
],
},
// 新增会员角色
......
src/components/NiceForm/components/DateSelect.tsx
View file @ cdcd0bda
......@@ -18,7 +18,9 @@ const getPrevTime = (num, flag) => {
const DateSelect = (props) => {
const { value, mutators } = props
const todayStartTime = moment().startOf('day').format('x')
const nowTime = moment().format('x').valueOf()
// const nowTime = moment().format('x').valueOf()
/** 当天的23:59:59 */
const nowTime = moment().endOf('day').valueOf()
const dateMemo = useMemo(() => [
{ label: '今天', value: `${todayStartTime},${nowTime}`},
{ label: '一周内', value: `${getPrevTime(1, 'week')},${nowTime}`},
......@@ -28,8 +30,8 @@ const DateSelect = (props) => {
{ label: '一年内', value: `${getPrevTime(1, 'year')},${nowTime}`},
{ label: '一年前', value: `0,${getPrevTime(1, 'year')}`},
], [])
const handleChange = (e) => {
mutators.change(e ? e.split(',') : '');
}
......@@ -37,7 +39,7 @@ const DateSelect = (props) => {
const val = !value || !value.length ? undefined : value.join();
return (
<Select
<Select
style={{minWidth: 160}}
placeholder={placeholder}
onChange={handleChange}
......@@ -52,4 +54,4 @@ DateSelect.defaultProps = {}
DateSelect.isFieldComponent = true;
export default DateSelect
\ No newline at end of file
export default DateSelect
src/components/PolymericTable/interface.d.ts
View file @ cdcd0bda
......@@ -37,7 +37,7 @@ export interface EditableRowProps extends React.HTMLAttributes<HTMLElement> {
onFieldsChange?: (changedFields: ChangedFieldsItem[]) => void,
}
interface EditableColumns extends ColumnType<any> {
interface EditableColumns<T = any> extends ColumnType<T> {
dataIndex?: string | number;
editable?: boolean;
rules?: Array<any>;
......
src/global/styles/reset.less
View file @ cdcd0bda
......@@ -293,4 +293,4 @@
> label.ant-form-item-required::before {
order: 10;
margin-left: -6px;
}
\ No newline at end of file
}
src/locales/zh-CN/menu.ts
View file @ cdcd0bda
......@@ -123,6 +123,8 @@ export default {
'menu.memberAbility.memberManage.maintainDetail.levelInfo': '会员等级信息',
'menu.memberAbility.memberManage.maintainDetail.equityInfo': '权益信息',
'menu.memberAbility.memberManage.maintainDetail.sincerityInfo': '诚信信息',
'menu.memberAbility.memberManage.maintainDetail.archiveInfo': '档案信息',
'menu.memberAbility.memberManage.maintainDetail.changedInfo': '变更信息',
'menu.memberAbility.memberManage.maintainFreeze': '会员冻结',
'menu.memberAbility.memberManage.maintainUnfreeze': '会员解除',
'menu.memberAbility.memberManage.maintainEliminate': '解除关系',
......@@ -133,6 +135,8 @@ export default {
'menu.memberAbility.memberProfile.memberQueryDetail.levelInfo': '会员等级信息',
'menu.memberAbility.memberProfile.memberQueryDetail.equityInfo': '权益信息',
'menu.memberAbility.memberProfile.memberQueryDetail.sincerityInfo': '诚信信息',
'menu.memberAbility.memberProfile.memberQueryDetail.archiveInfo': '档案信息',
'menu.memberAbility.memberProfile.memberQueryDetail.changedInfo': '变更信息',
'menu.memberAbility.memberProfile.memberUpdate': '修改注册信息',
'menu.memberAbility.memberProfile.addSubRole': '新建会员角色',
'menu.memberAbility.memberProfile.modifyMember': '变更会员信息',
......
src/pages/member/components/MemberDocCategory/index.tsx
View file @ cdcd0bda
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-21 16:10:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-21 17:52:37
* @LastEditTime: 2021-06-11 15:56:24
* @Description: 会员分类信息
*/
import React from 'react';
......@@ -105,7 +105,6 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
),
columnProps: {
span: 3,
style: { paddingBottom: 0 },
},
},
];
......@@ -113,9 +112,6 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
<CustomizeColumn
title="分类信息"
data={data}
bodyStyle={{
paddingBottom: 0,
}}
{...rest}
/>
);
......
src/pages/member/components/MemberDocInspection/index.tsx
View file @ cdcd0bda
......@@ -2,71 +2,127 @@
* @Author: XieZhiXiong
* @Date: 2021-05-21 17:53:43
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-21 18:07:16
* @LastEditTime: 2021-06-11 16:27:07
* @Description: 会员考察信息
*/
import React from 'react';
import React, { useEffect, useState } from 'react';
import MellowCard, { MellowCardProps } from '@/components/MellowCard';
import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
interface IProps extends MellowCardProps {}
const PAGE_SIZE = 5;
const mockData = [
{
id: 1,
index: 1,
inspectionTheme: '温州龙昌皮业有限公司入库考察',
type: '入库考察',
createTime: '2020-12-08',
score: 80,
},
{
id: 2,
index: 2,
inspectionTheme: '温州龙昌皮业有限公司入库考察',
type: '入库考察',
createTime: '2020-12-08',
score: 70,
},
{
id: 3,
index: 4,
inspectionTheme: '温州龙昌皮业有限公司入库考察',
type: '入库考察',
createTime: '2020-12-08',
score: 80,
},
];
export type ListItemType = {
/**
* 主键id
*/
id: number
/**
* 考察主题
*/
subject: string
/**
* 考察类型枚举1-入库考察2-整改考察3-计划考察4-其他考察
*/
inspectType: number
/**
* 考察类型名称
*/
inspectTypeName: string
/**
* 考察日期，格式为yyyy-MM-dd
*/
inspectTime: string
/**
* 考察评分
*/
score: string
}
export type ParamsType = {
current: string,
pageSize: string,
}
export type ReponseType = {
totalCount: number,
data: ListItemType[],
}
interface IProps extends MellowCardProps {
/**
* 获取列表数据方法
*/
fetchList: (params: ParamsType) => Promise<ReponseType>,
}
const MemberDocInspection: React.FC<IProps> = (props: IProps) => {
const {
fetchList,
...rest
} = props;
const [page, setPage] = useState(1);
const [size, setSize] = useState(PAGE_SIZE);
const [loading, setLoading] = useState(false);
const [list, setList] = useState<ReponseType>({
totalCount: 0,
data: [],
});
const columns: EditableColumns[] = [
{
title: '序号',
dataIndex: 'index',
dataIndex: 'id',
},
{
title: '考察主题',
dataIndex: 'inspectionTheme',
dataIndex: 'subject',
ellipsis: true,
},
{
title: '考察类型',
dataIndex: 'type',
dataIndex: 'inspectTypeName',
},
{
title: '考察日期',
dataIndex: 'createTime',
dataIndex: 'inspectTime',
},
{
title: '考察评分',
dataIndex: 'score',
},
];
const getList = (params?: ParamsType) => {
if (fetchList) {
setLoading(true);
const nextPage = params?.current || page;
const nextSize = params?.pageSize || size;
fetchList({
current: `${nextPage}`,
pageSize: `${nextSize}`,
}).then((res) => {
if (res.data) {
setList(res);
}
}).finally(() => {
setLoading(false);
});
}
};
useEffect(() => {
getList();
}, []);
const handlePaginationChange = (page: number, size: number) => {
setPage(page);
setSize(size);
getList({
current: `${page}`,
pageSize: `${size}`,
});
};
return (
<MellowCard
......@@ -74,10 +130,15 @@ const MemberDocInspection: React.FC<IProps> = (props: IProps) => {
{...rest}
>
<PolymericTable
dataSource={mockData}
dataSource={list.data}
columns={columns}
loading={false}
pagination={null}
loading={loading}
pagination={{
current: page,
pageSize: size,
total: list.totalCount,
}}
onPaginationChange={handlePaginationChange}
/>
</MellowCard>
);
......
src/pages/member/components/MemberDocScoredInfo/index.tsx
View file @ cdcd0bda
......@@ -2,71 +2,133 @@
* @Author: XieZhiXiong
* @Date: 2021-05-21 18:01:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-21 18:01:48
* @LastEditTime: 2021-06-11 16:38:20
* @Description: 会员考评信息
*/
import React from 'react';
import React, { useEffect, useState } from 'react';
import MellowCard, { MellowCardProps } from '@/components/MellowCard';
import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
interface IProps extends MellowCardProps {}
const PAGE_SIZE = 5;
const mockData = [
{
id: 1,
index: 1,
inspectionTheme: '温州龙昌皮业有限公司入库考察',
type: '入库考察',
createTime: '2020-12-08',
score: 80,
},
{
id: 2,
index: 2,
inspectionTheme: '温州龙昌皮业有限公司入库考察',
type: '入库考察',
createTime: '2020-12-08',
score: 70,
},
{
id: 3,
index: 4,
inspectionTheme: '温州龙昌皮业有限公司入库考察',
type: '入库考察',
createTime: '2020-12-08',
score: 80,
},
];
export type ListItemType = {
/**
* 主键id
*/
id: number
/**
* 考评主题
*/
subject: string
/**
* 下级会员名称
*/
name: string
/**
* 考评时间开始，格式为yyyy-MM-dd
*/
appraisalDayStart: string
/**
* 考评时间结束，格式为yyyy-MM-dd
*/
appraisalDayEnd: string
/**
* 考评完成时间，格式为yyyy-MM-dd
*/
completeDay: string
/**
* 总得分
*/
totalScore: string
}
export type ParamsType = {
current: string,
pageSize: string,
}
export type ReponseType = {
totalCount: number,
data: ListItemType[],
}
interface IProps extends MellowCardProps {
/**
* 获取列表数据方法
*/
fetchList: (params: ParamsType) => Promise<ReponseType>,
}
const MemberDocScoredInfo: React.FC<IProps> = (props: IProps) => {
const {
fetchList,
...rest
} = props;
const [page, setPage] = useState(1);
const [size, setSize] = useState(PAGE_SIZE);
const [loading, setLoading] = useState(false);
const [list, setList] = useState<ReponseType>({
totalCount: 0,
data: [],
});
const columns: EditableColumns[] = [
{
title: '序号',
dataIndex: 'index',
dataIndex: 'id',
},
{
title: '考评主题',
dataIndex: 'inspectionTheme',
dataIndex: 'subject',
ellipsis: true,
render: (text, record) => `${text}-${record.name}`,
},
{
title: '考评范围',
dataIndex: 'type',
dataIndex: 'appraisalDayStart',
render: (text, record) => `${text}-${record.appraisalDayEnd}`,
},
{
title: '考评完成时间',
dataIndex: 'createTime',
dataIndex: 'completeDay',
},
{
title: '考评最终分',
dataIndex: 'score',
dataIndex: 'totalScore',
},
];
const getList = (params?: ParamsType) => {
if (fetchList) {
setLoading(true);
const nextPage = params?.current || page;
const nextSize = params?.pageSize || size;
fetchList({
current: `${nextPage}`,
pageSize: `${nextSize}`,
}).then((res) => {
if (res.data) {
setList(res);
}
}).finally(() => {
setLoading(false);
});
}
};
useEffect(() => {
getList();
}, []);
const handlePaginationChange = (page: number, size: number) => {
setPage(page);
setSize(size);
getList({
current: `${page}`,
pageSize: `${size}`,
});
};
return (
<MellowCard
......@@ -74,10 +136,15 @@ const MemberDocScoredInfo: React.FC<IProps> = (props: IProps) => {
{...rest}
>
<PolymericTable
dataSource={mockData}
dataSource={list.data}
columns={columns}
loading={false}
pagination={null}
loading={loading}
pagination={{
current: page,
pageSize: size,
total: list.totalCount,
}}
onPaginationChange={handlePaginationChange}
/>
</MellowCard>
);
......
src/pages/member/components/MemberDocTableList/index.tsx 0 → 100644
View file @ cdcd0bda
/*
* @Author: XieZhiXiong
* @Date: 2021-06-11 16:40:26
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-11 16:43:17
* @Description: Card 列表组件
*/
import React, { useEffect, useState } from 'react';
import MellowCard, { MellowCardProps } from '@/components/MellowCard';
import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
const PAGE_SIZE = 5;
export type ParamsType = {
current: string,
pageSize: string,
}
export type ReponseType<T> = {
totalCount: number,
data: T[],
}
interface IProps<T> extends MellowCardProps {
/**
* Card 标题
*/
title: string,
/**
* Table 列
*/
columns: EditableColumns<T>[],
/**
* 获取列表数据方法
*/
fetchList: (params: ParamsType) => Promise<ReponseType<T>>,
}
const MemberDocTableList = <T,>(props: IProps<T>) => {
const {
title,
columns,
fetchList,
...rest
} = props;
const [page, setPage] = useState(1);
const [size, setSize] = useState(PAGE_SIZE);
const [loading, setLoading] = useState(false);
const [list, setList] = useState<ReponseType<T>>({
totalCount: 0,
data: [],
});
const getList = (params?: ParamsType) => {
if (fetchList) {
setLoading(true);
const nextPage = params?.current || page;
const nextSize = params?.pageSize || size;
fetchList({
current: `${nextPage}`,
pageSize: `${nextSize}`,
}).then((res) => {
if (res.data) {
setList(res);
}
}).finally(() => {
setLoading(false);
});
}
};
useEffect(() => {
getList();
}, []);
const handlePaginationChange = (page: number, size: number) => {
setPage(page);
setSize(size);
getList({
current: `${page}`,
pageSize: `${size}`,
});
};
return (
<MellowCard
title={title}
{...rest}
>
<PolymericTable
dataSource={list.data}
columns={columns}
loading={loading}
pagination={{
current: page,
pageSize: size,
total: list.totalCount,
}}
onPaginationChange={handlePaginationChange}
/>
</MellowCard>
);
};
export default MemberDocTableList;
\ No newline at end of file
src/pages/member/components/MemberFeedbackRecords/index.tsx
View file @ cdcd0bda
......@@ -27,12 +27,46 @@ export interface FetchParams {
};
export interface ListItem {
id: number;
createTime: string;
content: string;
reason: string;
byMemberName: string;
remark: string;
/**
* 主键id
*/
id: number
/**
* 业务类型1-投诉2-建议
*/
type: number
/**
* 业务类型名称
*/
typeName: string
/**
* 事件分类
*/
classify: number
/**
* 事件分类名称
*/
classifyName: string
/**
* 投诉建议方
*/
name: string
/**
* 事件描述
*/
subject: string
/**
* 事件时间，格式为yyyy-MM-ddHH:mm:ss
*/
eventTime: string
/**
* 处理时间，格式为yyyy-MM-ddHH:mm:ss
*/
handleTime: string
/**
* 处理结果
*/
result: string
};
interface IProps extends MellowCardProps {
......@@ -61,26 +95,38 @@ const MemberFeedbackRecords: React.FC<IProps> = (props: IProps) => {
const recordColumns: EditableColumns[] = [
{
title: '标题',
dataIndex: 'remark',
title: '业务类型',
dataIndex: 'typeName',
},
{
title: '原因',
dataIndex: 'content',
title: '事件分类',
dataIndex: 'classifyName',
ellipsis: true,
},
{
title: '反馈方',
dataIndex: 'byMemberName',
title: '投诉建议方',
dataIndex: 'name',
},
{
title: '处理结果',
dataIndex: 'reason',
title: '事件描述',
dataIndex: 'subject',
ellipsis: true,
},
{
title: '单据时间',
dataIndex: 'createTime',
title: '事件时间',
dataIndex: 'eventTime',
align: 'center',
ellipsis: true,
},
{
title: '处理时间',
dataIndex: 'handleTime',
align: 'center',
ellipsis: true,
},
{
title: '处理结果',
dataIndex: 'result',
align: 'center',
ellipsis: true,
},
......
src/pages/member/memberMaintain/detailed/archiveInfo.tsx
View file @ cdcd0bda
......@@ -2,51 +2,309 @@
* @Author: XieZhiXiong
* @Date: 2021-05-21 16:45:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-21 18:11:51
* @LastEditTime: 2021-06-11 17:20:51
* @Description: 会员档案信息
*/
import React from 'react';
import { Row, Col } from 'antd';
import React, { useEffect, useState } from 'react';
import { Row, Col, Spin } from 'antd';
import { usePageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api';
import { GetMemberAbilityMaintenanceDetailRecordResponse } from '@/services/MemberV2Api';
import { EditableColumns } from '@/components/PolymericTable/interface';
import MemberDocCategory from '../../components/MemberDocCategory';
import MemberDocIncomingInfo from '../../components/MemberDocIncomingInfo';
import MemberDocQualification from '../../components/MemberDocQualification';
import MemberDocInspection from '../../components/MemberDocInspection';
import MemberDocScoredInfo from '../../components/MemberDocScoredInfo';
import MemberDocRectificationInfo from '../../components/MemberDocRectificationInfo';
import MemberDocTableList, { ParamsType, ReponseType } from '../../components/MemberDocTableList';
export type InspectListItemType = {
/**
* 主键id
*/
id: number
/**
* 考察主题
*/
subject: string
/**
* 考察类型枚举1-入库考察2-整改考察3-计划考察4-其他考察
*/
inspectType: number
/**
* 考察类型名称
*/
inspectTypeName: string
/**
* 考察日期，格式为yyyy-MM-dd
*/
inspectTime: string
/**
* 考察评分
*/
score: string
}
export type AppraisalListItemType = {
/**
* 主键id
*/
id: number
/**
* 考评主题
*/
subject: string
/**
* 下级会员名称
*/
name: string
/**
* 考评时间开始，格式为yyyy-MM-dd
*/
appraisalDayStart: string
/**
* 考评时间结束，格式为yyyy-MM-dd
*/
appraisalDayEnd: string
/**
* 考评完成时间，格式为yyyy-MM-dd
*/
completeDay: string
/**
* 总得分
*/
totalScore: string
}
export type RectifyListItemType = {
/**
* 主键id
*/
id: number
/**
* 整改主题
*/
subject: string
/**
* 整改期限开始，格式为yyyy-MM-dd
*/
rectifyTimeStart: string
/**
* 整改期限结束，格式为yyyy-MM-dd
*/
rectifyTimeEnd: string
/**
* 整改结果
*/
result: string
}
const MemberArchiveInfo = () => {
const { validateId } = usePageStatus();
const [archiveInfo, setArchiveInfo] = useState<GetMemberAbilityMaintenanceDetailRecordResponse>();
const [loading, setLoading] = useState(false);
const getArchiveInfo = () => {
setLoading(true);
PublicApi.getMemberAbilityMaintenanceDetailRecord({
validateId,
}).then((res) => {
if (res.code === 1000) {
setArchiveInfo(res.data);
}
}).finally(() => {
setLoading(false);
});
};
const inspectionColumns: EditableColumns<InspectListItemType>[] = [
{
title: '序号',
dataIndex: 'id',
},
{
title: '考察主题',
dataIndex: 'subject',
ellipsis: true,
},
{
title: '考察类型',
dataIndex: 'inspectTypeName',
},
{
title: '考察日期',
dataIndex: 'inspectTime',
},
{
title: '考察评分',
dataIndex: 'score',
},
];
const getInspectList = (params: ParamsType): Promise<ReponseType<InspectListItemType>> => {
return new Promise((resolve, reject) => {
PublicApi.getMemberAbilityMaintenanceDetailInspectPage({
validateId,
...params,
})
.then((res) => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch((err) => {
reject(err);
});
});
};
const AppraisalColumns: EditableColumns<AppraisalListItemType>[] = [
{
title: '序号',
dataIndex: 'id',
},
{
title: '考评主题',
dataIndex: 'subject',
ellipsis: true,
render: (text, record) => `${text}-${record.name}`,
},
{
title: '考评范围',
dataIndex: 'appraisalDayStart',
render: (text, record) => `${text}-${record.appraisalDayEnd}`,
},
{
title: '考评完成时间',
dataIndex: 'completeDay',
},
{
title: '考评最终分',
dataIndex: 'totalScore',
},
]
const getAppraisalList = (params: ParamsType): Promise<ReponseType<AppraisalListItemType>> => {
return new Promise((resolve, reject) => {
PublicApi.getMemberAbilityMaintenanceDatailAppraisalPage({
validateId,
...params,
})
.then((res) => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch((err) => {
reject(err);
});
});
};
const RectifyColumns: EditableColumns<RectifyListItemType>[] = [
{
title: '序号',
dataIndex: 'id',
},
{
title: '整改主题',
dataIndex: 'subject',
ellipsis: true,
},
{
title: '整改开始日期',
dataIndex: 'rectifyTimeStart',
},
{
title: '整改截止日期',
dataIndex: 'rectifyTimeEnd',
},
{
title: '整改结果',
dataIndex: 'result',
},
]
const getRectifyList = (params: ParamsType): Promise<ReponseType<RectifyListItemType>> => {
return new Promise((resolve, reject) => {
PublicApi.getMemberAbilityMaintenanceDetailRectifyPage({
validateId,
...params,
})
.then((res) => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch((err) => {
reject(err);
});
});
};
useEffect(() => {
getArchiveInfo();
}, []);
return (
<Row gutter={[16, 16]}>
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory />
</Col>
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo />
</Col>
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification />
</Col>
{/* 考察信息 */}
<Col span={24}>
<MemberDocInspection />
</Col>
{/* 考评信息 */}
<Col span={24}>
<MemberDocScoredInfo />
</Col>
{/* 整改信息 */}
<Col span={24}>
<MemberDocRectificationInfo />
</Col>
</Row>
<Spin spinning={loading}>
<Row gutter={[16, 16]}>
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory
dataSource={archiveInfo?.classfication}
id="categoryInfo"
/>
</Col>
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={archiveInfo?.depositDetails}
id="depositDetails"
/>
</Col>
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={archiveInfo?.qualities}
id="qualitiesInfo"
/>
</Col>
{/* 考察信息 */}
<Col span={24}>
<MemberDocTableList<InspectListItemType>
title="考察信息"
columns={inspectionColumns}
fetchList={getInspectList}
id="inspectInfo"
/>
</Col>
{/* 考评信息 */}
<Col span={24}>
<MemberDocTableList<AppraisalListItemType>
title="考评信息"
columns={AppraisalColumns}
fetchList={getAppraisalList}
id="appraisalInfo"
/>
</Col>
{/* 整改信息 */}
<Col span={24}>
<MemberDocTableList<RectifyListItemType>
title="整改信息"
columns={RectifyColumns}
fetchList={getRectifyList}
id="rectifyInfo"
/>
</Col>
</Row>
</Spin>
);
};
......
src/pages/member/memberMaintain/detailed/changedInfo.tsx
View file @ cdcd0bda
......@@ -14,7 +14,7 @@ const MemberChangedInfo = () => {
<Row gutter={[16, 16]}>
{/* 分类信息 */}
<Col span={24}>
<ChangedInfo />
<ChangedInfo id="changedInfo" />
</Col>
</Row>
);
......
src/pages/member/memberMaintain/detailed/index.tsx
View file @ cdcd0bda
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-24 10:12:09
* @LastEditTime: 2021-06-11 15:28:49
* @Description:
*/
import React, { useState, useEffect } from 'react';
......@@ -48,12 +48,11 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
const [infoLoading, setInfoLoading] = useState(false);
const getBasicInfo = () => {
if (!id || !validateId) {
if (!validateId) {
return;
}
setInfoLoading(true);
PublicApi.getMemberAbilityMaintenanceDetailBasic({
memberId: id,
validateId,
}).then(res => {
if (res.code !== 1000) {
......@@ -90,6 +89,12 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
case 'sincerityInfo':
history.push(`${url}/sincerityInfo?id=${id}&validateId=${validateId}`);
break;
case 'archiveInfo':
history.push(`${url}/archiveInfo?id=${id}&validateId=${validateId}`);
break;
case 'changedInfo':
history.push(`${url}/changedInfo?id=${id}&validateId=${validateId}`);
break;
default:
break;
}
......@@ -190,6 +195,42 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
},
];
break;
case 'archiveInfo':
ret = [
{
key: 'categoryInfo',
name: '分类信息',
},
{
key: 'depositDetails',
name: '入库信息',
},
{
key: 'qualitiesInfo',
name: '资质证明',
},
{
key: 'inspectInfo',
name: '考察信息',
},
{
key: 'appraisalInfo',
name: '考评信息',
},
{
key: 'rectifyInfo',
name: '整改信息',
},
];
break;
case 'changedInfo':
ret = [
{
key: 'changedInfo',
name: '变更信息',
},
];
break;
default:
break;
}
......@@ -214,11 +255,11 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
extra={(
<Bookmark value={getBookmarkKey()} onChange={handleBookmarkChange}>
<Bookmark.Item value="basicInfo" title="基本信息" icon={<UnorderedListOutlined />} />
<Bookmark.Item value="2" title="档案信息" icon={<FolderOutlined />} />
<Bookmark.Item value="archiveInfo" title="档案信息" icon={<FolderOutlined />} />
<Bookmark.Item value="levelInfo" title="等级信息" icon={<BarChartOutlined />} />
<Bookmark.Item value="equityInfo" title="权益信息" icon={<InsuranceOutlined />} />
<Bookmark.Item value="sincerityInfo" title="信用信息" icon={<BulbOutlined />} />
<Bookmark.Item value="3" title="变更信息" icon={<EditOutlined />} />
<Bookmark.Item value="changedInfo" title="变更信息" icon={<EditOutlined />} />
</Bookmark>
)}
>
......
src/pages/member/memberQuery/detailed/archiveInfo.tsx
View file @ cdcd0bda
......@@ -2,51 +2,290 @@
* @Author: XieZhiXiong
* @Date: 2021-05-21 16:45:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-21 18:11:51
* @LastEditTime: 2021-06-11 17:36:40
* @Description: 会员档案信息
*/
import React from 'react';
import { Row, Col } from 'antd';
import MemberDocCategory from '../../components/MemberDocCategory';
import React, { useEffect, useState } from 'react';
import { Row, Col, Spin } from 'antd';
import { usePageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api';
import { GetMemberAbilityInfoDetailArchivesResponse } from '@/services/MemberV2Api';
import { EditableColumns } from '@/components/PolymericTable/interface';
import MemberDocIncomingInfo from '../../components/MemberDocIncomingInfo';
import MemberDocQualification from '../../components/MemberDocQualification';
import MemberDocInspection from '../../components/MemberDocInspection';
import MemberDocScoredInfo from '../../components/MemberDocScoredInfo';
import MemberDocRectificationInfo from '../../components/MemberDocRectificationInfo';
import MemberDocTableList, { ParamsType, ReponseType } from '../../components/MemberDocTableList';
export type InspectListItemType = {
/**
* 主键id
*/
id: number
/**
* 考察主题
*/
subject: string
/**
* 考察类型枚举1-入库考察2-整改考察3-计划考察4-其他考察
*/
inspectType: number
/**
* 考察类型名称
*/
inspectTypeName: string
/**
* 考察日期，格式为yyyy-MM-dd
*/
inspectTime: string
/**
* 考察评分
*/
score: string
}
export type AppraisalListItemType = {
/**
* 主键id
*/
id: number
/**
* 考评主题
*/
subject: string
/**
* 下级会员名称
*/
name: string
/**
* 考评时间开始，格式为yyyy-MM-dd
*/
appraisalDayStart: string
/**
* 考评时间结束，格式为yyyy-MM-dd
*/
appraisalDayEnd: string
/**
* 考评完成时间，格式为yyyy-MM-dd
*/
completeDay: string
/**
* 总得分
*/
totalScore: string
}
export type RectifyListItemType = {
/**
* 主键id
*/
id: number
/**
* 整改主题
*/
subject: string
/**
* 整改期限开始，格式为yyyy-MM-dd
*/
rectifyTimeStart: string
/**
* 整改期限结束，格式为yyyy-MM-dd
*/
rectifyTimeEnd: string
/**
* 整改结果
*/
result: string
}
const MemberArchiveInfo = () => {
const { validateId } = usePageStatus();
const [archiveInfo, setArchiveInfo] = useState<GetMemberAbilityInfoDetailArchivesResponse>();
const [loading, setLoading] = useState(false);
const getArchiveInfo = () => {
setLoading(true);
PublicApi.getMemberAbilityInfoDetailArchives({
validateId,
}).then((res) => {
if (res.code === 1000) {
setArchiveInfo(res.data);
}
}).finally(() => {
setLoading(false);
});
};
const inspectionColumns: EditableColumns<InspectListItemType>[] = [
{
title: '序号',
dataIndex: 'id',
},
{
title: '考察主题',
dataIndex: 'subject',
ellipsis: true,
},
{
title: '考察类型',
dataIndex: 'inspectTypeName',
},
{
title: '考察日期',
dataIndex: 'inspectTime',
},
{
title: '考察评分',
dataIndex: 'score',
},
];
const getInspectList = (params: ParamsType): Promise<ReponseType<InspectListItemType>> => {
return new Promise((resolve, reject) => {
PublicApi.getMemberAbilityMaintenanceDetailInspectPage({
validateId,
...params,
})
.then((res) => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch((err) => {
reject(err);
});
});
};
const AppraisalColumns: EditableColumns<AppraisalListItemType>[] = [
{
title: '序号',
dataIndex: 'id',
},
{
title: '考评主题',
dataIndex: 'subject',
ellipsis: true,
render: (text, record) => `${text}-${record.name}`,
},
{
title: '考评范围',
dataIndex: 'appraisalDayStart',
render: (text, record) => `${text}-${record.appraisalDayEnd}`,
},
{
title: '考评完成时间',
dataIndex: 'completeDay',
},
{
title: '考评最终分',
dataIndex: 'totalScore',
},
]
const getAppraisalList = (params: ParamsType): Promise<ReponseType<AppraisalListItemType>> => {
return new Promise((resolve, reject) => {
PublicApi.getMemberAbilityInfoDatailAppraisalPage({
validateId,
...params,
})
.then((res) => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch((err) => {
reject(err);
});
});
};
const RectifyColumns: EditableColumns<RectifyListItemType>[] = [
{
title: '序号',
dataIndex: 'id',
},
{
title: '整改主题',
dataIndex: 'subject',
ellipsis: true,
},
{
title: '整改开始日期',
dataIndex: 'rectifyTimeStart',
},
{
title: '整改截止日期',
dataIndex: 'rectifyTimeEnd',
},
{
title: '整改结果',
dataIndex: 'result',
},
]
const getRectifyList = (params: ParamsType): Promise<ReponseType<RectifyListItemType>> => {
return new Promise((resolve, reject) => {
PublicApi.getMemberAbilityInfoDetailRectifyPage({
validateId,
...params,
})
.then((res) => {
if (res.code === 1000) {
resolve(res.data);
}
reject(res);
})
.catch((err) => {
reject(err);
});
});
};
useEffect(() => {
getArchiveInfo();
}, []);
return (
<Row gutter={[16, 16]}>
{/* 分类信息 */}
<Col span={24}>
<MemberDocCategory />
</Col>
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo />
</Col>
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification />
</Col>
{/* 考察信息 */}
<Col span={24}>
<MemberDocInspection />
</Col>
{/* 考评信息 */}
<Col span={24}>
<MemberDocScoredInfo />
</Col>
{/* 整改信息 */}
<Col span={24}>
<MemberDocRectificationInfo />
</Col>
</Row>
<Spin spinning={loading}>
<Row gutter={[16, 16]}>
{/* 入库信息 */}
<Col span={24}>
<MemberDocIncomingInfo
dataSource={archiveInfo?.depositDetails}
id="depositDetails"
/>
</Col>
{/* 资质证明 */}
<Col span={24}>
<MemberDocQualification
dataSource={archiveInfo?.qualities}
id="qualitiesInfo"
/>
</Col>
{/* 考评信息 */}
<Col span={24}>
<MemberDocTableList<AppraisalListItemType>
title="考评信息"
columns={AppraisalColumns}
fetchList={getAppraisalList}
id="appraisalInfo"
/>
</Col>
{/* 整改信息 */}
<Col span={24}>
<MemberDocTableList<RectifyListItemType>
title="整改信息"
columns={RectifyColumns}
fetchList={getRectifyList}
id="rectifyInfo"
/>
</Col>
</Row>
</Spin>
);
};
......
src/pages/member/memberQuery/detailed/changedInfo.tsx
View file @ cdcd0bda
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-21 18:18:44
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-05-21 18:20:06
* @LastEditTime: 2021-06-11 17:42:14
* @Description: 会员变更信息详情
*/
import React from 'react';
......@@ -14,7 +14,7 @@ const MemberChangedInfo = () => {
<Row gutter={[16, 16]}>
{/* 分类信息 */}
<Col span={24}>
<ChangedInfo />
<ChangedInfo id="changedInfo" />
</Col>
</Row>
);
......
src/pages/member/memberQuery/detailed/index.tsx
View file @ cdcd0bda
......@@ -69,16 +69,22 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
const url = match.url === '/' ? '' : match.url;
switch (val) {
case 'basicInfo':
history.push(`${url}/basicInfo?&validateId=${validateId}`);
history.push(`${url}/basicInfo?validateId=${validateId}`);
break;
case 'levelInfo':
history.push(`${url}/levelInfo?&validateId=${validateId}`);
history.push(`${url}/levelInfo?validateId=${validateId}`);
break;
case 'equityInfo':
history.push(`${url}/equityInfo?&validateId=${validateId}`);
history.push(`${url}/equityInfo?validateId=${validateId}`);
break;
case 'sincerityInfo':
history.push(`${url}/sincerityInfo?&validateId=${validateId}`);
history.push(`${url}/sincerityInfo?validateId=${validateId}`);
break;
case 'archiveInfo':
history.push(`${url}/archiveInfo?validateId=${validateId}`);
break;
case 'changedInfo':
history.push(`${url}/changedInfo?validateId=${validateId}`);
break;
default:
break;
......@@ -180,6 +186,42 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
},
];
break;
case 'archiveInfo':
ret = [
{
key: 'categoryInfo',
name: '分类信息',
},
{
key: 'depositDetails',
name: '入库信息',
},
{
key: 'qualitiesInfo',
name: '资质证明',
},
{
key: 'inspectInfo',
name: '考察信息',
},
{
key: 'appraisalInfo',
name: '考评信息',
},
{
key: 'rectifyInfo',
name: '整改信息',
},
];
break;
case 'changedInfo':
ret = [
{
key: 'changedInfo',
name: '变更信息',
},
];
break;
default:
break;
}
......@@ -204,11 +246,11 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
extra={(
<Bookmark value={getBookmarkKey()} onChange={handleBookmarkChange}>
<Bookmark.Item value="basicInfo" title="基本信息" icon={<UnorderedListOutlined />} />
<Bookmark.Item value="2" title="档案信息" icon={<FolderOutlined />} />
<Bookmark.Item value="archiveInfo" title="档案信息" icon={<FolderOutlined />} />
<Bookmark.Item value="levelInfo" title="等级信息" icon={<BarChartOutlined />} />
<Bookmark.Item value="equityInfo" title="权益信息" icon={<InsuranceOutlined />} />
<Bookmark.Item value="sincerityInfo" title="信用信息" icon={<BulbOutlined />} />
<Bookmark.Item value="3" title="变更信息" icon={<EditOutlined />} />
<Bookmark.Item value="changedInfo" title="变更信息" icon={<EditOutlined />} />
</Bookmark>
)}
>
......
src/pages/member/memberQuery/rectificationQuery/detail.tsx
View file @ cdcd0bda
......@@ -88,7 +88,9 @@ const rectificationAddDetail = () => {
title={initialValue?.subject}
anchors={headers}
extra={
<Button type="primary" icon={<FormOutlined />} onClick={() => toggle(true)}>填写整改信息</Button>
initialValue?.currentOuterStep === 2 && (
<Button type="primary" icon={<FormOutlined />} onClick={() => toggle(true)}>填写整改信息</Button>
)
}
>
<AuditProcess
......
src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout/index.tsx
View file @ cdcd0bda
......@@ -17,7 +17,7 @@ import { useBidTable } from '../../../effects/useBidTable';
export interface ContrastProps {
effect?: any,
redux?(e: any),
preview?: string
preview?: boolean
}
const chNum: { [key: number]: string } = {
......
src/pages/transaction/purchaseAbility/components/detail/components/purchasePlanMaterialLayout/drawer.tsx
View file @ cdcd0bda
......@@ -33,8 +33,8 @@ const DrawerLayout: React.FC<DrawerLayoutProps> = (props: any) => {
dataIndex: 'startTime',
render: (text: any, record: any) => (
<Space direction='vertical' size={0}>
<Typography.Text>{format(text)}</Typography.Text>
<Typography.Text>{format(record.endTime)}</Typography.Text>
<Typography.Text>{format(text, "YYYY-MM-DD")}</Typography.Text>
<Typography.Text>{format(record.endTime, "YYYY-MM-DD")}</Typography.Text>
</Space>
)
},
......@@ -57,17 +57,19 @@ const DrawerLayout: React.FC<DrawerLayoutProps> = (props: any) => {
title: '成本价',
key: 'costPrice',
dataIndex: 'costPrice',
render: (text: any) => (<>{ text ? `￥${text.toFixed(2)}` : `￥0` }</>)
},
{
title: '需求金额',
key: 'needPrice',
dataIndex: 'needPrice',
render: (text: any) => (<>{ text ? `￥${text.toFixed(2)}` : `￥0` }</>)
},
{
title: '到货日期',
key: 'arriveTime',
dataIndex: 'arriveTime',
render: (text: any) => format(text)
render: (text: any) => format(text, "YYYY-MM-DD")
},
]
......
src/pages/transaction/purchaseAbility/components/table/index.tsx
View file @ cdcd0bda
......@@ -74,8 +74,8 @@ interface Iprops {
effects?: string,
selectedRow?: boolean,
reload?: any,
externalStatusFetch?: Promise<unknown>,
interiorStatusFetch?: Promise<unknown>,
externalStatusFetch?: () => Promise<unknown>,
interiorStatusFetch?: () => Promise<unknown>,
}
const formActions = createFormActions();
const Table: React.FC<Iprops> = (props: any) => {
......
src/pages/transaction/purchaseAbility/confirmOffer/demand/index.tsx
View file @ cdcd0bda
......@@ -56,8 +56,8 @@ const DemandDetailed = () => {
{
col: [
{ label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
{ label: '单据时间', extra: format(data.createTime) },
]
},
......
src/pages/transaction/purchaseAbility/confirmOffer/offerInquire/index.tsx
View file @ cdcd0bda
......@@ -12,6 +12,7 @@ import {
OFFTER_CONFIRMINTERIORSTATE_COLOR,
OFFTER_EXTERNALSTATE_TYPE,
CHNUM_TYPE,
BUTTONAUTHORITY
} from '../../constants';
import ModalOperate from '../../components/modalOperate';
......@@ -100,7 +101,8 @@ const OfferInquire = () => {
dataIndex: 'operate',
render: (text: any, record: any) => (
<>
{ record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE
{
record.button === BUTTONAUTHORITY.FOUR
&& (
<Button
type='link'
......@@ -112,7 +114,8 @@ const OfferInquire = () => {
>
调整截止时间
</Button>
)}
)
}
<Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button>
</>
)
......
src/pages/transaction/purchaseAbility/confirmOffer/preview/index.tsx
View file @ cdcd0bda
......@@ -47,8 +47,8 @@ const ContrastPreview = () => {
col: [
{ label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '需求摘要', extra: data.details },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
]
},
{
......
src/pages/transaction/purchaseAbility/confirmOffer/quote/index.tsx
View file @ cdcd0bda
......@@ -10,7 +10,6 @@ import OtherLayout from '../../components/detail/components/otherLayout';
import BidInfoLayout from '../../components/detail/components/bidInfoLayout';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
} from '../../constants';
import { LinkOutlined } from '@ant-design/icons';
......@@ -38,7 +37,7 @@ const QuoteDetails = () => {
{ label: '报价单号', extra: data.quotedPriceNo },
{ label: '报价摘要', extra: data.quotedDetails },
{ label: '报价会员', extra: data.createMemberName },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> }
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> }
]
},
{
......
src/pages/transaction/purchaseAbility/confirmOffer/toComparePrices/index.tsx
View file @ cdcd0bda
......@@ -13,6 +13,7 @@ import {
OFFTER_EXTERNALSTATE_TYPE,
OFFTER_CONFIRMINTERNALSTATE_TYPE,
CHNUM_TYPE,
BUTTONAUTHORITY,
} from '../../constants';
const { Text } = Typography
......@@ -94,7 +95,7 @@ const ToComparePrices = () => {
dataIndex: 'operate',
render: (text: any, record: any) =>
<>
{ record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.WAITSTHAN_TYPE &&
{ record.button === BUTTONAUTHORITY.SIX &&
<Button
type='link'
onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/contrast?id=${record.id}&turn=${record.turn}`)}
......@@ -103,8 +104,7 @@ const ToComparePrices = () => {
</Button>
}
{
( record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS1_TYPE &&
record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS2_TYPE
(record.button === BUTTONAUTHORITY.SEVEN
) && <Button type='link'>修改授标结果</Button>
}
<Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/toComparePrices/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button>
......
src/pages/transaction/purchaseAbility/offter/addOffter/index.tsx
View file @ cdcd0bda
......@@ -7,12 +7,11 @@ import moment from 'moment'
import { PublicApi } from '@/services/api';
import { Row, Col, Space, Button, Typography, Popconfirm, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE_TYPE,
CHNUM_TYPE
CHNUM_TYPE,
BUTTONAUTHORITY
} from '../../constants';
import { Badge, Tag } from 'antd';
const { Text } = Typography;
......@@ -91,24 +90,32 @@ const AddOffter = () => {
dataIndex: 'operate',
render: (text: any, record: any) => <>
{
record.interiorState === OFFTER_INTERNALSTATE_TYPE.WAITSUBMITAUDIT_TYPE
record.button === BUTTONAUTHORITY.ONE
&& (
<>
<Popconfirm title="确定要提交审核吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}>
<Button type='link'>
<Popconfirm title="确定要提交审核吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}>
<Button type='link'>
提交审核
</Button>
</Popconfirm>
<Button
onClick={() => history.push(`/memberCenter/procurementAbility/offter/edit?id=${record.id}&number=${record.quotedPriceNo}`)}
type='link'
>修改</Button>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => fetchDeleteBatch(record.id)}>
<Button type='link'>
删除
</Button>
</Popconfirm>
</>
</Button>
</Popconfirm>
)
}
{
(record.button === BUTTONAUTHORITY.ONE || record.button === BUTTONAUTHORITY.TWO)
&& (
<Button
onClick={() => history.push(`/memberCenter/procurementAbility/offter/edit?id=${record.id}&number=${record.quotedPriceNo}`)}
type='link'
>修改</Button>
)
}
{
record.button === BUTTONAUTHORITY.ONE
&& (
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => fetchDeleteBatch(record.id)}>
<Button type='link'>
删除
</Button>
</Popconfirm>
)
}
</>
......
src/pages/transaction/purchaseAbility/offter/demand/index.tsx
View file @ cdcd0bda
......@@ -11,14 +11,11 @@ import RecordLyout from '../../components/detail/components/recordLyout';
import moment from 'moment';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
import { LinkOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import MaterialLayout from '../../components/detail/components/materialLayout';
import DemandLayout from '../../components/detail/components/demandLayout';
const ICON_STYLE: any = {
color: '#C0C4CC',
......@@ -53,8 +50,8 @@ const DemandDetailed = () => {
{
col: [
{ label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
{ label: '单据时间', extra: format(data.createTime) },
]
},
......
src/pages/transaction/purchaseAbility/offter/detail/index.tsx
View file @ cdcd0bda
......@@ -68,8 +68,8 @@ const QuoteDetails = () => {
col: [
{ label: '报价单号', extra: data.quotedPriceNo },
{ label: '报价摘要', extra: data.quotedDetails },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
]
},
{
......
src/pages/transaction/purchaseAbility/offter/submitOffter/index.tsx
View file @ cdcd0bda
......@@ -55,8 +55,8 @@ const SubmitOffter = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价轮次',
key: 'count',
dataIndex: 'count',
key: 'turn',
dataIndex: 'turn',
render: (text: any, record: any) => (
<>
<Rate
......@@ -78,12 +78,12 @@ const SubmitOffter = () => {
title: '外部状态',
key: 'externalState',
dataIndex: 'externalState',
render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{record.externalStateName}</Tag>
}, {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Badge status={OFFTER_INTERNALSTATE_COLOR[text]} text={OFFTER_INTERNALSTATE[text]} />
render: (text: any, record: any) => <Badge status={OFFTER_INTERNALSTATE_COLOR[text]} text={record.interiorStateName} />
}, {
title: '操作',
key: 'operate',
......
src/pages/transaction/purchaseAbility/purchasePlan/demand/index.tsx
View file @ cdcd0bda
......@@ -48,8 +48,8 @@ const DemandDetailed = () => {
},
{
col: [
{ label: '需求计划开始', extra: format(data.startTime) },
{ label: '需求计划截止', extra: format(data.endTime) },
{ label: '需求计划开始', extra: format(data.startTime, "YYYY-MM-DD") },
{ label: '需求计划截止', extra: format(data.endTime, "YYYY-MM-DD") },
]
},
{
......
src/pages/transaction/purchaseAbility/purchasePlan/detail/index.tsx
View file @ cdcd0bda
......@@ -83,7 +83,7 @@ const PurchasePlanDetailed = () => {
{
label: '采购计划开始', extra: (
<div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
<span>{format(data.startTime)}</span>
<span>{format(data.startTime, "YYYY-MM-DD")}</span>
{(pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.startTime, '计划开始时间', 'startTime')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>修改时间</span>)}
</div>
)
......@@ -91,7 +91,7 @@ const PurchasePlanDetailed = () => {
{
label: '采购计划截止', extra: (
<div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
<span>{format(data.endTime)}</span>
<span>{format(data.endTime, "YYYY-MM-DD")}</span>
{(pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.endTime, '计划结束时间', 'endTime')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>修改时间</span>)}
</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