diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index 99a39c46d..8c3ba7aeb 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -25,10 +25,9 @@ } }, watch: { - '$route': function(val) { - console.log(val) - if (val.meta.title == '首页') { - this.Navigation = val.meta.title + '$route': function(to,form) { + if (to.meta.title == '首页') { + this.Navigation = to.meta.title this.subNavigation = null } else { this.updateMenu() diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 1e1e0398a..fd7871319 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -189,8 +189,8 @@ { @@ -369,9 +369,9 @@ message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) - } else if (res.field_show_type === '4' || res.field_show_type === '6' || + } else if (res.field_show_type === '4' || res.field_show_type === '6' || res.field_show_type === '5' || res.field_show_type === '7' - ) { + ) { rule.push({ required: true, message: res.db_field_txt + this.$t('cannotEmpty'), @@ -425,6 +425,7 @@ } }) }) + console.log(this.headerText) } }) }, diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue index 73c94ea8b..156b552f3 100644 --- a/jero-web/src/components/libraryPush/index.vue +++ b/jero-web/src/components/libraryPush/index.vue @@ -72,7 +72,8 @@ expandedKeys: [], visible: false, confirmLoading: false, - selectedKey: [] + selectedKey: [], + tableKey:[], } }, mounted() { @@ -85,6 +86,7 @@ handleCancel() { this.visible = false }, + //String departIds,String userIds,String documentIds handleSubmit() { getAction(this.url.pullMessage, {}).then((res) => { if (res.success) { diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index df775abe9..c4cdb7e08 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -12,7 +12,7 @@ - +

{{ record.msgContent }} diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 78a2c51b4..06abdd2c0 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -182,9 +182,14 @@ }, //推送 handleCompare() { - this.$nextTick(() => { - this.$refs.libraryPushRef.visible = true - }) + if (this.idList.length > 0){ + this.$nextTick(() => { + this.$refs.libraryPushRef.visible = true + this.$refs.libraryPushRef.tableKey = this.idList + }) + }else{ + this.$message.warning(this.$t('selectLeastOne')) + } }, //导入 handleImport() {