diff --git a/src/pages/performance/CompensateGroupConfig/components/DraftList.tsx b/src/pages/performance/CompensateGroupConfig/components/DraftList.tsx index 040a532..b47ed1e 100755 --- a/src/pages/performance/CompensateGroupConfig/components/DraftList.tsx +++ b/src/pages/performance/CompensateGroupConfig/components/DraftList.tsx @@ -89,7 +89,7 @@ export default ({ type }: Props) => { 新增 - `id${row.id}`} dataSource={list} pagination={paginationConfig}> +
`id${row.draftId}`} dataSource={list} pagination={paginationConfig}> name || ""} /> { + return record.targetType === 2 ? `${value}%` : record.targetType === 3 ? `${value}元` : `${value}台`; + }, + }, +]; +const TargetModal = ({ visible, fileData, tarOnCancel }: Props) => { + return ( + <> + tarOnCancel()} maskClosable={false} width={1500}> +
+ {name || "--"}} /> + {name || "--"}} /> + {name || "--"}} + /> + ( + + {num !== undefined + ? `${num}${ + record.dataType == 1 ? "台" : record.dataType == 2 ? "%" : record.dataType == 3 ? "元" : "" + }` + : "--"} + + )} + /> + (time ? moment(time).format("YYYY-MM-DD") : "--")} + /> + + record.errorType ?
未导入
:
已导入
+ } + /> + (record.errorType ? ReasonsEnum[record.errorType] : "--")} + /> +
+ + + ); +}; + +export default TargetModal; diff --git a/src/pages/performance/EvaDataImport/components/style.less b/src/pages/performance/EvaDataImport/components/style.less new file mode 100644 index 0000000..aabc8d9 --- /dev/null +++ b/src/pages/performance/EvaDataImport/components/style.less @@ -0,0 +1,22 @@ +.no { + width: 47px; + height: 18px; + margin: 0 auto; + color: #f4333c; + font-weight: 500; + font-size: 12px; + line-height: 18px; + border: 1px solid #f8797f; + border-radius: 2px; +} +.yes { + width: 47px; + height: 18px; + margin: 0 auto; + color: #20c688; + font-weight: 500; + font-size: 12px; + line-height: 18px; + border: 1px solid #6ddab2; + border-radius: 2px; +} diff --git a/src/pages/performance/EvaDataImport/index.tsx b/src/pages/performance/EvaDataImport/index.tsx index 15ab819..5be19a4 100644 --- a/src/pages/performance/EvaDataImport/index.tsx +++ b/src/pages/performance/EvaDataImport/index.tsx @@ -8,6 +8,7 @@ import type { UploadProps } from "antd"; import { history } from "umi"; import moment from "moment"; import Filter from './components/Filter'; +import FileDatailsModal from './components/FileDatailsModal'; const Column = Table.Column; @@ -15,6 +16,8 @@ export default () => { const { loading, list, paginationConfig, setParams, innerParams } = usePagination(evaDataListApi, { pageSize: 10, }); + const [fileData, setFileData] = useState({}); + const [visible, setVisible] = useState(false); const uploadPerson: UploadProps = { name: "file", action: "/api/morax/erp/eval-indicator/staff-indicator", @@ -25,10 +28,12 @@ export default () => { console.log(info.file, info.fileList); } if (info.file.status === "done") { - message.success(`${info.file.name} 导入成功`); + message.success(`${info.file.name} 上传成功`); setParams({ ...innerParams }, true); + // setFileData(info.file.response.data); + // setVisible(true); } else if (info.file.status === "error") { - message.error(`${info.file.name} 导入失败`); + message.error(`${info.file.name} 上传失败`); } }, }; @@ -42,10 +47,10 @@ export default () => { console.log(info.file, info.fileList); } if (info.file.status === "done") { - message.success(`${info.file.name} 导入成功`); + message.success(`${info.file.name} 上传成功`); setParams({ ...innerParams }, true); } else if (info.file.status === "error") { - message.error(`${info.file.name} 导入失败`); + message.error(`${info.file.name} 上传失败`); } }, }; @@ -57,12 +62,20 @@ export default () => {
@@ -76,7 +89,6 @@ export default () => {
- `id${row.indicatorCode}`} @@ -137,6 +149,7 @@ export default () => { )} />
+ {/* setVisible(false)} fileData={fileData} /> */} ); diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx index a53ed0c..abb52b7 100755 --- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx +++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx @@ -425,7 +425,7 @@ const TotalAmount = ({ }} /> -
金额可为负数
+
金额可为负数,负数为负激励
)} diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/TotalAmountSal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/TotalAmountSal.tsx index 4b7995e..518c276 100755 --- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/TotalAmountSal.tsx +++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/TotalAmountSal.tsx @@ -58,7 +58,7 @@ const TotalAmount = ({ if (dataIndex == "upper" && isPercent == 2) { precision = 2; } - const inputNode = inputType === "number" ? : ; + const inputNode = inputType === "number" ? : ; return ( @@ -360,24 +360,28 @@ const TotalAmount = ({ }} /> +
金额可为负数,负数为负激励
) : ( -
- - + <> + +
+ +
金额可为负数,负数为负激励
+ )} ); diff --git a/src/pages/performance/EvaGroupSetting/components/DraftList.tsx b/src/pages/performance/EvaGroupSetting/components/DraftList.tsx index 6d9b69a..4ac553c 100644 --- a/src/pages/performance/EvaGroupSetting/components/DraftList.tsx +++ b/src/pages/performance/EvaGroupSetting/components/DraftList.tsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useEffect, useState } from "react"; import { PageHeaderWrapper } from "@ant-design/pro-layout"; import { Button, Card, Table, Row, Space, Typography, Divider, Popconfirm, message } from "antd"; import usePagination from "@/hooks/usePagination"; @@ -22,6 +22,9 @@ export default ({ type }: Props) => { status: 2, type: 1, }); + useEffect(() => { + console.log("list", list); + }, [list]); const [visibleDetail, setVisibleDetail] = useState(false); const [item, setItem] = useState({}); //删除 @@ -69,7 +72,7 @@ export default ({ type }: Props) => {
`id${row.id}`} + rowKey={(row) => `id${row.draftId}`} dataSource={list} pagination={paginationConfig} scroll={{ x: 500 }} diff --git a/src/pages/performance/KpiGroupSetting/components/DraftList.tsx b/src/pages/performance/KpiGroupSetting/components/DraftList.tsx index 197dff2..47edbe9 100755 --- a/src/pages/performance/KpiGroupSetting/components/DraftList.tsx +++ b/src/pages/performance/KpiGroupSetting/components/DraftList.tsx @@ -92,7 +92,7 @@ export default ({ type }: Props) => {
`id${row.id}`} + rowKey={(row) => `id${row.draftId}`} dataSource={list} pagination={paginationConfig} scroll={{ x: 500 }}