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

李宇
2 parents 6983478d 7f7044c5
Showing 31 changed files with 110 additions and 84 deletions
IMPLEMENTATION_PLAN.md
antis-ncc-admin/src/views/wageManagement/detail-dialog.vue
事业部驾驶舱接口测试总结.md → docs/test-reports/事业部驾驶舱接口测试总结.md
事业部驾驶舱接口测试报告.md → docs/test-reports/事业部驾驶舱接口测试报告.md
合作成本在店长工资计算中未统计问题分析.md → docs/test-reports/合作成本在店长工资计算中未统计问题分析.md
工资服务接口检查报告.md → docs/test-reports/工资服务接口检查报告.md
工资查询接口实现总结.md → docs/test-reports/工资查询接口实现总结.md
工资查询接口测试结果_202511.md → docs/test-reports/工资查询接口测试结果_202511.md
工资锁定解锁接口实现总结.md → docs/test-reports/工资锁定解锁接口实现总结.md
工资锁定解锁接口测试报告.md → docs/test-reports/工资锁定解锁接口测试报告.md
工资锁定解锁接口测试结果.md → docs/test-reports/工资锁定解锁接口测试结果.md
工资锁定解锁接口测试结果_完整版.md → docs/test-reports/工资锁定解锁接口测试结果_完整版.md
工资锁定解锁接口测试结果_最终版.md → docs/test-reports/工资锁定解锁接口测试结果_最终版.md
店内支出接口测试报告.md → docs/test-reports/店内支出接口测试报告.md
批量锁定当月工资接口测试报告.md → docs/test-reports/批量锁定当月工资接口测试报告.md
接口测试准备说明.md → docs/test-reports/接口测试准备说明.md
流程配置接口测试报告.md → docs/test-reports/流程配置接口测试报告.md
测试流程配置接口说明.md → docs/test-reports/测试流程配置接口说明.md
送洗记录作废接口实现总结.md → docs/test-reports/送洗记录作废接口实现总结.md
送洗记录作废接口测试报告.md → docs/test-reports/送洗记录作废接口测试报告.md
-# 科技部驾驶舱接口实现计划
-
-## 当前状态
-
-✅ **已实现接口（2个）**：
-1. GetStatistics - 核心指标
-2. GetShareStatistics - 股份统计
-
-⏳ **待实现接口（11个）**：
-1. GetPerformanceTrend - 业绩趋势
-2. GetShareTrend - 股份趋势
-3. GetStoreRanking - 门店排行
-4. GetStoreDistribution - 门店分布
-5. GetTeacherRanking - 老师排行
-6. GetOperationStatistics - 运营分析
-7. GetComparisonAnalysis - 对比分析
-8. GetStoreDetailList - 门店明细列表
-9. GetTeacherDetailList - 老师明细列表
-10. GetBillingDetailList - 开单明细列表
-11. GetConsumeDetailList - 消耗明细列表
-
-## 实现计划
-
-由于代码量巨大（约11个接口，估计总代码量约2000-3000行），采用分批实现策略：
-
-**第一批**：GetPerformanceTrend, GetShareTrend（趋势分析接口）
-**第二批**：GetStoreRanking, GetStoreDistribution, GetTeacherRanking（排行和分布接口）
-**第三批**：GetOperationStatistics, GetComparisonAnalysis（分析和对比接口）
-**第四批**：GetStoreDetailList, GetTeacherDetailList, GetBillingDetailList, GetConsumeDetailList（明细列表接口）
-
-## 注意事项
-
-- 所有DTO类已创建完成
-- 实体类命名空间：NCC.Extend.Entitys（已在使用）
-- UserEntity通过NCC.System.Entitys.Permission使用
-- 所有接口都需要遵循月份维度要求
-- 所有接口都需要支持techDepartmentId或storeIds参数
-
 <template>
-  <el-dialog
-    title="健康师工资详情"
-    :visible="visible"
-    width="1400px"
-    :close-on-click-modal="false"
-    @close="handleClose"
-    class="detail-dialog"
-  >
+  <el-dialog title="健康师工资详情" :visible="visible" width="1400px" :close-on-click-modal="false" @close="handleClose"
+    class="detail-dialog">
     <div v-if="detailData" class="detail-content">
       <!-- 基本信息 -->
       <div class="detail-section">
@@ -494,68 +488,136 @@ export default {
  
 <style lang="scss" scoped>
 .detail-dialog {
+  ::v-deep .el-dialog {
+    border-radius: 12px;
+    overflow: hidden;
+  }
+
+  ::v-deep .el-dialog__header {
+    padding: 24px 24px 20px;
+    border-bottom: 1px solid #f1f5f9;
+    background: linear-gradient(to bottom, #ffffff, #f8fafc);
+  }
+
+  ::v-deep .el-dialog__title {
+    font-size: 20px;
+    font-weight: 600;
+    color: #1a202c;
+    letter-spacing: -0.01em;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 24px;
+    background: #f8fafc;
+  }
+
   .detail-content {
-    max-height: 70vh;
+    max-height: calc(80vh - 120px);
     overflow-y: auto;
-    padding-right: 10px;
+    padding-right: 8px;
+    margin-right: -8px;
   }
  
   .detail-section {
-    margin-bottom: 20px;
-    background: #fff;
-    border-radius: 8px;
-    padding: 20px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    margin-bottom: 24px;
+    background: #ffffff;
+    border-radius: 12px;
+    padding: 24px;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.06), 0 1px 2px 0 rgba(0, 0, 0, 0.04);
+    border: 1px solid rgba(0, 0, 0, 0.04);
+    transition: all 0.2s ease;
+
+    &:hover {
+      box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.08), 0 2px 4px 0 rgba(0, 0, 0, 0.04);
+    }
+
+    &:last-child {
+      margin-bottom: 0;
+    }
  
     .section-title {
       display: flex;
       align-items: center;
-      gap: 8px;
-      margin-bottom: 16px;
-      padding-bottom: 12px;
-      border-bottom: 2px solid #409EFF;
-      font-size: 16px;
+      gap: 10px;
+      margin-bottom: 20px;
+      padding-bottom: 16px;
+      border-bottom: 2px solid #e2e8f0;
+      font-size: 17px;
       font-weight: 600;
-      color: #303133;
+      color: #1a202c;
+      letter-spacing: -0.01em;
+      position: relative;
+
+      &::after {
+        content: '';
+        position: absolute;
+        bottom: -2px;
+        left: 0;
+        width: 60px;
+        height: 2px;
+        background: linear-gradient(90deg, #409EFF, #67C23A);
+        border-radius: 1px;
+      }
  
       i {
         color: #409EFF;
         font-size: 18px;
+        width: 20px;
+        text-align: center;
       }
     }
  
     .section-content {
       .info-row {
-        display: flex;
-        flex-wrap: wrap;
-        gap: 20px 40px;
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+        gap: 16px 24px;
  
         .info-item {
           display: flex;
-          align-items: center;
-          min-width: 200px;
-          flex: 0 0 calc(33.333% - 27px);
+          align-items: flex-start;
+          padding: 14px 16px;
+          background: #f8fafc;
+          border-radius: 8px;
+          border: 1px solid rgba(0, 0, 0, 0.04);
+          transition: all 0.2s ease;
+          min-height: 48px;
+
+          &:hover {
+            background: #f1f5f9;
+            border-color: rgba(64, 158, 255, 0.2);
+            transform: translateY(-1px);
+          }
  
           .label {
-            color: #606266;
-            font-size: 14px;
+            color: #718096;
+            font-size: 13px;
+            font-weight: 500;
             white-space: nowrap;
-            margin-right: 8px;
+            margin-right: 12px;
+            flex-shrink: 0;
+            min-width: fit-content;
           }
  
           .value {
-            color: #303133;
+            color: #1a202c;
             font-size: 14px;
-            font-weight: 500;
+            font-weight: 600;
+            word-break: break-word;
+            flex: 1;
+            text-align: right;
  
             &.highlight {
               color: #409EFF;
-              font-weight: 600;
+              font-weight: 700;
+              font-size: 15px;
             }
  
             &.large {
-              font-size: 18px;
+              font-size: 24px;
+              font-weight: 700;
               color: #67C23A;
+              letter-spacing: -0.02em;
             }
           }
         }
@@ -568,16 +630,18 @@ export default {
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    padding: 60px 20px;
-    color: #909399;
+    padding: 80px 20px;
+    color: #a0aec0;
  
     i {
-      font-size: 48px;
-      margin-bottom: 16px;
+      font-size: 56px;
+      margin-bottom: 20px;
+      opacity: 0.6;
     }
  
     span {
-      font-size: 14px;
+      font-size: 15px;
+      font-weight: 500;
     }
   }
  
@@ -588,21 +652,21 @@ export default {
  
 // 滚动条样式
 .detail-content::-webkit-scrollbar {
-  width: 6px;
+  width: 8px;
 }
  
 .detail-content::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 3px;
+  background: #f8fafc;
+  border-radius: 4px;
 }
  
 .detail-content::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
-  border-radius: 3px;
+  background: #cbd5e0;
+  border-radius: 4px;
+  transition: background 0.2s ease;
  
   &:hover {
-    background: #a8a8a8;
+    background: #a0aec0;
   }
 }
 </style>
-