diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 2a09ddf..9ed6afd 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -123,7 +123,7 @@ export const JeecgListMixin = { sqp['superQueryMatchType'] = this.superQueryMatchType } var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters); - param.field = this.getQueryField(); + // param.field = this.getQueryField(); param.pageNo = this.ipagination.current; param.pageSize = this.ipagination.pageSize; return filterObj(param); diff --git a/src/views/modules/ServerInfo/modules/ServerInfoModal.vue b/src/views/modules/ServerInfo/modules/ServerInfoModal.vue index 0870aa7..44b1193 100644 --- a/src/views/modules/ServerInfo/modules/ServerInfoModal.vue +++ b/src/views/modules/ServerInfo/modules/ServerInfoModal.vue @@ -108,6 +108,7 @@ export default { } else { this.model.status = 0 } + let success = true; httpAction(httpurl, this.model, method) .then(res => { if (res.success) { @@ -115,11 +116,14 @@ export default { that.$emit('ok') } else { that.$message.warning(res.message) + success = false; } }) .finally(() => { that.confirmLoading = false - that.close() + if (success) { + that.close() + } }) } else { return false