liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220608-供应商可以在确认报价前查看到其他人的分项报价' into 'release_20220624'

Browse Source 
6.24 供应商可以在确认报价前查看到其他人的分项报价

See merge request eshop/fe_service_ebtp_frontend!140
This commit is contained in:
周建龙
2022-06-24 21:26:01 +08:00
parent f3e549c8d7 5fcc7ecd27
commit 2b6da9833c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Opening/ProjectManager/Room/index.tsx
View File

@ -350,7 +350,7 @@ const Room: React.FC<{}> = () => {
return ( return (
<> <>
{ {
rangeT && record.quoteId != null ? <> rangeT && record.quoteId != null && record.isSignTime ? <>
<Button key='ckfxbj' onClick={() => { queryFxbj(record, tdocId1); }}>查看分项报价</Button> <Button key='ckfxbj' onClick={() => { queryFxbj(record, tdocId1); }}>查看分项报价</Button>
</> : null </> : null
} }
@ -375,6 +375,7 @@ const Room: React.FC<{}> = () => {
}); });
//拼data //拼data
let haveCompleteT = false; let haveCompleteT = false;
const isLocalSign_: boolean = res.data.suppliers.findIndex((item: any) => item.bidUserId == userId ? item.signTime != null : false) != -1;
res.data.suppliers != undefined ? res.data.suppliers.map((item1: any, index: any) => { res.data.suppliers != undefined ? res.data.suppliers.map((item1: any, index: any) => {
let oneGys = {}; let oneGys = {};
signTimeT[item1.bidUserId] = item1.signTime == null ? true : false;//控制显示 确认报价按钮 signTimeT[item1.bidUserId] = item1.signTime == null ? true : false;//控制显示 确认报价按钮
@ -389,6 +390,7 @@ const Room: React.FC<{}> = () => {
oneGys["newPriceRemark"] = item1.newPriceRemark;//数据表id，补录报价用 oneGys["newPriceRemark"] = item1.newPriceRemark;//数据表id，补录报价用
oneGys["quoteDecryptStatus"] = item1.quoteDecryptStatus; oneGys["quoteDecryptStatus"] = item1.quoteDecryptStatus;
oneGys["quoteId"] = item1.quoteId; oneGys["quoteId"] = item1.quoteId;
oneGys["isSignTime"] = juese == "ebtp-supplier" ? item1.bidUserId == userId ? true : isLocalSign_ : true;
if (item1.companyId == tenderId) { if (item1.companyId == tenderId) {
category.map((item2: any, index: any) => { category.map((item2: any, index: any) => {
oneGys[item2] = item1.dataMap[item2]; oneGys[item2] = item1.dataMap[item2];

4
src/pages/ZTanPan/RoomConfig/View/Manager/Sing/index.tsx
View File

@ -320,7 +320,7 @@ const Room: React.FC<{}> = () => {
return ( return (
<> <>
{ {
rangeT && record.quoteId != null ? <> rangeT && record.quoteId != null && record.isSignTime ? <>
<Button key='ckfxbj' onClick={() => { queryFxbj(record, tdocId1); }}>查看分项报价</Button> <Button key='ckfxbj' onClick={() => { queryFxbj(record, tdocId1); }}>查看分项报价</Button>
</> : null </> : null
} }
@ -345,6 +345,7 @@ const Room: React.FC<{}> = () => {
}); });
//拼data //拼data
let haveCompleteT = false; let haveCompleteT = false;
const isLocalSign_: boolean = res.data.suppliers.findIndex((item: any) => item.bidUserId == userId ? item.signTime != null : false) != -1;
res.data.suppliers != undefined ? res.data.suppliers.map((item1: any, index: any) => { res.data.suppliers != undefined ? res.data.suppliers.map((item1: any, index: any) => {
let oneGys = {}; let oneGys = {};
signTimeT[item1.bidUserId] = item1.signTime == null ? true : false;//控制显示 确认报价按钮 signTimeT[item1.bidUserId] = item1.signTime == null ? true : false;//控制显示 确认报价按钮
@ -359,6 +360,7 @@ const Room: React.FC<{}> = () => {
oneGys["newPriceRemark"] = item1.newPriceRemark;//数据表id，补录报价用 oneGys["newPriceRemark"] = item1.newPriceRemark;//数据表id，补录报价用
oneGys["quoteDecryptStatus"] = item1.quoteDecryptStatus; oneGys["quoteDecryptStatus"] = item1.quoteDecryptStatus;
oneGys["quoteId"] = item1.quoteId; oneGys["quoteId"] = item1.quoteId;
oneGys["isSignTime"] = juese === 'ebtp-supplier' ? item1.bidUserId == userId ? true : isLocalSign_ : true;
if (item1.companyId == tendererId) { if (item1.companyId == tendererId) {
category.map((item2: any, index: any) => { category.map((item2: any, index: any) => {
oneGys[item2] = item1.dataMap[item2]; oneGys[item2] = item1.dataMap[item2];