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

# Conflicts:
#	public/cdn/avue/index.css
#	public/cdn/avue/index.js

src/router/page/index.js

@@ -30,7 +30,7 @@ export default [{
   meta: {
     keepAlive: true,
     isTab: false,
-    isAuth: false
+    isAuth: true
   }
 
 },

src/views/activiti/index.vue

@@ -163,9 +163,10 @@
           this.getList(this.page)
         })
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize

src/views/activiti/leave.vue

@@ -154,9 +154,10 @@ export default {
         this.getList(this.page)
       })
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize

src/views/activiti/process.vue

@@ -133,12 +133,7 @@
         ).then(function () {
           return status(row.processonDefinitionId, type)
         }).then(() => {
-          this.getList(this.page)
-          _this.$message({
-            showClose: true,
-            message: '操作成功',
-            type: 'success'
-          })
+          this.$message.success('操作成功')
           this.getList(this.page)
         })
       },
@@ -146,7 +141,6 @@
         this.$refs.crud.rowDel(row, index)
       },
       rowDel: function (row) {
-        var _this = this
         this.$confirm(
           '是否确认删除ID为"' + row.deploymentId + '"的模型?',
           '警告',
@@ -158,26 +152,15 @@
         ).then(function () {
           return delObj(row.deploymentId)
         }).then(() => {
+          this.$message.success('删除成功')
           this.getList(this.page)
-          _this.$message({
-            showClose: true,
-            message: '删除成功',
-            type: 'success'
-          })
-          this.getList(this.page)
-        }).catch(function () {
         })
       },
-      /**
-       * 搜索回调
-       */
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
-      /**
-       * 刷新回调
-       */
       refreshChange() {
         this.getList(this.page)
       }

src/views/admin/dict/index.vue

@@ -182,9 +182,10 @@
           done()
         })
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize

src/views/admin/file/index.vue

@@ -111,8 +111,9 @@ export default {
         this.getList(this.page)
       })
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.getList(this.page, form)
+      done()
     },
     refreshChange() {
       this.searchForm = this.form

src/views/admin/log/index.vue

@@ -92,9 +92,10 @@ export default {
         this.$message.success('删除成功')
       })
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize

src/views/admin/param/index.vue

@@ -127,9 +127,10 @@
           loading()
         })
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       refreshChange() {
         this.getList(this.page)

src/views/admin/role/index.vue

@@ -27,7 +27,7 @@
         :table-loading="listLoading"
         :before-open="handleOpenBefore"
         @on-load="getList"
-        @search-change="handleFilter"
+        @search-change="searchChange"
         @refresh-change="refreshChange"
         @size-change="sizeChange"
         @current-change="currentChange"
@@ -185,9 +185,10 @@ export default {
     refreshChange() {
       this.getList(this.page)
     },
-    handleFilter(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize

src/views/admin/social/index.vue

@@ -115,9 +115,10 @@
       refreshChange() {
         this.getList(this.page)
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize

src/views/admin/tenant/index.vue

@@ -37,93 +37,94 @@
 </template>
 
 <script>
-import { addObj, delObj, fetchList, putObj } from '@/api/admin/tenant'
-import { tableOption } from '@/const/crud/admin/tenant'
-import { mapGetters } from 'vuex'
+  import {addObj, delObj, fetchList, putObj} from '@/api/admin/tenant'
+  import {tableOption} from '@/const/crud/admin/tenant'
+  import {mapGetters} from 'vuex'
 
-export default {
-  name: 'Tenant',
-  data() {
-    return {
-      tableData:[],
-      searchForm: {},
-      page: {
-        total: 0, // 总页数
-        currentPage: 1, // 当前页数
-        pageSize: 20 // 每页显示多少条
-      },
-      tableLoading: false,
-      tableOption: tableOption
-    }
-  },
-  computed: {
-    ...mapGetters(['permissions']),
-    permissionList() {
+  export default {
+    name: 'Tenant',
+    data() {
       return {
-        addBtn: this.vaildData(this.permissions.admin_systenant_add, false),
-        delBtn: this.vaildData(this.permissions.admin_systenant_del, false),
-        editBtn: this.vaildData(this.permissions.admin_systenant_edit, false)
+        tableData: [],
+        searchForm: {},
+        page: {
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 20 // 每页显示多少条
+        },
+        tableLoading: false,
+        tableOption: tableOption
       }
-    }
-  },
-  methods: {
-    getList(page, params) {
-      this.tableLoading = true
-      fetchList(Object.assign({
-        current: page.currentPage,
-        size: page.pageSize
-      }, params, this.searchForm)).then(response => {
-        this.tableData = response.data.data.records
-        this.page.total = response.data.data.total
-        this.tableLoading = false
-      }).catch(() => {
-        this.tableLoading = false
-      })
     },
-    rowDel: function(row, index) {
-      var _this = this
-      this.$confirm('是否确认删除ID为' + row.id, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delObj(row.id)
-      }).then(data => {
-        _this.$message.success('删除成功')
-        this.getList(this.page)
-      })
-    },
-    handleUpdate: function(row, index, done, loading) {
-      putObj(row).then(data => {
-        this.$message.success('修改成功')
-        done()
-        this.getList(this.page)
-      }).catch(() => {
-        loading()
-      })
+    computed: {
+      ...mapGetters(['permissions']),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permissions.admin_systenant_add, false),
+          delBtn: this.vaildData(this.permissions.admin_systenant_del, false),
+          editBtn: this.vaildData(this.permissions.admin_systenant_edit, false)
+        }
+      }
     },
-    handleSave: function(row, done, loading) {
-      addObj(row).then(data => {
-        this.$message.success('添加成功')
+    methods: {
+      getList(page, params) {
+        this.tableLoading = true
+        fetchList(Object.assign({
+          current: page.currentPage,
+          size: page.pageSize
+        }, params, this.searchForm)).then(response => {
+          this.tableData = response.data.data.records
+          this.page.total = response.data.data.total
+          this.tableLoading = false
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+      rowDel: function (row, index) {
+        var _this = this
+        this.$confirm('是否确认删除ID为' + row.id, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function () {
+          return delObj(row.id)
+        }).then(data => {
+          _this.$message.success('删除成功')
+          this.getList(this.page)
+        })
+      },
+      handleUpdate: function (row, index, done, loading) {
+        putObj(row).then(data => {
+          this.$message.success('修改成功')
+          done()
+          this.getList(this.page)
+        }).catch(() => {
+          loading()
+        })
+      },
+      handleSave: function (row, done, loading) {
+        addObj(row).then(data => {
+          this.$message.success('添加成功')
+          done()
+          this.getList(this.page)
+        }).catch(() => {
+          loading()
+        })
+      },
+      searchChange(form, done) {
+        this.searchForm = form
+        this.getList(this.page, form)
         done()
+      },
+      refreshChange() {
         this.getList(this.page)
-      }).catch(() => {
-        loading()
-      })
-    },
-    searchChange(form) {
-      this.searchForm = form
-      this.getList(this.page, form)
-    },
-    refreshChange() {
-      this.getList(this.page)
-    },
-    sizeChange(pageSize){
-      this.page.pageSize = pageSize
-    },
-    currentChange(current){
-      this.page.currentPage = current
-    },
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      currentChange(current) {
+        this.page.currentPage = current
+      },
+    }
   }
-}
 </script>

src/views/admin/user/index.vue

@@ -43,7 +43,7 @@
             :before-open="handleOpenBefore"
             :data="list"
             @on-load="getList"
-            @search-change="handleFilter"
+            @search-change="searchChange"
             @refresh-change="refreshChange"
             @size-change="sizeChange"
             @current-change="currentChange"
@@ -221,9 +221,10 @@
           this.treeDeptData = response.data.data
         })
       },
-      handleFilter(param) {
+      searchChange(param,done) {
         this.searchForm = param
         this.getList(this.page, param)
+        done()
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize

src/views/daemon/job-log/index.vue

@@ -78,18 +78,13 @@ export default {
         this.tableLoading = false
       })
     },
-    /**
-       * 清除全局检索条件
-       */
     handleSearchReset() {
       this.queryParams = {}
     },
-    /**
-       * 检索查询
-       */
-    handleFilter(params) {
+    handleFilter(params, done) {
       this.queryParams = params
       this.getList(this.page)
+      done()
     },
     refreshChange() {
       this.getList(this.page)

src/views/daemon/job-manage/index.vue

@@ -182,9 +182,10 @@
       /**
        * 定时任务检索查询分页查询
        */
-      handleFilter(params) {
+      handleFilter(params, done) {
         this.queryParams = params
         this.getList(this.page)
+        done()
       },
       /**
        * 启动定时任务

src/views/daemon/status-trace-log/index.vue

@@ -117,9 +117,10 @@
           done()
         })
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize

src/views/gen/form.vue

@@ -112,9 +112,10 @@
           loading();
         });
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       sizeChange(pageSize){
         this.page.pageSize = pageSize

src/views/mp/wxfansmsg/index.vue

@@ -185,9 +185,10 @@ export default {
     refreshChange() {
       this.getList(this.page)
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     reply: function(row) {
       this.msgId = row.id

src/views/pay/goods/index.vue

@@ -127,9 +127,10 @@ export default {
         loading()
       })
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize

src/views/pay/notify/index.vue

@@ -127,9 +127,10 @@
           loading()
         })
       },
-      searchChange(form) {
+      searchChange(form, done) {
         this.searchForm = form
         this.getList(this.page, form)
+        done()
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize

src/views/pay/orders/index.vue

@@ -136,9 +136,10 @@ export default {
         loading()
       })
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize

src/views/pay/paychannel/index.vue

@@ -91,7 +91,6 @@ export default {
       })
     },
     rowDel: function(row, index) {
-      var _this = this
       this.$confirm('是否确认删除ID为' + row.id, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -99,23 +98,13 @@ export default {
       }).then(function() {
         return delObj(row.id)
       }).then(data => {
-        _this.tableData.splice(index, 1)
-        _this.$message({
-          showClose: true,
-          message: '删除成功',
-          type: 'success'
-        })
+        this.$message.success('删除成功')
         this.getList(this.page)
       })
     },
     handleUpdate: function(row, index, done, loading) {
       putObj(row).then(data => {
-        this.tableData.splice(index, 1, Object.assign({}, row))
-        this.$message({
-          showClose: true,
-          message: '修改成功',
-          type: 'success'
-        })
+        this.$message.success('修改成功')
         done()
         this.getList(this.page)
       }).catch(() => {
@@ -124,21 +113,17 @@ export default {
     },
     handleSave: function(row, done, loading) {
       addObj(row).then(data => {
-        this.tableData.push(Object.assign({}, row))
-        this.$message({
-          showClose: true,
-          message: '添加成功',
-          type: 'success'
-        })
+        this.$message.success('添加成功')
         done()
         this.getList(this.page)
       }).catch(() => {
         loading()
       })
     },
-    searchChange(form) {
+    searchChange(form, done) {
       this.searchForm = form
       this.getList(this.page, form)
+      done()
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize