1. 优化和修复bug

src/views/order/groupBuyingMr/dialog/details.vue

@@ -60,10 +60,10 @@
           <div class="grid-content bg-purple item-class">支付总额: <span>￥{{ form.orderPrice || '' }}</span></div>
         </el-col> -->
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">应付金额: <span>￥{{ form.orderPrice || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">应付金额: <span>￥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">实付金额: <span>￥{{ form.realPrice || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">实付金额: <span>￥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">团购人数: <span>{{ form.quantity || '' }}</span></div>

src/views/order/orderMr/dialog/details.vue

@@ -54,16 +54,16 @@
           <div style="display: flex;" class="grid-content bg-purple item-class">核销码: <span style="display: block;margin-left: 5px;"><span>{{ form.orderIdOrQrCode }}</span></span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">购票数量: <span>{{ form.viewerNum || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">购票数量: <span>{{ form.viewerNum || form.viewerNum == 0 ? form.viewerNum : '' }}</span></div>
         </el-col>
         <!-- <el-col :span="12">
           <div class="grid-content bg-purple item-class">支付总额: <span>￥{{ form.orderPrice || '' }}</span></div>
         </el-col> -->
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">应付金额: <span>￥{{ form.orderPrice || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">应付金额: <span>￥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">实付金额: <span>￥{{ form.realPrice || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">实付金额: <span>￥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">下单时间: <span>{{ form.createTime || '' }}</span></div>

src/views/order/viewers/index.vue

@@ -87,15 +87,19 @@
       </el-table-column>
       <el-table-column label="购票人" align="center" prop="memberName" />
       <el-table-column label="购票人手机号" align="center" prop="memberMobile" />
-
-      <el-table-column label="订单总额" align="center" prop="realPriceTotal">
+      <el-table-column label="订单应付总额" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.priceTotal || scope.row.priceTotal == 0  ? '￥' + scope.row.realPriceTotal : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单实付总额" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.realPriceTotal ? '￥' + scope.row.realPriceTotal : '-' }}</span>
+          <span>{{ scope.row.realPriceTotal || scope.row.realPriceTotal == 0 ? '￥' + scope.row.realPriceTotal : '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="观影实付金额" align="center" prop="realPrice">
+      <el-table-column label="观影人单价" align="center" prop="realPrice">
         <template slot-scope="scope">
-          <span>{{ scope.row.realPrice ? '￥' + scope.row.realPrice : '-' }}</span>
+          <span>{{ scope.row.realPrice || scope.row.realPrice == 0 ? '￥' + scope.row.realPrice : '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="支付方式" align="center" prop="payWay">

src/views/statistics/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+    <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="报表名称">
         <el-input
           v-model="queryParams.name"
@@ -14,7 +14,7 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <div class="box-class clearfix">
       <div 
       class="item-class clearfix" 
@@ -50,9 +50,9 @@ export default {
       itemList: [
         // {id: 1, name: '总览统计', url: ''},
         // {id: 2, name: '渠道统计', url: ''},
-        {id: 3, name: '场次销售分析', hasPermi: 'session:session:list', url: 'statisticalReport/session'},
+        // {id: 3, name: '场次销售分析', hasPermi: 'session:session:list', url: 'statisticalReport/session'},
         {id: 4, name: '场次销售统计', hasPermi: 'statisticalReport:sessionInventory:downloadExcel', url: 'statisticalReport/sessionInventory'},
-        {id: 5, name: '座位类型销售统计', hasPermi: 'statisticalReport:seatInventory:downloadExcel', url: 'statisticalReport/seatInventory'},
+        // {id: 5, name: '座位类型销售统计', hasPermi: 'statisticalReport:seatInventory:downloadExcel', url: 'statisticalReport/seatInventory'},
       ]
     };
   },

src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -126,7 +126,7 @@
               <el-checkbox v-model="form.channelWindow">窗口</el-checkbox>
               <el-checkbox v-model="form.channelAutoSale">自助售/取票机</el-checkbox>
             </el-form-item>
-            <!-- <el-form-item label="税率:" prop="taxRate" label-width="100px">
+            <el-form-item label="税率:" prop="taxRate" label-width="100px">
               <el-select
                 v-model="form.taxRate"
                 placeholder="请选择税率"
@@ -140,7 +140,7 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item label="可售区域:" label-width="100px">
               <span @click="deliverableAreaDialogCancel(form.saleArea)" style="cursor: pointer;color: #1890ff;">请选择(点击这里进行选择)</span>
               <span style="margin-left: 10px;color: red;cursor: pointer;" @click="form.saleArea=''">全部清除</span>

src/views/ticket/ticketMr/dialog/details.vue

@@ -68,9 +68,9 @@
            + ' ' + 
            (form.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')}}</span></div>
         </el-col>
-        <!-- <el-col :span="12">
+        <el-col :span="12">
           <div class="grid-content bg-purple item-class">税率: <span>{{ form.taxRate }}</span></div>
-        </el-col> -->
+        </el-col>
         <el-col :span="24" v-if="form.goodsPerform">
           <div style="width: 100%;height: 100px;overflow: hidden;overflow-y: auto;background-color: rgba(204, 204, 204,0.3);padding: 5px;box-sizing: border-box;border-radius: 10px;">
             <div style="padding: 0 10px;" class="grid-content bg-purple item-class">可售渠道: </div>