Sfoglia il codice sorgente

Merge branch 'develop_yh50' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh50

lilei 4 mesi fa
parent
commit
7c07f1d61a

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -531,8 +531,8 @@ export default {
         const regularQuota = item.promotionRule.promotionRuleType != 'PROMO_PROD' ? item.gateQuotaAmount : 0// 配额  // 额度item.regularRuleValue
         const regularSelected = isYuan1 ? item.regularTotalAmount : item.regularTotalQty // 已选
         const regularTotal = isYuan1 ? item.regularBorrowAmount : item.regularBorrowQty // 累计
-        const regularBaseVal = (isYuan1 ? item.baseAmount : item.baseQty) * 1 <= 0 ? 0 : (isYuan1 ? item.baseAmount : item.baseQty) // 基础差
-        const regularNextVal = (isYuan1 ? item.nextAmount : item.nextQty) * 1 <= 0 ? 0 : (isYuan1 ? item.nextAmount : item.nextQty) // 下级差
+        const regularBaseVal = (item.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && item.promotionRule.regularPromotionSameFlag == 1) ? undefined : (isYuan1 ? item.baseAmount : item.baseQty) * 1 <= 0 ? 0 : (isYuan1 ? item.baseAmount : item.baseQty) // 基础差
+        const regularNextVal = (item.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && item.promotionRule.regularPromotionSameFlag == 1) ? undefined : (isYuan1 ? item.nextAmount : item.nextQty) * 1 <= 0 ? 0 : (isYuan1 ? item.nextAmount : item.nextQty) // 下级差
         // 促销品
         const promoUnit = '个'
         const promoSelected = item.giftQty || 0 // 已选

+ 4 - 2
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -449,6 +449,7 @@ export default {
           align: 'center',
           fixed: 'right',
           operationColumn: false,
+          // regularPromotionSameFlag 是否正促一致
           renderBodyCell: ({ row, column, rowIndex }, h) => {
             return (
               <div>
@@ -464,7 +465,7 @@ export default {
                     >换促销</a-button> : ''
                 }
                 {
-                  !(row.promotionFlag == 'GIFT' && row.salesPromoDetailParentSn) && row.regularPromotionSameFlag != 1
+                  row.promotionFlag != 'GIFT'
                     ? <a-button
                       id={'salesEdit-del-' + row.id}
                       size="small"
@@ -472,9 +473,10 @@ export default {
                       disabled={_this.delLoading}
                       class="button-error"
                       onClick={() => _this.handleDel(row)}
-                    >删除{row.regularPromotionSameFlag}</a-button> : ''
+                    >删除{row.regularPromotionSameFlag}</a-button> : '--'
                 }
               </div>
+
             )
           }
         }