优化后台页面

src/router/notKeepAliveList.js

@@ -26,5 +26,11 @@ export default [
   '/business/attendanceList',
   '/business/returnVisitList',
   '/business/levelManager',
-  '/matchManager/matchManager'
+  '/matchManager/matchManager',
+  '/luckyDraw/lotteryManager', // 抽奖活动管理
+  '/luckyDraw/trophyManager', // 奖品设置
+  '/luckyDraw/lotteryRecord', // 抽奖记录
+  '/specialSetup/globalConfig', // 全局配置
+  '/specialSetup/adminManager', // 系统角色权限管理
+  '/specialSetup/adminoperation',
 ]

src/views/categroyManager/globalConfig.vue

@@ -1,106 +1,133 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>全局配置
+      <div class="squrt"></div>
+      全局配置
     </h2>
     <div class="m-core">
       <!-- navMenu -->
-      <el-tabs v-model.trim="activeIndex"
-               type="card"
-               @tab-click="handleClick">
-
-        <el-tab-pane label="声部设置(对内)"
-        lazy
-                     name="0"
-                     v-if="permissionList.musicalManager">
-          <musicalManager v-if="activeIndex == 0" />
-        </el-tab-pane>
-        <el-tab-pane label="声部设置(对外)"
-        lazy
-                     name="1"
-                     v-if="permissionList.musicalManagerOut">
-          <musicalManagerOut v-if="activeIndex == 1" />
-        </el-tab-pane>
-        <el-tab-pane label="乐团收费类型"
-        lazy
-                     name="2"
-                     v-if="permissionList.typesManager">
-          <typesManager v-if="activeIndex == 2" />
-        </el-tab-pane>
-          <el-tab-pane label="课程时长设置"
-          lazy
-                     name="11"
-                     v-if="permissionList.courseTimerSetting">
-          <courseTimerSetting v-if="activeIndex == 11" />
-        </el-tab-pane>
-        <el-tab-pane label="商品折扣和声部设置"
-        lazy
-                     name="9"
-                     v-if="permissionList.discountManage">
-          <discountManage v-if="activeIndex == 9" />
-        </el-tab-pane>
-        <el-tab-pane label="乐团收费标准"
-        lazy
-                     name="3"
-                     v-if="permissionList.chargesList">
-          <chargesList v-if="activeIndex == 3" />
-        </el-tab-pane>
-        <el-tab-pane label="乐团课程费用"
-        lazy
-                     name="10"
-                     v-if="permissionList.musicCourseFee">
-          <musicCourseFee v-if="activeIndex == 10" />
-        </el-tab-pane>
-        <el-tab-pane label="乐团作业模板"
-        lazy
-                     name="4"
-                     v-if="permissionList.jobTemplateSetting">
-          <jobTemplateSetting v-if="activeIndex == 4" />
-        </el-tab-pane>
-        <el-tab-pane label="热词标签"
-        lazy
-                     name="5"
-                     v-if="permissionList.errorManager">
-          <errorManager v-if="activeIndex == 5" />
-        </el-tab-pane>
-        <el-tab-pane label="参数设置"
-        lazy
-                     name="6"
-                     v-if="permissionList.overallManager">
-          <overallManager v-if="activeIndex == 6" />
-        </el-tab-pane>
-        <el-tab-pane label="收费分润配置"
-        lazy
-                     name="7"
-                     v-if="permissionList.overallManagerTwo">
-          <overallManagerTwo v-if="activeIndex == 7" />
-        </el-tab-pane>
-        <!-- holiday_setting -->
-        <el-tab-pane label="节假日设置"
-        lazy
-                     name="8"
-                     v-if="permissionList.holidaySetting">
-          <holidaySetting v-if="activeIndex == 8" />
-        </el-tab-pane>
-
-      </el-tabs>
+      <location-hash v-model="activeIndex" @change="handleClick">
+        <el-tabs
+          v-model.trim="activeIndex"
+          type="card"
+          @tab-click="handleClick"
+        >
+          <el-tab-pane
+            label="声部设置(对内)"
+            lazy
+            name="0"
+            v-if="permissionList.musicalManager"
+          >
+            <musicalManager v-if="activeIndex == 0" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="声部设置(对外)"
+            lazy
+            name="1"
+            v-if="permissionList.musicalManagerOut"
+          >
+            <musicalManagerOut v-if="activeIndex == 1" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="乐团收费类型"
+            lazy
+            name="2"
+            v-if="permissionList.typesManager"
+          >
+            <typesManager v-if="activeIndex == 2" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="课程时长设置"
+            lazy
+            name="11"
+            v-if="permissionList.courseTimerSetting"
+          >
+            <courseTimerSetting v-if="activeIndex == 11" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="商品折扣和声部设置"
+            lazy
+            name="9"
+            v-if="permissionList.discountManage"
+          >
+            <discountManage v-if="activeIndex == 9" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="乐团收费标准"
+            lazy
+            name="3"
+            v-if="permissionList.chargesList"
+          >
+            <chargesList v-if="activeIndex == 3" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="乐团课程费用"
+            lazy
+            name="10"
+            v-if="permissionList.musicCourseFee"
+          >
+            <musicCourseFee v-if="activeIndex == 10" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="乐团作业模板"
+            lazy
+            name="4"
+            v-if="permissionList.jobTemplateSetting"
+          >
+            <jobTemplateSetting v-if="activeIndex == 4" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="热词标签"
+            lazy
+            name="5"
+            v-if="permissionList.errorManager"
+          >
+            <errorManager v-if="activeIndex == 5" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="参数设置"
+            lazy
+            name="6"
+            v-if="permissionList.overallManager"
+          >
+            <overallManager v-if="activeIndex == 6" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="收费分润配置"
+            lazy
+            name="7"
+            v-if="permissionList.overallManagerTwo"
+          >
+            <overallManagerTwo v-if="activeIndex == 7" />
+          </el-tab-pane>
+          <!-- holiday_setting -->
+          <el-tab-pane
+            label="节假日设置"
+            lazy
+            name="8"
+            v-if="permissionList.holidaySetting"
+          >
+            <holidaySetting v-if="activeIndex == 8" />
+          </el-tab-pane>
+        </el-tabs>
+      </location-hash>
     </div>
   </div>
 </template>
 <script>
-import overallManager from './generalSettings/overallManager'
-import overallManagerTwo from './generalSettings/overallManagerTwo'
-import holidaySetting from './generalSettings/holidaySetting'
-import musicalManager from './specialSetup/musicalManager'
-import musicalManagerOut from './specialSetup/musicalManagerOut'
-import typesManager from './specialSetup/typesManager'
-import discountManage from './specialSetup/discountManage'
-import jobTemplateSetting from './specialSetup/jobTemplateSetting'
-import errorManager from './generalSettings/errorManager'
-import chargesList from './specialSetup/chargesList'
-import musicCourseFee from './specialSetup/musicCourseFee'
-import courseTimerSetting from './specialSetup/courseTimerSetting'
-import { permission } from '@/utils/directivePage'
+import musicalManager from "./specialSetup/musicalManager";
+import musicalManagerOut from "./specialSetup/musicalManagerOut";
+import typesManager from "./specialSetup/typesManager";
+import courseTimerSetting from "./specialSetup/courseTimerSetting";
+import discountManage from "./specialSetup/discountManage";
+import chargesList from "./specialSetup/chargesList";
+import musicCourseFee from "./specialSetup/musicCourseFee";
+import jobTemplateSetting from "./specialSetup/jobTemplateSetting";
+import errorManager from "./generalSettings/errorManager";
+import overallManager from "./generalSettings/overallManager";
+import overallManagerTwo from "./generalSettings/overallManagerTwo";
+import holidaySetting from "./generalSettings/holidaySetting";
+import { permission } from "@/utils/directivePage";
 export default {
   components: {
     overallManager,
@@ -116,32 +143,33 @@ export default {
     musicCourseFee,
     courseTimerSetting
   },
-  name: 'globalConfig',
-  data () {
+  name: "globalConfig",
+  data() {
+    const query = this.$route.query
     return {
-      activeIndex: '0',
+      activeIndex: query.opt || "0",
       permissionList: {
-        overallManager: permission('/globalConfig/overallManager'),
-        overallManagerTwo: permission('/globalConfig/overallManagerTwo'),
-        musicalManager: permission('/globalConfig/musicalManager'),
-        musicalManagerOut: permission('/globalConfig/musicalManagerOut'),
-        typesManager: permission('/globalConfig/typesManager'),
-        chargesList: permission('/globalConfig/chargesList'),
-        jobTemplateSetting: permission('/globalConfig/jobTemplateSetting'),
-        errorManager: permission('/globalConfig/errorManager'),
-        holidaySetting: permission('/globalConfig/holidaySetting'),
-        musicCourseFee: permission('/globalConfig/musicCourseFee'),
-        discountManage: permission('/globalConfig/discountManage'),
-        courseTimerSetting:permission('/globalConfig/courseTimerSetting'),
+        overallManager: permission("/globalConfig/overallManager"),
+        overallManagerTwo: permission("/globalConfig/overallManagerTwo"),
+        musicalManager: permission("/globalConfig/musicalManager"),
+        musicalManagerOut: permission("/globalConfig/musicalManagerOut"),
+        typesManager: permission("/globalConfig/typesManager"),
+        chargesList: permission("/globalConfig/chargesList"),
+        jobTemplateSetting: permission("/globalConfig/jobTemplateSetting"),
+        errorManager: permission("/globalConfig/errorManager"),
+        holidaySetting: permission("/globalConfig/holidaySetting"),
+        musicCourseFee: permission("/globalConfig/musicCourseFee"),
+        discountManage: permission("/globalConfig/discountManage"),
+        courseTimerSetting: permission("/globalConfig/courseTimerSetting")
       }
-    }
+    };
   },
   methods: {
-    handleClick (val) {
-      this.activeIndex = val.name
+    handleClick(val) {
+      this.activeIndex = val.name;
     }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 /deep/.m-container {

src/views/categroyManager/insideSetting/adminManager.vue

@@ -28,7 +28,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination sync :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
@@ -90,10 +90,14 @@ export default {
           page: this.pageInfo.page
         }
       }
+      let tagTitle = '新建'
       if (row) {
         params.query.id = row.id
+        tagTitle = '修改'
       }
-      this.$router.push(params)
+      this.$router.push(params, (route) => {
+        route.meta.title = tagTitle + '系统角色权限'
+      })
     }
   }
 }

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -17,7 +17,7 @@
                     v-model.trim="result.roleDesc"></el-input>
         </el-form-item>
         <el-form-item label="搜索">
-          <el-input style="width:212px"
+          <el-input style="width:210px"
                     v-model.trim="seachRoleValue"></el-input>
           <el-button style="margin-left: 10px"
                      type="danger"

src/views/categroyManager/specialSetup/chargesList.vue

@@ -2,7 +2,7 @@
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <save-form :inline="true" @submit="search" @reset="onReSet" :saveKey="'chargesList'" :model="searchForm">
         <el-form-item>
           <el-select
             placeholder="请选择分部"
@@ -34,10 +34,10 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button type="danger" native-type="submit">搜索</el-button>
+          <el-button type="primary" native-type="reset">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div @click="onChargeOperation('create')" v-permission="'chargeTypeOrganizationFee/add'"
            class='newBand'>添加</div>
       <div class="tableWrap">

src/views/categroyManager/specialSetup/courseTimerSetting.vue

@@ -4,6 +4,9 @@
       :inline="true"
       class="searchForm"
       ref="searchForm"
+      @submit="search"
+      @reset="reset"
+      :saveKey="'courseTimerSetting'"
       :model.sync="searchForm"
     >
       <el-form-item :rules="[]">
@@ -39,8 +42,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="search" type="primary">搜索</el-button>
-        <el-button @click="reset" type="danger">重置</el-button>
+        <el-button native-type="submit" type="danger">搜索</el-button>
+        <el-button native-type="reset" type="primary">重置</el-button>
       </el-form-item>
     </save-form>
     <div

src/views/categroyManager/specialSetup/discountManage.vue

@@ -2,7 +2,10 @@
   <div class='m-container'>
     <!-- <h2>折扣设置</h2> -->
     <div class="m-core">
-      <el-form :inline="true"
+      <save-form :inline="true"
+               @submit="search"
+               @reset="onReSet"
+               :saveKey="'discountManage'"
                :model="searchForm">
         <el-form-item>
           <el-select v-model.trim="searchForm.subjectId"
@@ -34,12 +37,10 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger"
-                     @click="search">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+          <el-button type="danger" native-type="submit">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class='newBand'
            v-permission="'chargeTypeSubjectMapper/insert'"
            @click="createVisible = true">添加</div>
@@ -73,7 +74,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination sync :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -74,15 +74,11 @@
             <el-select v-model.trim="form.subjectId"
                        clearable
                        filterable>
-              <el-option-group v-for="group in subjectList"
-                               :key="group.label"
-                               :label="group.label">
-                <el-option v-for="item in group.options"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-option-group>
+              <el-option v-for="item in selects.subjects"
+                           :key="item.id"
+                          :label="item.name"
+                           :value="item.id">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="作业内容"
@@ -107,14 +103,13 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { courseHomeworkTemplateList, subjectListTree, homeWorkUpdate, homeWorkAdd, homeWorkDel } from '@/api/specialSetting'
+import { courseHomeworkTemplateList, homeWorkUpdate, homeWorkAdd, homeWorkDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
   name: 'jobTemplateSetting',
   data () {
     return {
       tableList: [],
-      subjectList: [], // 声部
       formActionTitle: 'create',
       formTitle: {
         create: '添加作业模板',
@@ -145,7 +140,8 @@ export default {
   },
   mounted () {
     this.getList()
-    this.getSubjectTree()
+    // 获取声部
+    this.$store.dispatch('setSubjects')
   },
   methods: {
     onJobSubmit (formName) { // 添加数据
@@ -220,32 +216,6 @@ export default {
       }
       this.$refs[formName].resetFields()
     },
-    getSubjectTree () { // 获取声部列表
-      subjectListTree({
-        delFlag: 'NO',
-        rows: 9999
-      }).then(res => {
-        let result = res.data
-        if (res.code == 200) {
-          let tempArray = []
-          result.rows.forEach((item, index) => {
-            let subject = []
-            item.subjects.forEach(s => {
-              subject.push({
-                value: s.id,
-                label: s.name
-              })
-            })
-
-            tempArray[index] = {
-              label: item.name,
-              options: subject
-            }
-          })
-          this.subjectList = tempArray
-        }
-      })
-    }
 
   }
 }

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -2,19 +2,23 @@
   <div class="m-container">
     <!-- <h2>折扣设置</h2> -->
     <div class="m-core">
-      <el-form :inline="true"
+      <save-form :inline="true"
+               @submit="search"
+               @reset="onReSet"
+               ref="searchForm"
+               :saveKey="'musicCourseFee'"
                :model="searchForm">
-        <el-form-item>
+        <el-form-item prop="organId">
           <el-select placeholder="请选择分部"
                      v-model="searchForm.organId"
                      clearable>
-            <el-option v-for="(item, index) in organList"
+            <el-option v-for="(item, index) in selects.branchs"
                        :label="item.name"
                        :value="item.id"
                        :key="index"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="courseScheduleType">
           <el-select placeholder="课程类型"
                      v-model="searchForm.courseScheduleType"
                      clearable
@@ -27,12 +31,11 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger"
-                     @click="search">搜索</el-button>
-          <el-button @click="onReSet"
+          <el-button type="danger" native-type="submit">搜索</el-button>
+          <el-button native-type="reset"
                      type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class="newBand"
            v-permission="'organizationCourseUnitPriceSettings/insert'"
            @click="newVisiable = true">
@@ -105,7 +108,7 @@
           <el-select placeholder="请选择分部"
                      v-model="createForm.organId"
                      clearable>
-            <el-option v-for="(item, index) in organList"
+            <el-option v-for="(item, index) in selects.branchs"
                        :label="item.name"
                        :value="item.id"
                        :key="index"></el-option>
@@ -170,7 +173,7 @@
                      v-model="resetForm.organId"
                      clearable
                      disabled>
-            <el-option v-for="(item, index) in organList"
+            <el-option v-for="(item, index) in search.branchs"
                        :label="item.name"
                        :value="item.id"
                        :key="index"></el-option>
@@ -278,14 +281,10 @@ export default {
         this.dataList.forEach((item) => {
           this.$set(this.createForm.unitPriceJson, item.id, null);
         });
-        console.log(this.createForm);
-      }
-    });
-    getEmployeeOrgan().then((res) => {
-      if (res.code == 200) {
-        this.organList = res.data;
       }
     });
+    // 获取分部
+    this.$store.dispatch('setBranchs')
     this.getList();
   },
   methods: {
@@ -294,10 +293,7 @@ export default {
       this.getList();
     },
     onReSet () {
-      this.searchForm = {
-        organId: null,
-        courseScheduleType: null,
-      };
+      this.$refs.searchForm.resetFields()
       this.search();
     },
 

src/views/luckyDraw/lotteryManager.vue

@@ -6,18 +6,19 @@
         </h2>
         <div class="newBand" v-permission="'luckDrawGroup/add'" @click="onOperationLottery('create')">添加</div>
         <!-- 搜索标题 -->
-        <el-form :inline="true"
+        <save-form :inline="true"
                 class="searchForm"
-                v-model.trim="searchForm">
+                @submit="getList"
+                :model="searchForm">
         <el-form-item >
-            <el-input v-model.trim="searchForm.search"
+            <el-input v-model.trim="searchForm.search" clearable
                     placeholder="请输入活动名称"></el-input>
         </el-form-item>
         <el-form-item>
-            <el-button @click="getList"
+            <el-button native-type="submit"
                     type="danger">搜索</el-button>
         </el-form-item>
-        </el-form>
+        </save-form>
         <!-- 列表 -->
         <div class="tableWrap">
             <el-table :data="tableList"
@@ -40,7 +41,7 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <pagination :total="pageInfo.total"
+            <pagination sync :total.sync="pageInfo.total"
                         :page.sync="pageInfo.page"
                         :limit.sync="pageInfo.limit"
                         :page-sizes="pageInfo.page_size"
@@ -127,9 +128,6 @@ export default {
     mounted () {
         this.getList()
     },
-    activated () {
-        this.getList()
-    },
     methods: {
         onOperationLottery(type, data) {
             this.formActionTitle = type

src/views/luckyDraw/lotteryRecord.vue

@@ -5,24 +5,28 @@
             <div class="squrt"></div>抽奖记录
         </h2>
         <!-- 搜索标题 -->
-        <el-form :inline="true"
+        <save-form :inline="true"
                 class="searchForm"
-                v-model.trim="searchForm">
-            <el-form-item>
-                <el-input v-model.trim="searchForm.userId"
+                ref="searchForm"
+                @submit="getList"
+                @reset="onReset"
+                :model="searchForm">
+            <el-form-item prop="userId">
+                <el-input v-model.trim="searchForm.userId" clearable
                         placeholder="请输入学生编号"></el-input>
             </el-form-item>
-            <el-form-item>
-                <el-input v-model.trim="searchForm.name"
+            <el-form-item prop="name">
+                <el-input v-model.trim="searchForm.name" clearable
                         placeholder="请输入奖项名称"></el-input>
             </el-form-item>
-            <el-form-item>
+            <el-form-item prop="time">
                 <el-date-picker
                     style="width: 100%"
                     v-model="time"
                     :picker-options="{ firstDayOfWeek: 1 }"
                     @change="onDateChange"
                     type="daterange"
+                    clearable
                     range-separator="至"
                     start-placeholder="抽奖开始日期"
                     end-placeholder="抽奖结束日期">
@@ -34,17 +38,17 @@
                             filterable
                             clearable
                             placeholder="请选择分部">
-                    <el-option v-for="(item,index) in organList"
+                    <el-option v-for="(item,index) in selects.branchs"
                             :key="index"
                             :label="item.name"
                             :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item>
-                <el-button @click="getList"
-                        type="danger">搜索</el-button>
+                <el-button native-type="submit" type="danger">搜索</el-button>
+                <el-button native-type="reset" type="primary">重置</el-button>
             </el-form-item>
-        </el-form>
+        </save-form>
         <!-- 列表 -->
         <div class="tableWrap">
             <el-table :data="tableList"
@@ -70,7 +74,7 @@
                                 label="抽奖时间">
                 </el-table-column>
             </el-table>
-            <pagination :total="pageInfo.total"
+            <pagination sync :total.sync="pageInfo.total"
                         :page.sync="pageInfo.page"
                         :limit.sync="pageInfo.limit"
                         :page-sizes="pageInfo.page_size"
@@ -81,7 +85,6 @@
 
 <script>
 import pagination from "@/components/Pagination/index";
-import { getEmployeeOrgan } from '@/api/buildTeam'
 import { luckDrawLogList } from './api'
 import dayjs from 'dayjs';
 import cleanDeep from 'clean-deep';
@@ -94,6 +97,7 @@ export default {
                 userId: null,
                 name: null,
                 startDate: null,
+                organId: null,
                 endDate: null
             },
             tableList: [],
@@ -116,20 +120,12 @@ export default {
         this.__init()
         this.getList()
     },
-    activated () {
-        this.__init()
-        this.getList()
-    },
     methods: {
-        __init() {
-            getEmployeeOrgan().then(res => {
-                if (res.code == 200) {
-                    this.organList = res.data;
-                }
-            })
+        async __init() {
+            // 获取分部
+            this.$store.dispatch('setBranchs')
         },
         onDateChange(value) {
-            console.log(value)
             let searchForm = this.searchForm
             searchForm.startDate = null
             searchForm.endDate = null
@@ -138,16 +134,23 @@ export default {
                 searchForm.endDate = dayjs(value[1]).format('YYYY-MM-DD') + ' 23:59:59'
             }
         },
-        getList() {
+        async getList() {
             let params = Object.assign({}, this.searchForm)
             params.rows = this.pageInfo.limit
             params.page = this.pageInfo.page
-            luckDrawLogList(cleanDeep(params)).then(res => {
+            await luckDrawLogList(cleanDeep(params)).then(res => {
                 if (res.code == 200 && res.data) {
                     this.tableList = res.data.rows
                     this.pageInfo.total = res.data.total
                 }
             })
+        },
+        onReset() {
+            this.$refs.searchForm.resetFields()
+            this.time = null
+            this.searchForm.startDate = null
+            this.searchForm.endDate = null
+            this.getList()
         }
     }
 };

src/views/luckyDraw/trophyManager.vue

@@ -6,11 +6,12 @@
         </h2>
         <div class="newBand" v-permission="'luckDrawPrize/batchAdd'" @click="onOperationTrophy('create')">添加</div>
         <!-- 搜索标题 -->
-        <el-form :inline="true"
+        <save-form :inline="true"
                 class="searchForm"
-                v-model.trim="searchForm">
+                @submit="getList"
+                :model="searchForm">
             <el-form-item>
-                <el-input v-model.trim="searchForm.name"
+                <el-input v-model.trim="searchForm.name" clearable
                         placeholder="请输入奖品名称"></el-input>
             </el-form-item>
             <el-form-item>
@@ -21,10 +22,9 @@
                 </el-select>
             </el-form-item>
             <el-form-item>
-                <el-button @click="getList"
-                        type="danger">搜索</el-button>
+                <el-button native-type="submit" type="danger">搜索</el-button>
             </el-form-item>
-        </el-form>
+        </save-form>
         <!-- 列表 -->
         <div class="tableWrap">
             <el-table :data="tableList"
@@ -73,7 +73,7 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <pagination :total="pageInfo.total"
+            <pagination sync :total.sync="pageInfo.total"
                         :page.sync="pageInfo.page"
                         :limit.sync="pageInfo.limit"
                         :page-sizes="pageInfo.page_size"
@@ -228,9 +228,6 @@ export default {
     async mounted () {
         await this.__init()
     },
-    async activated () {
-        await this.__init()
-    },
     methods: {
         async __init() {
             const query = this.$route.query

src/views/matchManager/index.vue

@@ -8,6 +8,7 @@
       <save-form :inline="true" ref="searchForm" @submit="search" @reset="onReSet" :model="searchForm">
         <el-form-item prop="search">
           <el-input v-model.trim="searchForm.search"
+                    clearable
                     @keyup.enter.native="search"
                     placeholder='选手姓名/编号/身份证号'></el-input>
         </el-form-item>