diff --git a/antis-ncc-admin/src/views/attendance-record/components/record-detail-dialog.vue b/antis-ncc-admin/src/views/attendance-record/components/record-detail-dialog.vue
index 7d68631..cb47805 100644
--- a/antis-ncc-admin/src/views/attendance-record/components/record-detail-dialog.vue
+++ b/antis-ncc-admin/src/views/attendance-record/components/record-detail-dialog.vue
@@ -44,7 +44,7 @@
             </div>
             <div class="overview-card info">
               <div class="overview-card__label">录入方式</div>
-              <div class="overview-card__value">{{ detail.isManual === 1 ? '含补卡/手工修正' : '真实打卡' }}</div>
+              <div class="overview-card__value">{{ isNoAttendanceRecord ? '无' : (detail.isManual === 1 ? '含补卡/手工修正' : '真实打卡') }}</div>
             </div>
           </div>
 
@@ -54,7 +54,7 @@
                 <span>上班打卡</span>
                 <div class="punch-card__actions">
                   <el-tag size="mini" :type="detail.punchIn && detail.punchIn.type === 2 ? 'warning' : 'success'">
-                    {{ detail.punchIn ? detail.punchIn.typeText || '未打卡' : '未打卡' }}
+                    {{ punchInTypeLabel }}
                   </el-tag>
                   <el-button size="mini" type="text" :disabled="!hasCoordinate(detail.punchIn)"
                     @click="openMap(detail.punchIn, '上班打卡地点')">查看地图</el-button>
@@ -63,7 +63,7 @@
               <div class="punch-card__content">
                 <div class="field-item">
                   <label>打卡时间</label>
-                  <span>{{ detail.punchIn ? detail.punchIn.time || '未打卡' : '未打卡' }}</span>
+                  <span>{{ punchInTimeLabel }}</span>
                 </div>
                 <div class="field-item">
                   <label>打卡地址</label>
@@ -89,7 +89,7 @@
                 <span>下班打卡</span>
                 <div class="punch-card__actions">
                   <el-tag size="mini" :type="detail.punchOut && detail.punchOut.type === 2 ? 'warning' : 'success'">
-                    {{ detail.punchOut ? detail.punchOut.typeText || '未打卡' : '未打卡' }}
+                    {{ punchOutTypeLabel }}
                   </el-tag>
                   <el-button size="mini" type="text" :disabled="!hasCoordinate(detail.punchOut)"
                     @click="openMap(detail.punchOut, '下班打卡地点')">查看地图</el-button>
@@ -98,7 +98,7 @@
               <div class="punch-card__content">
                 <div class="field-item">
                   <label>打卡时间</label>
-                  <span>{{ detail.punchOut ? detail.punchOut.time || '未打卡' : '未打卡' }}</span>
+                  <span>{{ punchOutTimeLabel }}</span>
                 </div>
                 <div class="field-item">
                   <label>打卡地址</label>
@@ -120,7 +120,7 @@
             </div>
           </div>
 
-          <el-card shadow="never" class="supplement-card">
+          <el-card v-if="hasSupplementInfo" shadow="never" class="supplement-card">
             <div slot="header" class="supplement-card__header supplement-card__header--row">
               <span>补卡信息</span>
               <el-button v-if="canShowCancelWorkflowSupplement" type="danger" size="mini" plain
@@ -151,7 +151,7 @@
             </div>
           </el-card>
 
-          <el-card v-if="hasRelatedWorkflows || isLeaveOrSickStatus" shadow="never"
+          <el-card v-if="hasAttendanceRecord && (hasRelatedWorkflows || isLeaveOrSickStatus)" shadow="never"
             class="supplement-card workflow-card">
             <div slot="header" class="supplement-card__header">
               <span>关联流程</span>
@@ -176,6 +176,17 @@
               <span>当前为{{ detail.statusText }}状态，暂无关联流程记录</span>
             </div>
           </el-card>
+
+          <el-card v-if="showRecordRemarkOnly" shadow="never" class="supplement-card">
+            <div slot="header" class="supplement-card__header">
+              <span>记录备注</span>
+            </div>
+            <div class="supplement-grid">
+              <div class="field-item field-item--full">
+                <span>{{ detail.remark || '无' }}</span>
+              </div>
+            </div>
+          </el-card>
         </template>
 
         <el-empty v-else :image-size="72" description="暂无考勤详情" />
@@ -232,6 +243,7 @@ export default {
         case 2:
           return 'warning'
         case 3:
+        case 8:
           return 'info'
         default:
           return 'danger'
@@ -240,12 +252,78 @@ export default {
     hasRelatedWorkflows() {
       return this.detail && Array.isArray(this.detail.relatedWorkflows) && this.detail.relatedWorkflows.length > 0
     },
+    /** 后端无考勤行时返回 hasAttendanceRecord: false（兼容旧接口：有 id 视为有记录） */
+    hasAttendanceRecord() {
+      const d = this.detail
+      if (!d) return true
+      const h = d.hasAttendanceRecord
+      if (h === false || h === 0) return false
+      if (d.id) return true
+      return h !== false && h !== 0
+    },
+    isNoAttendanceRecord() {
+      return !!(this.detail && (this.detail.hasAttendanceRecord === false || this.detail.hasAttendanceRecord === 0))
+    },
+    /** 考勤日晚于今日、尚无打卡（后端 status=8 待考勤） */
+    isPendingAttendanceDay() {
+      const d = this.detail
+      if (!d || !this.hasAttendanceRecord) return false
+      const s = d.status
+      return s === 8 || s === '8'
+    },
+    /** 备注已记销假时不再视为「待销假」请假态，避免仍显示确认销假 */
     isLeaveOrSickStatus() {
-      return this.detail && (this.detail.status === 4 || this.detail.status === 5)
+      if (!this.detail) return false
+      const r = this.detail.remark
+      if (r != null && String(r).indexOf('销假') >= 0) return false
+      return this.detail.status === 4 || this.detail.status === 5
+    },
+    /** 无补卡卡片时，若有考勤备注仍单独展示（原备注在补卡卡片内） */
+    showRecordRemarkOnly() {
+      if (!this.detail || !this.hasAttendanceRecord) return false
+      const r = this.detail.remark
+      if (r == null || String(r).trim() === '') return false
+      return !this.hasSupplementInfo
+    },
+    /** 无流程补卡数据时不展示补卡信息卡片（避免全是「无」仍占版面） */
+    hasSupplementInfo() {
+      if (!this.detail || !this.hasAttendanceRecord) return false
+      const s = this.detail.supplement
+      if (!s) return false
+      const wf = s.workflowId != null && s.workflowId !== '' ? s.workflowId : s.WorkflowId
+      if (wf) return true
+      const r = s.remark != null && s.remark !== '' ? s.remark : s.Remark
+      if (r) return true
+      const op = s.operatorName != null && s.operatorName !== '' ? s.operatorName : s.OperatorName
+      if (op) return true
+      const t = s.operateTime != null && s.operateTime !== '' ? s.operateTime : s.OperateTime
+      return !!t
+    },
+    punchInTypeLabel() {
+      if (this.isNoAttendanceRecord || this.isPendingAttendanceDay) return '暂无打卡'
+      const p = this.detail && this.detail.punchIn
+      return p ? (p.typeText || '未打卡') : '未打卡'
+    },
+    punchInTimeLabel() {
+      if (this.isNoAttendanceRecord || this.isPendingAttendanceDay) return '暂无打卡'
+      const p = this.detail && this.detail.punchIn
+      return p ? (p.time || '未打卡') : '未打卡'
+    },
+    punchOutTypeLabel() {
+      if (this.isNoAttendanceRecord || this.isPendingAttendanceDay) return '暂无打卡'
+      const p = this.detail && this.detail.punchOut
+      return p ? (p.typeText || '未打卡') : '未打卡'
+    },
+    punchOutTimeLabel() {
+      if (this.isNoAttendanceRecord || this.isPendingAttendanceDay) return '暂无打卡'
+      const p = this.detail && this.detail.punchOut
+      return p ? (p.time || '未打卡') : '未打卡'
     },
     /** 正常上下班均已打卡，或已有补卡/手工修正，或请假/病假：不显示后台补卡入口 */
     showSupplementButton() {
       if (!this.detail) return false
+      if (!this.detail.id) return false
+      if (this.detail.status === 8 || this.detail.status === '8') return false
       if (this.detail.isManual === 1) return false
       if (this.detail.status === 4 || this.detail.status === 5) return false
       const hasIn = !!(this.detail.punchIn && this.detail.punchIn.time)
@@ -311,6 +389,7 @@ export default {
     workflowTagType(type) {
       if (type === '请假') return 'danger'
       if (type === '补卡') return 'warning'
+      if (type === '销假') return 'success'
       return 'info'
     },
     canOpenRelatedWorkflow(wf) {
diff --git a/antis-ncc-admin/src/views/attendance-record/index.vue b/antis-ncc-admin/src/views/attendance-record/index.vue
index 38aa4c0..20774cd 100644
--- a/antis-ncc-admin/src/views/attendance-record/index.vue
+++ b/antis-ncc-admin/src/views/attendance-record/index.vue
@@ -7,11 +7,11 @@
             <div class="record-hero__eyebrow">Attendance Record</div>
             <h2 class="record-hero__title">考勤记录</h2>
             <p class="record-hero__desc">
-              按月查看员工每日考勤状态（含打卡、补卡及审批通过的请假/病假同步），可查看上下班时间、地点、照片与补卡信息；点击有记录的日期可查看详情并后台补卡。
+              按月查看员工每日考勤状态（列表含筛选范围内全部在职员工，无记录日期显示为无）；含打卡、补卡及审批通过的请假/病假同步，可查看上下班时间、地点、照片与补卡信息；点击日期可查看详情并后台补卡。
             </p>
           </div>
           <div class="record-hero__actions">
-            <el-button type="primary" plain icon="el-icon-download" :loading="exportLoading"
+            <el-button v-if="viewMode === 'month'" type="primary" plain icon="el-icon-download" :loading="exportLoading"
               @click="exportMonthReport">导出月度明细</el-button>
             <el-button icon="el-icon-refresh-right" @click="refreshPage">刷新</el-button>
           </div>
@@ -22,10 +22,21 @@
 
         <el-card class="filter-card" shadow="never">
           <el-form :inline="true" :model="query" class="filter-form" @submit.native.prevent>
-            <el-form-item label="统计月份">
+            <el-form-item label="视图">
+              <el-radio-group v-model="viewMode" size="mini" @change="onViewModeChange">
+                <el-radio-button label="month">月</el-radio-button>
+                <el-radio-button label="week">周</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+
+            <el-form-item v-if="viewMode === 'month'" label="统计月份">
               <el-date-picker v-model="query.month" type="month" value-format="yyyy-MM" format="yyyy-MM"
                 placeholder="选择月份" />
             </el-form-item>
+            <el-form-item v-else label="选择日期">
+              <el-date-picker v-model="query.weekDate" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                placeholder="选择任意日期" @change="onWeekDateChange" />
+            </el-form-item>
             <el-form-item label="考勤分组">
               <el-select v-model="query.attendanceGroupId" clearable filterable placeholder="全部分组">
                 <el-option v-for="item in attendanceGroupOptions" :key="item.id" :label="item.fullName"
@@ -46,7 +57,7 @@
           <div class="summary-card">
             <div class="summary-card__label">员工人数</div>
             <div class="summary-card__value">{{ summary.employeeCount }}</div>
-            <div class="summary-card__hint">当前筛选条件下有考勤记录的员工数</div>
+            <div class="summary-card__hint">当前筛选条件下的在职员工数（含当月无考勤记录）</div>
           </div>
           <div class="summary-card success">
             <div class="summary-card__label">正常出勤</div>
@@ -68,7 +79,7 @@
         <el-card class="table-card" shadow="never">
           <div slot="header" class="table-card__header">
             <div>
-              <span>月度考勤明细</span>
+              <span>{{ viewMode === 'month' ? '月度考勤明细' : '周度考勤明细' }}</span>
               <span class="table-card__sub">{{ headerText }}</span>
             </div>
             <div class="table-card__legend">
@@ -94,10 +105,10 @@
               </template>
             </el-table-column>
 
-            <el-table-column v-for="day in monthDays" :key="day.key" :label="day.label" :min-width="110" align="left">
+            <el-table-column v-for="day in activeDays" :key="day.key" :label="day.label" :min-width="110" align="left">
               <template slot-scope="scope">
                 <div class="day-cell"
-                  :class="[`status-${scope.row.dayRecords[day.key].statusKey}`, { clickable: scope.row.dayRecords[day.key].statusKey !== 'empty' }]"
+                  :class="[`status-${scope.row.dayRecords[day.key].statusKey}`, 'clickable']"
                   @click="handleOpenDetail(scope.row, day.key, scope.row.dayRecords[day.key])">
                   <div class="day-cell__time">{{ scope.row.dayRecords[day.key].timeText }}</div>
                   <el-tag :type="scope.row.dayRecords[day.key].tagType" size="mini" effect="plain">
@@ -136,6 +147,7 @@ export default {
   },
   data() {
     return {
+      viewMode: 'month',
       pageLoading: false,
       tableLoading: false,
       exportLoading: false,
@@ -147,7 +159,29 @@ export default {
     }
   },
   computed: {
-    monthDays() {
+    headerText() {
+      if (this.viewMode === 'week') {
+        const anchor = dayjs(this.query.weekDate || dayjs().format('YYYY-MM-DD'))
+        const diff = (anchor.day() + 6) % 7 // Monday-based
+        const start = anchor.subtract(diff, 'day')
+        const end = start.add(6, 'day')
+        return `${start.format('YYYY-MM-DD')} ~ ${end.format('YYYY-MM-DD')}`
+      }
+      return `${this.query.month} · 共 ${this.activeDays.length} 天`
+    },
+    activeDays() {
+      if (this.viewMode === 'week') {
+        const anchor = dayjs(this.query.weekDate || dayjs().format('YYYY-MM-DD'))
+        const diff = (anchor.day() + 6) % 7 // Monday-based
+        const start = anchor.subtract(diff, 'day')
+        return Array.from({ length: 7 }).map((_, index) => {
+          const date = start.add(index, 'day')
+          return {
+            key: date.format('YYYY-MM-DD'),
+            label: `${index + 1}日\n${this.getWeekLabel(date.day())}`
+          }
+        })
+      }
       const base = dayjs(`${this.query.month}-01`)
       const total = base.daysInMonth()
       return Array.from({ length: total }).map((_, index) => {
@@ -157,9 +191,6 @@ export default {
           label: `${index + 1}日\n${this.getWeekLabel(date.day())}`
         }
       })
-    },
-    headerText() {
-      return `${this.query.month} · 共 ${this.monthDays.length} 天`
     }
   },
   created() {
@@ -169,6 +200,7 @@ export default {
     createDefaultQuery() {
       return {
         month: dayjs().format('YYYY-MM'),
+        weekDate: dayjs().format('YYYY-MM-DD'),
         attendanceGroupId: '',
         keyword: '',
         currentPage: 1,
@@ -228,6 +260,9 @@ export default {
       }
     },
     async loadData() {
+      if (this.viewMode === 'week') {
+        this.query.month = dayjs(this.query.weekDate || dayjs().format('YYYY-MM-DD')).format('YYYY-MM')
+      }
       if (!this.query.month) {
         this.summary = this.createEmptySummary()
         this.total = 0
@@ -252,7 +287,7 @@ export default {
     },
     normalizeRow(item) {
       const dayRecordMap = {}
-      this.monthDays.forEach(day => {
+      this.activeDays.forEach(day => {
         dayRecordMap[day.key] = this.createEmptyDayRecord()
       })
         ; (item.dayRecords || []).forEach(record => {
@@ -271,10 +306,22 @@ export default {
       this.loadData()
     },
     search() {
-      if (!this.query.month) {
+      if (this.viewMode === 'month' && !this.query.month) {
         this.$message.warning('请选择统计月份')
         return
       }
+      if (this.viewMode === 'week' && !this.query.weekDate) {
+        this.$message.warning('请选择日期')
+        return
+      }
+      this.query.currentPage = 1
+      this.loadData()
+    },
+    onViewModeChange() {
+      this.query.currentPage = 1
+      this.loadData()
+    },
+    onWeekDateChange() {
       this.query.currentPage = 1
       this.loadData()
     },
@@ -283,7 +330,7 @@ export default {
       this.loadData()
     },
     handleOpenDetail(row, attendanceDate, dayRecord) {
-      if (!dayRecord || dayRecord.statusKey === 'empty') return
+      // 即使当天为“空白/无记录”，也允许点开详情（弹窗内会显示暂无详情）
       this.$refs.recordDetailDialog.open({
         userId: row.userId,
         attendanceDate
@@ -504,7 +551,8 @@ export default {
   }
 
   .status-rest .day-cell__time,
-  .status-empty .day-cell__time {
+  .status-empty .day-cell__time,
+  .status-pending .day-cell__time {
     color: #909399;
   }
 
diff --git a/antis-ncc-admin/src/views/lqMdxx/Form.vue b/antis-ncc-admin/src/views/lqMdxx/Form.vue
index 13afe01..d0dae8a 100644
--- a/antis-ncc-admin/src/views/lqMdxx/Form.vue
+++ b/antis-ncc-admin/src/views/lqMdxx/Form.vue
@@ -53,6 +53,62 @@
 						</div>
 					</el-form-item>
 				</el-col>
+				<el-col :span="24">
+					<el-form-item label="正常打卡方式">
+						<div class="att-punch-check-row">
+							<el-checkbox :true-label="1" :false-label="0"
+								v-model="dataForm.attendanceCheckFence">范围打卡（电子围栏）</el-checkbox>
+							<el-checkbox :true-label="1" :false-label="0" v-model="dataForm.attendanceCheckWifi">Wi-Fi
+								打卡</el-checkbox>
+						</div>
+						<div class="att-punch-hint">
+							可同时勾选：<strong>两者都勾选</strong>时，员工在打卡<strong>范围内</strong>或满足<strong>门店
+								Wi-Fi 规则</strong>，<strong>满足其一</strong>即可；仅勾选一项则只校验该项。
+							Wi-Fi 以<strong>成对表</strong>维护（SSID + BSSID）；可选「校验对应」防同名热点，拿不到 BSSID 时需依赖<strong>围栏
+								+ SSID</strong>。
+						</div>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="Number(dataForm.attendanceCheckWifi) === 1">
+					<el-form-item label="Wi-Fi 白名单">
+						<div v-if="!isDetail" class="wifi-pair-toolbar">
+							<el-button type="primary" size="small" icon="el-icon-plus"
+								@click="addWifiPair">添加一行</el-button>
+						</div>
+						<div class="wifi-pair-table">
+							<div class="wifi-pair-head">
+								<span class="wifi-pair-col-ssid">Wi-Fi 名称 (SSID)</span>
+								<span class="wifi-pair-col-bssid">BSSID（路由器 MAC）</span>
+								<span v-if="!isDetail" class="wifi-pair-col-act"></span>
+							</div>
+							<div v-for="(row, index) in dataForm.attendanceWifiPairList" :key="'wp-' + index"
+								class="wifi-pair-row">
+								<el-input v-model="row.ssid" size="small" :disabled="isDetail" maxlength="64"
+									placeholder="与手机显示一致" />
+								<el-input v-model="row.bssid" size="small" :disabled="isDetail" maxlength="64"
+									placeholder="如 aa:bb:cc:dd:ee:ff" />
+								<div v-if="!isDetail" class="wifi-pair-col-act">
+									<el-button type="text" size="small" class="wifi-pair-del"
+										@click="removeWifiPair(index)">删除</el-button>
+								</div>
+							</div>
+							<div v-if="!dataForm.attendanceWifiPairList.length" class="store-tags-empty">请至少添加一行；建议 SSID
+								与 BSSID 成对填写</div>
+						</div>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="Number(dataForm.attendanceCheckWifi) === 1">
+					<el-form-item label=" ">
+						<el-checkbox :true-label="1" :false-label="0" v-model="dataForm.attendanceWifiVerifyPair">
+							校验 SSID 与 BSSID 为同一 AP（防同名热点）
+						</el-checkbox>
+						<div class="att-punch-hint wifi-verify-hint">
+							<strong>开启</strong>：能获取 BSSID 时必须与表中<strong>同一行</strong>的 SSID、BSSID 同时一致；获取不到 BSSID
+							时须<strong>在电子围栏内</strong>且 SSID 命中。<strong>关闭</strong>：当前网络的 SSID 或 BSSID
+							命中表中<strong>任意一行</strong>的任一字段即可。
+						</div>
+					</el-form-item>
+				</el-col>
 
 				<!-- 其他业务字段 -->
 				<el-col :span="12">
@@ -98,70 +154,43 @@
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="门店图片" prop="storeImages">
-						<NCC-UploadImg v-model="dataForm.storeImages" :fileSize="5" sizeUnit="MB" :limit="9" :disabled="!!isDetail" />
+						<NCC-UploadImg v-model="dataForm.storeImages" :fileSize="5" sizeUnit="MB" :limit="9"
+							:disabled="!!isDetail" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="门店介绍" prop="storeDescription">
-						<el-input v-model="dataForm.storeDescription" type="textarea" :rows="4" maxlength="1000" show-word-limit
-							placeholder="请输入门店介绍" />
+						<el-input v-model="dataForm.storeDescription" type="textarea" :rows="4" maxlength="1000"
+							show-word-limit placeholder="请输入门店介绍" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="营业时间设置" prop="businessHours">
-						<el-input
-							v-model="dataForm.businessHours"
-							type="textarea"
-							:rows="3"
-							maxlength="500"
-							show-word-limit
-							placeholder="请输入营业时间设置"
-						/>
+						<el-input v-model="dataForm.businessHours" type="textarea" :rows="3" maxlength="500"
+							show-word-limit placeholder="请输入营业时间设置" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="交通提示" prop="trafficTips">
-						<el-input
-							v-model="dataForm.trafficTips"
-							type="textarea"
-							:rows="3"
-							maxlength="500"
-							show-word-limit
-							placeholder="请输入交通提示"
-						/>
+						<el-input v-model="dataForm.trafficTips" type="textarea" :rows="3" maxlength="500"
+							show-word-limit placeholder="请输入交通提示" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="门店标签" prop="storeTags">
 						<div class="store-tags-editor">
 							<div class="store-tags-list">
-								<el-tag
-									v-for="(tag, index) in dataForm.storeTags"
-									:key="`${tag}-${index}`"
-									:disable-transitions="false"
-									:closable="!isDetail"
-									@close="handleRemoveTag(index)">
+								<el-tag v-for="(tag, index) in dataForm.storeTags" :key="`${tag}-${index}`"
+									:disable-transitions="false" :closable="!isDetail" @close="handleRemoveTag(index)">
 									{{ tag }}
 								</el-tag>
 								<span v-if="!dataForm.storeTags.length" class="store-tags-empty">暂无标签</span>
 							</div>
 							<div class="store-tags-action-row" v-if="!isDetail">
-								<el-input
-									v-if="inputTagVisible"
-									ref="tagInput"
-									v-model="inputTagValue"
-									class="input-new-tag"
-									size="small"
-									maxlength="20"
-									placeholder="请输入标签内容"
-									@keyup.enter.native="handleInputTagConfirm"
-									@blur="handleInputTagConfirm"
-								/>
-								<el-button
-									v-else
-									class="button-new-tag tag-action-btn"
-									size="small"
-									icon="el-icon-plus"
+								<el-input v-if="inputTagVisible" ref="tagInput" v-model="inputTagValue"
+									class="input-new-tag" size="small" maxlength="20" placeholder="请输入标签内容"
+									@keyup.enter.native="handleInputTagConfirm" @blur="handleInputTagConfirm" />
+								<el-button v-else class="button-new-tag tag-action-btn" size="small" icon="el-icon-plus"
 									@click="showTagInput">
 									新增标签
 								</el-button>
@@ -186,15 +215,10 @@
 					</div>
 				</div>
 				<div class="location-search-bar">
-					<el-input
-						v-model="locationSearchKeyword"
-						placeholder="输入地址或关键词检索（如：成都市武侯区紫荆北路182号）"
-						clearable
-						size="small"
-						class="search-input"
-						@keyup.enter.native="handleSearchLocation"
-					>
-						<el-button slot="append" icon="el-icon-search" @click="handleSearchLocation" :loading="locationSearchLoading">检索</el-button>
+					<el-input v-model="locationSearchKeyword" placeholder="输入地址或关键词检索（如：成都市武侯区紫荆北路182号）" clearable
+						size="small" class="search-input" @keyup.enter.native="handleSearchLocation">
+						<el-button slot="append" icon="el-icon-search" @click="handleSearchLocation"
+							:loading="locationSearchLoading">检索</el-button>
 					</el-input>
 				</div>
 				<div id="location-map" class="map-canvas"></div>
@@ -253,22 +277,22 @@ const TMAP_WS_KEY = 'YRXBZ-NEV6T-K7SXH-VJPMF-G5IQF-F3FCJ'
 
 // JSONP 调用（绕过 CORS，腾讯 WebService API 前端需用 JSONP）
 function jsonp(url) {
-  return new Promise((resolve, reject) => {
-    const cbName = '_tmap_jsonp_' + Date.now() + '_' + Math.random().toString(36).slice(2);
-    const script = document.createElement('script');
-    script.src = url + (url.indexOf('?') >= 0 ? '&' : '?') + 'output=jsonp&callback=' + cbName;
-    window[cbName] = function(res) {
-      if (script.parentNode) script.parentNode.removeChild(script);
-      delete window[cbName];
-      resolve(res);
-    };
-    script.onerror = function() {
-      if (script.parentNode) script.parentNode.removeChild(script);
-      delete window[cbName];
-      reject(new Error('JSONP request failed'));
-    };
-    document.body.appendChild(script);
-  });
+	return new Promise((resolve, reject) => {
+		const cbName = '_tmap_jsonp_' + Date.now() + '_' + Math.random().toString(36).slice(2);
+		const script = document.createElement('script');
+		script.src = url + (url.indexOf('?') >= 0 ? '&' : '?') + 'output=jsonp&callback=' + cbName;
+		window[cbName] = function (res) {
+			if (script.parentNode) script.parentNode.removeChild(script);
+			delete window[cbName];
+			resolve(res);
+		};
+		script.onerror = function () {
+			if (script.parentNode) script.parentNode.removeChild(script);
+			delete window[cbName];
+			reject(new Error('JSONP request failed'));
+		};
+		document.body.appendChild(script);
+	});
 }
 
 export default {
@@ -296,6 +320,10 @@ export default {
 				storeTags: [],
 				businessHours: '',
 				trafficTips: '',
+				attendanceCheckFence: 0,
+				attendanceCheckWifi: 0,
+				attendanceWifiPairList: [],
+				attendanceWifiVerifyPair: 0,
 			},
 			rules: {
 				mdbm: [{ required: true, message: '请输入门店编码', trigger: 'blur' }],
@@ -383,6 +411,14 @@ export default {
 							this.dataForm.storeDescription = raw.storeDescription || '';
 							this.dataForm.businessHours = raw.businessHours || '';
 							this.dataForm.trafficTips = raw.trafficTips || '';
+							const acf = raw.attendanceCheckFence != null ? Number(raw.attendanceCheckFence) : (raw.AttendanceCheckFence != null ? Number(raw.AttendanceCheckFence) : null);
+							const acw = raw.attendanceCheckWifi != null ? Number(raw.attendanceCheckWifi) : (raw.AttendanceCheckWifi != null ? Number(raw.AttendanceCheckWifi) : null);
+							this.dataForm.attendanceCheckFence = acf != null ? acf : 1;
+							this.dataForm.attendanceCheckWifi = acw != null ? acw : 0;
+							const avp = raw.attendanceWifiVerifyPair != null ? Number(raw.attendanceWifiVerifyPair) : (raw.AttendanceWifiVerifyPair != null ? Number(raw.AttendanceWifiVerifyPair) : null);
+							this.dataForm.attendanceWifiVerifyPair = avp != null ? avp : 0;
+							const apRaw = raw.attendanceWifiPairs != null ? raw.attendanceWifiPairs : raw.AttendanceWifiPairs;
+							this.dataForm.attendanceWifiPairList = this.parseWifiPairList(apRaw);
 						});
 				} else {
 					// 新建时重置经纬度与围栏
@@ -394,10 +430,38 @@ export default {
 					this.dataForm.storeTags = [];
 					this.dataForm.businessHours = '';
 					this.dataForm.trafficTips = '';
+					this.dataForm.attendanceCheckFence = 0;
+					this.dataForm.attendanceCheckWifi = 0;
+					this.dataForm.attendanceWifiPairList = [];
+					this.dataForm.attendanceWifiVerifyPair = 0;
 				}
 			})
 		},
 
+		addWifiPair() {
+			if (this.isDetail) return;
+			this.dataForm.attendanceWifiPairList.push({ ssid: '', bssid: '' });
+		},
+
+		removeWifiPair(index) {
+			if (this.isDetail) return;
+			this.dataForm.attendanceWifiPairList.splice(index, 1);
+		},
+
+		parseWifiPairList(value) {
+			const arr = this.parseJsonArray(value);
+			if (!arr.length) return [];
+			return arr.map((item) => {
+				if (item && typeof item === 'object') {
+					return {
+						ssid: (item.ssid != null ? String(item.ssid) : (item.Ssid != null ? String(item.Ssid) : '')).trim(),
+						bssid: (item.bssid != null ? String(item.bssid) : (item.Bssid != null ? String(item.Bssid) : '')).trim()
+					};
+				}
+				return { ssid: '', bssid: '' };
+			}).filter((p) => p.ssid || p.bssid);
+		},
+
 		parseJsonArray(value) {
 			if (!value) return [];
 			if (Array.isArray(value)) return value;
@@ -810,6 +874,16 @@ export default {
 		dataFormSubmit() {
 			this.$refs['elForm'].validate((valid) => {
 				if (!valid) return;
+				if (Number(this.dataForm.attendanceCheckWifi) === 1) {
+					const pairs = (this.dataForm.attendanceWifiPairList || []).map((r) => ({
+						ssid: (r.ssid || '').trim(),
+						bssid: (r.bssid || '').trim()
+					})).filter((p) => p.ssid || p.bssid);
+					if (!pairs.length) {
+						this.$message.warning('开启 Wi-Fi 打卡时请至少添加一行 Wi-Fi 白名单');
+						return;
+					}
+				}
 				const isNew = !this.dataForm.id;
 				// 提交前：fencePolygons 若为数组则序列化为 JSON 字符串，与后端约定一致
 				const submitData = { ...this.dataForm };
@@ -822,6 +896,13 @@ export default {
 				if (Array.isArray(submitData.storeTags)) {
 					submitData.storeTags = JSON.stringify(submitData.storeTags);
 				}
+				delete submitData.attendanceWifiPairList;
+				const pairRows = (this.dataForm.attendanceWifiPairList || []).map((r) => ({
+					ssid: (r.ssid || '').trim(),
+					bssid: (r.bssid || '').trim()
+				})).filter((p) => p.ssid || p.bssid);
+				submitData.attendanceWifiPairs = JSON.stringify(pairRows);
+				submitData.attendanceWifiVerifyPair = this.dataForm.attendanceWifiVerifyPair != null ? Number(this.dataForm.attendanceWifiVerifyPair) : 0;
 				request({
 					url: isNew ? '/api/Extend/LqMdxx' : `/api/Extend/LqMdxx/${this.dataForm.id}`,
 					method: isNew ? 'POST' : 'PUT',
@@ -844,6 +925,65 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.att-punch-check-row {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	gap: 16px 24px;
+}
+
+.att-punch-hint {
+	margin-top: 8px;
+	font-size: 12px;
+	color: #909399;
+	line-height: 1.5;
+}
+
+.wifi-verify-hint {
+	margin-top: 6px;
+}
+
+.wifi-pair-toolbar {
+	margin-bottom: 10px;
+}
+
+.wifi-pair-table {
+	width: 100%;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	overflow: hidden;
+}
+
+.wifi-pair-head {
+	display: grid;
+	grid-template-columns: 1fr 1fr 56px;
+	gap: 8px;
+	align-items: center;
+	padding: 8px 10px;
+	background: #f5f7fa;
+	font-size: 12px;
+	color: #606266;
+	font-weight: 500;
+}
+
+.wifi-pair-row {
+	display: grid;
+	grid-template-columns: 1fr 1fr 56px;
+	gap: 8px;
+	align-items: center;
+	padding: 8px 10px;
+	border-top: 1px solid #ebeef5;
+}
+
+.wifi-pair-col-act {
+	text-align: right;
+}
+
+.wifi-pair-del {
+	color: #f56c6c;
+	padding: 0;
+}
+
 .fence-status-bar {
 	display: flex;
 	align-items: center;
@@ -953,6 +1093,7 @@ export default {
 	}
 
 	.store-tags-editor {
+
 		.input-new-tag,
 		.tag-action-btn {
 			width: 100%;
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAttendanceRecord/LqAttendanceRecordPunchInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAttendanceRecord/LqAttendanceRecordPunchInput.cs
index 967c336..d71381c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAttendanceRecord/LqAttendanceRecordPunchInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAttendanceRecord/LqAttendanceRecordPunchInput.cs
@@ -61,5 +61,17 @@ namespace NCC.Extend.Entitys.Dto.LqAttendanceRecord
         /// </summary>
         [Display(Name = "备注")]
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 当前连接 Wi-Fi 的 SSID（小程序上报，用于门店 Wi-Fi 打卡校验）
+        /// </summary>
+        [Display(Name = "Wi-Fi SSID")]
+        public string WifiSsid { get; set; }
+
+        /// <summary>
+        /// 当前连接 Wi-Fi 的 BSSID（可选）
+        /// </summary>
+        [Display(Name = "Wi-Fi BSSID")]
+        public string WifiBssid { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
index b107322..ef8bc36 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
@@ -59,6 +59,26 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         public string fencePolygons { get; set; }
 
         /// <summary>
+        /// 正常打卡是否启用电子围栏校验（1-是，0-否；null 沿用后端默认）
+        /// </summary>
+        public int? attendanceCheckFence { get; set; }
+
+        /// <summary>
+        /// 正常打卡是否启用 Wi-Fi 校验（1-是，0-否）
+        /// </summary>
+        public int? attendanceCheckWifi { get; set; }
+
+        /// <summary>
+        /// Wi-Fi 成对配置（SSID+BSSID），JSON 数组字符串，如 [{"ssid":"x","bssid":"aa:bb:..."}]
+        /// </summary>
+        public string attendanceWifiPairs { get; set; }
+
+        /// <summary>
+        /// 是否校验 SSID 与 BSSID 对应（1-是，0-否）
+        /// </summary>
+        public int? attendanceWifiVerifyPair { get; set; }
+
+        /// <summary>
         /// 姓名
         /// </summary>
         public string xm { get; set; }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
index 7084722..b78d773 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
@@ -61,6 +61,26 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         public string fencePolygons { get; set; }
 
         /// <summary>
+        /// 正常打卡是否启用电子围栏校验（1-是，0-否）
+        /// </summary>
+        public int? attendanceCheckFence { get; set; }
+
+        /// <summary>
+        /// 正常打卡是否启用 Wi-Fi 校验（1-是，0-否）
+        /// </summary>
+        public int? attendanceCheckWifi { get; set; }
+
+        /// <summary>
+        /// Wi-Fi 成对配置（SSID+BSSID），JSON 数组字符串
+        /// </summary>
+        public string attendanceWifiPairs { get; set; }
+
+        /// <summary>
+        /// 是否校验 SSID 与 BSSID 对应（1-是，0-否）
+        /// </summary>
+        public int? attendanceWifiVerifyPair { get; set; }
+
+        /// <summary>
         /// 姓名
         /// </summary>
         public string xm { get; set; }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
index 96dbbc2..c2bf7ad 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
@@ -72,6 +72,30 @@ namespace NCC.Extend.Entitys.lq_mdxx
         public string FencePolygons { get; set; }
 
         /// <summary>
+        /// 正常打卡是否启用电子围栏校验（1-是，0-否；null 表示沿用旧逻辑：已配置围栏则校验）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_AttendanceCheckFence")]
+        public int? AttendanceCheckFence { get; set; }
+
+        /// <summary>
+        /// 正常打卡是否启用 Wi-Fi（成对 SSID+BSSID）校验（1-是，0-否；null 视为 0）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_AttendanceCheckWifi")]
+        public int? AttendanceCheckWifi { get; set; }
+
+        /// <summary>
+        /// 允许打卡的 Wi-Fi 成对配置，JSON 数组，如 [{"ssid":"门店5G","bssid":"aa:bb:cc:dd:ee:ff"}]
+        /// </summary>
+        [SugarColumn(ColumnName = "F_AttendanceWifiPairs", ColumnDataType = "varchar(4000)")]
+        public string AttendanceWifiPairs { get; set; }
+
+        /// <summary>
+        /// 是否校验 SSID 与 BSSID 为同一 AP（1-是：有 BSSID 时必须整对命中；无 BSSID 时需同时在围栏内且 SSID 命中；0-否：命中任一条的 SSID 或 BSSID 即可）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_AttendanceWifiVerifyPair")]
+        public int? AttendanceWifiVerifyPair { get; set; }
+
+        /// <summary>
         /// 姓名
         /// </summary>
         [SugarColumn(ColumnName = "xm")]
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/wform_leave_cancel_apply/WformLeaveCancelApplyEntityLite.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/wform_leave_cancel_apply/WformLeaveCancelApplyEntityLite.cs
new file mode 100644
index 0000000..3eff5b1
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/wform_leave_cancel_apply/WformLeaveCancelApplyEntityLite.cs
@@ -0,0 +1,35 @@
+using System;
+using NCC.Common.Const;
+using SqlSugar;
+
+namespace NCC.Extend.Entitys.wform_leave_cancel_apply
+{
+    /// <summary>
+    /// 销假申请单（精简映射：考勤详情关联流程）
+    /// </summary>
+    [SugarTable("WFORM_LEAVE_CANCEL_APPLY")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class WformLeaveCancelApplyEntityLite
+    {
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        [SugarColumn(ColumnName = "F_FLOWID")]
+        public string FlowId { get; set; }
+
+        [SugarColumn(ColumnName = "F_BILLNO")]
+        public string BillNo { get; set; }
+
+        /// <summary>
+        /// 待销假的考勤记录主键（lq_attendance_record.F_Id）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ATTENDANCERECORDID")]
+        public string AttendanceRecordId { get; set; }
+
+        [SugarColumn(ColumnName = "F_APPLYDATE")]
+        public DateTime? ApplyDate { get; set; }
+
+        [SugarColumn(ColumnName = "F_CANCELREASON")]
+        public string CancelReason { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/AttendanceRecordStatusEnum.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/AttendanceRecordStatusEnum.cs
index c3e765b..41003ef 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/AttendanceRecordStatusEnum.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/AttendanceRecordStatusEnum.cs
@@ -47,6 +47,12 @@ namespace NCC.Extend.Entitys.Enum
         /// 旷工
         /// </summary>
         [Description("旷工")]
-        旷工 = 7
+        旷工 = 7,
+
+        /// <summary>
+        /// 考勤日晚于当前日期、尚无打卡数据（界面展示「暂无打卡」，不计入缺卡类统计）
+        /// </summary>
+        [Description("暂无打卡")]
+        待考勤 = 8
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceRecordService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceRecordService.cs
index 2db023e..84650df 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceRecordService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceRecordService.cs
@@ -27,6 +27,7 @@ using NCC.Extend.Entitys.lq_attendance_missing_card_rule;
 using NCC.Extend.Entitys.lq_attendance_record;
 using NCC.Extend.Entitys.lq_attendance_setting;
 using NCC.Extend.Entitys.lq_mdxx;
+using NCC.Extend.Entitys.wform_leave_cancel_apply;
 using NCC.Extend.Entitys.wform_leaveapply;
 using NCC.Extend.Entitys.flow_task;
 using NCC.Extend.Entitys.flow_engine;
@@ -96,7 +97,8 @@ namespace NCC.Extend
         /// 获取月度考勤记录矩阵
         /// </summary>
         /// <remarks>
-        /// 按统计月份返回员工每日考勤状态；含打卡、补卡及请假流程同步后的「请假/病假」记录。
+        /// 按统计月份返回员工每日考勤状态；列表包含当前筛选条件下所有在职员工（含当月尚无考勤记录者），
+        /// 含打卡、补卡及请假流程同步后的「请假/病假」记录。
         /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>月度考勤记录矩阵</returns>
@@ -227,59 +229,92 @@ namespace NCC.Extend
 
             var monthStart = new DateTime(monthDate.Year, monthDate.Month, 1);
             var monthEnd = monthStart.AddMonths(1);
-            var keyword = input.Keyword?.Trim();
 
-            var matchedRecords = await _db.Queryable<LqAttendanceRecordEntity>()
-                .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
-                .Where(x => x.AttendanceDate >= monthStart && x.AttendanceDate < monthEnd)
-                .WhereIF(!string.IsNullOrWhiteSpace(input.AttendanceGroupId), x => x.AttendanceGroupId == input.AttendanceGroupId)
-                .WhereIF(!string.IsNullOrWhiteSpace(keyword), x =>
-                    x.EmployeeName.Contains(keyword) ||
-                    x.StoreName.Contains(keyword) ||
-                    x.AttendanceGroupName.Contains(keyword))
-                .ToListAsync();
+            var eligibleUsers = await QueryMonthReportEligibleUsersAsync(input);
+            var eligibleUserIds = eligibleUsers.Select(x => x.UserId).Where(x => !string.IsNullOrWhiteSpace(x)).Distinct().ToList();
+
+            var matchedRecords = eligibleUserIds.Count == 0
+                ? new List<LqAttendanceRecordEntity>()
+                : await _db.Queryable<LqAttendanceRecordEntity>()
+                    .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Where(x => x.AttendanceDate >= monthStart && x.AttendanceDate < monthEnd)
+                    .Where(x => eligibleUserIds.Contains(x.UserId))
+                    .ToListAsync();
 
             matchedRecords = await RecalculateRecordStatusesAsync(matchedRecords);
 
-            var summary = BuildSummary(matchedRecords);
-            var groupedEmployees = matchedRecords
-                .GroupBy(x => new
+            var recordsByUserId = matchedRecords
+                .GroupBy(x => x.UserId)
+                .ToDictionary(x => x.Key, x => x.ToList());
+
+            var summary = BuildSummary(matchedRecords, eligibleUsers.Count);
+            var groupedEmployees = eligibleUsers
+                .Select(u =>
                 {
-                    x.UserId,
-                    x.EmployeeName,
-                    x.StoreId,
-                    x.StoreName,
-                    x.AttendanceGroupId,
-                    x.AttendanceGroupName
-                })
-                .Select(g => new LqAttendanceRecordRowOutput
-                {
-                    userId = g.Key.UserId,
-                    employeeName = g.Key.EmployeeName,
-                    storeId = g.Key.StoreId,
-                    storeName = g.Key.StoreName,
-                    attendanceGroupId = g.Key.AttendanceGroupId,
-                    groupName = g.Key.AttendanceGroupName,
-                    monthStats = new LqAttendanceRecordMonthStatOutput
+                    recordsByUserId.TryGetValue(u.UserId, out var userRecords);
+                    userRecords ??= new List<LqAttendanceRecordEntity>();
+                    return new LqAttendanceRecordRowOutput
                     {
-                        normal = g.Count(x => x.Status == (int)AttendanceRecordStatusEnum.正常),
-                        late = g.Count(x => x.Status == (int)AttendanceRecordStatusEnum.迟到),
-                        abnormal = g.Count(x => IsAbnormalStatus(x.Status))
-                    },
-                    dayRecords = g.GroupBy(x => x.AttendanceDate.Date)
-                        .Select(dayGroup => BuildDayItem(dayGroup.OrderByDescending(x => x.UpdateTime ?? x.CreateTime ?? DateTime.MinValue).First()))
-                        .OrderBy(x => x.date)
-                        .ToList()
+                        userId = u.UserId,
+                        employeeName = u.EmployeeName,
+                        storeId = u.StoreId,
+                        storeName = u.StoreName,
+                        attendanceGroupId = u.AttendanceGroupId,
+                        groupName = u.GroupName,
+                        monthStats = new LqAttendanceRecordMonthStatOutput
+                        {
+                            normal = userRecords.Count(x => x.Status == (int)AttendanceRecordStatusEnum.正常),
+                            late = userRecords.Count(x => x.Status == (int)AttendanceRecordStatusEnum.迟到),
+                            abnormal = userRecords.Count(x => IsAbnormalStatus(x.Status))
+                        },
+                        dayRecords = userRecords
+                            .GroupBy(x => x.AttendanceDate.Date)
+                            .Select(dayGroup => BuildDayItem(dayGroup.OrderByDescending(x => x.UpdateTime ?? x.CreateTime ?? DateTime.MinValue).First()))
+                            .OrderBy(x => x.date)
+                            .ToList()
+                    };
                 })
-                .OrderBy(x => x.storeName)
-                .ThenBy(x => x.groupName)
-                .ThenBy(x => x.employeeName)
                 .ToList();
 
             return (groupedEmployees, summary);
         }
 
         /// <summary>
+        /// 月度矩阵：当前筛选条件下的在职员工（主数据），与当月是否有考勤行无关。
+        /// </summary>
+        private async Task<List<MonthReportUserLine>> QueryMonthReportEligibleUsersAsync(LqAttendanceRecordMonthQueryInput input)
+        {
+            var keyword = input.Keyword?.Trim();
+            var lines = await _db.Queryable<UserEntity, LqMdxxEntity, LqAttendanceGroupEntity>((u, s, g) => new JoinQueryInfos(
+                    JoinType.Left, s.Id == u.Mdid,
+                    JoinType.Left, g.Id == u.AttendanceGroupId))
+                .Where((u, s, g) => u.DeleteMark == null && SqlFunc.IsNull(u.IsOnJob, 1) == 1)
+                .WhereIF(!string.IsNullOrWhiteSpace(input.AttendanceGroupId),
+                    (u, s, g) => u.AttendanceGroupId == input.AttendanceGroupId)
+                .WhereIF(!string.IsNullOrWhiteSpace(keyword), (u, s, g) =>
+                    SqlFunc.Contains(SqlFunc.IsNull(u.RealName, ""), keyword) ||
+                    SqlFunc.Contains(SqlFunc.IsNull(u.Account, ""), keyword) ||
+                    SqlFunc.Contains(SqlFunc.IsNull(s.Dm, ""), keyword) ||
+                    SqlFunc.Contains(SqlFunc.IsNull(g.GroupName, ""), keyword))
+                .Select((u, s, g) => new MonthReportUserLine
+                {
+                    UserId = u.Id,
+                    EmployeeName = u.RealName,
+                    StoreId = u.Mdid,
+                    StoreName = s.Dm,
+                    AttendanceGroupId = u.AttendanceGroupId,
+                    GroupName = g.GroupName
+                })
+                .ToListAsync();
+
+            return lines
+                .OrderBy(x => x.StoreName ?? "")
+                .ThenBy(x => x.GroupName ?? "")
+                .ThenBy(x => x.EmployeeName ?? "")
+                .ToList();
+        }
+
+        /// <summary>
         /// 提交打卡
         /// </summary>
         /// <remarks>
@@ -327,6 +362,19 @@ namespace NCC.Extend
 
             var punchDirection = (AttendancePunchDirectionEnum)input.PunchDirection;
             var punchType = input.PunchType;
+            if (punchType == (int)AttendancePunchTypeEnum.正常上班)
+            {
+                if ((store.AttendanceCheckWifi ?? 0) == 1 && ParseStoreWifiPairs(store).Count == 0)
+                {
+                    throw NCCException.Oh("门店已开启 Wi-Fi 打卡但未配置网络白名单，请联系管理员在门店资料中维护");
+                }
+
+                if (!IsNormalPunchLocationSatisfied(store, input.Longitude, input.Latitude, input.WifiSsid, input.WifiBssid))
+                {
+                    throw NCCException.Oh("未满足门店打卡要求（需在打卡范围内或连接门店指定 Wi-Fi/路由器），可改用外勤打卡");
+                }
+            }
+
             var fenceValid = EvaluateFenceValid(store, input.Longitude, input.Latitude);
             ApplyPunch(record, punchDirection, punchType, punchTime, input.Longitude, input.Latitude, input.Address, input.PhotoUrl, fenceValid);
 
@@ -374,18 +422,33 @@ namespace NCC.Extend
             var record = await GetAttendanceRecordAsync(input);
             if (record == null)
             {
+                if (!string.IsNullOrWhiteSpace(input.UserId) && !string.IsNullOrWhiteSpace(input.AttendanceDate))
+                {
+                    return await BuildEmptyAttendanceDetailAsync(input);
+                }
+
                 throw NCCException.Oh("未找到对应的打卡记录");
             }
 
+            var statusBeforeDetailRecalc = record.Status;
             var recalculated = await RecalculateRecordStatusesAsync(new List<LqAttendanceRecordEntity> { record });
             record = recalculated.FirstOrDefault() ?? record;
+            // 重算后状态变化时落库（含：备注已销假但库中仍为请假、待考勤已到期应转为缺卡等）
+            if (record.Status != statusBeforeDetailRecalc)
+            {
+                await SaveAttendanceRecordAsync(record);
+            }
+
             var group = await GetAttendanceGroupAsync(record.AttendanceGroupId, false);
 
             var relatedWorkflows = ParseRelatedWorkflows(record.RelatedWorkflowsJson);
 
+            // 销假后考勤状态可能会从“请假/病假”恢复到“正常/缺卡”等，
+            // 但 record.Remark 仍可能保留“请假审批通过：...；销假：...”信息。
+            // 因此解析 leaveType/billNo 时不再强依赖 isLeaveStatus。
             var isLeaveStatus = record.Status == (int)AttendanceRecordStatusEnum.请假
                 || record.Status == (int)AttendanceRecordStatusEnum.病假;
-            if (!relatedWorkflows.Any(x => x.type == "请假") && isLeaveStatus
+            if (!relatedWorkflows.Any(x => x.type == "请假")
                 && TryParseLeaveApplyFromSyncRemark(record.Remark, out var parsedLeaveType, out var parsedBillNo)
                 && !string.IsNullOrWhiteSpace(parsedBillNo))
             {
@@ -406,6 +469,31 @@ namespace NCC.Extend
                 });
             }
 
+            var cancelApplyRows = await _db.Queryable<WformLeaveCancelApplyEntityLite>()
+                .Where(x => x.AttendanceRecordId == record.Id)
+                .OrderBy(x => x.ApplyDate, OrderByType.Desc)
+                .ToListAsync();
+            foreach (var cancelApply in cancelApplyRows)
+            {
+                if (cancelApply == null || string.IsNullOrWhiteSpace(cancelApply.Id))
+                {
+                    continue;
+                }
+
+                if (relatedWorkflows.Any(x => x.type == "销假" && x.id == cancelApply.Id))
+                {
+                    continue;
+                }
+
+                relatedWorkflows.Add(new RelatedWorkflowItem
+                {
+                    type = "销假",
+                    id = cancelApply.Id,
+                    billNo = cancelApply.BillNo,
+                    remark = SafeTrim(cancelApply.CancelReason)
+                });
+            }
+
             if (!string.IsNullOrWhiteSpace(record.SupplementWorkflowId) && !relatedWorkflows.Any(x => x.type == "补卡"))
             {
                 relatedWorkflows.Add(new RelatedWorkflowItem
@@ -1060,7 +1148,9 @@ namespace NCC.Extend
             }
             else if (!record.PunchInTime.HasValue && !record.PunchOutTime.HasValue)
             {
-                targetStatus = (int)AttendanceRecordStatusEnum.缺卡;
+                targetStatus = attendanceDate > today
+                    ? (int)AttendanceRecordStatusEnum.待考勤
+                    : (int)AttendanceRecordStatusEnum.缺卡;
             }
             else
             {
@@ -1472,11 +1562,11 @@ namespace NCC.Extend
             };
         }
 
-        private static dynamic BuildSummary(List<LqAttendanceRecordEntity> matchedRecords)
+        private static dynamic BuildSummary(List<LqAttendanceRecordEntity> matchedRecords, int displayedEmployeeCount)
         {
             return new
             {
-                employeeCount = matchedRecords.Select(x => x.UserId).Distinct().Count(),
+                employeeCount = displayedEmployeeCount,
                 normalCount = matchedRecords.Count(x => x.Status == (int)AttendanceRecordStatusEnum.正常),
                 lateCount = matchedRecords.Count(x => x.Status == (int)AttendanceRecordStatusEnum.迟到),
                 leaveAndMissingCount = matchedRecords.Count(x => x.Status == (int)AttendanceRecordStatusEnum.请假
@@ -1667,9 +1757,28 @@ namespace NCC.Extend
 
         private async Task<LqAttendanceRecordEntity> GetAttendanceRecordByUserDateAsync(string userId, DateTime attendanceDate)
         {
-            return await _db.Queryable<LqAttendanceRecordEntity>()
-                .Where(x => x.UserId == userId && x.AttendanceDate >= attendanceDate.Date && x.AttendanceDate < attendanceDate.Date.AddDays(1) && x.IsEffective == StatusEnum.有效.GetHashCode())
-                .FirstAsync();
+            var list = await _db.Queryable<LqAttendanceRecordEntity>()
+                .Where(x => x.UserId == userId
+                            && x.AttendanceDate >= attendanceDate.Date
+                            && x.AttendanceDate < attendanceDate.Date.AddDays(1)
+                            && x.IsEffective == StatusEnum.有效.GetHashCode())
+                .Take(1)
+                .ToListAsync();
+            return list.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 不限制 IsEffective：用于考勤详情兜底展示（例如销假把“未来占位行”置为无效后仍希望看到关联请假/销假历史）。
+        /// </summary>
+        private async Task<LqAttendanceRecordEntity> GetAttendanceRecordByUserDateAnyAsync(string userId, DateTime attendanceDate)
+        {
+            var list = await _db.Queryable<LqAttendanceRecordEntity>()
+                .Where(x => x.UserId == userId
+                            && x.AttendanceDate >= attendanceDate.Date
+                            && x.AttendanceDate < attendanceDate.Date.AddDays(1))
+                .Take(1)
+                .ToListAsync();
+            return list.FirstOrDefault();
         }
 
         /// <param name="bypassSnapshotPairSkip">为 true 时不过滤「规则快照与全量快照均已存在」的记录（用于历史缺卡批量修正）</param>
@@ -1723,31 +1832,60 @@ namespace NCC.Extend
 
             foreach (var record in records)
             {
-                // 流程同步写入的请假/病假（含应休「休假」、年假等）：勿按打卡重算覆盖为缺卡/正常，否则详情无法销假、应休/年假额度无法按考勤折算还原
+                // 流程同步写入的请假/病假（含应休「休假」、年假等）：勿按打卡重算覆盖为缺卡/正常，否则详情无法销假、应休/年假额度无法按考勤折算还原。
+                // 备注已含「销假」时不再跳过：否则会出现库中仍为请假/病假但备注已销假、详情与列表长期不一致。
                 if (record.IsManual == 1
                     && (record.Status == (int)AttendanceRecordStatusEnum.请假 || record.Status == (int)AttendanceRecordStatusEnum.病假)
                     && !string.IsNullOrWhiteSpace(record.Remark)
-                    && record.Remark.IndexOf("请假审批通过：", StringComparison.Ordinal) >= 0)
+                    && record.Remark.IndexOf("请假审批通过：", StringComparison.Ordinal) >= 0
+                    && record.Remark.IndexOf("销假", StringComparison.Ordinal) < 0)
                 {
                     continue;
                 }
 
+                var leaveSyncedButCancelledInRemark = !string.IsNullOrWhiteSpace(record.Remark)
+                    && record.Remark.IndexOf("销假", StringComparison.Ordinal) >= 0
+                    && (record.Status == (int)AttendanceRecordStatusEnum.请假
+                        || record.Status == (int)AttendanceRecordStatusEnum.病假);
+
+                var attendanceDate = record.AttendanceDate.Date;
+                var todayDate = DateTime.Today.Date;
+                // 「待考勤」仅适用于考勤日晚于今日；已到期应重新按打卡情况判定（否则快照非空时会一直被跳过）
+                var pendingAttendanceExpired = record.Status == (int)AttendanceRecordStatusEnum.待考勤
+                    && attendanceDate <= todayDate;
+                // 库中仍是「缺卡」但考勤日晚于今日且无打卡时，应展示为待考勤；否则快照非空会一直跳过重算，永远停留在缺卡
+                var futureDayMissingShouldBePending = attendanceDate > todayDate
+                    && record.Status == (int)AttendanceRecordStatusEnum.缺卡
+                    && !record.PunchInTime.HasValue
+                    && !record.PunchOutTime.HasValue;
+
                 if (!bypassSnapshotPairSkip
                     && !string.IsNullOrWhiteSpace(record.RuleSnapshotJson)
-                    && !string.IsNullOrWhiteSpace(record.AllRuleSnapshotJson))
+                    && !string.IsNullOrWhiteSpace(record.AllRuleSnapshotJson)
+                    && !leaveSyncedButCancelledInRemark
+                    && !pendingAttendanceExpired
+                    && !futureDayMissingShouldBePending)
                 {
                     continue;
                 }
 
-                var attendanceDate = record.AttendanceDate.Date;
                 var group = ResolveRecordAttendanceGroup(record, userDict, groupDict);
                 var isHoliday = holidayDates.Contains(attendanceDate);
                 var isExempt = IsExemptForDate(exemptUsers, record.UserId, attendanceDate);
+                // 备注已销假但状态未落库时，勿把「请假/病假」传入 Resolve（否则会原样保留请假）；
+                // 「待考勤」已到期时同样按正常流程重算为缺卡/正常等；
+                // 未来日+缺卡无打卡时勿把「缺卡」传入 Resolve（否则会原样保留缺卡）。
+                var statusForResolution = record.Status;
+                if (leaveSyncedButCancelledInRemark || pendingAttendanceExpired || futureDayMissingShouldBePending)
+                {
+                    statusForResolution = (int)AttendanceRecordStatusEnum.正常;
+                }
+
                 var statusContext = ResolveAttendanceStatus(
                     attendanceDate,
                     group,
                     lateRules,
-                    record.Status,
+                    statusForResolution,
                     record.PunchInTime,
                     record.PunchOutTime,
                     null,
@@ -1807,9 +1945,19 @@ namespace NCC.Extend
         {
             if (!string.IsNullOrWhiteSpace(input.Id))
             {
-                return await _db.Queryable<LqAttendanceRecordEntity>()
+                var effectiveList = await _db.Queryable<LqAttendanceRecordEntity>()
                     .Where(x => x.Id == input.Id && x.IsEffective == StatusEnum.有效.GetHashCode())
-                    .FirstAsync();
+                    .Take(1)
+                    .ToListAsync();
+                var effectiveRecord = effectiveList.FirstOrDefault();
+                if (effectiveRecord != null) return effectiveRecord;
+
+                // 兜底：允许返回无效行（用于展示请假/销假关联历史）
+                var anyList = await _db.Queryable<LqAttendanceRecordEntity>()
+                    .Where(x => x.Id == input.Id)
+                    .Take(1)
+                    .ToListAsync();
+                return anyList.FirstOrDefault();
             }
 
             if (string.IsNullOrWhiteSpace(input.UserId) || string.IsNullOrWhiteSpace(input.AttendanceDate))
@@ -1818,7 +1966,11 @@ namespace NCC.Extend
             }
 
             var attendanceDate = ParseAttendanceDate(input.AttendanceDate);
-            return await GetAttendanceRecordByUserDateAsync(input.UserId, attendanceDate);
+            var effectiveRecordByDate = await GetAttendanceRecordByUserDateAsync(input.UserId, attendanceDate);
+            if (effectiveRecordByDate != null) return effectiveRecordByDate;
+
+            // 兜底：允许返回无效行（用于展示请假/销假关联历史）
+            return await GetAttendanceRecordByUserDateAnyAsync(input.UserId, attendanceDate);
         }
 
         private static LqAttendanceRecordEntity CreateAttendanceRecord(UserEntity user, LqMdxxEntity store, LqAttendanceGroupEntity group, DateTime attendanceDate, string operatorUserId)
@@ -1834,7 +1986,9 @@ namespace NCC.Extend
                 AttendanceGroupId = group?.Id,
                 AttendanceGroupName = group?.GroupName,
                 AttendanceDate = attendanceDate.Date,
-                Status = (int)AttendanceRecordStatusEnum.缺卡,
+                Status = attendanceDate.Date > DateTime.Today.Date
+                    ? (int)AttendanceRecordStatusEnum.待考勤
+                    : (int)AttendanceRecordStatusEnum.缺卡,
                 LateMinutes = 0,
                 EarlyLeaveMinutes = 0,
                 IsManual = 0,
@@ -1956,9 +2110,12 @@ namespace NCC.Extend
             // 取消流程补卡、销假回退等场景会清空打卡时间；双无打卡不应判为「正常」，与销假后逻辑一致（见 ExecuteCancelLeaveCoreAsync）
             if (!punchInTime.HasValue && !punchOutTime.HasValue)
             {
+                var noPunchStatus = attendanceDate.Date > DateTime.Today.Date
+                    ? (int)AttendanceRecordStatusEnum.待考勤
+                    : (int)AttendanceRecordStatusEnum.缺卡;
                 return new AttendanceStatusContext
                 {
-                    Status = (int)AttendanceRecordStatusEnum.缺卡,
+                    Status = noPunchStatus,
                     LateMinutes = 0,
                     EarlyLeaveMinutes = 0
                 };
@@ -2005,6 +2162,154 @@ namespace NCC.Extend
             return lateRules.Any(rule => minutes >= rule.MinMinutes && (!rule.MaxMinutes.HasValue || minutes < rule.MaxMinutes.Value));
         }
 
+        private static bool StoreHasFencePolygons(LqMdxxEntity store) =>
+            store != null && !string.IsNullOrWhiteSpace(store.FencePolygons);
+
+        /// <summary>
+        /// 是否实际启用围栏校验（门店开启且已配置围栏多边形）
+        /// </summary>
+        private static bool EffectiveRequireFenceCheck(LqMdxxEntity store)
+        {
+            if (!StoreHasFencePolygons(store)) return false;
+            var f = store.AttendanceCheckFence;
+            if (!f.HasValue) return true;
+            return f.Value == 1;
+        }
+
+        /// <summary>
+        /// 统一 BSSID 格式：去空白、连字符改冒号、小写；无分隔符的 12 位十六进制转为 aa:bb:cc:dd:ee:ff
+        /// </summary>
+        private static string NormalizeAttendanceBssid(string value)
+        {
+            if (string.IsNullOrWhiteSpace(value)) return string.Empty;
+            var s = value.Trim().Replace("-", ":").Replace(" ", string.Empty).ToLowerInvariant();
+            if (s.IndexOf(':') < 0 && s.Length == 12)
+            {
+                var allHex = true;
+                foreach (var c in s)
+                {
+                    if ((c < '0' || c > '9') && (c < 'a' || c > 'f'))
+                    {
+                        allHex = false;
+                        break;
+                    }
+                }
+
+                if (allHex)
+                {
+                    return string.Join(":", Enumerable.Range(0, 6).Select(i => s.Substring(i * 2, 2)));
+                }
+            }
+
+            return s;
+        }
+
+        /// <summary>
+        /// 解析门店 Wi-Fi 成对配置（ssid + bssid）
+        /// </summary>
+        private static List<(string Ssid, string Bssid)> ParseStoreWifiPairs(LqMdxxEntity store)
+        {
+            var list = new List<(string Ssid, string Bssid)>();
+            if (store == null || string.IsNullOrWhiteSpace(store.AttendanceWifiPairs)) return list;
+            try
+            {
+                var token = JToken.Parse(store.AttendanceWifiPairs.Trim());
+                if (token is not JArray arr) return list;
+                foreach (var item in arr)
+                {
+                    if (item is not JObject jo) continue;
+                    var ssid = jo["ssid"]?.ToString()?.Trim() ?? jo["Ssid"]?.ToString()?.Trim() ?? string.Empty;
+                    var bssid = jo["bssid"]?.ToString()?.Trim() ?? jo["Bssid"]?.ToString()?.Trim() ?? string.Empty;
+                    if (!string.IsNullOrEmpty(ssid) || !string.IsNullOrEmpty(bssid))
+                    {
+                        list.Add((ssid, bssid));
+                    }
+                }
+            }
+            catch
+            {
+                // ignore invalid json
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// 是否启用 Wi-Fi 侧校验（门店勾选 Wi-Fi 打卡即视为需要；白名单是否已配置由 <see cref="IsWifiPunchAllowed"/> 判断）
+        /// </summary>
+        /// <remarks>
+        /// 若此处要求「必须已有成对数据」才为 true，则未配白名单时前端会显示「未要求 Wi-Fi」且可能放过打卡，与门店勾选意图不符。
+        /// </remarks>
+        private static bool EffectiveRequireWifiCheck(LqMdxxEntity store)
+        {
+            if (store == null || (store.AttendanceCheckWifi ?? 0) != 1) return false;
+            return true;
+        }
+
+        /// <summary>
+        /// Wi-Fi 是否满足打卡规则（仅 <see cref="ParseStoreWifiPairs"/>）
+        /// </summary>
+        private static bool IsWifiPunchAllowed(LqMdxxEntity store, decimal? longitude, decimal? latitude, string wifiSsid, string wifiBssid)
+        {
+            var pairs = ParseStoreWifiPairs(store);
+            if (pairs.Count > 0)
+            {
+                var strict = (store.AttendanceWifiVerifyPair ?? 0) == 1;
+                var clientSsid = (wifiSsid ?? string.Empty).Trim();
+                var clientBssidNorm = NormalizeAttendanceBssid(wifiBssid);
+                var hasClientBssid = !string.IsNullOrEmpty(clientBssidNorm);
+
+                if (strict)
+                {
+                    if (hasClientBssid)
+                    {
+                        // 微信/iOS 常拿不到 SSID 或名称不准，以 BSSID（AP）为准；配置行须含有效 BSSID
+                        return pairs.Any(p =>
+                        {
+                            var pb = NormalizeAttendanceBssid(p.Bssid);
+                            return !string.IsNullOrEmpty(pb) && pb == clientBssidNorm;
+                        });
+                    }
+
+                    if (EvaluateFenceValid(store, longitude, latitude) != 1) return false;
+                    if (string.IsNullOrEmpty(clientSsid)) return false;
+                    return pairs.Any(p =>
+                    {
+                        var ps = (p.Ssid ?? string.Empty).Trim();
+                        return !string.IsNullOrEmpty(ps) && string.Equals(ps, clientSsid, StringComparison.OrdinalIgnoreCase);
+                    });
+                }
+
+                return pairs.Any(p =>
+                {
+                    var ps = (p.Ssid ?? string.Empty).Trim();
+                    var pb = NormalizeAttendanceBssid(p.Bssid);
+                    var ssidHit = !string.IsNullOrEmpty(ps) && !string.IsNullOrEmpty(clientSsid) &&
+                                  string.Equals(ps, clientSsid, StringComparison.OrdinalIgnoreCase);
+                    var bssidHit = !string.IsNullOrEmpty(pb) && pb == clientBssidNorm;
+                    return ssidHit || bssidHit;
+                });
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 正常打卡是否满足门店位置策略：仅围栏 / 仅 Wi-Fi / 两者同时开启时为「围栏或 Wi-Fi 满足其一」
+        /// </summary>
+        private static bool IsNormalPunchLocationSatisfied(LqMdxxEntity store, decimal? longitude, decimal? latitude, string wifiSsid, string wifiBssid)
+        {
+            var needFence = EffectiveRequireFenceCheck(store);
+            var needWifi = EffectiveRequireWifiCheck(store);
+            if (!needFence && !needWifi) return true;
+
+            var fenceOk = !needFence || EvaluateFenceValid(store, longitude, latitude) == 1;
+            var wifiOk = !needWifi || IsWifiPunchAllowed(store, longitude, latitude, wifiSsid, wifiBssid);
+            if (needFence && needWifi) return fenceOk || wifiOk;
+            if (needFence) return fenceOk;
+            return wifiOk;
+        }
+
         private static int? EvaluateFenceValid(LqMdxxEntity store, decimal? longitude, decimal? latitude)
         {
             if (store == null || !longitude.HasValue || !latitude.HasValue || string.IsNullOrWhiteSpace(store.FencePolygons))
@@ -2246,12 +2551,77 @@ namespace NCC.Extend
                     w.taskNodeId
                 }).ToList(),
                 canCancelWorkflowSupplement,
+                hasAttendanceRecord = true,
                 ruleSnapshotJson = record.RuleSnapshotJson,
                 allRuleSnapshotJson = record.AllRuleSnapshotJson
             };
         }
 
         /// <summary>
+        /// 当日无考勤行时仍返回详情结构，便于前端展示「暂无打卡」。
+        /// </summary>
+        private async Task<dynamic> BuildEmptyAttendanceDetailAsync(LqAttendanceRecordDetailQueryInput input)
+        {
+            var user = await GetAttendanceUserAsync(input.UserId.Trim(), requireOnJob: false);
+            var attendanceDate = ParseAttendanceDate(input.AttendanceDate);
+            var store = await GetStoreAsync(user.Mdid);
+            var group = await GetAttendanceGroupAsync(user.AttendanceGroupId, required: false);
+            var missingStatus = attendanceDate.Date > DateTime.Today.Date
+                ? (int)AttendanceRecordStatusEnum.待考勤
+                : (int)AttendanceRecordStatusEnum.缺卡;
+
+            return new
+            {
+                id = (string)null,
+                userId = user.Id,
+                employeeName = user.RealName,
+                storeId = user.Mdid,
+                storeName = store?.Dm,
+                attendanceDate = attendanceDate.ToString("yyyy-MM-dd"),
+                attendanceGroupId = user.AttendanceGroupId,
+                attendanceGroupName = group?.GroupName,
+                workStartTime = group?.WorkStartTime,
+                workEndTime = group?.WorkEndTime,
+                status = missingStatus,
+                statusText = "暂无打卡",
+                lateMinutes = 0,
+                earlyLeaveMinutes = 0,
+                isManual = 0,
+                remark = (string)null,
+                punchIn = new
+                {
+                    time = (string)null,
+                    type = (int?)null,
+                    typeText = "暂无打卡",
+                    longitude = (decimal?)null,
+                    latitude = (decimal?)null,
+                    address = (string)null,
+                    photoUrl = (string)null,
+                    fenceValid = (int?)null,
+                    fenceValidText = "未校验"
+                },
+                punchOut = new
+                {
+                    time = (string)null,
+                    type = (int?)null,
+                    typeText = "暂无打卡",
+                    longitude = (decimal?)null,
+                    latitude = (decimal?)null,
+                    address = (string)null,
+                    photoUrl = (string)null,
+                    fenceValid = (int?)null,
+                    fenceValidText = "未校验"
+                },
+                supplement = (object)null,
+                relatedWorkflows = new List<object>(),
+                canCancelWorkflowSupplement = false,
+                hasAttendanceRecord = false,
+                ruleSnapshotJson = (string)null,
+                allRuleSnapshotJson = (string)null
+            };
+        }
+
+        /// <summary>
         /// 是否允许「取消流程补卡」：能解析到补卡申请单，且申请目标中存在与本考勤日对应的勾选项（含 PascalCase、日期格式差异、单日申请兜底）。
         /// </summary>
         private async Task<bool> ComputeCanCancelWorkflowSupplementAsync(LqAttendanceRecordEntity record)
@@ -2770,6 +3140,8 @@ namespace NCC.Extend
                 return null;
             }
 
+            var wifiPairRows = ParseStoreWifiPairs(entity);
+            var wifiPairsPayload = wifiPairRows.Select(p => new { ssid = p.Ssid, bssid = p.Bssid }).ToList();
             return new
             {
                 storeId = entity.Id,
@@ -2781,7 +3153,13 @@ namespace NCC.Extend
                 fencePolygons = entity.FencePolygons,
                 hasFence = !string.IsNullOrWhiteSpace(entity.FencePolygons),
                 businessHours = entity.BusinessHours,
-                trafficTips = entity.TrafficTips
+                trafficTips = entity.TrafficTips,
+                attendanceCheckFence = entity.AttendanceCheckFence,
+                attendanceCheckWifi = entity.AttendanceCheckWifi,
+                attendanceWifiPairs = wifiPairsPayload,
+                attendanceWifiVerifyPair = entity.AttendanceWifiVerifyPair ?? 0,
+                requireFenceCheck = EffectiveRequireFenceCheck(entity),
+                requireWifiCheck = EffectiveRequireWifiCheck(entity)
             };
         }
 
@@ -3032,6 +3410,13 @@ namespace NCC.Extend
         private static string GetAttendanceRecordStatusDisplayText(LqAttendanceRecordEntity record)
         {
             var (_, statusText, _) = MapStatus(record.Status);
+            // 备注中已记录销假时，不再用「请假审批通过」里的假种名作为状态 headline（避免仍显示年假等）
+            if (!string.IsNullOrWhiteSpace(record.Remark)
+                && record.Remark.IndexOf("销假", StringComparison.Ordinal) >= 0)
+            {
+                return statusText;
+            }
+
             if (record.Status == (int)AttendanceRecordStatusEnum.请假)
             {
                 var label = TryGetLeaveTypeLabelFromSyncRemark(record.Remark);
@@ -3157,6 +3542,7 @@ namespace NCC.Extend
                 }
 
                 if (statusKey == "sick") return "病假";
+                if (statusKey == "pending") return "暂无打卡";
                 if (statusKey == "missing") return "缺卡";
                 if (statusKey == "absenteeism") return "旷工";
                 return "--";
@@ -3181,6 +3567,8 @@ namespace NCC.Extend
                     return ("sick", "病假", "danger");
                 case AttendanceRecordStatusEnum.缺卡:
                     return ("missing", "缺卡", "danger");
+                case AttendanceRecordStatusEnum.待考勤:
+                    return ("pending", "暂无打卡", "info");
                 case AttendanceRecordStatusEnum.旷工:
                     return ("absenteeism", "旷工", "danger");
                 default:
@@ -3284,7 +3672,7 @@ namespace NCC.Extend
         }
 
         /// <summary>
-        /// 为「请假」「补卡」等关联项补全打开流程详情所需字段（FLOW_TASK / FLOW_ENGINE）
+        /// 为「请假」「补卡」「销假」等关联项补全打开流程详情所需字段（FLOW_TASK / FLOW_ENGINE）
         /// </summary>
         private async Task FillRelatedWorkflowFlowOpenAsync(List<RelatedWorkflowItem> list)
         {
@@ -3294,7 +3682,7 @@ namespace NCC.Extend
             }
 
             foreach (var w in list.Where(x =>
-                (x.type == "请假" || x.type == "补卡") && !string.IsNullOrWhiteSpace(x.id)))
+                (x.type == "请假" || x.type == "补卡" || x.type == "销假") && !string.IsNullOrWhiteSpace(x.id)))
             {
                 if (!string.IsNullOrWhiteSpace(w.flowId)
                     && !string.IsNullOrWhiteSpace(w.flowCode)
@@ -3362,6 +3750,21 @@ namespace NCC.Extend
             return JsonConvert.SerializeObject(list);
         }
 
+        private sealed class MonthReportUserLine
+        {
+            public string UserId { get; set; }
+
+            public string EmployeeName { get; set; }
+
+            public string StoreId { get; set; }
+
+            public string StoreName { get; set; }
+
+            public string AttendanceGroupId { get; set; }
+
+            public string GroupName { get; set; }
+        }
+
         private sealed class PunchApplyTargetLine
         {
             public string date { get; set; }
diff --git a/绿纤uni-app/pages/attendance-punch/attendance-punch.vue b/绿纤uni-app/pages/attendance-punch/attendance-punch.vue
index 0a94366..8473062 100644
--- a/绿纤uni-app/pages/attendance-punch/attendance-punch.vue
+++ b/绿纤uni-app/pages/attendance-punch/attendance-punch.vue
@@ -18,29 +18,19 @@
 			<!-- 打卡方式：与小程序白卡片风格一致 -->
 			<view class="att-card att-seg-card">
 				<view class="att-seg">
-					<view
-						class="att-seg-item"
-						:class="{ 'is-active': punchType === 1 }"
-						@click="setPunchType(1)"
-					>正常</view>
-					<view
-						class="att-seg-item"
-						:class="{ 'is-active': punchType === 2 }"
-						@click="setPunchType(2)"
-					>外勤</view>
+					<view class="att-seg-item" :class="{ 'is-active': punchType === 1 }" @click="setPunchType(1)">正常
+					</view>
+					<view class="att-seg-item" :class="{ 'is-active': punchType === 2 }" @click="setPunchType(2)">外勤
+					</view>
 				</view>
 			</view>
 
 			<!-- 单一大按钮：按顺序上班 → 下班 → 已完成 -->
 			<view class="att-card att-punch-card">
-				<view
-					class="att-big-btn"
-					:class="{
-						'is-all-done': allPunchDone,
-						'is-disabled': !canPressMainButton
-					}"
-					@click="onMainPunch"
-				>
+				<view class="att-big-btn" :class="{
+					'is-all-done': allPunchDone,
+					'is-disabled': !canPressMainButton
+				}" @click="onMainPunch">
 					<template v-if="allPunchDone">
 						<u-icon name="checkmark-circle-fill" color="#ffffff" size="52"></u-icon>
 						<text class="att-big-done-text">今日打卡已完成</text>
@@ -61,17 +51,28 @@
 					<text class="att-loc-text">{{ locationText }}</text>
 					<text class="att-loc-tip">{{ fenceStatusText }}</text>
 					<view class="att-loc-actions">
-						<text
-							v-if="canViewFenceMap"
-							class="att-loc-action att-loc-action--primary"
-							@click.stop="openFenceMap"
-						>查看打卡范围</text>
+						<text v-if="canViewFenceMap" class="att-loc-action att-loc-action--primary"
+							@click.stop="openFenceMap">查看打卡范围</text>
 						<text class="att-loc-action" @click.stop="refreshLocation">重新定位</text>
 					</view>
 				</view>
 				<u-icon name="arrow-right" color="#c8c9cc" size="18"></u-icon>
 			</view>
 
+			<!-- #ifdef MP-WEIXIN -->
+			<view v-if="Number(punchType) === 1" class="att-card att-loc-card att-wifi-card">
+				<u-icon name="wifi" color="#43a047" size="22"></u-icon>
+				<view class="att-loc-main">
+					<text class="att-loc-text">{{ wifiMainText }}</text>
+					<text class="att-loc-tip">{{ wifiTipText }}</text>
+					<view class="att-loc-actions">
+						<text class="att-loc-action" @click.stop="refreshWifiInfo">刷新 Wi-Fi</text>
+					</view>
+				</view>
+				<u-icon name="arrow-right" color="#c8c9cc" size="18"></u-icon>
+			</view>
+			<!-- #endif -->
+
 			<view class="att-card">
 				<view class="att-card-head">
 					<text class="att-card-title">今日记录</text>
@@ -84,7 +85,9 @@
 						<view class="att-tl-body">
 							<view class="att-tl-row">
 								<text class="att-tl-name">上班</text>
-								<text class="att-tl-time">{{ detail.punchIn && detail.punchIn.time ? detail.punchIn.time : '未打卡' }}</text>
+								<text class="att-tl-time">{{ detail.punchIn && detail.punchIn.time ? detail.punchIn.time
+									: '未打卡'
+								}}</text>
 							</view>
 						</view>
 					</view>
@@ -93,7 +96,9 @@
 						<view class="att-tl-body">
 							<view class="att-tl-row">
 								<text class="att-tl-name">下班</text>
-								<text class="att-tl-time">{{ detail.punchOut && detail.punchOut.time ? detail.punchOut.time : '未打卡' }}</text>
+								<text class="att-tl-time">{{ detail.punchOut && detail.punchOut.time ?
+									detail.punchOut.time : '未打卡'
+								}}</text>
 							</view>
 						</view>
 					</view>
@@ -107,25 +112,13 @@
 			<view class="att-card att-more-card">
 				<view class="att-more-title">打卡照片（选填）</view>
 				<view class="att-upload-wrap">
-					<u-upload
-						:fileList="photoFileList"
-						@afterRead="afterReadPhoto"
-						@delete="deletePhoto"
-						name="photo"
-						:maxCount="1"
-						accept="image"
-						width="120"
-						height="120"
-					></u-upload>
+					<u-upload :fileList="photoFileList" @afterRead="afterReadPhoto" @delete="deletePhoto" name="photo"
+						:maxCount="1" accept="image" width="120" height="120"></u-upload>
 				</view>
 				<template v-if="punchType === 2">
 					<view class="att-more-title att-more-title--second">外勤说明（选填）</view>
-					<u-input
-						v-model="remark"
-						placeholder="请填写外勤事由（选填）"
-						border="none"
-						:customStyle="{ background: '#f1f8f4', padding: '16rpx 20rpx', borderRadius: '12rpx' }"
-					></u-input>
+					<u-input v-model="remark" placeholder="请填写外勤事由（选填）" border="none"
+						:customStyle="{ background: '#f1f8f4', padding: '16rpx 20rpx', borderRadius: '12rpx' }"></u-input>
 				</template>
 			</view>
 
@@ -140,728 +133,946 @@
 </template>
 
 <script>
-	import { isPointInPolygon, parseFencePolygons } from '@/service/attendance-fence.js'
-
-	export default {
-		data() {
-			return {
-				loading: false,
-				submitting: false,
-				userInfo: {},
-				today: '',
-				detail: null,
-				punchConfig: null,
-				storeFence: null,
-				attendanceGroup: null,
-				isInFence: null,
-				punchType: 1,
-				remark: '',
-				longitude: null,
-				latitude: null,
-				address: '',
-				fenceEnabled: false,
-				locating: false,
-				photoUrl: '',
-				photoFileList: [],
-				clockTime: '--:--:--',
-				clockTimer: null
+import { isPointInPolygon, parseFencePolygons } from '@/service/attendance-fence.js'
+
+export default {
+	data() {
+		return {
+			loading: false,
+			submitting: false,
+			userInfo: {},
+			today: '',
+			detail: null,
+			punchConfig: null,
+			storeFence: null,
+			attendanceGroup: null,
+			isInFence: null,
+			punchType: 1,
+			remark: '',
+			longitude: null,
+			latitude: null,
+			address: '',
+			fenceEnabled: false,
+			locating: false,
+			photoUrl: '',
+			photoFileList: [],
+			clockTime: '--:--:--',
+			clockTimer: null,
+			wifiSSID: '',
+			wifiBSSID: '',
+			wifiLoading: false,
+			wifiError: ''
+		}
+	},
+	computed: {
+		todayText() {
+			if (!this.today) return ''
+			const [y, m, d] = this.today.split('-')
+			return `${y}年${Number(m)}月${Number(d)}日`
+		},
+		weekdayText() {
+			if (!this.today) return ''
+			const w = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+			const [y, m, d] = this.today.split('-').map(Number)
+			const dt = new Date(y, m - 1, d)
+			return w[dt.getDay()]
+		},
+		ruleTimeText() {
+			if (this.attendanceGroup && this.attendanceGroup.workStartTime && this.attendanceGroup.workEndTime) {
+				return `${this.attendanceGroup.workStartTime} - ${this.attendanceGroup.workEndTime}`
+			}
+			if (this.detail && this.detail.workStartTime && this.detail.workEndTime) {
+				return `${this.detail.workStartTime} - ${this.detail.workEndTime}`
 			}
+			return ''
 		},
-		computed: {
-			todayText() {
-				if (!this.today) return ''
-				const [y, m, d] = this.today.split('-')
-				return `${y}年${Number(m)}月${Number(d)}日`
-			},
-			weekdayText() {
-				if (!this.today) return ''
-				const w = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
-				const [y, m, d] = this.today.split('-').map(Number)
-				const dt = new Date(y, m - 1, d)
-				return w[dt.getDay()]
-			},
-			ruleTimeText() {
-				if (this.attendanceGroup && this.attendanceGroup.workStartTime && this.attendanceGroup.workEndTime) {
-					return `${this.attendanceGroup.workStartTime} - ${this.attendanceGroup.workEndTime}`
-				}
-				if (this.detail && this.detail.workStartTime && this.detail.workEndTime) {
-					return `${this.detail.workStartTime} - ${this.detail.workEndTime}`
-				}
-				return ''
-			},
-			displayName() {
-				return this.detail && this.detail.employeeName
-					? this.detail.employeeName
-					: (this.userInfo.userName || this.userInfo.realName || '员工')
-			},
-			locationText() {
-				if (this.locating) return '正在获取位置…'
-				if (this.address) return this.address
-				if (this.longitude != null && this.latitude != null) {
-					return `已定位 · ${Number(this.latitude).toFixed(4)}, ${Number(this.longitude).toFixed(4)}`
+		displayName() {
+			return this.detail && this.detail.employeeName
+				? this.detail.employeeName
+				: (this.userInfo.userName || this.userInfo.realName || '员工')
+		},
+		locationText() {
+			if (this.locating) return '正在获取位置…'
+			if (this.address) return this.address
+			if (this.longitude != null && this.latitude != null) {
+				return `已定位 · ${Number(this.latitude).toFixed(4)}, ${Number(this.longitude).toFixed(4)}`
+			}
+			return '点击获取定位，用于考勤校验'
+		},
+		requireFenceCheck() {
+			const sf = this.storeFence
+			if (!sf) return false
+			const rf = sf.requireFenceCheck != null ? sf.requireFenceCheck : sf.RequireFenceCheck
+			return rf === true || rf === 1 || rf === '1'
+		},
+		requireWifiCheck() {
+			const sf = this.storeFence
+			if (!sf) return false
+			const rw = sf.requireWifiCheck != null ? sf.requireWifiCheck : sf.RequireWifiCheck
+			return rw === true || rw === 1 || rw === '1'
+		},
+		/** 门店是否已配置 Wi-Fi 成对白名单（与接口 attendanceWifiPairs 一致） */
+		wifiPairRulesCount() {
+			const sf = this.storeFence
+			if (!sf) return 0
+			const raw = sf.attendanceWifiPairs != null ? sf.attendanceWifiPairs : sf.AttendanceWifiPairs
+			return Array.isArray(raw) ? raw.length : 0
+		},
+		wifiVerifyPairStrict() {
+			const sf = this.storeFence
+			if (!sf) return false
+			const v = sf.attendanceWifiVerifyPair != null ? sf.attendanceWifiVerifyPair : sf.AttendanceWifiVerifyPair
+			return Number(v) === 1
+		},
+		wifiMatchesStore() {
+			const sf = this.storeFence
+			const rawPairs = sf && (sf.attendanceWifiPairs != null ? sf.attendanceWifiPairs : sf.AttendanceWifiPairs)
+			const pairs = Array.isArray(rawPairs) ? rawPairs : []
+			const curSsid = (this.wifiSSID || '').trim()
+			const curB = this.normalizeAttendanceBssid(this.wifiBSSID)
+			const hasClientBssid = !!curB
+			if (pairs.length > 0) {
+				const strict = this.wifiVerifyPairStrict
+				if (strict) {
+					if (hasClientBssid) {
+						// 与后端一致：有 BSSID 时以路由器 MAC 为准（避免 iOS/微信 SSID 为空或不准确）
+						return pairs.some((p) => {
+							const pb = this.normalizeAttendanceBssid(p.bssid)
+							return !!pb && pb === curB
+						})
+					}
+					if (this.isInFence !== true) return false
+					if (!curSsid) return false
+					return pairs.some((p) => {
+						const ps = String(p.ssid || '').trim()
+						return !!ps && ps.toLowerCase() === curSsid.toLowerCase()
+					})
 				}
-				return '点击获取定位，用于考勤校验'
-			},
-			fenceStatusText() {
-				if (this.locating) return '正在校验打卡范围…'
-				if (Number(this.punchType) === 2) return '外勤打卡不受门店围栏限制'
-				if (!this.fenceEnabled) return '当前门店未配置围栏，正常打卡不受范围限制'
+				return pairs.some((p) => {
+					const ps = String(p.ssid || '').trim()
+					const pb = this.normalizeAttendanceBssid(p.bssid)
+					const ssidHit =
+						!!ps && !!curSsid && ps.toLowerCase() === curSsid.toLowerCase()
+					const bssidHit = !!pb && pb === curB
+					return ssidHit || bssidHit
+				})
+			}
+			return false
+		},
+		/** 正常上班时是否满足门店「围栏 / Wi-Fi / 或二者择一」策略（与后端一致） */
+		normalPunchLocationOk() {
+			if (Number(this.punchType) !== 1) return true
+			const rf = this.requireFenceCheck
+			const rw = this.requireWifiCheck
+			if (!rf && !rw) return true
+			const fenceOk = !rf || this.isInFence === true
+			const wifiOk = !rw || this.wifiMatchesStore
+			if (rf && rw) return fenceOk || wifiOk
+			if (rf) return fenceOk
+			return wifiOk
+		},
+		fenceStatusText() {
+			if (this.locating) return '正在校验位置…'
+			if (Number(this.punchType) === 2) return '外勤打卡不受门店位置与 Wi-Fi 限制'
+			const rf = this.requireFenceCheck
+			const rw = this.requireWifiCheck
+			if (!rf && !rw) return '当前门店未要求范围或 Wi-Fi，正常打卡可直接进行'
+			const fenceLine = rf
+				? (this.longitude == null || this.latitude == null
+					? '需定位后判断是否在打卡范围内'
+					: (this.isInFence === true ? '已在打卡范围内' : '不在打卡范围内'))
+				: ''
+			const hasPairs = this.wifiPairRulesCount > 0
+			const wifiLine = rw
+				? (!hasPairs
+					? '门店已要求 Wi-Fi 打卡，但未配置网络白名单，请联系管理员在门店资料中维护'
+					: (this.wifiMatchesStore
+						? '已匹配门店 Wi-Fi 规则'
+						: '未匹配门店 Wi-Fi 规则（开启「对应」且无 BSSID 时需同时在围栏内且 SSID 正确）'))
+				: ''
+			if (rf && rw) {
+				return `门店要求：范围或 Wi-Fi 满足其一即可。${fenceLine}；${wifiLine}`
+			}
+			if (rf) {
 				if (this.longitude == null || this.latitude == null) return '点击更新定位后校验是否在门店范围内'
 				if (this.isInFence === true) return '当前位于门店打卡范围内，可正常上下班打卡'
 				if (this.isInFence === false) return '当前不在门店打卡范围内，正常打卡不可用'
 				return '定位完成后自动校验门店围栏范围'
-			},
-			punchInDone() {
-				return !!(this.detail && this.detail.punchIn && this.detail.punchIn.time)
-			},
-			punchOutDone() {
-				return !!(this.detail && this.detail.punchOut && this.detail.punchOut.time)
-			},
-			/** 下一步应打卡方向：1 上班 → 2 下班；都完成则为 null */
-			nextPunchDirection() {
-				if (!this.userInfo.userId) return null
-				if (!this.punchInDone) return 1
-				if (!this.punchOutDone) return 2
-				return null
-			},
-			allPunchDone() {
-				return this.punchInDone && this.punchOutDone
-			},
-			mainButtonTitle() {
-				if (this.allPunchDone) return '今日打卡已完成'
-				if (this.nextPunchDirection === 1) return '上班打卡'
-				if (this.nextPunchDirection === 2) return '下班打卡'
-				return '打卡'
-			},
-			mainButtonSub() {
-				if (this.allPunchDone) return ''
-				if (this.nextPunchDirection === 1) return '上班签到'
-				if (this.nextPunchDirection === 2) return '下班签退'
-				return ''
-			},
-			canPressMainButton() {
-				if (this.loading || this.submitting || this.locating) return false
-				if (!this.userInfo.userId) return false
-				if (this.nextPunchDirection == null) return false
-				if (Number(this.punchType) === 1 && this.fenceEnabled && this.isInFence !== true) return false
-				return true
-			},
-			canViewFenceMap() {
-				return !!(
-					(this.storeFence && this.storeFence.hasFence && this.storeFence.fencePolygons) ||
-					(this.storeFence && this.storeFence.longitude != null && this.storeFence.latitude != null) ||
-					(this.longitude != null && this.latitude != null)
-				)
 			}
+			return wifiLine || '请连接门店指定 Wi-Fi 后再试'
 		},
-		onLoad() {
-			this.userInfo = uni.getStorageSync('userInfo') || {}
-			this.today = this.formatDate(new Date())
+		punchInDone() {
+			return !!(this.detail && this.detail.punchIn && this.detail.punchIn.time)
 		},
-		onShow() {
-			this.userInfo = uni.getStorageSync('userInfo') || {}
-			this.startClock()
-			this.initializePage()
+		punchOutDone() {
+			return !!(this.detail && this.detail.punchOut && this.detail.punchOut.time)
 		},
-		onHide() {
-			this.stopClock()
+		/** 下一步应打卡方向：1 上班 → 2 下班；都完成则为 null */
+		nextPunchDirection() {
+			if (!this.userInfo.userId) return null
+			if (!this.punchInDone) return 1
+			if (!this.punchOutDone) return 2
+			return null
 		},
-		onUnload() {
-			this.stopClock()
+		allPunchDone() {
+			return this.punchInDone && this.punchOutDone
 		},
-		onPullDownRefresh() {
-			this.initializePage().finally(() => {
-				uni.stopPullDownRefresh()
-			})
+		mainButtonTitle() {
+			if (this.allPunchDone) return '今日打卡已完成'
+			if (this.nextPunchDirection === 1) return '上班打卡'
+			if (this.nextPunchDirection === 2) return '下班打卡'
+			return '打卡'
 		},
-		methods: {
-			/** 切回「正常」时只清空外勤说明；照片正常/外勤共用，保留 */
-			setPunchType(type) {
-				this.punchType = type
-				if (type === 1) {
-					this.remark = ''
-				}
-			},
-			async initializePage() {
-				await this.loadPunchConfig()
-				await this.refreshLocation()
-				await this.loadDetail()
-			},
-			onMainPunch() {
-				if (!this.nextPunchDirection) return
-				if (Number(this.punchType) === 1 && this.fenceEnabled && this.isInFence !== true) {
-					uni.showToast({ title: '当前不在门店打卡范围内，无法正常打卡', icon: 'none' })
-					return
+		mainButtonSub() {
+			if (this.allPunchDone) return ''
+			if (this.nextPunchDirection === 1) return '上班签到'
+			if (this.nextPunchDirection === 2) return '下班签退'
+			return ''
+		},
+		canPressMainButton() {
+			if (this.loading || this.submitting || this.locating) return false
+			if (!this.userInfo.userId) return false
+			if (this.nextPunchDirection == null) return false
+			if (Number(this.punchType) === 1 && !this.normalPunchLocationOk) return false
+			return true
+		},
+		canViewFenceMap() {
+			return !!(
+				(this.storeFence && this.storeFence.hasFence && this.storeFence.fencePolygons) ||
+				(this.storeFence && this.storeFence.longitude != null && this.storeFence.latitude != null) ||
+				(this.longitude != null && this.latitude != null)
+			)
+		},
+		wifiMainText() {
+			if (this.wifiLoading) return '正在获取 Wi-Fi 信息…'
+			if (this.wifiError) return this.wifiError
+			if (this.wifiSSID) return `当前网络：${this.wifiSSID}`
+			return '未获取到 Wi-Fi 名称'
+		},
+		wifiTipText() {
+			if (this.wifiLoading) return '用于核对是否在门店网络环境'
+			if (this.wifiError) {
+				if (this.wifiError.indexOf('模拟器') !== -1 || this.wifiError.indexOf('真机') !== -1) {
+					return 'Wi-Fi 由系统提供，开发者工具无此能力'
 				}
-				if (!this.canPressMainButton) return
-				this.doPunch(this.nextPunchDirection)
-			},
-			startClock() {
-				this.tickClock()
-				this.clockTimer = setInterval(this.tickClock, 1000)
-			},
-			stopClock() {
-				if (this.clockTimer) {
-					clearInterval(this.clockTimer)
-					this.clockTimer = null
+				return '可点击「刷新 Wi-Fi」重试；部分机型需开启定位权限'
+			}
+			if (Number(this.punchType) === 1 && this.requireWifiCheck) {
+				if (this.wifiPairRulesCount === 0) {
+					return '门店已开启 Wi-Fi 校验，白名单未配置，请联系管理员'
 				}
-			},
-			tickClock() {
-				const now = new Date()
-				const h = `${now.getHours()}`.padStart(2, '0')
-				const m = `${now.getMinutes()}`.padStart(2, '0')
-				const s = `${now.getSeconds()}`.padStart(2, '0')
-				this.clockTime = `${h}:${m}:${s}`
-			},
-			formatDate(d) {
-				const y = d.getFullYear()
-				const m = `${d.getMonth() + 1}`.padStart(2, '0')
-				const day = `${d.getDate()}`.padStart(2, '0')
-				return `${y}-${m}-${day}`
-			},
-			async loadDetail() {
-				if (!this.userInfo.userId) {
-					return
+				const strict = this.wifiVerifyPairStrict
+				if (this.wifiMatchesStore) {
+					return strict ? '已满足门店 Wi-Fi（含对应校验）' : '已命中门店 Wi-Fi 白名单'
 				}
-				this.loading = true
-				try {
-					const res = await this.API.getAttendanceDetail({
-						userId: this.userInfo.userId,
-						attendanceDate: this.today
-					})
-					if (res && Number(res.code) === 200 && res.data) {
-						this.detail = res.data
-					} else {
-						this.detail = null
-					}
-				} catch (e) {
+				return strict
+					? '未满足：若已开「对应」校验，请连门店 AP 或进入围栏且 SSID 正确'
+					: '未命中白名单（可核对 SSID/BSSID；与围栏组合时满足其一即可）'
+			}
+			if (this.wifiBSSID) return `BSSID：${this.wifiBSSID}`
+			return '名称由系统返回；iOS 常可稳定获取 BSSID'
+		}
+	},
+	onLoad() {
+		this.userInfo = uni.getStorageSync('userInfo') || {}
+		this.today = this.formatDate(new Date())
+	},
+	onShow() {
+		this.userInfo = uni.getStorageSync('userInfo') || {}
+		this.startClock()
+		this.initializePage()
+	},
+	onHide() {
+		this.stopClock()
+	},
+	onUnload() {
+		this.stopClock()
+	},
+	onPullDownRefresh() {
+		this.initializePage().finally(() => {
+			uni.stopPullDownRefresh()
+		})
+	},
+	methods: {
+		/** 与后端 NormalizeAttendanceBssid 一致：连字符统一为冒号、小写 */
+		normalizeAttendanceBssid(s) {
+			if (!s) return ''
+			let t = String(s).trim().replace(/-/g, ':').replace(/\s+/g, '').toLowerCase()
+			if (t.indexOf(':') < 0 && t.length === 12 && /^[0-9a-f]{12}$/.test(t)) {
+				t = t.match(/.{2}/g).join(':')
+			}
+			return t
+		},
+		/** 切回「正常」时只清空外勤说明；照片正常/外勤共用，保留 */
+		setPunchType(type) {
+			this.punchType = type
+			if (Number(type) === 1) {
+				this.remark = ''
+				// #ifdef MP-WEIXIN
+				this.refreshWifiInfo()
+				// #endif
+			}
+		},
+		async initializePage() {
+			await this.loadPunchConfig()
+			const wifiTask =
+				Number(this.punchType) === 1 ? this.refreshWifiInfo() : Promise.resolve()
+			await Promise.all([this.refreshLocation(), wifiTask])
+			await this.loadDetail()
+		},
+		onMainPunch() {
+			if (!this.nextPunchDirection) return
+			if (Number(this.punchType) === 1 && !this.normalPunchLocationOk) {
+				uni.showToast({
+					title: '未满足门店要求（需在范围内或指定 Wi-Fi/BSSID），可改用外勤',
+					icon: 'none'
+				})
+				return
+			}
+			if (!this.canPressMainButton) return
+			this.doPunch(this.nextPunchDirection)
+		},
+		startClock() {
+			this.tickClock()
+			this.clockTimer = setInterval(this.tickClock, 1000)
+		},
+		stopClock() {
+			if (this.clockTimer) {
+				clearInterval(this.clockTimer)
+				this.clockTimer = null
+			}
+		},
+		tickClock() {
+			const now = new Date()
+			const h = `${now.getHours()}`.padStart(2, '0')
+			const m = `${now.getMinutes()}`.padStart(2, '0')
+			const s = `${now.getSeconds()}`.padStart(2, '0')
+			this.clockTime = `${h}:${m}:${s}`
+		},
+		formatDate(d) {
+			const y = d.getFullYear()
+			const m = `${d.getMonth() + 1}`.padStart(2, '0')
+			const day = `${d.getDate()}`.padStart(2, '0')
+			return `${y}-${m}-${day}`
+		},
+		async loadDetail() {
+			if (!this.userInfo.userId) {
+				return
+			}
+			this.loading = true
+			try {
+				const res = await this.API.getAttendanceDetail({
+					userId: this.userInfo.userId,
+					attendanceDate: this.today
+				})
+				if (res && Number(res.code) === 200 && res.data) {
+					this.detail = res.data
+				} else {
 					this.detail = null
-				} finally {
-					this.loading = false
 				}
-			},
-			async loadPunchConfig() {
-				if (!this.userInfo.userId) {
+			} catch (e) {
+				this.detail = null
+			} finally {
+				this.loading = false
+			}
+		},
+		async loadPunchConfig() {
+			if (!this.userInfo.userId) {
+				this.punchConfig = null
+				this.storeFence = null
+				this.attendanceGroup = null
+				this.fenceEnabled = false
+				this.isInFence = null
+				return
+			}
+			try {
+				const res = await this.API.getCurrentAttendancePunchConfig({})
+				if (res && Number(res.code) === 200 && res.data) {
+					this.punchConfig = res.data
+					this.storeFence = res.data.storeFence || null
+					this.attendanceGroup = res.data.attendanceGroup || null
+					this.fenceEnabled = !!(this.storeFence && this.storeFence.hasFence && this.storeFence.fencePolygons)
+					this.evaluateFenceRange()
+				} else {
 					this.punchConfig = null
 					this.storeFence = null
 					this.attendanceGroup = null
 					this.fenceEnabled = false
 					this.isInFence = null
-					return
 				}
+			} catch (e) {
+				this.punchConfig = null
+				this.storeFence = null
+				this.attendanceGroup = null
+				this.fenceEnabled = false
+				this.isInFence = null
+			}
+		},
+		refreshWifiInfo() {
+			return new Promise((resolve) => {
+				// #ifndef MP-WEIXIN
+				resolve()
+				return
+				// #endif
+				// #ifdef MP-WEIXIN
 				try {
-					const res = await this.API.getCurrentAttendancePunchConfig({})
-					if (res && Number(res.code) === 200 && res.data) {
-						this.punchConfig = res.data
-						this.storeFence = res.data.storeFence || null
-						this.attendanceGroup = res.data.attendanceGroup || null
-						this.fenceEnabled = !!(this.storeFence && this.storeFence.hasFence && this.storeFence.fencePolygons)
-						this.evaluateFenceRange()
-					} else {
-						this.punchConfig = null
-						this.storeFence = null
-						this.attendanceGroup = null
-						this.fenceEnabled = false
-						this.isInFence = null
+					const sys = uni.getSystemInfoSync()
+					if (sys && sys.platform === 'devtools') {
+						this.wifiLoading = false
+						this.wifiSSID = ''
+						this.wifiBSSID = ''
+						this.wifiError = '开发者工具模拟器不支持 Wi-Fi，请用真机预览或扫码调试'
+						resolve()
+						return
 					}
-				} catch (e) {
-					this.punchConfig = null
-					this.storeFence = null
-					this.attendanceGroup = null
-					this.fenceEnabled = false
-					this.isInFence = null
-				}
-			},
-			refreshLocation() {
-				this.locating = true
-				return new Promise((resolve) => {
-					uni.getLocation({
-						type: 'gcj02',
-						isHighAccuracy: true,
-						success: (res) => {
-							this.longitude = res.longitude
-							this.latitude = res.latitude
-							this.address = ''
-							this.evaluateFenceRange()
-							this.locating = false
-							resolve()
-						},
-						fail: () => {
-							this.locating = false
-							this.isInFence = null
-							uni.showToast({ title: '定位失败，请检查系统定位权限', icon: 'none' })
-							resolve()
+				} catch (e) { }
+				this.wifiLoading = true
+				this.wifiError = ''
+				uni.startWifi({
+					success: () => {
+						uni.getConnectedWifi({
+							success: (res) => {
+								const w = res && res.wifi
+								this.wifiSSID = w && w.SSID ? String(w.SSID) : ''
+								this.wifiBSSID = w && w.BSSID ? String(w.BSSID) : ''
+								this.wifiLoading = false
+								if (!this.wifiSSID && !this.wifiBSSID) {
+									this.wifiError = '未连接 Wi-Fi'
+								}
+								resolve()
+							},
+							fail: (err) => {
+								this.wifiLoading = false
+								const msg = (err && err.errMsg) ? String(err.errMsg) : ''
+								if (msg.indexOf('auth deny') !== -1 || msg.indexOf('authorize') !== -1) {
+									this.wifiError = '需授权获取 Wi-Fi 信息'
+								} else if (msg.indexOf('not connected') !== -1 || (err && Number(err.errCode) === 12002)) {
+									this.wifiError = '当前未连接 Wi-Fi'
+								} else {
+									this.wifiError = '无法获取 Wi-Fi 信息'
+								}
+								this.wifiSSID = ''
+								this.wifiBSSID = ''
+								resolve()
+							}
+						})
+					},
+					fail: (err) => {
+						this.wifiLoading = false
+						this.wifiSSID = ''
+						this.wifiBSSID = ''
+						const msg = (err && err.errMsg) ? String(err.errMsg) : ''
+						if (msg.indexOf('devtools') !== -1 || msg.indexOf('not support') !== -1) {
+							this.wifiError = '当前环境不支持 Wi-Fi，请用真机预览'
+						} else {
+							this.wifiError = '无法启动 Wi-Fi 模块，请用真机重试'
 						}
-					})
-				})
-			},
-			openFenceMap() {
-				if (!this.canViewFenceMap) {
-					uni.showToast({ title: '暂无可展示的打卡范围', icon: 'none' })
-					return
-				}
-				const query = []
-				if (this.longitude != null) query.push(`longitude=${encodeURIComponent(this.longitude)}`)
-				if (this.latitude != null) query.push(`latitude=${encodeURIComponent(this.latitude)}`)
-				if (this.address) query.push(`address=${encodeURIComponent(this.address)}`)
-				if (this.isInFence !== null) query.push(`isInFence=${this.isInFence ? 1 : 0}`)
-				uni.navigateTo({
-					url: `/pages/attendance-fence-map/attendance-fence-map${query.length ? `?${query.join('&')}` : ''}`
+						resolve()
+					}
 				})
-			},
-			evaluateFenceRange() {
-				if (!this.fenceEnabled) {
-					this.isInFence = true
-					return
-				}
-				if (this.longitude == null || this.latitude == null) {
-					this.isInFence = null
-					return
-				}
-				const polygons = parseFencePolygons(this.storeFence && this.storeFence.fencePolygons)
-				if (!polygons.length) {
-					this.isInFence = true
-					return
-				}
-				this.isInFence = polygons.some((polygon) => this.isPointInPolygon(this.longitude, this.latitude, polygon))
-			},
-			isPointInPolygon(lng, lat, polygon) {
-				return isPointInPolygon(lng, lat, polygon)
-			},
-			async afterReadPhoto(event) {
-				const lists = [].concat(event.file)
-				const file = lists[0]
-				let fileObj = file
-				if (file.url && !file.path && !file.tempFilePath) {
-					fileObj = { tempFilePath: file.url }
-				}
-				try {
-					uni.showLoading({ title: '上传中' })
-					const result = await this.API.uploadFile(fileObj)
-					uni.hideLoading()
-					if (result && result.code === 200 && result.data && result.data.url) {
-						this.photoUrl = result.data.url
-						this.photoFileList = [{
-							url: result.data.url,
-							status: 'success'
-						}]
-					} else {
-						uni.showToast({ title: (result && result.msg) || '上传失败', icon: 'none' })
+				// #endif
+			})
+		},
+		refreshLocation() {
+			this.locating = true
+			return new Promise((resolve) => {
+				uni.getLocation({
+					type: 'gcj02',
+					isHighAccuracy: true,
+					success: (res) => {
+						this.longitude = res.longitude
+						this.latitude = res.latitude
+						this.address = ''
+						this.evaluateFenceRange()
+						this.locating = false
+						resolve()
+					},
+					fail: () => {
+						this.locating = false
+						this.isInFence = null
+						uni.showToast({ title: '定位失败，请检查系统定位权限', icon: 'none' })
+						resolve()
 					}
-				} catch (err) {
-					uni.hideLoading()
-					uni.showToast({ title: '上传失败', icon: 'none' })
-				}
-			},
-			deletePhoto() {
-				this.photoUrl = ''
-				this.photoFileList = []
-			},
-			async doPunch(direction) {
-				if (!this.userInfo.userId) {
-					uni.showToast({ title: '请先登录', icon: 'none' })
-					return
+				})
+			})
+		},
+		openFenceMap() {
+			if (!this.canViewFenceMap) {
+				uni.showToast({ title: '暂无可展示的打卡范围', icon: 'none' })
+				return
+			}
+			const query = []
+			if (this.longitude != null) query.push(`longitude=${encodeURIComponent(this.longitude)}`)
+			if (this.latitude != null) query.push(`latitude=${encodeURIComponent(this.latitude)}`)
+			if (this.address) query.push(`address=${encodeURIComponent(this.address)}`)
+			if (this.isInFence !== null) query.push(`isInFence=${this.isInFence ? 1 : 0}`)
+			uni.navigateTo({
+				url: `/pages/attendance-fence-map/attendance-fence-map${query.length ? `?${query.join('&')}` : ''}`
+			})
+		},
+		evaluateFenceRange() {
+			if (!this.fenceEnabled) {
+				this.isInFence = true
+				return
+			}
+			if (this.longitude == null || this.latitude == null) {
+				this.isInFence = null
+				return
+			}
+			const polygons = parseFencePolygons(this.storeFence && this.storeFence.fencePolygons)
+			if (!polygons.length) {
+				this.isInFence = true
+				return
+			}
+			this.isInFence = polygons.some((polygon) => this.isPointInPolygon(this.longitude, this.latitude, polygon))
+		},
+		isPointInPolygon(lng, lat, polygon) {
+			return isPointInPolygon(lng, lat, polygon)
+		},
+		async afterReadPhoto(event) {
+			const lists = [].concat(event.file)
+			const file = lists[0]
+			let fileObj = file
+			if (file.url && !file.path && !file.tempFilePath) {
+				fileObj = { tempFilePath: file.url }
+			}
+			try {
+				uni.showLoading({ title: '上传中' })
+				const result = await this.API.uploadFile(fileObj)
+				uni.hideLoading()
+				if (result && result.code === 200 && result.data && result.data.url) {
+					this.photoUrl = result.data.url
+					this.photoFileList = [{
+						url: result.data.url,
+						status: 'success'
+					}]
+				} else {
+					uni.showToast({ title: (result && result.msg) || '上传失败', icon: 'none' })
 				}
+			} catch (err) {
+				uni.hideLoading()
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		},
+		deletePhoto() {
+			this.photoUrl = ''
+			this.photoFileList = []
+		},
+		async doPunch(direction) {
+			if (!this.userInfo.userId) {
+				uni.showToast({ title: '请先登录', icon: 'none' })
+				return
+			}
+			const isNormal = Number(this.punchType) === 1
+			const needGps =
+				!isNormal ||
+				!!(this.storeFence && this.storeFence.requireFenceCheck)
+			if (needGps) {
 				if (this.longitude == null || this.latitude == null) {
 					await this.refreshLocation()
-					if (this.longitude == null || this.latitude == null) {
-						uni.showToast({ title: '请先完成定位', icon: 'none' })
-						return
-					}
 				}
-				const isFieldWork = Number(this.punchType) === 2
-				const payload = {
-					userId: this.userInfo.userId,
-					punchDirection: direction,
-					punchType: Number(this.punchType),
-					longitude: this.longitude,
-					latitude: this.latitude,
-					address: this.address || this.locationText,
-					photoUrl: this.photoUrl || undefined,
-					remark: isFieldWork ? ((this.remark || '').trim() || undefined) : undefined
+				if (this.longitude == null || this.latitude == null) {
+					uni.showToast({ title: '请先完成定位', icon: 'none' })
+					return
 				}
-				this.submitting = true
-				try {
-					const res = await this.API.submitAttendancePunch(payload)
-					if (res && Number(res.code) === 200) {
-						uni.showToast({ title: '打卡成功', icon: 'success' })
-						this.remark = ''
-						this.photoUrl = ''
-						this.photoFileList = []
-						await this.loadDetail()
-					} else {
-						uni.showToast({ title: (res && (res.msg || res.message)) || '打卡失败', icon: 'none' })
-					}
-				} catch (e) {
-					uni.showToast({ title: '打卡失败', icon: 'none' })
-				} finally {
-					this.submitting = false
+			} else if (isNormal && this.longitude == null) {
+				await this.refreshLocation()
+			}
+			const isFieldWork = Number(this.punchType) === 2
+			const payload = {
+				userId: this.userInfo.userId,
+				punchDirection: direction,
+				punchType: Number(this.punchType),
+				longitude: this.longitude != null ? this.longitude : undefined,
+				latitude: this.latitude != null ? this.latitude : undefined,
+				address: this.address || this.locationText,
+				wifiSsid: (this.wifiSSID || '').trim() || undefined,
+				wifiBssid: (this.wifiBSSID || '').trim() || undefined,
+				photoUrl: this.photoUrl || undefined,
+				remark: isFieldWork ? ((this.remark || '').trim() || undefined) : undefined
+			}
+			this.submitting = true
+			try {
+				const res = await this.API.submitAttendancePunch(payload)
+				if (res && Number(res.code) === 200) {
+					uni.showToast({ title: '打卡成功', icon: 'success' })
+					this.remark = ''
+					this.photoUrl = ''
+					this.photoFileList = []
+					await this.loadDetail()
+				} else {
+					uni.showToast({ title: (res && (res.msg || res.message)) || '打卡失败', icon: 'none' })
 				}
+			} catch (e) {
+				uni.showToast({ title: '打卡失败', icon: 'none' })
+			} finally {
+				this.submitting = false
 			}
 		}
 	}
+}
 </script>
 
 <style scoped lang="scss">
-	/* 与 pages/index 首页：浅绿底 #e8f5e9、渐变顶栏、主色 #43a047 */
-	.att-page {
-		min-height: 100vh;
-		background: #e8f5e9;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		box-sizing: border-box;
-	}
+/* 与 pages/index 首页：浅绿底 #e8f5e9、渐变顶栏、主色 #43a047 */
+.att-page {
+	min-height: 100vh;
+	background: #e8f5e9;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	box-sizing: border-box;
+}
 
-	.att-header {
-		background: linear-gradient(120deg, #43e97b 0%, #38f9d7 100%);
-		padding: 40rpx 32rpx 48rpx;
-		text-align: center;
-		box-shadow: 0 4rpx 24rpx 0 rgba(67, 233, 123, 0.12);
-	}
+.att-header {
+	background: linear-gradient(120deg, #43e97b 0%, #38f9d7 100%);
+	padding: 40rpx 32rpx 48rpx;
+	text-align: center;
+	box-shadow: 0 4rpx 24rpx 0 rgba(67, 233, 123, 0.12);
+}
 
-	.att-clock {
-		font-size: 88rpx;
-		font-weight: 300;
-		color: #ffffff;
-		letter-spacing: 4rpx;
-		font-variant-numeric: tabular-nums;
-		line-height: 1.1;
-		text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-	}
+.att-clock {
+	font-size: 88rpx;
+	font-weight: 300;
+	color: #ffffff;
+	letter-spacing: 4rpx;
+	font-variant-numeric: tabular-nums;
+	line-height: 1.1;
+	text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
+}
 
-	.att-meta {
-		margin-top: 16rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 16rpx;
-	}
+.att-meta {
+	margin-top: 16rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 16rpx;
+}
 
-	.att-date {
-		font-size: 28rpx;
-		color: rgba(255, 255, 255, 0.92);
-	}
+.att-date {
+	font-size: 28rpx;
+	color: rgba(255, 255, 255, 0.92);
+}
 
-	.att-week {
-		font-size: 28rpx;
-		color: #e8f5e9;
-		font-weight: 500;
-	}
+.att-week {
+	font-size: 28rpx;
+	color: #e8f5e9;
+	font-weight: 500;
+}
 
-	.att-user {
-		margin-top: 12rpx;
-		font-size: 26rpx;
-		color: rgba(255, 255, 255, 0.88);
-	}
+.att-user {
+	margin-top: 12rpx;
+	font-size: 26rpx;
+	color: rgba(255, 255, 255, 0.88);
+}
 
-	.att-rule {
-		margin-top: 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 12rpx;
-		font-size: 24rpx;
-	}
+.att-rule {
+	margin-top: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 12rpx;
+	font-size: 24rpx;
+}
 
-	.att-rule-label {
-		color: rgba(255, 255, 255, 0.75);
-	}
+.att-rule-label {
+	color: rgba(255, 255, 255, 0.75);
+}
 
-	.att-rule-val {
-		color: #ffffff;
-		font-weight: 600;
-	}
+.att-rule-val {
+	color: #ffffff;
+	font-weight: 600;
+}
 
-	.att-body {
-		margin-top: -28rpx;
-		padding: 0 32rpx 32rpx;
-		position: relative;
-		z-index: 2;
-	}
+.att-body {
+	margin-top: -28rpx;
+	padding: 0 32rpx 32rpx;
+	position: relative;
+	z-index: 2;
+}
 
-	.att-card {
-		background: #ffffff;
-		border-radius: 20rpx;
-		padding: 28rpx;
-		margin-bottom: 24rpx;
-		box-shadow: 0 4rpx 24rpx 0 rgba(67, 233, 123, 0.08);
-	}
+.att-card {
+	background: #ffffff;
+	border-radius: 20rpx;
+	padding: 28rpx;
+	margin-bottom: 24rpx;
+	box-shadow: 0 4rpx 24rpx 0 rgba(67, 233, 123, 0.08);
+}
 
-	.att-seg-card {
-		padding: 20rpx 24rpx;
-	}
+.att-seg-card {
+	padding: 20rpx 24rpx;
+}
 
-	.att-seg {
-		display: flex;
-		background: linear-gradient(135deg, #e8f5e9 60%, #c8e6c9 100%);
-		border-radius: 16rpx;
-		padding: 8rpx;
-	}
+.att-seg {
+	display: flex;
+	background: linear-gradient(135deg, #e8f5e9 60%, #c8e6c9 100%);
+	border-radius: 16rpx;
+	padding: 8rpx;
+}
 
-	.att-seg-item {
-		flex: 1;
-		text-align: center;
-		padding: 20rpx 0;
-		font-size: 28rpx;
-		color: #6a9c6a;
-		border-radius: 12rpx;
-	}
+.att-seg-item {
+	flex: 1;
+	text-align: center;
+	padding: 20rpx 0;
+	font-size: 28rpx;
+	color: #6a9c6a;
+	border-radius: 12rpx;
+}
 
-	.att-seg-item.is-active {
-		background: #ffffff;
-		color: #43a047;
-		font-weight: 600;
-		box-shadow: 0 2rpx 12rpx rgba(67, 160, 71, 0.15);
-	}
+.att-seg-item.is-active {
+	background: #ffffff;
+	color: #43a047;
+	font-weight: 600;
+	box-shadow: 0 2rpx 12rpx rgba(67, 160, 71, 0.15);
+}
 
-	.att-punch-card {
-		text-align: center;
-		padding: 40rpx 28rpx 36rpx;
-	}
+.att-punch-card {
+	text-align: center;
+	padding: 40rpx 28rpx 36rpx;
+}
 
-	.att-big-btn {
-		width: 300rpx;
-		height: 300rpx;
-		margin: 0 auto;
-		border-radius: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background: linear-gradient(145deg, #66bb6a 0%, #43a047 45%, #388e3c 100%);
-		box-shadow: 0 12rpx 40rpx 0 rgba(67, 160, 71, 0.35);
-		transition: transform 0.15s, opacity 0.15s;
-	}
+.att-big-btn {
+	width: 300rpx;
+	height: 300rpx;
+	margin: 0 auto;
+	border-radius: 50%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background: linear-gradient(145deg, #66bb6a 0%, #43a047 45%, #388e3c 100%);
+	box-shadow: 0 12rpx 40rpx 0 rgba(67, 160, 71, 0.35);
+	transition: transform 0.15s, opacity 0.15s;
+}
 
-	.att-big-btn:active:not(.is-disabled):not(.is-all-done) {
-		transform: scale(0.97);
-	}
+.att-big-btn:active:not(.is-disabled):not(.is-all-done) {
+	transform: scale(0.97);
+}
 
-	.att-big-btn.is-disabled:not(.is-all-done) {
-		opacity: 0.5;
-		box-shadow: none;
-	}
+.att-big-btn.is-disabled:not(.is-all-done) {
+	opacity: 0.5;
+	box-shadow: none;
+}
 
-	.att-big-btn.is-all-done {
-		background: linear-gradient(145deg, #81c784 0%, #66bb6a 100%);
-		box-shadow: 0 8rpx 28rpx 0 rgba(67, 160, 71, 0.25);
-	}
+.att-big-btn.is-all-done {
+	background: linear-gradient(145deg, #81c784 0%, #66bb6a 100%);
+	box-shadow: 0 8rpx 28rpx 0 rgba(67, 160, 71, 0.25);
+}
 
-	.att-big-title {
-		font-size: 40rpx;
-		font-weight: 700;
-		color: #ffffff;
-		letter-spacing: 2rpx;
-	}
+.att-big-title {
+	font-size: 40rpx;
+	font-weight: 700;
+	color: #ffffff;
+	letter-spacing: 2rpx;
+}
 
-	.att-big-sub {
-		margin-top: 16rpx;
-		font-size: 24rpx;
-		color: rgba(255, 255, 255, 0.9);
-	}
+.att-big-sub {
+	margin-top: 16rpx;
+	font-size: 24rpx;
+	color: rgba(255, 255, 255, 0.9);
+}
 
-	.att-big-done-text {
-		margin-top: 12rpx;
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #ffffff;
-	}
+.att-big-done-text {
+	margin-top: 12rpx;
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #ffffff;
+}
 
-	.att-next-hint {
-		margin-top: 24rpx;
-		font-size: 24rpx;
-		color: #388e3c;
-		font-weight: 500;
-	}
+.att-next-hint {
+	margin-top: 24rpx;
+	font-size: 24rpx;
+	color: #388e3c;
+	font-weight: 500;
+}
 
-	.att-loc-card {
-		display: flex;
-		align-items: flex-start;
-		gap: 16rpx;
-	}
+.att-loc-card {
+	display: flex;
+	align-items: flex-start;
+	gap: 16rpx;
+}
 
-	.att-loc-main {
-		flex: 1;
-		min-width: 0;
-	}
+.att-loc-main {
+	flex: 1;
+	min-width: 0;
+}
 
-	.att-loc-text {
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 1.5;
-		word-break: break-all;
-	}
+.att-loc-text {
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 1.5;
+	word-break: break-all;
+}
 
-	.att-loc-tip {
-		display: block;
-		margin-top: 8rpx;
-		font-size: 22rpx;
-		color: #6a9c6a;
-	}
+.att-loc-tip {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 22rpx;
+	color: #6a9c6a;
+}
 
-	.att-loc-actions {
-		display: flex;
-		align-items: center;
-		flex-wrap: wrap;
-		gap: 16rpx;
-		margin-top: 16rpx;
-	}
+.att-loc-actions {
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 16rpx;
+	margin-top: 16rpx;
+}
 
-	.att-loc-action {
-		font-size: 22rpx;
-		color: #7f8c8d;
-		background: #f5f7fa;
-		border-radius: 999rpx;
-		padding: 10rpx 20rpx;
-		line-height: 1;
-	}
+.att-loc-action {
+	font-size: 22rpx;
+	color: #7f8c8d;
+	background: #f5f7fa;
+	border-radius: 999rpx;
+	padding: 10rpx 20rpx;
+	line-height: 1;
+}
 
-	.att-loc-action--primary {
-		color: #43a047;
-		background: rgba(67, 160, 71, 0.12);
-	}
+.att-loc-action--primary {
+	color: #43a047;
+	background: rgba(67, 160, 71, 0.12);
+}
 
-	.att-card-head {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 24rpx;
-		padding-bottom: 20rpx;
-		border-bottom: 1rpx solid #e8f5e9;
-	}
+.att-card-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 24rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 1rpx solid #e8f5e9;
+}
 
-	.att-card-title {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #388e3c;
-		letter-spacing: 1rpx;
-	}
+.att-card-title {
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #388e3c;
+	letter-spacing: 1rpx;
+}
 
-	.att-status-tag {
-		font-size: 22rpx;
-		color: #43a047;
-		background: rgba(67, 160, 71, 0.12);
-		padding: 8rpx 20rpx;
-		border-radius: 8rpx;
-	}
+.att-status-tag {
+	font-size: 22rpx;
+	color: #43a047;
+	background: rgba(67, 160, 71, 0.12);
+	padding: 8rpx 20rpx;
+	border-radius: 8rpx;
+}
 
-	.att-timeline {
-		position: relative;
-		padding-left: 8rpx;
-	}
+.att-timeline {
+	position: relative;
+	padding-left: 8rpx;
+}
 
-	.att-tl-item {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-		position: relative;
-		min-height: 100rpx;
-		overflow: visible;
-	}
+.att-tl-item {
+	display: flex;
+	flex-direction: row;
+	align-items: flex-start;
+	position: relative;
+	min-height: 100rpx;
+	overflow: visible;
+}
 
-	.att-tl-item--last {
-		min-height: auto;
-	}
+.att-tl-item--last {
+	min-height: auto;
+}
 
-	.att-tl-dot {
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 50%;
-		background: #e0e0e0;
-		margin-top: 8rpx;
-		flex-shrink: 0;
-		z-index: 1;
-	}
+.att-tl-dot {
+	width: 20rpx;
+	height: 20rpx;
+	border-radius: 50%;
+	background: #e0e0e0;
+	margin-top: 8rpx;
+	flex-shrink: 0;
+	z-index: 1;
+}
 
-	.att-tl-dot.is-on {
-		background: #43a047;
-		box-shadow: 0 0 0 6rpx rgba(67, 160, 71, 0.2);
-	}
+.att-tl-dot.is-on {
+	background: #43a047;
+	box-shadow: 0 0 0 6rpx rgba(67, 160, 71, 0.2);
+}
 
-	.att-tl-line {
-		position: absolute;
-		left: 9rpx;
-		top: 28rpx;
-		width: 2rpx;
-		height: 72rpx;
-		background: #e8f5e9;
-	}
+.att-tl-line {
+	position: absolute;
+	left: 9rpx;
+	top: 28rpx;
+	width: 2rpx;
+	height: 72rpx;
+	background: #e8f5e9;
+}
 
-	.att-tl-body {
-		flex: 1;
-		margin-left: 24rpx;
-		padding-bottom: 28rpx;
-	}
+.att-tl-body {
+	flex: 1;
+	margin-left: 24rpx;
+	padding-bottom: 28rpx;
+}
 
-	.att-tl-item--last .att-tl-body {
-		padding-bottom: 0;
-	}
+.att-tl-item--last .att-tl-body {
+	padding-bottom: 0;
+}
 
-	.att-tl-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		gap: 16rpx;
-	}
+.att-tl-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	gap: 16rpx;
+}
 
-	.att-tl-name {
-		font-size: 28rpx;
-		color: #6a9c6a;
-	}
+.att-tl-name {
+	font-size: 28rpx;
+	color: #6a9c6a;
+}
 
-	.att-tl-time {
-		font-size: 28rpx;
-		color: #333333;
-		font-weight: 500;
-		text-align: right;
-		word-break: break-all;
-	}
+.att-tl-time {
+	font-size: 28rpx;
+	color: #333333;
+	font-weight: 500;
+	text-align: right;
+	word-break: break-all;
+}
 
-	.att-empty {
-		font-size: 26rpx;
-		color: #909399;
-		line-height: 1.6;
-		text-align: center;
-		padding: 16rpx 0;
-	}
+.att-empty {
+	font-size: 26rpx;
+	color: #909399;
+	line-height: 1.6;
+	text-align: center;
+	padding: 16rpx 0;
+}
 
-	.att-more-title {
-		font-size: 26rpx;
-		color: #6a9c6a;
-		margin-bottom: 20rpx;
-		font-weight: 500;
-	}
+.att-more-title {
+	font-size: 26rpx;
+	color: #6a9c6a;
+	margin-bottom: 20rpx;
+	font-weight: 500;
+}
 
-	.att-more-title--second {
-		margin-top: 28rpx;
-		margin-bottom: 16rpx;
-	}
+.att-more-title--second {
+	margin-top: 28rpx;
+	margin-bottom: 16rpx;
+}
 
-	.att-upload-wrap {
-		margin-top: 20rpx;
-	}
+.att-upload-wrap {
+	margin-top: 20rpx;
+}
 
-	.att-safe {
-		height: 24rpx;
-	}
+.att-safe {
+	height: 24rpx;
+}
 
-	.att-loading-mask {
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background: rgba(255, 255, 255, 0.75);
-		z-index: 999;
-	}
+.att-loading-mask {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background: rgba(255, 255, 255, 0.75);
+	z-index: 999;
+}
 
-	.att-loading-txt {
-		margin-top: 16rpx;
-		font-size: 26rpx;
-		color: #6a9c6a;
-	}
+.att-loading-txt {
+	margin-top: 16rpx;
+	font-size: 26rpx;
+	color: #6a9c6a;
+}
 </style>
diff --git a/绿纤uni-app/pagesA/my-application-list/my-application-list.vue b/绿纤uni-app/pagesA/my-application-list/my-application-list.vue
index d53f9be..dcd2dbd 100644
--- a/绿纤uni-app/pagesA/my-application-list/my-application-list.vue
+++ b/绿纤uni-app/pagesA/my-application-list/my-application-list.vue
@@ -5,6 +5,18 @@
 			<view class="header-sub">查看我发起的流程申请，支持进入详情查看表单与审批进度</view>
 		</view>
 
+		<view class="filter-bar">
+			<view
+				v-for="tab in statusTabs"
+				:key="tab.key"
+				class="filter-item"
+				:class="statusFilter === tab.key ? 'filter-item--active' : ''"
+				@tap="changeStatusFilter(tab.key)"
+			>
+				{{ tab.label }}
+			</view>
+		</view>
+
 		<view v-if="loading && !list.length" class="state-card">
 			<text class="state-text">加载中...</text>
 		</view>
@@ -63,6 +75,13 @@ export default {
 		return {
 			loading: false,
 			list: [],
+			statusFilter: 'all',
+			statusTabs: [
+				{ key: 'all', label: '全部' },
+				{ key: 'running', label: '审核中' },
+				{ key: 'passed', label: '已通过' },
+				{ key: 'rejected', label: '不通过' }
+			],
 			query: {
 				currentPage: 1,
 				pageSize: 20,
@@ -73,8 +92,14 @@ export default {
 		}
 	},
 	computed: {
+		filteredList() {
+			if (!Array.isArray(this.list)) return []
+			const st = this.getStatusFilterNumber(this.statusFilter)
+			if (st === null) return this.list
+			return this.list.filter(item => Number(item.status) === st)
+		},
 		displayList() {
-			return (this.list || []).map(item => ({
+			return (this.filteredList || []).map(item => ({
 				...item,
 				statusClassName: this.statusClass(item.status),
 				statusText: this.getStatusText(item.status),
@@ -115,6 +140,11 @@ export default {
 				uni.stopPullDownRefresh()
 			}
 		},
+		changeStatusFilter(key) {
+			if (this.statusFilter === key) return
+			this.statusFilter = key
+			this.refresh()
+		},
 		refresh() {
 			this.query.currentPage = 1
 			this.total = 0
@@ -151,6 +181,15 @@ export default {
 			}
 			return map[Number(status)] || 'status-default'
 		},
+		// 业务状态：与 getStatusText / 后端 FlowTaskEntity.status 对齐
+		// all: 全部；running: 待审核；passed: 已通过；rejected: 已驳回(不通过)
+		getStatusFilterNumber(key) {
+			if (key === 'all') return null
+			if (key === 'running') return 1
+			if (key === 'passed') return 2
+			if (key === 'rejected') return 3
+			return null
+		},
 		getUrgentText(val) {
 			const map = {
 				1: '普通',
@@ -192,6 +231,28 @@ export default {
 	box-sizing: border-box;
 	background: linear-gradient(180deg, #e8f5e9 0%, #f7fff8 100%);
 }
+.filter-bar {
+	display: flex;
+	gap: 16rpx;
+	padding: 0 12rpx;
+	margin-bottom: 22rpx;
+}
+.filter-item {
+	flex: 1;
+	text-align: center;
+	padding: 14rpx 0;
+	border-radius: 999rpx;
+	background: rgba(255, 255, 255, 0.7);
+	color: #7a8b7b;
+	font-size: 24rpx;
+	font-weight: 600;
+	border: 1px solid rgba(46, 125, 50, 0.12);
+}
+.filter-item--active {
+	background: #e8f5e9;
+	color: #2e7d32;
+	border-color: rgba(46, 125, 50, 0.35);
+}
 .header-card,
 .state-card,
 .apply-card {
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js
index 788b529..bfeeaee 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.js
@@ -134,6 +134,15 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var m0 = Number(_vm.punchType)
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        m0: m0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -312,13 +321,6 @@ var _attendanceFence = __webpack_require__(/*! @/service/attendance-fence.js */ 
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
@@ -341,7 +343,11 @@ var _default = {
       photoUrl: '',
       photoFileList: [],
       clockTime: '--:--:--',
-      clockTimer: null
+      clockTimer: null,
+      wifiSSID: '',
+      wifiBSSID: '',
+      wifiLoading: false,
+      wifiError: ''
     };
   },
   computed: {
@@ -385,14 +391,95 @@ var _default = {
       }
       return '点击获取定位，用于考勤校验';
     },
+    requireFenceCheck: function requireFenceCheck() {
+      var sf = this.storeFence;
+      if (!sf) return false;
+      var rf = sf.requireFenceCheck != null ? sf.requireFenceCheck : sf.RequireFenceCheck;
+      return rf === true || rf === 1 || rf === '1';
+    },
+    requireWifiCheck: function requireWifiCheck() {
+      var sf = this.storeFence;
+      if (!sf) return false;
+      var rw = sf.requireWifiCheck != null ? sf.requireWifiCheck : sf.RequireWifiCheck;
+      return rw === true || rw === 1 || rw === '1';
+    },
+    /** 门店是否已配置 Wi-Fi 成对白名单（与接口 attendanceWifiPairs 一致） */wifiPairRulesCount: function wifiPairRulesCount() {
+      var sf = this.storeFence;
+      if (!sf) return 0;
+      var raw = sf.attendanceWifiPairs != null ? sf.attendanceWifiPairs : sf.AttendanceWifiPairs;
+      return Array.isArray(raw) ? raw.length : 0;
+    },
+    wifiVerifyPairStrict: function wifiVerifyPairStrict() {
+      var sf = this.storeFence;
+      if (!sf) return false;
+      var v = sf.attendanceWifiVerifyPair != null ? sf.attendanceWifiVerifyPair : sf.AttendanceWifiVerifyPair;
+      return Number(v) === 1;
+    },
+    wifiMatchesStore: function wifiMatchesStore() {
+      var _this = this;
+      var sf = this.storeFence;
+      var rawPairs = sf && (sf.attendanceWifiPairs != null ? sf.attendanceWifiPairs : sf.AttendanceWifiPairs);
+      var pairs = Array.isArray(rawPairs) ? rawPairs : [];
+      var curSsid = (this.wifiSSID || '').trim();
+      var curB = this.normalizeAttendanceBssid(this.wifiBSSID);
+      var hasClientBssid = !!curB;
+      if (pairs.length > 0) {
+        var strict = this.wifiVerifyPairStrict;
+        if (strict) {
+          if (hasClientBssid) {
+            // 与后端一致：有 BSSID 时以路由器 MAC 为准（避免 iOS/微信 SSID 为空或不准确）
+            return pairs.some(function (p) {
+              var pb = _this.normalizeAttendanceBssid(p.bssid);
+              return !!pb && pb === curB;
+            });
+          }
+          if (this.isInFence !== true) return false;
+          if (!curSsid) return false;
+          return pairs.some(function (p) {
+            var ps = String(p.ssid || '').trim();
+            return !!ps && ps.toLowerCase() === curSsid.toLowerCase();
+          });
+        }
+        return pairs.some(function (p) {
+          var ps = String(p.ssid || '').trim();
+          var pb = _this.normalizeAttendanceBssid(p.bssid);
+          var ssidHit = !!ps && !!curSsid && ps.toLowerCase() === curSsid.toLowerCase();
+          var bssidHit = !!pb && pb === curB;
+          return ssidHit || bssidHit;
+        });
+      }
+      return false;
+    },
+    /** 正常上班时是否满足门店「围栏 / Wi-Fi / 或二者择一」策略（与后端一致） */normalPunchLocationOk: function normalPunchLocationOk() {
+      if (Number(this.punchType) !== 1) return true;
+      var rf = this.requireFenceCheck;
+      var rw = this.requireWifiCheck;
+      if (!rf && !rw) return true;
+      var fenceOk = !rf || this.isInFence === true;
+      var wifiOk = !rw || this.wifiMatchesStore;
+      if (rf && rw) return fenceOk || wifiOk;
+      if (rf) return fenceOk;
+      return wifiOk;
+    },
     fenceStatusText: function fenceStatusText() {
-      if (this.locating) return '正在校验打卡范围…';
-      if (Number(this.punchType) === 2) return '外勤打卡不受门店围栏限制';
-      if (!this.fenceEnabled) return '当前门店未配置围栏，正常打卡不受范围限制';
-      if (this.longitude == null || this.latitude == null) return '点击更新定位后校验是否在门店范围内';
-      if (this.isInFence === true) return '当前位于门店打卡范围内，可正常上下班打卡';
-      if (this.isInFence === false) return '当前不在门店打卡范围内，正常打卡不可用';
-      return '定位完成后自动校验门店围栏范围';
+      if (this.locating) return '正在校验位置…';
+      if (Number(this.punchType) === 2) return '外勤打卡不受门店位置与 Wi-Fi 限制';
+      var rf = this.requireFenceCheck;
+      var rw = this.requireWifiCheck;
+      if (!rf && !rw) return '当前门店未要求范围或 Wi-Fi，正常打卡可直接进行';
+      var fenceLine = rf ? this.longitude == null || this.latitude == null ? '需定位后判断是否在打卡范围内' : this.isInFence === true ? '已在打卡范围内' : '不在打卡范围内' : '';
+      var hasPairs = this.wifiPairRulesCount > 0;
+      var wifiLine = rw ? !hasPairs ? '门店已要求 Wi-Fi 打卡，但未配置网络白名单，请联系管理员在门店资料中维护' : this.wifiMatchesStore ? '已匹配门店 Wi-Fi 规则' : '未匹配门店 Wi-Fi 规则（开启「对应」且无 BSSID 时需同时在围栏内且 SSID 正确）' : '';
+      if (rf && rw) {
+        return "\u95E8\u5E97\u8981\u6C42\uFF1A\u8303\u56F4\u6216 Wi-Fi \u6EE1\u8DB3\u5176\u4E00\u5373\u53EF\u3002".concat(fenceLine, "\uFF1B").concat(wifiLine);
+      }
+      if (rf) {
+        if (this.longitude == null || this.latitude == null) return '点击更新定位后校验是否在门店范围内';
+        if (this.isInFence === true) return '当前位于门店打卡范围内，可正常上下班打卡';
+        if (this.isInFence === false) return '当前不在门店打卡范围内，正常打卡不可用';
+        return '定位完成后自动校验门店围栏范围';
+      }
+      return wifiLine || '请连接门店指定 Wi-Fi 后再试';
     },
     punchInDone: function punchInDone() {
       return !!(this.detail && this.detail.punchIn && this.detail.punchIn.time);
@@ -425,11 +512,38 @@ var _default = {
       if (this.loading || this.submitting || this.locating) return false;
       if (!this.userInfo.userId) return false;
       if (this.nextPunchDirection == null) return false;
-      if (Number(this.punchType) === 1 && this.fenceEnabled && this.isInFence !== true) return false;
+      if (Number(this.punchType) === 1 && !this.normalPunchLocationOk) return false;
       return true;
     },
     canViewFenceMap: function canViewFenceMap() {
       return !!(this.storeFence && this.storeFence.hasFence && this.storeFence.fencePolygons || this.storeFence && this.storeFence.longitude != null && this.storeFence.latitude != null || this.longitude != null && this.latitude != null);
+    },
+    wifiMainText: function wifiMainText() {
+      if (this.wifiLoading) return '正在获取 Wi-Fi 信息…';
+      if (this.wifiError) return this.wifiError;
+      if (this.wifiSSID) return "\u5F53\u524D\u7F51\u7EDC\uFF1A".concat(this.wifiSSID);
+      return '未获取到 Wi-Fi 名称';
+    },
+    wifiTipText: function wifiTipText() {
+      if (this.wifiLoading) return '用于核对是否在门店网络环境';
+      if (this.wifiError) {
+        if (this.wifiError.indexOf('模拟器') !== -1 || this.wifiError.indexOf('真机') !== -1) {
+          return 'Wi-Fi 由系统提供，开发者工具无此能力';
+        }
+        return '可点击「刷新 Wi-Fi」重试；部分机型需开启定位权限';
+      }
+      if (Number(this.punchType) === 1 && this.requireWifiCheck) {
+        if (this.wifiPairRulesCount === 0) {
+          return '门店已开启 Wi-Fi 校验，白名单未配置，请联系管理员';
+        }
+        var strict = this.wifiVerifyPairStrict;
+        if (this.wifiMatchesStore) {
+          return strict ? '已满足门店 Wi-Fi（含对应校验）' : '已命中门店 Wi-Fi 白名单';
+        }
+        return strict ? '未满足：若已开「对应」校验，请连门店 AP 或进入围栏且 SSID 正确' : '未命中白名单（可核对 SSID/BSSID；与围栏组合时满足其一即可）';
+      }
+      if (this.wifiBSSID) return "BSSID\uFF1A".concat(this.wifiBSSID);
+      return '名称由系统返回；iOS 常可稳定获取 BSSID';
     }
   },
   onLoad: function onLoad() {
@@ -453,28 +567,39 @@ var _default = {
     });
   },
   methods: {
+    /** 与后端 NormalizeAttendanceBssid 一致：连字符统一为冒号、小写 */normalizeAttendanceBssid: function normalizeAttendanceBssid(s) {
+      if (!s) return '';
+      var t = String(s).trim().replace(/-/g, ':').replace(/\s+/g, '').toLowerCase();
+      if (t.indexOf(':') < 0 && t.length === 12 && /^[0-9a-f]{12}$/.test(t)) {
+        t = t.match(/.{2}/g).join(':');
+      }
+      return t;
+    },
     /** 切回「正常」时只清空外勤说明；照片正常/外勤共用，保留 */setPunchType: function setPunchType(type) {
       this.punchType = type;
-      if (type === 1) {
+      if (Number(type) === 1) {
         this.remark = '';
+        this.refreshWifiInfo();
       }
     },
     initializePage: function initializePage() {
-      var _this = this;
+      var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var wifiTask;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return _this.loadPunchConfig();
+                return _this2.loadPunchConfig();
               case 2:
-                _context.next = 4;
-                return _this.refreshLocation();
-              case 4:
-                _context.next = 6;
-                return _this.loadDetail();
-              case 6:
+                wifiTask = Number(_this2.punchType) === 1 ? _this2.refreshWifiInfo() : Promise.resolve();
+                _context.next = 5;
+                return Promise.all([_this2.refreshLocation(), wifiTask]);
+              case 5:
+                _context.next = 7;
+                return _this2.loadDetail();
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -484,9 +609,9 @@ var _default = {
     },
     onMainPunch: function onMainPunch() {
       if (!this.nextPunchDirection) return;
-      if (Number(this.punchType) === 1 && this.fenceEnabled && this.isInFence !== true) {
+      if (Number(this.punchType) === 1 && !this.normalPunchLocationOk) {
         uni.showToast({
-          title: '当前不在门店打卡范围内，无法正常打卡',
+          title: '未满足门店要求（需在范围内或指定 Wi-Fi/BSSID），可改用外勤',
           icon: 'none'
         });
         return;
@@ -518,42 +643,42 @@ var _default = {
       return "".concat(y, "-").concat(m, "-").concat(day);
     },
     loadDetail: function loadDetail() {
-      var _this2 = this;
+      var _this3 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var res;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                if (_this2.userInfo.userId) {
+                if (_this3.userInfo.userId) {
                   _context2.next = 2;
                   break;
                 }
                 return _context2.abrupt("return");
               case 2:
-                _this2.loading = true;
+                _this3.loading = true;
                 _context2.prev = 3;
                 _context2.next = 6;
-                return _this2.API.getAttendanceDetail({
-                  userId: _this2.userInfo.userId,
-                  attendanceDate: _this2.today
+                return _this3.API.getAttendanceDetail({
+                  userId: _this3.userInfo.userId,
+                  attendanceDate: _this3.today
                 });
               case 6:
                 res = _context2.sent;
                 if (res && Number(res.code) === 200 && res.data) {
-                  _this2.detail = res.data;
+                  _this3.detail = res.data;
                 } else {
-                  _this2.detail = null;
+                  _this3.detail = null;
                 }
                 _context2.next = 13;
                 break;
               case 10:
                 _context2.prev = 10;
                 _context2.t0 = _context2["catch"](3);
-                _this2.detail = null;
+                _this3.detail = null;
               case 13:
                 _context2.prev = 13;
-                _this2.loading = false;
+                _this3.loading = false;
                 return _context2.finish(13);
               case 16:
               case "end":
@@ -564,52 +689,52 @@ var _default = {
       }))();
     },
     loadPunchConfig: function loadPunchConfig() {
-      var _this3 = this;
+      var _this4 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var res;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                if (_this3.userInfo.userId) {
+                if (_this4.userInfo.userId) {
                   _context3.next = 7;
                   break;
                 }
-                _this3.punchConfig = null;
-                _this3.storeFence = null;
-                _this3.attendanceGroup = null;
-                _this3.fenceEnabled = false;
-                _this3.isInFence = null;
+                _this4.punchConfig = null;
+                _this4.storeFence = null;
+                _this4.attendanceGroup = null;
+                _this4.fenceEnabled = false;
+                _this4.isInFence = null;
                 return _context3.abrupt("return");
               case 7:
                 _context3.prev = 7;
                 _context3.next = 10;
-                return _this3.API.getCurrentAttendancePunchConfig({});
+                return _this4.API.getCurrentAttendancePunchConfig({});
               case 10:
                 res = _context3.sent;
                 if (res && Number(res.code) === 200 && res.data) {
-                  _this3.punchConfig = res.data;
-                  _this3.storeFence = res.data.storeFence || null;
-                  _this3.attendanceGroup = res.data.attendanceGroup || null;
-                  _this3.fenceEnabled = !!(_this3.storeFence && _this3.storeFence.hasFence && _this3.storeFence.fencePolygons);
-                  _this3.evaluateFenceRange();
+                  _this4.punchConfig = res.data;
+                  _this4.storeFence = res.data.storeFence || null;
+                  _this4.attendanceGroup = res.data.attendanceGroup || null;
+                  _this4.fenceEnabled = !!(_this4.storeFence && _this4.storeFence.hasFence && _this4.storeFence.fencePolygons);
+                  _this4.evaluateFenceRange();
                 } else {
-                  _this3.punchConfig = null;
-                  _this3.storeFence = null;
-                  _this3.attendanceGroup = null;
-                  _this3.fenceEnabled = false;
-                  _this3.isInFence = null;
+                  _this4.punchConfig = null;
+                  _this4.storeFence = null;
+                  _this4.attendanceGroup = null;
+                  _this4.fenceEnabled = false;
+                  _this4.isInFence = null;
                 }
                 _context3.next = 21;
                 break;
               case 14:
                 _context3.prev = 14;
                 _context3.t0 = _context3["catch"](7);
-                _this3.punchConfig = null;
-                _this3.storeFence = null;
-                _this3.attendanceGroup = null;
-                _this3.fenceEnabled = false;
-                _this3.isInFence = null;
+                _this4.punchConfig = null;
+                _this4.storeFence = null;
+                _this4.attendanceGroup = null;
+                _this4.fenceEnabled = false;
+                _this4.isInFence = null;
               case 21:
               case "end":
                 return _context3.stop();
@@ -618,24 +743,84 @@ var _default = {
         }, _callee3, null, [[7, 14]]);
       }))();
     },
+    refreshWifiInfo: function refreshWifiInfo() {
+      var _this5 = this;
+      return new Promise(function (resolve) {
+        try {
+          var sys = uni.getSystemInfoSync();
+          if (sys && sys.platform === 'devtools') {
+            _this5.wifiLoading = false;
+            _this5.wifiSSID = '';
+            _this5.wifiBSSID = '';
+            _this5.wifiError = '开发者工具模拟器不支持 Wi-Fi，请用真机预览或扫码调试';
+            resolve();
+            return;
+          }
+        } catch (e) {}
+        _this5.wifiLoading = true;
+        _this5.wifiError = '';
+        uni.startWifi({
+          success: function success() {
+            uni.getConnectedWifi({
+              success: function success(res) {
+                var w = res && res.wifi;
+                _this5.wifiSSID = w && w.SSID ? String(w.SSID) : '';
+                _this5.wifiBSSID = w && w.BSSID ? String(w.BSSID) : '';
+                _this5.wifiLoading = false;
+                if (!_this5.wifiSSID && !_this5.wifiBSSID) {
+                  _this5.wifiError = '未连接 Wi-Fi';
+                }
+                resolve();
+              },
+              fail: function fail(err) {
+                _this5.wifiLoading = false;
+                var msg = err && err.errMsg ? String(err.errMsg) : '';
+                if (msg.indexOf('auth deny') !== -1 || msg.indexOf('authorize') !== -1) {
+                  _this5.wifiError = '需授权获取 Wi-Fi 信息';
+                } else if (msg.indexOf('not connected') !== -1 || err && Number(err.errCode) === 12002) {
+                  _this5.wifiError = '当前未连接 Wi-Fi';
+                } else {
+                  _this5.wifiError = '无法获取 Wi-Fi 信息';
+                }
+                _this5.wifiSSID = '';
+                _this5.wifiBSSID = '';
+                resolve();
+              }
+            });
+          },
+          fail: function fail(err) {
+            _this5.wifiLoading = false;
+            _this5.wifiSSID = '';
+            _this5.wifiBSSID = '';
+            var msg = err && err.errMsg ? String(err.errMsg) : '';
+            if (msg.indexOf('devtools') !== -1 || msg.indexOf('not support') !== -1) {
+              _this5.wifiError = '当前环境不支持 Wi-Fi，请用真机预览';
+            } else {
+              _this5.wifiError = '无法启动 Wi-Fi 模块，请用真机重试';
+            }
+            resolve();
+          }
+        });
+      });
+    },
     refreshLocation: function refreshLocation() {
-      var _this4 = this;
+      var _this6 = this;
       this.locating = true;
       return new Promise(function (resolve) {
         uni.getLocation({
           type: 'gcj02',
           isHighAccuracy: true,
           success: function success(res) {
-            _this4.longitude = res.longitude;
-            _this4.latitude = res.latitude;
-            _this4.address = '';
-            _this4.evaluateFenceRange();
-            _this4.locating = false;
+            _this6.longitude = res.longitude;
+            _this6.latitude = res.latitude;
+            _this6.address = '';
+            _this6.evaluateFenceRange();
+            _this6.locating = false;
             resolve();
           },
           fail: function fail() {
-            _this4.locating = false;
-            _this4.isInFence = null;
+            _this6.locating = false;
+            _this6.isInFence = null;
             uni.showToast({
               title: '定位失败，请检查系统定位权限',
               icon: 'none'
@@ -663,7 +848,7 @@ var _default = {
       });
     },
     evaluateFenceRange: function evaluateFenceRange() {
-      var _this5 = this;
+      var _this7 = this;
       if (!this.fenceEnabled) {
         this.isInFence = true;
         return;
@@ -678,14 +863,14 @@ var _default = {
         return;
       }
       this.isInFence = polygons.some(function (polygon) {
-        return _this5.isPointInPolygon(_this5.longitude, _this5.latitude, polygon);
+        return _this7.isPointInPolygon(_this7.longitude, _this7.latitude, polygon);
       });
     },
     isPointInPolygon: function isPointInPolygon(lng, lat, polygon) {
       return (0, _attendanceFence.isPointInPolygon)(lng, lat, polygon);
     },
     afterReadPhoto: function afterReadPhoto(event) {
-      var _this6 = this;
+      var _this8 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var lists, file, fileObj, result;
         return _regenerator.default.wrap(function _callee4$(_context4) {
@@ -705,13 +890,13 @@ var _default = {
                   title: '上传中'
                 });
                 _context4.next = 8;
-                return _this6.API.uploadFile(fileObj);
+                return _this8.API.uploadFile(fileObj);
               case 8:
                 result = _context4.sent;
                 uni.hideLoading();
                 if (result && result.code === 200 && result.data && result.data.url) {
-                  _this6.photoUrl = result.data.url;
-                  _this6.photoFileList = [{
+                  _this8.photoUrl = result.data.url;
+                  _this8.photoFileList = [{
                     url: result.data.url,
                     status: 'success'
                   }];
@@ -744,14 +929,14 @@ var _default = {
       this.photoFileList = [];
     },
     doPunch: function doPunch(direction) {
-      var _this7 = this;
+      var _this9 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
-        var isFieldWork, payload, res;
+        var isNormal, needGps, isFieldWork, payload, res;
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                if (_this7.userInfo.userId) {
+                if (_this9.userInfo.userId) {
                   _context5.next = 3;
                   break;
                 }
@@ -761,81 +946,99 @@ var _default = {
                 });
                 return _context5.abrupt("return");
               case 3:
-                if (!(_this7.longitude == null || _this7.latitude == null)) {
-                  _context5.next = 9;
+                isNormal = Number(_this9.punchType) === 1;
+                needGps = !isNormal || !!(_this9.storeFence && _this9.storeFence.requireFenceCheck);
+                if (!needGps) {
+                  _context5.next = 14;
                   break;
                 }
-                _context5.next = 6;
-                return _this7.refreshLocation();
-              case 6:
-                if (!(_this7.longitude == null || _this7.latitude == null)) {
+                if (!(_this9.longitude == null || _this9.latitude == null)) {
                   _context5.next = 9;
                   break;
                 }
+                _context5.next = 9;
+                return _this9.refreshLocation();
+              case 9:
+                if (!(_this9.longitude == null || _this9.latitude == null)) {
+                  _context5.next = 12;
+                  break;
+                }
                 uni.showToast({
                   title: '请先完成定位',
                   icon: 'none'
                 });
                 return _context5.abrupt("return");
-              case 9:
-                isFieldWork = Number(_this7.punchType) === 2;
+              case 12:
+                _context5.next = 17;
+                break;
+              case 14:
+                if (!(isNormal && _this9.longitude == null)) {
+                  _context5.next = 17;
+                  break;
+                }
+                _context5.next = 17;
+                return _this9.refreshLocation();
+              case 17:
+                isFieldWork = Number(_this9.punchType) === 2;
                 payload = {
-                  userId: _this7.userInfo.userId,
+                  userId: _this9.userInfo.userId,
                   punchDirection: direction,
-                  punchType: Number(_this7.punchType),
-                  longitude: _this7.longitude,
-                  latitude: _this7.latitude,
-                  address: _this7.address || _this7.locationText,
-                  photoUrl: _this7.photoUrl || undefined,
-                  remark: isFieldWork ? (_this7.remark || '').trim() || undefined : undefined
+                  punchType: Number(_this9.punchType),
+                  longitude: _this9.longitude != null ? _this9.longitude : undefined,
+                  latitude: _this9.latitude != null ? _this9.latitude : undefined,
+                  address: _this9.address || _this9.locationText,
+                  wifiSsid: (_this9.wifiSSID || '').trim() || undefined,
+                  wifiBssid: (_this9.wifiBSSID || '').trim() || undefined,
+                  photoUrl: _this9.photoUrl || undefined,
+                  remark: isFieldWork ? (_this9.remark || '').trim() || undefined : undefined
                 };
-                _this7.submitting = true;
-                _context5.prev = 12;
-                _context5.next = 15;
-                return _this7.API.submitAttendancePunch(payload);
-              case 15:
+                _this9.submitting = true;
+                _context5.prev = 20;
+                _context5.next = 23;
+                return _this9.API.submitAttendancePunch(payload);
+              case 23:
                 res = _context5.sent;
                 if (!(res && Number(res.code) === 200)) {
-                  _context5.next = 25;
+                  _context5.next = 33;
                   break;
                 }
                 uni.showToast({
                   title: '打卡成功',
                   icon: 'success'
                 });
-                _this7.remark = '';
-                _this7.photoUrl = '';
-                _this7.photoFileList = [];
-                _context5.next = 23;
-                return _this7.loadDetail();
-              case 23:
-                _context5.next = 26;
+                _this9.remark = '';
+                _this9.photoUrl = '';
+                _this9.photoFileList = [];
+                _context5.next = 31;
+                return _this9.loadDetail();
+              case 31:
+                _context5.next = 34;
                 break;
-              case 25:
+              case 33:
                 uni.showToast({
                   title: res && (res.msg || res.message) || '打卡失败',
                   icon: 'none'
                 });
-              case 26:
-                _context5.next = 31;
+              case 34:
+                _context5.next = 39;
                 break;
-              case 28:
-                _context5.prev = 28;
-                _context5.t0 = _context5["catch"](12);
+              case 36:
+                _context5.prev = 36;
+                _context5.t0 = _context5["catch"](20);
                 uni.showToast({
                   title: '打卡失败',
                   icon: 'none'
                 });
-              case 31:
-                _context5.prev = 31;
-                _this7.submitting = false;
-                return _context5.finish(31);
-              case 34:
+              case 39:
+                _context5.prev = 39;
+                _this9.submitting = false;
+                return _context5.finish(39);
+              case 42:
               case "end":
                 return _context5.stop();
             }
           }
-        }, _callee5, null, [[12, 28, 31, 34]]);
+        }, _callee5, null, [[20, 36, 39, 42]]);
       }))();
     }
   }
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.wxml b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.wxml
index 3ef1fba..0231392 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.wxml
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/attendance-punch/attendance-punch.wxml
@@ -1 +1 @@
-<view class="att-page data-v-f6f89274"><view class="att-header data-v-f6f89274"><view class="att-clock data-v-f6f89274">{{clockTime}}</view><view class="att-meta data-v-f6f89274"><text class="att-date data-v-f6f89274">{{todayText}}</text><text class="att-week data-v-f6f89274">{{weekdayText}}</text></view><view class="att-user data-v-f6f89274">{{displayName}}</view><block wx:if="{{ruleTimeText}}"><view class="att-rule data-v-f6f89274"><text class="att-rule-label data-v-f6f89274">今日班次</text><text class="att-rule-val data-v-f6f89274">{{ruleTimeText}}</text></view></block></view><view class="att-body data-v-f6f89274"><view class="att-card att-seg-card data-v-f6f89274"><view class="att-seg data-v-f6f89274"><view data-event-opts="{{[['tap',[['setPunchType',[1]]]]]}}" class="{{['att-seg-item','data-v-f6f89274',(punchType===1)?'is-active':'']}}" bindtap="__e">正常</view><view data-event-opts="{{[['tap',[['setPunchType',[2]]]]]}}" class="{{['att-seg-item','data-v-f6f89274',(punchType===2)?'is-active':'']}}" bindtap="__e">外勤</view></view></view><view class="att-card att-punch-card data-v-f6f89274"><view data-event-opts="{{[['tap',[['onMainPunch',['$event']]]]]}}" class="{{['att-big-btn','data-v-f6f89274',(allPunchDone)?'is-all-done':'',(!canPressMainButton)?'is-disabled':'']}}" bindtap="__e"><block wx:if="{{allPunchDone}}"><u-icon vue-id="0bf3a300-1" name="checkmark-circle-fill" color="#ffffff" size="52" class="data-v-f6f89274" bind:__l="__l"></u-icon><text class="att-big-done-text data-v-f6f89274">今日打卡已完成</text></block><block wx:else><text class="att-big-title data-v-f6f89274">{{mainButtonTitle}}</text><text class="att-big-sub data-v-f6f89274">{{mainButtonSub}}</text></block></view><block wx:if="{{nextPunchDirection&&!allPunchDone}}"><view class="att-next-hint data-v-f6f89274">{{'当前应打：'+(nextPunchDirection===1?'上班卡':'下班卡')+''}}</view></block></view><view class="att-card att-loc-card data-v-f6f89274"><u-icon vue-id="0bf3a300-2" name="map-fill" color="#43a047" size="22" class="data-v-f6f89274" bind:__l="__l"></u-icon><view class="att-loc-main data-v-f6f89274"><text class="att-loc-text data-v-f6f89274">{{locationText}}</text><text class="att-loc-tip data-v-f6f89274">{{fenceStatusText}}</text><view class="att-loc-actions data-v-f6f89274"><block wx:if="{{canViewFenceMap}}"><text data-event-opts="{{[['tap',[['openFenceMap',['$event']]]]]}}" class="att-loc-action att-loc-action--primary data-v-f6f89274" catchtap="__e">查看打卡范围</text></block><text data-event-opts="{{[['tap',[['refreshLocation',['$event']]]]]}}" class="att-loc-action data-v-f6f89274" catchtap="__e">重新定位</text></view></view><u-icon vue-id="0bf3a300-3" name="arrow-right" color="#c8c9cc" size="18" class="data-v-f6f89274" bind:__l="__l"></u-icon></view><view class="att-card data-v-f6f89274"><view class="att-card-head data-v-f6f89274"><text class="att-card-title data-v-f6f89274">今日记录</text><block wx:if="{{detail&&detail.statusText}}"><view class="att-status-tag data-v-f6f89274">{{detail.statusText}}</view></block></view><block wx:if="{{detail}}"><view class="att-timeline data-v-f6f89274"><view class="att-tl-item data-v-f6f89274"><view class="{{['att-tl-dot','data-v-f6f89274',punchInDone?'is-on':'']}}"></view><view class="att-tl-line data-v-f6f89274"></view><view class="att-tl-body data-v-f6f89274"><view class="att-tl-row data-v-f6f89274"><text class="att-tl-name data-v-f6f89274">上班</text><text class="att-tl-time data-v-f6f89274">{{detail.punchIn&&detail.punchIn.time?detail.punchIn.time:'未打卡'}}</text></view></view></view><view class="att-tl-item att-tl-item--last data-v-f6f89274"><view class="{{['att-tl-dot','data-v-f6f89274',punchOutDone?'is-on':'']}}"></view><view class="att-tl-body data-v-f6f89274"><view class="att-tl-row data-v-f6f89274"><text class="att-tl-name data-v-f6f89274">下班</text><text class="att-tl-time data-v-f6f89274">{{detail.punchOut&&detail.punchOut.time?detail.punchOut.time:'未打卡'}}</text></view></view></view></view></block><block wx:else><block wx:if="{{!loading}}"><view class="att-empty data-v-f6f89274"><text class="data-v-f6f89274">今日尚无记录，打卡后将显示在此</text></view></block></block></view><view class="att-card att-more-card data-v-f6f89274"><view class="att-more-title data-v-f6f89274">打卡照片（选填）</view><view class="att-upload-wrap data-v-f6f89274"><u-upload vue-id="0bf3a300-4" fileList="{{photoFileList}}" name="photo" maxCount="{{1}}" accept="image" width="120" height="120" data-event-opts="{{[['^afterRead',[['afterReadPhoto']]],['^delete',[['deletePhoto']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-f6f89274" bind:__l="__l"></u-upload></view><block wx:if="{{punchType===2}}"><view class="att-more-title att-more-title--second data-v-f6f89274">外勤说明（选填）</view><u-input bind:input="__e" vue-id="0bf3a300-5" placeholder="请填写外勤事由（选填）" border="none" customStyle="{{({background:'#f1f8f4',padding:'16rpx 20rpx',borderRadius:'12rpx'})}}" value="{{remark}}" data-event-opts="{{[['^input',[['__set_model',['','remark','$event',[]]]]]]}}" class="data-v-f6f89274" bind:__l="__l"></u-input></block></view><view class="att-safe data-v-f6f89274"></view></view><block wx:if="{{loading}}"><view class="att-loading-mask data-v-f6f89274"><u-loading-icon vue-id="0bf3a300-6" mode="circle" size="28" color="#43a047" class="data-v-f6f89274" bind:__l="__l"></u-loading-icon><text class="att-loading-txt data-v-f6f89274">加载中</text></view></block></view>
\ No newline at end of file
+<view class="att-page data-v-f6f89274"><view class="att-header data-v-f6f89274"><view class="att-clock data-v-f6f89274">{{clockTime}}</view><view class="att-meta data-v-f6f89274"><text class="att-date data-v-f6f89274">{{todayText}}</text><text class="att-week data-v-f6f89274">{{weekdayText}}</text></view><view class="att-user data-v-f6f89274">{{displayName}}</view><block wx:if="{{ruleTimeText}}"><view class="att-rule data-v-f6f89274"><text class="att-rule-label data-v-f6f89274">今日班次</text><text class="att-rule-val data-v-f6f89274">{{ruleTimeText}}</text></view></block></view><view class="att-body data-v-f6f89274"><view class="att-card att-seg-card data-v-f6f89274"><view class="att-seg data-v-f6f89274"><view data-event-opts="{{[['tap',[['setPunchType',[1]]]]]}}" class="{{['att-seg-item','data-v-f6f89274',(punchType===1)?'is-active':'']}}" bindtap="__e">正常 </view><view data-event-opts="{{[['tap',[['setPunchType',[2]]]]]}}" class="{{['att-seg-item','data-v-f6f89274',(punchType===2)?'is-active':'']}}" bindtap="__e">外勤 </view></view></view><view class="att-card att-punch-card data-v-f6f89274"><view data-event-opts="{{[['tap',[['onMainPunch',['$event']]]]]}}" class="{{['att-big-btn','data-v-f6f89274',(allPunchDone)?'is-all-done':'',(!canPressMainButton)?'is-disabled':'']}}" bindtap="__e"><block wx:if="{{allPunchDone}}"><u-icon vue-id="0bf3a300-1" name="checkmark-circle-fill" color="#ffffff" size="52" class="data-v-f6f89274" bind:__l="__l"></u-icon><text class="att-big-done-text data-v-f6f89274">今日打卡已完成</text></block><block wx:else><text class="att-big-title data-v-f6f89274">{{mainButtonTitle}}</text><text class="att-big-sub data-v-f6f89274">{{mainButtonSub}}</text></block></view><block wx:if="{{nextPunchDirection&&!allPunchDone}}"><view class="att-next-hint data-v-f6f89274">{{'当前应打：'+(nextPunchDirection===1?'上班卡':'下班卡')+''}}</view></block></view><view class="att-card att-loc-card data-v-f6f89274"><u-icon vue-id="0bf3a300-2" name="map-fill" color="#43a047" size="22" class="data-v-f6f89274" bind:__l="__l"></u-icon><view class="att-loc-main data-v-f6f89274"><text class="att-loc-text data-v-f6f89274">{{locationText}}</text><text class="att-loc-tip data-v-f6f89274">{{fenceStatusText}}</text><view class="att-loc-actions data-v-f6f89274"><block wx:if="{{canViewFenceMap}}"><text data-event-opts="{{[['tap',[['openFenceMap',['$event']]]]]}}" class="att-loc-action att-loc-action--primary data-v-f6f89274" catchtap="__e">查看打卡范围</text></block><text data-event-opts="{{[['tap',[['refreshLocation',['$event']]]]]}}" class="att-loc-action data-v-f6f89274" catchtap="__e">重新定位</text></view></view><u-icon vue-id="0bf3a300-3" name="arrow-right" color="#c8c9cc" size="18" class="data-v-f6f89274" bind:__l="__l"></u-icon></view><block wx:if="{{$root.m0===1}}"><view class="att-card att-loc-card att-wifi-card data-v-f6f89274"><u-icon vue-id="0bf3a300-4" name="wifi" color="#43a047" size="22" class="data-v-f6f89274" bind:__l="__l"></u-icon><view class="att-loc-main data-v-f6f89274"><text class="att-loc-text data-v-f6f89274">{{wifiMainText}}</text><text class="att-loc-tip data-v-f6f89274">{{wifiTipText}}</text><view class="att-loc-actions data-v-f6f89274"><text data-event-opts="{{[['tap',[['refreshWifiInfo',['$event']]]]]}}" class="att-loc-action data-v-f6f89274" catchtap="__e">刷新 Wi-Fi</text></view></view><u-icon vue-id="0bf3a300-5" name="arrow-right" color="#c8c9cc" size="18" class="data-v-f6f89274" bind:__l="__l"></u-icon></view></block><view class="att-card data-v-f6f89274"><view class="att-card-head data-v-f6f89274"><text class="att-card-title data-v-f6f89274">今日记录</text><block wx:if="{{detail&&detail.statusText}}"><view class="att-status-tag data-v-f6f89274">{{detail.statusText}}</view></block></view><block wx:if="{{detail}}"><view class="att-timeline data-v-f6f89274"><view class="att-tl-item data-v-f6f89274"><view class="{{['att-tl-dot','data-v-f6f89274',punchInDone?'is-on':'']}}"></view><view class="att-tl-line data-v-f6f89274"></view><view class="att-tl-body data-v-f6f89274"><view class="att-tl-row data-v-f6f89274"><text class="att-tl-name data-v-f6f89274">上班</text><text class="att-tl-time data-v-f6f89274">{{detail.punchIn&&detail.punchIn.time?detail.punchIn.time:'未打卡'}}</text></view></view></view><view class="att-tl-item att-tl-item--last data-v-f6f89274"><view class="{{['att-tl-dot','data-v-f6f89274',punchOutDone?'is-on':'']}}"></view><view class="att-tl-body data-v-f6f89274"><view class="att-tl-row data-v-f6f89274"><text class="att-tl-name data-v-f6f89274">下班</text><text class="att-tl-time data-v-f6f89274">{{detail.punchOut&&detail.punchOut.time?detail.punchOut.time:'未打卡'}}</text></view></view></view></view></block><block wx:else><block wx:if="{{!loading}}"><view class="att-empty data-v-f6f89274"><text class="data-v-f6f89274">今日尚无记录，打卡后将显示在此</text></view></block></block></view><view class="att-card att-more-card data-v-f6f89274"><view class="att-more-title data-v-f6f89274">打卡照片（选填）</view><view class="att-upload-wrap data-v-f6f89274"><u-upload vue-id="0bf3a300-6" fileList="{{photoFileList}}" name="photo" maxCount="{{1}}" accept="image" width="120" height="120" data-event-opts="{{[['^afterRead',[['afterReadPhoto']]],['^delete',[['deletePhoto']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-f6f89274" bind:__l="__l"></u-upload></view><block wx:if="{{punchType===2}}"><view class="att-more-title att-more-title--second data-v-f6f89274">外勤说明（选填）</view><u-input bind:input="__e" vue-id="0bf3a300-7" placeholder="请填写外勤事由（选填）" border="none" customStyle="{{({background:'#f1f8f4',padding:'16rpx 20rpx',borderRadius:'12rpx'})}}" value="{{remark}}" data-event-opts="{{[['^input',[['__set_model',['','remark','$event',[]]]]]]}}" class="data-v-f6f89274" bind:__l="__l"></u-input></block></view><view class="att-safe data-v-f6f89274"></view></view><block wx:if="{{loading}}"><view class="att-loading-mask data-v-f6f89274"><u-loading-icon vue-id="0bf3a300-8" mode="circle" size="28" color="#43a047" class="data-v-f6f89274" bind:__l="__l"></u-loading-icon><text class="att-loading-txt data-v-f6f89274">加载中</text></view></block></view>
\ No newline at end of file
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.js
index a21cf61..00c0aec 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.js
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.js
@@ -219,11 +219,37 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
       loading: false,
       list: [],
+      statusFilter: 'all',
+      statusTabs: [{
+        key: 'all',
+        label: '全部'
+      }, {
+        key: 'running',
+        label: '审核中'
+      }, {
+        key: 'passed',
+        label: '已通过'
+      }, {
+        key: 'rejected',
+        label: '不通过'
+      }],
       query: {
         currentPage: 1,
         pageSize: 20,
@@ -234,9 +260,17 @@ var _default = {
     };
   },
   computed: {
+    filteredList: function filteredList() {
+      if (!Array.isArray(this.list)) return [];
+      var st = this.getStatusFilterNumber(this.statusFilter);
+      if (st === null) return this.list;
+      return this.list.filter(function (item) {
+        return Number(item.status) === st;
+      });
+    },
     displayList: function displayList() {
       var _this = this;
-      return (this.list || []).map(function (item) {
+      return (this.filteredList || []).map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           statusClassName: _this.statusClass(item.status),
           statusText: _this.getStatusText(item.status),
@@ -305,6 +339,11 @@ var _default = {
         }, _callee, null, [[1, 11, 16, 20]]);
       }))();
     },
+    changeStatusFilter: function changeStatusFilter(key) {
+      if (this.statusFilter === key) return;
+      this.statusFilter = key;
+      this.refresh();
+    },
     refresh: function refresh() {
       this.query.currentPage = 1;
       this.total = 0;
@@ -341,6 +380,15 @@ var _default = {
       };
       return map[Number(status)] || 'status-default';
     },
+    // 业务状态：与 getStatusText / 后端 FlowTaskEntity.status 对齐
+    // all: 全部；running: 待审核；passed: 已通过；rejected: 已驳回(不通过)
+    getStatusFilterNumber: function getStatusFilterNumber(key) {
+      if (key === 'all') return null;
+      if (key === 'running') return 1;
+      if (key === 'passed') return 2;
+      if (key === 'rejected') return 3;
+      return null;
+    },
     getUrgentText: function getUrgentText(val) {
       var map = {
         1: '普通',
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxml b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxml
index a97cb0d..a474454 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxml
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxml
@@ -1 +1 @@
-<view class="page data-v-3bb121e5"><view class="header-card data-v-3bb121e5"><view class="header-title data-v-3bb121e5">我的申请</view><view class="header-sub data-v-3bb121e5">查看我发起的流程申请，支持进入详情查看表单与审批进度</view></view><block wx:if="{{$root.g0}}"><view class="state-card data-v-3bb121e5"><text class="state-text data-v-3bb121e5">加载中...</text></view></block><block wx:else><block wx:if="{{$root.g1}}"><view class="state-card empty-card data-v-3bb121e5"><text class="empty-icon data-v-3bb121e5">无</text><text class="state-text data-v-3bb121e5">暂无申请记录</text></view></block><block wx:else><view class="list-wrap data-v-3bb121e5"><block wx:for="{{displayList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['displayList','id',item.id]]]]]]]}}" class="apply-card data-v-3bb121e5" bindtap="__e"><view class="card-head data-v-3bb121e5"><view class="title-wrap data-v-3bb121e5"><text class="apply-title data-v-3bb121e5">{{item.fullName||'无标题'}}</text><text class="apply-flow data-v-3bb121e5">{{item.flowName||item.flowCode||'流程'}}</text></view><view class="{{['status-tag','data-v-3bb121e5',item.statusClassName]}}">{{''+item.statusText+''}}</view></view><view class="meta-row data-v-3bb121e5"><text class="meta-label data-v-3bb121e5">发起时间</text><text class="meta-value data-v-3bb121e5">{{item.startTimeText}}</text></view><view class="meta-row data-v-3bb121e5"><text class="meta-label data-v-3bb121e5">当前节点</text><text class="meta-value data-v-3bb121e5">{{item.thisStep||'-'}}</text></view><view class="meta-row data-v-3bb121e5"><text class="meta-label data-v-3bb121e5">紧急程度</text><text class="meta-value data-v-3bb121e5">{{item.urgentText}}</text></view><view class="progress-row data-v-3bb121e5"><view class="progress-track data-v-3bb121e5"><view class="progress-inner data-v-3bb121e5" style="{{(item.progressWidthStyle)}}"></view></view><text class="progress-text data-v-3bb121e5">{{item.progressText}}</text></view></view></block></view></block></block><block wx:if="{{$root.g2}}"><view class="footer-tip data-v-3bb121e5">下拉可刷新，点击卡片查看详情</view></block></view>
\ No newline at end of file
+<view class="page data-v-3bb121e5"><view class="header-card data-v-3bb121e5"><view class="header-title data-v-3bb121e5">我的申请</view><view class="header-sub data-v-3bb121e5">查看我发起的流程申请，支持进入详情查看表单与审批进度</view></view><view class="filter-bar data-v-3bb121e5"><block wx:for="{{statusTabs}}" wx:for-item="tab" wx:for-index="__i0__" wx:key="key"><view data-event-opts="{{[['tap',[['changeStatusFilter',['$0'],[[['statusTabs','key',tab.key,'key']]]]]]]}}" class="{{['filter-item','data-v-3bb121e5',statusFilter===tab.key?'filter-item--active':'']}}" bindtap="__e">{{''+tab.label+''}}</view></block></view><block wx:if="{{$root.g0}}"><view class="state-card data-v-3bb121e5"><text class="state-text data-v-3bb121e5">加载中...</text></view></block><block wx:else><block wx:if="{{$root.g1}}"><view class="state-card empty-card data-v-3bb121e5"><text class="empty-icon data-v-3bb121e5">无</text><text class="state-text data-v-3bb121e5">暂无申请记录</text></view></block><block wx:else><view class="list-wrap data-v-3bb121e5"><block wx:for="{{displayList}}" wx:for-item="item" wx:for-index="__i1__" wx:key="id"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['displayList','id',item.id]]]]]]]}}" class="apply-card data-v-3bb121e5" bindtap="__e"><view class="card-head data-v-3bb121e5"><view class="title-wrap data-v-3bb121e5"><text class="apply-title data-v-3bb121e5">{{item.fullName||'无标题'}}</text><text class="apply-flow data-v-3bb121e5">{{item.flowName||item.flowCode||'流程'}}</text></view><view class="{{['status-tag','data-v-3bb121e5',item.statusClassName]}}">{{''+item.statusText+''}}</view></view><view class="meta-row data-v-3bb121e5"><text class="meta-label data-v-3bb121e5">发起时间</text><text class="meta-value data-v-3bb121e5">{{item.startTimeText}}</text></view><view class="meta-row data-v-3bb121e5"><text class="meta-label data-v-3bb121e5">当前节点</text><text class="meta-value data-v-3bb121e5">{{item.thisStep||'-'}}</text></view><view class="meta-row data-v-3bb121e5"><text class="meta-label data-v-3bb121e5">紧急程度</text><text class="meta-value data-v-3bb121e5">{{item.urgentText}}</text></view><view class="progress-row data-v-3bb121e5"><view class="progress-track data-v-3bb121e5"><view class="progress-inner data-v-3bb121e5" style="{{(item.progressWidthStyle)}}"></view></view><text class="progress-text data-v-3bb121e5">{{item.progressText}}</text></view></view></block></view></block></block><block wx:if="{{$root.g2}}"><view class="footer-tip data-v-3bb121e5">下拉可刷新，点击卡片查看详情</view></block></view>
\ No newline at end of file
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxss b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxss
index de71495..02a636e 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxss
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/my-application-list/my-application-list.wxss
@@ -30,6 +30,28 @@
   box-sizing: border-box;
   background: linear-gradient(180deg, #e8f5e9 0%, #f7fff8 100%);
 }
+.filter-bar.data-v-3bb121e5 {
+  display: flex;
+  gap: 16rpx;
+  padding: 0 12rpx;
+  margin-bottom: 22rpx;
+}
+.filter-item.data-v-3bb121e5 {
+  flex: 1;
+  text-align: center;
+  padding: 14rpx 0;
+  border-radius: 999rpx;
+  background: rgba(255, 255, 255, 0.7);
+  color: #7a8b7b;
+  font-size: 24rpx;
+  font-weight: 600;
+  border: 1px solid rgba(46, 125, 50, 0.12);
+}
+.filter-item--active.data-v-3bb121e5 {
+  background: #e8f5e9;
+  color: #2e7d32;
+  border-color: rgba(46, 125, 50, 0.35);
+}
 .header-card.data-v-3bb121e5,
 .state-card.data-v-3bb121e5,
 .apply-card.data-v-3bb121e5 {
diff --git a/项目文档相关/docs/数据库说明.md b/项目文档相关/docs/数据库说明.md
index 5ce7443..8037c10 100644
--- a/项目文档相关/docs/数据库说明.md
+++ b/项目文档相关/docs/数据库说明.md
@@ -56,6 +56,11 @@
   - `longitude` (DECIMAL): 经度
   - `latitude` (DECIMAL): 纬度
   - `fence_polygons` (JSON): 电子围栏多边形坐标，格式 `[[{lng,lat},...]]`
+  - `F_AttendanceCheckFence` (INT，可空): 正常打卡是否启用电子围栏校验（1-是，0-否；**可空**：空表示沿用历史默认「有围栏则校验」）
+  - `F_AttendanceCheckWifi` (INT，可空): 正常打卡是否启用 Wi-Fi 校验（1-是，0-否）
+  - `F_AttendanceWifiPairs` (VARCHAR): Wi-Fi 成对白名单，JSON 数组，如 `[{"ssid":"门店5G","bssid":"aa:bb:cc:dd:ee:ff"}]`
+  - `F_AttendanceWifiVerifyPair` (INT，可空，默认 0): **是否校验 SSID 与 BSSID 为同一 AP**。`1`：端上能拿到 BSSID 时必须与某行 **SSID+BSSID 同时一致**；端上 **拿不到 BSSID** 时须 **在电子围栏内** 且 SSID 与某行一致（防同名热点）。`0`：不强制同 AP，只要当前 SSID 或 BSSID **命中任意一行中的字段** 即可（仍按行维护，但校验为「或」）
+  - ~~`F_AttendanceWifiSsids` / `F_AttendanceWifiBssids`~~：已删除，统一使用 `F_AttendanceWifiPairs`（脚本：`项目文档相关/sql/2026-4-3/门店考勤_围栏与WiFi打卡配置.sql`）
   - `F_BusinessHours` (TEXT): 营业时间设置
   - `F_TrafficTips` (TEXT): 交通提示
 - **人员信息**: `BASE_USER` (系统用户表，包含门店ID等扩展字段)
@@ -161,7 +166,7 @@
   - `F_PunchOutLongitude` / `F_PunchOutLatitude` / `F_PunchOutAddress`: 下班打卡定位与地址
   - `F_PunchInPhotoUrl` / `F_PunchOutPhotoUrl`: 上下班打卡照片
   - `F_IsPunchInFenceValid` / `F_IsPunchOutFenceValid`: 上下班围栏校验结果（1围栏内，0围栏外，null未校验）
-  - `F_Status`: 打卡状态（1正常，2迟到，3休息，4请假，5病假，6缺卡，7旷工）
+  - `F_Status`: 打卡状态（1正常，2迟到，3休息，4请假，5病假，6缺卡，7旷工，8待考勤；8 表示考勤日晚于当前日期且尚无打卡，界面展示「暂无打卡」，不计入缺卡类异常统计）
   - `F_LateMinutes`: 迟到分钟数
   - `F_EarlyLeaveMinutes`: 早退分钟数
   - `F_IsManual`: 是否手动补录
diff --git a/项目文档相关/sql/2026-4-3/门店考勤_WiFi_BSSID白名单列.sql b/项目文档相关/sql/2026-4-3/门店考勤_WiFi_BSSID白名单列.sql
new file mode 100644
index 0000000..4daa2ed
--- /dev/null
+++ b/项目文档相关/sql/2026-4-3/门店考勤_WiFi_BSSID白名单列.sql
@@ -0,0 +1,4 @@
+-- 已合并入「门店考勤_围栏与WiFi打卡配置.sql」。
+-- 独立 SSID/BSSID 列已废弃并删除，请只执行：门店考勤_围栏与WiFi打卡配置.sql
+
+SELECT 1 AS note_use_main_script_instead;
diff --git a/项目文档相关/sql/2026-4-3/门店考勤_围栏与WiFi打卡配置.sql b/项目文档相关/sql/2026-4-3/门店考勤_围栏与WiFi打卡配置.sql
new file mode 100644
index 0000000..776e1cf
--- /dev/null
+++ b/项目文档相关/sql/2026-4-3/门店考勤_围栏与WiFi打卡配置.sql
@@ -0,0 +1,76 @@
+-- 门店正常打卡：围栏 + Wi-Fi 成对配置（SSID+BSSID）
+-- 可重复执行。会删除已废弃列 F_AttendanceWifiSsids、F_AttendanceWifiBssids（数据请先迁移到 F_AttendanceWifiPairs）
+-- 执行前：USE 你的库名;
+
+DELIMITER $$
+
+DROP PROCEDURE IF EXISTS `sp_patch_lq_mdxx_attendance_wifi`$$
+
+CREATE PROCEDURE `sp_patch_lq_mdxx_attendance_wifi`()
+BEGIN
+  DECLARE dbname VARCHAR(64);
+  SET dbname = DATABASE();
+
+  -- 1) 基础列：围栏开关、Wi-Fi 开关
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = dbname AND TABLE_NAME = 'lq_mdxx' AND COLUMN_NAME = 'F_AttendanceCheckFence'
+  ) THEN
+    ALTER TABLE `lq_mdxx`
+      ADD COLUMN `F_AttendanceCheckFence` int NULL DEFAULT NULL
+      COMMENT '正常打卡是否启用围栏校验：1是 0否；NULL 表示沿用旧逻辑(有围栏则校验)'
+      AFTER `fence_polygons`;
+  END IF;
+
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = dbname AND TABLE_NAME = 'lq_mdxx' AND COLUMN_NAME = 'F_AttendanceCheckWifi'
+  ) THEN
+    ALTER TABLE `lq_mdxx`
+      ADD COLUMN `F_AttendanceCheckWifi` int NULL DEFAULT NULL
+      COMMENT '正常打卡是否启用Wi-Fi校验：1是 0否；NULL 视为0'
+      AFTER `F_AttendanceCheckFence`;
+  END IF;
+
+  -- 2) 删除废弃列（独立 SSID / BSSID JSON 列，已由 F_AttendanceWifiPairs 替代）
+  IF EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = dbname AND TABLE_NAME = 'lq_mdxx' AND COLUMN_NAME = 'F_AttendanceWifiBssids'
+  ) THEN
+    ALTER TABLE `lq_mdxx` DROP COLUMN `F_AttendanceWifiBssids`;
+  END IF;
+
+  IF EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = dbname AND TABLE_NAME = 'lq_mdxx' AND COLUMN_NAME = 'F_AttendanceWifiSsids'
+  ) THEN
+    ALTER TABLE `lq_mdxx` DROP COLUMN `F_AttendanceWifiSsids`;
+  END IF;
+
+  -- 3) 成对配置列（加在 Wi-Fi 开关后；此时已不存在旧列）
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = dbname AND TABLE_NAME = 'lq_mdxx' AND COLUMN_NAME = 'F_AttendanceWifiPairs'
+  ) THEN
+    ALTER TABLE `lq_mdxx`
+      ADD COLUMN `F_AttendanceWifiPairs` varchar(4000) NULL DEFAULT NULL
+      COMMENT 'Wi-Fi成对配置 JSON [{"ssid":"","bssid":""}]'
+      AFTER `F_AttendanceCheckWifi`;
+  END IF;
+
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = dbname AND TABLE_NAME = 'lq_mdxx' AND COLUMN_NAME = 'F_AttendanceWifiVerifyPair'
+  ) THEN
+    ALTER TABLE `lq_mdxx`
+      ADD COLUMN `F_AttendanceWifiVerifyPair` int NULL DEFAULT 0
+      COMMENT '1=校验SSID与BSSID为同一AP；0=SSID或BSSID命中任一行即可'
+      AFTER `F_AttendanceWifiPairs`;
+  END IF;
+END$$
+
+DELIMITER ;
+
+CALL `sp_patch_lq_mdxx_attendance_wifi`();
+
+DROP PROCEDURE IF EXISTS `sp_patch_lq_mdxx_attendance_wifi`;