模板管理中的指标自动合并bug修复
This commit is contained in:
@ -243,8 +243,8 @@ const SupplierEvaluateResultScoreByList: React.FC = () => {
|
||||
},
|
||||
{
|
||||
title: intl.formatMessage({ id: 'supplierEvaluateResult.column.evaluatorName' }),
|
||||
dataIndex: 'evaluatorName',
|
||||
key: 'evaluatorName',
|
||||
dataIndex: 'userName',
|
||||
key: 'userName',
|
||||
width: 120,
|
||||
ellipsis: {
|
||||
showTitle: false,
|
||||
|
@ -16,7 +16,7 @@ import { ArrowLeftOutlined, SaveOutlined, ExclamationCircleOutlined } from '@ant
|
||||
import { getIndicator, saveEvaluateScore } from '@/servers/api/supplierEvaluate';
|
||||
import ScoreEvaluationTable from '@/components/ScoreEvaluationTable';
|
||||
import styles from './supplierEvaluateScore.less';
|
||||
|
||||
import { useUser } from '@/hooks/useUser';
|
||||
const { Title } = Typography;
|
||||
const { confirm } = Modal;
|
||||
|
||||
@ -34,7 +34,7 @@ const SupplierEvaluateScoreDetail: React.FC = () => {
|
||||
const [record, setRecord] = useState<any>(null);
|
||||
const [mode, setMode] = useState<'view' | 'score'>('view'); // 默认为查看模式
|
||||
const [recordType, setRecordType] = useState<'supplier' | 'task'>('supplier'); // 默认为供应商类型
|
||||
|
||||
const { getUserId } = useUser();
|
||||
// 从路由获取传递的记录
|
||||
useEffect(() => {
|
||||
if (location.state?.record) {
|
||||
@ -173,6 +173,7 @@ const SupplierEvaluateScoreDetail: React.FC = () => {
|
||||
// 构建提交数据
|
||||
const submitData: SupplierEvaluateScore.ScoreSaveRequest = {
|
||||
id: record.id,
|
||||
userId: getUserId(),
|
||||
scoreVoList: scoreData.flatMap((item) => {
|
||||
return item.indicatorNdList.map((subItem: any) => ({
|
||||
id: subItem.id,
|
||||
|
Reference in New Issue
Block a user