Commit 24260294 authored by alwayOnlie's avatar alwayOnlie

修改bug

parent bbbe6d01
...@@ -141,10 +141,10 @@ const FormList = (props: any) => { ...@@ -141,10 +141,10 @@ const FormList = (props: any) => {
bidAmount: sourceType == '1' ? item.awardTaxProbability * item.purchaseCount / 100 * item.taxUnitPrice : sourceType == '2' ? item.awardTenderRatio * item.inviteTenderMateriel.count / 100 * item.price : item.price, bidAmount: sourceType == '1' ? item.awardTaxProbability * item.purchaseCount / 100 * item.taxUnitPrice : sourceType == '2' ? item.awardTenderRatio * item.inviteTenderMateriel.count / 100 * item.price : item.price,
// productBrand // productBrand
associatedDataId: _filter(sourceType, item, ['', 'productId', 'commoditySkuId']), // 关联商品id associatedDataId: _filter(sourceType, item, ['', 'productId', 'commoditySkuId']), // 关联商品id
associatedGoods: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityAttribute', '']), //关联 associatedGoods: _filter(sourceType, item, ['', 'productName', 'commodityName', '']), //关联
associatedMaterielNo: _filter(sourceType, item, ['', 'number', 'commodityCode']), // 关联物料编号 // associatedMaterielNo: _filter(sourceType, item, ['', 'number', 'commodityCode']), // 关联物料编号
associatedMaterielName: _filter(sourceType, item, ['', 'productName', 'commodityName']), // 关联商品名称 // associatedMaterielName: _filter(sourceType, item, ['', 'productName', 'commodityName']), // 关联商品名称
associatedType: sourceType == 1 ? _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']).split('-')[1] : _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']), //规格型号 associatedType: sourceType == 1 ? _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']).split('-')[1] : _filter(sourceType, item, ['', 'productAttributeJson', 'commodityAttribute', '']), //规格型号
associatedCategory: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']), // 关联商品品类 associatedCategory: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']), // 关联商品品类
associatedBrand: _filter(sourceType, item, ['', 'productBrand', 'commodityBrand', '']),// 关联品牌 associatedBrand: _filter(sourceType, item, ['', 'productBrand', 'commodityBrand', '']),// 关联品牌
rowId: index, rowId: index,
...@@ -358,10 +358,10 @@ const FormList = (props: any) => { ...@@ -358,10 +358,10 @@ const FormList = (props: any) => {
</div> </div>
<div className={styles.text}> <div className={styles.text}>
<p>商品ID:{record.associatedDataId}</p> <p>商品ID:{record.associatedDataId}</p>
<p>商品名称:{record.associatedMaterielName}</p> <p>商品名称:{record.associatedGoods}</p>
</div> </div>
<div className={styles.text}> <div className={styles.text}>
<p>规格:{record.associatedGoods}</p> <p>规格:{record.associatedType}</p>
<p>品类:{record.associatedCategory}</p> <p>品类:{record.associatedCategory}</p>
</div> </div>
<div className={styles.text}> <div className={styles.text}>
......
...@@ -273,10 +273,10 @@ const Details = (props: any) => { ...@@ -273,10 +273,10 @@ const Details = (props: any) => {
</div> </div>
<div className={style.text}> <div className={style.text}>
<p>商品ID:{record.associatedDataId}</p> <p>商品ID:{record.associatedDataId}</p>
<p className={style.nowrap}>商品名称:{record.associatedMaterielName}</p> <p className={style.nowrap}>商品名称:{record.associatedGoods}</p>
</div> </div>
<div className={style.text}> <div className={style.text}>
<p>规格型号:{record.associatedGoods}</p> <p>规格型号:{record.associatedType}</p>
<p>品类:{record.associatedCategory}</p> <p>品类:{record.associatedCategory}</p>
</div> </div>
<div className={style.text}> <div className={style.text}>
......
...@@ -186,10 +186,10 @@ const FormList = (props: any) => { ...@@ -186,10 +186,10 @@ const FormList = (props: any) => {
</div> </div>
<div className={styles.text}> <div className={styles.text}>
<p>商品ID:{record.associatedDataId}</p> <p>商品ID:{record.associatedDataId}</p>
<p>商品名称:{record.associatedMaterielName}</p> <p>商品名称:{record.associatedGoods}</p>
</div> </div>
<div className={styles.text}> <div className={styles.text}>
<p>规格:{record.associatedGoods}</p> <p>规格:{record.associatedType}</p>
<p>品类:{record.associatedCategory}</p> <p>品类:{record.associatedCategory}</p>
</div> </div>
<div className={styles.text}> <div className={styles.text}>
......
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