更新工作台和首页优化

src/views/afterSchoolManager/afterSchoolDetail.vue

@@ -6,7 +6,7 @@
       <el-page-header @back="goBack"
                       :content="title"></el-page-header>
     </h2>
-    <afterWorkList />
+    <afterWorkList saveKey="afterSchoolDetail" />
   </div>
 </template>
 

src/views/afterSchoolManager/afterWorkList.vue

@@ -8,7 +8,7 @@
       <save-form :inline="true"
                :model="searchForm"
                @submit="search"
-               :saveKey="'afterWorkList'"
+               :saveKey="formSaveKey"
                @reset="onReSet"
                v-if="show">
         <el-form-item>
@@ -201,7 +201,7 @@
           </el-table-column>
         </el-table>
         <pagination
-         :saveKey="'afterWorkList'"
+         :saveKey="formSaveKey"
          sync
         :total.sync="rules.total"
                     :page.sync="rules.page"
@@ -264,10 +264,12 @@ import { Export } from '@/utils/downLoadFile'
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 export default {
-  props: ["id"],
+  props: ["id", "saveKey"],
   components: { pagination },
   data () {
+    const that = this
     return {
+      formSaveKey: that.saveKey || 'afterWorkList',
       searchForm: {
         search: null,
         timer: [],

src/views/main/schedule-branch/index.vue

@@ -66,7 +66,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total.sync="rules.total"
+    <pagination sync :total.sync="rules.total"
       :page.sync="rules.page"
       save-key="/main/main/schedule-branch"
       :limit.sync="rules.limit"

src/views/main/teamSchedule/scheduleDetail.vue

@@ -78,7 +78,7 @@
         >
       </div>
     </el-dialog>
-    <taskList ref="taskList" @resetSchedule="resetSchedule" @getTotal='getTotal'/>
+    <taskList style="margin-top: 15px;" ref="taskList" @resetSchedule="resetSchedule" @getTotal='getTotal'/>
   </div>
 </template>
 <script>

src/views/teamDetail/teamDetailedList.vue

@@ -25,18 +25,15 @@
                   :data='tableList'>
           <el-table-column label="商品编号"
                            prop='sn'
-                           align="center"
-                           width="160px">
+                           align="center">
           </el-table-column>
           <el-table-column label="商品名称"
                            align="center"
-                           prop='name'
-                           width="160px">
+                           prop='name'>
           </el-table-column>
           <el-table-column label="商品类型"
                            align="center"
-                           prop='type'
-                           width="160px">
+                           prop='type'>
             <template slot-scope="scope">
               <div>
                 {{ scope.row.type | shopType }}
@@ -45,8 +42,7 @@
           </el-table-column>
           <el-table-column label="具体型号"
                            align="center"
-                           prop='specification'
-                           width="160px">
+                           prop='specification'>
           </el-table-column>
           <el-table-column label="数量统计"
                            align="center"

src/views/workBenchManager/classFeesIsOk.vue

@@ -388,6 +388,7 @@ import remoteSearch from '@/components/remote-search/index'
 import load from "@/utils/loading";
 import { belongDaya } from '@/constant'
 import { objectToOptions } from '@/utils'
+import dayjs from 'dayjs'
 import {
   findIsSettlementCourseSalarys,
   openSalaryConfirm,
@@ -478,7 +479,7 @@ export default {
         teacherId: null,
         signInStatus: null,
         signOutStatus: null,
-        month: null,
+        month: dayjs().format('YYYY-MM'),
         confirmStatus: null,
       };
       this.search();

src/views/workBenchManager/journal/index.vue

@@ -6,19 +6,19 @@
     <div class="m-core">
         <tab-router v-model="activeIndex" type="card" >
           <el-tab-pane label="系统通知" lazy v-if="permissionList.journalItem" name="SYSTEM">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'SYSTEM'" saveKey="journal-system" />
           </el-tab-pane>
           <el-tab-pane label="学生申诉" lazy v-if="permissionList.studentComplain" name="STUDENT">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'STUDENT'" saveKey="journal-student" />
           </el-tab-pane>
           <el-tab-pane label="退团退课" lazy v-if="permissionList.musicGroupCourse" name="MUSICGROUP">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'MUSICGROUP'" saveKey="journal-musicGroup" />
           </el-tab-pane>
           <el-tab-pane label="请假处理" lazy v-if="permissionList.leaveOperation" name="LEAVE">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'LEAVE'" saveKey="journal-leave" />
           </el-tab-pane>
           <el-tab-pane label="VIP申请审核" lazy v-if="permissionList.vipApply" name="VIPAPPLY">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'VIPAPPLY'" saveKey="journal-vipApply" />
           </el-tab-pane>
         </tab-router>
     </div>

src/views/workBenchManager/journal/model/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <save-form :inline="true" ref="searchForm" :model="searchForm">
+    <save-form :inline="true" ref="searchForm" :model="searchForm" @submit="onSearch" :saveKey="saveKey">
       <el-form-item prop="readStatus">
         <el-select
           v-model.trim="searchForm.readStatus"
@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="onSearch">搜索</el-button>
+        <el-button type="danger" native-type="submit">搜索</el-button>
       </el-form-item>
     </save-form>
     <div class="tableWrap">
@@ -55,7 +55,9 @@
         </el-table-column>
       </el-table>
       <pagination
-        :total="pageInfo.total"
+        sync
+        :saveKey="saveKey"
+        :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"
         :limit.sync="pageInfo.limit"
         :page-sizes="pageInfo.page_size"
@@ -127,7 +129,7 @@ import vipApplyModel from "./vipApply";
 import musicGroupModel from "./musicGroup"
 export default {
   components: { pagination, StudentModel, LeaveModel, vipApplyModel, musicGroupModel },
-  props: ["type"],
+  props: ["type", 'saveKey'],
   data() {
     return {
       dialogSystem: false,

src/views/workBenchManager/payAppeal.vue

@@ -146,7 +146,7 @@
                   type="text"
                   v-if="permission('teacherAttendance/operation')&&scope.row.complaintsStatusEnum == 2"
                   @click="lookDetail(scope.row)"
-                  >操作</el-button
+                  >处理申诉</el-button
                 >
                  <el-button
                   type="text"

src/views/workBenchManager/requestProcessing.vue

@@ -142,7 +142,7 @@
                   type="text"
                   @click="lookDetail(scope.row)"
                   v-permission="'teacherSalaryComplaints/complaintsDispose'"
-                  >操作</el-button
+                  >课酬申诉</el-button
                 >
               </div>
             </template>