lilei 2 سال پیش
والد
کامیت
1853cf67c1

+ 4 - 4
src/views/numsGoodsShelves/redPacket/redPacketStatistics.vue

@@ -161,13 +161,13 @@ export default {
         { title: '员工手机号码', dataIndex: 'userMobile', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '订单编号', dataIndex: 'orderNo', scopedSlots: { customRender: 'orderNo' }, width: '130px', align: 'center' },
         { title: '订单类型', dataIndex: 'orderTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '订单状态', dataIndex: 'shelfPlaceNum', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '订单状态', dataIndex: 'orderSourceDictValue', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '下单时间', dataIndex: 'orderDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: 'VIN', dataIndex: 'settleTypeDictValue', width: '140px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '车型', dataIndex: 'storeName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: 'VIN', dataIndex: 'vin', width: '140px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '车型', dataIndex: 'carModal', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '本单红包金额小计', dataIndex: 'totalRewardAmount', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '红包发放状态', dataIndex: 'rewardStatusDictValue', width: '100px', align: 'center', scopedSlots: { customRender: 'rewardStatus' } },
-        { title: '红包发放时间', dataIndex: 'rewardRatioTimes', width: '150px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '红包发放时间', dataIndex: 'giveDate', width: '150px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '操作', width: '120px', align: 'center', scopedSlots: { customRender: 'action' }, fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 24 - 24
src/views/numsGoodsShelves/redPacket/statisticsDetail.vue

@@ -10,49 +10,49 @@
       @cancle="handleBack"
       width="80%">
       <a-spin :spinning="spinning" tip="Loading...">
-        <div ref="tableSearch" class="table-page-search-wrapper">
+        <div ref="tableSearch" class="table-page-search-wrapper" v-if="itemData">
           <a-descriptions>
             <a-descriptions-item label="活动名称">
-              Zhou Maomao
+              {{ itemData.rewardRuleName|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="货架名称">
-              1810000000
+              {{ itemData.shelfName|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="配件经销商">
-              Hangzhou, Zhejiang
+              {{ itemData.dealerName|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="汽车修理厂">
-              empty
+              {{ itemData.storeName|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="员工姓名">
-              No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China
+              {{ itemData.userName|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="员工手机号码">
-              Zhou Maomao
+              {{ itemData.userMobile|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="订单编号">
-              1810000000
+              {{ itemData.orderNo|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="订单类型">
-              Hangzhou, Zhejiang
+              {{ itemData.orderTypeDictValue|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="订单状态">
-              empty
+              {{ itemData.orderSourceDictValue|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="红包奖励时间">
-              No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China
+              {{ itemData.rewardCreateDate|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="红包发放状态">
-              No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China
+              {{ itemData.rewardStatusDictValue|| '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="红包发放时间">
-              No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China
+              {{ itemData.giveDate|| '--' }}
             </a-descriptions-item>
           </a-descriptions>
         </div>
-        <a-alert type="info" style="margin-bottom:10px">
+        <a-alert type="info" style="margin-bottom:10px" v-if="itemData">
           <div slot="message">
-            红包金额小计:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '--' }}</strong>;
+            红包金额小计:<strong>{{ itemData&&(itemData.totalRewardAmount || itemData.totalRewardAmount==0) ? itemData.totalRewardAmount : '--' }}</strong>;
           </div>
         </a-alert>
         <s-table
@@ -75,7 +75,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getShelfList } from '@/api/shelf.js'
+import { rewardOrderQueryList } from '@/api/rewardOrder.js'
 export default {
   name: 'StatisticsDetail',
   components: {
@@ -100,21 +100,21 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'storeName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'storeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下单数量', dataIndex: 'shelfPlaceNum', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '售价(终端会员价)', dataIndex: 'shelfPlaceNum', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '成本价(市级价)', dataIndex: 'shelfPlaceNum', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '售价(终端会员价)', dataIndex: 'terminalPrice', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '成本价(市级价)', dataIndex: 'cityPrice', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '售价小计', dataIndex: 'shelfPlaceNum', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '成本小计', dataIndex: 'shelfPlaceNum', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '毛利小计', dataIndex: 'shelfPlaceNum', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '红包毛利比例', dataIndex: 'shelfPlaceNum', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '红包金额', dataIndex: 'shelfPlaceNum', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } }
+        { title: '毛利小计', dataIndex: 'grossAmount', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '红包毛利比例', dataIndex: 'rewardRatio', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '红包金额', dataIndex: 'rewardAmount', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.spinning = true
-        return getShelfList(Object.assign(parameter, this.queryParam)).then(res => {
+        return rewardOrderQueryList(Object.assign(parameter, { rewardOrderSn: this.itemData.rewardOrderSn })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data