Merge branch 'master' of http://39.98.150.180/antissoft/lvqianmeiye_ERP

“wangming”
2 parents a2653749 5fba24b5
Showing 2 changed files with 46 additions and 2 deletions
antis-ncc-admin/src/views/lqKhxx/index.vue
绿纤html/dailyReportnew.html
@@ -106,7 +106,8 @@
 				<div class="NCC-common-head">
 					<div>
 						<el-button  type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
+						<!-- <el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button> -->
+						<el-button type="text" icon="el-icon-download" :loading="exportLoading" @click="exportMemberItems()">导出</el-button>
 						<el-button v-has="'btn_remove'" type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
 					</div>
 					<div class="NCC-common-head-right">
@@ -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,
@@ -723,7 +723,7 @@
                 <thead>
                     <tr>
                         <th>门店</th>
-                        <!-- <th>员工</th> -->
+                        <th>员工数</th>
                         <th>人头</th>
                         <th>人次</th>
                         <th>项目</th>
@@ -1337,6 +1337,7 @@
                 // <td>${store.ProjectCount || 0}</td>
                 row.innerHTML = `
                     <td>${store.StoreName}</td>
+					 <td>${store.EmployeeCount}</td>
                     <td>${store.HeadCount || 0}</td>
                     <td>${store.PersonCount || 0}</td>
                     <td>${store.TotalProjectCount || 0}</td>
@@ -1357,6 +1358,7 @@
             totalRow.className = 'total-row';
             totalRow.innerHTML = `
                 <td>总计</td>
+				<td>${totalEmployeeCount}</td>
                 <td>${totalHeadCount}</td>
                 <td>${totalPersonCount}</td>
                 <td>${totalProjectCount}</td>
@@ -1370,6 +1372,7 @@
             const avgDivisor = data.length || 1;
             averageRow.innerHTML = `
                 <td>平均</td>
+				<td>${Math.round(totalEmployeeCount / avgDivisor)}</td>
                 <td>${Math.round(totalHeadCount / avgDivisor)}</td>
                 <td>${Math.round(totalPersonCount / avgDivisor)}</td>
                 <td>${Math.round(totalProjectCount / avgDivisor)}</td>