Skip to content

J
jinfa-platform
Commit 225b3b6f authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

🐞 fix(询价报价): 修改点击弹窗里的报价单号跳转详情

parent 5d4ef078
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 153 deletions
src/pages/transaction/dealAbility/inquiryOffer/detail/index.tsx
View file @ 225b3b6f
......@@ -222,7 +222,7 @@ const InquiryOfferDetail = () => {
title: '商品ID',
key: 'commodityId',
dataIndex: 'commodityId',
render: (commodityId, data) => <Typography.Link target="_blank" href={`${ENTERPRISE_CENTER_URL}/shop/${data.memberId}_${data.memberRoleId}/inquiry/detail/${data.commodityId}`}>{commodityId}</Typography.Link>
// render: (commodityId, data) => <Typography.Link target="_blank" href={`${ENTERPRISE_CENTER_URL}/shop/${data.memberId}_${data.memberRoleId}/inquiry/detail/${data.commodityId}`}>{commodityId}</Typography.Link>
},
{
title: '商品名称',
......
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/productQuote.tsx
View file @ 225b3b6f
......@@ -8,6 +8,7 @@ import { ENTERPRISE_CENTER_URL } from '@/constants';
import { PublicApi } from '@/services/api';
import { StandardTable } from 'god';
import moment from 'moment';
import { getAuth } from '@/utils/auth'
interface ProductQuoteLayoutProps {
/** 回显 */
......@@ -114,12 +115,21 @@ const ProductQuoteLayout: React.FC<ProductQuoteLayoutProps> = (props: any) => {
},
]
const handlePreview = (val) => {
const { memberId } = getAuth()
if (val.quoteMemberId === memberId) {
window.open(`/memberCenter/tranactionAbility/inquiryOffer/offerSearch/offer/preview?id=${val.id}`)
} else {
window.open(`memberCenter/tranactionAbility/confirmOffer/offerSearch/offer/preview?id=${val.id}`)
}
}
const hitoryColumns: ColumnType<any>[] = [
{
title: '商品ID',
key: 'commodityId',
dataIndex: 'commodityId',
render: (commodityId, data) => <Typography.Link target="_blank" href={`${ENTERPRISE_CENTER_URL}/shop/${data.memberId}_${data.memberRoleId}/inquiry/detail/${data.commodityId}`}>{commodityId}</Typography.Link>
// render: (commodityId, data) => <Typography.Link target="_blank" href={`${ENTERPRISE_CENTER_URL}/shop/${data.memberId}_${data.memberRoleId}/inquiry/detail/${data.commodityId}`}>{commodityId}</Typography.Link>
},
{
title: '商品名称',
......@@ -170,7 +180,9 @@ const ProductQuoteLayout: React.FC<ProductQuoteLayoutProps> = (props: any) => {
{
title: '报价单',
key: 'quotationNo',
dataIndex: 'quotationNo'
dataIndex: 'quotationNo',
render: (_text, _record) => <Button type='link' onClick={() => handlePreview(_record)}>{_text}</Button>
},
{
title: '外部状态',
......
src/pages/transaction/marketingAbility/components/listModalLayout/components/productLayout/index.tsx
View file @ 225b3b6f
......@@ -99,7 +99,6 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
{remind.label[3]}{_index + 1}
</span>
{!isPreview && <DeleteOutlined onClick={() => onDeletion(_index)} />}
</div>
<div className={style.productLayout_contenxt}>
{remind.name === 'swapValue' && (
......
src/pages/transaction/marketingAbility/components/listModalLayout/index.less
View file @ 225b3b6f
......@@ -38,173 +38,173 @@
flex: 1;
}
.productLayout_title {
margin-top: 16px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
margin-bottom: 16px;
}
}
.productLayout_title {
margin-top: 16px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
margin-bottom: 16px;
.productLayout_arrow {
flex: 1;
font-size: 12px;
color: #303133;
}
.productLayout_arrow {
flex: 1;
font-size: 12px;
color: #303133;
}
&::before {
content: '';
width: 2px;
height: 12px;
background-color: #00A98F;
margin-right: 6px;
}
}
&::before {
content: '';
width: 2px;
height: 12px;
background-color: #00A98F;
margin-right: 6px;
}
}
.productLayout_contenxt {
// display: flex;
// flex-direction: row;
// flex-wrap: nowrap;
margin-bottom: 16px;
.productLayout_contenxt {
// display: flex;
// flex-direction: row;
// flex-wrap: nowrap;
margin-bottom: 16px;
.productLayout_formItem {
width: 100%;
.productLayout_item {
border: 1px solid #F7F8FA;
padding: 8px;
cursor: pointer;
position: relative;
&:hover{
border-color: #00B37A;
}
.productLayout_item_img {
height: 80px;
width: 80px;
background-position: center;
background-size: contain;
background-repeat: no-repeat;
}
.productLayout_item_title {
font-size: 12px;
color: #252D37;
}
.productLayout_item_price {
color: #91959B;
font-size: 12px;
span{
font-size: 14px;
color: #D32F2F;
}
}
.productLayout_item_info {
font-size: 12px;
color: #91959B;
}
}
}
}
.productLayout_formItem {
width: 100%;
.couponLayout_contenxt {
.productLayout_item {
border: 1px solid #F7F8FA;
padding: 8px;
cursor: pointer;
position: relative;
height: 100px;
width: 100%;
.couponLayout_item_left {
width: 144px;
height: 100%;
background: radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 3px, #3899FF 3px);
background-size: 15px 10px;
background-position: 1% 1px;
position: relative;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-evenly;
p {
font-size: 12px;
text-align: center;
color: #fff;
margin: 0;
span {
font-size: 24px;
}
}
&::before {
content: '';
position: absolute;
width: 25px;
height: 25px;
border-radius: 50%;
box-sizing: border-box;
left: -15px;
top: 37.5px;
z-index: 10;
background-color: #fff;
}
&:hover{
border-color: #00B37A;
}
&::after {
background-color: #3899FF;
content: '';
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 10px;
z-index: -1;
}
.productLayout_item_img {
height: 80px;
width: 80px;
background-position: center;
background-size: contain;
background-repeat: no-repeat;
}
.couponLayout_item_right {
height: 100%;
position: relative;
border: 1px solid #EDEEEF;
border-radius: 0 4px 4px 0;
display: flex;
flex-direction: column;
justify-content: space-evenly;
.productLayout_item_title {
font-size: 12px;
padding-left: 20px;
color: #252D37;
}
.couponLayout_item_right_type {
color: #007BFC;
padding: 2px 4px;
background-color: #E9F3FF;
width: fit-content;
}
.productLayout_item_price {
color: #91959B;
font-size: 12px;
.couponLayout_item_right_info {
span{
font-size: 14px;
color: #252D37;
color: #D32F2F;
}
}
.couponLayout_item_right_date {
color: #91959B;
}
.productLayout_item_info {
font-size: 12px;
color: #91959B;
}
}
}
}
&::after {
content: '';
position: absolute;
width: 25px;
height: 25px;
border-radius: 50%;
border: 1px solid #EDEEEF;
box-sizing: border-box;
right: -15px;
top: 37.5px;
z-index: 10;
background-color: #fff;
}
.couponLayout_contenxt {
position: relative;
height: 100px;
width: 100%;
.couponLayout_item_left {
width: 144px;
height: 100%;
background: radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 3px, #3899FF 3px);
background-size: 15px 10px;
background-position: 1% 1px;
position: relative;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-evenly;
p {
font-size: 12px;
text-align: center;
color: #fff;
margin: 0;
span {
font-size: 24px;
}
}
&::before {
content: '';
position: absolute;
width: 25px;
height: 25px;
border-radius: 50%;
box-sizing: border-box;
left: -15px;
top: 37.5px;
z-index: 10;
background-color: #fff;
}
&::after {
background-color: #3899FF;
content: '';
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 10px;
z-index: -1;
}
}
.couponLayout_item_right {
height: 100%;
position: relative;
border: 1px solid #EDEEEF;
border-radius: 0 4px 4px 0;
display: flex;
flex-direction: column;
justify-content: space-evenly;
font-size: 12px;
padding-left: 20px;
.couponLayout_item_right_type {
color: #007BFC;
padding: 2px 4px;
background-color: #E9F3FF;
width: fit-content;
}
.couponLayout_item_right_info {
font-size: 14px;
color: #252D37;
}
.couponLayout_item_right_date {
color: #91959B;
}
&::after {
content: '';
position: absolute;
width: 25px;
height: 25px;
border-radius: 50%;
border: 1px solid #EDEEEF;
box-sizing: border-box;
right: -15px;
top: 37.5px;
z-index: 10;
background-color: #fff;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment