lilei 6 月之前
父节点
当前提交
1a8a471c5e

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

@@ -178,17 +178,17 @@ export default {
         {
           field: 'promotionRuleType',
           key: '2',
-          width: 100,
+          width: 90,
           title: '活动类型',
           align: 'center',
           fixed: 'left',
           renderBodyCell: ({ row, column, rowIndex }, h) => {
-            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' // 是否特价
+            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && _this.type == 'edit' // 是否特价
             const tejiaLen = _this.activeList.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD').length // 特价活动数量
             // 特价活动上移下移排序
             const equalWord = <div class="table-arrow-box">
-              <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">{rowIndex != 0 ? '' : ''}</span>
-              <span class="down" onClick={() => _this.moveTjRow(row, rowIndex, 0)} title="下移">{rowIndex != tejiaLen - 1 ? '' : ''}</span>
+              {rowIndex != 0 ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}
+              {rowIndex != tejiaLen - 1 ? <span class="down" onClick={() => _this.moveTjRow(row, rowIndex, 0)} title="下移">⇣</span> : ''}
             </div>
             // 买产品送产品  同款产品 是累计产品才弹详情窗
             if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotion.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
@@ -206,7 +206,7 @@ export default {
         },
         { field: 'promotionRuleDesc',
           key: '3',
-          width: 100,
+          width: 110,
           title: '规则简称',
           align: 'center',
           fixed: 'left',

+ 7 - 15
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -126,23 +126,15 @@ export default {
       }
       // 销售单号
       const codeFormat = function (record, data, h) {
-        let ftext = ''
-        let fcolor = ''
-        if (record.promotionFlag == 'GIFT') {
-          ftext = '促'
-          fcolor = '#52c41a'
-        }
-        if (record.promotionFlag == 'GATE') {
-          ftext = '槛'
-          fcolor = '#108ee9'
-        }
-
         return (
           <div>
-            <span style="padding-right: 15px;">{data}</span>
-            {ftext ? (<a-badge count={ftext} number-style={{ backgroundColor: fcolor, zoom: '80%' }}></a-badge>) : ''}
-            {record.convertPromoGiftsQty ? (<a-badge count="转" number-style={{ backgroundColor: '#ffaa00', zoom: '80%' }}></a-badge>) : ''}
-            {(Number(record.stockQty || 0) < Number(record.unpushedQty || 0)) && _this.showStock ? (<a-badge count="缺" number-style={{ zoom: '80%' }}></a-badge>) : ''}
+            <span style="padding-right: 10px;">{data}</span>
+            {record.promotionFlag.indexOf('GIFT') >= 0 ? <a-badge count="促" numberStyle={{ backgroundColor: '#52c41a', zoom: '0.7' }}/> : ''}
+            {record.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
+            {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
+            {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
+            {record.convertPromoGiftsQty ? (<a-badge count="转" numberStyle={{ backgroundColor: '#ffaa00', zoom: '0.7' }}></a-badge>) : ''}
+            {(Number(record.stockQty || 0) < Number(record.unpushedQty || 0)) && _this.showStock ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
           </div>
         )
       }