Merge branch 'iteration_adminOptimiz' of http://git.dayaedu.com/molingzhide/dy-admin-manager into iteration_adminOptimiz

src/components/Tooltip/index.vue

@@ -1,6 +1,6 @@
 <template>
   <el-tooltip effect="dark" placement="top">
-    <div slot="content" style="max-width: 200px; max-height: 250px; overflow-y: auto;">{{ content }}</div>
+    <div slot="content" style="max-width: 300px; max-height: 250px; overflow-y: auto;">{{ content }}</div>
     <span class="content-tooltip">{{ content }}</span>
   </el-tooltip>
 </template>

src/components/remote-search/index.vue

@@ -3,7 +3,6 @@
     <el-select
       :value="value"
       filterable
-      clearable
       remote
       reserve-keyword
       clearable

src/router/notKeepAliveList.js

@@ -48,4 +48,10 @@ export default [
   '/operateManager/stuRecodeManager',// 学生考勤
   '/operateManager/operateStudent', // 运营指标
   '/operateManager/serverIndexList', // 服务指标
+  '/operateManager/stuRecodeManager',
+  '/insideSetting/entryActivities', // 时间充值活动
+  '/insideSetting/entryOperation',
+  '/insideSetting/helpContent', // 帮助中心
+  '/insideSetting/helpCategory', // 帮助中心分类
+  '/shopManager/shopManager', // 商品管理
 ]

src/views/afterSchoolManager/afterSchoolList.vue

@@ -36,8 +36,8 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="分配开始日期"
-                          end-placeholder="分配结束日期"
+                          start-placeholder="截止开始日期"
+                          end-placeholder="截止结束日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"></el-date-picker>

src/views/app/entryActivities.vue

@@ -7,8 +7,9 @@
       <div @click="onChargeOperation('create')"
            v-permission="'/entryOperation'"
            class='newBand'>添加</div>
-      <el-form :inline="true"
-               :model="searchForm">
+      <save-form :inline="true"
+               :model="searchForm"
+               @submit="search">
         <!-- <el-form-item>
           <el-select placeholder="请选择适用范围">
             <el-option value="NEW" label="新用户"></el-option>
@@ -26,10 +27,9 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger"
-                     @click="getList">搜索</el-button>
+          <el-button type="danger" native-type="submit">搜索</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class="tableWrap">
         <el-table :data="dataList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -89,7 +89,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"
@@ -128,6 +128,10 @@ export default {
     this.getList()
   },
   methods: {
+    search() {
+      this.pageInfo.page = 1
+      this.getList()
+    },
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + '成功')
@@ -157,6 +161,8 @@ export default {
           query: {
             type: 'create'
           }
+        }, (route) => {
+          route.meta.title = '添加活动充值活动'
         })
       } else if (type == 'look') {
         this.$router.push({
@@ -165,6 +171,8 @@ export default {
             id: row.id,
             type: 'look'
           }
+        }, (route) => {
+          route.meta.title = '查看活动充值活动'
         })
       }
     },

src/views/app/entryOperation.vue

@@ -277,26 +277,6 @@ export default {
   mounted () {
     this.init();
   },
-  activated () {
-    if (this.$route.query.type == "create") {
-      this.form = {
-        name: null,
-        suitableUser: null,
-        date: null,
-        startDate: null,
-        endDate: null,
-        totalPrice: null,
-        discountPrice: null,
-        purchaseMinutes: null,
-        giveMinutes: null,
-        coverImg: null,
-        detail: null
-      }
-      this.$refs["form"].resetFields();
-    }
-    this.pageType = this.$route.query.type;
-    this.init();
-  },
   methods: {
     init () {
       this.getList();

src/views/helpCenter/helpCategory.vue

@@ -110,9 +110,6 @@ export default {
       }
     };
   },
-  activated () {
-    this.getList()
-  },
   mounted () {
     this.getList()
   },

src/views/helpCenter/helpContent.vue

@@ -12,9 +12,10 @@
            v-permission="'/helpCategory'"
            @click="onToUrl()">分类管理</div>
       <!-- 搜索标题 -->
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               v-model.trim="searchForm">
+               @submit="search"
+               :model="searchForm">
         <el-form-item prop="hasPracticeCourse">
           <el-cascader ref="cascader"
                        :show-all-levels="false"
@@ -24,10 +25,9 @@
                        clearable></el-cascader>
         </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"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
@@ -40,7 +40,12 @@
                            label="标题"></el-table-column>
           <el-table-column align="center"
                            prop="content"
-                           label="内容"></el-table-column>
+                           label="内容">
+            <template slot-scope="scope">
+              <!-- <overflow-text :text="scope.row.content"></overflow-text> -->
+              <Tooltip :content="scope.row.content"></Tooltip>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="catalog.text"
                            label="分类名"></el-table-column>
@@ -56,7 +61,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"
@@ -110,6 +115,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import Tooltip from '@/components/Tooltip'
 // import store from '@/store'
 import {
   helpCenterCatalogList,
@@ -118,7 +124,7 @@ import {
   helpCenterContentDelete
 } from "@/api/appTenant";
 export default {
-  components: { pagination },
+  components: { pagination, Tooltip },
   name: "helpCategory",
   data () {
     return {
@@ -155,15 +161,15 @@ export default {
       tempTreeList: []
     };
   },
-  activated () {
-    this.getList();
-    this.getTreeList()
-  },
   mounted () {
     this.getList();
     this.getTreeList()
   },
   methods: {
+    search() {
+      this.pageInfo.page = 1
+      this.getList()
+    },
     onTypeDelOpeation (row) {
       this.$confirm('您是否删除该内容?', '提示', {
         confirmButtonText: '确定',
@@ -312,7 +318,7 @@ export default {
         content: null, // 内容
         catalogId: [], // 分类编号
       }
-      this.$refs.cascader.handleClear()
+      this.$refs.formCascader.handleClear()
       this.$refs[formName].resetFields();
     }
   }

src/views/workBenchManager/classFeesIsOk.vue

@@ -32,6 +32,7 @@
           <el-input
             v-model.trim="searchForm.search"
             @keyup.enter.native="search"
+            clearable
             placeholder="课程编号、课程组名称"
           ></el-input>
         </el-form-item>
@@ -68,7 +69,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
+          <remoteSearch :commit='"setTeachers"'  v-model='searchForm.teacherId' />
+          <!-- <el-select
             placeholder="老师姓名"
             v-model="searchForm.teacherId"
             clearable
@@ -80,7 +82,7 @@
               :value="item.id"
               :key="index"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item>
           <el-select
@@ -358,6 +360,7 @@ import numeral from "numeral";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
+import remoteSearch from '@/components/remote-search/index'
 import load from "@/utils/loading";
 import {
   findIsSettlementCourseSalarys,
@@ -367,7 +370,7 @@ import {
 } from "@/api/journal";
 import { courseListType } from "@/utils/searchArray";
 export default {
-  components: { pagination },
+  components: { pagination, remoteSearch },
   data() {
     return {
       searchForm: {
@@ -412,9 +415,6 @@ export default {
     // 获取分部
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       if (!this.searchForm.month) {

src/views/workBenchManager/payAppeal.vue

@@ -10,6 +10,7 @@
         <el-form-item>
           <el-input
             v-model.trim="searchForm.search"
+            clearable
             @keyup.enter.native="search"
             placeholder="老师名称"
           ></el-input>
@@ -299,9 +300,6 @@ export default {
 
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       this.getList();

src/views/workBenchManager/requestProcessing.vue

@@ -62,10 +62,11 @@
         <el-form-item>
           <el-date-picker
             :clearable="true"
+            style="width: 100% !important;"
             v-model="searchForm.salarySettlementMonth"
             type="month"
             value-format="yyyy-MM"
-            placeholder="选择申诉年月"
+            placeholder="选择归属年月"
           ></el-date-picker>
         </el-form-item>
         <el-form-item>