diff --git a/antis-ncc-admin/src/views/lqKhxx/index.vue b/antis-ncc-admin/src/views/lqKhxx/index.vue
index 2799d34..faa9b6c 100644
--- a/antis-ncc-admin/src/views/lqKhxx/index.vue
+++ b/antis-ncc-admin/src/views/lqKhxx/index.vue
@@ -106,7 +106,8 @@
新增
- 导出
+
+ 导出
批量删除
@@ -401,6 +402,7 @@ export default {
},
list: [],
listLoading: true,
+ exportLoading: false,
multipleSelection: [], total: 0,
listQuery: {
currentPage: 1,
@@ -635,6 +637,45 @@ export default {
this.exportBoxVisible = false
})
},
+ // 导出会员品项
+ exportMemberItems() {
+ let query = { ...this.listQuery, ...this.query }
+ // 处理数组参数
+ let exportQuery = {}
+ for (let key in query) {
+ if (Array.isArray(query[key])) {
+ exportQuery[key] = query[key].join()
+ } else {
+ exportQuery[key] = query[key]
+ }
+ }
+ // 显示加载状态
+ this.exportLoading = true
+ const loading = this.$loading({
+ lock: true,
+ text: '正在导出数据,请稍候...',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ request({
+ url: `/api/Extend/LqKhxx/Actions/ExportOptimized`,
+ method: 'GET',
+ data: exportQuery
+ }).then(res => {
+ loading.close()
+ this.exportLoading = false
+ if (!res.data.url) {
+ this.$message.warning('导出失败,没有可导出的数据')
+ return
+ }
+ window.location.href = this.define.comUrl + res.data.url
+ this.$message.success('导出成功')
+ }).catch(err => {
+ loading.close()
+ this.exportLoading = false
+ this.$message.error('导出失败:' + (err.msg || err.message || '未知错误'))
+ })
+ },
search() {
this.listQuery = {
currentPage: 1,
diff --git a/绿纤html/dailyReportnew.html b/绿纤html/dailyReportnew.html
index 7d7eeba..42a4db1 100644
--- a/绿纤html/dailyReportnew.html
+++ b/绿纤html/dailyReportnew.html
@@ -723,7 +723,7 @@
| 门店 |
-
+ 员工数 |
人头 |
人次 |
项目 |
@@ -1337,6 +1337,7 @@
// ${store.ProjectCount || 0} |
row.innerHTML = `
${store.StoreName} |
+ ${store.EmployeeCount} |
${store.HeadCount || 0} |
${store.PersonCount || 0} |
${store.TotalProjectCount || 0} |
@@ -1357,6 +1358,7 @@
totalRow.className = 'total-row';
totalRow.innerHTML = `
总计 |
+ ${totalEmployeeCount} |
${totalHeadCount} |
${totalPersonCount} |
${totalProjectCount} |
@@ -1370,6 +1372,7 @@
const avgDivisor = data.length || 1;
averageRow.innerHTML = `
平均 |
+ ${Math.round(totalEmployeeCount / avgDivisor)} |
${Math.round(totalHeadCount / avgDivisor)} |
${Math.round(totalPersonCount / avgDivisor)} |
${Math.round(totalProjectCount / avgDivisor)} |