diff --git a/index.html b/index.html index 0b6d521..c2ee4ab 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,7 @@ + diff --git a/package.json b/package.json index 3b75732..f913dd4 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "js-cookie": "^2.2.1", "jspdf": "^2.5.1", "lodash": "^4.17.21", + "md5": "^2.3.0", "moment": "^2.29.3", "motion": "^10.16.4", "mqtt": "^4.2.1", diff --git a/src/views/evaluation/personnel_evaluation_status/components/personnel_list.vue b/src/views/evaluation/personnel_evaluation_status/components/personnel_list.vue index 729e52b..1cdc487 100644 --- a/src/views/evaluation/personnel_evaluation_status/components/personnel_list.vue +++ b/src/views/evaluation/personnel_evaluation_status/components/personnel_list.vue @@ -32,7 +32,7 @@ style="width: 100%;"/> - + 搜索 @@ -40,6 +40,9 @@ 重置 + + 导出数据 + @@ -78,6 +81,9 @@ 批量兑换 全选兑换 +
+ 合计:奖励总得分: {{ totalScores }} ,已兑换分数: {{ userdScores }} ,未兑换奖励数: {{ totalScores - userdScores }} +
@@ -95,9 +101,12 @@ export default { directives: { waves }, data() { return { + config: config, total: 0, varList: [], treeData: [], + totalScores: 0, + userdScores: 0, normalizer(node) { return { id: node.id, @@ -168,6 +177,8 @@ export default { this.listLoading = false this.varList = data.varList this.total = data.page.totalResult + this.totalScores = data.allAmounttoScore.totalScores + this.userdScores = data.allAmounttoScore.userdScores }).catch((e) => { this.listLoading = false }) @@ -243,6 +254,38 @@ export default { }, goBack() { this.$parent.activeName = 'List' + }, + // 导出数据 + exportData() { + this.$confirm('确定要导出到excel吗?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + console.log('开始') + this.listLoading = false + let pageData = '' + if (this.searchForm.KEYWORDS) { + pageData += '&KEYWORDS=' + this.searchForm.KEYWORDS + } + if (this.searchForm.DEPARTMENT_ID) { + pageData += '&DEPARTMENT_ID=' + this.searchForm.DEPARTMENT_ID + } + if (this.searchForm.dates[0]) { + pageData += '&START_TIME=' + this.searchForm.dates[0] + ' 00:00:00' + } + if (this.searchForm.dates[1]) { + pageData += '&END_TIME=' + this.searchForm.dates[1] + ' 23:59:59' + } + if (this.$parent.CORPINFO_ID) { + pageData += '&CORPINFO_ID=' + this.$parent.CORPINFO_ID + } + window.open(this.config.httpurl + 'evaluationscore/excelAll?' + pageData) + }).catch(() => { + console.log('报错') + this.listLoading = false + }) + this.listLoading = false } } } diff --git a/src/views/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue index 713264b..2fdf10c 100644 --- a/src/views/keyprojects/outsourced/components/edit.vue +++ b/src/views/keyprojects/outsourced/components/edit.vue @@ -37,6 +37,7 @@ @@ -443,6 +446,7 @@ export default { directives: { waves }, data() { return { + updateValue: true, selectUsers: [], // 防止报错,参数无用 chooseUserList: [], punishThePerson: [], @@ -1315,6 +1319,52 @@ export default { this.form.UNITS_PHONE = item.PHONENUM } }) + }, + // 将树节点的子节点全部添加到数组中 + pullSelectedNodes(selectedItems) { + if (selectedItems.nodes && selectedItems.nodes.length > 0) { + for (let i = 0; i < selectedItems.nodes.length; i++) { + if (!this.form.JURISDICTION_UNIT.includes(selectedItems.nodes[i].id)) { + this.form.JURISDICTION_UNIT.push(selectedItems.nodes[i].id) + } + this.pullSelectedNodes(selectedItems.nodes[i]) + } + } + }, + // 选择项时触发的事件 + handleSelect(selectedItems) { + // 选择父节点时同时勾选全部子节点 + if (!this.form.JURISDICTION_UNIT.includes(selectedItems.id)) { + this.form.JURISDICTION_UNIT.push(selectedItems.id) + } + this.pullSelectedNodes(selectedItems) + this.onClick() + }, + // 将选中项的子节点全部移除 + removeSelectedNodes(selectedItems) { + if (selectedItems.nodes && selectedItems.nodes.length > 0) { + for (let i = 0; i < selectedItems.nodes.length; i++) { + if (this.form.JURISDICTION_UNIT.includes(selectedItems.nodes[i].id)) { + this.form.JURISDICTION_UNIT.splice(this.form.JURISDICTION_UNIT.indexOf(selectedItems.nodes[i].id), 1) + } + this.removeSelectedNodes(selectedItems.nodes[i]) + } + } + }, + // 移除选中项时触发的事件 + handleRemove(selectedItems) { + // 移除选中项时同时移除全部子节点 + if (this.form.JURISDICTION_UNIT.includes(selectedItems.id)) { + this.form.JURISDICTION_UNIT.splice(this.form.JURISDICTION_UNIT.indexOf(selectedItems.id), 1) + } + this.removeSelectedNodes(selectedItems) + this.onClick() + }, + onClick() { + this.updateValue = false + this.$nextTick(() => { + this.updateValue = true + }) } } } diff --git a/src/views/map/components/caofeidian_index.vue b/src/views/map/components/caofeidian_index.vue index 6b40b3e..91a76c6 100644 --- a/src/views/map/components/caofeidian_index.vue +++ b/src/views/map/components/caofeidian_index.vue @@ -1,7 +1,7 @@