diff --git a/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx b/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx index 82ca780..117f5fc 100644 --- a/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx +++ b/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx @@ -822,69 +822,70 @@ const GroupLeader: React.FC = () => { }; }, }, - { - title: `是否拟${candidateType}人`, - dataIndex: 'winnerBidder', - valueType: 'select', - width: 120, - editable: !confirmSubmitStatus, - valueEnum: successfulWinning, - formItemProps: () => { - return { - rules: [{ required: true, message: `请选择是否拟${candidateType}人` }], - }; - }, - }, - { - title: contractedMoneyName, - dataIndex: 'contractedMoney', - width: 150, - editable: !confirmSubmitStatus, - formItemProps: (from: any, { rowKey, rowIndex }: any) => { - return { - rules: quotationMethod ? [] : [ - { - pattern: regularCheck, - message: '请输入数字，并且小数点后最多只能输入五位' - }, - { - validator: () => { - from.validateFields([[rowKey, 'taxRatePrice']]); - return Promise.resolve() - }, - message: "增值税金额不能高于拟签约的金额" - } - ], - }; - }, - }, - { - title: taxRatePriceName, - dataIndex: 'taxRatePrice', - width: 150, - editable: !confirmSubmitStatus, - formItemProps: (from: any, { rowKey, rowIndex }: any) => { - let contractedMoney = from.getFieldValue([rowKey || '', 'contractedMoney']); - let taxRatePrice = from.getFieldValue([rowKey || '', 'taxRatePrice']); - return { - rules: quotationMethod ? [] : [ - { - pattern: regularCheck, - message: '请输入数字，并且小数点后最多只能输入五位' - }, - { - validator: () => { - if (isEmpty(contractedMoney) || isEmpty(taxRatePrice)) { - return Promise.resolve(); - } - return (Number(taxRatePrice) < Number(contractedMoney) || (Number(taxRatePrice) == Number(contractedMoney))) ? Promise.resolve() : Promise.reject(new Error('增值税金额不能高于拟签约的金额')) - }, - message: "增值税金额不能高于拟签约的金额" - } - ], - }; - }, - }, + // { + // title: `是否拟${candidateType}人`, + // dataIndex: 'winnerBidder', + // valueType: 'select', + // width: 120, + // editable: !confirmSubmitStatus, + // valueEnum: successfulWinning, + + // formItemProps: () => { + // return { + // rules: [{ required: true, message: `请选择是否拟${candidateType}人` }], + // }; + // }, + // }, + // { + // title: contractedMoneyName, + // dataIndex: 'contractedMoney', + // width: 150, + // editable: !confirmSubmitStatus, + // formItemProps: (from: any, { rowKey, rowIndex }: any) => { + // return { + // rules: quotationMethod ? [] : [ + // { + // pattern: regularCheck, + // message: '请输入数字，并且小数点后最多只能输入五位' + // }, + // { + // validator: () => { + // from.validateFields([[rowKey, 'taxRatePrice']]); + // return Promise.resolve() + // }, + // message: "增值税金额不能高于拟签约的金额" + // } + // ], + // }; + // }, + // }, + // { + // title: taxRatePriceName, + // dataIndex: 'taxRatePrice', + // width: 150, + // editable: !confirmSubmitStatus, + // formItemProps: (from: any, { rowKey, rowIndex }: any) => { + // let contractedMoney = from.getFieldValue([rowKey || '', 'contractedMoney']); + // let taxRatePrice = from.getFieldValue([rowKey || '', 'taxRatePrice']); + // return { + // rules: quotationMethod ? [] : [ + // { + // pattern: regularCheck, + // message: '请输入数字，并且小数点后最多只能输入五位' + // }, + // { + // validator: () => { + // if (isEmpty(contractedMoney) || isEmpty(taxRatePrice)) { + // return Promise.resolve(); + // } + // return (Number(taxRatePrice) < Number(contractedMoney) || (Number(taxRatePrice) == Number(contractedMoney))) ? Promise.resolve() : Promise.reject(new Error('增值税金额不能高于拟签约的金额')) + // }, + // message: "增值税金额不能高于拟签约的金额" + // } + // ], + // }; + // }, + // }, ] : //预审字段 [ @@ -1233,7 +1234,8 @@ const GroupLeader: React.FC = () => { // if (verificationDanger()) { // return; // } - verificationMoneyIsEdit(data); + //2025.6.25 zyx 中远海运去掉拟签约金额和增值税金额 verificationMoneyIsEdit(data); + submit()//2025.6.25 zyx 中远海运去掉拟签约金额和增值税金额 } //提交接口调用 function submit() { @@ -1415,16 +1417,17 @@ const GroupLeader: React.FC = () => { } return true; } - if (bidMethodDict != 'procurement_mode_7') { - if (winnerBidderData.length !== 0) {//验证是否拟中标人 - 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}元）`); - return true; - } - } + //2025.6.25 zyx 中远海运去掉是否拟中标人、拟签约金额和增值税金额 + // if (bidMethodDict != 'procurement_mode_7') { + // if (winnerBidderData.length !== 0) {//验证是否拟中标人 + // 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}元）`); + // return true; + // } + // } return false; } diff --git a/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/SortEditableTable.tsx b/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/SortEditableTable.tsx index 3cb3e2f..5af2723 100644 --- a/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/SortEditableTable.tsx +++ b/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/SortEditableTable.tsx @@ -151,12 +151,12 @@ const SortEditableTable: React.FC = (props) => { } } }, - { - title: `是否${candidateType}候选人`, - dataIndex: 'winnerCandidate', - valueType: 'select', - valueEnum: successfulCandidate, - }, + // { + // title: `是否${candidateType}候选人`, + // dataIndex: 'winnerCandidate', + // valueType: 'select', + // valueEnum: successfulCandidate, + // }, ] setColumns(enquiryColumns); return;