فهرست منبع

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

lilei 1 سال پیش
والد
کامیت
3b932e6c5d

+ 3 - 3
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -120,11 +120,11 @@
               <span>{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
             </template>
             <!-- 规则 -->
-            <template slot="promotionDesc" slot-scope="text, record">
+            <!-- <template slot="promotionDesc" slot-scope="text, record">
               <span v-if="record.promotionRule.promotionRuleType=='PROMO_PROD'">{{ record.promotionRule.promotionRuleTypeDictValue }}</span>
               <span v-else-if="record.promotionRule.promotionRuleType=='RATIO_AMOUNT'">{{ record.promotionRule.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.promotionRule.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品</span>
               <span v-else>购买满{{ record.promotionRule.regularAmount }}元正价产品,送{{ record.promotionRule.giveAmount }}元促销品采购额{{ record.promotionRule.accrualFlag&&record.promotionRule.accrualFlag==1?'(金额叠加)':'(金额不叠加)' }}</span>
-            </template>
+            </template> -->
             <!-- 地区 -->
             <template slot="addressInfo" slot-scope="text, record">
               <span>{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
@@ -220,7 +220,7 @@ export default {
         { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '130px', align: 'center', fixed: 'left' },
         { title: '费用所属部门', dataIndex: 'departmentName', width: '160px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
         { title: '促销类型', dataIndex: 'promotionRule.promotionRuleTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
-        { title: '规则', dataIndex: 'promotionRule.description', width: '180px', align: 'center', scopedSlots: { customRender: 'promotionDesc' }, fixed: 'left' },
+        { title: '规则', dataIndex: 'promotionRule.ruleInfo', width: '180px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '120px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },

+ 3 - 3
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -129,11 +129,11 @@
           <span>{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
         </template>
         <!-- 规则 -->
-        <template slot="promotionDesc" slot-scope="text, record">
+        <!-- <template slot="promotionDesc" slot-scope="text, record">
           <span v-if="record.promotionRule.promotionRuleType=='PROMO_PROD'">{{ record.promotionRule.promotionRuleTypeDictValue }}</span>
           <span v-else-if="record.promotionRule.promotionRuleType=='RATIO_AMOUNT'">{{ record.promotionRule.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.promotionRule.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品</span>
           <span v-else>购买满{{ record.promotionRule.regularAmount }}元正价产品,送{{ record.promotionRule.giveAmount }}元促销品采购额{{ record.promotionRule.accrualFlag&&record.promotionRule.accrualFlag==1?'(金额叠加)':'(金额不叠加)' }}</span>
-        </template>
+        </template> -->
         <!-- 地区 -->
         <template slot="addressInfo" slot-scope="text, record">
           <span>{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
@@ -284,7 +284,7 @@ export default {
         },
         fixed: 'left'
       },
-      { title: '规则', dataIndex: 'promotionRule.description', width: '180px', align: 'center', scopedSlots: { customRender: 'promotionDesc' }, fixed: 'left' },
+      { title: '规则', dataIndex: 'promotionRule.ruleInfo', width: '180px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
       {
         title: '销售单号',
         dataIndex: 'salesBillNo',