Merge branch 'dev' of 113.31.163.91:quanshu/mp-ui-pc into dev

src/views/business/ticket/index.vue

@@ -19,34 +19,31 @@
       </el-form-item>
       <el-form-item label="盲票组类型">
         <el-select
-          v-model="queryParams.ticketType"
+          v-model="queryParams.type"
           placeholder="请选择盲票组类型"
           clearable
           size="small"
           @change="handleQuery"
         >
-          <el-option
-            v-for="item in ticketTypeArr"
-            :key="item.areaId"
-            :label="item.areaName"
-            :value="item.areaId"
-          />
+          <el-option label="全部" value="" />
+          <el-option label="线上票" value="online" />
+          <el-option label="线下票" value="offline" />
         </el-select>
       </el-form-item>
       <el-form-item label="盲票组状态">
         <el-select
-          v-model="queryParams.ticketState"
+          v-model="queryParams.status"
           placeholder="请选择盲票组状态"
           clearable
           size="small"
           @change="handleQuery"
         >
-          <el-option
-            v-for="item in ticketStateArr"
-            :key="item.areaId"
-            :label="item.areaName"
-            :value="item.areaId"
-          />
+          <el-option label="全部" value="" />
+          <el-option label="待出票" value="wait" />
+          <el-option label="出票中" value="doing" />
+          <el-option label="待上架" value="done" />
+          <el-option label="已上架" value="on" />
+          <el-option label="已下架" value="off" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -57,7 +54,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" @click="getList(true)"
           >重置</el-button
         >
       </el-form-item>
@@ -114,7 +111,7 @@
 
       <right-toolbar
         :showSearch.sync="showSearch"
-        @queryTable="getList"
+        @queryTable="getList()"
       ></right-toolbar>
     </el-row>
 
@@ -261,15 +258,13 @@ export default {
       showSearch: true,
       queryParams: {
         title: "",
-        ticketType: "",
-        ticketState: "",
+        type: "",
+        status: "",
       },
       pageParams: {
         pageNum: 1,
         pageSize: 10,
       },
-      ticketTypeArr: [],
-      ticketStateArr: [],
       // 总条数
       total: 0,
       list: [],
@@ -282,8 +277,14 @@ export default {
   },
   methods: {
     // 盲票组列表
-    getList() {
-      this.loading = true;
+    getList(reset) {
+     if (this.loading) {
+       return
+     }
+     this.loading = true
+     if (reset) {
+       this.queryParams = { pageNum: 1, pageSize: 20 }
+     }
       getTicketList(
         "pageNum=" +
           this.pageParams.pageNum +
@@ -352,7 +353,9 @@ export default {
       this.getList();
     },
     // 重置
-    resetQuery() {},
+    resetQuery() {
+
+    },
     // 添加盲票组
     handleAdd() {
       this.$router.push({ name: "TicketCreate" });