Merge branch 'feature/8月-奥莱定制' into dev

src/views/card/analysis.vue

@@ -11,12 +11,19 @@
           <li><span>领取卡券数</span>{{ baseData.getCnt | fnumber }}</li>
           <li><span>领取人数</span>{{ baseData.getNum | fnumber }}</li>
           <li><span>领取率</span>{{ ((baseData.getCnt * 100) / baseData.volumesCnt) | fnumber | famount }}%</li>
-          <li><span>使用卡券数</span>{{ baseData.useCnt | fnumber }}</li>
-          <li><span>核销订单数</span>{{ baseData.cardOrderCnt | fnumber }}</li>
-          <li><span>使用人数</span>{{ baseData.useNum | fnumber }}</li>
+          <li>
+            <span>{{ cardInfo.cardType == 3 ? '核销卡券数' : '使用卡券数' }}</span>
+            {{ baseData.useCnt | fnumber }}
+          </li>
+          <li v-if="cardInfo.cardType != 3"><span>核销订单数</span>{{ baseData.cardOrderCnt | fnumber }}</li>
+          <li>
+            <span>{{ cardInfo.cardType == 3 ? '核销人数' : '使用人数' }}</span>
+            {{ baseData.useNum | fnumber }}
+          </li>
           <li><span>核销率</span>{{ ((baseData.useCnt * 100) / baseData.getCnt) | fnumber | famount }}%</li>
-          <li><span>销售额</span>{{ baseData.verificationAmt | fnumber | famount }}</li>
-          <li><span>客单价</span>￥{{ (baseData.verificationAmt / baseData.cardOrderCnt) | fnumber | famount }}</li>
+          <li v-if="cardInfo.cardType != 3"><span>销售额</span>{{ baseData.verificationAmt | fnumber | famount }}</li>
+          <li v-if="cardInfo.cardType == 3"><span>核销额</span>{{ baseData.wirteOffPrice | fnumber | famount }}</li>
+          <li v-if="cardInfo.cardType != 3"><span>客单价</span>￥{{ (baseData.verificationAmt / baseData.cardOrderCnt) | fnumber | famount }}</li>
         </ul>
       </div>
       <div v-if="cardInfo.giveFlag" style="border-top: 1px solid #DCDFE6;padding-top:28px">
@@ -58,12 +65,15 @@
         </el-table-column>
         <el-table-column min-width="100" align="left" prop="volumesCnt" label="投放卡券数"></el-table-column>
         <el-table-column min-width="100" align="left" prop="getCnt" label="领取卡券数"></el-table-column>
-        <el-table-column min-width="100" align="left" prop="useCnt" label="使用卡券数"></el-table-column>
-        <el-table-column min-width="100" align="left" prop="cardOrderCnt" label="核销订单数"></el-table-column>
-        <el-table-column min-width="100" align="left" prop="verificationAmt" label="销售额"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" min-width="120" fixed="right" align="left" label="客单价">
-          <template slot-scope="scope"> ￥{{ (scope.row.verificationAmt / scope.row.cardOrderCnt).toFixed(2) | fnumber }} </template>
-        </el-table-column>
+        <el-table-column min-width="100" align="left" prop="useCnt" :label="cardInfo.cardType == 3 ? '核销卡券数' : '使用卡券数'"></el-table-column>
+        <el-table-column v-if="cardInfo.cardType == 3" min-width="100" align="left" prop="wirteOffPrice" label="核销额"></el-table-column>
+        <template v-if="cardInfo.cardType != 3">
+          <el-table-column min-width="100" align="left" prop="cardOrderCnt" label="核销订单数"></el-table-column>
+          <el-table-column min-width="100" align="left" prop="verificationAmt" label="销售额"></el-table-column>
+          <el-table-column :show-overflow-tooltip="true" min-width="120" fixed="right" align="left" label="客单价">
+            <template slot-scope="scope"> ￥{{ (scope.row.verificationAmt / scope.row.cardOrderCnt).toFixed(2) | fnumber }} </template>
+          </el-table-column>
+        </template>
       </el-table>
     </div>
   </section>

src/views/card/list.vue

@@ -56,7 +56,13 @@ export default {
       total: 0,
       loading: false,
       tableList: [],
-      cardTypeOptions: [{ value: '', label: '全部卡券类型' }, { value: 0, label: '抵金券' }, { value: 1, label: '折扣券' }, { value: 2, label: '兑换券' }], // eslint-disable-line
+      cardTypeOptions: [
+        { value: '', label: '全部卡券类型' },
+        { value: 0, label: '抵金券' },
+        { value: 1, label: '折扣券' },
+        { value: 2, label: '兑换券' },
+        { value: 3, label: '商场抵金券' }
+      ],
       sortFlag: false,
       adjustStock: false,
       currentCard: {}

src/views/card/partials/card-item.vue

@@ -24,8 +24,14 @@
           <p>核销率</p>
         </div>
         <div>
-          <h5>{{ item.saleAmount }}</h5>
-          <p>销售额</p>
+          <template v-if="item.cardType == 3">
+            <h5>{{ item.wirteOffPrice || 0 }}</h5>
+            <p>核销额</p>
+          </template>
+          <template v-else>
+            <h5>{{ item.saleAmount }}</h5>
+            <p>销售额</p>
+          </template>
         </div>
         <el-tooltip class="item" effect="dark" open-delay="300">
           <div slot="content">