lilei 3 weeks ago
parent
commit
42e814503d
1 changed files with 12 additions and 12 deletions
  1. 12 12
      src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

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

@@ -102,8 +102,8 @@ export default {
           // 当前勾选产品
           const endSelProduct = selectedRowKeys[selectedRowKeys.length - 1]
           // 叠加多选
-          if (endSelProduct && row.promotion && row.promotion.stackFlag == '1') {
-            const rows = this.tableData.filter(item => selectedRowKeys.includes(item.salesPromoSn) && item.promotion && item.promotion.stackFlag == '1')
+          if (endSelProduct && row.promotionRule && row.promotionRule.stackFlag == '1') {
+            const rows = this.tableData.filter(item => selectedRowKeys.includes(item.salesPromoSn) && item.promotionRule && item.promotionRule.stackFlag == '1')
             this.checkboxOption.selectedRowKeys = rows.map(item => item.salesPromoSn)
           } else {
             // 非叠加单选
@@ -190,16 +190,16 @@ export default {
           align: 'center',
           fixed: 'left',
           renderBodyCell: ({ row, column, rowIndex }, h) => {
-            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotion.stackFlag == 1 && _this.type == 'edit' // 是否特价叠加
-            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotion.stackFlag == 1).length // 特价叠加活动数量
-            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotion.stackFlag == 1) // 特价叠加活动开始索引
+            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotionRule.stackFlag == 1 && _this.type == 'edit' // 是否特价叠加
+            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1).length // 特价叠加活动数量
+            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1) // 特价叠加活动开始索引
             // 特价活动上移下移排序
             const equalWord = <div class="table-arrow-box">
               {rowIndex > tjStart ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}
               {rowIndex < tjStart + tejiaLen - 1 ? <span class="down" onClick={() => _this.moveTjRow(row, rowIndex, 0)} title="下移">⇣</span> : <span></span>}
             </div>
             // 买产品送产品  同款产品 是累计产品才弹详情窗
-            if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotion.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
+            if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotionRule.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
               return (<div style="width:100%;display:flex;justify-content: space-between;">
                 <div class="table-link-text" onClick={() => _this.showBuyGifts(row)} style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
                 {isTejia && tejiaLen > 1 ? equalWord : ''}
@@ -243,8 +243,8 @@ export default {
                 <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{row[column.field]}</span>
               </div>
               <div style="position:absolute;right:0;">
-                {row.promotion.stackFlag == 1 ? <a-badge count="叠" numberStyle={{ backgroundColor: '#00aa00', marginLeft: '2px', zoom: '0.7' }}/> : ''}
-                {row.promotion.borrowFlag == 1 ? <a-badge count="累" numberStyle={{ backgroundColor: '#F5222D', marginLeft: '2px', zoom: '0.7' }} /> : ''}
+                {row.promotionRule.stackFlag == 1 ? <a-badge count="叠" numberStyle={{ backgroundColor: '#00aa00', marginLeft: '2px', zoom: '0.7' }}/> : ''}
+                {row.promotionRule.borrowFlag == 1 ? <a-badge count="累" numberStyle={{ backgroundColor: '#F5222D', marginLeft: '2px', zoom: '0.7' }} /> : ''}
               </div>
             </div>)
           }
@@ -496,10 +496,10 @@ export default {
             if (row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD') {
               importButton.push({ key: 'DISCOUNT', name: '特价产品' })
             }
-            if (row && row.promotion && row.promotion.borrowFlag == 1 && row.promotionRule.gateFlag === '1') {
+            if (row && row.promotionRule && row.promotionRule.borrowFlag == 1 && row.promotionRule.gateFlag === '1') {
               importButton.push({ key: 'BORROW_GATE', name: '累计门槛产品' })
             }
-            if (row && row.promotion && row.promotion.borrowFlag == 1 && row.promotionRule.promotionRuleType != 'PROMO_PROD') {
+            if (row && row.promotionRule && row.promotionRule.borrowFlag == 1 && row.promotionRule.promotionRuleType != 'PROMO_PROD') {
               importButton.push({ key: 'BORROW_REGULAR', name: '累计正价产品' })
             }
             return (
@@ -529,7 +529,7 @@ export default {
                 >
                  添加
                 </a-button> : ''}
-                {row.enabledFlag == 1 && row.promotion.borrowFlag == 1 ? <a-button
+                {row.enabledFlag == 1 && row.promotionRule.borrowFlag == 1 ? <a-button
                   type="link"
                   size="small"
                   class="button-primary"
@@ -735,7 +735,7 @@ export default {
       const _this = this
       // 启用
       if (item.enabledFlag == 0) {
-        const isJiejia = item.promotion.stackFlag == 1 // 叠加产品
+        const isJiejia = item.promotionRule.stackFlag == 1 // 叠加产品
         this.$confirm({
           title: item.promotion.description + '-' + item.promotionRule.description + ',确定启用规则?',
           centered: true,