Commit f497c06aed35d38bc0fe4ff3105d5efec5035beb

Authored by “wangming”
1 parent 2c37ef74

feat: 补充报销编号/退卡导出/上传人员筛选等并更新 V2.0.1 说明

报销列表与导出展示业务编号,申请时间零点补时分秒;退卡明细支持类型筛选与按健康师拆行导出;上传记录可按人员筛选;同步入职资料字段与更新说明草稿。

Co-authored-by: Cursor <cursoragent@cursor.com>
Showing 44 changed files with 2712 additions and 154 deletions
.cursor/skills/duplicate-recharge-exception-types/SKILL.md 0 → 100644
  1 +---
  2 +name: duplicate-recharge-exception-types
  3 +description: 重复充值/异常开单耗卡审计口径。在开发或修改重复充值审计、异常开单、异常耗卡、监控中心审计列表时使用;触发词:重复充值、异常开单、异常耗卡、同日多笔、短时间金额一致、系统卡顿重复提交。
  4 +---
  5 +
  6 +# 异常开单 / 异常耗卡审计口径
  7 +
  8 +## 一、何时使用
  9 +
  10 +- 开发或修改「重复充值审计」「单据充值审计」相关前后端
  11 +- 定义异常类型、列表筛选、关联单据展示
  12 +- 排查同会员短时间重复单据是否为系统卡顿导致
  13 +
  14 +## 二、异常类型(必须区分)
  15 +
  16 +### 1. 同日多笔(已有)
  17 +
  18 +| 类型编码(建议) | 名称 | 判定 |
  19 +|------------------|------|------|
  20 +| `SameDayDuplicateBilling` | 同日重复开单 | 同会员 + 同一自然日,≥2 笔开单(合并为 1 行) |
  21 +| `SameDayDuplicateConsume` | 同日重复耗卡 | 同会员 + 同一自然日,≥2 笔耗卡(合并为 1 行) |
  22 +| `SameDayMixed` | 同日开单+耗卡 | **已停用自动产出**:一开一耗属常态,计入审计会刷屏;筛选项可保留兼容 |
  23 +
  24 +说明:同日重复开单/耗卡列表**合并为单行**,`RelatedBizList` 仅含同类型当日单据。已被「异常开单/耗卡」簇覆盖的单据不再计入同日重复。
  25 +
  26 +### 2. 短时间金额一致(系统卡顿疑似重复提交)— 必须支持
  27 +
  28 +| 类型编码(建议) | 名称 | 判定 |
  29 +|------------------|------|------|
  30 +| `ShortIntervalSameAmountBilling` | 异常开单 | 同会员 + **短时间内** + **金额一致** 的多笔开单 |
  31 +| `ShortIntervalSameAmountConsume` | 异常耗卡 | 同会员 + **短时间内** + **金额一致** 的多笔耗卡 |
  32 +
  33 +**业务含义**:极可能是前端/网络卡顿导致用户重复提交,系统生成了多笔相同金额单据,而非真实二次消费。
  34 +
  35 +#### 判定细则(实现时遵守)
  36 +
  37 +1. **同一会员**(开单看 `kdhy`,耗卡看 `hy`)
  38 +2. **业务类型相同**(开单只跟开单比,耗卡只跟耗卡比)
  39 +3. **金额一致**:开单用实付 `sfyj`;耗卡用消耗金额 `xfje`;`ABS(a-b) < 0.01`
  40 +4. **操作人一致**:开单 `F_CreateUser`;耗卡 `czry`;两侧都非空且相同
  41 +5. **内容一致(品项指纹)**:
  42 + - 开单:`lq_kd_pxmx` 按 `px + 次数 + 实付金额` 排序拼接
  43 + - 耗卡:`lq_xh_pxmx` 按 `px + 次数 + 合计金额` 排序拼接
  44 + - 两侧都无明细时**不**因空内容相同而判异常
  45 +6. **短时间窗口**:业务时间差 ≤ **3 分钟**(连通簇:同金额桶内按时间间隔并查集)
  46 +7. **有效单据**:仅有效记录;**金额必须 > 0**(0 元不进异常开单/耗卡,避免赠送/体验单刷屏)
  47 +8. 命中后展示异常类型并高亮,同组合并为 **1 行**,关联单据仅含同组同金额单号/时间/金额
  48 +
  49 +**核心思路**:异常单主要用于检查是否「重复开单/重复耗卡」(卡顿重复提交),不是普通的同日多笔业务。
  50 +
  51 +#### 与「同日多笔」的关系
  52 +
  53 +- **可同时命中**:例如同日多笔里其中两笔又满足短时间+同金额 → 优先或同时打上「异常开单/异常耗卡」标签(产品若要求单一类型,**短时间同金额优先**于普通同日多笔,因指向更明确的故障原因)
  54 +- 展示上名称使用:**异常开单** / **异常耗卡**(不要只写「重复」)
  55 +
  56 +## 三、实现注意
  57 +
  58 +- 统计与列表过滤条件、时间范围、门店权限必须一致
  59 +- 关联单据弹窗/列需能看清:哪几笔单号、各自时间与金额
  60 +- 修改该口径后需用真实库数据抽验(短时间同金额成对样本)
  61 +
  62 +## 四、触发词
  63 +
  64 +异常开单、异常耗卡、短时间金额一致、系统卡顿、重复提交、重复充值审计、单据充值审计
... ...
antis-ncc-admin/src/api/extend/employee-profile-submission.js
... ... @@ -17,12 +17,17 @@ export function getEmployeeProfileSubmissionList(data) {
17 17 })
18 18 }
19 19  
20   -/** 申请详情(敏感字段脱敏) */
21   -export function getEmployeeProfileSubmissionInfo(id, showTail4 = false) {
  20 +/**
  21 + * 申请详情
  22 + * @param {string} id 申请 ID
  23 + * @param {boolean} showTail4 仅后 4 位
  24 + * @param {boolean} revealSensitive 人事审核:手机号/身份证完整明文
  25 + */
  26 +export function getEmployeeProfileSubmissionInfo(id, showTail4 = false, revealSensitive = false) {
22 27 return request({
23 28 url: '/api/Extend/LqEmployeeProfileSubmission/GetInfo',
24 29 method: 'get',
25   - data: { id, showTail4 }
  30 + data: { id, showTail4, revealSensitive }
26 31 })
27 32 }
28 33  
... ...
antis-ncc-admin/src/views/lqHytkHytk/index.vue
... ... @@ -62,6 +62,14 @@
62 62 </el-form-item>
63 63 </el-col>
64 64 <el-col :span="6">
  65 + <el-form-item label="类型">
  66 + <el-select v-model="query.refundType" placeholder="全部" clearable>
  67 + <el-option label="退卡" value="refund" />
  68 + <el-option label="转卡" value="transfer" />
  69 + </el-select>
  70 + </el-form-item>
  71 + </el-col>
  72 + <el-col :span="6">
65 73 <el-form-item label="ID">
66 74 <el-input v-model="query.id" placeholder="ID" clearable />
67 75 </el-form-item>
... ... @@ -79,11 +87,9 @@
79 87 </el-row>
80 88 <div class="NCC-common-layout-main NCC-flex-main">
81 89 <div class="NCC-common-head">
82   - <!-- <div>
83   - <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
  90 + <div>
84 91 <el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
85   - <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
86   - </div> -->
  92 + </div>
87 93 <div class="NCC-common-head-right">
88 94 <el-tooltip effect="dark" content="刷新" placement="top">
89 95 <el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
... ... @@ -193,6 +199,16 @@
193 199 <span class="text-nowrap">{{ scope.row.actualRefundAmount || '无' }}</span>
194 200 </template>
195 201 </el-table-column>
  202 + <el-table-column prop="tkyy" label="类型" width="90" align="center">
  203 + <template slot-scope="scope">
  204 + <el-tag
  205 + :type="scope.row.tkyy === '转卡' ? 'warning' : 'success'"
  206 + size="mini"
  207 + disable-transitions>
  208 + {{ scope.row.tkyy === '转卡' ? '转卡' : '退卡' }}
  209 + </el-tag>
  210 + </template>
  211 + </el-table-column>
196 212 <el-table-column prop="tksj" label="退卡时间" align="left" :formatter="ncc.tableDateFormat"/>
197 213 <!-- <el-table-column prop="czry" label="退卡人" align="left" /> -->
198 214 <el-table-column label="是否作废" width="100" align="center">
... ... @@ -261,6 +277,7 @@
261 277 czry:undefined,
262 278 jksId:undefined,
263 279 kjblsId:undefined,
  280 + refundType:undefined,
264 281 },
265 282 list: [],
266 283 listLoading: true,
... ... @@ -281,14 +298,18 @@
281 298 { prop: 'hy', label: '会员' },
282 299 { prop: 'hymc', label: '会员姓名' },
283 300 { prop: 'hyzh', label: '会员账号' },
  301 + { prop: 'hyPhone', label: '会员电话' },
284 302 { prop: 'jks', label: '健康师' },
285 303 { prop: 'jkszh', label: '健康师账号' },
286 304 { prop: 'jksxm', label: '健康师姓名' },
287 305 { prop: 'bz', label: '备注' },
288 306 { prop: 'tkpx', label: '退卡品项' },
  307 + { prop: 'tkje', label: '退卡金额' },
  308 + { prop: 'actualRefundAmount', label: '实际退款金额' },
  309 + { prop: 'tkyy', label: '类型' },
289 310 { prop: 'tksj', label: '退卡时间' },
290 311 { prop: 'czry', label: '退卡人' },
291   - ],
  312 + ],
292 313 mdOptions : [],
293 314 hyOptions : [],
294 315 kdhyOptions:[],
... ... @@ -415,12 +436,18 @@
415 436 };
416 437 let query = {}
417 438 for (let key in _query) {
  439 + if (key === 'refundType') continue
418 440 if (Array.isArray(_query[key])) {
419 441 query[key] = _query[key].join()
420 442 } else {
421 443 query[key] = _query[key]
422 444 }
423 445 }
  446 + if (this.query.refundType === 'refund') {
  447 + query.excludeTransferCard = 1
  448 + } else if (this.query.refundType === 'transfer') {
  449 + query.onlyTransferCard = 1
  450 + }
424 451 request({
425 452 url: `/api/Extend/LqHytkHytk`,
426 453 method: 'GET',
... ... @@ -496,6 +523,12 @@
496 523 },
497 524 download(data) {
498 525 let query = { ...data, ...this.listQuery, ...this.query }
  526 + delete query.refundType
  527 + if (this.query.refundType === 'refund') {
  528 + query.excludeTransferCard = 1
  529 + } else if (this.query.refundType === 'transfer') {
  530 + query.onlyTransferCard = 1
  531 + }
499 532 request({
500 533 url: `/api/Extend/LqHytkHytk/Actions/Export`,
501 534 method: 'GET',
... ...
antis-ncc-admin/src/views/lqReimbursementApplication/edit-dialog.vue
... ... @@ -67,7 +67,9 @@
67 67 placeholder="请选择申请时间"
68 68 format="yyyy-MM-dd HH:mm:ss"
69 69 value-format="timestamp"
  70 + :default-time="applicationTimeDefaultTime"
70 71 style="width: 100%"
  72 + @change="onApplicationTimePickerChange"
71 73 />
72 74 </el-form-item>
73 75 </el-col>
... ... @@ -275,10 +277,30 @@ export default {
275 277 initialPurchaseRecordIds: [] // 存储初始的购买记录ID列表
276 278 }
277 279 },
  280 + computed: {
  281 + applicationTimeDefaultTime() {
  282 + const now = new Date()
  283 + const hh = String(now.getHours()).padStart(2, '0')
  284 + const mm = String(now.getMinutes()).padStart(2, '0')
  285 + const ss = String(now.getSeconds()).padStart(2, '0')
  286 + return `${hh}:${mm}:${ss}`
  287 + }
  288 + },
278 289 created() {
279 290 this.loadStoreOptions()
280 291 },
281 292 methods: {
  293 + /** 日期时间选择器若落成 00:00:00,补当前时分秒,避免申请时间只剩日期 */
  294 + onApplicationTimePickerChange(val) {
  295 + if (!val && val !== 0) return
  296 + const date = new Date(val)
  297 + if (Number.isNaN(date.getTime())) return
  298 + if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
  299 + const now = new Date()
  300 + date.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds())
  301 + this.dataForm.applicationTime = date.getTime()
  302 + }
  303 + },
282 304 async init(id) {
283 305 this.visible = true
284 306 this.loading = true
... ...
antis-ncc-admin/src/views/lqReimbursementApplication/form-dialog.vue
... ... @@ -66,7 +66,9 @@
66 66 placeholder="请选择申请时间"
67 67 format="yyyy-MM-dd HH:mm:ss"
68 68 value-format="timestamp"
  69 + :default-time="applicationTimeDefaultTime"
69 70 style="width: 100%"
  71 + @change="onApplicationTimePickerChange"
70 72 />
71 73 </el-form-item>
72 74 </el-col>
... ... @@ -369,11 +371,31 @@ export default {
369 371 purchaseSelection: []
370 372 }
371 373 },
  374 + computed: {
  375 + applicationTimeDefaultTime() {
  376 + const now = new Date()
  377 + const hh = String(now.getHours()).padStart(2, '0')
  378 + const mm = String(now.getMinutes()).padStart(2, '0')
  379 + const ss = String(now.getSeconds()).padStart(2, '0')
  380 + return `${hh}:${mm}:${ss}`
  381 + }
  382 + },
372 383 created() {
373 384 this.loadStoreOptions()
374 385 this.loadWorkflowConfigOptions()
375 386 },
376 387 methods: {
  388 + /** 日期时间选择器若落成 00:00:00,补当前时分秒,避免申请时间只剩日期 */
  389 + onApplicationTimePickerChange(val) {
  390 + if (!val && val !== 0) return
  391 + const date = new Date(val)
  392 + if (Number.isNaN(date.getTime())) return
  393 + if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
  394 + const now = new Date()
  395 + date.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds())
  396 + this.dataForm.applicationTime = date.getTime()
  397 + }
  398 + },
377 399 openPurchaseDialog() {
378 400 this.showPurchaseDialog = true
379 401 this.loadPurchaseRecords()
... ...
antis-ncc-admin/src/views/lqReimbursementApplication/index.vue
... ... @@ -123,6 +123,15 @@
123 123 </div>
124 124  
125 125 <NCC-table v-loading="listLoading" :data="list">
  126 + <el-table-column label="编号" width="150" show-overflow-tooltip>
  127 + <template slot-scope="scope">
  128 + <div class="table-cell-with-icon">
  129 + <i class="el-icon-document cell-icon info"></i>
  130 + <span class="cell-text">{{ scope.row.applicationNo || '无' }}</span>
  131 + </div>
  132 + </template>
  133 + </el-table-column>
  134 +
126 135 <el-table-column label="申请人" min-width="110" show-overflow-tooltip>
127 136 <template slot-scope="scope">
128 137 <div class="table-cell-with-icon">
... ... @@ -481,12 +490,14 @@ export default {
481 490 formatDateTime(dateTime) {
482 491 if (!dateTime) return '无'
483 492 const date = new Date(dateTime)
  493 + if (Number.isNaN(date.getTime())) return '无'
484 494 const year = date.getFullYear()
485 495 const month = String(date.getMonth() + 1).padStart(2, '0')
486 496 const day = String(date.getDate()).padStart(2, '0')
487 497 const hours = String(date.getHours()).padStart(2, '0')
488 498 const minutes = String(date.getMinutes()).padStart(2, '0')
489   - return `${year}-${month}-${day} ${hours}:${minutes}`
  499 + const seconds = String(date.getSeconds()).padStart(2, '0')
  500 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
490 501 },
491 502  
492 503 getStatusType(status) {
... ...
antis-ncc-admin/src/views/lqUploadRecord/index.vue
... ... @@ -23,7 +23,7 @@
23 23 <!-- 筛选区 -->
24 24 <el-row class="NCC-common-search-box" :gutter="16">
25 25 <el-form @submit.native.prevent>
26   - <el-col :span="5">
  26 + <el-col :span="4">
27 27 <el-form-item label="文件名">
28 28 <el-input
29 29 v-model="query.keyword"
... ... @@ -34,6 +34,11 @@
34 34 </el-form-item>
35 35 </el-col>
36 36 <el-col :span="5">
  37 + <el-form-item label="人员信息">
  38 + <userSelect v-model="query.userId" placeholder="请选择上传人" />
  39 + </el-form-item>
  40 + </el-col>
  41 + <el-col :span="4">
37 42 <el-form-item label="图片来源">
38 43 <el-select
39 44 v-model="query.fileType"
... ... @@ -50,7 +55,7 @@
50 55 </el-select>
51 56 </el-form-item>
52 57 </el-col>
53   - <el-col :span="8">
  58 + <el-col :span="7">
54 59 <el-form-item label="上传时间">
55 60 <el-date-picker
56 61 v-model="dateRange"
... ... @@ -64,7 +69,7 @@
64 69 />
65 70 </el-form-item>
66 71 </el-col>
67   - <el-col :span="6">
  72 + <el-col :span="4">
68 73 <el-form-item>
69 74 <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
70 75 <el-button icon="el-icon-refresh-right" @click="reset">重置</el-button>
... ... @@ -163,9 +168,11 @@
163 168 <script>
164 169 import { getUploadRecords, getAuditStats } from '@/api/extend/ossUpload'
165 170 import { appendOssImageThumb } from '@/utils/oss-image-thumb'
  171 +import userSelect from '@/components/NCC-userSelect'
166 172  
167 173 export default {
168 174 name: 'LqUploadRecord',
  175 + components: { userSelect },
169 176 data() {
170 177 return {
171 178 activeStatus: null,
... ... @@ -173,6 +180,7 @@ export default {
173 180 dateRange: null,
174 181 query: {
175 182 keyword: undefined,
  183 + userId: undefined,
176 184 fileType: undefined,
177 185 auditStatus: undefined
178 186 },
... ... @@ -256,6 +264,9 @@ export default {
256 264 if (this.query.keyword) {
257 265 params.keyword = this.query.keyword
258 266 }
  267 + if (this.query.userId) {
  268 + params.userId = this.query.userId
  269 + }
259 270 if (this.query.fileType) {
260 271 params.fileType = this.query.fileType
261 272 }
... ... @@ -286,7 +297,7 @@ export default {
286 297 },
287 298 reset() {
288 299 this.activeStatus = null
289   - this.query = { keyword: undefined, fileType: undefined, auditStatus: undefined }
  300 + this.query = { keyword: undefined, userId: undefined, fileType: undefined, auditStatus: undefined }
290 301 this.dateRange = null
291 302 this.listQuery = { currentPage: 1, pageSize: 20 }
292 303 this.initData()
... ...
antis-ncc-admin/src/views/monitorCenter/duplicate-recharge-audit/components/related-biz-dialog.vue 0 → 100644
  1 +<template>
  2 + <el-dialog
  3 + :title="dialogTitle"
  4 + :visible.sync="dialogVisible"
  5 + width="860px"
  6 + append-to-body
  7 + :close-on-click-modal="false"
  8 + class="NCC-dialog related-biz-dialog"
  9 + @close="handleClose"
  10 + >
  11 + <div v-if="row" class="summary">
  12 + <div class="summary-item">
  13 + <span class="label">会员</span>
  14 + <span class="value">{{ displayText(row.memberName || row.MemberName) }}</span>
  15 + </div>
  16 + <div class="summary-item">
  17 + <span class="label">门店</span>
  18 + <span class="value">{{ displayText(row.storeName || row.StoreName) }}</span>
  19 + </div>
  20 + <div class="summary-item">
  21 + <span class="label">业务日期</span>
  22 + <span class="value">{{ formatDate(row.bizDate || row.BizDate) }}</span>
  23 + </div>
  24 + <div class="summary-item">
  25 + <span class="label">异常类型</span>
  26 + <el-tag size="mini" disable-transitions :type="exceptionTagType(row.exceptionType || row.ExceptionType)">
  27 + {{ displayText(row.exceptionTypeName || row.ExceptionTypeName) }}
  28 + </el-tag>
  29 + </div>
  30 + </div>
  31 +
  32 + <el-table :data="relatedList" border size="small" class="related-table">
  33 + <el-table-column label="序号" width="70" align="center">
  34 + <template slot-scope="scope">
  35 + {{ scope.row.daySequence || scope.row.DaySequence || '无' }}
  36 + </template>
  37 + </el-table-column>
  38 + <el-table-column label="业务类型" width="90" align="center">
  39 + <template slot-scope="scope">
  40 + <el-tag
  41 + size="mini"
  42 + disable-transitions
  43 + :type="(scope.row.bizType || scope.row.BizType) === 'Billing' ? 'primary' : 'success'"
  44 + >
  45 + {{ displayText(scope.row.bizTypeName || scope.row.BizTypeName) }}
  46 + </el-tag>
  47 + </template>
  48 + </el-table-column>
  49 + <el-table-column label="业务单号" min-width="180" show-overflow-tooltip>
  50 + <template slot-scope="scope">
  51 + {{ displayText(scope.row.bizId || scope.row.BizId) }}
  52 + </template>
  53 + </el-table-column>
  54 + <el-table-column label="金额" width="110" align="right">
  55 + <template slot-scope="scope">
  56 + ¥{{ formatMoney(scope.row.amount != null ? scope.row.amount : scope.row.Amount) }}
  57 + </template>
  58 + </el-table-column>
  59 + <el-table-column label="业务时间" min-width="160">
  60 + <template slot-scope="scope">
  61 + {{ formatDateTime(scope.row.bizTime || scope.row.BizTime) }}
  62 + </template>
  63 + </el-table-column>
  64 + <el-table-column label="标记" width="120" align="center">
  65 + <template slot-scope="scope">
  66 + <template v-if="isHighlightRow">
  67 + <el-tag v-if="scope.row.isFirst || scope.row.IsFirst" size="mini" type="info" disable-transitions>首笔</el-tag>
  68 + <el-tag v-else-if="scope.row.isCurrent || scope.row.IsCurrent" size="mini" type="warning" disable-transitions>主单</el-tag>
  69 + <el-tag v-else size="mini" type="danger" effect="plain" disable-transitions>同组</el-tag>
  70 + </template>
  71 + <template v-else>
  72 + <el-tag v-if="scope.row.isFirst || scope.row.IsFirst" size="mini" type="info" disable-transitions>首笔</el-tag>
  73 + <el-tag v-if="scope.row.isCurrent || scope.row.IsCurrent" size="mini" type="warning" disable-transitions>当前</el-tag>
  74 + <span v-if="!(scope.row.isFirst || scope.row.IsFirst || scope.row.isCurrent || scope.row.IsCurrent)">无</span>
  75 + </template>
  76 + </template>
  77 + </el-table-column>
  78 + <el-table-column label="操作" width="80" align="center" fixed="right">
  79 + <template slot-scope="scope">
  80 + <el-button type="text" size="mini" @click="handleViewDetail(scope.row)">详情</el-button>
  81 + </template>
  82 + </el-table-column>
  83 + </el-table>
  84 +
  85 + <div slot="footer" class="dialog-footer">
  86 + <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
  87 + </div>
  88 + </el-dialog>
  89 +</template>
  90 +
  91 +<script>
  92 +import dayjs from 'dayjs'
  93 +
  94 +export default {
  95 + name: 'RelatedBizDialog',
  96 + props: {
  97 + visible: {
  98 + type: Boolean,
  99 + default: false
  100 + },
  101 + row: {
  102 + type: Object,
  103 + default: null
  104 + }
  105 + },
  106 + computed: {
  107 + dialogVisible: {
  108 + get() {
  109 + return this.visible
  110 + },
  111 + set(val) {
  112 + this.$emit('update:visible', val)
  113 + }
  114 + },
  115 + relatedList() {
  116 + if (!this.row) return []
  117 + return this.row.relatedBizList || this.row.RelatedBizList || []
  118 + },
  119 + dialogTitle() {
  120 + if (!this.row) return '关联单据'
  121 + const type = this.row.exceptionType || this.row.ExceptionType
  122 + if (type === 'ShortIntervalSameAmountBilling' || type === 'ShortIntervalSameAmountConsume') {
  123 + return '同组重复单据'
  124 + }
  125 + return '关联单据'
  126 + },
  127 + isHighlightRow() {
  128 + if (!this.row) return false
  129 + if (this.row.isHighlight === true || this.row.IsHighlight === true) return true
  130 + const type = this.row.exceptionType || this.row.ExceptionType
  131 + return type === 'ShortIntervalSameAmountBilling' || type === 'ShortIntervalSameAmountConsume'
  132 + }
  133 + },
  134 + methods: {
  135 + displayText(val) {
  136 + if (val === null || val === undefined || val === '') return '无'
  137 + return val
  138 + },
  139 + formatMoney(val) {
  140 + if (val === null || val === undefined || val === '') return '0.00'
  141 + return Number(val).toLocaleString('zh-CN', {
  142 + minimumFractionDigits: 2,
  143 + maximumFractionDigits: 2
  144 + })
  145 + },
  146 + formatDateTime(val) {
  147 + if (!val) return '无'
  148 + return dayjs(val).format('YYYY-MM-DD HH:mm:ss')
  149 + },
  150 + formatDate(val) {
  151 + if (!val) return '无'
  152 + return dayjs(val).format('YYYY-MM-DD')
  153 + },
  154 + exceptionTagType(type) {
  155 + if (type === 'ShortIntervalSameAmountBilling' || type === 'ShortIntervalSameAmountConsume') return 'danger'
  156 + if (type === 'SameDayDuplicateBilling') return 'warning'
  157 + if (type === 'SameDayDuplicateConsume') return 'success'
  158 + if (type === 'SameDayMixed') return 'info'
  159 + return 'info'
  160 + },
  161 + handleViewDetail(row) {
  162 + const bizType = row.bizType || row.BizType
  163 + const bizId = row.bizId || row.BizId
  164 + if (!bizId) return
  165 + this.$emit('view-detail', { bizType, bizId })
  166 + },
  167 + handleClose() {
  168 + this.$emit('update:visible', false)
  169 + }
  170 + }
  171 +}
  172 +</script>
  173 +
  174 +<style lang="scss" scoped>
  175 +.related-biz-dialog {
  176 + .summary {
  177 + display: flex;
  178 + flex-wrap: wrap;
  179 + gap: 12px 24px;
  180 + margin-bottom: 12px;
  181 + padding: 12px;
  182 + background: #f5f7fa;
  183 + border-radius: 8px;
  184 +
  185 + .summary-item {
  186 + display: flex;
  187 + align-items: center;
  188 + gap: 8px;
  189 + .label {
  190 + color: #909399;
  191 + font-size: 13px;
  192 + }
  193 + .value {
  194 + color: #303133;
  195 + font-size: 13px;
  196 + }
  197 + }
  198 + }
  199 +
  200 + .related-table {
  201 + width: 100%;
  202 + }
  203 +}
  204 +</style>
  205 +
  206 +<style lang="scss">
  207 +body.ncc-content-dark .related-biz-dialog,
  208 +.ncc-content-dark .related-biz-dialog {
  209 + .summary {
  210 + background: rgba(255, 255, 255, 0.06) !important;
  211 + .label { color: rgba(255, 255, 255, 0.45) !important; }
  212 + .value { color: rgba(255, 255, 255, 0.85) !important; }
  213 + }
  214 +}
  215 +</style>
... ...
antis-ncc-admin/src/views/monitorCenter/duplicate-recharge-audit/index.vue
... ... @@ -63,6 +63,16 @@
63 63 </el-form-item>
64 64 </el-col>
65 65 <el-col :span="6">
  66 + <el-form-item label="异常类型">
  67 + <el-select v-model="query.exceptionType" placeholder="全部" clearable style="width: 100%">
  68 + <el-option label="异常开单" value="ShortIntervalSameAmountBilling" />
  69 + <el-option label="异常耗卡" value="ShortIntervalSameAmountConsume" />
  70 + <el-option label="同日重复开单" value="SameDayDuplicateBilling" />
  71 + <el-option label="同日重复耗卡" value="SameDayDuplicateConsume" />
  72 + </el-select>
  73 + </el-form-item>
  74 + </el-col>
  75 + <el-col :span="6">
66 76 <el-form-item label="会员">
67 77 <el-input
68 78 v-model="query.memberName"
... ... @@ -98,7 +108,24 @@
98 108 </div>
99 109 </div>
100 110  
101   - <NCC-table v-loading="listLoading" :data="list" has-c>
  111 + <NCC-table
  112 + v-loading="listLoading"
  113 + :data="list"
  114 + has-c
  115 + :row-class-name="tableRowClassName"
  116 + >
  117 + <el-table-column label="异常类型" width="130" align="center">
  118 + <template slot-scope="scope">
  119 + <el-tag
  120 + size="mini"
  121 + disable-transitions
  122 + effect="dark"
  123 + :type="exceptionTagType(scope.row.exceptionType || scope.row.ExceptionType)"
  124 + >
  125 + {{ displayText(scope.row.exceptionTypeName || scope.row.ExceptionTypeName) }}
  126 + </el-tag>
  127 + </template>
  128 + </el-table-column>
102 129 <el-table-column label="业务类型" width="90" align="center">
103 130 <template slot-scope="scope">
104 131 <el-tag
... ... @@ -141,16 +168,46 @@
141 168 {{ formatDate(scope.row.bizDate || scope.row.BizDate) }}
142 169 </template>
143 170 </el-table-column>
144   - <el-table-column label="当日序号" width="110" align="center">
  171 + <el-table-column label="当日序号" width="130" align="center">
145 172 <template slot-scope="scope">
146   - {{ scope.row.daySequence || scope.row.DaySequence || '无' }}
147   - /
148   - {{ scope.row.dayTotalCount || scope.row.DayTotalCount || '无' }}
  173 + {{ formatDaySequenceDisplay(scope.row) }}
149 174 </template>
150 175 </el-table-column>
151   - <el-table-column label="业务单号" min-width="180" show-overflow-tooltip>
  176 + <el-table-column label="业务单号" min-width="200" show-overflow-tooltip>
152 177 <template slot-scope="scope">
153   - {{ displayText(scope.row.bizId || scope.row.BizId) }}
  178 + <div class="biz-id-cell">
  179 + <el-tooltip
  180 + v-if="isHighlightRow(scope.row) && getRelatedGroupCount(scope.row) > 1"
  181 + :content="relatedBizIdsTooltip(scope.row)"
  182 + placement="top"
  183 + >
  184 + <span class="cell-text">{{ displayText(scope.row.bizId || scope.row.BizId) }}</span>
  185 + </el-tooltip>
  186 + <span v-else class="cell-text">{{ displayText(scope.row.bizId || scope.row.BizId) }}</span>
  187 + <el-tag
  188 + v-if="isHighlightRow(scope.row) && getRelatedGroupCount(scope.row) > 1"
  189 + size="mini"
  190 + type="danger"
  191 + disable-transitions
  192 + effect="plain"
  193 + class="group-tag"
  194 + >
  195 + 同组{{ getRelatedGroupCount(scope.row) }}笔
  196 + </el-tag>
  197 + </div>
  198 + </template>
  199 + </el-table-column>
  200 + <el-table-column label="操作" width="140" align="left" fixed="right">
  201 + <template slot-scope="scope">
  202 + <el-button type="text" size="mini" @click="openBizDetailFromRow(scope.row)">详情</el-button>
  203 + <el-button
  204 + v-if="showRelatedButton(scope.row)"
  205 + type="text"
  206 + size="mini"
  207 + @click="openRelatedDialog(scope.row)"
  208 + >
  209 + {{ relatedButtonText(scope.row) }}
  210 + </el-button>
154 211 </template>
155 212 </el-table-column>
156 213 </NCC-table>
... ... @@ -163,6 +220,14 @@
163 220 />
164 221 </div>
165 222 </div>
  223 +
  224 + <related-biz-dialog
  225 + :visible.sync="relatedDialogVisible"
  226 + :row="relatedDialogRow"
  227 + @view-detail="openBizDetail"
  228 + />
  229 + <LqKdKdjlbDetail ref="billingDetailDialog" />
  230 + <LqXhHyhkDetail ref="consumeDetailDialog" />
166 231 </div>
167 232 </template>
168 233  
... ... @@ -170,17 +235,27 @@
170 235 import request from '@/utils/request'
171 236 import dayjs from 'dayjs'
172 237 import * as XLSX from 'xlsx'
  238 +import RelatedBizDialog from './components/related-biz-dialog.vue'
  239 +import LqKdKdjlbDetail from '@/views/lqKdKdjlb/detail'
  240 +import LqXhHyhkDetail from '@/views/lqXhHyhk/detail'
  241 +
  242 +function currentMonthRange() {
  243 + const start = dayjs().startOf('month').format('YYYY-MM-DD')
  244 + const end = dayjs().endOf('month').format('YYYY-MM-DD')
  245 + return [start, end]
  246 +}
173 247  
174 248 export default {
175 249 name: 'DuplicateRechargeAudit',
  250 + components: { RelatedBizDialog, LqKdKdjlbDetail, LqXhHyhkDetail },
176 251 data() {
177   - const today = dayjs().format('YYYY-MM-DD')
178 252 return {
179   - dateRange: [today, today],
  253 + dateRange: currentMonthRange(),
180 254 query: {
181 255 businessUnitId: undefined,
182 256 storeId: undefined,
183 257 bizType: undefined,
  258 + exceptionType: undefined,
184 259 memberName: ''
185 260 },
186 261 listQuery: {
... ... @@ -191,7 +266,9 @@ export default {
191 266 storeOptions: [],
192 267 list: [],
193 268 total: 0,
194   - listLoading: false
  269 + listLoading: false,
  270 + relatedDialogVisible: false,
  271 + relatedDialogRow: null
195 272 }
196 273 },
197 274 created() {
... ... @@ -220,6 +297,79 @@ export default {
220 297 if (!val) return '无'
221 298 return dayjs(val).format('YYYY-MM-DD')
222 299 },
  300 + exceptionTagType(type) {
  301 + if (type === 'ShortIntervalSameAmountBilling' || type === 'ShortIntervalSameAmountConsume') return 'danger'
  302 + if (type === 'SameDayDuplicateBilling') return 'warning'
  303 + if (type === 'SameDayDuplicateConsume') return 'success'
  304 + if (type === 'SameDayMixed') return 'info'
  305 + return 'info'
  306 + },
  307 + isHighlightRow(row) {
  308 + if (!row) return false
  309 + if (row.isHighlight === true || row.IsHighlight === true) return true
  310 + const type = row.exceptionType || row.ExceptionType
  311 + return type === 'ShortIntervalSameAmountBilling' || type === 'ShortIntervalSameAmountConsume'
  312 + },
  313 + getRelatedBizList(row) {
  314 + if (!row) return []
  315 + return row.relatedBizList || row.RelatedBizList || []
  316 + },
  317 + getRelatedGroupCount(row) {
  318 + return this.getRelatedBizList(row).length
  319 + },
  320 + relatedBizIdsTooltip(row) {
  321 + const ids = this.getRelatedBizList(row)
  322 + .map(item => item.bizId || item.BizId)
  323 + .filter(Boolean)
  324 + return ids.length ? ids.join('、') : '无'
  325 + },
  326 + formatDaySequenceDisplay(row) {
  327 + if (this.isHighlightRow(row)) {
  328 + const groupCount = this.getRelatedGroupCount(row)
  329 + const dayTotal = row.dayTotalCount != null ? row.dayTotalCount : row.DayTotalCount
  330 + if (groupCount > 0) {
  331 + if (dayTotal != null && dayTotal !== '') {
  332 + return `${groupCount}笔/当日${dayTotal}笔`
  333 + }
  334 + return `同组${groupCount}笔`
  335 + }
  336 + return '无'
  337 + }
  338 + const seq = row.daySequence != null ? row.daySequence : row.DaySequence
  339 + const total = row.dayTotalCount != null ? row.dayTotalCount : row.DayTotalCount
  340 + if ((seq === null || seq === undefined || seq === '') && (total === null || total === undefined || total === '')) {
  341 + return '无'
  342 + }
  343 + return `${this.displayText(seq)}/${this.displayText(total)}`
  344 + },
  345 + showRelatedButton(row) {
  346 + return this.getRelatedGroupCount(row) > 0
  347 + },
  348 + relatedButtonText(row) {
  349 + return this.isHighlightRow(row) ? '查看同组' : '查看关联'
  350 + },
  351 + openBizDetailFromRow(row) {
  352 + const bizType = row.bizType || row.BizType
  353 + const bizId = row.bizId || row.BizId
  354 + this.openBizDetail({ bizType, bizId })
  355 + },
  356 + openBizDetail({ bizType, bizId }) {
  357 + if (!bizId) return
  358 + if (bizType === 'Billing') {
  359 + if (this.$refs.billingDetailDialog) {
  360 + this.$refs.billingDetailDialog.init(bizId)
  361 + }
  362 + return
  363 + }
  364 + if (bizType === 'Consume') {
  365 + if (this.$refs.consumeDetailDialog) {
  366 + this.$refs.consumeDetailDialog.init(bizId)
  367 + }
  368 + }
  369 + },
  370 + tableRowClassName({ row }) {
  371 + return this.isHighlightRow(row) ? 'audit-row-highlight' : ''
  372 + },
223 373 applyRouteQuery() {
224 374 const q = this.$route.query || {}
225 375 if (q.startTime && q.endTime) {
... ... @@ -238,6 +388,7 @@ export default {
238 388 if (q.businessUnitId) this.query.businessUnitId = q.businessUnitId
239 389 if (q.storeId) this.query.storeId = q.storeId
240 390 if (q.bizType) this.query.bizType = q.bizType
  391 + if (q.exceptionType) this.query.exceptionType = q.exceptionType
241 392 if (q.memberName) this.query.memberName = q.memberName
242 393 },
243 394 buildPayload(forExport) {
... ... @@ -246,19 +397,18 @@ export default {
246 397 return null
247 398 }
248 399 const startDate = this.dateRange[0]
249   - const payload = {
  400 + return {
250 401 startTime: `${startDate} 00:00:00`,
251 402 endTime: `${this.dateRange[1]} 23:59:59`,
252   - // 兼容旧版后端按月份查询;新版优先使用 startTime/endTime
253 403 statisticsMonth: startDate.replace(/-/g, '').slice(0, 6),
254 404 businessUnitId: this.query.businessUnitId || undefined,
255 405 storeId: this.query.storeId || undefined,
256 406 bizType: this.query.bizType || undefined,
  407 + exceptionType: this.query.exceptionType || undefined,
257 408 memberName: this.query.memberName || undefined,
258 409 currentPage: forExport ? 1 : this.listQuery.currentPage,
259 410 pageSize: forExport ? 5000 : this.listQuery.pageSize
260 411 }
261   - return payload
262 412 },
263 413 async loadBusinessUnits() {
264 414 try {
... ... @@ -297,16 +447,20 @@ export default {
297 447 this.initData()
298 448 },
299 449 reset() {
300   - const today = dayjs().format('YYYY-MM-DD')
301   - this.dateRange = [today, today]
  450 + this.dateRange = currentMonthRange()
302 451 this.query = {
303 452 businessUnitId: undefined,
304 453 storeId: undefined,
305 454 bizType: undefined,
  455 + exceptionType: undefined,
306 456 memberName: ''
307 457 }
308 458 this.search()
309 459 },
  460 + openRelatedDialog(row) {
  461 + this.relatedDialogRow = row
  462 + this.relatedDialogVisible = true
  463 + },
310 464 async initData() {
311 465 const payload = this.buildPayload(false)
312 466 if (!payload) return
... ... @@ -344,14 +498,18 @@ export default {
344 498 return
345 499 }
346 500 const exportRows = rows.map(r => ({
  501 + 异常类型: r.exceptionTypeName || r.ExceptionTypeName || '',
347 502 业务类型: r.bizTypeName || r.BizTypeName || '',
348 503 门店: r.storeName || r.StoreName || '',
349 504 会员: r.memberName || r.MemberName || '',
350 505 金额: r.amount != null ? r.amount : r.Amount,
351 506 业务时间: this.formatDateTime(r.bizTime || r.BizTime),
352 507 业务日期: this.formatDate(r.bizDate || r.BizDate),
353   - 当日序号: `${r.daySequence || r.DaySequence || ''}/${r.dayTotalCount || r.DayTotalCount || ''}`,
354   - 业务单号: r.bizId || r.BizId || ''
  508 + 当日序号: this.formatDaySequenceDisplay(r),
  509 + 业务单号: r.bizId || r.BizId || '',
  510 + 首笔单号: r.firstBizId || r.FirstBizId || '',
  511 + 首笔类型: r.firstBizTypeName || r.FirstBizTypeName || '',
  512 + 关联单据: r.relatedBizSummary || r.RelatedBizSummary || ''
355 513 }))
356 514 const sheet = XLSX.utils.json_to_sheet(exportRows)
357 515 const book = XLSX.utils.book_new()
... ... @@ -380,5 +538,42 @@ export default {
380 538 &.info { color: #909399; }
381 539 }
382 540 }
  541 +
  542 + .biz-id-cell {
  543 + display: flex;
  544 + align-items: center;
  545 + gap: 6px;
  546 + min-width: 0;
  547 + white-space: nowrap;
  548 + .cell-text {
  549 + min-width: 0;
  550 + overflow: hidden;
  551 + text-overflow: ellipsis;
  552 + }
  553 + .group-tag {
  554 + flex-shrink: 0;
  555 + }
  556 + }
  557 +
  558 + ::v-deep .el-table .audit-row-highlight > td {
  559 + background: rgba(245, 108, 108, 0.14) !important;
  560 + }
  561 +
  562 + ::v-deep .el-table .audit-row-highlight:hover > td {
  563 + background: rgba(245, 108, 108, 0.22) !important;
  564 + }
  565 +}
  566 +</style>
  567 +
  568 +<style lang="scss">
  569 +/* 暗黑模式:异常开单/耗卡行高亮 */
  570 +body.ncc-content-dark .duplicate-recharge-audit-page,
  571 +.ncc-content-dark .duplicate-recharge-audit-page {
  572 + .el-table .audit-row-highlight > td {
  573 + background: rgba(245, 108, 108, 0.22) !important;
  574 + }
  575 + .el-table .audit-row-highlight:hover > td {
  576 + background: rgba(245, 108, 108, 0.32) !important;
  577 + }
383 578 }
384 579 </style>
... ...
antis-ncc-admin/src/views/permission/employee-profile-submission/detail-dialog.vue
... ... @@ -33,6 +33,7 @@
33 33 <el-descriptions-item label="出生日期">{{ formatDate(info.birthday) }}</el-descriptions-item>
34 34 <el-descriptions-item label="民族">{{ display(info.nation) }}</el-descriptions-item>
35 35 <el-descriptions-item label="籍贯">{{ display(info.nativePlace) }}</el-descriptions-item>
  36 + <el-descriptions-item label="身份证地址" :span="2">{{ display(info.idCardAddress) }}</el-descriptions-item>
36 37 <el-descriptions-item label="证件类型">身份证</el-descriptions-item>
37 38 <el-descriptions-item label="身份证号">{{ display(info.idCardNoMasked) }}</el-descriptions-item>
38 39 <el-descriptions-item label="文化程度">{{ display(info.education) }}</el-descriptions-item>
... ... @@ -70,9 +71,36 @@
70 71 <el-descriptions-item label="转正日期">{{ formatDate(info.regularizationDate) }}</el-descriptions-item>
71 72 <el-descriptions-item label="招聘类型">{{ enumLabel('recruitmentType', info.recruitmentType) }}</el-descriptions-item>
72 73 <el-descriptions-item label="开户行">{{ display(info.bankName) }}</el-descriptions-item>
  74 + <el-descriptions-item label="开户实名">{{ display(info.bankAccountName) }}</el-descriptions-item>
73 75 <el-descriptions-item label="银行卡号">{{ display(info.bankCardNoMasked) }}</el-descriptions-item>
74 76 </el-descriptions>
75 77  
  78 + <div class="detail-section-title">证件照片</div>
  79 + <div class="id-card-preview-row">
  80 + <div class="id-card-preview-item">
  81 + <div class="id-card-preview-label">身份证正面</div>
  82 + <el-image
  83 + v-if="info.idCardFrontUrl"
  84 + class="id-card-preview-image"
  85 + :src="resolveFileUrl(info.idCardFrontUrl)"
  86 + :preview-src-list="[resolveFileUrl(info.idCardFrontUrl)]"
  87 + fit="contain"
  88 + />
  89 + <span v-else class="id-card-preview-empty">无</span>
  90 + </div>
  91 + <div class="id-card-preview-item">
  92 + <div class="id-card-preview-label">身份证反面</div>
  93 + <el-image
  94 + v-if="info.idCardBackUrl"
  95 + class="id-card-preview-image"
  96 + :src="resolveFileUrl(info.idCardBackUrl)"
  97 + :preview-src-list="[resolveFileUrl(info.idCardBackUrl)]"
  98 + fit="contain"
  99 + />
  100 + <span v-else class="id-card-preview-empty">无</span>
  101 + </div>
  102 + </div>
  103 +
76 104 <div class="detail-section-title">教育与经历</div>
77 105 <el-descriptions :column="2" border size="small" class="detail-block">
78 106 <el-descriptions-item label="毕业院校">{{ display(info.graduateSchool) }}</el-descriptions-item>
... ... @@ -111,6 +139,7 @@
111 139 value-format="yyyy-MM-dd"
112 140 placeholder="请选择入职日期"
113 141 style="width: 100%"
  142 + @change="syncRegularizationDate"
114 143 />
115 144 </el-form-item>
116 145 </el-col>
... ... @@ -172,7 +201,7 @@
172 201 </el-col>
173 202 <el-col :span="12">
174 203 <el-form-item label="试用期">
175   - <el-select v-model="approveForm.probationMonths" clearable placeholder="选填" style="width: 100%">
  204 + <el-select v-model="approveForm.probationMonths" clearable placeholder="选填" style="width: 100%" @change="syncRegularizationDate">
176 205 <el-option
177 206 v-for="item in enumOptions.probationMonthsOptions || []"
178 207 :key="item.value"
... ... @@ -184,13 +213,7 @@
184 213 </el-col>
185 214 <el-col :span="12">
186 215 <el-form-item label="转正日期">
187   - <el-date-picker
188   - v-model="approveForm.regularizationDate"
189   - type="date"
190   - value-format="yyyy-MM-dd"
191   - placeholder="选填"
192   - style="width: 100%"
193   - />
  216 + <el-input :value="approveRegularizationDisplay" readonly placeholder="根据入职日期与试用期自动计算" />
194 217 </el-form-item>
195 218 </el-col>
196 219 <el-col :span="12">
... ... @@ -331,12 +354,42 @@ export default {
331 354 if (this.mode === 'approve') return '审核扫码入职申请'
332 355 if (this.mode === 'reject') return '驳回扫码入职申请'
333 356 return '扫码入职申请详情'
  357 + },
  358 + approveRegularizationDisplay() {
  359 + const val = this.calcRegularizationDate(this.approveForm.entryDate, this.approveForm.probationMonths)
  360 + return val || '无'
334 361 }
335 362 },
336 363 methods: {
337 364 display(val) {
338 365 return val === null || val === undefined || val === '' ? '无' : val
339 366 },
  367 + resolveFileUrl(url) {
  368 + if (!url) return ''
  369 + if (String(url).startsWith('http')) return url
  370 + const base = (this.define && this.define.comUrl) || ''
  371 + return base + url
  372 + },
  373 + calcRegularizationDate(entryDate, probationMonths) {
  374 + if (!entryDate || probationMonths === null || probationMonths === undefined || probationMonths === '') return ''
  375 + const months = Number(probationMonths)
  376 + if (Number.isNaN(months) || months < 0) return ''
  377 + const parts = String(entryDate).split('-')
  378 + if (parts.length < 3) return ''
  379 + const d = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10))
  380 + if (Number.isNaN(d.getTime())) return ''
  381 + d.setMonth(d.getMonth() + months)
  382 + const y = d.getFullYear()
  383 + const m = `${d.getMonth() + 1}`.padStart(2, '0')
  384 + const day = `${d.getDate()}`.padStart(2, '0')
  385 + return `${y}-${m}-${day}`
  386 + },
  387 + syncRegularizationDate() {
  388 + this.approveForm.regularizationDate = this.calcRegularizationDate(
  389 + this.approveForm.entryDate,
  390 + this.approveForm.probationMonths
  391 + )
  392 + },
340 393 formatDate(val) {
341 394 if (!val) return '无'
342 395 return this.ncc.dateFormat(val, 'YYYY-MM-DD')
... ... @@ -431,6 +484,7 @@ export default {
431 484 birthday: pick(raw.birthday, raw.Birthday),
432 485 nation: pick(raw.nation, raw.Nation),
433 486 nativePlace: pick(raw.nativePlace, raw.NativePlace),
  487 + idCardAddress: pick(raw.idCardAddress, raw.IdCardAddress),
434 488 idCardNoMasked: pick(raw.idCardNoMasked, raw.IdCardNoMasked),
435 489 education: pick(raw.education, raw.Education),
436 490 entryDate: pick(raw.entryDate, raw.EntryDate),
... ... @@ -455,7 +509,10 @@ export default {
455 509 regularizationDate: pick(raw.regularizationDate, raw.RegularizationDate),
456 510 recruitmentType: pick(raw.recruitmentType, raw.RecruitmentType),
457 511 bankName: pick(raw.bankName, raw.BankName),
  512 + bankAccountName: pick(raw.bankAccountName, raw.BankAccountName),
458 513 bankCardNoMasked: pick(raw.bankCardNoMasked, raw.BankCardNoMasked),
  514 + idCardFrontUrl: pick(raw.idCardFrontUrl, raw.IdCardFrontUrl),
  515 + idCardBackUrl: pick(raw.idCardBackUrl, raw.IdCardBackUrl),
459 516 graduateSchool: pick(raw.graduateSchool, raw.GraduateSchool),
460 517 enrollmentDate: pick(raw.enrollmentDate, raw.EnrollmentDate),
461 518 graduationDate: pick(raw.graduationDate, raw.GraduationDate),
... ... @@ -476,11 +533,12 @@ export default {
476 533 this.loading = true
477 534 Promise.all([
478 535 this.loadEnumOptions(),
479   - getEmployeeProfileSubmissionInfo(this.submissionId, false)
  536 + getEmployeeProfileSubmissionInfo(this.submissionId, false, true)
480 537 ]).then(([, res]) => {
481 538 this.info = this.normalizeInfo(res.data)
482 539 if (this.mode === 'approve') {
483 540 this.approveForm = this.buildApproveFormFromInfo(this.info)
  541 + this.syncRegularizationDate()
484 542 }
485 543 }).catch(() => {
486 544 this.info = null
... ... @@ -494,6 +552,7 @@ export default {
494 552 this.submitLoading = false
495 553 },
496 554 submitApprove() {
  555 + this.syncRegularizationDate()
497 556 this.$refs.approveForm.validate(valid => {
498 557 if (!valid) return
499 558 this.submitLoading = true
... ... @@ -567,6 +626,41 @@ export default {
567 626 color: #909399;
568 627 }
569 628  
  629 +.id-card-preview-row {
  630 + display: flex;
  631 + flex-wrap: wrap;
  632 + gap: 16px;
  633 + margin-bottom: 4px;
  634 +}
  635 +
  636 +.id-card-preview-item {
  637 + min-width: 160px;
  638 +}
  639 +
  640 +.id-card-preview-label {
  641 + margin-bottom: 8px;
  642 + font-size: 13px;
  643 + color: #606266;
  644 +}
  645 +
  646 +.id-card-preview-image {
  647 + width: 160px;
  648 + height: 100px;
  649 + border: 1px solid #ebeef5;
  650 + border-radius: 4px;
  651 + background: #fafafa;
  652 +}
  653 +
  654 +.id-card-preview-empty {
  655 + display: inline-block;
  656 + min-width: 160px;
  657 + line-height: 100px;
  658 + text-align: center;
  659 + color: #909399;
  660 + border: 1px dashed #dcdfe6;
  661 + border-radius: 4px;
  662 +}
  663 +
570 664 html.dark {
571 665 .detail-section-title {
572 666 color: rgba(255, 255, 255, 0.85);
... ...
antis-ncc-admin/src/views/permission/user/components/user-form-employee-profile.vue
... ... @@ -75,20 +75,14 @@
75 75 </el-col>
76 76 <el-col :sm="12" :xs="24">
77 77 <el-form-item label="试用期">
78   - <el-select v-model="form.probationMonths" placeholder="请选择" clearable style="width: 100%">
  78 + <el-select v-model="form.probationMonths" placeholder="请选择" clearable style="width: 100%" @change="syncRegularizationDate">
79 79 <el-option v-for="item in enumOptions.probationMonthsOptions" :key="item.value" :label="item.label" :value="item.value" />
80 80 </el-select>
81 81 </el-form-item>
82 82 </el-col>
83 83 <el-col :sm="12" :xs="24">
84 84 <el-form-item label="转正日期">
85   - <el-date-picker
86   - v-model="form.regularizationDate"
87   - type="date"
88   - placeholder="转正日期"
89   - value-format="yyyy-MM-dd"
90   - style="width: 100%"
91   - />
  85 + <el-input :value="regularizationDisplay" readonly placeholder="根据入职日期与试用期自动计算" />
92 86 </el-form-item>
93 87 </el-col>
94 88 <el-col :sm="12" :xs="24">
... ... @@ -132,6 +126,11 @@
132 126 </el-form-item>
133 127 </el-col>
134 128 <el-col :span="24">
  129 + <el-form-item label="身份证地址">
  130 + <el-input v-model="form.idCardAddress" type="textarea" :rows="2" placeholder="请填写身份证上的完整住址(省市区街道门牌)" />
  131 + </el-form-item>
  132 + </el-col>
  133 + <el-col :span="24">
135 134 <el-form-item label="现居住地址">
136 135 <el-input v-model="form.currentAddress" type="textarea" :rows="2" placeholder="现居住地址" />
137 136 </el-form-item>
... ... @@ -139,6 +138,64 @@
139 138 </el-row>
140 139 </el-card>
141 140  
  141 + <!-- 证件照片 -->
  142 + <el-card class="user-form-card" shadow="never">
  143 + <div slot="header" class="user-form-card__header">
  144 + <div class="user-form-card__title-row">
  145 + <i class="el-icon-postcard user-form-card__icon user-form-card__icon--warning" />
  146 + <span class="user-form-card__title">证件照片</span>
  147 + </div>
  148 + </div>
  149 + <el-row :gutter="20" class="custom-row user-form-section-grid">
  150 + <el-col :sm="12" :xs="24">
  151 + <el-form-item label="身份证正面">
  152 + <div class="id-card-upload-block">
  153 + <el-image
  154 + v-if="form.idCardFrontUrl"
  155 + class="id-card-upload-preview"
  156 + :src="resolveFileUrl(form.idCardFrontUrl)"
  157 + :preview-src-list="[resolveFileUrl(form.idCardFrontUrl)]"
  158 + fit="contain"
  159 + />
  160 + <el-upload
  161 + v-if="!form.idCardFrontUrl"
  162 + :show-file-list="false"
  163 + accept="image/*"
  164 + action=""
  165 + :http-request="opt => uploadIdCard(opt, 'front')"
  166 + >
  167 + <el-button size="small" type="primary">上传正面</el-button>
  168 + </el-upload>
  169 + <el-button v-if="form.idCardFrontUrl" size="mini" type="text" @click="clearIdCard('front')">重新上传</el-button>
  170 + </div>
  171 + </el-form-item>
  172 + </el-col>
  173 + <el-col :sm="12" :xs="24">
  174 + <el-form-item label="身份证反面">
  175 + <div class="id-card-upload-block">
  176 + <el-image
  177 + v-if="form.idCardBackUrl"
  178 + class="id-card-upload-preview"
  179 + :src="resolveFileUrl(form.idCardBackUrl)"
  180 + :preview-src-list="[resolveFileUrl(form.idCardBackUrl)]"
  181 + fit="contain"
  182 + />
  183 + <el-upload
  184 + v-if="!form.idCardBackUrl"
  185 + :show-file-list="false"
  186 + accept="image/*"
  187 + action=""
  188 + :http-request="opt => uploadIdCard(opt, 'back')"
  189 + >
  190 + <el-button size="small" type="primary">上传反面</el-button>
  191 + </el-upload>
  192 + <el-button v-if="form.idCardBackUrl" size="mini" type="text" @click="clearIdCard('back')">重新上传</el-button>
  193 + </div>
  194 + </el-form-item>
  195 + </el-col>
  196 + </el-row>
  197 + </el-card>
  198 +
142 199 <!-- 银行信息 -->
143 200 <el-card class="user-form-card" shadow="never">
144 201 <div slot="header" class="user-form-card__header">
... ... @@ -154,6 +211,11 @@
154 211 </el-form-item>
155 212 </el-col>
156 213 <el-col :sm="12" :xs="24">
  214 + <el-form-item label="开户实名">
  215 + <el-input v-model="form.bankAccountName" placeholder="银行卡开户姓名" maxlength="30" />
  216 + </el-form-item>
  217 + </el-col>
  218 + <el-col :sm="12" :xs="24">
157 219 <el-form-item label="银行卡号">
158 220 <el-input v-model="form.bankCardNo" :placeholder="bankCardPlaceholder" clearable maxlength="30" />
159 221 <div v-if="bankCardNoMasked && !form.bankCardNo" class="field-hint">当前:{{ bankCardNoMasked }}</div>
... ... @@ -254,6 +316,7 @@
254 316 <script>
255 317 import { getEmployeeProfileByUserId, saveEmployeeProfile } from '@/api/extend/employee-profile'
256 318 import { getEmployeeProfilePublicConfig } from '@/api/extend/employee-profile-submission'
  319 +import { ossUploadFile } from '@/utils/oss-upload'
257 320  
258 321 const EMPTY_ENUM = {
259 322 maritalStatusOptions: [],
... ... @@ -271,6 +334,7 @@ function emptyForm() {
271 334 politicalStatus: null,
272 335 householdType: null,
273 336 currentAddress: '',
  337 + idCardAddress: '',
274 338 employeeNo: '',
275 339 employeeType: null,
276 340 employeeStatus: null,
... ... @@ -278,7 +342,10 @@ function emptyForm() {
278 342 regularizationDate: null,
279 343 recruitmentType: null,
280 344 bankName: '',
  345 + bankAccountName: '',
281 346 bankCardNo: '',
  347 + idCardFrontUrl: '',
  348 + idCardBackUrl: '',
282 349 graduateSchool: '',
283 350 enrollmentDate: null,
284 351 graduationDate: null,
... ... @@ -341,9 +408,28 @@ export default {
341 408 },
342 409 bankCardPlaceholder() {
343 410 return this.bankCardNoMasked ? '留空则保留原卡号,输入则更新' : '请输入银行卡号'
  411 + },
  412 + regularizationDisplay() {
  413 + const val = this.calcRegularizationDate(this.entryDateValue, this.form.probationMonths)
  414 + return val || '无'
  415 + },
  416 + entryDateValue() {
  417 + if (this.entryDate === null || this.entryDate === undefined || this.entryDate === '') return ''
  418 + if (typeof this.entryDate === 'number') {
  419 + return this.formatDateValue(new Date(this.entryDate))
  420 + }
  421 + return this.formatDateValue(this.entryDate)
344 422 }
345 423 },
346 424 watch: {
  425 + entryDate: {
  426 + handler() {
  427 + this.syncRegularizationDate()
  428 + }
  429 + },
  430 + 'form.probationMonths'() {
  431 + this.syncRegularizationDate()
  432 + },
347 433 userId: {
348 434 immediate: true,
349 435 handler(val) {
... ... @@ -370,6 +456,57 @@ export default {
370 456 this.loadEnumOptions()
371 457 },
372 458 methods: {
  459 + resolveFileUrl(url) {
  460 + if (!url) return ''
  461 + if (String(url).startsWith('http')) return url
  462 + const base = (this.define && this.define.comUrl) || ''
  463 + return base + url
  464 + },
  465 + calcRegularizationDate(entryDate, probationMonths) {
  466 + if (!entryDate || probationMonths === null || probationMonths === undefined || probationMonths === '') return ''
  467 + const months = Number(probationMonths)
  468 + if (Number.isNaN(months) || months < 0) return ''
  469 + const parts = String(entryDate).split('-')
  470 + if (parts.length < 3) return ''
  471 + const d = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) - 1, parseInt(parts[2], 10))
  472 + if (Number.isNaN(d.getTime())) return ''
  473 + d.setMonth(d.getMonth() + months)
  474 + const y = d.getFullYear()
  475 + const m = `${d.getMonth() + 1}`.padStart(2, '0')
  476 + const day = `${d.getDate()}`.padStart(2, '0')
  477 + return `${y}-${m}-${day}`
  478 + },
  479 + syncRegularizationDate() {
  480 + this.form.regularizationDate = this.calcRegularizationDate(this.entryDateValue, this.form.probationMonths) || null
  481 + },
  482 + uploadIdCard(option, side) {
  483 + const file = option && option.file
  484 + if (!file) return
  485 + const loading = this.$loading({ lock: true, text: '上传中', spinner: 'el-icon-loading' })
  486 + ossUploadFile(file, 'annexpic').then(res => {
  487 + if (res && res.url) {
  488 + if (side === 'front') {
  489 + this.form.idCardFrontUrl = res.url
  490 + } else {
  491 + this.form.idCardBackUrl = res.url
  492 + }
  493 + this.$message.success('上传成功')
  494 + } else {
  495 + this.$message.error('上传失败')
  496 + }
  497 + }).catch(() => {
  498 + this.$message.error('上传失败')
  499 + }).finally(() => {
  500 + loading.close()
  501 + })
  502 + },
  503 + clearIdCard(side) {
  504 + if (side === 'front') {
  505 + this.form.idCardFrontUrl = ''
  506 + } else {
  507 + this.form.idCardBackUrl = ''
  508 + }
  509 + },
373 510 computeTenureFromEntryDate(entryDate) {
374 511 if (entryDate === null || entryDate === undefined || entryDate === '') return ''
375 512 const start = typeof entryDate === 'number' ? new Date(entryDate) : new Date(entryDate)
... ... @@ -448,6 +585,7 @@ export default {
448 585 politicalStatus: pick(raw.politicalStatus, raw.PoliticalStatus),
449 586 householdType: pick(raw.householdType, raw.HouseholdType),
450 587 currentAddress: pick(raw.currentAddress, raw.CurrentAddress) || '',
  588 + idCardAddress: pick(raw.idCardAddress, raw.IdCardAddress) || '',
451 589 employeeNo: pick(raw.employeeNo, raw.EmployeeNo) || '',
452 590 employeeType: pick(raw.employeeType, raw.EmployeeType),
453 591 employeeStatus: pick(raw.employeeStatus, raw.EmployeeStatus),
... ... @@ -455,6 +593,9 @@ export default {
455 593 regularizationDate: this.formatDateValue(pick(raw.regularizationDate, raw.RegularizationDate)),
456 594 recruitmentType: pick(raw.recruitmentType, raw.RecruitmentType),
457 595 bankName: pick(raw.bankName, raw.BankName) || '',
  596 + bankAccountName: pick(raw.bankAccountName, raw.BankAccountName) || '',
  597 + idCardFrontUrl: pick(raw.idCardFrontUrl, raw.IdCardFrontUrl) || '',
  598 + idCardBackUrl: pick(raw.idCardBackUrl, raw.IdCardBackUrl) || '',
458 599 graduateSchool: pick(raw.graduateSchool, raw.GraduateSchool) || '',
459 600 enrollmentDate: this.formatDateValue(pick(raw.enrollmentDate, raw.EnrollmentDate)),
460 601 graduationDate: this.formatDateValue(pick(raw.graduationDate, raw.GraduationDate)),
... ... @@ -497,6 +638,7 @@ export default {
497 638 politicalStatus: row.politicalStatus,
498 639 householdType: row.householdType,
499 640 currentAddress: row.currentAddress,
  641 + idCardAddress: row.idCardAddress,
500 642 employeeNo: row.employeeNo,
501 643 employeeType: row.employeeType,
502 644 employeeStatus: row.employeeStatus,
... ... @@ -504,7 +646,10 @@ export default {
504 646 regularizationDate: row.regularizationDate,
505 647 recruitmentType: row.recruitmentType,
506 648 bankName: row.bankName,
  649 + bankAccountName: row.bankAccountName,
507 650 bankCardNo: '',
  651 + idCardFrontUrl: row.idCardFrontUrl,
  652 + idCardBackUrl: row.idCardBackUrl,
508 653 graduateSchool: row.graduateSchool,
509 654 enrollmentDate: row.enrollmentDate,
510 655 graduationDate: row.graduationDate,
... ... @@ -519,6 +664,7 @@ export default {
519 664 this.age = row.age
520 665 this.tenureText = row.tenureText
521 666 this.bankCardNoMasked = row.bankCardNoMasked
  667 + this.syncRegularizationDate()
522 668 this.loaded = true
523 669 this.loadFailed = false
524 670 this.loadedUserId = uid
... ... @@ -580,6 +726,7 @@ export default {
580 726 politicalStatus: this.form.politicalStatus,
581 727 householdType: this.form.householdType,
582 728 currentAddress: this.form.currentAddress || null,
  729 + idCardAddress: this.form.idCardAddress || null,
583 730 employeeNo: this.form.employeeNo || null,
584 731 employeeType: this.form.employeeType,
585 732 employeeStatus: this.form.employeeStatus,
... ... @@ -587,6 +734,9 @@ export default {
587 734 regularizationDate: this.form.regularizationDate || null,
588 735 recruitmentType: this.form.recruitmentType,
589 736 bankName: this.form.bankName || null,
  737 + bankAccountName: this.form.bankAccountName || null,
  738 + idCardFrontUrl: this.form.idCardFrontUrl || null,
  739 + idCardBackUrl: this.form.idCardBackUrl || null,
590 740 graduateSchool: this.form.graduateSchool || null,
591 741 enrollmentDate: this.form.enrollmentDate || null,
592 742 graduationDate: this.form.graduationDate || null,
... ... @@ -608,6 +758,7 @@ export default {
608 758 if (!uid) {
609 759 return Promise.reject(new Error('PROFILE_MISSING_USER_ID'))
610 760 }
  761 + this.syncRegularizationDate()
611 762 if (this.userId && (!this.loaded || this.loadedUserId !== this.userId)) {
612 763 return Promise.reject(new Error('PROFILE_NOT_READY'))
613 764 }
... ... @@ -750,6 +901,28 @@ export default {
750 901 line-height: 1.45;
751 902 }
752 903  
  904 +.field-hint {
  905 + margin-top: 4px;
  906 + font-size: 12px;
  907 + color: #909399;
  908 + line-height: 1.45;
  909 +}
  910 +
  911 +.id-card-upload-block {
  912 + display: flex;
  913 + flex-direction: column;
  914 + align-items: flex-start;
  915 + gap: 8px;
  916 +}
  917 +
  918 +.id-card-upload-preview {
  919 + width: 160px;
  920 + height: 100px;
  921 + border: 1px solid #ebeef5;
  922 + border-radius: 4px;
  923 + background: #fafafa;
  924 +}
  925 +
753 926 @media (max-width: 767px) {
754 927 .profile-derived-summary__grid {
755 928 grid-template-columns: 1fr;
... ...
antis-ncc-admin/src/views/statisticsList/form16.vue
... ... @@ -150,19 +150,24 @@
150 150 <span>{{ formatPercentage(scope.row.VisitRate) }}%</span>
151 151 </template>
152 152 </el-table-column>
153   - <el-table-column prop="TotalBillingCount" label="开单数(全部)" min-width="130" sortable="custom" >
  153 + <el-table-column prop="TotalBillingCount" label="开单数(拓客)" min-width="130" sortable="custom" >
154 154 <template slot-scope="scope">
155 155 <i class="el-icon-document-copy" style="margin-right: 4px; color: #67C23A;"></i>
156 156 <span>{{ scope.row.TotalBillingCount !== null && scope.row.TotalBillingCount !== undefined ? scope.row.TotalBillingCount : 0 }}</span>
157 157 </template>
158 158 </el-table-column>
159   - <el-table-column prop="TotalBillingAmount" label="开单金额(全部)" min-width="140" sortable="custom" >
  159 + <el-table-column prop="TotalBillingAmount" label="开单金额(拓客)" min-width="140" sortable="custom" >
160 160 <template slot-scope="scope">
161 161 <i class="el-icon-coin" style="margin-right: 4px; color: #67C23A;"></i>
162 162 <span class="amount-paid">¥{{ formatMoney(scope.row.TotalBillingAmount) }}</span>
163 163 </template>
164 164 </el-table-column>
165   - <el-table-column prop="ConversionRate" label="成交率" min-width="100" sortable="custom" >
  165 + <el-table-column prop="ConversionRate" label="成交率" min-width="120" sortable="custom" >
  166 + <template slot="header">
  167 + <el-tooltip content="成交率 = 到店拓客中有金额开单人数 ÷ 到店人数(不含0元单)" placement="top">
  168 + <span>成交率</span>
  169 + </el-tooltip>
  170 + </template>
166 171 <template slot-scope="scope">
167 172 <i class="el-icon-data-analysis" style="margin-right: 4px; color: #67C23A;"></i>
168 173 <span>{{ formatPercentage(scope.row.ConversionRate) }}%</span>
... ...
antis-ncc-admin/src/views/statisticsList/form21.vue
... ... @@ -122,6 +122,18 @@
122 122 </el-form-item>
123 123 </el-col>
124 124 <el-col :span="6">
  125 + <el-form-item label="类型">
  126 + <el-select
  127 + v-model="query.refundType"
  128 + placeholder="全部"
  129 + clearable
  130 + :style='{"width":"100%"}'>
  131 + <el-option label="退卡" value="refund" />
  132 + <el-option label="转卡" value="transfer" />
  133 + </el-select>
  134 + </el-form-item>
  135 + </el-col>
  136 + <el-col :span="6">
125 137 <el-form-item label="组织类型">
126 138 <el-select
127 139 v-model="query.organizationType"
... ... @@ -233,6 +245,16 @@
233 245 <span>{{ formatDateTime(scope.row.refundTime) || '无' }}</span>
234 246 </template>
235 247 </el-table-column>
  248 + <el-table-column prop="tkyy" label="类型" width="90" align="center">
  249 + <template slot-scope="scope">
  250 + <el-tag
  251 + :type="scope.row.tkyy === '转卡' ? 'warning' : 'success'"
  252 + size="mini"
  253 + disable-transitions>
  254 + {{ scope.row.tkyy === '转卡' ? '转卡' : '退卡' }}
  255 + </el-tag>
  256 + </template>
  257 + </el-table-column>
236 258 <el-table-column prop="itemName" label="退卡品项名称" min-width="150" sortable="custom">
237 259 <template slot-scope="scope">
238 260 <i class="el-icon-goods" style="margin-right: 4px; color: #E6A23C;"></i>
... ... @@ -338,7 +360,8 @@ export default {
338 360 performanceType: undefined,
339 361 beautyType: undefined,
340 362 sourceType: undefined,
341   - itemCategory: undefined
  363 + itemCategory: undefined,
  364 + refundType: undefined
342 365 },
343 366 storeOptions: [],
344 367 departmentOptions: [],
... ... @@ -735,6 +758,12 @@ export default {
735 758 params.itemCategory = this.query.itemCategory
736 759 }
737 760  
  761 + if (this.query.refundType === 'refund') {
  762 + params.excludeTransferCard = 1
  763 + } else if (this.query.refundType === 'transfer') {
  764 + params.onlyTransferCard = 1
  765 + }
  766 +
738 767 // 排序参数
739 768 if (this.sortProp) {
740 769 params.sidx = this.sortProp
... ... @@ -796,7 +825,8 @@ export default {
796 825 performanceType: undefined,
797 826 beautyType: undefined,
798 827 sourceType: undefined,
799   - itemCategory: undefined
  828 + itemCategory: undefined,
  829 + refundType: undefined
800 830 }
801 831 this.setDefaultTimeRange()
802 832 this.departmentOptions = []
... ... @@ -894,6 +924,12 @@ export default {
894 924 params.itemCategory = this.query.itemCategory
895 925 }
896 926  
  927 + if (this.query.refundType === 'refund') {
  928 + params.excludeTransferCard = 1
  929 + } else if (this.query.refundType === 'transfer') {
  930 + params.onlyTransferCard = 1
  931 + }
  932 +
897 933 // 排序参数(导出时也使用相同的排序)
898 934 if (this.sortProp) {
899 935 params.sidx = this.sortProp
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBusinessUnitDashboard/BusinessUnitDashboardCapabilityDtos.cs
... ... @@ -264,6 +264,12 @@ namespace NCC.Extend.Entitys.Dto.LqBusinessUnitDashboard
264 264 /// 业务类型:Billing / Consume,空则全部
265 265 /// </summary>
266 266 public string BizType { get; set; }
  267 +
  268 + /// <summary>
  269 + /// 异常类型:SameDayDuplicateBilling / SameDayDuplicateConsume / SameDayMixed /
  270 + /// ShortIntervalSameAmountBilling / ShortIntervalSameAmountConsume,空则全部
  271 + /// </summary>
  272 + public string ExceptionType { get; set; }
267 273 }
268 274  
269 275 /// <summary>
... ... @@ -330,5 +336,102 @@ namespace NCC.Extend.Entitys.Dto.LqBusinessUnitDashboard
330 336 /// 当日总笔数
331 337 /// </summary>
332 338 public int DayTotalCount { get; set; }
  339 +
  340 + /// <summary>
  341 + /// 异常类型编码:SameDayDuplicateBilling / SameDayDuplicateConsume / SameDayMixed /
  342 + /// ShortIntervalSameAmountBilling(异常开单)/ ShortIntervalSameAmountConsume(异常耗卡)
  343 + /// </summary>
  344 + public string ExceptionType { get; set; }
  345 +
  346 + /// <summary>
  347 + /// 异常类型名称
  348 + /// </summary>
  349 + public string ExceptionTypeName { get; set; }
  350 +
  351 + /// <summary>
  352 + /// 是否高风险高亮(异常开单/异常耗卡:短时间金额一致)
  353 + /// </summary>
  354 + public bool IsHighlight { get; set; }
  355 +
  356 + /// <summary>
  357 + /// 当日首笔业务单号
  358 + /// </summary>
  359 + public string FirstBizId { get; set; }
  360 +
  361 + /// <summary>
  362 + /// 当日首笔业务类型名称
  363 + /// </summary>
  364 + public string FirstBizTypeName { get; set; }
  365 +
  366 + /// <summary>
  367 + /// 当日首笔业务时间
  368 + /// </summary>
  369 + public DateTime? FirstBizTime { get; set; }
  370 +
  371 + /// <summary>
  372 + /// 当日首笔金额
  373 + /// </summary>
  374 + public decimal FirstAmount { get; set; }
  375 +
  376 + /// <summary>
  377 + /// 当日关联单据摘要(便于列表展示)
  378 + /// </summary>
  379 + public string RelatedBizSummary { get; set; }
  380 +
  381 + /// <summary>
  382 + /// 当日全部关联单据(含首笔与当前笔)
  383 + /// </summary>
  384 + public List<BusinessUnitDuplicateRechargeRelatedBizOutput> RelatedBizList { get; set; }
  385 + }
  386 +
  387 + /// <summary>
  388 + /// 重复充值审计关联单据
  389 + /// </summary>
  390 + public class BusinessUnitDuplicateRechargeRelatedBizOutput
  391 + {
  392 + /// <summary>
  393 + /// 业务主键
  394 + /// </summary>
  395 + public string BizId { get; set; }
  396 +
  397 + /// <summary>
  398 + /// 业务类型:Billing / Consume
  399 + /// </summary>
  400 + public string BizType { get; set; }
  401 +
  402 + /// <summary>
  403 + /// 业务类型名称
  404 + /// </summary>
  405 + public string BizTypeName { get; set; }
  406 +
  407 + /// <summary>
  408 + /// 业务时间
  409 + /// </summary>
  410 + public DateTime BizTime { get; set; }
  411 +
  412 + /// <summary>
  413 + /// 金额
  414 + /// </summary>
  415 + public decimal Amount { get; set; }
  416 +
  417 + /// <summary>
  418 + /// 当日序号(从1开始)
  419 + /// </summary>
  420 + public int DaySequence { get; set; }
  421 +
  422 + /// <summary>
  423 + /// 是否当日首笔
  424 + /// </summary>
  425 + public bool IsFirst { get; set; }
  426 +
  427 + /// <summary>
  428 + /// 是否当前审计行
  429 + /// </summary>
  430 + public bool IsCurrent { get; set; }
  431 +
  432 + /// <summary>
  433 + /// 操作人ID(开单 CreateUser / 耗卡 Czry)
  434 + /// </summary>
  435 + public string OperatorId { get; set; }
333 436 }
334 437 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEmployeeProfile/LqEmployeeProfileInfoOutput.cs
... ... @@ -108,6 +108,26 @@ namespace NCC.Extend.Entitys.Dto.LqEmployeeProfile
108 108 public string bankCardNoMasked { get; set; }
109 109  
110 110 /// <summary>
  111 + /// 开户实名
  112 + /// </summary>
  113 + public string bankAccountName { get; set; }
  114 +
  115 + /// <summary>
  116 + /// 身份证地址
  117 + /// </summary>
  118 + public string idCardAddress { get; set; }
  119 +
  120 + /// <summary>
  121 + /// 身份证正面照片 URL
  122 + /// </summary>
  123 + public string idCardFrontUrl { get; set; }
  124 +
  125 + /// <summary>
  126 + /// 身份证反面照片 URL
  127 + /// </summary>
  128 + public string idCardBackUrl { get; set; }
  129 +
  130 + /// <summary>
111 131 /// 毕业院校
112 132 /// </summary>
113 133 public string graduateSchool { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEmployeeProfile/LqEmployeeProfileSaveInput.cs
... ... @@ -73,6 +73,26 @@ namespace NCC.Extend.Entitys.Dto.LqEmployeeProfile
73 73 public string bankCardNo { get; set; }
74 74  
75 75 /// <summary>
  76 + /// 开户实名(开户人真实姓名)
  77 + /// </summary>
  78 + public string bankAccountName { get; set; }
  79 +
  80 + /// <summary>
  81 + /// 身份证地址(完整地址,独立于籍贯)
  82 + /// </summary>
  83 + public string idCardAddress { get; set; }
  84 +
  85 + /// <summary>
  86 + /// 身份证正面照片 URL
  87 + /// </summary>
  88 + public string idCardFrontUrl { get; set; }
  89 +
  90 + /// <summary>
  91 + /// 身份证反面照片 URL
  92 + /// </summary>
  93 + public string idCardBackUrl { get; set; }
  94 +
  95 + /// <summary>
76 96 /// 毕业院校
77 97 /// </summary>
78 98 public string graduateSchool { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEmployeeProfileSubmission/LqEmployeeProfileSubmissionCrInput.cs
... ... @@ -163,6 +163,26 @@ namespace NCC.Extend.Entitys.Dto.LqEmployeeProfileSubmission
163 163 public string bankCardNo { get; set; }
164 164  
165 165 /// <summary>
  166 + /// 开户实名(开户人真实姓名)
  167 + /// </summary>
  168 + public string bankAccountName { get; set; }
  169 +
  170 + /// <summary>
  171 + /// 身份证地址(完整地址,独立于籍贯)
  172 + /// </summary>
  173 + public string idCardAddress { get; set; }
  174 +
  175 + /// <summary>
  176 + /// 身份证正面照片 URL
  177 + /// </summary>
  178 + public string idCardFrontUrl { get; set; }
  179 +
  180 + /// <summary>
  181 + /// 身份证反面照片 URL
  182 + /// </summary>
  183 + public string idCardBackUrl { get; set; }
  184 +
  185 + /// <summary>
166 186 /// 毕业院校
167 187 /// </summary>
168 188 public string graduateSchool { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEmployeeProfileSubmission/LqEmployeeProfileSubmissionInfoOutput.cs
... ... @@ -223,6 +223,26 @@ namespace NCC.Extend.Entitys.Dto.LqEmployeeProfileSubmission
223 223 public string bankCardNoMasked { get; set; }
224 224  
225 225 /// <summary>
  226 + /// 开户实名
  227 + /// </summary>
  228 + public string bankAccountName { get; set; }
  229 +
  230 + /// <summary>
  231 + /// 身份证地址
  232 + /// </summary>
  233 + public string idCardAddress { get; set; }
  234 +
  235 + /// <summary>
  236 + /// 身份证正面照片 URL
  237 + /// </summary>
  238 + public string idCardFrontUrl { get; set; }
  239 +
  240 + /// <summary>
  241 + /// 身份证反面照片 URL
  242 + /// </summary>
  243 + public string idCardBackUrl { get; set; }
  244 +
  245 + /// <summary>
226 246 /// 毕业院校
227 247 /// </summary>
228 248 public string graduateSchool { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqEmployeeProfileSubmission/LqEmployeeProfileSubmissionPublicConfigOutput.cs
... ... @@ -18,6 +18,11 @@ namespace NCC.Extend.Entitys.Dto.LqEmployeeProfileSubmission
18 18 public List<string> requiredFields { get; set; }
19 19  
20 20 /// <summary>
  21 + /// 文化程度选项
  22 + /// </summary>
  23 + public List<string> educationOptions { get; set; }
  24 +
  25 + /// <summary>
21 26 /// 婚姻状况选项
22 27 /// </summary>
23 28 public List<EmployeeProfileEnumOption> maritalStatusOptions { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs
... ... @@ -112,5 +112,15 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
112 112 /// 仅转卡退卡(1=是,只返回 tkyy=转卡 的记录)
113 113 /// </summary>
114 114 public int? onlyTransferCard { get; set; }
  115 +
  116 + /// <summary>
  117 + /// 导出选中字段(逗号分隔)
  118 + /// </summary>
  119 + public string selectKey { get; set; }
  120 +
  121 + /// <summary>
  122 + /// 导出数据类型:0=当前页,1=全部
  123 + /// </summary>
  124 + public int dataType { get; set; }
115 125 }
116 126 }
117 127 \ No newline at end of file
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/RefundDetailListOutput.cs
... ... @@ -43,6 +43,11 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
43 43 public DateTime? refundTime { get; set; }
44 44  
45 45 /// <summary>
  46 + /// 类型(退卡原因):「转卡」表示转卡,其余视为退卡
  47 + /// </summary>
  48 + public string tkyy { get; set; }
  49 +
  50 + /// <summary>
46 51 /// 退卡品项ID
47 52 /// </summary>
48 53 public string itemId { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/StoreStatisticsListOutput.cs
... ... @@ -61,17 +61,22 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
61 61 public decimal VisitRate { get; set; }
62 62  
63 63 /// <summary>
64   - /// 开单数(全部数据,不要求链路)
  64 + /// 到店拓客中有成交开单的人数(整单业绩&gt;0,成交率分子,按会员ID去重)
  65 + /// </summary>
  66 + public int VisitBillingCount { get; set; }
  67 +
  68 + /// <summary>
  69 + /// 拓客开单人数(不要求邀约→预约链路;仅统计整单业绩&gt;0,按会员ID去重)
65 70 /// </summary>
66 71 public int TotalBillingCount { get; set; }
67 72  
68 73 /// <summary>
69   - /// 开单金额(全部数据,不要求链路)
  74 + /// 拓客开单金额汇总(不要求邀约→预约链路;仅统计整单业绩&gt;0)
70 75 /// </summary>
71 76 public decimal TotalBillingAmount { get; set; }
72 77  
73 78 /// <summary>
74   - /// 成交率(开单数/到店数,百分比)
  79 + /// 成交率(到店拓客中有金额开单人数/到店人数,百分比,≤100%)
75 80 /// </summary>
76 81 public decimal ConversionRate { get; set; }
77 82 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqUploadRecord/UploadRecordListQueryInput.cs
... ... @@ -27,5 +27,10 @@ namespace NCC.Extend.Entitys.Dto.LqUploadRecord
27 27 /// 结束时间
28 28 /// </summary>
29 29 public DateTime? endTime { get; set; }
  30 +
  31 + /// <summary>
  32 + /// 上传人用户 ID,不传则不过滤
  33 + /// </summary>
  34 + public string userId { get; set; }
30 35 }
31 36 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_employee_profile/LqEmployeeProfileEntity.cs
... ... @@ -96,6 +96,30 @@ namespace NCC.Extend.Entitys.lq_employee_profile
96 96 public string BankCardCipher { get; set; }
97 97  
98 98 /// <summary>
  99 + /// 开户实名(开户人真实姓名)
  100 + /// </summary>
  101 + [SugarColumn(ColumnName = "F_BankAccountName", ColumnDataType = "varchar(128)")]
  102 + public string BankAccountName { get; set; }
  103 +
  104 + /// <summary>
  105 + /// 身份证地址(完整地址,独立于籍贯)
  106 + /// </summary>
  107 + [SugarColumn(ColumnName = "F_IdCardAddress", ColumnDataType = "varchar(500)")]
  108 + public string IdCardAddress { get; set; }
  109 +
  110 + /// <summary>
  111 + /// 身份证正面照片 URL
  112 + /// </summary>
  113 + [SugarColumn(ColumnName = "F_IdCardFrontUrl", ColumnDataType = "varchar(500)")]
  114 + public string IdCardFrontUrl { get; set; }
  115 +
  116 + /// <summary>
  117 + /// 身份证反面照片 URL
  118 + /// </summary>
  119 + [SugarColumn(ColumnName = "F_IdCardBackUrl", ColumnDataType = "varchar(500)")]
  120 + public string IdCardBackUrl { get; set; }
  121 +
  122 + /// <summary>
99 123 /// 毕业院校
100 124 /// </summary>
101 125 [SugarColumn(ColumnName = "F_GraduateSchool", ColumnDataType = "varchar(200)")]
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_employee_profile_submission/LqEmployeeProfileSubmissionEntity.cs
... ... @@ -292,6 +292,30 @@ namespace NCC.Extend.Entitys.lq_employee_profile_submission
292 292 public string BankCardCipher { get; set; }
293 293  
294 294 /// <summary>
  295 + /// 开户实名(开户人真实姓名)
  296 + /// </summary>
  297 + [SugarColumn(ColumnName = "F_BankAccountName", ColumnDataType = "varchar(128)")]
  298 + public string BankAccountName { get; set; }
  299 +
  300 + /// <summary>
  301 + /// 身份证地址(完整地址,独立于籍贯)
  302 + /// </summary>
  303 + [SugarColumn(ColumnName = "F_IdCardAddress", ColumnDataType = "varchar(500)")]
  304 + public string IdCardAddress { get; set; }
  305 +
  306 + /// <summary>
  307 + /// 身份证正面照片 URL
  308 + /// </summary>
  309 + [SugarColumn(ColumnName = "F_IdCardFrontUrl", ColumnDataType = "varchar(500)")]
  310 + public string IdCardFrontUrl { get; set; }
  311 +
  312 + /// <summary>
  313 + /// 身份证反面照片 URL
  314 + /// </summary>
  315 + [SugarColumn(ColumnName = "F_IdCardBackUrl", ColumnDataType = "varchar(500)")]
  316 + public string IdCardBackUrl { get; set; }
  317 +
  318 + /// <summary>
295 319 /// 毕业院校
296 320 /// </summary>
297 321 [SugarColumn(ColumnName = "F_GraduateSchool", ColumnDataType = "varchar(200)")]
... ...
netcore/src/Modularity/Extend/NCC.Extend/EmployeeProfileSensitiveHelper.cs
... ... @@ -24,10 +24,23 @@ namespace NCC.Extend
24 24  
25 25 internal static readonly string[] PublicRequiredFields =
26 26 {
27   - "realName", "mobilePhone", "gender", "idCardNo",
  27 + "realName", "mobilePhone", "gender", "idCardNo", "education",
  28 + "currentAddress", "idCardAddress", "idCardFrontUrl", "idCardBackUrl",
  29 + "bankName", "bankCardNo", "bankAccountName",
28 30 "urgentContacts", "urgentTelePhone"
29 31 };
30 32  
  33 + /// <summary>文化程度合法取值白名单</summary>
  34 + internal static readonly string[] EducationLevels =
  35 + {
  36 + "博士", "硕士", "本科", "大专", "中专", "技校", "高中", "初中", "小学"
  37 + };
  38 +
  39 + private static readonly string[] FullAddressDetailKeywords =
  40 + {
  41 + "区", "县", "镇", "乡", "村", "路", "街", "道", "号", "弄", "栋", "单元", "室", "层", "楼", "组", "委", "队"
  42 + };
  43 +
31 44 internal static string NormalizeIdCard(string idCard)
32 45 {
33 46 return string.IsNullOrWhiteSpace(idCard) ? null : idCard.Trim().ToUpperInvariant();
... ... @@ -260,6 +273,62 @@ namespace NCC.Extend
260 273 return !value.HasValue || Enum.IsDefined(typeof(T), value.Value);
261 274 }
262 275  
  276 + internal static bool IsValidEducation(string education)
  277 + {
  278 + if (string.IsNullOrWhiteSpace(education))
  279 + {
  280 + return false;
  281 + }
  282 +
  283 + var trimmed = education.Trim();
  284 + return EducationLevels.Any(x => x == trimmed);
  285 + }
  286 +
  287 + internal static bool IsValidFullAddress(string address)
  288 + {
  289 + if (string.IsNullOrWhiteSpace(address))
  290 + {
  291 + return false;
  292 + }
  293 +
  294 + var trimmed = address.Trim();
  295 + if (trimmed.Length < 8)
  296 + {
  297 + return false;
  298 + }
  299 +
  300 + return FullAddressDetailKeywords.Any(trimmed.Contains);
  301 + }
  302 +
  303 + internal static bool IsValidHttpUrl(string url)
  304 + {
  305 + if (string.IsNullOrWhiteSpace(url))
  306 + {
  307 + return false;
  308 + }
  309 +
  310 + return Uri.TryCreate(url.Trim(), UriKind.Absolute, out var uri)
  311 + && (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps);
  312 + }
  313 +
  314 + /// <summary>入职日期 + 试用期月数自动推算转正日期;二者齐全时覆盖手工值。</summary>
  315 + internal static DateTime? CalcRegularizationDate(DateTime? entryDate, int? probationMonths)
  316 + {
  317 + if (!entryDate.HasValue || !probationMonths.HasValue)
  318 + {
  319 + return null;
  320 + }
  321 +
  322 + return entryDate.Value.Date.AddMonths(probationMonths.Value);
  323 + }
  324 +
  325 + internal static bool IsSamePhoneAfterNormalize(string phoneA, string phoneB)
  326 + {
  327 + var a = NormalizeMobile(phoneA);
  328 + var b = NormalizeMobile(phoneB);
  329 + return !string.IsNullOrEmpty(a) && a == b;
  330 + }
  331 +
263 332 internal static string GenerateSubmissionNo()
264 333 {
265 334 var rnd = new Random(Guid.NewGuid().GetHashCode()).Next(1000, 9999);
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqBusinessUnitDashboardService.Features.cs
... ... @@ -15,6 +15,8 @@ using NCC.Extend.Entitys.Dto.LqBusinessUnitDashboard;
15 15 using NCC.Extend.Entitys.Enum;
16 16 using NCC.Extend.Entitys.lq_hytk_hytk;
17 17 using NCC.Extend.Entitys.lq_kd_kdjlb;
  18 +using NCC.Extend.Entitys.lq_kd_pxmx;
  19 +using NCC.Extend.Entitys.lq_xh_pxmx;
18 20 using NCC.Extend.Entitys.lq_khxx;
19 21 using NCC.Extend.Entitys.lq_md_target;
20 22 using NCC.Extend.Entitys.lq_mdxx;
... ... @@ -378,6 +380,14 @@ namespace NCC.Extend
378 380 x.BizType.Equals(bizType, StringComparison.OrdinalIgnoreCase)).ToList();
379 381 }
380 382  
  383 + if (!string.IsNullOrWhiteSpace(input.ExceptionType))
  384 + {
  385 + var exceptionType = input.ExceptionType.Trim();
  386 + auditRows = auditRows.Where(x =>
  387 + !string.IsNullOrWhiteSpace(x.ExceptionType) &&
  388 + x.ExceptionType.Equals(exceptionType, StringComparison.OrdinalIgnoreCase)).ToList();
  389 + }
  390 +
381 391 var keyword = string.IsNullOrWhiteSpace(input.keyword) ? null : input.keyword.Trim();
382 392 if (keyword != null)
383 393 {
... ... @@ -580,6 +590,9 @@ namespace NCC.Extend
580 590 return (list, list.Count);
581 591 }
582 592  
  593 + /// <summary>
  594 + /// 构建重复充值审计行:异常开单/耗卡按短间隔连通簇合并为单行;未被簇覆盖的同日重复仍按原规则输出。
  595 + /// </summary>
583 596 private async Task<List<BusinessUnitDuplicateRechargeAuditListOutput>> BuildDuplicateRechargeAuditRowsAsync(
584 597 List<string> storeIds, DateTime startDate, DateTime endDateTime)
585 598 {
... ... @@ -604,7 +617,8 @@ namespace NCC.Extend
604 617 StoreId = bill.Djmd,
605 618 StoreName = store.Dm,
606 619 BizTime = bill.Kdrq.Value,
607   - Amount = bill.Sfyj
  620 + Amount = bill.Sfyj,
  621 + OperatorId = bill.CreateUser
608 622 })
609 623 .ToListAsync();
610 624  
... ... @@ -629,43 +643,391 @@ namespace NCC.Extend
629 643 StoreId = consume.Md,
630 644 StoreName = store.Dm,
631 645 BizTime = consume.Hksj.Value,
632   - Amount = consume.Xfje ?? 0m
  646 + Amount = consume.Xfje ?? 0m,
  647 + OperatorId = consume.Czry
633 648 })
634 649 .ToListAsync();
635 650  
  651 + // 品项内容指纹:用于判定「内容一样」的重复开单/耗卡
  652 + await FillDuplicateRechargeContentKeysAsync(billingRows, consumeRows);
  653 +
636 654 var grouped = billingRows.Concat(consumeRows)
637 655 .GroupBy(x => new { x.MemberId, BizDate = x.BizTime.Date })
638 656 .Where(g => g.Count() >= 2);
639 657  
640 658 var result = new List<BusinessUnitDuplicateRechargeAuditListOutput>();
  659 + // 短时间同金额同操作人同内容:默认 3 分钟,优先判定为异常开单/异常耗卡(疑似卡顿重复提交)
  660 + const int shortIntervalMinutes = 3;
  661 + const decimal amountEpsilon = 0.01m;
  662 +
641 663 foreach (var group in grouped)
642 664 {
643 665 var ordered = group.OrderBy(x => x.BizTime).ThenBy(x => x.BizId).ToList();
644 666 var dayTotal = ordered.Count;
645   - for (var i = 1; i < ordered.Count; i++)
  667 +
  668 + var coveredBizIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
  669 + var billingOrdered = ordered
  670 + .Where(x => x.BizType == nameof(DuplicateRechargeBizType.Billing))
  671 + .ToList();
  672 + var consumeOrdered = ordered
  673 + .Where(x => x.BizType == nameof(DuplicateRechargeBizType.Consume))
  674 + .ToList();
  675 +
  676 + // 异常开单/耗卡:金额>0,短间隔同金额同操作人同内容,合并为单行
  677 + var shortIntervalClusters = BuildDuplicateRechargeShortIntervalClusters(
  678 + billingOrdered, shortIntervalMinutes, amountEpsilon)
  679 + .Concat(BuildDuplicateRechargeShortIntervalClusters(
  680 + consumeOrdered, shortIntervalMinutes, amountEpsilon));
  681 +
  682 + foreach (var cluster in shortIntervalClusters)
646 683 {
647   - var row = ordered[i];
  684 + foreach (var item in cluster)
  685 + coveredBizIds.Add(item.BizId);
  686 +
  687 + var clusterOrdered = cluster
  688 + .OrderBy(x => x.BizTime)
  689 + .ThenBy(x => x.BizId)
  690 + .ToList();
  691 + var mainRow = clusterOrdered[clusterOrdered.Count - 1];
  692 + var clusterFirst = clusterOrdered[0];
  693 + var exceptionType = mainRow.BizType == nameof(DuplicateRechargeBizType.Billing)
  694 + ? "ShortIntervalSameAmountBilling"
  695 + : "ShortIntervalSameAmountConsume";
  696 + var exceptionTypeName = mainRow.BizType == nameof(DuplicateRechargeBizType.Billing)
  697 + ? "异常开单"
  698 + : "异常耗卡";
  699 +
  700 + var clusterRelatedList = clusterOrdered.Select((x, idx) =>
  701 + new BusinessUnitDuplicateRechargeRelatedBizOutput
  702 + {
  703 + BizId = x.BizId,
  704 + BizType = x.BizType,
  705 + BizTypeName = x.BizTypeName,
  706 + BizTime = x.BizTime,
  707 + Amount = x.Amount,
  708 + DaySequence = idx + 1,
  709 + IsFirst = idx == 0,
  710 + IsCurrent = x.BizId == mainRow.BizId,
  711 + OperatorId = x.OperatorId
  712 + }).ToList();
  713 +
648 714 result.Add(new BusinessUnitDuplicateRechargeAuditListOutput
649 715 {
650   - BizId = row.BizId,
651   - BizType = row.BizType,
652   - BizTypeName = row.BizTypeName,
653   - MemberId = row.MemberId,
654   - MemberName = string.IsNullOrWhiteSpace(row.MemberName) ? "无" : row.MemberName,
655   - StoreId = row.StoreId,
656   - StoreName = string.IsNullOrWhiteSpace(row.StoreName) ? "无" : row.StoreName,
657   - BizTime = row.BizTime,
658   - BizDate = row.BizTime.Date,
659   - Amount = row.Amount,
660   - DaySequence = i + 1,
661   - DayTotalCount = dayTotal
  716 + BizId = mainRow.BizId,
  717 + BizType = mainRow.BizType,
  718 + BizTypeName = mainRow.BizTypeName,
  719 + MemberId = mainRow.MemberId,
  720 + MemberName = string.IsNullOrWhiteSpace(mainRow.MemberName) ? "无" : mainRow.MemberName,
  721 + StoreId = mainRow.StoreId,
  722 + StoreName = string.IsNullOrWhiteSpace(mainRow.StoreName) ? "无" : mainRow.StoreName,
  723 + BizTime = mainRow.BizTime,
  724 + BizDate = mainRow.BizTime.Date,
  725 + Amount = mainRow.Amount,
  726 + DaySequence = clusterOrdered.Count,
  727 + DayTotalCount = dayTotal,
  728 + ExceptionType = exceptionType,
  729 + ExceptionTypeName = exceptionTypeName,
  730 + IsHighlight = true,
  731 + FirstBizId = clusterFirst.BizId,
  732 + FirstBizTypeName = clusterFirst.BizTypeName,
  733 + FirstBizTime = clusterFirst.BizTime,
  734 + FirstAmount = clusterFirst.Amount,
  735 + RelatedBizSummary = BuildShortIntervalClusterSummary(clusterOrdered),
  736 + RelatedBizList = clusterRelatedList
662 737 });
663 738 }
  739 +
  740 + // 同日重复:按类型各合并为 1 行,避免第2笔起逐条刷屏;类型优先级:同类型多笔 > 开单+耗卡
  741 + var uncoveredBilling = billingOrdered
  742 + .Where(x => !coveredBizIds.Contains(x.BizId))
  743 + .OrderBy(x => x.BizTime)
  744 + .ThenBy(x => x.BizId)
  745 + .ToList();
  746 + var uncoveredConsume = consumeOrdered
  747 + .Where(x => !coveredBizIds.Contains(x.BizId))
  748 + .OrderBy(x => x.BizTime)
  749 + .ThenBy(x => x.BizId)
  750 + .ToList();
  751 +
  752 + if (uncoveredBilling.Count >= 2)
  753 + {
  754 + result.Add(BuildSameDayAuditRow(
  755 + uncoveredBilling,
  756 + dayTotal,
  757 + "SameDayDuplicateBilling",
  758 + "同日重复开单"));
  759 + }
  760 +
  761 + if (uncoveredConsume.Count >= 2)
  762 + {
  763 + result.Add(BuildSameDayAuditRow(
  764 + uncoveredConsume,
  765 + dayTotal,
  766 + "SameDayDuplicateConsume",
  767 + "同日重复耗卡"));
  768 + }
  769 +
  770 + // 说明:不再自动产出「同日开单+耗卡」。
  771 + // 一开一耗是门店常态,计入审计会严重刷屏并淹没真正的同类型重复/卡顿重复提交。
  772 + }
  773 +
  774 + return result;
  775 + }
  776 +
  777 + /// <summary>
  778 + /// 构建同日重复/混合审计行(同组合并为单行,RelatedBizList 仅含本组单据)。
  779 + /// </summary>
  780 + private static BusinessUnitDuplicateRechargeAuditListOutput BuildSameDayAuditRow(
  781 + IReadOnlyList<DuplicateRechargeRawRow> groupOrdered,
  782 + int dayTotal,
  783 + string exceptionType,
  784 + string exceptionTypeName)
  785 + {
  786 + var mainRow = groupOrdered[groupOrdered.Count - 1];
  787 + var first = groupOrdered[0];
  788 + var relatedList = groupOrdered.Select((x, idx) =>
  789 + new BusinessUnitDuplicateRechargeRelatedBizOutput
  790 + {
  791 + BizId = x.BizId,
  792 + BizType = x.BizType,
  793 + BizTypeName = x.BizTypeName,
  794 + BizTime = x.BizTime,
  795 + Amount = x.Amount,
  796 + DaySequence = idx + 1,
  797 + IsFirst = idx == 0,
  798 + IsCurrent = x.BizId == mainRow.BizId,
  799 + OperatorId = x.OperatorId
  800 + }).ToList();
  801 +
  802 + var relatedSummary = string.Join(";", groupOrdered.Select((x, idx) =>
  803 + $"第{idx + 1}笔[{x.BizTypeName}] {x.BizId} ¥{x.Amount:0.##} {x.BizTime:HH:mm:ss}"));
  804 +
  805 + return new BusinessUnitDuplicateRechargeAuditListOutput
  806 + {
  807 + BizId = mainRow.BizId,
  808 + BizType = mainRow.BizType,
  809 + BizTypeName = mainRow.BizTypeName,
  810 + MemberId = mainRow.MemberId,
  811 + MemberName = string.IsNullOrWhiteSpace(mainRow.MemberName) ? "无" : mainRow.MemberName,
  812 + StoreId = mainRow.StoreId,
  813 + StoreName = string.IsNullOrWhiteSpace(mainRow.StoreName) ? "无" : mainRow.StoreName,
  814 + BizTime = mainRow.BizTime,
  815 + BizDate = mainRow.BizTime.Date,
  816 + Amount = mainRow.Amount,
  817 + DaySequence = groupOrdered.Count,
  818 + DayTotalCount = dayTotal,
  819 + ExceptionType = exceptionType,
  820 + ExceptionTypeName = exceptionTypeName,
  821 + IsHighlight = false,
  822 + FirstBizId = first.BizId,
  823 + FirstBizTypeName = first.BizTypeName,
  824 + FirstBizTime = first.BizTime,
  825 + FirstAmount = first.Amount,
  826 + RelatedBizSummary = relatedSummary,
  827 + RelatedBizList = relatedList
  828 + };
  829 + }
  830 +
  831 + /// <summary>
  832 + /// 按短间隔同金额同操作人同内容构建连通簇(开单/耗卡分别建簇,簇大小≥2)。
  833 + /// 先按操作人+内容指纹+金额分桶,再在桶内按时间间隔做连通,避免不同金额混入同组。
  834 + /// </summary>
  835 + private static List<List<DuplicateRechargeRawRow>> BuildDuplicateRechargeShortIntervalClusters(
  836 + IReadOnlyList<DuplicateRechargeRawRow> sameTypeOrdered,
  837 + int shortIntervalMinutes,
  838 + decimal amountEpsilon)
  839 + {
  840 + if (sameTypeOrdered == null || sameTypeOrdered.Count < 2)
  841 + return new List<List<DuplicateRechargeRawRow>>();
  842 +
  843 + var result = new List<List<DuplicateRechargeRawRow>>();
  844 + var buckets = sameTypeOrdered
  845 + .Where(x =>
  846 + x.Amount > 0m &&
  847 + !string.IsNullOrWhiteSpace(x.OperatorId) &&
  848 + !string.IsNullOrWhiteSpace(x.ContentKey))
  849 + .GroupBy(x => new
  850 + {
  851 + OperatorId = (x.OperatorId ?? string.Empty).Trim().ToLowerInvariant(),
  852 + ContentKey = x.ContentKey ?? string.Empty,
  853 + // 金额分桶:先按分取整,再在桶内用 epsilon 校验,杜绝不同金额进同一簇
  854 + AmountBucket = Math.Round(x.Amount, 2, MidpointRounding.AwayFromZero)
  855 + });
  856 +
  857 + foreach (var bucket in buckets)
  858 + {
  859 + var ordered = bucket
  860 + .OrderBy(x => x.BizTime)
  861 + .ThenBy(x => x.BizId)
  862 + .ToList();
  863 + if (ordered.Count < 2) continue;
  864 +
  865 + // 桶内再按 epsilon 拆成严格同金额子组(防止四舍五入边界误合)
  866 + var amountGroups = new List<List<DuplicateRechargeRawRow>>();
  867 + foreach (var row in ordered)
  868 + {
  869 + var matched = amountGroups.FirstOrDefault(g =>
  870 + IsDuplicateRechargeSameAmount(g[0].Amount, row.Amount, amountEpsilon));
  871 + if (matched != null) matched.Add(row);
  872 + else amountGroups.Add(new List<DuplicateRechargeRawRow> { row });
  873 + }
  874 +
  875 + foreach (var amountGroup in amountGroups)
  876 + {
  877 + if (amountGroup.Count < 2) continue;
  878 + result.AddRange(BuildShortIntervalClustersByTime(amountGroup, shortIntervalMinutes));
  879 + }
664 880 }
665 881  
666 882 return result;
667 883 }
668 884  
  885 + /// <summary>
  886 + /// 同一金额/操作人/内容下,按时间间隔≤N分钟做连通簇。
  887 + /// </summary>
  888 + private static List<List<DuplicateRechargeRawRow>> BuildShortIntervalClustersByTime(
  889 + IReadOnlyList<DuplicateRechargeRawRow> sameAmountOrdered,
  890 + int shortIntervalMinutes)
  891 + {
  892 + var count = sameAmountOrdered.Count;
  893 + if (count < 2) return new List<List<DuplicateRechargeRawRow>>();
  894 +
  895 + var parent = Enumerable.Range(0, count).ToArray();
  896 + int Find(int x)
  897 + {
  898 + while (parent[x] != x)
  899 + {
  900 + parent[x] = parent[parent[x]];
  901 + x = parent[x];
  902 + }
  903 +
  904 + return x;
  905 + }
  906 +
  907 + void Union(int a, int b)
  908 + {
  909 + var rootA = Find(a);
  910 + var rootB = Find(b);
  911 + if (rootA != rootB) parent[rootB] = rootA;
  912 + }
  913 +
  914 + for (var i = 0; i < count; i++)
  915 + {
  916 + for (var j = i + 1; j < count; j++)
  917 + {
  918 + if ((sameAmountOrdered[j].BizTime - sameAmountOrdered[i].BizTime).TotalMinutes >
  919 + shortIntervalMinutes)
  920 + break;
  921 + Union(i, j);
  922 + }
  923 + }
  924 +
  925 + return parent
  926 + .Select((_, idx) => idx)
  927 + .GroupBy(Find)
  928 + .Where(g => g.Count() >= 2)
  929 + .Select(g => g
  930 + .OrderBy(idx => sameAmountOrdered[idx].BizTime)
  931 + .ThenBy(idx => sameAmountOrdered[idx].BizId)
  932 + .Select(idx => sameAmountOrdered[idx])
  933 + .ToList())
  934 + .ToList();
  935 + }
  936 +
  937 + private static string BuildShortIntervalClusterSummary(IReadOnlyList<DuplicateRechargeRawRow> clusterOrdered)
  938 + {
  939 + if (clusterOrdered == null || clusterOrdered.Count < 2) return string.Empty;
  940 +
  941 + var parts = new List<string> { $"共{clusterOrdered.Count}笔相同内容疑似重复提交" };
  942 + for (var i = 0; i < clusterOrdered.Count; i++)
  943 + {
  944 + var current = clusterOrdered[i];
  945 + var segment =
  946 + $"[{current.BizTypeName}] {current.BizId} ¥{current.Amount:0.##} {current.BizTime:HH:mm:ss}";
  947 + if (i > 0)
  948 + {
  949 + var previous = clusterOrdered[i - 1];
  950 + segment += $"(距上一笔 {(current.BizTime - previous.BizTime).TotalSeconds:0} 秒)";
  951 + }
  952 +
  953 + parts.Add(segment);
  954 + }
  955 +
  956 + return string.Join(";", parts);
  957 + }
  958 +
  959 + /// <summary>
  960 + /// 批量填充开单/耗卡品项内容指纹(品项+次数+金额)
  961 + /// </summary>
  962 + private async Task FillDuplicateRechargeContentKeysAsync(
  963 + List<DuplicateRechargeRawRow> billingRows,
  964 + List<DuplicateRechargeRawRow> consumeRows)
  965 + {
  966 + var billingIds = billingRows.Select(x => x.BizId).Where(x => !string.IsNullOrWhiteSpace(x)).Distinct().ToList();
  967 + if (billingIds.Any())
  968 + {
  969 + var billingItems = await _db.Queryable<LqKdPxmxEntity>()
  970 + .Where(x => billingIds.Contains(x.Glkdbh) && x.IsEffective == 1)
  971 + .Select(x => new { x.Glkdbh, x.Px, x.ProjectNumber, x.ActualPrice })
  972 + .ToListAsync();
  973 + var billingMap = billingItems
  974 + .GroupBy(x => x.Glkdbh)
  975 + .ToDictionary(
  976 + g => g.Key,
  977 + g => string.Join("|", g.OrderBy(i => i.Px)
  978 + .ThenBy(i => i.ProjectNumber)
  979 + .ThenBy(i => i.ActualPrice)
  980 + .Select(i => $"{i.Px}:{i.ProjectNumber:0.####}:{i.ActualPrice:0.####}")));
  981 + foreach (var row in billingRows)
  982 + {
  983 + row.ContentKey = billingMap.TryGetValue(row.BizId, out var key) ? key : string.Empty;
  984 + }
  985 + }
  986 +
  987 + var consumeIds = consumeRows.Select(x => x.BizId).Where(x => !string.IsNullOrWhiteSpace(x)).Distinct().ToList();
  988 + if (consumeIds.Any())
  989 + {
  990 + var consumeItems = await _db.Queryable<LqXhPxmxEntity>()
  991 + .Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == 1)
  992 + .Select(x => new { x.ConsumeInfoId, x.Px, x.ProjectNumber, x.TotalPrice })
  993 + .ToListAsync();
  994 + var consumeMap = consumeItems
  995 + .GroupBy(x => x.ConsumeInfoId)
  996 + .ToDictionary(
  997 + g => g.Key,
  998 + g => string.Join("|", g.OrderBy(i => i.Px)
  999 + .ThenBy(i => i.ProjectNumber)
  1000 + .ThenBy(i => i.TotalPrice)
  1001 + .Select(i => $"{i.Px}:{i.ProjectNumber:0.####}:{i.TotalPrice:0.####}")));
  1002 + foreach (var row in consumeRows)
  1003 + {
  1004 + row.ContentKey = consumeMap.TryGetValue(row.BizId, out var key) ? key : string.Empty;
  1005 + }
  1006 + }
  1007 + }
  1008 +
  1009 + private static bool IsDuplicateRechargeSameAmount(decimal a, decimal b, decimal epsilon)
  1010 + {
  1011 + return Math.Abs(a - b) < epsilon;
  1012 + }
  1013 +
  1014 + private static bool IsDuplicateRechargeSameOperator(string a, string b)
  1015 + {
  1016 + var left = (a ?? string.Empty).Trim();
  1017 + var right = (b ?? string.Empty).Trim();
  1018 + if (string.IsNullOrEmpty(left) || string.IsNullOrEmpty(right)) return false;
  1019 + return string.Equals(left, right, StringComparison.OrdinalIgnoreCase);
  1020 + }
  1021 +
  1022 + private static bool IsDuplicateRechargeSameContent(string a, string b)
  1023 + {
  1024 + var left = a ?? string.Empty;
  1025 + var right = b ?? string.Empty;
  1026 + // 两边都无明细时,不因「空内容相同」误判为异常重复
  1027 + if (string.IsNullOrWhiteSpace(left) || string.IsNullOrWhiteSpace(right)) return false;
  1028 + return string.Equals(left, right, StringComparison.Ordinal);
  1029 + }
  1030 +
669 1031 private async Task<dynamic> ExportCapabilityDataAsync<T>(
670 1032 List<T> exportData,
671 1033 string actionCode,
... ... @@ -755,6 +1117,10 @@ namespace NCC.Extend
755 1117 public string StoreName { get; set; }
756 1118 public DateTime BizTime { get; set; }
757 1119 public decimal Amount { get; set; }
  1120 + /// <summary>操作人(开单 CreateUser / 耗卡 Czry)</summary>
  1121 + public string OperatorId { get; set; }
  1122 + /// <summary>品项内容指纹(品项+次数+金额)</summary>
  1123 + public string ContentKey { get; set; }
758 1124 }
759 1125  
760 1126 private class StoreRankingMetricsRow
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqEmployeeProfileService.cs
... ... @@ -115,8 +115,6 @@ namespace NCC.Extend
115 115 throw NCCException.Oh("userId 不能为空");
116 116 }
117 117  
118   - ValidateSaveInput(input);
119   -
120 118 var user = await _db.Queryable<UserEntity>()
121 119 .Where(x => x.Id == input.userId && x.DeleteMark == null)
122 120 .FirstAsync();
... ... @@ -130,6 +128,15 @@ namespace NCC.Extend
130 128 .Where(x => x.UserId == input.userId)
131 129 .FirstAsync();
132 130  
  131 + ValidateSaveInput(input, existing?.BankCardCipher);
  132 +
  133 + var autoRegularizationDate = EmployeeProfileSensitiveHelper.CalcRegularizationDate(
  134 + user.EntryDate, input.probationMonths);
  135 + if (autoRegularizationDate.HasValue)
  136 + {
  137 + input.regularizationDate = autoRegularizationDate;
  138 + }
  139 +
133 140 if (!string.IsNullOrWhiteSpace(input.employeeNo))
134 141 {
135 142 var dup = await _db.Queryable<LqEmployeeProfileEntity>()
... ... @@ -199,7 +206,7 @@ namespace NCC.Extend
199 206 }
200 207 }
201 208  
202   - private static void ValidateSaveInput(LqEmployeeProfileSaveInput input)
  209 + private static void ValidateSaveInput(LqEmployeeProfileSaveInput input, string existingBankCipher = null)
203 210 {
204 211 if (!EmployeeProfileSensitiveHelper.IsEnumDefined<EmployeeMaritalStatusEnum>(input.maritalStatus))
205 212 {
... ... @@ -236,6 +243,43 @@ namespace NCC.Extend
236 243 throw NCCException.Oh("招聘类型枚举无效");
237 244 }
238 245  
  246 + if (string.IsNullOrWhiteSpace(input.currentAddress))
  247 + {
  248 + throw NCCException.Oh("现居住地址不能为空");
  249 + }
  250 +
  251 + if (!EmployeeProfileSensitiveHelper.IsValidFullAddress(input.idCardAddress))
  252 + {
  253 + throw NCCException.Oh("身份证地址不能为空,且须填写完整地址(含区/县/街道/门牌等详细信息)");
  254 + }
  255 +
  256 + if (!EmployeeProfileSensitiveHelper.IsValidHttpUrl(input.idCardFrontUrl))
  257 + {
  258 + throw NCCException.Oh("身份证正面照片不能为空且须为有效 URL");
  259 + }
  260 +
  261 + if (!EmployeeProfileSensitiveHelper.IsValidHttpUrl(input.idCardBackUrl))
  262 + {
  263 + throw NCCException.Oh("身份证反面照片不能为空且须为有效 URL");
  264 + }
  265 +
  266 + if (string.IsNullOrWhiteSpace(input.bankName))
  267 + {
  268 + throw NCCException.Oh("开户行不能为空");
  269 + }
  270 +
  271 + if (string.IsNullOrWhiteSpace(input.bankAccountName))
  272 + {
  273 + throw NCCException.Oh("开户实名不能为空");
  274 + }
  275 +
  276 + var hasBankCard = !string.IsNullOrWhiteSpace(input.bankCardNo)
  277 + || !string.IsNullOrWhiteSpace(existingBankCipher);
  278 + if (!hasBankCard)
  279 + {
  280 + throw NCCException.Oh("银行卡号不能为空");
  281 + }
  282 +
239 283 if (!string.IsNullOrWhiteSpace(input.bankCardNo)
240 284 && !EmployeeProfileSensitiveHelper.IsValidBankCard(input.bankCardNo))
241 285 {
... ... @@ -268,6 +312,10 @@ namespace NCC.Extend
268 312 entity.RegularizationDate = input.regularizationDate?.Date;
269 313 entity.RecruitmentType = input.recruitmentType;
270 314 entity.BankName = input.bankName?.Trim();
  315 + entity.BankAccountName = input.bankAccountName?.Trim();
  316 + entity.IdCardAddress = input.idCardAddress?.Trim();
  317 + entity.IdCardFrontUrl = input.idCardFrontUrl?.Trim();
  318 + entity.IdCardBackUrl = input.idCardBackUrl?.Trim();
271 319 if (!string.IsNullOrWhiteSpace(input.bankCardNo))
272 320 {
273 321 entity.BankCardCipher = EmployeeProfileSensitiveHelper.EncryptSensitive(
... ... @@ -307,7 +355,9 @@ namespace NCC.Extend
307 355 entity.EmployeeType,
308 356 entity.EmployeeStatus,
309 357 entity.BankName,
  358 + entity.BankAccountName,
310 359 bankCardNoMasked = EmployeeProfileSensitiveHelper.MaskBankCard(bankPlain),
  360 + entity.IdCardAddress,
311 361 entity.GraduateSchool,
312 362 entity.Major
313 363 };
... ... @@ -360,6 +410,10 @@ namespace NCC.Extend
360 410 output.recruitmentTypeName = profile.RecruitmentType.HasValue
361 411 ? EnumHelper.GetEnumDesc<EmployeeRecruitmentTypeEnum>(profile.RecruitmentType.Value) : null;
362 412 output.bankName = profile.BankName;
  413 + output.bankAccountName = profile.BankAccountName;
  414 + output.idCardAddress = profile.IdCardAddress;
  415 + output.idCardFrontUrl = profile.IdCardFrontUrl;
  416 + output.idCardBackUrl = profile.IdCardBackUrl;
363 417 output.graduateSchool = profile.GraduateSchool;
364 418 output.enrollmentDate = profile.EnrollmentDate;
365 419 output.graduationDate = profile.GraduationDate;
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqEmployeeProfileSubmissionService.cs
... ... @@ -120,6 +120,7 @@ namespace NCC.Extend
120 120 {
121 121 certificatesTypeName = "身份证",
122 122 requiredFields = EmployeeProfileSensitiveHelper.PublicRequiredFields.ToList(),
  123 + educationOptions = EmployeeProfileSensitiveHelper.EducationLevels.ToList(),
123 124 maritalStatusOptions = BuildEnumOptions<EmployeeMaritalStatusEnum>(),
124 125 politicalStatusOptions = BuildEnumOptions<EmployeePoliticalStatusEnum>(),
125 126 householdTypeOptions = BuildEnumOptions<EmployeeHouseholdTypeEnum>(),
... ... @@ -292,20 +293,25 @@ namespace NCC.Extend
292 293 /// 获取扫码入职申请详情(敏感字段默认脱敏)
293 294 /// </summary>
294 295 /// <remarks>
295   - /// showTail4=true 时身份证/银行卡/手机号仅展示后 4 位供审核比对,仍不返回完整明文。
  296 + /// 人事审核弹窗传 revealSensitive=true 返回手机号/身份证完整明文(需组织权限);
  297 + /// showTail4=true 时仅展示后 4 位;二者都不传则常规脱敏。
296 298 /// </remarks>
297 299 /// <param name="id">申请 ID</param>
298 300 /// <param name="showTail4">是否展示后 4 位(审核比对)</param>
  301 + /// <param name="revealSensitive">是否返回手机号/身份证完整明文(人事审核)</param>
299 302 /// <returns>详情</returns>
300 303 /// <response code="200">成功</response>
301 304 /// <response code="400">记录不存在</response>
302 305 /// <response code="500">服务器错误</response>
303 306 [HttpGet("GetInfo")]
304   - public async Task<LqEmployeeProfileSubmissionInfoOutput> GetInfoAsync([FromQuery] string id, [FromQuery] bool showTail4 = false)
  307 + public async Task<LqEmployeeProfileSubmissionInfoOutput> GetInfoAsync(
  308 + [FromQuery] string id,
  309 + [FromQuery] bool showTail4 = false,
  310 + [FromQuery] bool revealSensitive = false)
305 311 {
306 312 var entity = await GetSubmissionOrThrowAsync(id);
307 313 await EnsureCanEditOrganizeAsync(entity.OrganizeId);
308   - return MapInfoOutput(entity, showTail4);
  314 + return MapInfoOutput(entity, showTail4, revealSensitive);
309 315 }
310 316  
311 317 /// <summary>
... ... @@ -681,6 +687,51 @@ namespace NCC.Extend
681 687 throw NCCException.Oh("紧急联系人电话格式不正确");
682 688 }
683 689  
  690 + if (EmployeeProfileSensitiveHelper.IsSamePhoneAfterNormalize(input.mobilePhone, input.urgentTelePhone))
  691 + {
  692 + throw NCCException.Oh("紧急联系人电话不能与员工手机号相同");
  693 + }
  694 +
  695 + if (!EmployeeProfileSensitiveHelper.IsValidEducation(input.education))
  696 + {
  697 + throw NCCException.Oh("文化程度取值无效,请选择:博士、硕士、本科、大专、中专、技校、高中、初中、小学");
  698 + }
  699 +
  700 + if (string.IsNullOrWhiteSpace(input.currentAddress))
  701 + {
  702 + throw NCCException.Oh("现居住地址不能为空");
  703 + }
  704 +
  705 + if (!EmployeeProfileSensitiveHelper.IsValidFullAddress(input.idCardAddress))
  706 + {
  707 + throw NCCException.Oh("身份证地址不能为空,且须填写完整地址(含区/县/街道/门牌等详细信息)");
  708 + }
  709 +
  710 + if (!EmployeeProfileSensitiveHelper.IsValidHttpUrl(input.idCardFrontUrl))
  711 + {
  712 + throw NCCException.Oh("身份证正面照片不能为空且须为有效 URL");
  713 + }
  714 +
  715 + if (!EmployeeProfileSensitiveHelper.IsValidHttpUrl(input.idCardBackUrl))
  716 + {
  717 + throw NCCException.Oh("身份证反面照片不能为空且须为有效 URL");
  718 + }
  719 +
  720 + if (string.IsNullOrWhiteSpace(input.bankName))
  721 + {
  722 + throw NCCException.Oh("开户行不能为空");
  723 + }
  724 +
  725 + if (string.IsNullOrWhiteSpace(input.bankCardNo))
  726 + {
  727 + throw NCCException.Oh("银行卡号不能为空");
  728 + }
  729 +
  730 + if (string.IsNullOrWhiteSpace(input.bankAccountName))
  731 + {
  732 + throw NCCException.Oh("开户实名不能为空");
  733 + }
  734 +
684 735 if (!EmployeeProfileSensitiveHelper.IsEnumDefined<EmployeeMaritalStatusEnum>(input.maritalStatus))
685 736 {
686 737 throw NCCException.Oh("婚姻状况枚举无效");
... ... @@ -722,6 +773,13 @@ namespace NCC.Extend
722 773 throw NCCException.Oh("银行卡号格式不正确");
723 774 }
724 775  
  776 + var autoRegularizationDate = EmployeeProfileSensitiveHelper.CalcRegularizationDate(
  777 + input.entryDate, input.probationMonths);
  778 + if (autoRegularizationDate.HasValue)
  779 + {
  780 + input.regularizationDate = autoRegularizationDate;
  781 + }
  782 +
725 783 if (input.birthday.HasValue)
726 784 {
727 785 var idBirth = EmployeeProfileSensitiveHelper.ParseBirthdayFromIdCard(idCard);
... ... @@ -827,13 +885,18 @@ namespace NCC.Extend
827 885 EmployeeType = input.employeeType,
828 886 EmployeeStatus = input.employeeStatus,
829 887 ProbationMonths = input.probationMonths,
830   - RegularizationDate = input.regularizationDate?.Date,
  888 + RegularizationDate = EmployeeProfileSensitiveHelper.CalcRegularizationDate(input.entryDate, input.probationMonths)
  889 + ?? input.regularizationDate?.Date,
831 890 RecruitmentType = input.recruitmentType,
832 891 BankName = input.bankName?.Trim(),
833 892 BankCardCipher = string.IsNullOrWhiteSpace(input.bankCardNo)
834 893 ? null
835 894 : EmployeeProfileSensitiveHelper.EncryptSensitive(
836 895 EmployeeProfileSensitiveHelper.NormalizeBankCard(input.bankCardNo)),
  896 + BankAccountName = input.bankAccountName?.Trim(),
  897 + IdCardAddress = input.idCardAddress?.Trim(),
  898 + IdCardFrontUrl = input.idCardFrontUrl?.Trim(),
  899 + IdCardBackUrl = input.idCardBackUrl?.Trim(),
837 900 GraduateSchool = input.graduateSchool?.Trim(),
838 901 EnrollmentDate = input.enrollmentDate?.Date,
839 902 GraduationDate = input.graduationDate?.Date,
... ... @@ -864,18 +927,27 @@ namespace NCC.Extend
864 927 return snapshot.ToString(Formatting.None);
865 928 }
866 929  
867   - private static LqEmployeeProfileSubmissionInfoOutput MapInfoOutput(LqEmployeeProfileSubmissionEntity entity, bool showTail4)
  930 + private static LqEmployeeProfileSubmissionInfoOutput MapInfoOutput(
  931 + LqEmployeeProfileSubmissionEntity entity,
  932 + bool showTail4,
  933 + bool revealSensitive = false)
868 934 {
869 935 var idPlain = EmployeeProfileSensitiveHelper.DecryptSensitive(entity.IdCardCipher);
870 936 var bankPlain = EmployeeProfileSensitiveHelper.DecryptSensitive(entity.BankCardCipher);
871 937  
872   - string MaskSensitive(string plain, Func<string, string> defaultMask)
  938 + string MaskSensitive(string plain, Func<string, string> defaultMask, bool allowReveal)
873 939 {
874 940 if (string.IsNullOrWhiteSpace(plain))
875 941 {
876 942 return "无";
877 943 }
878 944  
  945 + // 人事审核:手机号/身份证返回完整明文
  946 + if (allowReveal && revealSensitive)
  947 + {
  948 + return plain.Trim();
  949 + }
  950 +
879 951 return showTail4 ? EmployeeProfileSensitiveHelper.MaskTail4(plain) : defaultMask(plain);
880 952 }
881 953  
... ... @@ -894,12 +966,12 @@ namespace NCC.Extend
894 966 submitIp = entity.SubmitIp,
895 967 submitTime = entity.SubmitTime,
896 968 realName = entity.RealName,
897   - mobilePhoneMasked = MaskSensitive(entity.MobilePhone, EmployeeProfileSensitiveHelper.MaskPhone),
  969 + mobilePhoneMasked = MaskSensitive(entity.MobilePhone, EmployeeProfileSensitiveHelper.MaskPhone, allowReveal: true),
898 970 gender = entity.Gender,
899 971 birthday = entity.Birthday,
900 972 nation = entity.Nation,
901 973 nativePlace = entity.NativePlace,
902   - idCardNoMasked = MaskSensitive(idPlain, EmployeeProfileSensitiveHelper.MaskIdCard),
  974 + idCardNoMasked = MaskSensitive(idPlain, EmployeeProfileSensitiveHelper.MaskIdCard, allowReveal: true),
903 975 education = entity.Education,
904 976 entryDate = entity.EntryDate,
905 977 organizeId = entity.OrganizeId,
... ... @@ -923,7 +995,11 @@ namespace NCC.Extend
923 995 regularizationDate = entity.RegularizationDate,
924 996 recruitmentType = entity.RecruitmentType,
925 997 bankName = entity.BankName,
926   - bankCardNoMasked = MaskSensitive(bankPlain, EmployeeProfileSensitiveHelper.MaskBankCard),
  998 + bankCardNoMasked = MaskSensitive(bankPlain, EmployeeProfileSensitiveHelper.MaskBankCard, allowReveal: false),
  999 + bankAccountName = entity.BankAccountName,
  1000 + idCardAddress = entity.IdCardAddress,
  1001 + idCardFrontUrl = entity.IdCardFrontUrl,
  1002 + idCardBackUrl = entity.IdCardBackUrl,
927 1003 graduateSchool = entity.GraduateSchool,
928 1004 enrollmentDate = entity.EnrollmentDate,
929 1005 graduationDate = entity.GraduationDate,
... ... @@ -1052,6 +1128,13 @@ namespace NCC.Extend
1052 1128 submission.RegularizationDate = input.regularizationDate.Value.Date;
1053 1129 }
1054 1130  
  1131 + var autoRegularizationDate = EmployeeProfileSensitiveHelper.CalcRegularizationDate(
  1132 + submission.EntryDate, submission.ProbationMonths);
  1133 + if (autoRegularizationDate.HasValue)
  1134 + {
  1135 + submission.RegularizationDate = autoRegularizationDate;
  1136 + }
  1137 +
1055 1138 if (input.recruitmentType.HasValue)
1056 1139 {
1057 1140 submission.RecruitmentType = input.recruitmentType;
... ... @@ -1106,6 +1189,8 @@ namespace NCC.Extend
1106 1189 throw NCCException.Oh("招聘类型枚举无效");
1107 1190 }
1108 1191  
  1192 + ValidateSubmissionProfileFields(submission);
  1193 +
1109 1194 if (submission.RegularizationDate.HasValue
1110 1195 && submission.RegularizationDate.Value.Date < submission.EntryDate.Value.Date)
1111 1196 {
... ... @@ -1113,6 +1198,55 @@ namespace NCC.Extend
1113 1198 }
1114 1199 }
1115 1200  
  1201 + private static void ValidateSubmissionProfileFields(LqEmployeeProfileSubmissionEntity submission)
  1202 + {
  1203 + if (!EmployeeProfileSensitiveHelper.IsValidEducation(submission.Education))
  1204 + {
  1205 + throw NCCException.Oh("文化程度取值无效,请选择:博士、硕士、本科、大专、中专、技校、高中、初中、小学");
  1206 + }
  1207 +
  1208 + if (string.IsNullOrWhiteSpace(submission.CurrentAddress))
  1209 + {
  1210 + throw NCCException.Oh("现居住地址不能为空");
  1211 + }
  1212 +
  1213 + if (!EmployeeProfileSensitiveHelper.IsValidFullAddress(submission.IdCardAddress))
  1214 + {
  1215 + throw NCCException.Oh("身份证地址不能为空,且须填写完整地址(含区/县/街道/门牌等详细信息)");
  1216 + }
  1217 +
  1218 + if (!EmployeeProfileSensitiveHelper.IsValidHttpUrl(submission.IdCardFrontUrl))
  1219 + {
  1220 + throw NCCException.Oh("身份证正面照片不能为空且须为有效 URL");
  1221 + }
  1222 +
  1223 + if (!EmployeeProfileSensitiveHelper.IsValidHttpUrl(submission.IdCardBackUrl))
  1224 + {
  1225 + throw NCCException.Oh("身份证反面照片不能为空且须为有效 URL");
  1226 + }
  1227 +
  1228 + if (string.IsNullOrWhiteSpace(submission.BankName))
  1229 + {
  1230 + throw NCCException.Oh("开户行不能为空");
  1231 + }
  1232 +
  1233 + if (string.IsNullOrWhiteSpace(submission.BankCardCipher))
  1234 + {
  1235 + throw NCCException.Oh("银行卡号不能为空");
  1236 + }
  1237 +
  1238 + if (string.IsNullOrWhiteSpace(submission.BankAccountName))
  1239 + {
  1240 + throw NCCException.Oh("开户实名不能为空");
  1241 + }
  1242 +
  1243 + if (EmployeeProfileSensitiveHelper.IsSamePhoneAfterNormalize(
  1244 + submission.MobilePhone, submission.UrgentTelePhone))
  1245 + {
  1246 + throw NCCException.Oh("紧急联系人电话不能与员工手机号相同");
  1247 + }
  1248 + }
  1249 +
1116 1250 private static UserEntity BuildNewUserFromSubmission(LqEmployeeProfileSubmissionEntity submission, string idCardPlain)
1117 1251 {
1118 1252 var mobile = submission.MobilePhone;
... ... @@ -1232,6 +1366,10 @@ namespace NCC.Extend
1232 1366 RecruitmentType = submission.RecruitmentType,
1233 1367 BankName = submission.BankName,
1234 1368 BankCardCipher = submission.BankCardCipher,
  1369 + BankAccountName = submission.BankAccountName,
  1370 + IdCardAddress = submission.IdCardAddress,
  1371 + IdCardFrontUrl = submission.IdCardFrontUrl,
  1372 + IdCardBackUrl = submission.IdCardBackUrl,
1235 1373 GraduateSchool = submission.GraduateSchool,
1236 1374 EnrollmentDate = submission.EnrollmentDate,
1237 1375 GraduationDate = submission.GraduationDate,
... ... @@ -1270,6 +1408,10 @@ namespace NCC.Extend
1270 1408 existing.BankCardCipher = submission.BankCardCipher;
1271 1409 }
1272 1410  
  1411 + existing.BankAccountName = submission.BankAccountName;
  1412 + existing.IdCardAddress = submission.IdCardAddress;
  1413 + existing.IdCardFrontUrl = submission.IdCardFrontUrl;
  1414 + existing.IdCardBackUrl = submission.IdCardBackUrl;
1273 1415 existing.GraduateSchool = submission.GraduateSchool;
1274 1416 existing.EnrollmentDate = submission.EnrollmentDate;
1275 1417 existing.GraduationDate = submission.GraduationDate;
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs
... ... @@ -1114,6 +1114,7 @@ namespace NCC.Extend.LqHytkHytk
1114 1114 memberName = refundInfo?.Hymc,
1115 1115 memberPhone = !string.IsNullOrEmpty(memberId) && memberDict.ContainsKey(memberId) ? memberDict[memberId] : "",
1116 1116 refundTime = refundTime,
  1117 + tkyy = refundInfo?.Tkyy,
1117 1118 itemId = mx.Px,
1118 1119 itemName = ItemDisplayNameHelper.Display(refundItemNameMap, mx.Px, mx.Pxmc),
1119 1120 refundQuantity = mx.ProjectNumber,
... ... @@ -1311,26 +1312,12 @@ namespace NCC.Extend.LqHytkHytk
1311 1312 ? healthCoachDict[mx.Id]
1312 1313 : new List<(string Id, string Name, decimal Performance)>();
1313 1314  
1314   - // 合并多个健康师姓名和业绩(格式:姓名(业绩),用顿号分隔)
1315   - var healthCoachNames = "";
1316   - if (healthCoachList.Any())
1317   - {
1318   - var healthCoachItems = healthCoachList
1319   - .Where(h => !string.IsNullOrEmpty(h.Name))
1320   - .Select(h => $"{h.Name}({h.Performance:F2})")
1321   - .ToList();
1322   - healthCoachNames = string.Join("、", healthCoachItems);
1323   - }
1324   -
1325   - // 获取第一个健康师信息(兼容旧版本)
1326   - var firstHealthCoach = healthCoachList.FirstOrDefault();
1327   -
1328 1315 // 获取实际退款金额(所有健康师业绩之和)
1329 1316 var actualRefundAmount = actualRefundAmountDict.ContainsKey(mx.Id)
1330 1317 ? actualRefundAmountDict[mx.Id]
1331 1318 : 0m;
1332 1319  
1333   - resultList.Add(new RefundDetailListOutput
  1320 + var baseRow = new RefundDetailListOutput
1334 1321 {
1335 1322 refundId = mx.RefundInfoId,
1336 1323 storeId = refundInfo?.Md,
... ... @@ -1339,6 +1326,7 @@ namespace NCC.Extend.LqHytkHytk
1339 1326 memberName = refundInfo?.Hymc,
1340 1327 memberPhone = !string.IsNullOrEmpty(memberId) && memberDict.ContainsKey(memberId) ? memberDict[memberId] : "",
1341 1328 refundTime = refundTime,
  1329 + tkyy = refundInfo?.Tkyy,
1342 1330 itemId = mx.Px,
1343 1331 itemName = ItemDisplayNameHelper.Display(refundItemNameMap, mx.Px, mx.Pxmc),
1344 1332 refundQuantity = mx.ProjectNumber,
... ... @@ -1348,11 +1336,47 @@ namespace NCC.Extend.LqHytkHytk
1348 1336 beautyType = mx.BeautyType,
1349 1337 sourceType = mx.SourceType,
1350 1338 itemCategory = mx.ItemCategory,
1351   - healthCoachId = firstHealthCoach.Id,
1352   - healthCoachName = healthCoachNames,
1353   - healthCoachPerformance = firstHealthCoach.Performance,
1354 1339 actualRefundAmount = actualRefundAmount
1355   - });
  1340 + };
  1341 +
  1342 + // 导出按健康师拆行:每人一行;无健康师仍输出 1 行
  1343 + if (healthCoachList == null || !healthCoachList.Any())
  1344 + {
  1345 + baseRow.healthCoachId = "";
  1346 + baseRow.healthCoachName = "";
  1347 + baseRow.healthCoachPerformance = 0;
  1348 + resultList.Add(baseRow);
  1349 + }
  1350 + else
  1351 + {
  1352 + foreach (var coach in healthCoachList)
  1353 + {
  1354 + resultList.Add(new RefundDetailListOutput
  1355 + {
  1356 + refundId = baseRow.refundId,
  1357 + storeId = baseRow.storeId,
  1358 + storeName = baseRow.storeName,
  1359 + memberId = baseRow.memberId,
  1360 + memberName = baseRow.memberName,
  1361 + memberPhone = baseRow.memberPhone,
  1362 + refundTime = baseRow.refundTime,
  1363 + tkyy = baseRow.tkyy,
  1364 + itemId = baseRow.itemId,
  1365 + itemName = baseRow.itemName,
  1366 + refundQuantity = baseRow.refundQuantity,
  1367 + unitPrice = baseRow.unitPrice,
  1368 + totalPrice = baseRow.totalPrice,
  1369 + performanceType = baseRow.performanceType,
  1370 + beautyType = baseRow.beautyType,
  1371 + sourceType = baseRow.sourceType,
  1372 + itemCategory = baseRow.itemCategory,
  1373 + healthCoachId = coach.Id ?? "",
  1374 + healthCoachName = coach.Name ?? "",
  1375 + healthCoachPerformance = coach.Performance,
  1376 + actualRefundAmount = baseRow.actualRefundAmount
  1377 + });
  1378 + }
  1379 + }
1356 1380 }
1357 1381  
1358 1382 // 7. 排序
... ... @@ -1382,7 +1406,7 @@ namespace NCC.Extend.LqHytkHytk
1382 1406 /// 导出退卡明细
1383 1407 /// </summary>
1384 1408 /// <remarks>
1385   - /// 导出退卡明细到Excel,支持多门店、会员、时间范围、品项、业绩类型、科美类型、来源类型、品项分类等筛选
  1409 + /// 导出退卡明细到Excel,按品项×健康师拆行;支持多门店、会员、时间、品项、类型(退卡/转卡)等筛选。
1386 1410 ///
1387 1411 /// 示例请求:
1388 1412 /// ```json
... ... @@ -1396,7 +1420,9 @@ namespace NCC.Extend.LqHytkHytk
1396 1420 /// "performanceType": "业绩类型",
1397 1421 /// "beautyType": "科美类型",
1398 1422 /// "sourceType": "来源类型",
1399   - /// "itemCategory": "品项分类"
  1423 + /// "itemCategory": "品项分类",
  1424 + /// "excludeTransferCard": 0,
  1425 + /// "onlyTransferCard": 0
1400 1426 /// }
1401 1427 /// ```
1402 1428 /// </remarks>
... ... @@ -1432,9 +1458,15 @@ namespace NCC.Extend.LqHytkHytk
1432 1458 }
1433 1459 }
1434 1460  
  1461 + // 类型展示:转卡保持「转卡」,其余统一「退卡」
  1462 + foreach (var row in exportData)
  1463 + {
  1464 + row.tkyy = row.tkyy == "转卡" ? "转卡" : "退卡";
  1465 + }
  1466 +
1435 1467 // 定义导出字段
1436 1468 List<ParamsModel> paramList =
1437   - "[{\"value\":\"退卡ID\",\"field\":\"refundId\"},{\"value\":\"门店\",\"field\":\"storeName\"},{\"value\":\"会员ID\",\"field\":\"memberId\"},{\"value\":\"会员名称\",\"field\":\"memberName\"},{\"value\":\"会员电话\",\"field\":\"memberPhone\"},{\"value\":\"退卡时间\",\"field\":\"refundTime\"},{\"value\":\"退卡品项ID\",\"field\":\"itemId\"},{\"value\":\"退卡品项名称\",\"field\":\"itemName\"},{\"value\":\"退卡数量\",\"field\":\"refundQuantity\"},{\"value\":\"单价\",\"field\":\"unitPrice\"},{\"value\":\"总价\",\"field\":\"totalPrice\"},{\"value\":\"业绩类型\",\"field\":\"performanceType\"},{\"value\":\"科美类型\",\"field\":\"beautyType\"},{\"value\":\"来源类型\",\"field\":\"sourceType\"},{\"value\":\"品项分类\",\"field\":\"itemCategory\"},{\"value\":\"健康师\",\"field\":\"healthCoachName\"},{\"value\":\"健康师业绩\",\"field\":\"healthCoachPerformance\"},]".ToList<ParamsModel>();
  1469 + "[{\"value\":\"退卡ID\",\"field\":\"refundId\"},{\"value\":\"门店\",\"field\":\"storeName\"},{\"value\":\"会员ID\",\"field\":\"memberId\"},{\"value\":\"会员名称\",\"field\":\"memberName\"},{\"value\":\"会员电话\",\"field\":\"memberPhone\"},{\"value\":\"退卡时间\",\"field\":\"refundTime\"},{\"value\":\"类型\",\"field\":\"tkyy\"},{\"value\":\"退卡品项ID\",\"field\":\"itemId\"},{\"value\":\"退卡品项名称\",\"field\":\"itemName\"},{\"value\":\"退卡数量\",\"field\":\"refundQuantity\"},{\"value\":\"单价\",\"field\":\"unitPrice\"},{\"value\":\"总价\",\"field\":\"totalPrice\"},{\"value\":\"业绩类型\",\"field\":\"performanceType\"},{\"value\":\"科美类型\",\"field\":\"beautyType\"},{\"value\":\"来源类型\",\"field\":\"sourceType\"},{\"value\":\"品项分类\",\"field\":\"itemCategory\"},{\"value\":\"健康师\",\"field\":\"healthCoachName\"},{\"value\":\"健康师业绩\",\"field\":\"healthCoachPerformance\"},]".ToList<ParamsModel>();
1438 1470  
1439 1471 ExcelConfig excelconfig = new ExcelConfig();
1440 1472 excelconfig.FileName = "退卡明细_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
... ... @@ -1519,7 +1551,9 @@ namespace NCC.Extend.LqHytkHytk
1519 1551 input.startTime,
1520 1552 input.endTime,
1521 1553 input.itemId,
1522   - input.itemCategory
  1554 + input.itemCategory,
  1555 + input.excludeTransferCard,
  1556 + input.onlyTransferCard
1523 1557 },
1524 1558 rowCount = exportData.Count,
1525 1559 fileName = excelconfig.FileName
... ... @@ -1535,6 +1569,92 @@ namespace NCC.Extend.LqHytkHytk
1535 1569 }
1536 1570 #endregion
1537 1571  
  1572 + #region 会员退卡导出
  1573 + /// <summary>
  1574 + /// 导出会员退卡列表
  1575 + /// </summary>
  1576 + /// <remarks>
  1577 + /// GET /api/Extend/LqHytkHytk/Actions/Export
  1578 + /// dataType:0=当前页,1=全部;selectKey:逗号分隔导出字段。
  1579 + /// </remarks>
  1580 + /// <param name="input">查询与导出参数</param>
  1581 + /// <returns>Excel 文件下载信息</returns>
  1582 + [HttpGet("Actions/Export")]
  1583 + public async Task<dynamic> Export([FromQuery] LqHytkHytkListQueryInput input)
  1584 + {
  1585 + var exportData = new List<LqHytkHytkListOutput>();
  1586 + if (input.dataType == 0)
  1587 + {
  1588 + var data = Clay.Object(await this.GetList(input));
  1589 + exportData = data.Solidify<PageResult<LqHytkHytkListOutput>>().list;
  1590 + }
  1591 + else
  1592 + {
  1593 + input.currentPage = 1;
  1594 + input.pageSize = 100000;
  1595 + var data = Clay.Object(await this.GetList(input));
  1596 + exportData = data.Solidify<PageResult<LqHytkHytkListOutput>>().list;
  1597 + }
  1598 +
  1599 + foreach (var row in exportData)
  1600 + {
  1601 + if (row == null) continue;
  1602 + row.tkyy = row.tkyy == "转卡" ? "转卡" : "退卡";
  1603 + }
  1604 +
  1605 + List<ParamsModel> paramList =
  1606 + "[{\"value\":\"退卡编号\",\"field\":\"id\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"门店编号\",\"field\":\"mdbh\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"会员\",\"field\":\"hy\"},{\"value\":\"会员姓名\",\"field\":\"hymc\"},{\"value\":\"会员账号\",\"field\":\"hyzh\"},{\"value\":\"会员电话\",\"field\":\"hyPhone\"},{\"value\":\"退卡金额\",\"field\":\"tkje\"},{\"value\":\"实际退款金额\",\"field\":\"actualRefundAmount\"},{\"value\":\"类型\",\"field\":\"tkyy\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"退卡时间\",\"field\":\"tksj\"},{\"value\":\"操作人员\",\"field\":\"czry\"},{\"value\":\"是否有效\",\"field\":\"isEffective\"}]".ToList<ParamsModel>();
  1607 +
  1608 + ExcelConfig excelconfig = new ExcelConfig();
  1609 + excelconfig.FileName = "会员退卡_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
  1610 + excelconfig.HeadFont = "微软雅黑";
  1611 + excelconfig.HeadPoint = 10;
  1612 + excelconfig.IsAllSizeColumn = true;
  1613 + excelconfig.ColumnModel = new List<ExcelColumnModel>();
  1614 +
  1615 + var selectKeys = string.IsNullOrWhiteSpace(input.selectKey)
  1616 + ? paramList.Select(p => p.field).ToList()
  1617 + : input.selectKey.Split(',').Where(x => !string.IsNullOrWhiteSpace(x)).ToList();
  1618 + foreach (var item in selectKeys)
  1619 + {
  1620 + var isExist = paramList.Find(p => p.field == item);
  1621 + if (isExist != null)
  1622 + {
  1623 + excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
  1624 + }
  1625 + }
  1626 +
  1627 + var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
  1628 + ExcelExportHelper<LqHytkHytkListOutput>.Export(exportData, excelconfig, addPath);
  1629 + var fileName = _userManager.UserId + "|" + addPath + "|xls";
  1630 +
  1631 + await TryWriteBizLogAsync(
  1632 + "导出",
  1633 + "lq_hytk_hytk",
  1634 + null,
  1635 + $"导出会员退卡,共 {exportData.Count} 条",
  1636 + new
  1637 + {
  1638 + filters = new
  1639 + {
  1640 + input.md,
  1641 + input.hy,
  1642 + input.tksj,
  1643 + input.jksId,
  1644 + input.kjblsId,
  1645 + input.isEffective,
  1646 + input.excludeTransferCard,
  1647 + input.onlyTransferCard,
  1648 + input.dataType
  1649 + },
  1650 + rowCount = exportData.Count,
  1651 + fileName = excelconfig.FileName
  1652 + }.Serialize());
  1653 +
  1654 + return new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
  1655 + }
  1656 + #endregion
  1657 +
1538 1658 private static object BuildRefundSnapshot(LqHytkHytkEntity entity)
1539 1659 {
1540 1660 if (entity == null)
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqReimbursementApplicationService.cs
... ... @@ -536,7 +536,7 @@ namespace NCC.Extend.LqReimbursementApplication
536 536 entity.CurrentNodeOrder = 0;
537 537 entity.ApprovalStatus = "待审批";
538 538 var now = DateTime.Now;
539   - entity.ApplicationTime = input.applicationTime ?? now;
  539 + entity.ApplicationTime = NormalizeApplicationTime(input.applicationTime, now);
540 540 if (string.IsNullOrEmpty(entity.ApplicationUserId))
541 541 {
542 542 entity.ApplicationUserId = userInfo.userId;
... ... @@ -614,7 +614,7 @@ namespace NCC.Extend.LqReimbursementApplication
614 614 {
615 615 await EnsurePurchaseRecordsSameMonthAsApplicationAsync(
616 616 input.selectedPurchaseRecordIds,
617   - input.applicationTime ?? now);
  617 + entity.ApplicationTime ?? now);
618 618  
619 619 await EnsurePurchaseRecordsBelongToApplicantAsync(
620 620 input.selectedPurchaseRecordIds,
... ... @@ -727,7 +727,7 @@ namespace NCC.Extend.LqReimbursementApplication
727 727 {
728 728 exportData = await this.GetNoPagingList(input);
729 729 }
730   - List<ParamsModel> paramList = "[{\"value\":\"申请编号\",\"field\":\"id\"},{\"value\":\"申请人编号\",\"field\":\"applicationUserId\"},{\"value\":\"申请人姓名\",\"field\":\"applicationUserName\"},{\"value\":\"申请门店\",\"field\":\"applicationStoreId\"},{\"value\":\"申请时间\",\"field\":\"applicationTime\"},{\"value\":\"总金额\",\"field\":\"amount\"},{\"value\":\"审批人\",\"field\":\"approveUser\"},{\"value\":\"审批结果\",\"field\":\"approveStatus\"},{\"value\":\"审批时间\",\"field\":\"approveTime\"},{\"value\":\"关联购买编号\",\"field\":\"purchaseRecordsId\"},{\"value\":\"流程名称\",\"field\":\"workflowName\"}]".ToList<ParamsModel>();
  730 + List<ParamsModel> paramList = "[{\"value\":\"申请ID\",\"field\":\"id\"},{\"value\":\"编号\",\"field\":\"applicationNo\"},{\"value\":\"申请人编号\",\"field\":\"applicationUserId\"},{\"value\":\"申请人姓名\",\"field\":\"applicationUserName\"},{\"value\":\"申请门店\",\"field\":\"applicationStoreId\"},{\"value\":\"申请时间\",\"field\":\"applicationTime\"},{\"value\":\"总金额\",\"field\":\"amount\"},{\"value\":\"审批人\",\"field\":\"approveUser\"},{\"value\":\"审批结果\",\"field\":\"approveStatus\"},{\"value\":\"审批时间\",\"field\":\"approveTime\"},{\"value\":\"关联购买编号\",\"field\":\"purchaseRecordsId\"},{\"value\":\"流程名称\",\"field\":\"workflowName\"}]".ToList<ParamsModel>();
731 731 ExcelConfig excelconfig = new ExcelConfig();
732 732 excelconfig.FileName = "报销申请表.xls";
733 733 excelconfig.HeadFont = "微软雅黑";
... ... @@ -887,6 +887,10 @@ namespace NCC.Extend.LqReimbursementApplication
887 887 var entity = input.Adapt<LqReimbursementApplicationEntity>();
888 888 entity.Id = id; // 确保使用路由参数中的主键
889 889 entity.WorkflowConfigId = !string.IsNullOrEmpty(input.workflowConfigId) ? input.workflowConfigId.Trim() : oldEntity?.WorkflowConfigId;
  890 + if (input.applicationTime.HasValue)
  891 + {
  892 + entity.ApplicationTime = NormalizeApplicationTime(input.applicationTime, DateTime.Now);
  893 + }
890 894 var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
891 895 if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
892 896  
... ... @@ -896,7 +900,7 @@ namespace NCC.Extend.LqReimbursementApplication
896 900 {
897 901 await EnsurePurchaseRecordsSameMonthAsApplicationAsync(
898 902 newIds,
899   - input.applicationTime ?? oldEntity.ApplicationTime);
  903 + entity.ApplicationTime ?? input.applicationTime ?? oldEntity.ApplicationTime);
900 904  
901 905 // 绑定归属以库中原申请人为准(非管理员已强制不可改申请人)
902 906 var applicantId = !string.IsNullOrEmpty(input.applicationUserId)
... ... @@ -2295,6 +2299,7 @@ namespace NCC.Extend.LqReimbursementApplication
2295 2299 exportData.Add(new ReimbursementDetailExportOutput
2296 2300 {
2297 2301 applicationId = app.Id,
  2302 + applicationNo = app.ApplicationNo,
2298 2303 applicationUserName = app.ApplicationUserName,
2299 2304 applicationStoreId = app.ApplicationStoreId,
2300 2305 applicationStoreName = !string.IsNullOrEmpty(app.ApplicationStoreId) && applicationStores.ContainsKey(app.ApplicationStoreId)
... ... @@ -2327,6 +2332,7 @@ namespace NCC.Extend.LqReimbursementApplication
2327 2332 exportData.Add(new ReimbursementDetailExportOutput
2328 2333 {
2329 2334 applicationId = app.Id,
  2335 + applicationNo = app.ApplicationNo,
2330 2336 applicationUserName = app.ApplicationUserName,
2331 2337 applicationStoreId = app.ApplicationStoreId,
2332 2338 applicationStoreName = !string.IsNullOrEmpty(app.ApplicationStoreId) && applicationStores.ContainsKey(app.ApplicationStoreId)
... ... @@ -2353,7 +2359,7 @@ namespace NCC.Extend.LqReimbursementApplication
2353 2359 }
2354 2360  
2355 2361 // 导出Excel
2356   - List<ParamsModel> paramList = "[{\"value\":\"报销申请ID\",\"field\":\"applicationId\"},{\"value\":\"申请人姓名\",\"field\":\"applicationUserName\"},{\"value\":\"申请门店ID\",\"field\":\"applicationStoreId\"},{\"value\":\"申请门店\",\"field\":\"applicationStoreName\"},{\"value\":\"购买门店ID\",\"field\":\"purchaseStoreId\"},{\"value\":\"购买门店\",\"field\":\"purchaseStoreName\"},{\"value\":\"申请时间\",\"field\":\"applicationTime\"},{\"value\":\"申请金额\",\"field\":\"applicationAmount\"},{\"value\":\"工作流程名称\",\"field\":\"workflowName\"},{\"value\":\"完成时间\",\"field\":\"completionTime\"},{\"value\":\"审批状态\",\"field\":\"approvalStatus\"},{\"value\":\"购买记录ID\",\"field\":\"purchaseRecordId\"},{\"value\":\"支出分类ID\",\"field\":\"reimbursementCategoryId\"},{\"value\":\"分类名称\",\"field\":\"reimbursementCategoryName\"},{\"value\":\"单价\",\"field\":\"unitPrice\"},{\"value\":\"数量\",\"field\":\"quantity\"},{\"value\":\"金额\",\"field\":\"amount\"},{\"value\":\"收款人\",\"field\":\"payeeName\"},{\"value\":\"备注说明\",\"field\":\"memo\"},{\"value\":\"购买时间\",\"field\":\"purchaseTime\"}]".ToList<ParamsModel>();
  2362 + List<ParamsModel> paramList = "[{\"value\":\"报销申请ID\",\"field\":\"applicationId\"},{\"value\":\"编号\",\"field\":\"applicationNo\"},{\"value\":\"申请人姓名\",\"field\":\"applicationUserName\"},{\"value\":\"申请门店ID\",\"field\":\"applicationStoreId\"},{\"value\":\"申请门店\",\"field\":\"applicationStoreName\"},{\"value\":\"购买门店ID\",\"field\":\"purchaseStoreId\"},{\"value\":\"购买门店\",\"field\":\"purchaseStoreName\"},{\"value\":\"申请时间\",\"field\":\"applicationTime\"},{\"value\":\"申请金额\",\"field\":\"applicationAmount\"},{\"value\":\"工作流程名称\",\"field\":\"workflowName\"},{\"value\":\"完成时间\",\"field\":\"completionTime\"},{\"value\":\"审批状态\",\"field\":\"approvalStatus\"},{\"value\":\"购买记录ID\",\"field\":\"purchaseRecordId\"},{\"value\":\"支出分类ID\",\"field\":\"reimbursementCategoryId\"},{\"value\":\"分类名称\",\"field\":\"reimbursementCategoryName\"},{\"value\":\"单价\",\"field\":\"unitPrice\"},{\"value\":\"数量\",\"field\":\"quantity\"},{\"value\":\"金额\",\"field\":\"amount\"},{\"value\":\"收款人\",\"field\":\"payeeName\"},{\"value\":\"备注说明\",\"field\":\"memo\"},{\"value\":\"购买时间\",\"field\":\"purchaseTime\"}]".ToList<ParamsModel>();
2357 2363 ExcelConfig excelconfig = new ExcelConfig();
2358 2364 excelconfig.FileName = $"报销表明细_{startLabel}至{endLabel}.xls";
2359 2365 excelconfig.HeadFont = "微软雅黑";
... ... @@ -2939,6 +2945,33 @@ namespace NCC.Extend.LqReimbursementApplication
2939 2945 }
2940 2946  
2941 2947 /// <summary>
  2948 + /// 规范化申请时间:未传则用当前时间;若仅有日期(时分秒为 00:00:00)则补上当前时分秒。
  2949 + /// 避免前端 date/datetime 选择器把申请时间落成当天零点。
  2950 + /// </summary>
  2951 + private static DateTime NormalizeApplicationTime(DateTime? input, DateTime now)
  2952 + {
  2953 + if (!input.HasValue)
  2954 + {
  2955 + return now;
  2956 + }
  2957 +
  2958 + var value = input.Value;
  2959 + if (value.TimeOfDay == TimeSpan.Zero)
  2960 + {
  2961 + return new DateTime(
  2962 + value.Year,
  2963 + value.Month,
  2964 + value.Day,
  2965 + now.Hour,
  2966 + now.Minute,
  2967 + now.Second,
  2968 + now.Millisecond);
  2969 + }
  2970 +
  2971 + return value;
  2972 + }
  2973 +
  2974 + /// <summary>
2942 2975 /// 解析列表查询中的日期时间参数,支持 yyyy-MM-dd HH:mm:ss、yyyy-MM-dd 及毫秒时间戳
2943 2976 /// </summary>
2944 2977 private static DateTime? ParseQueryDateTime(string value)
... ... @@ -3105,6 +3138,11 @@ ON DUPLICATE KEY UPDATE F_CurrentValue = LAST_INSERT_ID(F_CurrentValue + 1), F_U
3105 3138 public string applicationId { get; set; }
3106 3139  
3107 3140 /// <summary>
  3141 + /// 业务编号(如 ZC-2026-7-093)
  3142 + /// </summary>
  3143 + public string applicationNo { get; set; }
  3144 +
  3145 + /// <summary>
3108 3146 /// 申请人姓名
3109 3147 /// </summary>
3110 3148 public string applicationUserName { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
... ... @@ -6602,16 +6602,9 @@ namespace NCC.Extend.LqStatistics
6602 6602 storeFilterForAll = $"AND xh.md IN ('{storeIdParams}')";
6603 6603 }
6604 6604  
6605   - var billingStoreFilterForAll = "";
6606   - if (input.StoreIds != null && input.StoreIds.Any())
6607   - {
6608   - var storeIdParams = string.Join("','", input.StoreIds);
6609   - billingStoreFilterForAll = $"AND kd.djmd IN ('{storeIdParams}')";
6610   - }
6611   -
6612 6605 var sql = $@"
6613 6606 SELECT
6614   - COALESCE(total_stats.StoreId, tk_stats.StoreId, yaoy_stats.StoreId, yy_stats.StoreId, xh_stats.StoreId, kd_stats.StoreId, visit_stats.StoreId, total_billing_stats.StoreId) as StoreId,
  6607 + COALESCE(total_stats.StoreId, tk_stats.StoreId, yaoy_stats.StoreId, yy_stats.StoreId, xh_stats.StoreId, kd_stats.StoreId, visit_stats.StoreId, visit_billing_stats.StoreId, total_billing_stats.StoreId) as StoreId,
6615 6608 COALESCE(md.dm, '') as StoreName,
6616 6609 COALESCE(total_stats.TotalCount, 0) as TotalCount,
6617 6610 COALESCE(tk_stats.TkMemberCount, 0) as TkMemberCount,
... ... @@ -6621,6 +6614,7 @@ namespace NCC.Extend.LqStatistics
6621 6614 COALESCE(kd_stats.BillingCount, 0) as BillingCount,
6622 6615 COALESCE(kd_stats.BillingAmount, 0) as BillingAmount,
6623 6616 COALESCE(visit_stats.VisitCount, 0) as VisitCount,
  6617 + COALESCE(visit_billing_stats.VisitBillingCount, 0) as VisitBillingCount,
6624 6618 COALESCE(total_billing_stats.TotalBillingCount, 0) as TotalBillingCount,
6625 6619 COALESCE(total_billing_stats.TotalBillingAmount, 0) as TotalBillingAmount
6626 6620 FROM (
... ... @@ -6770,18 +6764,54 @@ namespace NCC.Extend.LqStatistics
6770 6764 {timeFilterForAll}
6771 6765 GROUP BY tk.F_StoreId")}
6772 6766 ) visit_stats ON visit_stats.StoreId = stores.StoreId
6773   - -- 开单数统计(全部数据,不要求链路,按门店统计该门店的所有开单记录)
  6767 + -- 到店拓客中有成交开单人数(整单业绩>0;不含0元单)
6774 6768 LEFT JOIN (
  6769 + {(hasEventFilter ? $@"
6775 6770 SELECT
6776   - kd.djmd as StoreId,
6777   - COUNT(DISTINCT kd.kdhy) as TotalBillingCount,
  6771 + tk.F_StoreId as StoreId,
  6772 + COUNT(DISTINCT tk.F_MemberId) as VisitBillingCount
  6773 + FROM lq_tkjlb tk
  6774 + INNER JOIN lq_xh_hyhk xh ON xh.hy = tk.F_MemberId AND xh.F_IsEffective = 1
  6775 + INNER JOIN lq_kd_kdjlb kd ON kd.kdhy = tk.F_MemberId AND kd.F_IsEffective = 1 AND IFNULL(kd.zdyj, 0) > 0
  6776 + WHERE tk.F_StoreId IS NOT NULL
  6777 + AND tk.F_EventId = @EventId
  6778 + {billingTimeFilterForAll}
  6779 + GROUP BY tk.F_StoreId" : $@"
  6780 + SELECT
  6781 + tk.F_StoreId as StoreId,
  6782 + COUNT(DISTINCT tk.F_MemberId) as VisitBillingCount
  6783 + FROM lq_tkjlb tk
  6784 + INNER JOIN lq_xh_hyhk xh ON xh.hy = tk.F_MemberId AND xh.F_IsEffective = 1
  6785 + INNER JOIN lq_kd_kdjlb kd ON kd.kdhy = tk.F_MemberId AND kd.F_IsEffective = 1 AND IFNULL(kd.zdyj, 0) > 0
  6786 + WHERE tk.F_StoreId IS NOT NULL
  6787 + {(string.IsNullOrEmpty(whereClause) ? "" : " AND " + whereClause.Replace("WHERE ", ""))}
  6788 + {timeFilterForAll}
  6789 + {billingTimeFilterForAll}
  6790 + GROUP BY tk.F_StoreId")}
  6791 + ) visit_billing_stats ON visit_billing_stats.StoreId = stores.StoreId
  6792 + -- 拓客开单人数统计(不要求链路;仅统计整单业绩>0)
  6793 + LEFT JOIN (
  6794 + {(hasEventFilter ? $@"
  6795 + SELECT
  6796 + tk.F_StoreId as StoreId,
  6797 + COUNT(DISTINCT tk.F_MemberId) as TotalBillingCount,
6778 6798 SUM(kd.zdyj) as TotalBillingAmount
6779   - FROM lq_kd_kdjlb kd
6780   - WHERE kd.F_IsEffective = 1
6781   - AND kd.djmd IS NOT NULL
  6799 + FROM lq_tkjlb tk
  6800 + INNER JOIN lq_kd_kdjlb kd ON kd.kdhy = tk.F_MemberId AND kd.F_IsEffective = 1 AND IFNULL(kd.zdyj, 0) > 0
  6801 + WHERE tk.F_StoreId IS NOT NULL
  6802 + AND tk.F_EventId = @EventId
6782 6803 {billingTimeFilterForAll}
6783   - {billingStoreFilterForAll}
6784   - GROUP BY kd.djmd
  6804 + GROUP BY tk.F_StoreId" : $@"
  6805 + SELECT
  6806 + tk.F_StoreId as StoreId,
  6807 + COUNT(DISTINCT tk.F_MemberId) as TotalBillingCount,
  6808 + SUM(kd.zdyj) as TotalBillingAmount
  6809 + FROM lq_tkjlb tk
  6810 + INNER JOIN lq_kd_kdjlb kd ON kd.kdhy = tk.F_MemberId AND kd.F_IsEffective = 1 AND IFNULL(kd.zdyj, 0) > 0
  6811 + WHERE tk.F_StoreId IS NOT NULL
  6812 + {(string.IsNullOrEmpty(whereClause) ? "" : " AND " + whereClause.Replace("WHERE ", ""))}
  6813 + {billingTimeFilterForAll}
  6814 + GROUP BY tk.F_StoreId")}
6785 6815 ) total_billing_stats ON total_billing_stats.StoreId = stores.StoreId
6786 6816 WHERE stores.StoreId IS NOT NULL
6787 6817 ORDER BY stores.StoreId";
... ... @@ -6797,9 +6827,9 @@ namespace NCC.Extend.LqStatistics
6797 6827 ? Math.Round(item.VisitCount * 100m / item.TkMemberCount, 2)
6798 6828 : 0m;
6799 6829  
6800   - // 成交率 = 开单数(全部数据)/ 到店人数 * 100
  6830 + // 成交率 = 到店拓客中有金额开单人数 / 到店人数 * 100(整单业绩>0)
6801 6831 item.ConversionRate = item.VisitCount > 0
6802   - ? Math.Round(item.TotalBillingCount * 100m / item.VisitCount, 2)
  6832 + ? Math.Round(item.VisitBillingCount * 100m / item.VisitCount, 2)
6803 6833 : 0m;
6804 6834 }
6805 6835  
... ...
netcore/src/Modularity/Extend/NCC.Extend/OssDirectUploadService.cs
... ... @@ -426,8 +426,8 @@ namespace NCC.Extend
426 426 /// 分页查询上传记录
427 427 /// </summary>
428 428 /// <remarks>
429   - /// 管理端查询上传记录列表,支持按审核状态、图片来源(fileType)、关键词、时间范围筛选。
430   - /// fileType 精确匹配 FileType 字段;keyword 模糊匹配原始文件名或 ObjectKey。
  429 + /// 管理端查询上传记录列表,支持按审核状态、图片来源(fileType)、上传人(userId)、关键词、时间范围筛选。
  430 + /// fileType 精确匹配 FileType 字段;userId 精确匹配上传人用户 ID;keyword 模糊匹配原始文件名或 ObjectKey。
431 431 /// </remarks>
432 432 /// <param name="input">分页查询入参</param>
433 433 /// <returns>分页列表(含用户姓名、图片访问 URL)</returns>
... ... @@ -442,6 +442,7 @@ namespace NCC.Extend
442 442 var data = await _db.Queryable<LqUploadRecordEntity>()
443 443 .WhereIF(input.auditStatus.HasValue, x => x.AuditStatus == input.auditStatus.Value)
444 444 .WhereIF(!string.IsNullOrWhiteSpace(input.fileType), x => x.FileType == input.fileType)
  445 + .WhereIF(!string.IsNullOrWhiteSpace(input.userId), x => x.UserId == input.userId)
445 446 .WhereIF(!string.IsNullOrWhiteSpace(input.keyword),
446 447 x => x.OriginalFileName.Contains(input.keyword) || x.ObjectKey.Contains(input.keyword))
447 448 .WhereIF(input.startTime.HasValue, x => x.CreateTime >= input.startTime.Value)
... ...
绿纤uni-app/pages/employee-onboard/employee-onboard.vue
... ... @@ -82,10 +82,48 @@
82 82 <view class="field-item">
83 83 <text class="field-label">籍贯</text>
84 84 <u-input v-model="form.nativePlace" placeholder="如:四川成都" border="surround" maxlength="50"></u-input>
  85 + <text class="field-hint">可选填,请勿仅填写省市,建议填写到区县</text>
  86 + </view>
  87 + <view class="field-item">
  88 + <text class="field-label required">身份证地址</text>
  89 + <u-textarea v-model="form.idCardAddress" placeholder="请填写身份证上的完整住址(省市区街道门牌)" maxlength="200" count></u-textarea>
85 90 </view>
86 91 <view class="field-item">
87 92 <text class="field-label">文化程度</text>
88   - <u-input v-model="form.education" placeholder="如:本科" border="surround" maxlength="30"></u-input>
  93 + <view class="picker-trigger" @click="openEnumPicker('education', educationOptions, '请选择文化程度')">
  94 + <text :class="pickerTextClass(form.educationLabel)">{{ form.educationLabel || '请选择文化程度' }}</text>
  95 + <u-icon name="arrow-down" size="14" color="#909399"></u-icon>
  96 + </view>
  97 + </view>
  98 + <view class="field-item">
  99 + <text class="field-label required">身份证正面</text>
  100 + <view class="id-card-upload-wrap">
  101 + <u-upload
  102 + :fileList="idCardFrontFileList"
  103 + @afterRead="afterReadIdCardFront"
  104 + @delete="deleteIdCardFront"
  105 + name="idCardFront"
  106 + :maxCount="1"
  107 + accept="image"
  108 + width="160"
  109 + height="100"
  110 + ></u-upload>
  111 + </view>
  112 + </view>
  113 + <view class="field-item">
  114 + <text class="field-label required">身份证反面</text>
  115 + <view class="id-card-upload-wrap">
  116 + <u-upload
  117 + :fileList="idCardBackFileList"
  118 + @afterRead="afterReadIdCardBack"
  119 + @delete="deleteIdCardBack"
  120 + name="idCardBack"
  121 + :maxCount="1"
  122 + accept="image"
  123 + width="160"
  124 + height="100"
  125 + ></u-upload>
  126 + </view>
89 127 </view>
90 128 </view>
91 129  
... ... @@ -117,7 +155,7 @@
117 155 </view>
118 156 </view>
119 157 <view class="field-item">
120   - <text class="field-label">现居住地址</text>
  158 + <text class="field-label required">现居住地址</text>
121 159 <u-textarea v-model="form.currentAddress" placeholder="请输入现居住地址" maxlength="200" count></u-textarea>
122 160 </view>
123 161 <view class="field-item">
... ... @@ -141,12 +179,16 @@
141 179 <text>银行信息</text>
142 180 </view>
143 181 <view class="field-item">
144   - <text class="field-label">开户行</text>
  182 + <text class="field-label required">开户行</text>
145 183 <u-input v-model="form.bankName" placeholder="如:中国工商银行XX支行" border="surround" maxlength="80"></u-input>
146 184 </view>
147 185 <view class="field-item">
148   - <text class="field-label">银行卡号</text>
149   - <u-input v-model="form.bankCardNo" placeholder="请输入银行卡号(选填)" type="number" maxlength="30" border="surround"></u-input>
  186 + <text class="field-label required">开户实名</text>
  187 + <u-input v-model="form.bankAccountName" placeholder="请输入银行卡开户姓名" border="surround" maxlength="30"></u-input>
  188 + </view>
  189 + <view class="field-item">
  190 + <text class="field-label required">银行卡号</text>
  191 + <u-input v-model="form.bankCardNo" placeholder="请输入银行卡号" type="number" maxlength="30" border="surround"></u-input>
150 192 </view>
151 193 </view>
152 194  
... ... @@ -274,12 +316,19 @@
274 316  
275 317 <script>
276 318 import employeeOnboardApi from '@/apis/modules/employee-onboard.js'
  319 +import { ossUploadFile } from '@/service/oss-upload.js'
277 320  
278 321 var GENDER_OPTIONS = [
279 322 { value: 1, label: '男' },
280 323 { value: 2, label: '女' }
281 324 ]
282 325  
  326 +var EDUCATION_OPTIONS = [
  327 + '博士', '硕士', '本科', '大专', '中专', '技校', '高中', '初中', '小学'
  328 +].map(function(item) {
  329 + return { value: item, label: item }
  330 +})
  331 +
283 332 function emptyConfig() {
284 333 return {
285 334 maritalStatusOptions: [],
... ... @@ -297,7 +346,9 @@ function emptyForm() {
297 346 idCardNo: '',
298 347 nation: '',
299 348 nativePlace: '',
  349 + idCardAddress: '',
300 350 education: '',
  351 + educationLabel: '',
301 352 maritalStatus: null,
302 353 maritalStatusLabel: '',
303 354 politicalStatus: null,
... ... @@ -309,7 +360,10 @@ function emptyForm() {
309 360 telePhone: '',
310 361 landline: '',
311 362 bankName: '',
  363 + bankAccountName: '',
312 364 bankCardNo: '',
  365 + idCardFrontUrl: '',
  366 + idCardBackUrl: '',
313 367 graduateSchool: '',
314 368 major: '',
315 369 enrollmentDate: '',
... ... @@ -340,6 +394,11 @@ export default {
340 394 submitHint: '',
341 395 form: emptyForm(),
342 396 genderOptions: GENDER_OPTIONS,
  397 + educationOptions: EDUCATION_OPTIONS,
  398 + idCardFrontFileList: [],
  399 + idCardBackFileList: [],
  400 + idCardFrontUploading: false,
  401 + idCardBackUploading: false,
343 402 enumPickerVisible: false,
344 403 enumPickerColumns: [],
345 404 enumPickerKey: '',
... ... @@ -510,10 +569,63 @@ export default {
510 569 return /^1\d{10}$/.test((mobile || '').trim())
511 570 },
512 571 isValidBankCard: function(bankCard) {
513   - if (!bankCard || !bankCard.trim()) return true
  572 + if (!bankCard || !bankCard.trim()) return false
514 573 var normalized = bankCard.replace(/\s+/g, '')
515 574 return normalized.length >= 12 && normalized.length <= 30 && /^\d+$/.test(normalized)
516 575 },
  576 + uploadIdCardImage: function(fileObj, side) {
  577 + var self = this
  578 + var uploadingKey = side === 'front' ? 'idCardFrontUploading' : 'idCardBackUploading'
  579 + if (self[uploadingKey]) return Promise.resolve()
  580 + self[uploadingKey] = true
  581 + uni.showLoading({ title: '上传中' })
  582 + return ossUploadFile(fileObj, 'annexpic').then(function(result) {
  583 + if (result && result.code === 200 && result.data && result.data.url) {
  584 + var previewUrl = result.data.thumbnailUrl || result.data.url
  585 + if (side === 'front') {
  586 + self.form.idCardFrontUrl = result.data.url
  587 + self.idCardFrontFileList = [{ url: previewUrl, status: 'success' }]
  588 + } else {
  589 + self.form.idCardBackUrl = result.data.url
  590 + self.idCardBackFileList = [{ url: previewUrl, status: 'success' }]
  591 + }
  592 + } else {
  593 + uni.showToast({ title: (result && result.msg) || '上传失败', icon: 'none' })
  594 + }
  595 + }).catch(function() {
  596 + uni.showToast({ title: '上传失败', icon: 'none' })
  597 + }).finally(function() {
  598 + self[uploadingKey] = false
  599 + uni.hideLoading()
  600 + })
  601 + },
  602 + normalizeUploadFile: function(file) {
  603 + if (!file) return null
  604 + if (file.url && !file.path && !file.tempFilePath) {
  605 + return { tempFilePath: file.url }
  606 + }
  607 + return file
  608 + },
  609 + afterReadIdCardFront: function(event) {
  610 + var lists = [].concat(event.file)
  611 + var fileObj = this.normalizeUploadFile(lists[0])
  612 + if (!fileObj) return
  613 + this.uploadIdCardImage(fileObj, 'front')
  614 + },
  615 + afterReadIdCardBack: function(event) {
  616 + var lists = [].concat(event.file)
  617 + var fileObj = this.normalizeUploadFile(lists[0])
  618 + if (!fileObj) return
  619 + this.uploadIdCardImage(fileObj, 'back')
  620 + },
  621 + deleteIdCardFront: function() {
  622 + this.form.idCardFrontUrl = ''
  623 + this.idCardFrontFileList = []
  624 + },
  625 + deleteIdCardBack: function() {
  626 + this.form.idCardBackUrl = ''
  627 + this.idCardBackFileList = []
  628 + },
517 629 onIdCardBlur: function() {
518 630 var normalized = this.normalizeIdCard(this.form.idCardNo)
519 631 this.form.idCardNo = normalized
... ... @@ -545,9 +657,18 @@ export default {
545 657 if (!this.isValidMobile(f.mobilePhone)) return '请输入正确的手机号'
546 658 if (!f.gender) return '请选择性别'
547 659 if (!this.isValidIdCard(f.idCardNo)) return '身份证号不合法'
  660 + if (!f.idCardAddress || !f.idCardAddress.trim()) return '请填写身份证地址'
  661 + if (!f.currentAddress || !f.currentAddress.trim()) return '请填写现居住地址'
  662 + if (!f.bankName || !f.bankName.trim()) return '请填写开户行'
  663 + if (!f.bankAccountName || !f.bankAccountName.trim()) return '请填写开户实名'
  664 + if (!this.isValidBankCard(f.bankCardNo)) return '请输入正确的银行卡号'
  665 + if (!f.idCardFrontUrl) return '请上传身份证正面照片'
  666 + if (!f.idCardBackUrl) return '请上传身份证反面照片'
548 667 if (!f.urgentContacts || !f.urgentContacts.trim()) return '请输入紧急联系人'
549 668 if (!this.isValidMobile(f.urgentTelePhone)) return '请输入正确的紧急联系人电话'
550   - if (!this.isValidBankCard(f.bankCardNo)) return '银行卡号格式不正确'
  669 + if ((f.urgentTelePhone || '').trim() === (f.mobilePhone || '').trim()) {
  670 + return '紧急联系人电话不能与员工手机号一致'
  671 + }
551 672 if (f.enrollmentDate && f.graduationDate && f.graduationDate < f.enrollmentDate) {
552 673 return '毕业时间不能早于入学时间'
553 674 }
... ... @@ -566,6 +687,7 @@ export default {
566 687 idCardNo: this.normalizeIdCard(f.idCardNo),
567 688 nation: (f.nation || '').trim() || null,
568 689 nativePlace: (f.nativePlace || '').trim() || null,
  690 + idCardAddress: (f.idCardAddress || '').trim(),
569 691 education: (f.education || '').trim() || null,
570 692 telePhone: (f.telePhone || '').trim() || null,
571 693 landline: (f.landline || '').trim() || null,
... ... @@ -575,9 +697,12 @@ export default {
575 697 maritalStatus: f.maritalStatus,
576 698 politicalStatus: f.politicalStatus,
577 699 householdType: f.householdType,
578   - currentAddress: (f.currentAddress || '').trim() || null,
579   - bankName: (f.bankName || '').trim() || null,
580   - bankCardNo: (f.bankCardNo || '').trim() || null,
  700 + currentAddress: (f.currentAddress || '').trim(),
  701 + bankName: (f.bankName || '').trim(),
  702 + bankAccountName: (f.bankAccountName || '').trim(),
  703 + bankCardNo: (f.bankCardNo || '').trim(),
  704 + idCardFrontUrl: f.idCardFrontUrl || null,
  705 + idCardBackUrl: f.idCardBackUrl || null,
581 706 graduateSchool: (f.graduateSchool || '').trim() || null,
582 707 enrollmentDate: f.enrollmentDate || null,
583 708 graduationDate: f.graduationDate || null,
... ... @@ -824,6 +949,18 @@ export default {
824 949 color: #606266;
825 950 }
826 951  
  952 +.field-hint {
  953 + display: block;
  954 + margin-top: 8rpx;
  955 + font-size: 22rpx;
  956 + color: #909399;
  957 + line-height: 1.5;
  958 +}
  959 +
  960 +.id-card-upload-wrap {
  961 + margin-top: 4rpx;
  962 +}
  963 +
827 964 .preview-row {
828 965 display: flex;
829 966 align-items: center;
... ...
绿纤uni-app/pages/reimbursement-audit-list/reimbursement-audit-list.vue
... ... @@ -20,6 +20,10 @@
20 20 <text class="detail-value">{{ getStoreName(item.applicationStoreId) || '无' }}</text>
21 21 </view>
22 22 <view class="detail-item">
  23 + <text class="detail-label">编号:</text>
  24 + <text class="detail-value">{{ item.applicationNo || '无' }}</text>
  25 + </view>
  26 + <view class="detail-item">
23 27 <text class="detail-label">总金额:</text>
24 28 <text class="detail-value amount">¥{{ item.amount || 0 }}</text>
25 29 </view>
... ...
绿纤uni-app/pages/reimbursement-list/reimbursement-list.vue
... ... @@ -49,6 +49,10 @@
49 49 <view class="application-time">{{ utils.formatTime(item.applicationTime) }}</view>
50 50 </view>
51 51 <view class="item-details">
  52 + <view class="detail-item">
  53 + <text class="detail-label">编号:</text>
  54 + <text class="detail-value">{{ item.applicationNo || '无' }}</text>
  55 + </view>
52 56 <!-- <view class="detail-item">
53 57 <text class="detail-label">门店:</text>
54 58 <text class="detail-value">{{ getStoreName(item.applicationStoreId) || '无' }}</text>
... ...
绿纤uni-app/pagesA/my-application-detail/my-application-detail.vue
... ... @@ -10,11 +10,15 @@
10 10 <view class="summary-grid">
11 11 <view class="summary-item">
12 12 <text class="summary-label">流程名称</text>
13   - <text class="summary-value">{{ flowTaskInfo.flowName || '-' }}</text>
  13 + <text class="summary-value">{{ flowTaskInfo.flowName || '无' }}</text>
14 14 </view>
15 15 <view class="summary-item">
16 16 <text class="summary-label">当前节点</text>
17   - <text class="summary-value">{{ flowTaskInfo.thisStep || '-' }}</text>
  17 + <text class="summary-value">{{ flowTaskInfo.thisStep || '无' }}</text>
  18 + </view>
  19 + <view class="summary-item summary-item--full">
  20 + <text class="summary-label">下一个审批人</text>
  21 + <text class="summary-value" :class="{ 'summary-value--warn': nextApproverText === '无' }">{{ nextApproverText || '无' }}</text>
18 22 </view>
19 23 <view class="summary-item">
20 24 <text class="summary-label">发起时间</text>
... ... @@ -54,7 +58,7 @@
54 58 <text class="timeline-title">{{ item.title }}</text>
55 59 <text class="timeline-time">{{ item.time }}</text>
56 60 </view>
57   - <text v-if="item.user" class="timeline-text">处理人:{{ item.user }}</text>
  61 + <text v-if="item.user" class="timeline-text">{{ item.action === '待审批' || item.action === '待分配审批人' ? '审批人' : '处理人' }}:{{ item.user }}</text>
58 62 <text v-if="item.action" class="timeline-text">动作:{{ item.action }}</text>
59 63 <text v-if="item.opinion" class="timeline-text">说明:{{ item.opinion }}</text>
60 64 </view>
... ... @@ -66,11 +70,14 @@
66 70 </template>
67 71  
68 72 <script>
  73 +import { formatNextApproverText, buildPendingTimelineItems } from '@/utils/flow-next-approver.js'
  74 +
69 75 export default {
70 76 data() {
71 77 return {
72 78 loading: false,
73 79 flowTaskInfo: {},
  80 + flowTaskNodeList: [],
74 81 flowTaskOperatorRecordList: [],
75 82 formConfigList: [],
76 83 formContent: {}
... ... @@ -85,6 +92,9 @@ export default {
85 92 width: this.getProgress(this.flowTaskInfo) + '%'
86 93 }
87 94 },
  95 + nextApproverText() {
  96 + return formatNextApproverText(this.flowTaskNodeList, this.flowTaskInfo)
  97 + },
88 98 detailFields() {
89 99 const source = this.formConfigList.map(item => {
90 100 return {
... ... @@ -114,6 +124,7 @@ export default {
114 124 dotClass: map.dotClass
115 125 }
116 126 })
  127 + list.push(...buildPendingTimelineItems(this.flowTaskNodeList, this.flowTaskInfo))
117 128 if (Number(this.flowTaskInfo.completion) === 100 && this.flowTaskInfo.endTime) {
118 129 list.push({
119 130 title: '流程结束',
... ... @@ -143,6 +154,7 @@ export default {
143 154 const res = await this.API.getMyApplicationDetail(this.id, { n: Date.now() })
144 155 const data = res && res.data ? res.data : {}
145 156 this.flowTaskInfo = data.flowTaskInfo || {}
  157 + this.flowTaskNodeList = data.flowTaskNodeList || []
146 158 this.flowTaskOperatorRecordList = data.flowTaskOperatorRecordList || []
147 159 this.formConfigList = this.parseJson(this.flowTaskInfo.flowForm)
148 160 this.formContent = this.parseJson(this.flowTaskInfo.flowFormContentJson) || {}
... ... @@ -335,6 +347,9 @@ export default {
335 347 border-radius: 18rpx;
336 348 background: #f8fbf8;
337 349 }
  350 +.summary-item--full {
  351 + grid-column: 1 / -1;
  352 +}
338 353 .summary-label {
339 354 display: block;
340 355 font-size: 22rpx;
... ... @@ -346,6 +361,14 @@ export default {
346 361 font-size: 25rpx;
347 362 line-height: 1.5;
348 363 color: #1f2937;
  364 + word-break: break-all;
  365 +}
  366 +.summary-value--warn {
  367 + color: #e53935;
  368 +}
  369 +.dot-waiting {
  370 + background: #ff9800;
  371 + box-shadow: 0 0 0 4rpx rgba(255, 152, 0, 0.2);
349 372 }
350 373 .progress-wrap {
351 374 margin-top: 24rpx;
... ...
绿纤uni-app/pagesA/my-approval-detail/my-approval-detail.vue
... ... @@ -16,6 +16,10 @@
16 16 <text class="summary-label">当前节点</text>
17 17 <text class="summary-value">{{ flowTaskInfo.thisStep || '无' }}</text>
18 18 </view>
  19 + <view class="summary-item summary-item--full">
  20 + <text class="summary-label">下一个审批人</text>
  21 + <text class="summary-value" :class="{ 'summary-value--warn': nextApproverText === '无' }">{{ nextApproverText || '无' }}</text>
  22 + </view>
19 23 <view class="summary-item">
20 24 <text class="summary-label">发起时间</text>
21 25 <text class="summary-value">{{ formatDate(flowTaskInfo.startTime) }}</text>
... ... @@ -54,7 +58,7 @@
54 58 <text class="timeline-title">{{ item.title }}</text>
55 59 <text class="timeline-time">{{ item.time }}</text>
56 60 </view>
57   - <text v-if="item.user" class="timeline-text">处理人:{{ item.user }}</text>
  61 + <text v-if="item.user" class="timeline-text">{{ item.action === '待审批' || item.action === '待分配审批人' ? '审批人' : '处理人' }}:{{ item.user }}</text>
58 62 <text v-if="item.action" class="timeline-text">动作:{{ item.action }}</text>
59 63 <text v-if="item.opinion" class="timeline-text">说明:{{ item.opinion }}</text>
60 64 </view>
... ... @@ -95,6 +99,8 @@
95 99 </template>
96 100  
97 101 <script>
  102 +import { formatNextApproverText, buildPendingTimelineItems } from '@/utils/flow-next-approver.js'
  103 +
98 104 export default {
99 105 data() {
100 106 return {
... ... @@ -106,6 +112,7 @@ export default {
106 112 flowCode: '',
107 113 canAudit: false,
108 114 flowTaskInfo: {},
  115 + flowTaskNodeList: [],
109 116 flowTaskOperatorRecordList: [],
110 117 formConfigList: [],
111 118 formContent: {},
... ... @@ -123,6 +130,9 @@ export default {
123 130 width: this.getProgress(this.flowTaskInfo) + '%'
124 131 }
125 132 },
  133 + nextApproverText() {
  134 + return formatNextApproverText(this.flowTaskNodeList, this.flowTaskInfo)
  135 + },
126 136 detailFields() {
127 137 const source = this.formConfigList.map(item => ({
128 138 label: item.filedName || item.label || '字段',
... ... @@ -150,6 +160,7 @@ export default {
150 160 dotClass: map.dotClass
151 161 }
152 162 })
  163 + list.push(...buildPendingTimelineItems(this.flowTaskNodeList, this.flowTaskInfo))
153 164 if (Number(this.flowTaskInfo.completion) === 100 && this.flowTaskInfo.endTime) {
154 165 list.push({
155 166 title: '流程结束',
... ... @@ -186,6 +197,7 @@ export default {
186 197 })
187 198 const data = res && res.data ? res.data : {}
188 199 this.flowTaskInfo = data.flowTaskInfo || {}
  200 + this.flowTaskNodeList = data.flowTaskNodeList || []
189 201 this.flowTaskOperatorRecordList = data.flowTaskOperatorRecordList || []
190 202 this.formConfigList = this.parseJson(this.flowTaskInfo.flowForm)
191 203 this.formContent = this.parseJson(this.flowTaskInfo.flowFormContentJson) || {}
... ... @@ -413,6 +425,9 @@ export default {
413 425 border-radius: 18rpx;
414 426 background: #f8fbf8;
415 427 }
  428 +.summary-item--full {
  429 + grid-column: 1 / -1;
  430 +}
416 431 .summary-label {
417 432 display: block;
418 433 font-size: 22rpx;
... ... @@ -424,6 +439,10 @@ export default {
424 439 font-size: 25rpx;
425 440 line-height: 1.5;
426 441 color: #1f2937;
  442 + word-break: break-all;
  443 +}
  444 +.summary-value--warn {
  445 + color: #e53935;
427 446 }
428 447 .progress-wrap {
429 448 margin-top: 24rpx;
... ... @@ -509,6 +528,10 @@ export default {
509 528 .dot-danger { background: #e53935; }
510 529 .dot-warning { background: #d48806; }
511 530 .dot-default { background: #9aa49a; }
  531 +.dot-waiting {
  532 + background: #ff9800;
  533 + box-shadow: 0 0 0 4rpx rgba(255, 152, 0, 0.2);
  534 +}
512 535 .timeline-content {
513 536 padding: 0 0 0 12rpx;
514 537 }
... ...
绿纤uni-app/pagesA/reimbursement-form/reimbursement-form.vue
... ... @@ -1308,7 +1308,15 @@
1308 1308 submitData.applicationStoreId = this.formData.applicationStoreId
1309 1309 }
1310 1310 if (this.formData.applicationTime) {
1311   - submitData.applicationTime = this.formData.applicationTime
  1311 + let applicationTime = this.formData.applicationTime
  1312 + const d = new Date(applicationTime)
  1313 + if (!Number.isNaN(d.getTime()) && d.getHours() === 0 && d.getMinutes() === 0 && d.getSeconds() === 0) {
  1314 + const now = new Date()
  1315 + d.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds())
  1316 + applicationTime = d.getTime()
  1317 + this.formData.applicationTime = applicationTime
  1318 + }
  1319 + submitData.applicationTime = applicationTime
1312 1320 }
1313 1321 if (this.formData.amount) {
1314 1322 submitData.amount = this.formData.amount
... ... @@ -1356,12 +1364,25 @@
1356 1364 throw new Error(getErrorMsg(res, '修改失败'))
1357 1365 }
1358 1366 } else {
1359   - // 创建
  1367 + // 创建:若申请时间仅有日期(00:00:00),补当前时分秒
  1368 + let applicationTime = this.formData.applicationTime
  1369 + if (applicationTime) {
  1370 + const d = new Date(applicationTime)
  1371 + if (!Number.isNaN(d.getTime()) && d.getHours() === 0 && d.getMinutes() === 0 && d.getSeconds() === 0) {
  1372 + const now = new Date()
  1373 + d.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds())
  1374 + applicationTime = d.getTime()
  1375 + this.formData.applicationTime = applicationTime
  1376 + }
  1377 + } else {
  1378 + applicationTime = Date.now()
  1379 + this.formData.applicationTime = applicationTime
  1380 + }
1360 1381 submitData = {
1361 1382 applicationUserId: this.formData.applicationUserId,
1362 1383 applicationUserName: this.formData.applicationUserName,
1363 1384 applicationStoreId: this.formData.applicationStoreId,
1364   - applicationTime: this.formData.applicationTime,
  1385 + applicationTime: applicationTime,
1365 1386 amount: this.formData.amount,
1366 1387 workflowConfigId: this.formData.workflowConfigId,
1367 1388 selectedPurchaseRecordIds: this.formData.selectedPurchaseRecordIds,
... ...
绿纤uni-app/utils/flow-next-approver.js 0 → 100644
  1 +/**
  2 + * 从流程详情节点列表解析「当前待审批」节点与展示文案。
  3 + * 后端 FlowBeforeInfo:type=1 为当前节点,userName 为审批人(姓名/账号)。
  4 + */
  5 +
  6 +export function resolveCurrentApproverNodes(flowTaskNodeList, flowTaskInfo) {
  7 + const nodes = Array.isArray(flowTaskNodeList) ? flowTaskNodeList : []
  8 + const info = flowTaskInfo || {}
  9 + const status = Number(info.status)
  10 + const completion = Number(info.completion)
  11 + if (status !== 1 || completion === 100) return []
  12 +
  13 + const isApproverLike = (n) => {
  14 + const t = n && n.nodeType
  15 + return t === 'approver' || t === 'subFlow'
  16 + }
  17 +
  18 + let current = nodes.filter((n) => String(n.type) === '1' && isApproverLike(n))
  19 + if (!current.length) {
  20 + const stepIds = String(info.thisStepId || '')
  21 + .split(',')
  22 + .map((s) => s.trim())
  23 + .filter(Boolean)
  24 + if (stepIds.length) {
  25 + current = nodes.filter((n) => stepIds.includes(n.nodeCode) && isApproverLike(n))
  26 + }
  27 + }
  28 + return current
  29 +}
  30 +
  31 +export function formatNextApproverText(flowTaskNodeList, flowTaskInfo) {
  32 + const current = resolveCurrentApproverNodes(flowTaskNodeList, flowTaskInfo)
  33 + const names = []
  34 + current.forEach((n) => {
  35 + String(n.userName || '')
  36 + .split(',')
  37 + .forEach((s) => {
  38 + const t = (s || '').trim()
  39 + if (t && !names.includes(t)) names.push(t)
  40 + })
  41 + })
  42 + if (names.length) return names.join('、')
  43 +
  44 + const status = Number((flowTaskInfo || {}).status)
  45 + const completion = Number((flowTaskInfo || {}).completion)
  46 + if (status === 1 && completion !== 100) return '无'
  47 + return ''
  48 +}
  49 +
  50 +export function buildPendingTimelineItems(flowTaskNodeList, flowTaskInfo) {
  51 + const info = flowTaskInfo || {}
  52 + const status = Number(info.status)
  53 + const completion = Number(info.completion)
  54 + if (status !== 1 || completion === 100) return []
  55 +
  56 + const current = resolveCurrentApproverNodes(flowTaskNodeList, info)
  57 + if (current.length) {
  58 + return current.map((n) => ({
  59 + title: n.nodeName || '待审批',
  60 + time: '待处理',
  61 + user: (n.userName && String(n.userName).trim()) || '无',
  62 + action: '待审批',
  63 + opinion: '',
  64 + dotClass: 'dot-waiting'
  65 + }))
  66 + }
  67 +
  68 + return [{
  69 + title: info.thisStep || '待审批',
  70 + time: '待处理',
  71 + user: '无',
  72 + action: '待分配审批人',
  73 + opinion: '',
  74 + dotClass: 'dot-waiting'
  75 + }]
  76 +}
... ...
项目文档相关/docs/V2.0.1-系统更新说明-草稿.md 0 → 100644
  1 +# V2.0.1 系统更新说明(草稿)
  2 +
  3 +> 状态:**草稿**,暂不正式发布。
  4 +> 用途:先在此修改、补充,确认后再整合写入 `lq_changelog` 并发布。
  5 +> 对应 SQL 脚本(发布时用):`项目文档相关/sql/2026-07-28/系统更新说明_V2.0.1.sql`
  6 +> 创建日期:2026-07-28
  7 +> 最近补充:2026-07-28(报销编号/申请时间、上传记录人员筛选、退卡明细导出等)
  8 +
  9 +---
  10 +
  11 +## 建议标题
  12 +
  13 +2026年7月系统更新(V2.0.1)
  14 +
  15 +## 建议版本号
  16 +
  17 +V2.0.1
  18 +
  19 +## 建议类型
  20 +
  21 +功能更新(Type = 1)
  22 +
  23 +---
  24 +
  25 +## 正文(可直接改)
  26 +
  27 +### 新增功能
  28 +
  29 +#### 1. 事业部战略决策增强
  30 +
  31 +- 三美净业绩占比:生美/科美/医美净业绩与占比可视化
  32 +- 门店五项指标排名:总业绩、总消耗、客头数、客次数、项目数可切换
  33 +- 服务日志统计:日志数、覆盖耗卡、覆盖率、照片完整率;支持明细查看
  34 +- 当日重复充值软提醒:门店 PC 开单、手机端耗卡保存前确认(不硬拦)
  35 +- 【监控中心 → 重复充值审计】:按业务日期审计同会员同日第 2 笔及以后开单/耗卡;支持查看关联业务明细
  36 +
  37 +#### 2. 大项目战略决策增强
  38 +
  39 +- 医美消费频次、品项频次 Top
  40 +- 医美客户分层(A++~D)及分层明细
  41 +- 医美品项开单金额占比
  42 +- 付款医院应收账款统计
  43 +- 医美退款明细查询
  44 +
  45 +#### 3. 健康师金三角业绩(手机端)
  46 +
  47 +- 个人中心展示本月金三角业绩与提成缺口
  48 +- 新增【金三角业绩】页;档位说明问号可开关(小程序端弹窗兼容)
  49 +- 【系统管理 → 系统设置 → 业务配置 → 金三角业绩】控制档位说明展示
  50 +
  51 +#### 4. 手机端入口与合规
  52 +
  53 +- 首页常用功能支持大项目/教育部战略决策入口
  54 +- 新增隐私政策页
  55 +
  56 +#### 5. 考勤补卡全勤口径
  57 +
  58 +- 补卡日可标记「按正常考勤算」是否计入全勤
  59 +- 考勤明细支持调整放行(默认不计入)
  60 +
  61 +#### 6. 企业日历
  62 +
  63 +- 管理端右上角快捷打开企业日历
  64 +
  65 +#### 7. 退卡明细
  66 +
  67 +- 列表增加退卡 ID(门店列前)
  68 +- 导出品项分类按显示名转换(如医美 → DXM)
  69 +- 支持退卡/转卡类型筛选;列表展示退卡原因
  70 +- 导出按健康师拆行,便于对账
  71 +- 【会员退卡】恢复导出;支持类型筛选
  72 +
  73 +#### 8. 沉睡回店配置
  74 +
  75 +- 【系统设置 → 业务配置】可配置沉睡回店判定天数
  76 +
  77 +#### 9. 报销申请业务编号
  78 +
  79 +- 新增业务编号(如 ZC-2026-7-093)
  80 +- 【我的待办 / 所有申请】列表展示编号
  81 +- 报销表明细导出、申请列表导出增加「编号」列
  82 +- 手机端报销申请/审核列表同步展示编号
  83 +
  84 +#### 10. 上传记录人员筛选
  85 +
  86 +- 【上传记录】筛选区增加「人员信息」,可按上传人查询
  87 +
  88 +#### 11. 入职资料字段增强
  89 +
  90 +- 支持银行实名、身份证地址照片等资料维护(含敏感信息处理)
  91 +
  92 +### 优化与修复
  93 +
  94 +1. 暗黑模式:步骤条、系统更新弹窗等可读性增强
  95 +2. 人事填报审核与敏感信息处理增强
  96 +3. 报销、水印、手机号脱敏相关体验优化
  97 +4. 门店信息表单能力补充
  98 +5. 报销申请时间:选日期若为当天零点,自动补当前时分秒;列表展示到秒
  99 +
  100 +---
  101 +
  102 +## 纯文本版(发布到系统更新说明时用,与线上格式接近)
  103 +
  104 +```text
  105 +新增功能
  106 +1. 事业部战略决策增强
  107 +
  108 +三美净业绩占比:生美/科美/医美净业绩与占比可视化
  109 +门店五项指标排名:总业绩、总消耗、客头数、客次数、项目数可切换
  110 +服务日志统计:日志数、覆盖耗卡、覆盖率、照片完整率;支持明细查看
  111 +当日重复充值软提醒:门店 PC 开单、手机端耗卡保存前确认(不硬拦)
  112 +【监控中心 → 重复充值审计】:按业务日期审计同会员同日第 2 笔及以后开单/耗卡;支持查看关联业务明细
  113 +
  114 +2. 大项目战略决策增强
  115 +
  116 +医美消费频次、品项频次 Top
  117 +医美客户分层(A++~D)及分层明细
  118 +医美品项开单金额占比
  119 +付款医院应收账款统计
  120 +医美退款明细查询
  121 +
  122 +3. 健康师金三角业绩(手机端)
  123 +
  124 +个人中心展示本月金三角业绩与提成缺口
  125 +新增【金三角业绩】页;档位说明问号可开关(小程序端弹窗兼容)
  126 +【系统管理 → 系统设置 → 业务配置 → 金三角业绩】控制档位说明展示
  127 +
  128 +4. 手机端入口与合规
  129 +
  130 +首页常用功能支持大项目/教育部战略决策入口
  131 +新增隐私政策页
  132 +
  133 +5. 考勤补卡全勤口径
  134 +
  135 +补卡日可标记「按正常考勤算」是否计入全勤
  136 +考勤明细支持调整放行(默认不计入)
  137 +
  138 +6. 企业日历
  139 +
  140 +管理端右上角快捷打开企业日历
  141 +
  142 +7. 退卡明细
  143 +
  144 +列表增加退卡ID(门店列前)
  145 +导出品项分类按显示名转换(如医美 → DXM)
  146 +支持退卡/转卡类型筛选;列表展示退卡原因
  147 +导出按健康师拆行,便于对账
  148 +【会员退卡】恢复导出;支持类型筛选
  149 +
  150 +8. 沉睡回店配置
  151 +
  152 +【系统设置 → 业务配置】可配置沉睡回店判定天数
  153 +
  154 +9. 报销申请业务编号
  155 +
  156 +新增业务编号(如 ZC-2026-7-093)
  157 +【我的待办 / 所有申请】列表展示编号
  158 +报销表明细导出、申请列表导出增加「编号」列
  159 +手机端报销申请/审核列表同步展示编号
  160 +
  161 +10. 上传记录人员筛选
  162 +
  163 +【上传记录】筛选区增加「人员信息」,可按上传人查询
  164 +
  165 +11. 入职资料字段增强
  166 +
  167 +支持银行实名、身份证地址照片等资料维护(含敏感信息处理)
  168 +
  169 +优化与修复
  170 +1. 暗黑模式:步骤条、系统更新弹窗等可读性增强
  171 +2. 人事填报审核与敏感信息处理增强
  172 +3. 报销、水印、手机号脱敏相关体验优化
  173 +4. 门店信息表单能力补充
  174 +5. 报销申请时间:选日期若为当天零点,自动补当前时分秒;列表展示到秒
  175 +```
  176 +
  177 +---
  178 +
  179 +## 待你补充 / 调整
  180 +
  181 +- [ ] 文案措辞、顺序是否需调整
  182 +- [ ] 是否合并进更大版本(如继续挂在 V2.0.0 下,或改成 V2.0.2)
  183 +- [ ] 是否补充「需执行的 SQL / 菜单脚本」说明给业务方(入职资料字段见 `sql/2026-07-28/入职资料_银行实名与身份证地址照片.sql`)
  184 +- [ ] 确认后:更新 `系统更新说明_V2.0.1.sql` → 调 Changelog 接口发布
  185 +
  186 +## 发布备注
  187 +
  188 +此前曾通过接口写入并发布过一条 V2.0.1;若你要求「先改再发」,应以本草稿为准,正式发布前再覆盖/重新发布。
... ...
项目文档相关/docs/数据库说明.md
... ... @@ -298,7 +298,8 @@
298 298 - **关联**: `F_UserId` → `BASE_USER.F_Id`(唯一索引 `UK_lq_employee_profile_UserId`)。
299 299 - **主要字段**:
300 300 - 用工档案:`F_MaritalStatus`、`F_PoliticalStatus`、`F_HouseholdType`、`F_CurrentAddress`、`F_EmployeeNo`(可空、非空唯一)、`F_EmployeeType`(全职/实习/其他)、`F_EmployeeStatus`(正式/试用/待离职,与 `F_IsOnJob` 分离)、`F_ProbationMonths`(3/6)、`F_RegularizationDate`、`F_RecruitmentType`
301   - - 银行:`F_BankName`、`F_BankCardCipher`(密文,禁止明文列)
  301 + - 银行:`F_BankName`、`F_BankCardCipher`(密文,禁止明文列)、`F_BankAccountName`(开户实名)
  302 + - 身份证材料:`F_IdCardAddress`(完整地址,独立于 `BASE_USER.F_NATIVEPLACE`)、`F_IdCardFrontUrl`、`F_IdCardBackUrl`
302 303 - 教育/经历:`F_GraduateSchool`、`F_EnrollmentDate`、`F_GraduationDate`、`F_Major`、`F_PreviousCompany`、`F_PreviousPosition`、`F_PreviousStartDate`、`F_PreviousEndDate`
303 304 - 紧急联系人扩展:`F_EmergencyContactRelation`、`F_EmergencyContactAddress`(姓名/电话仍在 `BASE_USER.F_URGENTCONTACTS` / `F_URGENTTELEPHONE`)
304 305 - 审计:`F_CreateTime`/`F_UpdateTime`/`F_CreateUser`/`F_UpdateUser`、`F_LastReviewUserId`/`F_LastReviewUserName`/`F_LastReviewTime`
... ... @@ -314,7 +315,7 @@
314 315 - **关联**: 审核通过后 `F_LinkedUserId` → `BASE_USER.F_Id`。
315 316 - **敏感字段**: `F_IdCardCipher` / `F_BankCardCipher` 存密文;`F_IdCardHash`(char(64))用于身份证查重索引,**不对密文建唯一**;列表/接口默认脱敏。
316 317 - **主档快照列**: `F_RealName`、`F_MobilePhone`、`F_Gender`、`F_Birthday`、`F_Nation`、`F_NativePlace`、`F_Education`、`F_EntryDate`(申请入职日,通过后写 `BASE_USER.F_ENTRYDATE`)、组织/门店/岗位、`F_UrgentContacts`/`F_UrgentTelePhone`/`F_PostalAddress` 等;证件类型固定身份证,不重复存储。
317   -- **档案扩展快照列**: 与 `lq_employee_profile` 同名字段 + `F_FormSnapshotJson`(身份证、银行卡仅保存脱敏值的 JSON 备份)。
  318 +- **档案扩展快照列**: 与 `lq_employee_profile` 同名字段(含 `F_BankAccountName`、`F_IdCardAddress`、`F_IdCardFrontUrl`、`F_IdCardBackUrl`)+ `F_FormSnapshotJson`(身份证、银行卡仅保存脱敏值的 JSON 备份)。
318 319 - **流程字段**: `F_SubmissionNo`(申请编号,唯一)、`F_Status`、`F_RejectReason`、`F_ReviewUserId`/`F_ReviewUserName`/`F_ReviewTime`、`F_SubmitSource`/`F_SubmitIp`/`F_SubmitTime`/`F_UserAgent`、`F_VoidUserId`/`F_VoidTime`。
319 320 - **索引**: `UK_lq_employee_profile_submission_No`;`IDX_lq_employee_profile_submission_Status_SubmitTime`;`IDX_lq_employee_profile_submission_IdCardHash`;`IDX_lq_employee_profile_submission_MobilePhone`。
320 321 - **建表脚本**: `项目文档相关/sql/2026-07-18/员工档案扩展与扫码入职申请表.sql`。
... ...
项目文档相关/sql/2026-07-28/入职资料_银行实名与身份证地址照片.sql 0 → 100644
  1 +-- =============================================================================
  2 +-- 入职资料:银行开户实名、身份证地址与身份证正反面照片
  3 +-- 说明:为 lq_employee_profile / lq_employee_profile_submission 补齐字段;可重复执行
  4 +-- =============================================================================
  5 +
  6 +SET NAMES utf8mb4;
  7 +SET @db_name = DATABASE();
  8 +
  9 +-- lq_employee_profile.F_BankAccountName
  10 +SET @col_exists = (
  11 + SELECT COUNT(1) FROM information_schema.COLUMNS
  12 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile' AND COLUMN_NAME = 'F_BankAccountName'
  13 +);
  14 +SET @sql = IF(@col_exists = 0,
  15 + 'ALTER TABLE `lq_employee_profile` ADD COLUMN `F_BankAccountName` varchar(128) DEFAULT NULL COMMENT ''开户实名(开户人真实姓名)'' AFTER `F_BankCardCipher`;',
  16 + 'SELECT ''lq_employee_profile.F_BankAccountName 已存在'';'
  17 +);
  18 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  19 +
  20 +-- lq_employee_profile.F_IdCardAddress
  21 +SET @col_exists = (
  22 + SELECT COUNT(1) FROM information_schema.COLUMNS
  23 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile' AND COLUMN_NAME = 'F_IdCardAddress'
  24 +);
  25 +SET @sql = IF(@col_exists = 0,
  26 + 'ALTER TABLE `lq_employee_profile` ADD COLUMN `F_IdCardAddress` varchar(500) DEFAULT NULL COMMENT ''身份证地址(完整地址,独立于籍贯)'' AFTER `F_BankAccountName`;',
  27 + 'SELECT ''lq_employee_profile.F_IdCardAddress 已存在'';'
  28 +);
  29 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  30 +
  31 +-- lq_employee_profile.F_IdCardFrontUrl
  32 +SET @col_exists = (
  33 + SELECT COUNT(1) FROM information_schema.COLUMNS
  34 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile' AND COLUMN_NAME = 'F_IdCardFrontUrl'
  35 +);
  36 +SET @sql = IF(@col_exists = 0,
  37 + 'ALTER TABLE `lq_employee_profile` ADD COLUMN `F_IdCardFrontUrl` varchar(500) DEFAULT NULL COMMENT ''身份证正面照片 URL'' AFTER `F_IdCardAddress`;',
  38 + 'SELECT ''lq_employee_profile.F_IdCardFrontUrl 已存在'';'
  39 +);
  40 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  41 +
  42 +-- lq_employee_profile.F_IdCardBackUrl
  43 +SET @col_exists = (
  44 + SELECT COUNT(1) FROM information_schema.COLUMNS
  45 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile' AND COLUMN_NAME = 'F_IdCardBackUrl'
  46 +);
  47 +SET @sql = IF(@col_exists = 0,
  48 + 'ALTER TABLE `lq_employee_profile` ADD COLUMN `F_IdCardBackUrl` varchar(500) DEFAULT NULL COMMENT ''身份证反面照片 URL'' AFTER `F_IdCardFrontUrl`;',
  49 + 'SELECT ''lq_employee_profile.F_IdCardBackUrl 已存在'';'
  50 +);
  51 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  52 +
  53 +-- lq_employee_profile_submission.F_BankAccountName
  54 +SET @col_exists = (
  55 + SELECT COUNT(1) FROM information_schema.COLUMNS
  56 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile_submission' AND COLUMN_NAME = 'F_BankAccountName'
  57 +);
  58 +SET @sql = IF(@col_exists = 0,
  59 + 'ALTER TABLE `lq_employee_profile_submission` ADD COLUMN `F_BankAccountName` varchar(128) DEFAULT NULL COMMENT ''开户实名(开户人真实姓名)'' AFTER `F_BankCardCipher`;',
  60 + 'SELECT ''lq_employee_profile_submission.F_BankAccountName 已存在'';'
  61 +);
  62 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  63 +
  64 +-- lq_employee_profile_submission.F_IdCardAddress
  65 +SET @col_exists = (
  66 + SELECT COUNT(1) FROM information_schema.COLUMNS
  67 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile_submission' AND COLUMN_NAME = 'F_IdCardAddress'
  68 +);
  69 +SET @sql = IF(@col_exists = 0,
  70 + 'ALTER TABLE `lq_employee_profile_submission` ADD COLUMN `F_IdCardAddress` varchar(500) DEFAULT NULL COMMENT ''身份证地址(完整地址,独立于籍贯)'' AFTER `F_BankAccountName`;',
  71 + 'SELECT ''lq_employee_profile_submission.F_IdCardAddress 已存在'';'
  72 +);
  73 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  74 +
  75 +-- lq_employee_profile_submission.F_IdCardFrontUrl
  76 +SET @col_exists = (
  77 + SELECT COUNT(1) FROM information_schema.COLUMNS
  78 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile_submission' AND COLUMN_NAME = 'F_IdCardFrontUrl'
  79 +);
  80 +SET @sql = IF(@col_exists = 0,
  81 + 'ALTER TABLE `lq_employee_profile_submission` ADD COLUMN `F_IdCardFrontUrl` varchar(500) DEFAULT NULL COMMENT ''身份证正面照片 URL'' AFTER `F_IdCardAddress`;',
  82 + 'SELECT ''lq_employee_profile_submission.F_IdCardFrontUrl 已存在'';'
  83 +);
  84 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
  85 +
  86 +-- lq_employee_profile_submission.F_IdCardBackUrl
  87 +SET @col_exists = (
  88 + SELECT COUNT(1) FROM information_schema.COLUMNS
  89 + WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'lq_employee_profile_submission' AND COLUMN_NAME = 'F_IdCardBackUrl'
  90 +);
  91 +SET @sql = IF(@col_exists = 0,
  92 + 'ALTER TABLE `lq_employee_profile_submission` ADD COLUMN `F_IdCardBackUrl` varchar(500) DEFAULT NULL COMMENT ''身份证反面照片 URL'' AFTER `F_IdCardFrontUrl`;',
  93 + 'SELECT ''lq_employee_profile_submission.F_IdCardBackUrl 已存在'';'
  94 +);
  95 +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
... ...
项目文档相关/sql/2026-07-28/系统更新说明_V2.0.1.sql
... ... @@ -14,7 +14,7 @@ SET @Content = &#39;新增功能
14 14 门店五项指标排名:总业绩、总消耗、客头数、客次数、项目数可切换
15 15 服务日志统计:日志数、覆盖耗卡、覆盖率、照片完整率;支持明细查看
16 16 当日重复充值软提醒:门店 PC 开单、手机端耗卡保存前确认(不硬拦)
17   -【监控中心 → 重复充值审计】:按业务日期审计同会员同日第 2 笔及以后开单/耗卡
  17 +【监控中心 → 重复充值审计】:按业务日期审计同会员同日第 2 笔及以后开单/耗卡;支持查看关联业务明细
18 18  
19 19 2. 大项目战略决策增强
20 20  
... ... @@ -27,7 +27,7 @@ SET @Content = &#39;新增功能
27 27 3. 健康师金三角业绩(手机端)
28 28  
29 29 个人中心展示本月金三角业绩与提成缺口
30   -新增【金三角业绩】页;档位说明问号可开关
  30 +新增【金三角业绩】页;档位说明问号可开关(小程序端弹窗兼容)
31 31 【系统管理 → 系统设置 → 业务配置 → 金三角业绩】控制档位说明展示
32 32  
33 33 4. 手机端入口与合规
... ... @@ -48,16 +48,35 @@ SET @Content = &#39;新增功能
48 48  
49 49 列表增加退卡ID(门店列前)
50 50 导出品项分类按显示名转换(如医美 → DXM)
  51 +支持退卡/转卡类型筛选;列表展示退卡原因
  52 +导出按健康师拆行,便于对账
  53 +【会员退卡】恢复导出;支持类型筛选
51 54  
52 55 8. 沉睡回店配置
53 56  
54 57 【系统设置 → 业务配置】可配置沉睡回店判定天数
55 58  
  59 +9. 报销申请业务编号
  60 +
  61 +新增业务编号(如 ZC-2026-7-093)
  62 +【我的待办 / 所有申请】列表展示编号
  63 +报销表明细导出、申请列表导出增加「编号」列
  64 +手机端报销申请/审核列表同步展示编号
  65 +
  66 +10. 上传记录人员筛选
  67 +
  68 +【上传记录】筛选区增加「人员信息」,可按上传人查询
  69 +
  70 +11. 入职资料字段增强
  71 +
  72 +支持银行实名、身份证地址照片等资料维护(含敏感信息处理)
  73 +
56 74 优化与修复
57 75 1. 暗黑模式:步骤条、系统更新弹窗等可读性增强
58 76 2. 人事填报审核与敏感信息处理增强
59 77 3. 报销、水印、手机号脱敏相关体验优化
60   -4. 门店信息表单能力补充';
  78 +4. 门店信息表单能力补充
  79 +5. 报销申请时间:选日期若为当天零点,自动补当前时分秒;列表展示到秒';
61 80  
62 81 DELETE FROM lq_changelog WHERE F_Id = @ChangelogId OR F_Version = @Version;
63 82  
... ...