lilei 6 mēneši atpakaļ
vecāks
revīzija
c64f80b414

+ 16 - 5
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -221,7 +221,13 @@ export default {
     },
     // 切换tab
     changeTab (e) {
-      this.promoProductClz = e
+      // 促销阶梯
+      if (e.indexOf('GIFT-') >= 0) {
+        this.promoProductClz = e.split('-')[0]
+        this.queryParam.scopeLevel = e.split('-')[1]
+      } else {
+        this.promoProductClz = e
+      }
       this.resetSearchForm()
     },
     // 双击列表添加产品
@@ -269,7 +275,7 @@ export default {
       // 是否卖产品送采购额
       const isMcpScge = this.promoRuleData.promotionRuleType == 'BUY_PROD_GIVE_MONEY' && this.promoRuleData.scopeFlag === '1'
       // 阶梯
-      const hasScopeLevel = this.promoRuleData && this.promoRuleData.giveRuleList && this.promoRuleData.giveRuleList[0]
+      const giveRuleList = this.promoRuleData && this.promoRuleData.giveRuleList
       // 选项卡数据
       const tabList = []
       if (this.promoRuleData) {
@@ -280,8 +286,14 @@ export default {
           tabList.push({ text: '正价产品', val: 'REGULAR' })
         }
         if (this.promoRuleData.regularPromotionSameFlag === '0' || this.promoRuleData.scopeFlag === '0' || isMcpScge) {
-          const levelText = hasScopeLevel && isMcpScp ? '(阶梯' + hasScopeLevel.scopeLevel + ')' : ''
-          tabList.push({ text: '促销产品' + levelText, val: 'GIFT' })
+          if (giveRuleList && isMcpScp) {
+            giveRuleList.forEach(giveRule => {
+              const levelText = '(阶梯' + giveRule.scopeLevel + ')'
+              tabList.push({ text: '促销产品' + levelText, val: 'GIFT-' + giveRule.scopeLevel })
+            })
+          } else {
+            tabList.push({ text: '促销产品', val: 'GIFT' })
+          }
         }
         if (this.promoRuleData.promotionRuleType == 'PROMO_PROD') {
           tabList.push({ text: '特价产品', val: 'DISCOUNT' })
@@ -290,7 +302,6 @@ export default {
       this.tabList = tabList
       this.promoProductClz = tabList[0].val
       this.tableHeight = window.innerHeight - 330
-      this.queryParam.scopeLevel = hasScopeLevel.scopeLevel
       this.resetSearchForm()
     },
     // 刷新当前页面

+ 8 - 3
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -437,7 +437,7 @@ export default {
                     >换促销</a-button> : ''
                 }
                 {
-                  !(row.promotionFlag == 'GIFT' && row.salesPromoDetailParentSn)
+                  !(row.promotionFlag == 'GIFT' && row.salesPromoDetailParentSn) && row.regularPromotionSameFlag != 1
                     ? <a-button
                       id={'salesEdit-del-' + row.id}
                       size="small"
@@ -445,7 +445,7 @@ export default {
                       loading={_this.delLoading}
                       class="button-error"
                       onClick={() => _this.handleDel(row)}
-                    >删除</a-button> : ''
+                    >删除{row.regularPromotionSameFlag}</a-button> : ''
                 }
               </div>
             )
@@ -517,7 +517,12 @@ export default {
             if (data[i].promotionFlag == 'GIFT' && !!data[i].salesPromoDetailParentSn) {
               this.disableSelectedRowKeys.push(data[i].id)
             }
-            // 正促是否一致
+            // 促销品,正促是否一致
+            if (data[i].promotionFlag.indexOf('GIFT') >= 0 && data[i].promoRuleSnList) {
+              const ruleObj = this.activeList.find(item => item.promoRuleSn == data[i].promoRuleSnList[0])
+              console.log(ruleObj)
+              data[i].regularPromotionSameFlag = ruleObj.regularPromotionSameFlag
+            }
           }
           this.dataSource = data
         } else {