Merge branch 'ol_12_30' into online

src/views/accompanyManager/accompanyBuys.vue

@@ -1,176 +1,179 @@
 <!--  -->
 <template>
   <div class="m-core">
-    <save-form :inline="true"
-             class="searchForm"
-             save-key='accompanyBuys'
-             @submit="search"
-             @reset="onReSet"
-             :model.sync="searchForm">
+    <save-form
+      :inline="true"
+      class="searchForm"
+      save-key="accompanyBuys"
+      @submit="search"
+      @reset="onReSet"
+      :model.sync="searchForm"
+    >
       <!-- 状态 指导老师 活动方案-->
       <el-form-item>
-        <el-input v-model.trim="searchForm.search"
-        clearable
-                  placeholder="学员编号 学员名称"></el-input>
+        <el-input
+          v-model.trim="searchForm.search"
+          clearable
+          placeholder="学员编号 学员名称"
+        ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-select class="multiple"
-                   v-model.trim="searchForm.organIdList"
-                   filterable
-                   clearable
-                   placeholder="请选择分部">
-          <el-option v-for="(item,index) in selects.branchs"
-                     :key="index"
-                     :label="item.name"
-                     :value="item.id"></el-option>
+        <el-select
+          class="multiple"
+          v-model.trim="searchForm.organIdList"
+          filterable
+          clearable
+          placeholder="请选择分部"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
       <!-- statusList -->
       <el-form-item prop="buy">
-        <el-select class="multiple"
-                   v-model.trim="searchForm.buy"
-                   filterable
-                   clearable
-                   placeholder="购买网管课">
-          <el-option label="是"
-                     value="true"></el-option>
-          <el-option label="否"
-                     value="false"></el-option>
+        <el-select
+          class="multiple"
+          v-model.trim="searchForm.buy"
+          filterable
+          clearable
+          placeholder="购买网管课"
+        >
+          <el-option label="是" value="true"></el-option>
+          <el-option label="否" value="false"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button native-type="submit"
-                   type="danger">搜索</el-button>
-        <el-button native-type="reset"
-                   type="primary">重置</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-item>
         <!-- <div class="newBand" @click="onExport">导出</div> -->
-        <el-button @click="onExport"
-                   type="primary"
-                   v-permission="'export/studentBuyPractice'"
-                   style="background-color: #14928a; border: 1px solid #14928a;">导出</el-button>
+        <el-button
+          @click="onExport"
+          type="primary"
+          v-permission="'export/studentBuyPractice'"
+          style="background-color: #14928a; border: 1px solid #14928a"
+          >导出</el-button
+        >
       </el-form-item>
     </save-form>
     <div class="tableWrap">
-      <el-table style="width: 100%"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-                :data="tableData">
-        <el-table-column align="center"
-                         prop="studentId"
-                         label="学员编号">
-                           <template slot-scope="scope">
-              <copy-text>{{ scope.row.studentId }}</copy-text>
-            </template>
-                         </el-table-column>
-        <el-table-column align="center"
-                         prop="studentName"
-                         label="学员名称">
-                                        <template slot-scope="scope">
-              <copy-text>{{ scope.row.studentName }}</copy-text>
-            </template>
-                         </el-table-column>
-        <el-table-column align="center"
-                         prop="organName"
-                         label="所属分部">
-
-                                        <template slot-scope="scope">
-              <copy-text>{{ scope.row.organName }}</copy-text>
-            </template>
-                         </el-table-column>
+      <el-table
+        style="width: 100%"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        :data="tableData"
+      >
+        <el-table-column align="center" prop="studentId" label="学员编号">
+          <template slot-scope="scope">
+            <copy-text>{{ scope.row.studentId }}</copy-text>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="studentName" label="学员名称">
+          <template slot-scope="scope">
+            <copy-text>{{ scope.row.studentName }}</copy-text>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="organName" label="所属分部">
+          <template slot-scope="scope">
+            <copy-text>{{ scope.row.organName }}</copy-text>
+          </template>
+        </el-table-column>
         <!-- educationalTeacherId -->
-        <el-table-column align="center"
-                         prop="phone"
-                         label="手机号"></el-table-column>
-        <el-table-column align="center"
-                         label="是否购买">
+        <el-table-column
+          align="center"
+          prop="phone"
+          label="手机号"
+        ></el-table-column>
+        <el-table-column align="center" label="是否购买">
           <template slot-scope="scope">
             <div>
-              <p>{{scope.row.buyPractice?'是':'否'}}</p>
+              <p>{{ scope.row.buyPractice ? "是" : "否" }}</p>
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="lastClassDate"
-                         label="结束日期">
-          <template slot="header"
-                    slot-scope="scope">
-            <p style="position: relative; "> 结束日期 <el-tooltip placement="top"
-                          popper-class="mTooltip">
-                <div slot="content">
-                  免费网管课最后一节课截止日期
-                </div>
+        <el-table-column align="center" prop="lastClassDate" label="结束日期">
+          <template slot="header" slot-scope="scope">
+            <p style="position: relative">
+              结束日期
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">免费网管课最后一节课截止日期</div>
                 <!-- <img :src="imageIcon"
                       class="micon el-tooltip"
                       style="width:8px height:8px"
                       alt /> -->
-                <i class="el-icon-question"
-                   style="font-size: 18px; color: #F56C6C"></i>
+                <i
+                  class="el-icon-question"
+                  style="font-size: 18px; color: #f56c6c"
+                ></i>
               </el-tooltip>
             </p>
           </template>
           <template slot-scope="scope">
             <div>
-              <p>{{scope.row.lastClassDate | formatTimer}}</p>
+              <p>{{ scope.row.lastClassDate | formatTimer }}</p>
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="firstBuyTime"
-                         label="购买日期">
-          <template slot="header"
-                    slot-scope="scope">
-            <p style="position: relative; "> 购买日期 <el-tooltip placement="top"
-                          popper-class="mTooltip">
-                <div slot="content">
-                  付费网管课第一次购买时间
-                </div>
+        <el-table-column align="center" prop="firstBuyTime" label="购买日期">
+          <template slot="header" slot-scope="scope">
+            <p style="position: relative">
+              购买日期
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">付费网管课第一次购买时间</div>
                 <!-- <img :src="imageIcon"
                       class="micon el-tooltip"
                       style="width:8px height:8px"
                       alt /> -->
-                <i class="el-icon-question"
-                   style="font-size: 18px; color: #F56C6C"></i>
+                <i
+                  class="el-icon-question"
+                  style="font-size: 18px; color: #f56c6c"
+                ></i>
               </el-tooltip>
             </p>
           </template>
           <template slot-scope="scope">
             <div>
-              <p>{{scope.row.firstBuyTime | formatTimer}}</p>
+              <p>{{ scope.row.firstBuyTime | formatTimer }}</p>
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="intervalDay"
-                         label="时间差">
-          <template slot="header"
-                    slot-scope="scope">
-            <p style="position: relative; "> 时间差 <el-tooltip placement="top"
-                          popper-class="mTooltip">
-                <div slot="content">
-                  付费网管课结束后与购买日期的时间差
-                </div>
+        <el-table-column align="center" prop="intervalDay" label="时间差">
+          <template slot="header" slot-scope="scope">
+            <p style="position: relative">
+              时间差
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">付费网管课结束后与购买日期的时间差</div>
                 <!-- <img :src="imageIcon"
                       class="micon el-tooltip"
                       style="width:8px height:8px"
                       alt /> -->
-                <i class="el-icon-question"
-                   style="font-size: 18px; color: #F56C6C"></i>
+                <i
+                  class="el-icon-question"
+                  style="font-size: 18px; color: #f56c6c"
+                ></i>
               </el-tooltip>
             </p>
           </template>
           <template slot-scope="scope">
             <div>
-              <p>{{scope.row.intervalDay + '天'}}</p>
+              <p>{{ scope.row.intervalDay + "天" }}</p>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="rules.total"
-                  :page.sync="rules.page"
-                  :limit.sync="rules.limit"
-                  :page-sizes="rules.page_size"
-                  @pagination="getList" />
+      <pagination
+        sync
+        :total.sync="rules.total"
+        save-key="accompanyBuys"
+        :page.sync="rules.page"
+        :limit.sync="rules.limit"
+        :page-sizes="rules.page_size"
+        @pagination="getList"
+      />
     </div>
   </div>
 </template>
@@ -178,21 +181,21 @@
 <script>
 import {
   practiceGroupManageStudentBuys,
-  getEmployeeOrgan
+  getEmployeeOrgan,
 } from "@/api/buildTeam";
 import pagination from "@/components/Pagination/index";
-import axios from 'axios'
-import { getToken } from '@/utils/auth'
-import load from '@/utils/loading'
-import qs from 'qs'
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import load from "@/utils/loading";
+import qs from "qs";
 export default {
   components: { pagination },
-  data () {
+  data() {
     return {
       searchForm: {
         search: null,
         buy: null,
-        organIdList: null
+        organIdList: null,
       },
       tableData: [],
       organList: [],
@@ -201,122 +204,123 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created () { },
+  created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {
+  mounted() {
     this.init();
   },
-  activated () {
+  activated() {
     this.init();
   },
   computed: {
     saveKey() {
-      return this.$route.path + '/2'
-    }
+      return this.$route.path + "/2";
+    },
   },
   methods: {
-    init () {
+    init() {
       // 获取分部
-      this.$store.dispatch('setBranchs')
+      this.$store.dispatch("setBranchs");
       // getEmployeeOrgan().then(res => {
       //   if (res.code == 200) {
       //     this.organList = res.data;
       //   }
       // });
-      this.getList()
+      this.getList();
     },
-    getList () {
+    getList() {
       let obj = {
         page: this.rules.page,
-        rows: this.rules.limit
+        rows: this.rules.limit,
       };
       this.searchForm.search ? (obj.search = this.searchForm.search) : null;
-      this.searchForm.buy
-        ? (obj.buyPractice = this.searchForm.buy)
-        : null;
+      this.searchForm.buy ? (obj.buyPractice = this.searchForm.buy) : null;
       this.searchForm.organIdList
         ? (obj.organId = this.searchForm.organIdList)
         : null;
-      practiceGroupManageStudentBuys(obj).then(res => {
+      practiceGroupManageStudentBuys(obj).then((res) => {
         if (res.code == 200) {
-          this.tableData = res.data.rows
+          this.tableData = res.data.rows;
           this.rules.total = res.data.total;
         }
       });
     },
-    search () {
+    search() {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet () {
+    onReSet() {
       this.searchForm = {
         search: null,
         buy: null,
-        organIdList: null
+        organIdList: null,
       };
       this.search();
     },
     // 导出
-    onExport () {
+    onExport() {
       let searchForm = this.searchForm;
       let data = {
         buyPractice: searchForm.buy || null,
         organId: searchForm.organIdList || null,
-        search: searchForm.search || null
+        search: searchForm.search || null,
       };
       let url = "/api-web/export/studentBuyPractice";
       const options = {
         method: "POST",
         headers: {
-          Authorization: getToken()
+          Authorization: getToken(),
         },
         params: data,
         url,
-        responseType: "blob"
+        responseType: "blob",
       };
       this.$confirm("您确定导出报表", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          load.startLoading()
-          axios(options).then(res => {
-            let blob = new Blob([res.data], {
-              // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-              type: "application/vnd.ms-excel;charset=utf-8"
-              //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-            });
+          load.startLoading();
+          axios(options)
+            .then((res) => {
+              let blob = new Blob([res.data], {
+                // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+                type: "application/vnd.ms-excel;charset=utf-8",
+                //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+              });
 
-            let text = (new Response(blob)).text()
-            text.then(res => {
-              // 判断是否报错
-              if (res.indexOf('code') != -1) {
-                let json = JSON.parse(res)
-                this.$message.error(json.msg)
-              } else {
-                let objectUrl = URL.createObjectURL(blob);
-                let link = document.createElement("a");
-                let fname = "网管课购买" + new Date().getTime(); //下载文件的名字
-                link.href = objectUrl;
-                link.setAttribute("download", fname);
-                document.body.appendChild(link);
-                link.click();
-              }
+              let text = new Response(blob).text();
+              text.then((res) => {
+                // 判断是否报错
+                if (res.indexOf("code") != -1) {
+                  let json = JSON.parse(res);
+                  this.$message.error(json.msg);
+                } else {
+                  let objectUrl = URL.createObjectURL(blob);
+                  let link = document.createElement("a");
+                  let fname = "网管课购买" + new Date().getTime(); //下载文件的名字
+                  link.href = objectUrl;
+                  link.setAttribute("download", fname);
+                  document.body.appendChild(link);
+                  link.click();
+                }
+              });
+              load.endLoading();
             })
-            load.endLoading();
-          }).catch(error => {
-            this.$message.error('导出数据失败，请联系管理员');
-            load.endLoading();
-          });
-        }).catch(() => { });
-    }
-  }
+            .catch((error) => {
+              this.$message.error("导出数据失败，请联系管理员");
+              load.endLoading();
+            });
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

src/views/accompanyManager/accompanyList.vue

@@ -288,6 +288,7 @@
           </el-table-column>
         </el-table>
         <pagination
+         save-key="accompanyList"
           sync
           :total.sync="rules.total"
           :page.sync="rules.page"

src/views/afterSchoolManager/afterSchoolList.vue

@@ -123,7 +123,9 @@
           </el-table-column>
         </el-table>
         <pagination
-          :total="rules.total"
+        sync
+         :saveKey="'afterSchoolList'"
+          :total.sync="rules.total"
           :page.sync="rules.page"
           :limit.sync="rules.limit"
           :page-sizes="rules.page_size"

src/views/afterSchoolManager/afterWorkList.vue

@@ -200,7 +200,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
+        <pagination
+         :saveKey="'afterWorkList'"
+        :total="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"
@@ -491,4 +493,4 @@ export default {
 /deep/.el-textarea.is-disabled .el-textarea__inner {
   color: #333;
 }
-</style>
+</style>

src/views/businessManager/orderManager/financeManager.vue

@@ -366,7 +366,7 @@
               style="width: 100% !important"
             >
               <el-option
-                v-for="(item, index) in organList"
+                v-for="(item, index) in selects.branchs"
                 :key="index"
                 :label="item.name"
                 :value="item.id"
@@ -511,7 +511,7 @@
               </el-form-item>
               <el-form-item
                 class="setWidth"
-                style="margin-right: 10px"
+                style="margin:0 10px"
                 :prop="'goodsList.' + index + '.number'"
                 :rules="validAmount"
               >
@@ -536,7 +536,7 @@
               ></el-button>
               <el-button
                 icon="el-icon-plus"
-                  v-if="form.goodsList.length > 1"
+
                 :disabled="!isAdd"
                 @click.prevent="addGoodsList"
                 circle

src/views/categroyManager/generalSettings/errorManager.vue

@@ -28,7 +28,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination
+        :saveKey="'errorManager'"
+        sync
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
@@ -73,7 +76,7 @@ export default {
         create: '添加热词标签',
         update: '修改热词标签'
       },
-      typeStatus: false, // 添加教学点 
+      typeStatus: false, // 添加教学点
       formLabelWidth: '120px',
       form: {
         name: null, // 热词标签
@@ -181,4 +184,4 @@ export default {
 /deep/.el-select {
   width: 98% !important;
 }
-</style>
+</style>

src/views/categroyManager/specialSetup/chargesList.vue

@@ -85,7 +85,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination
+        :saveKey="'chargesList'"
+        :total="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/courseTimerSetting.vue

@@ -94,6 +94,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       :saveKey="'courseTimerSetting'"
         sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/categroyManager/specialSetup/discountManage.vue

@@ -74,7 +74,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination sync :total.sync="pageInfo.total"
+        <pagination sync
+         :saveKey="'discountManage'"
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -38,7 +38,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination
+        sync
+         :saveKey="'jobTemplateSetting'"
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -87,7 +87,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination
+         :saveKey="'musicCourseFee'"
+         sync
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/typesManager.vue

@@ -23,7 +23,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination
+        save-key='typesManager'
+        sync
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/contentManager/components/activity.vue

@@ -77,7 +77,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+      :saveKey="'contentActivity'"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -187,4 +189,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/contentManager/components/appPage.vue

@@ -88,7 +88,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+       saveKey="contentAppPage"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -195,4 +197,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/contentManager/components/banner.vue

@@ -94,7 +94,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+        saveKey="contentBanner"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -206,4 +208,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/contentManager/components/flashPage.vue

@@ -81,7 +81,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+      saveKey="contentFlashPage"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -189,4 +191,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/contentManager/components/information.vue

@@ -81,7 +81,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+      :saveKey="'contentInformation'"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -188,4 +190,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/contentManager/components/knowledge.vue

@@ -115,7 +115,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+       saveKey="contentKnowledge"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -241,4 +243,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/contentManager/components/training.vue

@@ -77,7 +77,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination sync :total.sync="pageInfo.total"
+      <pagination
+       :saveKey="'contentTraining'"
+      sync :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -187,4 +189,4 @@ export default {
 .bannerImg {
   height: 60px;
 }
-</style>
+</style>

src/views/evaluateManager/evaluateList.vue

@@ -150,6 +150,7 @@
         </el-table-column>
       </el-table>
       <pagination
+        save-key="commentManager-evaluateList"
         sync
         :total.sync="rules.total"
         :page.sync="rules.page"

src/views/evaluateManager/networkList.vue

@@ -259,6 +259,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       save-key="commentManager-networkList"
         sync
         :total.sync="rules.total"
         :page.sync="rules.page"

src/views/evaluateManager/vipEvaluateList.vue

@@ -33,7 +33,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select
+        <!-- <el-select
           placeholder="指导老师"
           v-model="searchForm.teacherId"
           clearable
@@ -45,7 +45,8 @@
             :value="item.id"
             :key="index"
           ></el-option>
-        </el-select>
+        </el-select> -->
+           <remote-search :commit='"setTeachers"' v-model='searchForm.teacherId' />
       </el-form-item>
       <el-form-item>
         <el-select
@@ -205,6 +206,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       save-key="commentManager-vipEvaluateList"
         sync
         :total.sync="rules.total"
         :page.sync="rules.page"
@@ -452,11 +454,11 @@ export default {
       }
 
       // 获取指导老师
-      getTeacher({}).then((res) => {
-        if (res.code == 200) {
-          this.teacherList = res.data;
-        }
-      });
+      // getTeacher({}).then((res) => {
+      //   if (res.code == 200) {
+      //     this.teacherList = res.data;
+      //   }
+      // });
       // 获取分部
       getEmployeeOrgan().then((res) => {
         if (res.code == 200) {

src/views/resetTeaming/components/resetPayList.vue

@@ -1,7 +1,9 @@
 <!--  -->
 <template>
   <div class="m-core">
-    <el-form :inline="true"
+    <save-form :inline="true"
+    save-key="resetPayList"
+    @submit='getList'
              :model="searchForm">
       <el-form-item>
         <el-select placeholder="缴费类型"
@@ -17,10 +19,10 @@
 
       <el-form-item>
         <el-button type="danger"
-                   @click="getList">搜索</el-button>
+                   native-type="submit">搜索</el-button>
         <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
       </el-form-item>
-    </el-form>
+    </save-form>
     <div class="topWrap">
       <div class="newBand"
            @click="newUserPay"
@@ -149,7 +151,10 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="rules.total"
+      <pagination
+      save-key="resetPayList"
+      sync
+      :total.sync="rules.total"
                   :page.sync="rules.page"
                   :limit.sync="rules.limit"
                   :page-sizes="rules.page_size"

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -1,7 +1,9 @@
 <!--  -->
 <template>
   <div class="m-core">
-    <el-form :inline="true"
+    <save-form :inline="true"
+    @submit='getList'
+    save-key='resetPayListSchool'
              :model="searchForm">
       <el-form-item>
         <el-select placeholder="缴费类型"
@@ -17,10 +19,10 @@
 
       <el-form-item>
         <el-button type="danger"
-                   @click="getList">搜索</el-button>
+                  native-type="submit">搜索</el-button>
         <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
       </el-form-item>
-    </el-form>
+    </save-form>
     <div class="topWrap">
       <div class="newBand"
            @click="newSchoolPay"
@@ -149,7 +151,10 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="rules.total"
+      <pagination
+      save-key='resetPayListSchool'
+      sync
+      :total.sync="rules.total"
                   :page.sync="rules.page"
                   :limit.sync="rules.limit"
                   :page-sizes="rules.page_size"

src/views/studentManager/components/studentCashout.vue

@@ -46,7 +46,9 @@
                          prop="withdrawNo">
         </el-table-column>
       </el-table>
-      <pagination :total="pageInfo.total"
+      <pagination
+      save-key='studentDetail-studentCashout'
+      :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -95,4 +97,4 @@ export default {
 }
 </script>
 <style lang="scss">
-</style>
+</style>

src/views/studentManager/components/studentNetwork.vue

@@ -55,7 +55,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
+        <pagination
+        sync
+        save-key='studentDetail-studentNetwork'
+        :total.sync="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"

src/views/studentManager/components/studentOrder.vue

@@ -256,7 +256,9 @@
                 </el-table-column>
               </el-table>
               <pagination
-                :total="courseAccount.total"
+               save-key="studentDetail-studentOrder"
+               sync
+                :total.sync="courseAccount.total"
                 :page.sync="courseAccount.page"
                 :limit.sync="courseAccount.limit"
                 :page-sizes="courseAccount.page_size"

src/views/studentManager/components/studentOutList.vue

@@ -75,6 +75,7 @@
         </el-table-column> -->
       </el-table>
       <pagination
+       save-key="studentDetail-studentOutList"
         sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/studentManager/components/studentPayList.vue

@@ -82,6 +82,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       save-key="studentDetail-studentPayList"
         sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/studentManager/components/studentRecord.vue

@@ -239,6 +239,7 @@
         </el-table>
         <pagination
           sync
+           save-key='studentDetail-studentRecord'
           :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"

src/views/studentManager/components/studentVip.vue

@@ -99,6 +99,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       save-key="studentDetail-studentVip"
       sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -87,6 +87,7 @@
         </el-table-column>
       </el-table>
       <pagination
+      save-key='teacherDetail-courseInfo'
       sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -87,6 +87,7 @@
         </el-table-column>
       </el-table>
       <pagination
+      save-key='teacherDetail-courseInfo1'
       sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/courseInfo2.vue

@@ -17,7 +17,10 @@
                          prop="subjectNames">
         </el-table-column>
       </el-table>
-      <pagination :total="pageInfo.total"
+      <pagination
+      save-key='teacherDetail-courseInfo2'
+      sync
+      :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -87,4 +90,4 @@ export default {
     margin-top: 20px;
   }
 }
-</style>
+</style>

src/views/teacherManager/teacherDetail/components/leaveRecord.vue

@@ -63,6 +63,7 @@
         </el-table-column>
       </el-table>
       <pagination
+      save-key="teacherDetail-leaveRecord"
         sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/outCourseList.vue

@@ -88,6 +88,7 @@
         </el-table-column>
       </el-table>
       <pagination
+      save-key='teacherDetail-outCourseList'
         sync
         :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/serveStudentList.vue

@@ -35,7 +35,10 @@
                          align="right">
         </el-table-column>
       </el-table>
-      <pagination :total="pageInfo.total"
+      <pagination
+      save-key='teacherDetail-serveStudentList'
+      sync
+      :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
@@ -194,4 +197,4 @@ export default {
     margin-top: 20px;
   }
 }
-</style>
+</style>

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -133,6 +133,7 @@
         </el-table-column>
       </el-table>
       <pagination
+      save-key='teacherDetail-settlement'
       sync
       :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -127,6 +127,7 @@
           ></el-table-column>
         </el-table>
         <pagination
+         save-key="teacherDetail-record"
           sync
           :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"

src/views/teacherManager/teacherDetail/components/timerList.vue

@@ -86,6 +86,7 @@
                          label="备注"></el-table-column>
       </el-table>
       <pagination
+       save-key='teacherDetail-timerList'
       sync
       :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"

src/views/teamDetail/components/classList.vue

@@ -86,7 +86,10 @@
           </template>
         </el-table-column> -->
       </el-table>
-      <pagination :total="rules.total"
+      <pagination
+      sync
+      save-key='teamDetails-classList'
+      :total.sync="rules.total"
                   :page.sync="rules.page"
                   :limit.sync="rules.limit"
                   :page-sizes="rules.page_size"
@@ -271,4 +274,4 @@ export default {
 }
 </script>
 <style lang="scss" scope>
-</style>
+</style>

src/views/teamDetail/components/courseList.vue

@@ -2,6 +2,7 @@
   <div class="cl-container">
     <!-- 搜索类型 -->
     <save-form :inline="true"
+    save-key='teamDetails-courseList'
              class="searchForm"
              ref='searchForm'
              :model="searchForm" @submit="search" @reset="onReSet">
@@ -178,6 +179,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       save-key='teamDetails-courseList'
       sync
       :total.sync="rules.total"
                   :page.sync="rules.page"

src/views/teamDetail/components/studentList.vue

@@ -256,6 +256,7 @@
         </el-table-column>
       </el-table>
       <pagination
+       save-key="teamDetails-studentList"
         sync
         :total.sync="rules.total"
         :page.sync="rules.page"

src/views/teamDetail/components/teacherList.vue

@@ -98,6 +98,7 @@
         </el-table-column> -->
       </el-table>
       <pagination
+      save-key="teamDetails-teacherList"
       sync
         :total.sync="rules.total"
         :page.sync="rules.page"

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -94,6 +94,7 @@
       </el-table>
       <!-- 分页器 -->
       <pagination
+      save-key='vipDetail-fnanceInfo'
       sync
       :total.sync="rules.total"
                   :page.sync="rules.page"

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -174,6 +174,7 @@
       </el-table>
     </div>
     <pagination
+      save-key='vipDetail-record'
       sync
       :total.sync="rules.total"
       :page.sync="rules.page"

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -123,6 +123,7 @@
         <el-table-column prop="courseSalary" label="课程余额"></el-table-column>
       </el-table>
       <pagination
+      save-key='vipDetail-vipStudentList'
         sync
         :total.sync="rules.total"
         :page.sync="rules.page"