Merge remote-tracking branch 'origin/dev' into dev

src/views/work/claim.vue

@@ -89,9 +89,8 @@
           height: 'auto',
           calcHeight: 30,
           tip: false,
-          simplePage: true,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
           border: true,
           index: true,
           selection: true,

src/views/work/done.vue

@@ -84,7 +84,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
           border: true,
           index: true,
           selection: true,

src/views/work/send.vue

@@ -88,7 +88,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
           border: true,
           index: true,
           selection: true,

src/views/work/start.vue

@@ -103,7 +103,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
           border: true,
           index: true,
           selection: true,

src/views/work/todo.vue

@@ -5,6 +5,7 @@
                :data="data"
                ref="crud"
                v-model="form"
+               :page.sync="page"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -89,9 +90,8 @@
           height: 'auto',
           calcHeight: 30,
           tip: false,
-          simplePage: true,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan:12,
           border: true,
           index: true,
           selection: true,