Merge branch '20230609-修改文字显示' into 'release_20230609'

6.9

See merge request eshop/fe_service_ebtp_frontend!272
This commit is contained in:
jl-zhoujl2
2023-06-09 16:23:32 +00:00
4 changed files with 28 additions and 28 deletions

View File

@ -219,13 +219,13 @@ const Index: React.FC<{}> = () => {
confirm({
title: <>
<p>使megp文件--</p>
<p>便</p>
<p style={{ color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={(getSessionProjectData().isIPassFile == '1') && !supplierStatus ? { marginBottom: 0 } : {}}>便</p>
<p style={(getSessionProjectData().isIPassFile == '1') ? { color: "#b30000", marginBottom: 0 } : { color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
<p style={{ color: "#b30000", marginBottom: 0 }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
</>,
icon: <ExclamationCircleOutlined />,
width: supplierStatus ? 720 : 416,
width: supplierStatus || (getSessionProjectData().isIPassFile != '1') ? 600 : 416,
okText: '知道了',
centered: true,
cancelButtonProps: {

View File

@ -301,11 +301,11 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
okText: "好的,我已知晓",
onOk() {
Modal.warning({
title: <><span>使megp文件--</span>
<p>便</p>
<p style={{ color: "#b30000", marginTop: "10px" }} hidden={!supplierStatus}>---</p>
title: <><p>使megp文件--</p>
<p style={(getSessionProjectData().isIPassFile == '1') && !supplierStatus ? { marginBottom: 0 } : {}}>便</p>
<p style={(getSessionProjectData().isIPassFile == '1') ? { color: "#b30000", marginBottom: 0 } : { color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
<p style={{ color: "#b30000", marginBottom: 0 }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
</>,
onOk() {
saveRecord(returnStitchingAddress(data)).then(res => { // 下载记录
@ -315,17 +315,17 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
resolve(true);
},
centered: true,
width: supplierStatus ? 720 : 416,
width: supplierStatus || (getSessionProjectData().isIPassFile != '1') ? 600 : 416,
})
},
});
} else {
Modal.warning({
title: <><span>使megp文件--</span>
<p>便</p>
<p style={{ color: "#b30000", marginTop: "10px" }} hidden={!supplierStatus}>---</p>
title: <><p>使megp文件--</p>
<p style={(getSessionProjectData().isIPassFile == '1') && !supplierStatus ? { marginBottom: 0 } : {}}>便</p>
<p style={(getSessionProjectData().isIPassFile == '1') ? { color: "#b30000", marginBottom: 0 } : { color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
<p style={{ color: "#b30000", marginBottom: 0 }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
</>,
onOk() {
saveRecord(returnStitchingAddress(data)).then(res => { // 下载记录
@ -335,7 +335,7 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
resolve(true);
},
centered: true,
width: supplierStatus ? 720 : 416,
width: supplierStatus || (getSessionProjectData().isIPassFile != '1') ? 600 : 416,
})
}
} else {

View File

@ -205,13 +205,13 @@ const Index: React.FC<IndexProps> = (props) => {
confirm({
title: <>
<p>使megp文件--</p>
<p>便</p>
<p style={{ color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={(getSessionProjectData().isIPassFile == '1') && !supplierStatus ? { marginBottom: 0 } : {}}>便</p>
<p style={(getSessionProjectData().isIPassFile == '1') ? { color: "#b30000", marginBottom: 0 } : { color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
<p style={{ color: "#b30000", marginBottom: 0 }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
</>,
icon: <ExclamationCircleOutlined />,
width: supplierStatus ? 720 : 416,
width: supplierStatus || (getSessionProjectData().isIPassFile != '1') ? 600 : 416,
okText: '知道了',
cancelButtonProps: {
className: 'display-cancel',

View File

@ -179,11 +179,11 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
okText: "好的,我已知晓",
onOk() {
Modal.warning({
title: <><span>使megp文件--</span>
<p>便</p>
<p style={{ color: "#b30000", marginTop: "10px" }} hidden={!supplierStatus}>---</p>
title: <><p>使megp文件--</p>
<p style={(getSessionProjectData().isIPassFile == '1') && !supplierStatus ? { marginBottom: 0 } : {}}>便</p>
<p style={(getSessionProjectData().isIPassFile == '1') ? { color: "#b30000", marginBottom: 0 } : { color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
<p style={{ color: "#b30000", marginBottom: 0 }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
</>,
onOk() {
saveRecord(returnStitchingAddress(data)).then(res => { // 下载记录
@ -193,17 +193,17 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
resolve(true);
},
centered: true,
width: supplierStatus ? 720 : 416,
width: supplierStatus || (getSessionProjectData().isIPassFile != '1') ? 600 : 416,
})
},
});
} else {
Modal.warning({
title: <><span>使megp文件--</span>
<p>便</p>
<p style={{ color: "#b30000", marginTop: "10px" }} hidden={!supplierStatus}>---</p>
title: <><p>使megp文件--</p>
<p style={(getSessionProjectData().isIPassFile == '1') && !supplierStatus ? { marginBottom: 0 } : {}}>便</p>
<p style={(getSessionProjectData().isIPassFile == '1') ? { color: "#b30000", marginBottom: 0 } : { color: "#b30000" }} hidden={!supplierStatus}>---</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS</p>
<p style={{ color: "#b30000" }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
<p style={{ color: "#b30000", marginBottom: 0 }} hidden={getSessionProjectData().isIPassFile == '1' ? true : false}>iPASS证书中维护的组织机构代码证号一致,4000560010-1iPASS更新 </p>
</>,
onOk() {
saveRecord(returnStitchingAddress(data)).then(res => { // 下载记录
@ -213,7 +213,7 @@ const DownloadPurchasingDocuments: React.FC<{}> = () => {
resolve(true);
},
centered: true,
width: supplierStatus ? 720 : 416,
width: supplierStatus || (getSessionProjectData().isIPassFile != '1') ? 600 : 416,
})
}
} else {