优惠券使用的显示

src/components/orderMan/CostManagement.vue

@@ -77,7 +77,9 @@
         </el-table-column>
       </el-table>
       <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex"
-        layout="prev, pager, next" :total="total">
+                     :page-sizes="[15, 30, 45, 60,75,90]"
+                     @size-change="handleSizeChange"
+        layout="sizes,prev, pager, next" :total="total">
       </el-pagination>
     </div>
     <!-- 选择是否公账 -->
@@ -168,6 +170,11 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      handleSizeChange(val){
+        this.msg.pageIndex = 1;
+        this.msg.pageSize = val;
+        this.getList();
+      },
       //点击生成单据
       creatDanju() {
         if (this.finMsg.IdList.length == 0) {

src/components/orderMan/orderDetails.vue

@@ -75,6 +75,26 @@
                 <span
                   class="el-tag el-tag--primary el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.DeliveryMethodName}}</span>
               </div>
+              <div flex="dir:left cross:center" class="item-box" v-if="dataInfo.CouponMoney && dataInfo.CouponMoney !='' && dataInfo.CouponMoney>0">
+                <span class="label">优惠金额:</span>
+                <div>￥{{dataInfo.CouponMoney}}</div>
+              </div>
+              <div flex="dir:left cross:center" class="item-box"  v-if="dataInfo.IntegralMoney && dataInfo.IntegralMoney !='' && dataInfo.IntegralMoney>0">
+                <span class="label">积分抵用金额:</span>
+                <div>￥{{dataInfo.IntegralMoney}}</div>
+              </div>
+              <div flex="dir:left cross:center" class="item-box"  v-if="dataInfo.IntegralNumber && dataInfo.IntegralNumber !='' && dataInfo.IntegralNumber>0">
+                <span class="label">积分数:</span>
+                <div>￥{{dataInfo.IntegralNumber}}</div>
+              </div>
+              <div flex="dir:left cross:center" class="item-box"  v-if="dataInfo.MemberDiscountCouponList && dataInfo.MemberDiscountCouponList.length >0">
+                <span class="label">优惠券信息:</span>
+                <div>
+                  <span v-for="(MItem,Mindex) in dataInfo.MemberDiscountCouponList" :key="Mindex">
+                      {{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
+                    </span>
+                </div>
+              </div>
               <div flex="dir:left cross:center" class="item-box">
                 <span class="label">用户:</span>
                 <div>{{dataInfo.OrderInfo.UserName}}</div>

src/components/orderMan/orderList.vue

@@ -286,6 +286,21 @@
                   <div>
                     <el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag>
                   </div>
+                  <div style="font-size: 12px" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
+                    <span>优惠金额:￥{{item.CouponMoney}}</span>
+                  </div>
+                  <div style="font-size: 12px" v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
+                    <span>积分抵用金额:￥{{item.IntegralMoney}}</span>
+                  </div>
+                  <div style="font-size: 12px" v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0">
+                    <span>积分数:￥{{item.IntegralNumber}}</span>
+                  </div>
+                  <div style="font-size: 12px" v-if="item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0">
+                    <span>优惠券信息:</span>
+                    <span v-for="(MItem,Mindex) in item.MemberDiscountCouponList" :key="Mindex">
+                      {{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
+                    </span>
+                  </div>
                 </div>
               </div>