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

李宇
2 parents 0f14a621 28ad29c0
Showing 2 changed files with 120 additions and 20 deletions
antis-ncc-admin/src/views/extend/annualSummary/dashboard/index.vue
netcore/src/Modularity/Extend/NCC.Extend/LqAnnualSummaryService.cs
@@ -119,7 +119,8 @@
               </div>
               <NCC-table v-loading="trendTableLoading" :data="trendTableData" border stripe style="width: 100%">
                 <el-table-column v-for="col in trendTableColumns" :key="col.prop" :prop="col.prop" :label="col.label"
-                  :width="col.width" :align="col.align || 'center'">
+                  :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                  :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -150,7 +151,8 @@
               <NCC-table v-loading="performanceTableLoading" :data="performanceTableData" border stripe
                 style="width: 100%">
                 <el-table-column v-for="col in performanceTableColumns" :key="col.prop" :prop="col.prop"
-                  :label="col.label" :width="col.width" :align="col.align || 'center'">
+                  :label="col.label" :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                  :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -180,7 +182,8 @@
               </div>
               <NCC-table v-loading="consumeTableLoading" :data="consumeTableData" border stripe style="width: 100%">
                 <el-table-column v-for="col in consumeTableColumns" :key="col.prop" :prop="col.prop" :label="col.label"
-                  :width="col.width" :align="col.align || 'center'">
+                  :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                  :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -210,7 +213,8 @@
               </div>
               <NCC-table v-loading="headCountTableLoading" :data="headCountTableData" border stripe style="width: 100%">
                 <el-table-column v-for="col in headCountTableColumns" :key="col.prop" :prop="col.prop"
-                  :label="col.label" :width="col.width" :align="col.align || 'center'">
+                  :label="col.label" :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                  :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -241,7 +245,8 @@
               <NCC-table v-loading="personTimeTableLoading" :data="personTimeTableData" border stripe
                 style="width: 100%">
                 <el-table-column v-for="col in personTimeTableColumns" :key="col.prop" :prop="col.prop"
-                  :label="col.label" :width="col.width" :align="col.align || 'center'">
+                  :label="col.label" :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                  :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -272,7 +277,8 @@
               <NCC-table v-loading="projectCountTableLoading" :data="projectCountTableData" border stripe
                 style="width: 100%">
                 <el-table-column v-for="col in projectCountTableColumns" :key="col.prop" :prop="col.prop"
-                  :label="col.label" :width="col.width" :align="col.align || 'center'">
+                  :label="col.label" :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                  :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -340,7 +346,7 @@
               <NCC-table v-loading="storeIndicatorTableLoading" :data="storeIndicatorTableData" border stripe
                 style="width: 100%">
                 <el-table-column v-for="col in storeIndicatorTableColumns" :key="col.prop" :prop="col.prop"
-                  :label="col.label">
+                  :label="col.label" :sortable="col.sortable || false" :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -408,7 +414,7 @@
               <NCC-table v-loading="buIndicatorTableLoading" :data="buIndicatorTableData" border stripe
                 style="width: 100%">
                 <el-table-column v-for="col in buIndicatorTableColumns" :key="col.prop" :prop="col.prop"
-                  :label="col.label">
+                  :label="col.label" :sortable="col.sortable || false" :sort-method="col.sortMethod || undefined">
                   <template slot-scope="scope">
                     <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                     <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -431,7 +437,8 @@
             <NCC-table v-loading="buSummaryTableLoading" :data="buSummaryTableData" border stripe style="width: 100%"
               :height="null" class="bu-summary-table">
               <el-table-column v-for="col in buSummaryTableColumns" :key="col.prop" :prop="col.prop" :label="col.label"
-                :width="col.width" :align="col.align || 'center'">
+                :width="col.width" :align="col.align || 'center'" :sortable="col.sortable || false"
+                :sort-method="col.sortMethod || undefined">
                 <template slot-scope="scope">
                   <span v-if="col.formatter" v-html="col.formatter(scope.row)"></span>
                   <span v-else>{{ scope.row[col.prop] || '0' }}</span>
@@ -1203,11 +1210,37 @@ export default {
         }
       })
     },
+    // 数字排序方法（返回一个排序函数）
+    getNumberSortMethod(prop) {
+      return (a, b) => {
+        const valA = parseFloat(a[prop]) || 0
+        const valB = parseFloat(b[prop]) || 0
+        return valA - valB
+      }
+    },
+    // 增长率排序方法（处理百分比，返回一个排序函数）
+    getGrowthRateSortMethod(prop) {
+      return (a, b) => {
+        const valA = parseFloat(a[prop]) || 0
+        const valB = parseFloat(b[prop]) || 0
+        return valA - valB
+      }
+    },
+    // 增长率排序方法（处理百分比字符串，返回一个排序函数）
+    getGrowthRateStringSortMethod(prop) {
+      return (a, b) => {
+        const rateA = a[prop] || '0%'
+        const rateB = b[prop] || '0%'
+        const valA = parseFloat(rateA.toString().replace('%', '')) || 0
+        const valB = parseFloat(rateB.toString().replace('%', '')) || 0
+        return valA - valB
+      }
+    },
     // 构建趋势表格列
     buildTrendTableColumns(data) {
       const columns = [
-        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left' },
-        { label: '门店', prop: 'storeName', align: 'left' }
+        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left', sortable: true },
+        { label: '门店', prop: 'storeName', align: 'left', sortable: true }
       ]
       for (let i = 1; i <= 12; i++) {
@@ -1216,6 +1249,8 @@ export default {
           prop: `month${i}`,
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod(`month${i}`),
           formatter: (row) => {
             return row[`month${i}`] ? Number(row[`month${i}`]).toLocaleString() : '0'
           }
@@ -1228,6 +1263,8 @@ export default {
           prop: 'totalCurrentYear',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('totalCurrentYear'),
           formatter: (row) => {
             return row.totalCurrentYear ? Number(row.totalCurrentYear).toLocaleString() : '0'
           }
@@ -1237,6 +1274,8 @@ export default {
           prop: 'totalLastYear',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('totalLastYear'),
           formatter: (row) => {
             return row.totalLastYear ? Number(row.totalLastYear).toLocaleString() : '0'
           }
@@ -1246,6 +1285,8 @@ export default {
           prop: 'growthRate',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateSortMethod('growthRate'),
           formatter: (row) => {
             const rate = parseFloat(row.growthRate) || 0
             const color = rate >= 0 ? '#67C23A' : '#F56C6C'
@@ -1259,8 +1300,8 @@ export default {
     // 构建月度统计表格列
     buildMonthlyStatTableColumns(data, name) {
       const columns = [
-        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left' },
-        { label: '门店', prop: 'storeName', align: 'left' }
+        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left', sortable: true },
+        { label: '门店', prop: 'storeName', align: 'left', sortable: true }
       ]
       for (let i = 1; i <= 12; i++) {
@@ -1269,6 +1310,8 @@ export default {
           prop: `month${i}`,
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod(`month${i}`),
           formatter: (row) => {
             const value = row[`month${i}`] || 0
             if (name === '业绩' || name === '消耗') {
@@ -1285,6 +1328,8 @@ export default {
           prop: 'totalCurrentYear',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('totalCurrentYear'),
           formatter: (row) => {
             const value = row.totalCurrentYear || 0
             if (name === '业绩' || name === '消耗') {
@@ -1298,6 +1343,8 @@ export default {
           prop: 'totalLastYear',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('totalLastYear'),
           formatter: (row) => {
             const value = row.totalLastYear || 0
             if (name === '业绩' || name === '消耗') {
@@ -1311,6 +1358,8 @@ export default {
           prop: 'growthRate',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateSortMethod('growthRate'),
           formatter: (row) => {
             const rate = parseFloat(row.growthRate) || 0
             const color = rate >= 0 ? '#67C23A' : '#F56C6C'
@@ -1340,13 +1389,15 @@ export default {
     // 构建门店指标表格列
     buildStoreIndicatorTableColumns() {
       this.storeIndicatorTableColumns = [
-        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left' },
-        { label: '门店', prop: 'storeName', align: 'left' },
+        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left', sortable: true },
+        { label: '门店', prop: 'storeName', align: 'left', sortable: true },
         {
           label: '本年数值',
           prop: 'currentYearValue',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentYearValue'),
           formatter: (row) => {
             return Number(row.currentYearValue || 0).toLocaleString()
           }
@@ -1356,6 +1407,8 @@ export default {
           prop: 'lastYearValue',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastYearValue'),
           formatter: (row) => {
             return Number(row.lastYearValue || 0).toLocaleString()
           }
@@ -1365,6 +1418,8 @@ export default {
           prop: 'growthRate',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateSortMethod('growthRate'),
           formatter: (row) => {
             const rate = parseFloat(row.growthRate) || 0
             const color = rate >= 0 ? '#67C23A' : '#F56C6C'
@@ -1376,12 +1431,14 @@ export default {
     // 构建事业部指标表格列
     buildBuIndicatorTableColumns() {
       this.buIndicatorTableColumns = [
-        { label: '事业部', prop: 'businessUnitName', width: 200, align: 'left' },
+        { label: '事业部', prop: 'businessUnitName', width: 200, align: 'left', sortable: true },
         {
           label: '本年数值',
           prop: 'currentYearValue',
           width: 150,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentYearValue'),
           formatter: (row) => {
             return Number(row.currentYearValue || 0).toLocaleString()
           }
@@ -1391,6 +1448,8 @@ export default {
           prop: 'lastYearValue',
           width: 150,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastYearValue'),
           formatter: (row) => {
             return Number(row.lastYearValue || 0).toLocaleString()
           }
@@ -1400,6 +1459,8 @@ export default {
           prop: 'growthRate',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateSortMethod('growthRate'),
           formatter: (row) => {
             const rate = parseFloat(row.growthRate) || 0
             const color = rate >= 0 ? '#67C23A' : '#F56C6C'
@@ -1411,13 +1472,15 @@ export default {
     // 构建事业部汇总表格列
     buildBuSummaryTableColumns() {
       this.buSummaryTableColumns = [
-        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left' },
-        { label: '门店', prop: 'storeName', align: 'left' },
+        { label: '事业部', prop: 'businessUnitName', width: 120, align: 'left', sortable: true },
+        { label: '门店', prop: 'storeName', align: 'left', sortable: true },
         {
           label: '本年业绩',
           prop: 'currentPerformance',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentPerformance'),
           formatter: (row) => {
             return `¥${Number(row.currentPerformance || 0).toLocaleString()}`
           }
@@ -1427,6 +1490,8 @@ export default {
           prop: 'lastPerformance',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastPerformance'),
           formatter: (row) => {
             return `¥${Number(row.lastPerformance || 0).toLocaleString()}`
           }
@@ -1436,6 +1501,8 @@ export default {
           prop: 'performanceGrowthRate',
           width: 110,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateStringSortMethod('performanceGrowthRate'),
           formatter: (row) => {
             const rate = row.performanceGrowthRate || '0%'
             const numRate = parseFloat(rate) || 0
@@ -1448,6 +1515,8 @@ export default {
           prop: 'currentConsume',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentConsume'),
           formatter: (row) => {
             return `¥${Number(row.currentConsume || 0).toLocaleString()}`
           }
@@ -1457,6 +1526,8 @@ export default {
           prop: 'lastConsume',
           width: 120,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastConsume'),
           formatter: (row) => {
             return `¥${Number(row.lastConsume || 0).toLocaleString()}`
           }
@@ -1466,6 +1537,8 @@ export default {
           prop: 'consumeGrowthRate',
           width: 110,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateStringSortMethod('consumeGrowthRate'),
           formatter: (row) => {
             const rate = row.consumeGrowthRate || '0%'
             const numRate = parseFloat(rate) || 0
@@ -1478,6 +1551,8 @@ export default {
           prop: 'currentHeadCount',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentHeadCount'),
           formatter: (row) => {
             return Number(row.currentHeadCount || 0).toLocaleString()
           }
@@ -1487,6 +1562,8 @@ export default {
           prop: 'lastHeadCount',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastHeadCount'),
           formatter: (row) => {
             return Number(row.lastHeadCount || 0).toLocaleString()
           }
@@ -1496,6 +1573,8 @@ export default {
           prop: 'headCountGrowthRate',
           width: 110,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateStringSortMethod('headCountGrowthRate'),
           formatter: (row) => {
             const rate = row.headCountGrowthRate || '0%'
             const numRate = parseFloat(rate) || 0
@@ -1508,6 +1587,8 @@ export default {
           prop: 'currentPersonTime',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentPersonTime'),
           formatter: (row) => {
             return Number(row.currentPersonTime || 0).toLocaleString()
           }
@@ -1517,6 +1598,8 @@ export default {
           prop: 'lastPersonTime',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastPersonTime'),
           formatter: (row) => {
             return Number(row.lastPersonTime || 0).toLocaleString()
           }
@@ -1526,6 +1609,8 @@ export default {
           prop: 'personTimeGrowthRate',
           width: 110,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateStringSortMethod('personTimeGrowthRate'),
           formatter: (row) => {
             const rate = row.personTimeGrowthRate || '0%'
             const numRate = parseFloat(rate) || 0
@@ -1538,6 +1623,8 @@ export default {
           prop: 'currentProjectCount',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('currentProjectCount'),
           formatter: (row) => {
             return Number(row.currentProjectCount || 0).toLocaleString()
           }
@@ -1547,6 +1634,8 @@ export default {
           prop: 'lastProjectCount',
           width: 100,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getNumberSortMethod('lastProjectCount'),
           formatter: (row) => {
             return Number(row.lastProjectCount || 0).toLocaleString()
           }
@@ -1556,6 +1645,8 @@ export default {
           prop: 'projectCountGrowthRate',
           width: 110,
           align: 'right',
+          sortable: 'custom',
+          sortMethod: this.getGrowthRateStringSortMethod('projectCountGrowthRate'),
           formatter: (row) => {
             const rate = row.projectCountGrowthRate || '0%'
             const numRate = parseFloat(rate) || 0
@@ -985,8 +985,17 @@ namespace NCC.Extend
                 .ToListAsync();
             // 整理所有门店 (包括今年有数据和去年有数据的)
-            var allStores = currentYearData.Select(x => new { x.StoreId, x.StoreName, x.BusinessUnitName, x.BusinessUnitId })
-                .Distinct()
+            // 按门店ID去重，确保每个门店只出现一次
+            // 如果同一门店有多个事业部，取第一个（通常应该只有一个）
+            var allStores = currentYearData
+                .GroupBy(x => x.StoreId)
+                .Select(g => new
+                {
+                    StoreId = g.Key,
+                    StoreName = g.First().StoreName,
+                    BusinessUnitName = g.First().BusinessUnitName,
+                    BusinessUnitId = g.First().BusinessUnitId
+                })
                 .OrderBy(x => x.BusinessUnitName)
                 .ThenBy(x => x.StoreName)
                 .ToList();