diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue
index 7beca0673..ab466cb3c 100644
--- a/jero-web/src/App.vue
+++ b/jero-web/src/App.vue
@@ -81,7 +81,7 @@
watch: {
$route: function(val) {
this.$nextTick(() => {
- this.$watermark.set(this.userInfo().updateBy + ' ' + this.userInfo().username)
+ this.$watermark.set(this.userInfo().username + ' ' + this.userInfo().realname)
})
}
},
diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue
index 156b552f3..1155ee025 100644
--- a/jero-web/src/components/libraryPush/index.vue
+++ b/jero-web/src/components/libraryPush/index.vue
@@ -9,18 +9,20 @@
@close="handleCancel"
:visible="visible"
style="height: 100%;overflow: auto;padding-bottom: 53px;">
+
-
+
{{$t('cancel')}}
{{$t('submit')}}
@@ -43,43 +45,25 @@
},
data() {
return {
- loading: true,
- gData: [
- {
- title: 'parent 1',
- key: '0-0',
- children: [
- {
- title: '张晨成',
- key: '0-0-0',
- disabled: true,
- children: [
- { title: 'leaf', key: '0-0-0-0' },
- { title: 'leaf', key: '0-0-0-1' }
- ]
- },
- {
- title: 'parent 1-1',
- key: '0-0-1',
- children: [
- { key: '0-0-1-0', title: 'zcvc' }
- ]
- }
- ]
- }
- ],
+ gData: [],
autoExpandParent: true,
expandedKeys: [],
visible: false,
confirmLoading: false,
selectedKey: [],
- tableKey:[],
+ tableKey: [],
+ userIds: []
}
},
mounted() {
-
+ this.queryDepartUserTreeList()
},
methods: {
+ getPush(data) {
+ this.tableKey = data
+ this.visible = true
+ this.queryDepartUserTreeList()
+ },
onSelect(selectedKeys) {
this.selectedKey = selectedKeys
},
@@ -88,10 +72,19 @@
},
//String departIds,String userIds,String documentIds
handleSubmit() {
- getAction(this.url.pullMessage, {}).then((res) => {
+ let query = {
+ documentIds: this.tableKey.join(','),
+ userIds: this.userIds.join(','),
+ departIds: this.userIds.join(',')
+ }
+ this.confirmLoading = true
+ getAction(this.url.pullMessage, query).then((res) => {
+ this.confirmLoading = false
if (res.success) {
this.$message.success(res.message)
+ this.userIds = []
this.visible = false
+ this.$emit('clearSelected')
eventBUs.$emit('searchReset')
} else {
this.$message.warning(res.message)
@@ -99,7 +92,21 @@
})
},
onChange(e) {
-
+ const value = e.target.value
+ },
+ queryDepartUserTreeList() {
+ this.confirmLoading = true
+ getAction('sys/user/queryDepartUserTreeList', {}).then((res) => {
+ this.confirmLoading = false
+ if (res.success) {
+ this.gData = res.result
+ } else {
+ this.gData = []
+ }
+ })
+ },
+ checkChange(e) {
+ this.userIds = e
}
}
}
diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue
index 7da08f235..9e1870fd6 100644
--- a/jero-web/src/components/tableDate/index.vue
+++ b/jero-web/src/components/tableDate/index.vue
@@ -111,6 +111,7 @@
})
eventBUs.$on('searchReset', target => {
this.searchParmes = {}
+ this.selectedRowKeys = []
this.getData()
this.getTableList()
})
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 6c1249d65..2b23877d3 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -61,6 +61,7 @@
@@ -201,8 +202,7 @@
handleCompare() {
if (this.idList.length > 0) {
this.$nextTick(() => {
- this.$refs.libraryPushRef.visible = true
- this.$refs.libraryPushRef.tableKey = this.idList
+ this.$refs.libraryPushRef.getPush(this.idList)
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
@@ -292,6 +292,9 @@
query: item
})
window.open(newUrl.href, '_blank')
+ },
+ clearSelected() {
+ this.idList = []
}
}
}