WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2022-08-26 13:58:49 +08:00
parent 0e12912b16 8fa191fa01
commit f366d3bc68
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/libraryAddForm/index.vue
+6 -1
View File
@@ -332,7 +332,12 @@
if (res.success) { if (res.success) {
this.confirmLoading = false this.confirmLoading = false
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
eventBUs.$emit('searchReset') if (this.formInline.id) {
eventBUs.$emit('searchGetData')
} else {
eventBUs.$emit('searchReset')
}
this.$emit('addFormClick') this.$emit('addFormClick')
} else { } else {
this.confirmLoading = false this.confirmLoading = false
jero-web/src/components/libraryPush/index.vue
+2 -2
View File
@@ -115,7 +115,7 @@
this.visible = false this.visible = false
this.visibleTree = false this.visibleTree = false
this.$emit('clearSelected') this.$emit('clearSelected')
eventBUs.$emit('searchReset') eventBUs.$emit('searchGetData')
} else { } else {
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
} }
@@ -188,7 +188,7 @@
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
z-index:100; z-index: 100;
width: 100%; width: 100%;
border-top: 1px solid #e8e8e8; border-top: 1px solid #e8e8e8;
padding: 10px 16px; padding: 10px 16px;
jero-web/src/views/documentManage/library/index.vue
+2 -2
View File
@@ -184,7 +184,7 @@
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.idList = [] _this.idList = []
eventBUs.$emit('searchReset') eventBUs.$emit('searchGetData')
} else { } else {
_this.$message.warning(_this.$t('operationFailed')) _this.$message.warning(_this.$t('operationFailed'))
} }
@@ -233,7 +233,7 @@
getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
eventBUs.$emit('searchReset') eventBUs.$emit('searchGetData')
} else { } else {
_this.$message.warning(_this.$t('operationFailed')) _this.$message.warning(_this.$t('operationFailed'))
} }