Commit 3615c547 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:

parent 64ed43ae
......@@ -256,15 +256,17 @@
}
// 处理高级筛选input和search按钮不对齐问题、search按钮背景
.ant-input-search {
.ant-input-group {
.ant-input {
padding: 6px;
.god-standard-table {
.ant-input-search {
.ant-input-group {
.ant-input {
padding: 6px;
}
}
}
.ant-input-group-addon {
.ant-input-search-button {
background-color: #F7F8FA;
.ant-input-group-addon {
.ant-input-search-button {
background-color: #F7F8FA;
}
}
}
}
......
......@@ -59,7 +59,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
/** 组合table所需data */
let tempData: any = []
// 只需取一个投标会员的物料项 决定table的行数
_memberList[0].submitTender.submitTenderMateriel.forEach((item, index) => {
_memberList[0]?.submitTender && _memberList[0].submitTender.submitTenderMateriel.forEach((item, index) => {
tempData.push({
inviteTenderMateriel: item.inviteTenderMateriel,
count: item.inviteTenderMateriel.count,
......
......@@ -201,7 +201,7 @@ export const RelevanceTenderProduct: React.FC<RelateProductDrawerProps> = ({
if(item => item.id === currentMaterial[0]['id']) {
item.file = v['file']
item.commodityId = selectRow[0]['id']
item.productId = selectRow[0]['commodityId']
item.commoditySkuId = selectRow[0]['commodityId']
// item.commodityId = selectRow[0]['commodityId']
}
return item
......
......@@ -110,7 +110,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
})
}
// 校验是否关联商品
if(!params.submitTenderMateriel.some(v => v.productId && v.commodityId)) {
if(!params.submitTenderMateriel.some(v => v.commoditySkuId && v.commodityId)) {
// if(!params.submitTenderMateriel.some(v => v.commodityId)) {
setBtnLoading(false)
return message.error('请先关联投标商品')
......
......@@ -97,7 +97,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
const renderDescription = async (record) => {
// 商品信息
let res = await PublicApi.getProductCommodityGetCommodity({id: record.productId})
let res = await PublicApi.getProductCommodityGetCommodity({id: record.commoditySkuId})
// 商品规格信息
let spec = await PublicApi.getProductCommodityGetCommodityAttributeByUnitPriceAndPicId({ unitPriceAndPicId: record.commodityId })
const { code , data } = res
......
......@@ -332,7 +332,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
id: Number(id),
paymentInformationId: PayInfoObj.id,
// 大于100为账期月结 id固定为-1
payTypeId: checked.id >= 100 && -1,
payTypeId: checked.id >= 100 ? -1 : checked.id,
payType: checked.channel,
}
......
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