评审结果去掉拟签约金额等

This commit is contained in:
jlzhangyx5
2025-06-30 16:28:31 +08:00
parent c801c68719
commit b23731ef63
2 changed files with 83 additions and 80 deletions

View File

@ -822,69 +822,70 @@ const GroupLeader: React.FC = () => {
}; };
}, },
}, },
{ // {
title: `是否拟${candidateType}`, // title: `是否拟${candidateType}人`,
dataIndex: 'winnerBidder', // dataIndex: 'winnerBidder',
valueType: 'select', // valueType: 'select',
width: 120, // width: 120,
editable: !confirmSubmitStatus, // editable: !confirmSubmitStatus,
valueEnum: successfulWinning, // valueEnum: successfulWinning,
formItemProps: () => {
return { // formItemProps: () => {
rules: [{ required: true, message: `请选择是否拟${candidateType}` }], // return {
}; // rules: [{ required: true, message: `请选择是否拟${candidateType}人` }],
}, // };
}, // },
{ // },
title: contractedMoneyName, // {
dataIndex: 'contractedMoney', // title: contractedMoneyName,
width: 150, // dataIndex: 'contractedMoney',
editable: !confirmSubmitStatus, // width: 150,
formItemProps: (from: any, { rowKey, rowIndex }: any) => { // editable: !confirmSubmitStatus,
return { // formItemProps: (from: any, { rowKey, rowIndex }: any) => {
rules: quotationMethod ? [] : [ // return {
{ // rules: quotationMethod ? [] : [
pattern: regularCheck, // {
message: '请输入数字,并且小数点后最多只能输入五位' // pattern: regularCheck,
}, // message: '请输入数字,并且小数点后最多只能输入五位'
{ // },
validator: () => { // {
from.validateFields([[rowKey, 'taxRatePrice']]); // validator: () => {
return Promise.resolve() // from.validateFields([[rowKey, 'taxRatePrice']]);
}, // return Promise.resolve()
message: "增值税金额不能高于拟签约的金额" // },
} // message: "增值税金额不能高于拟签约的金额"
], // }
}; // ],
}, // };
}, // },
{ // },
title: taxRatePriceName, // {
dataIndex: 'taxRatePrice', // title: taxRatePriceName,
width: 150, // dataIndex: 'taxRatePrice',
editable: !confirmSubmitStatus, // width: 150,
formItemProps: (from: any, { rowKey, rowIndex }: any) => { // editable: !confirmSubmitStatus,
let contractedMoney = from.getFieldValue([rowKey || '', 'contractedMoney']); // formItemProps: (from: any, { rowKey, rowIndex }: any) => {
let taxRatePrice = from.getFieldValue([rowKey || '', 'taxRatePrice']); // let contractedMoney = from.getFieldValue([rowKey || '', 'contractedMoney']);
return { // let taxRatePrice = from.getFieldValue([rowKey || '', 'taxRatePrice']);
rules: quotationMethod ? [] : [ // return {
{ // rules: quotationMethod ? [] : [
pattern: regularCheck, // {
message: '请输入数字,并且小数点后最多只能输入五位' // pattern: regularCheck,
}, // message: '请输入数字,并且小数点后最多只能输入五位'
{ // },
validator: () => { // {
if (isEmpty(contractedMoney) || isEmpty(taxRatePrice)) { // validator: () => {
return Promise.resolve(); // if (isEmpty(contractedMoney) || isEmpty(taxRatePrice)) {
} // return Promise.resolve();
return (Number(taxRatePrice) < Number(contractedMoney) || (Number(taxRatePrice) == Number(contractedMoney))) ? Promise.resolve() : Promise.reject(new Error('增值税金额不能高于拟签约的金额')) // }
}, // return (Number(taxRatePrice) < Number(contractedMoney) || (Number(taxRatePrice) == Number(contractedMoney))) ? Promise.resolve() : Promise.reject(new Error('增值税金额不能高于拟签约的金额'))
message: "增值税金额不能高于拟签约的金额" // },
} // message: "增值税金额不能高于拟签约的金额"
], // }
}; // ],
}, // };
}, // },
// },
] : ] :
//预审字段 //预审字段
[ [
@ -1233,7 +1234,8 @@ const GroupLeader: React.FC = () => {
// if (verificationDanger()) { // if (verificationDanger()) {
// return; // return;
// } // }
verificationMoneyIsEdit(data); //2025.6.25 zyx 中远海运去掉拟签约金额和增值税金额 verificationMoneyIsEdit(data);
submit()//2025.6.25 zyx 中远海运去掉拟签约金额和增值税金额
} }
//提交接口调用 //提交接口调用
function submit() { function submit() {
@ -1415,16 +1417,17 @@ const GroupLeader: React.FC = () => {
} }
return true; return true;
} }
if (bidMethodDict != 'procurement_mode_7') { //2025.6.25 zyx 中远海运去掉是否拟中标人、拟签约金额和增值税金额
if (winnerBidderData.length !== 0) {//验证是否拟中标人 // if (bidMethodDict != 'procurement_mode_7') {
message.info(bidMethodDict === 'procurement_mode_4' ? `${winnerBidderData[0].companyName}未选择是否拟入围人!` : `${winnerBidderData[0].companyName}未选择是否拟${candidateType}人!`); // if (winnerBidderData.length !== 0) {//验证是否拟中标人
return true; // message.info(bidMethodDict === 'procurement_mode_4' ? `${winnerBidderData[0].companyName}未选择是否拟入围人!` : `${winnerBidderData[0].companyName}未选择是否拟${candidateType}人!`);
} // return true;
if (contractedMoneyData.length !== 0) {//验证拟签约金额是否高于标段预算 // }
message.info(`${contractedMoneyData[0].companyName}拟签约金额不能高于标段预算${bidSectContractPrice}元)`); // if (contractedMoneyData.length !== 0) {//验证拟签约金额是否高于标段预算
return true; // message.info(`${contractedMoneyData[0].companyName}的拟签约金额不能高于标段预算(${bidSectContractPrice}元)`);
} // return true;
} // }
// }
return false; return false;
} }

View File

@ -151,12 +151,12 @@ const SortEditableTable: React.FC<SortEditableTableProps> = (props) => {
} }
} }
}, },
{ // {
title: `是否${candidateType}候选人`, // title: `是否${candidateType}候选人`,
dataIndex: 'winnerCandidate', // dataIndex: 'winnerCandidate',
valueType: 'select', // valueType: 'select',
valueEnum: successfulCandidate, // valueEnum: successfulCandidate,
}, // },
] ]
setColumns(enquiryColumns); setColumns(enquiryColumns);
return; return;