修改

src/pages/config/index.vue

@@ -5,7 +5,9 @@
     <div class="content">
       <el-tabs v-model="activeTab" type="card">
         <el-tab-pane label="服务器配置" name="server">
-          <el-form>
+          <el-form
+            :model="form"
+            ref="form">
             <el-form-item
               class="is-require"
               verify

src/pages/dashboard/index.vue

@@ -48,7 +48,7 @@
           <el-button
             type="text"
             icon="el-icon-refresh"
-            :title="刷新数据"
+            title="刷新数据"
             @click="refreshData"></el-button>
         </div>
         <OrderStatistics

src/pages/member/memberCheckLog.vue

@@ -224,11 +224,11 @@
           </template>
         </el-table-column>
         <el-table-column
-          width="80"
+          width="100"
           label="检票类型"
         >
           <template slot-scope="prop">
-            {{ prop.row.check_type | checkType }}
+            {{ prop.row.checkType | checkType }}
           </template>
         </el-table-column>
       </el-table>

src/pages/queryReport/OrderStatistic.vue

@@ -199,10 +199,7 @@
         :key="tableIndex"
         v-loading="loading"
         :data="tableData"
-        :span-method="objectSpanMethod"
-        :cell-class-name="handleCellStyle"
-        :header-cell-class-name="handleCellStyle"
-        :row-class-name="totalRowClassName">
+        :span-method="objectSpanMethod">
         <el-table-column
           v-for="(item) in finalGroup"
           :key="item.value"
@@ -395,15 +392,6 @@ export default {
   async created () {
     this.getTicketTypeList()
     this.getScenicList()
-    const searchParams = JSON.parse(sessionStorage.getItem('统计表-自定义售票统计-查询条件'))
-    if (searchParams) {
-      // 如果存在查询条件，则设置到组件的数据中
-      this.form = searchParams // 记住上次搜索条件
-    }
-    let lastSelectKeys = JSON.parse(sessionStorage.getItem('统计表-自定义售票统计-查询条件-selectKeys')) // 加载上次记住的分组信息
-    if (lastSelectKeys) {
-      this.selectKeys = lastSelectKeys
-    }
     this.getSaleStatistic()
     const res = await getSystemConfigList()
     /*
@@ -657,5 +645,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import './handOverStatistics/style.scss';
 </style>

src/pages/queryReport/checkQuery.vue

@@ -239,7 +239,8 @@
         >
         </el-table-column>
         <el-table-column
-          prop="checkNum"
+          prop="ticketNo"
+          width="180"
           label="票号"
         >
         </el-table-column>
@@ -255,9 +256,12 @@
         >
         </el-table-column>
         <el-table-column
-          prop="checkType"
+          width="100"
           label="检票类型"
         >
+          <template slot-scope="prop">
+            {{ prop.row.checkType | checkTypeFilter }}
+          </template>
         </el-table-column>
         <el-table-column
           prop="checkerAdminName"
@@ -271,11 +275,13 @@
         </el-table-column>
         <el-table-column
           prop="checkTime"
+          width="140"
           label="检票时间"
         >
         </el-table-column>
         <el-table-column
           prop="checkNum"
+          width="80"
           label="检票数量"
         >
         </el-table-column>
@@ -354,6 +360,31 @@ export default {
       currentOrder: null
     }
   },
+  filters: {
+    formatTime (time) {
+      return moment(time).format('YYYY-MM-DD HH:mm:ss')
+    },
+    checkTypeFilter (input) {
+      switch (input) {
+        case 'qrcode':
+          return '二维码'
+        case 'face':
+          return '人脸'
+        case 'card':
+          return 'IC卡'
+        case 'idcard':
+          return '身份证'
+        case 'manual_check':
+          return '人工检票'
+        case 'print_check':
+          return '取票即检票'
+        case 'buy_check':
+          return '购买即检票'
+        default:
+          break
+      }
+    }
+  },
   computed: {
     accountList () {
       return this.$store.state.app.accountList

src/pages/queryReport/refundQuery/RefundQuery.vue

@@ -226,23 +226,69 @@
         stripe
         v-loading="loading"
         :data="tableData">
-        <el-table-column prop="otaSourceName" label="销售渠道"></el-table-column>
-        <el-table-column prop="orderNo" label="订单号"></el-table-column>
-        <el-table-column prop="ticketNo" label="票号"></el-table-column>
-        <el-table-column prop="ticketTypeName" label="票种"></el-table-column>
-        <el-table-column prop="saleTime" label="售票时间"></el-table-column>
-        <el-table-column prop="saleAdminName" label="售票员"></el-table-column>
-        <el-table-column prop="salePrice" label="售票金额"></el-table-column>
-        <el-table-column prop="checkTime" label="检票时间"></el-table-column>
-        <el-table-column prop="cancelAdminName" label="退单操作员"></el-table-column>
-        <el-table-column prop="cancelSubmitTime" label="退单申请时间"></el-table-column>
-        <el-table-column prop="cancelCompleteTime" label="退单完成时间"></el-table-column>
-        <el-table-column prop="isForceCancel" label="是否强制退款">
+        <el-table-column
+          prop="otaSourceName"
+          width="90"
+          label="销售渠道"
+        ></el-table-column>
+        <el-table-column
+          prop="orderNo"
+          width="180"
+          label="订单号"
+        ></el-table-column>
+        <el-table-column
+          prop="ticketNo"
+          width="180"
+          label="票号"
+        ></el-table-column>
+        <el-table-column
+          prop="ticketTypeName"
+          label="票种"
+        ></el-table-column>
+        <el-table-column
+          prop="saleTime"
+          width="140"
+          label="售票时间"
+        ></el-table-column>
+        <el-table-column
+          prop="saleAdminName"
+          label="售票员"
+        ></el-table-column>
+        <el-table-column
+          prop="price"
+          label="售票金额"
+        ></el-table-column>
+        <el-table-column
+          prop="checkTime"
+          width="140"
+          label="检票时间"
+        ></el-table-column>
+        <el-table-column
+          prop="cancelAdminName"
+          label="退单操作员"
+        ></el-table-column>
+        <el-table-column
+          prop="cancelSubmitTime"
+          width="140"
+          label="退单申请时间"
+        ></el-table-column>
+        <el-table-column
+          prop="cancelCompleteTime"
+          width="140"
+          label="退单完成时间"
+        ></el-table-column>
+        <el-table-column
+          prop="isForceCancel"
+          label="是否强制退款"
+        >
           <template slot-scope="scope">
             <span>{{ scope.row.isForceCancel ? '是' : '否' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="cancelPrice" label="退单金额"></el-table-column>
+        <el-table-column
+          prop="cancelPrice"
+          label="退单金额"
+        ></el-table-column>
         <el-table-column
           label="操作"
           width="80"

src/pages/queryReport/secondQuery.vue

@@ -230,7 +230,7 @@ export default {
         startDate: '',
         endDate: '',
         keyWords1: '', // checker_device_id
-        keyWords2: '', // check_type
+        keyWords2: '', // checkType
         keyWords3: '', // check_direction
         keyWords4: '' // ticketNo
       },

src/pages/queryReport/secondQuery/CheckRecord.vue

@@ -12,7 +12,7 @@
         label="通关凭证"
       >
         <template slot-scope="props">
-          <span>{{ props.row.check_type | bindType }}</span>
+          <span>{{ props.row.checkType | bindType }}</span>
         </template>
       </el-table-column>
       <el-table-column

src/pages/sellManage/retail/RecentOrder.vue

@@ -35,7 +35,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="ticketName"
+        prop="firstTicketTypeName"
         label="票种">
       </el-table-column>
       <el-table-column

src/pages/systemSetting/role/EditDialog.vue

@@ -31,8 +31,8 @@
               <!-- 全选 -->
               <b>{{ item.name }}</b>
               <el-checkbox
-                :indeterminate="isIndeterminate[item.code]"
-                v-model="checkAll[item.code]"
+                :indeterminate="isIndeterminate[item.id]"
+                v-model="checkAll[item.id]"
                 @change="handleCheckAllChange($event,item)"
               >
               </el-checkbox>
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { cloneDeep } from 'lodash'
+import { cloneDeep, map } from 'lodash'
 import { getPermissionTree, editRole } from '@/api/systemSetting/role'
 
 export default {
@@ -168,8 +168,8 @@ export default {
       this.isIndeterminateAll = false
 
       this.permissionList.forEach(item => {
-        this.isIndeterminate[item.code] = false
-        this.checkAll[item.code] = val
+        this.isIndeterminate[item.id] = false
+        this.checkAll[item.id] = val
       })
     },
     // 单模块全选
@@ -191,7 +191,7 @@ export default {
           }
         })
       }
-      this.isIndeterminate[module.code] = false
+      this.isIndeterminate[module.id] = false
 
       this.checkAllStatus()
     },
@@ -205,9 +205,9 @@ export default {
       })
       let checkedCount = intersection.length
       // 单模块全选
-      this.checkAll[module.code] = checkedCount === module.permissions.length
+      this.checkAll[module.id] = checkedCount === module.permissions.length
       // 单模块不确定状态
-      this.isIndeterminate[module.code] = checkedCount > 0 && checkedCount < module.permissions.length
+      this.isIndeterminate[module.id] = checkedCount > 0 && checkedCount < module.permissions.length
 
       this.checkAllStatus()
     },
@@ -229,26 +229,22 @@ export default {
       if (val && this.roleItem) {
         this.form = cloneDeep(this.roleItem)
         const { resourceList } = this.roleItem
-        this.selectPermission = []
+        this.selectPermission = map(resourceList, 'id')
 
-        resourceList.forEach(item => {
-          this.selectPermission.push(item)
+        this.permissionList.forEach(item => {
+          const cLength = item.children ? item.children.length : 0
 
-          if (item.children) {
-            this.selectPermission.push(...item.children)
+          if (cLength > 0) {
+            // 交集
+            const hasOne = item.children.some(i => this.selectPermission.includes(i.id))
+            const hasAll = item.children.every(i => this.selectPermission.includes(i.id))
+            // 单模块全选
+            this.checkAll[item.id] = !!hasAll
+            // 单模块不确定状态
+            this.isIndeterminate[item.id] = !hasAll && hasOne
           }
         })
 
-        this.permissionList.forEach(item => {
-          // 交集
-          const intersection = this.selectPermission.find(val => val.id === item.id)
-          const checkedCount = intersection && intersection.children ? intersection.children.length : 0
-          // 单模块全选
-          this.checkAll[item.code] = checkedCount === item.permissions.length
-          // 单模块不确定状态
-          this.isIndeterminate[item.code] = checkedCount > 0 && checkedCount < item.permissions.length
-        })
-
         this.checkAllStatus()
       }
     }

src/pages/ticketSetting/ticket.vue

@@ -84,16 +84,16 @@
         :data="tableData"
       >
         <el-table-column
-          prop="name"
-          label="票种名称"
-        >
-        </el-table-column>
-        <!-- <el-table-column
           prop="id"
           label="票种ID"
           width="80"
         >
-        </el-table-column> -->
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="票种名称"
+        >
+        </el-table-column>
         <el-table-column
           label="票种分类"
         >