1. 优化

src/views/order/writeOffMr/index.vue

@@ -43,6 +43,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="核销日期" label-width="70px">
+        <el-date-picker
+          style="width: 250px;"
+          v-model="queryParams.writeoffTime"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <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>
@@ -148,9 +159,12 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      if(this.queryParams.time){
-        this.queryParams.payBeginTime = this.queryParams.time[0];
-        this.queryParams.payEndTime = this.queryParams.time[1];
+      if(this.queryParams.writeoffTime){
+        this.queryParams.createTimeBegin = this.queryParams.writeoffTime[0];
+        this.queryParams.createTimeEnd = this.queryParams.writeoffTime[1];
+      }else{
+        this.queryParams.createTimeBegin = null
+        this.queryParams.createTimeEnd = null
       }
       this.getList();
     },
@@ -161,6 +175,7 @@ export default {
       this.$set(this.queryParams, 'idCard', '');
       this.$set(this.queryParams, 'deviceType', '');
       this.$set(this.queryParams, 'deviceName', '');
+      this.$set(this.queryParams, 'writeoffTime', []);
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

src/views/statisticalReport/session.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="票务管理:">
+      <!-- <el-form-item label="票务管理:">
         <el-select
           v-model="queryParams.goodsId"
           placeholder="票务管理"
@@ -16,7 +16,7 @@
             :value="dict.goodsId"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="座位类型:">
         <el-select
           v-model="queryParams.seatTypeId"
@@ -65,9 +65,8 @@
 
     <el-table ref="tables" v-loading="loading" :data="dataList" border>
       <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
-      <el-table-column label="剧目名称" align="center" prop="performName" />
-      <el-table-column label="票务名称" align="center" prop="goodsName" />
-      <el-table-column label="座位类型" align="center" prop="seatTypeName" />
+      <!-- <el-table-column label="剧目名称" align="center" prop="performName" />
+      <el-table-column label="票务名称" align="center" prop="goodsName" /> -->
       <el-table-column label="场次日期" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.performDate }}</span>
@@ -78,6 +77,7 @@
           <span>{{ scope.row.performTimeStart }} -- {{ scope.row.performTimeEnd }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="座位类型" align="center" prop="seatTypeName" />
       <el-table-column label="总库存" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.total }}张</span>

src/views/statistics/index.vue

@@ -50,7 +50,7 @@ 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:list', url: 'statisticalReport/sessionInventory'},
         {id: 5, name: '座位库存', hasPermi: 'statisticalReport:seatInventory:list', url: 'statisticalReport/seatInventory'},
       ]

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

@@ -117,8 +117,21 @@
               <el-checkbox v-model="form.channelAutoSale">自助售/取票机</el-checkbox>
             </el-form-item>
             <el-form-item label="税率:" prop="taxRate" label-width="100px">
-              <el-input-number v-model="form.taxRate" placeholder="税率" controls-position="right" :min="0" :max="10000"></el-input-number>
-              <span style="margin-left: 5px">%</span>
+              <!-- <el-input-number v-model="form.taxRate" placeholder="税率" controls-position="right" :min="0" :max="10000"></el-input-number> -->
+              <el-select
+                v-model="form.taxRate"
+                placeholder="请选择税率"
+                clearable
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="dict in dict.type.system_taxrate"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+              <!-- <span style="margin-left: 5px">%</span> -->
             </el-form-item>
             <el-form-item label="可售区域:" label-width="100px">
               <span @click="deliverableAreaDialogCancel(form.saleArea)" style="cursor: pointer;color: #1890ff;">请选择(点击这里进行选择)</span>
@@ -246,6 +259,7 @@ import FreightMgrIndexMi from "./FreightMgrIndexMi"
 export default {
   name: "addAndEdit",
   mixins: [FreightMgrIndexMi],
+  dicts: ['system_taxrate'],
   data() {
     let validateNumber = (rule, value, callback) => {
       let regNumber=/^(([1-9]\d*)|([0][.]{1}[0-9]{0,2}[0-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g;
@@ -383,6 +397,7 @@ export default {
 
           this.$set(this.form, 'backStatus', obj.goodsPerform.backStatus);
           this.$set(this.form, 'backTime', '1');
+          this.$set(this.form, 'taxRate', obj.taxRate);
           this.$set(this.form, 'backStatus', obj.goodsPerform.backStatus.toString());
           
           this.$set(this.form, 'saleArea', obj.saleArea);
@@ -432,6 +447,7 @@ export default {
               this.$message.error("请选择销售渠道!");
               return false;
             }
+            postMap.taxRate = this.form.taxRate
             postMap.goodsPerform.channelWx = this.form.channelWx ? 0 : 1;
             postMap.goodsPerform.channelWindow = this.form.channelWindow  ? 0 : 1;
             postMap.goodsPerform.channelAutoSale = this.form.channelAutoSale  ? 0 : 1;
@@ -480,6 +496,7 @@ export default {
 
       this.$set(this.form, 'backStatus', '');
       this.$set(this.form, 'backTime', '1');
+      this.$set(this.form, 'taxRate', '');
       this.$set(this.form, 'backStatus', '');
       this.$set(this.form, 'days', '');
       this.$set(this.form, 'hour', '');

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

@@ -27,10 +27,10 @@
           <div class="grid-content bg-purple item-class">实名信息: <span>全部观影人员均实名</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">停止售卖时间: <span>开演前{{ form.goodsPerform.stopSaleTime }}分钟内</span></div>
+          <div class="grid-content bg-purple item-class">停止售卖时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.stopSaleTime }}分钟内</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">核销时间: <span>开演前{{ form.goodsPerform.beforeTime }}分钟内</span></div>
+          <div class="grid-content bg-purple item-class">核销时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.beforeTime }}分钟内</span></div>
         </el-col>
         <el-col :span="12" v-if="form.goodsPerform">
           <div class="grid-content bg-purple item-class">核销播报次数: <span>{{ form.goodsPerform.verificationSpeaker + '次' || '' }}</span></div>
@@ -62,7 +62,7 @@
            (form.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')}}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">税率: <span>{{ form.taxRate || '无' }}%</span></div>
+          <div class="grid-content bg-purple item-class">税率: <span>{{ form.taxRate }}</span></div>
         </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;">