Преглед на файлове

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

mo преди 4 години
родител
ревизия
ca57d6df8c
променени са 3 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 1 0
      src/router/notKeepAliveList.js
  2. 1 1
      src/views/categroyManager/insideSetting/staffManager.vue
  3. 2 1
      src/views/timedTask/index.vue

+ 1 - 0
src/router/notKeepAliveList.js

@@ -89,4 +89,5 @@ export default [
   '/business/teacherDetail',
   '/arrearage-students',
   '/business/strudentPayInfo',
+  '/timedTask/timedTask'
 ]

+ 1 - 1
src/views/categroyManager/insideSetting/staffManager.vue

@@ -625,7 +625,7 @@ export default {
   }
 }
 /deep/.el-dialog__body {
-  padding: 0 20px;
+  // padding: 0 20px;
 }
 /deep/.el-select,
 /deep/.el-date-editor.el-input {

+ 2 - 1
src/views/timedTask/index.vue

@@ -52,7 +52,8 @@
           </el-table-column>
         </el-table>
         <pagination
-          :total="pageInfo.total"
+          sync
+          :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"
           :page-sizes="pageInfo.page_size"