考勤记录

刘淇
1 parent 9441e28e
Showing 8 changed files with 1069 additions and 1565 deletions
api/index/index.js
api/user.js
pages-sub/daily/attendanceRecord.vue
pages-sub/daily/patrol-manage/add-patrol-record.vue
pages-sub/problem/work-order-manage/add-order.vue
pages-sub/problem/work-order-manage/order-detail.vue
pages/index/index.vue
uni_modules/uview-plus/components/u-cascader/u-cascader.vue
@@ -63,7 +63,7 @@ export const getCurrentOrg = (params) =&gt; {
  * @returns {Promise}
  */
 export const orgTaskIndicator = (params) => {
-  return get('/app-api/homePage/summary/orgTaskIndicator', params);
+  return post('/app-api/homePage/summary/orgTaskIndicator', params);
 };
  
  
@@ -85,6 +85,25 @@ export const getSmsCode = (data) =&gt; {
 }
  
  
+/**
+ * 查询月度考勤日历
+ * @returns {Promise}
+ */
+export const attendanceDaily = (data) => {
+  return get('/app-api/garden/attendance-daily/calendar',data)
+}
+
+/**
+ * 查询月度考勤日历
+ * @returns {Promise}
+ */
+export const dayDetail = (data) => {
+  return get('/app-api/garden/attendance-daily/day-detail',data)
+}
+
+
+
+
  
  
  
 <template>
-<view class="attendance-page">
-  <!-- 顶部统计卡片 -->
-  <view class="stat-card">
-    <view class="stat-item">
-      <view class="stat-label">本月打卡</view>
-      <view class="stat-value">{{ statData.checkInDays }}</view>
-    </view>
-    <view class="stat-item">
-      <view class="stat-label">正常天数</view>
-      <view class="stat-value">{{ statData.normalDays }}</view>
-    </view>
-    <view class="stat-item">
-      <view class="stat-label">异常天数</view>
-      <view class="stat-value">{{ statData.errorDays }}</view>
-    </view>
-  </view>
-
-  <!-- 手写内联日历，无弹窗 -->
-  <view class="calendar-wrap">
-    <view class="calendar-header">
-      <!-- 左右横向排列：上一月 | 年月标题 | 下一月 -->
-      <view class="calendar-btn" @click="prevMonth">上一月</view>
-      <view class="calendar-title">{{ currentYear }}年{{ currentMonth }}月</view>
-      <!-- 当前是最新月份时，隐藏下个月按钮 -->
-      <view v-if="canNext" class="calendar-btn" @click="nextMonth">下一月</view>
-      <view v-else class="calendar-btn empty-btn"></view>
-    </view>
-    <!-- 星期头部 -->
-    <view class="week-row">
-      <view class="week-item" v-for="w in weekList" :key="w">{{ w }}</view>
+  <view class="attendance-page">
+    <!-- 顶部统计卡片 -->
+    <view class="stat-card">
+      <view class="stat-item">
+        <view class="stat-label">本月打卡</view>
+        <view class="stat-value">{{ statData.checkInDays }}</view>
+      </view>
+      <view class="stat-item">
+        <view class="stat-label">正常天数</view>
+        <view class="stat-value">{{ statData.normalDays }}</view>
+      </view>
+      <view class="stat-item">
+        <view class="stat-label">异常天数</view>
+        <view class="stat-value">{{ statData.errorDays }}</view>
+      </view>
     </view>
-    <!-- 日期网格 -->
-    <view class="day-row" v-for="(row, rIdx) in dayRows" :key="rIdx">
-      <view
-        class="day-item"
-        v-for="(day, dIdx) in row"
-        :key="dIdx"
-        :class="{
+    <!-- 手写内联日历，无弹窗 -->
+    <view class="calendar-wrap">
+      <view class="calendar-header">
+        <!-- 左右横向排列：上一月 | 年月标题 | 下一月 -->
+        <view class="calendar-btn" @click="prevMonth">上一月</view>
+        <view class="calendar-title">{{ currentYear }}年{{ currentMonth }}月</view>
+        <!-- 当前是最新月份时，隐藏下个月按钮 -->
+        <view v-if="canNext" class="calendar-btn" @click="nextMonth">下一月</view>
+        <view v-else class="calendar-btn empty-btn"></view>
+      </view>
+      <!-- 星期头部 -->
+      <view class="week-row">
+        <view class="week-item" v-for="w in weekList" :key="w">{{ w }}</view>
+      </view>
+      <!-- 日期网格 -->
+      <view class="day-row" v-for="(row, rIdx) in dayRows" :key="rIdx">
+        <view class="day-item" v-for="(day, dIdx) in row" :key="dIdx" :class="{
           'day-item--other': day.otherMonth,
           'day-item--active': day.dateStr === selectDate,
-        }"
-        @click="onDayClick(day)"
-      >
-        <view class="day-text">{{ day.day }}</view>
-        <view v-if="day.dot" class="day-dot" :style="{backgroundColor: day.dotColor}"></view>
+        }" @click="onDayClick(day)">
+          <view class="day-text">{{ day.day }}</view>
+          <view v-if="day.dot" class="day-dot" :style="{ backgroundColor: day.dotColor }"></view>
+        </view>
       </view>
     </view>
-  </view>
-
-  <!-- 打卡详情区域 -->
-  <view class="detail-card">
-    <view v-if="!currentAttendance">
-      <view class="empty-text">暂无考勤记录</view>
-    </view>
-    <view v-else>
-      <view class="detail-row">
-        <view class="detail-title">上班打卡时间：</view>
-        <view class="detail-text">{{ currentAttendance.clockInTime || '缺少打卡记录' }}</view>
+    <!-- 打卡详情区域 -->
+    <view class="detail-card">
+      <view v-if="!currentAttendance">
+        <view class="empty-text">暂无考勤记录</view>
       </view>
-      <view class="detail-row">
-        <view class="detail-title">上班打卡地点：</view>
-        <view class="detail-text">{{ currentAttendance.clockInAddress || '-' }}</view>
-      </view>
-      <view class="divider"></view>
-      <view class="detail-row">
-        <view class="detail-title">下班打卡时间：</view>
-        <view class="detail-text">{{ currentAttendance.clockOutTime || '缺少打卡记录' }}</view>
-      </view>
-      <view class="detail-row">
-        <view class="detail-title">下班打卡地点：</view>
-        <view class="detail-text">{{ currentAttendance.clockOutAddress || '-' }}</view>
+      <view v-else>
+        <view class="detail-row">
+          <view class="detail-title">上班打卡时间：</view>
+          <view class="detail-text">{{ currentAttendance.onDutyTime || '缺少打卡记录' }}</view>
+        </view>
+        <view class="detail-row">
+          <view class="detail-title">上班打卡地点：</view>
+          <view class="detail-text">{{ currentAttendance.onDutyAddress || '-' }}</view>
+        </view>
+        <view class="divider"></view>
+        <view class="detail-row">
+          <view class="detail-title">下班打卡时间：</view>
+          <view class="detail-text">{{ currentAttendance.offDutyTime || '缺少打卡记录' }}</view>
+        </view>
+        <view class="detail-row">
+          <view class="detail-title">下班打卡地点：</view>
+          <view class="detail-text">{{ currentAttendance.offDutyAddress || '-' }}</view>
+        </view>
+        <!-- 可选：展示异常原因 -->
+        <view v-if="currentAttendance.abnormalReason" class="detail-row">
+          <view class="detail-title">异常原因：</view>
+          <view class="detail-text" style="color:#f56c6c">{{ currentAttendance.abnormalReason }}</view>
+        </view>
       </view>
     </view>
-  </view>
-</view>
+    </view>
 </template>
-
 <script setup lang="ts">
-import { ref, onMounted, computed } from 'vue';
-
-const weekList = ['日','一','二','三','四','五','六'];
+import { ref, onMounted, computed, watch } from 'vue';
+import { attendanceDaily, dayDetail } from '@/api/user'
+const weekList = ['日', '一', '二', '三', '四', '五', '六'];
 const today = new Date();
 const todayTs = today.getTime();
 // 当前显示月份
@@ -87,65 +83,50 @@ const currentYear = ref(today.getFullYear());
 const currentMonth = ref(today.getMonth() + 1);
 const selectDate = ref('');
 const dayRows = ref<any[]>([]);
-
 // 是否允许点击下一月：判断当前展示月份是否小于本月
 const canNext = computed(() => {
-  const showMonthDate = new Date(currentYear.value, currentMonth.value -1, 1);
+  const showMonthDate = new Date(currentYear.value, currentMonth.value - 1, 1);
   const nowMonthDate = new Date(today.getFullYear(), today.getMonth(), 1);
   return showMonthDate < nowMonthDate;
 });
  
-// ========== 写死静态统计数据 ==========
+// 统计数据
 const statData = ref({
-  checkInDays: 28,
-  normalDays: 25,
-  errorDays: 3
+  checkInDays: 0,
+  normalDays: 0,
+  errorDays: 0
 });
+// 当月考勤打点字典 {dateStr: {dot:string, abnormalReason:string}}
+const monthDayMap = ref<Record<string, { dot: string | null, abnormalReason: string | null }>>({});
  
-// ========== 写死日历标记：红点error异常，灰点normal正常 ==========
-const markMap = ref<Record<string, {type:'error'|'normal'}>>({
-  '2026-10-02': { type: 'error' },
-  '2026-10-10': { type: 'error' },
-  '2026-10-16': { type: 'error' },
-  '2026-10-05': { type: 'normal' },
-  '2026-10-12': { type: 'normal' },
-});
+// 选中日期详情
+const currentAttendance = ref<any>(null);
  
-// ========== 写死每日考勤详情数据 ==========
-const dayAttendanceMap = ref<Record<string, any>>({
-  '2026-10-02': {
-    clockInTime: '2026-10-02 08:02:10',
-    clockInAddress: '月坛南街安华大厦',
-    clockOutTime: '',
-    clockOutAddress: ''
-  },
-  '2026-10-13': {
-    clockInTime: '2026-10-13 07:58:25',
-    clockInAddress: '月坛南街安华大厦',
-    clockOutTime: '',
-    clockOutAddress: '南礼士地铁站'
-  },
-  '2026-10-05': {
-    clockInTime: '2026-10-05 08:00:00',
-    clockInAddress: '月坛南街安华大厦',
-    clockOutTime: '2026-10-05 18:00:00',
-    clockOutAddress: '月坛南街安华大厦'
-  },
-  '2026-10-10': null,
-  '2026-10-12': {
-    clockInTime: '2026-10-12 07:55:10',
-    clockInAddress: '月坛南街安华大厦',
-    clockOutTime: '2026-10-12 17:50:30',
-    clockOutAddress: '月坛南街安华大厦'
-  },
-  '2026-10-16': {
-    clockInTime: '2026-10-16 07:59:22',
-    clockInAddress: '月坛南街安华大厦',
-    clockOutTime: '',
-    clockOutAddress: ''
+// 拉取月度考勤汇总（stat + 当月日期打点）
+const getMonthAttendance = async () => {
+  try {
+    const month = `${currentYear.value}-${String(currentMonth.value).padStart(2, '0')}`;
+    const res = await attendanceDaily({ month });
+    // 赋值顶部统计
+    statData.value.checkInDays = res.stat.clockDays;
+    statData.value.normalDays = res.stat.normalDays;
+    statData.value.errorDays = res.stat.abnormalDays;
+    // 构建日期映射字典
+    const map: Record<string, { dot: string | null, abnormalReason: string | null }> = {};
+    res.days.forEach((item: any) => {
+      map[item.date] = {
+        dot: item.dot,
+        abnormalReason: item.abnormalReason
+      };
+    })
+    monthDayMap.value = map;
+    // 重新渲染日历
+    renderMonth();
+  } catch (err) {
+    console.error('获取月度考勤失败', err);
+    uni.showToast({ title: '加载月度考勤失败', icon: 'none' });
   }
-});
-const currentAttendance = ref<any>(null);
+};
  
 // 生成月份日期网格
 const renderMonth = () => {
@@ -159,46 +140,49 @@ const renderMonth = () =&gt; {
   const prevLastDay = new Date(year, month - 1, 0).getDate();
   // 当月第一天星期 0周日~6周六
   const firstWeek = firstDay.getDay();
-
   const rows: any[] = [];
   let row: any[] = [];
   // 填充上月尾部
-  for(let i = 0; i < firstWeek; i++){
+  for (let i = 0; i < firstWeek; i++) {
     const dayNum = prevLastDay - firstWeek + i + 1;
     row.push({
       day: dayNum,
       otherMonth: true,
-      dateStr: `${year}-${String(month-1).padStart(2,'0')}-${String(dayNum).padStart(2,'0')}`
+      dateStr: `${year}-${String(month - 1).padStart(2, '0')}-${String(dayNum).padStart(2, '0')}`
     })
   }
   // 填充当月日期
-  for(let d = 1; d <= lastDay.getDate(); d++){
-    const dateStr = `${year}-${String(month).padStart(2,'0')}-${String(d).padStart(2,'0')}`;
-    const mark = markMap.value[dateStr];
-    const item:any = {
+  for (let d = 1; d <= lastDay.getDate(); d++) {
+    const dateStr = `${year}-${String(month).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
+    const mark = monthDayMap.value[dateStr];
+    const item: any = {
       day: d,
       otherMonth: false,
       dateStr,
       dot: false,
       dotColor: ''
     };
-    if(mark){
+    if (mark?.dot) {
       item.dot = true;
-      item.dotColor = mark.type === 'error' ? '#f56c6c' : '#cccccc';
+      if (mark.dot === 'abnormal') {
+        item.dotColor = '#f56c6c';
+      } else if (mark.dot === 'partial') {
+        item.dotColor = '#cccccc';
+      }
     }
     row.push(item);
-    if(row.length ===7){
+    if (row.length === 7) {
       rows.push(row);
       row = [];
     }
   }
   // 填充下月开头
   let nextDay = 1;
-  while(row.length <7){
+  while (row.length < 7) {
     row.push({
       day: nextDay,
-      otherMonth:true,
-      dateStr: `${year}-${String(month+1).padStart(2,'0')}-${String(nextDay).padStart(2,'0')}`
+      otherMonth: true,
+      dateStr: `${year}-${String(month + 1).padStart(2, '0')}-${String(nextDay).padStart(2, '0')}`
     })
     nextDay++;
   }
@@ -208,180 +192,209 @@ const renderMonth = () =&gt; {
  
 // 上一月
 const prevMonth = () => {
-  if(currentMonth.value === 1){
+  if (currentMonth.value === 1) {
     currentYear.value--;
     currentMonth.value = 12;
-  }else{
+  } else {
     currentMonth.value--;
   }
-  renderMonth();
+  getMonthAttendance();
 };
 // 下一月
 const nextMonth = () => {
   let nextY = currentYear.value;
   let nextM = currentMonth.value + 1;
-  if(nextM > 12){
+  if (nextM > 12) {
     nextY++;
-    nextM =1;
+    nextM = 1;
   }
   currentYear.value = nextY;
   currentMonth.value = nextM;
-  renderMonth();
+  getMonthAttendance();
 };
  
-// 点击日期
-const onDayClick = (day:any) => {
+// 点击日期：获取当日详情
+const onDayClick = async (day: any) => {
   // 禁止点击其他月份
-  if(day.otherMonth) return;
+  if (day.otherMonth) return;
   const selectDay = new Date(day.dateStr);
-  if(selectDay > today){
+  if (selectDay > today) {
     currentAttendance.value = null;
+    selectDate.value = day.dateStr;
     return;
   }
   selectDate.value = day.dateStr;
-  const data = dayAttendanceMap.value[day.dateStr];
-  currentAttendance.value = data ?? null;
+  try {
+    const res = await dayDetail({ date: day.dateStr });
+    // 取第一条记录，大多数场景单条记录
+    const record = res.records?.[0] ?? null;
+    if (record) {
+      currentAttendance.value = {
+        ...record,
+        abnormalReason: res.abnormalReason
+      };
+    } else {
+      currentAttendance.value = null;
+    }
+  } catch (err) {
+    console.error('获取当日考勤详情失败', err);
+    uni.showToast({ title: '加载当日考勤失败', icon: 'none' });
+    currentAttendance.value = null;
+  }
 };
  
-onMounted(() => {
-  const todayStr = `${today.getFullYear()}-${String(today.getMonth()+1).padStart(2,'0')}-${String(today.getDate()).padStart(2,'0')}`;
+// 页面初始化
+onMounted(async () => {
+  const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
   selectDate.value = todayStr;
-  fetchDayAttendance(todayStr);
-  renderMonth();
+  await getMonthAttendance();
+  // 默认选中今天，加载当日详情
+  await onDayClick({ dateStr: todayStr, otherMonth: false });
 });
-
-const fetchDayAttendance = (date:string) => {
-  const selectDay = new Date(date);
-  if(selectDay > today){
-    currentAttendance.value = null;
-    return;
-  }
-  const data = dayAttendanceMap.value[date];
-  currentAttendance.value = data ?? null;
-};
 </script>
-
 <style scoped lang="scss">
-.attendance-page{
+.attendance-page {
   padding: 20rpx;
   background-color: #f5f5f7;
   min-height: 100vh;
 }
-.stat-card{
+
+.stat-card {
   display: flex;
   background-color: #3c9cff;
   border-radius: 16rpx;
-  padding:30rpx 0;
-  margin-bottom:20rpx;
-  .stat-item{
-    flex:1;
-    text-align:center;
-    color:#fff;
-    .stat-label{
-      font-size:28rpx;
-      opacity:0.9;
+  padding: 30rpx 0;
+  margin-bottom: 20rpx;
+
+  .stat-item {
+    flex: 1;
+    text-align: center;
+    color: #fff;
+
+    .stat-label {
+      font-size: 28rpx;
+      opacity: 0.9;
     }
-    .stat-value{
-      font-size:36rpx;
-      margin-top:10rpx;
-      font-weight:bold;
+
+    .stat-value {
+      font-size: 36rpx;
+      margin-top: 10rpx;
+      font-weight: bold;
     }
   }
 }
-.calendar-wrap{
-  background:#fff;
-  border-radius:12rpx;
-  padding:20rpx;
-  margin-bottom:20rpx;
+
+.calendar-wrap {
+  background: #fff;
+  border-radius: 12rpx;
+  padding: 20rpx;
+  margin-bottom: 20rpx;
 }
-.calendar-header{
-  display:flex;
+
+.calendar-header {
+  display: flex;
   justify-content: space-between;
-  align-items:center;
-  margin-bottom:20rpx;
+  align-items: center;
+  margin-bottom: 20rpx;
 }
-.calendar-title{
-  font-size:32rpx;
-  font-weight:bold;
+
+.calendar-title {
+  font-size: 32rpx;
+  font-weight: bold;
 }
-.calendar-btn{
-  padding:8rpx 16rpx;
-  border:1rpx solid #eee;
-  border-radius:8rpx;
-  font-size:26rpx;
+
+.calendar-btn {
+  padding: 8rpx 16rpx;
+  border: 1rpx solid #eee;
+  border-radius: 8rpx;
+  font-size: 26rpx;
 }
-.empty-btn{
-  border-color:transparent;
-  color:transparent;
+
+.empty-btn {
+  border-color: transparent;
+  color: transparent;
 }
-.week-row{
-  display:flex;
-  .week-item{
-    flex:1;
-    text-align:center;
-    font-size:26rpx;
-    color:#666;
-    padding:10rpx 0;
+
+.week-row {
+  display: flex;
+
+  .week-item {
+    flex: 1;
+    text-align: center;
+    font-size: 26rpx;
+    color: #666;
+    padding: 10rpx 0;
   }
 }
-.day-row{
-  display:flex;
-  .day-item{
-    flex:1;
-    min-height:70rpx;
-    display:flex;
-    flex-direction:column;
-    align-items:center;
-    justify-content:center;
-    padding:8rpx 0;
-    position:relative;
-    .day-text{
-      font-size:28rpx;
+
+.day-row {
+  display: flex;
+
+  .day-item {
+    flex: 1;
+    min-height: 70rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 8rpx 0;
+    position: relative;
+
+    .day-text {
+      font-size: 28rpx;
     }
-    .day-dot{
-      width:10rpx;
-      height:10rpx;
-      border-radius:50%;
-      margin-top:4rpx;
+
+    .day-dot {
+      position: absolute;
+      bottom: 8rpx;
+      width: 10rpx;
+      height: 10rpx;
+      border-radius: 50%;
     }
   }
-  .day-item--other{
-    color:#ccc;
+
+  .day-item--other {
+    color: #ccc;
   }
-  .day-item--active{
-    background:#3c9cff;
-    color:#fff;
-    border-radius:50%;
+
+  .day-item--active {
+    color: #f00;
   }
 }
-.detail-card{
-  background:#fff;
-  border-radius:12rpx;
-  padding:30rpx;
-  .empty-text{
-    text-align:center;
-    color:#999;
-    font-size:30rpx;
-    padding:40rpx 0;
+
+.detail-card {
+  background: #fff;
+  border-radius: 12rpx;
+  padding: 30rpx;
+
+  .empty-text {
+    text-align: center;
+    color: #999;
+    font-size: 30rpx;
+    padding: 40rpx 0;
   }
-  .detail-row{
-    margin-bottom:20rpx;
-    display:flex;
-    .detail-title{
-      font-size:30rpx;
-      color:#333;
-      width:220rpx;
+
+  .detail-row {
+    margin-bottom: 20rpx;
+    display: flex;
+
+    .detail-title {
+      font-size: 30rpx;
+      color: #333;
+      width: 220rpx;
     }
-    .detail-text{
-      flex:1;
-      font-size:30rpx;
-      color:#666;
+
+    .detail-text {
+      flex: 1;
+      font-size: 30rpx;
+      color: #666;
     }
   }
-  .divider{
-    height:1px;
-    background:#eee;
-    margin:30rpx 0;
+
+  .divider {
+    height: 1px;
+    background: #eee;
+    margin: 30rpx 0;
   }
 }
 </style>
 <template>
   <view class="u-page">
-    <!-- 原有模板内容不变，仅调整表单校验相关配置 -->
-    <view class="inspect-form-content commonPageLRpadding">
-      <up-form
-          label-position="left"
-          :model="inspectForm"
-          ref="inspectFormRef"
-          labelWidth="200rpx"
-      >
-        <!-- 1. 巡查描述 -->
-        <up-form-item
-            label="巡查描述"
-            prop="content"
-            class="form-item"
-            required
-        >
-          <up-textarea
-              v-model.trim="inspectForm.content"
-              placeholder="请输入巡查描述"
-              maxlength="200"
-              count
-          ></up-textarea>
-        </up-form-item>
-
-        <!-- 2. 上传图片 -->
-        <up-form-item
-            label="上传图片"
-            prop="images"
-            required
-            border-bottom
-            class="form-item"
-        >
-          <up-upload
-              :file-list="imagesList"
-              @after-read="(event) => uploadImgs(event)"
-              @delete="(event) => deleteImg(event)"
-              @on-exceed="handleExceed"
-              multiple
-              :max-count="3"
-              upload-text="选择图片"
-              del-color="#ff4d4f"
-              class="upload-wrap"
-              width="70"
-              height="70"
-          ></up-upload>
-        </up-form-item>
-
-        <!-- 3. 转为工单 -->
-        <up-form-item
-            label="转为工单"
-            prop="isWorkOrder"
-            required
-            class="form-item"
-        >
-          <up-radio-group
-              v-model="inspectForm.isWorkOrder"
-              active-color="#1989fa"
-              direction="row"
-              class="radio-group"
-              @change="handleWorkOrderChange"
-          >
-            <up-radio
-                :custom-style="{marginRight: '40rpx'}"
-                v-for="(item, index) in radioList"
-                :key="index"
-                :label="item.label"
-                :name="item.value"
-            >
+<!-- 原有模板内容不变，仅调整表单校验相关配置 -->
+<view class="inspect-form-content commonPageLRpadding">
+<up-form label-position="left" :model="inspectForm" ref="inspectFormRef" labelWidth="200rpx">
+<!-- 1. 巡查描述 -->
+<up-form-item label="巡查描述" prop="content" class="form-item" required>
+<up-textarea v-model.trim="inspectForm.content" placeholder="请输入巡查描述" maxlength="200" count></up-textarea>
+</up-form-item>
+<!-- 2. 上传图片 -->
+<up-form-item label="上传图片" prop="images" required border-bottom class="form-item">
+<up-upload :file-list="imagesList" @after-read="(event) => uploadImgs(event)"
+            @delete="(event) => deleteImg(event)" @on-exceed="handleExceed" multiple :max-count="3" upload-text="选择图片"
+del-color="#ff4d4f" class="upload-wrap" width="70" height="70"></up-upload>
+</up-form-item>
+<!-- 3. 转为工单 -->
+<up-form-item label="转为工单" prop="isWorkOrder" required class="form-item">
+<up-radio-group v-model="inspectForm.isWorkOrder" active-color="#1989fa" direction="row" class="radio-group"
+            @change="handleWorkOrderChange">
+<up-radio :custom-style="{ marginRight: '40rpx' }" v-for="(item, index) in radioList" :key="index"
+              :label="item.label" :name="item.value">
               {{ item.label }}
-            </up-radio>
-          </up-radio-group>
-        </up-form-item>
-
-        <!-- 紧急程度（仍为必填） -->
-<!--        v-if="inspectForm.isWorkOrder === '2'"-->
-        <up-form-item
-            v-if="inspectForm.isWorkOrder === '2'"
-            label="紧急程度"
-            prop="pressingTypeName"
-            border-bottom
-            required
-            class="form-item"
-            @click="handleActionSheetOpen('pressingType')"
-        >
-          <up-input
-              v-model="inspectForm.pressingTypeName"
-              disabled
-              disabled-color="#ffffff"
-              placeholder="请选择紧急程度"
-              border="none"
-
-          ></up-input>
-          <template #right>
-            <up-icon name="arrow-right" size="16"></up-icon>
-          </template>
-        </up-form-item>
-
-        <!-- 希望完成时间（移除 required 属性，改为非必填） -->
-<!--        v-if="inspectForm.isWorkOrder === '2'"-->
-        <up-form-item
-            v-if="inspectForm.isWorkOrder === '2'"
-            label="希望完成时间"
-            prop="expectedFinishDate"
-            class="form-item"
-            @click="show = true;  uni.hideKeyboard()"
-        >
-        <up-input
-            v-model="inspectForm.expectedFinishDate"
-            border="none"
-            readonly
-            placeholder="点击选择时间"
-        >
-
-
-        </up-input>
-        <template #right>
-          <!-- 核心修复：用view包裹图标，添加双重@click.stop -->
-          <view v-if="inspectForm.expectedFinishDate" @click.stop>
-            <up-icon
-                name="close"
-                size="16"
-                @click.stop="clearExpectedFinishDate"
-            ></up-icon>
-          </view>
-          <up-icon name="arrow-right" size="16" v-else></up-icon>
-        </template>
-        </up-form-item>
-
-      </up-form>
-    </view>
-
-    <!-- 底部提交按钮 -->
-    <view class="fixed-bottom-btn-wrap">
-      <up-button
-          type="primary"
-          text="提交"
-          @click="submitInspect"
-          :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"
-      ></up-button>
-    </view>
-
-    <!-- 紧急程度下拉弹窗 -->
-    <up-action-sheet
-        :show="showActionSheet"
-        :actions="pressingTypeList"
-        title="请选择紧急程度"
-        @close="handleActionSheetClose"
-        @select="handlePressingTypeSelect"
-    ></up-action-sheet>
-
-    <!-- 完成时间选择器 -->
-    <up-datetime-picker
-        :show="show"
-        v-model="datetimeValue"
-        mode="datetime"
-        :min-date="new Date()"
-        @cancel="show = false"
-        @confirm="expectedFinishDateConfirm"
-    ></up-datetime-picker>
-  </view>
+</up-radio>
+</up-radio-group>
+</up-form-item>
+<!-- ========== 【新增】业务线（单选框，对齐参考页面） ========== -->
+<up-form-item v-if="inspectForm.isWorkOrder === '2'" label="业务线" prop="busiLineCn" border-bottom required
+class="form-item">
+<up-radio-group v-model="inspectForm.busiLineCn" placement="row" @change="handleBusiLineChange">
+<up-radio v-for="item in busiLineOptions" :key="item.name" :label="item.name" :name="item.name"></up-radio>
+</up-radio-group>
+</up-form-item>
+<!-- ========== 【新增】问题类型（级联选择器，对齐参考页面） ========== -->
+<up-form-item v-if="inspectForm.isWorkOrder === '2'" label="问题类型" prop="orderName" border-bottom required
+class="form-item" @click="openCascader(); uni.hideKeyboard()">
+<up-input v-model="inspectForm.orderName" disabled disabled-color="#ffffff" placeholder="请选择问题类型"
+border="none"></up-input>
+<template #right>
+<up-icon name="arrow-right" size="16"></up-icon>
+</template>
+</up-form-item>
+<!-- 紧急程度（仍为必填） -->
+<up-form-item v-if="inspectForm.isWorkOrder === '2'" label="紧急程度" prop="pressingTypeName" border-bottom required
+class="form-item" @click="handleActionSheetOpen('pressingType')">
+<up-input v-model="inspectForm.pressingTypeName" disabled disabled-color="#ffffff" placeholder="请选择紧急程度"
+border="none"></up-input>
+<template #right>
+<up-icon name="arrow-right" size="16"></up-icon>
+</template>
+</up-form-item>
+<!-- 希望完成时间（移除 required 属性，改为非必填） -->
+<up-form-item v-if="inspectForm.isWorkOrder === '2'" label="希望完成时间" prop="expectedFinishDate" class="form-item"
+          @click="show = true; uni.hideKeyboard()">
+<up-input v-model="inspectForm.expectedFinishDate" border="none" readonly placeholder="点击选择时间">
+</up-input>
+<template #right>
+<!-- 核心修复：用view包裹图标，添加双重@click.stop -->
+<view v-if="inspectForm.expectedFinishDate" @click.stop>
+<up-icon name="close" size="16" @click.stop="clearExpectedFinishDate"></up-icon>
+</view>
+<up-icon name="arrow-right" size="16" v-else></up-icon>
+</template>
+</up-form-item>
+</up-form>
+</view>
+<!-- 底部提交按钮 -->
+<view class="fixed-bottom-btn-wrap">
+<up-button type="primary" text="提交" @click="submitInspect"
+        :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"></up-button>
+</view>
+<!-- 紧急程度下拉弹窗 -->
+<up-action-sheet :show="showActionSheet" :actions="pressingTypeList" title="请选择紧急程度" @close="handleActionSheetClose"
+      @select="handlePressingTypeSelect"></up-action-sheet>
+<!-- ========== 新增级联选择器组件 ========== -->
+<up-cascader v-model:show="showCascader" v-model="cascaderValue" :data="cascaderOptions" title="选择问题类型"
+      :auto-close="false" @confirm="cascaderConfirm"></up-cascader>
+<!-- 完成时间选择器 -->
+<up-datetime-picker :show="show" v-model="datetimeValue" mode="datetime" :min-date="new Date()"
+      @cancel="show = false" @confirm="expectedFinishDateConfirm"></up-datetime-picker>
+</view>
 </template>
-
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import type { UniFormRef } from '@/uni_modules/uview-plus/types'
+import { useUserStore } from '@/pinia/user';
+import { getDictLabel, getDictValue } from '@/common/utils/dict';
+import { getProblemListByType } from '@/api/common'
+const { proxy } = getCurrentInstance()!
 const inspectFormRef = ref<UniFormRef>(null)
-</script>
+const userStore = useUserStore();
+const BUSI_LINE_DICT_TYPE = 'business_line';
+const CJK_RE = /[一-龥]/;
+
+// 级联选择器变量
+const showCascader = ref(false);
+const cascaderValue = ref([]);
+const cascaderOptions = ref([]);
+
+// 打开级联弹窗
+const openCascader = () => {
+const busiLineEn = getBusiLineEnByCn(proxy.$data.inspectForm.busiLineCn)
+if (!busiLineEn) {
+uni.showToast({ title: '请先选择业务线', icon: 'none' })
+return
+  }
+if (!cascaderOptions.value || cascaderOptions.value.length === 0) {
+uni.showToast({ title: '正在加载问题类型，请稍等', icon: 'none' });
+loadProblemCascader(busiLineEn);
+return;
+  }
+cascaderValue.value = [];
+showCascader.value = true;
+};
+
+// 级联确认回调
+const cascaderConfirm = (selectedArr) => {
+const getLabelByValueList = (list, valList) => {
+const labelArr = [];
+let currentList = list;
+for (const val of valList) {
+const target = currentList.find(item => item.value === val);
+if (!target) break;
+labelArr.push(target.label);
+currentList = target.children || [];
+    }
+return labelArr.join('/');
+  };
+const fullLabel = getLabelByValueList(cascaderOptions.value, selectedArr);
+proxy.$data.inspectForm.orderName = fullLabel;
+proxy.$data.inspectForm.orderCode = selectedArr.at(-1);
+cascaderValue.value = selectedArr;
+inspectFormRef.value?.validateField('orderName');
+};
+
+// 加载级联树形数据
+const loadProblemCascader = async (parentCode) => {
+if (!parentCode) {
+cascaderOptions.value = []
+return
+  }
+try {
+uni.showLoading({ title: '加载类型中...' })
+const res = await getProblemListByType({ parentCode })
+uni.hideLoading()
+cascaderOptions.value = res || []
+  } catch (err) {
+uni.hideLoading()
+console.error('获取问题类型失败', err)
+uni.showToast({ title: '获取问题类型失败', icon: 'none' })
+cascaderOptions.value = []
+  }
+}
  
+const getBusiLineCnByEn = (busiLineEn) => {
+if (!busiLineEn) return '';
+return getDictLabel(BUSI_LINE_DICT_TYPE, busiLineEn) || busiLineEn;
+};
+const getBusiLineEnByCn = (cnName) => {
+if (!cnName) return '';
+const code = getDictValue(BUSI_LINE_DICT_TYPE, cnName);
+if (code) return code;
+return CJK_RE.test(cnName) ? '' : cnName;
+};
+
+// 暴露给选项式访问
+proxy.$setupCtx = {
+  loadProblemCascader,
+  getBusiLineEnByCn,
+  cascaderOptions,
+  cascaderValue
+}
+</script>
 <script lang="ts">
 import { uploadImages } from '@/common/utils/upload';
-import { inspectionCreate } from  "@/api/patrol-manage/patrol-plan";
+import { inspectionCreate } from "@/api/patrol-manage/patrol-plan";
 import { timeFormat } from '@/uni_modules/uview-plus'
-
+import { useUserStore } from '@/pinia/user';
+import { getDictLabel } from '@/common/utils/dict';
 export default {
-  data() {
-    return {
-      imagesList: [],
-      radioList: [
+data() {
+return {
+imagesList: [],
+radioList: [
         { label: '否', value: '1' },
         { label: '是', value: '2' }
       ],
-      pressingTypeList: [],
-      inspectForm: {
-        content: '',
-        isWorkOrder: '1',
-        pressingTypeName: '',
-        pressingType: '',
-        expectedFinishDate: '' // 非必填，可空
+pressingTypeList: [],
+busiLineOptions: [], // 业务线移到data，不再放在setup
+inspectForm: {
+content: '',
+isWorkOrder: '1',
+pressingTypeName: '',
+pressingType: '',
+busiLineCn: '',
+orderName: '',
+orderCode: '',
+expectedFinishDate: '' // 非必填，可空
       },
-      paramsOptins: {},
-      showActionSheet: false,
-      show: false,
-      datetimeValue: Date.now(),
-      inspectFormRules: {
-        images: [
+paramsOptins: {},
+showActionSheet: false,
+show: false,
+datetimeValue: Date.now(),
+inspectFormRules: {
+images: [
           {
-            required: true,
-            message: '请上传图片',
-            trigger: 'change',
-            validator: (rule, value, callback) => {
-              const hasSuccessImg = this.imagesList.some(item => item.status === 'success')
-              const imgCount = this.imagesList.filter(item => item.status === 'success').length
-
-              if (!hasSuccessImg || imgCount < 1) {
-                callback(new Error('最少需要上传1张图片'))
+required: true,
+message: '请上传图片',
+trigger: 'change',
+validator: (rule, value, callback) => {
+const hasSuccessImg = this.imagesList.some(item => item.status === 'success')
+const imgCount = this.imagesList.filter(item => item.status === 'success').length
+if (!hasSuccessImg || imgCount < 1) {
+callback(new Error('最少需要上传1张图片'))
               } else if (imgCount > 3) {
-                callback(new Error('最多只能上传3张图片'))
+callback(new Error('最多只能上传3张图片'))
               } else {
-                callback()
+callback()
               }
             }
           }
         ],
-        content: [
-          { type: 'string', required: true, message: '请输入工单描述', trigger: ['change'] }
+content: [
+          { type: 'string', required: true, message: '请输入巡查描述', trigger: ['change'] }
         ],
-        isWorkOrder: [
+isWorkOrder: [
           { type: 'string', required: true, message: '请选择是否转为工单', trigger: ['change'] }
         ],
-        pressingTypeName: [
+pressingTypeName: [
+          {
+required: true,
+message: '请选择紧急程度',
+trigger: 'change',
+validator: (rule, value, callback) => {
+if (this.inspectForm.isWorkOrder === '2' && !value) {
+callback(new Error('请选择紧急程度'))
+              } else {
+callback()
+              }
+            }
+          }
+        ],
+busiLineCn: [
+          {
+required: true,
+message: '请选择业务线',
+trigger: 'change',
+validator: (rule, value, callback) => {
+if (this.inspectForm.isWorkOrder === '2' && !value) {
+callback(new Error('请选择业务线'))
+              } else {
+callback()
+              }
+            }
+          }
+        ],
+orderName: [
           {
-            required: true,
-            message: '请选择紧急程度',
-            trigger: 'change',
-            validator: (rule, value, callback) => {
-              if (this.inspectForm.isWorkOrder === '2' && !value) {
-                callback(new Error('请选择紧急程度'))
+required: true,
+message: '请选择问题类型',
+trigger: 'change',
+validator: (rule, value, callback) => {
+if (this.inspectForm.isWorkOrder === '2' && !value) {
+callback(new Error('请选择问题类型'))
               } else {
-                callback()
+callback()
               }
             }
           }
         ],
-        // 关键修改：希望完成时间 移除必填校验，或改为非必填
-        expectedFinishDate: [
+expectedFinishDate: [
           {
-            // 移除 required: true，改为非必填
-            message: '请选择有效的希望完成时间', // 仅当有值时，校验格式（可选）
-            trigger: 'change',
-            validator: (rule, value, callback) => {
-              // 只有当字段有值时，才校验时间格式是否有效
-              if (value && !/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$/.test(value)) {
-                callback(new Error('请选择有效的希望完成时间'))
+message: '请选择有效的希望完成时间',
+trigger: 'change',
+validator: (rule, value, callback) => {
+if (value && !/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$/.test(value)) {
+callback(new Error('请选择有效的希望完成时间'))
               } else {
-                callback() // 无值时直接通过校验
+callback()
               }
             }
           }
@@ -251,185 +283,183 @@ export default {
       }
     }
   },
-  onLoad(option){
-    this.paramsOptins = option
-    this.getPressingTypeDict()
+onLoad(option) {
+this.paramsOptins = option
+// 初始化业务线选项
+const userStore = useUserStore();
+if (userStore.userInfo?.user?.busiLine) {
+const rawBusiLines = userStore.userInfo.user.busiLine.split(',');
+this.busiLineOptions = rawBusiLines.map(item => ({
+name: getDictLabel('business_line', item.trim()) || item.trim()
+}));
+}
   },
-  onReady() {
-    this.$refs.inspectFormRef.setRules(this.inspectFormRules)
+onReady() {
+this.$refs.inspectFormRef.setRules(this.inspectFormRules)
   },
-  methods: {
-    getPressingTypeDict() {
-      const dictList = uni.$dict.getDictSimpleList('workorder_pressing_type')
-      this.pressingTypeList = uni.$dict.transformLabelValueToNameValue(dictList)
-      console.log(this.pressingTypeList)
-    },
-
-    handleWorkOrderChange() {
-      if (this.inspectForm.isWorkOrder === '1') {
-        this.inspectForm.pressingTypeName = ''
-        this.inspectForm.pressingType = ''
-        this.inspectForm.expectedFinishDate = '' // 清空非必填字段
-        this.$refs.inspectFormRef.validateField(['pressingTypeName', 'expectedFinishDate'])
+onShow() {
+this.pressingTypeList = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
+  },
+methods: {
+handleWorkOrderChange() {
+if (this.inspectForm.isWorkOrder === '1') {
+this.inspectForm.pressingTypeName = ''
+this.inspectForm.pressingType = ''
+this.inspectForm.busiLineCn = ''
+this.inspectForm.orderName = ''
+this.inspectForm.orderCode = ''
+this.$setupCtx.cascaderOptions.value = []
+this.$setupCtx.cascaderValue.value = []
+this.inspectForm.expectedFinishDate = ''
+this.$refs.inspectFormRef.validateField(['pressingTypeName', 'busiLineCn', 'orderName', 'expectedFinishDate'])
+      } else {
+// 修复点：直接读取data中的 busiLineOptions，不再访问setup
+const busiOpts = this.busiLineOptions
+if (busiOpts.length > 0) {
+this.inspectForm.busiLineCn = busiOpts[0].name
+this.handleBusiLineChange()
+        }
       }
     },
-
-
-    handleActionSheetOpen(type) {
-      uni.hideKeyboard()
-      console.log('showActionSheet')
-      if (type === 'pressingType') {
-        console.log('showActionSheet')
-        this.showActionSheet = true
+handleBusiLineChange() {
+this.inspectForm.orderName = ''
+this.inspectForm.orderCode = ''
+this.$setupCtx.cascaderValue.value = []
+this.$setupCtx.cascaderOptions.value = []
+const busiLineEn = this.$setupCtx.getBusiLineEnByCn(this.inspectForm.busiLineCn)
+this.$setupCtx.loadProblemCascader(busiLineEn)
+this.$refs.inspectFormRef.validateField('busiLineCn')
+    },
+handleActionSheetOpen(type) {
+uni.hideKeyboard()
+if (type === 'pressingType') {
+this.showActionSheet = true
       }
-      uni.hideKeyboard()
     },
-
-    handleActionSheetClose() {
-      this.showActionSheet = false
+handleActionSheetClose() {
+this.showActionSheet = false
     },
-
-    handlePressingTypeSelect(e) {
-      console.log(e)
-      this.inspectForm.pressingTypeName = e.name
-      this.inspectForm.pressingType = e.value
-      this.showActionSheet = false
-      this.$refs.inspectFormRef.validateField('pressingTypeName')
+handlePressingTypeSelect(e) {
+this.inspectForm.pressingTypeName = e.name
+this.inspectForm.pressingType = e.value
+this.showActionSheet = false
+this.$refs.inspectFormRef.validateField('pressingTypeName')
     },
-
-    expectedFinishDateConfirm(e) {
-      this.inspectForm.expectedFinishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
-      this.show = false
-      this.$refs.inspectFormRef.validateField('expectedFinishDate')
+expectedFinishDateConfirm(e) {
+this.inspectForm.expectedFinishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+this.show = false
+this.$refs.inspectFormRef.validateField('expectedFinishDate')
     },
-    // 新增：清除希望完成时间的方法
-    clearExpectedFinishDate() {
-      this.inspectForm.expectedFinishDate = ''
-      // 清除后触发一次字段校验，确保校验状态更新
-      this.$refs.inspectFormRef.validateField('expectedFinishDate')
+clearExpectedFinishDate() {
+this.inspectForm.expectedFinishDate = ''
+this.$refs.inspectFormRef.validateField('expectedFinishDate')
     },
-
-    deleteImg(event) {
-      this.imagesList.splice(event.index, 1)
-      this.$refs.inspectFormRef.validateField('images')
-      uni.showToast({ title: '图片删除成功', icon: 'success' })
+deleteImg(event) {
+this.imagesList.splice(event.index, 1)
+this.$refs.inspectFormRef.validateField('images')
+uni.showToast({ title: '图片删除成功', icon: 'success' })
     },
-
-    async uploadImgs(event) {
-      const fileList = Array.isArray(event.file) ? event.file : [event.file]
-      const targetImgList = this.imagesList
-
-      const filePaths = fileList.map(item => item.url)
-      const tempItems = fileList.map(item => ({
-        ...item,
-        status: 'uploading',
-        message: '上传中'
+async uploadImgs(event) {
+const fileList = Array.isArray(event.file) ? event.file : [event.file]
+const targetImgList = this.imagesList
+const filePaths = fileList.map(item => item.url)
+const tempItems = fileList.map(item => ({
+...item,
+status: 'uploading',
+message: '上传中'
       }))
-      const startIndex = targetImgList.length
-      targetImgList.push(...tempItems)
-
-      try {
-        const uploadResultUrls = await uploadImages({
-          filePaths: filePaths,
-          ignoreError: true
+const startIndex = targetImgList.length
+targetImgList.push(...tempItems)
+try {
+const uploadResultUrls = await uploadImages({
+filePaths: filePaths,
+ignoreError: true
         })
-
-        uploadResultUrls.forEach((url, index) => {
-          if (targetImgList[startIndex + index]) {
-            targetImgList.splice(startIndex + index, 1, {
-              ...fileList[index],
-              status: 'success',
-              message: '',
-              url: url
+uploadResultUrls.forEach((url, index) => {
+if (targetImgList[startIndex + index]) {
+targetImgList.splice(startIndex + index, 1, {
+...fileList[index],
+status: 'success',
+message: '',
+url: url
             })
           }
         })
-
-        if (uploadResultUrls.length < fileList.length) {
-          const failCount = fileList.length - uploadResultUrls.length
-          uni.showToast({ title: `成功上传${uploadResultUrls.length}张，失败${failCount}张`, icon: 'none' })
+if (uploadResultUrls.length < fileList.length) {
+const failCount = fileList.length - uploadResultUrls.length
+uni.showToast({ title: `成功上传${uploadResultUrls.length}张，失败${failCount}张`, icon: 'none' })
         } else {
-          uni.showToast({ title: `成功上传${fileList.length}张图片`, icon: 'success' })
+uni.showToast({ title: `成功上传${fileList.length}张图片`, icon: 'success' })
         }
-
-        this.$refs.inspectFormRef.validateField('images')
+this.$refs.inspectFormRef.validateField('images')
       } catch (err) {
-        console.error('图片上传失败：', err)
-        for (let i = 0; i < fileList.length; i++) {
-          if (targetImgList[startIndex + i]) {
-            targetImgList.splice(startIndex + i, 1, {
-              ...fileList[i],
-              status: 'failed',
-              message: '上传失败'
+console.error('图片上传失败：', err)
+for (let i = 0; i < fileList.length; i++) {
+if (targetImgList[startIndex + i]) {
+targetImgList.splice(startIndex + i, 1, {
+...fileList[i],
+status: 'failed',
+message: '上传失败'
             })
           }
         }
-        uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
-        this.$refs.inspectFormRef.validateField('images')
+uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
+this.$refs.inspectFormRef.validateField('images')
       }
     },
-
-    handleExceed() {
-      uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
+handleExceed() {
+uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
     },
-
-    getImgUrlList(imgList) {
-      return imgList.filter(item => item.status === 'success').map(item => item.url)
+getImgUrlList(imgList) {
+return imgList.filter(item => item.status === 'success').map(item => item.url)
     },
-
-    async submitInspect() {
-      console.log('当前选择是否转为工单：', this.inspectForm.isWorkOrder)
-      try {
-        await this.$refs.inspectFormRef.validate()
-        console.log(this.imagesList)
-
-        // 构造基础提交数据
-        const baseSubmitData = {
-          "batchNo": this.paramsOptins.batchNo,
-          "planNo": this.paramsOptins.planNo,
-          "imgHost": "1",
-          "imgList": this.getImgUrlList(this.imagesList),
-          "inspectionState": this.inspectForm.isWorkOrder,
-          "transState": this.inspectForm.isWorkOrder === '1' ? '1' : '2',
-          "transWorkNo": "default'",
-          "remark": this.inspectForm.content.trim()
+async submitInspect() {
+console.log('当前选择是否转为工单：', this.inspectForm.isWorkOrder)
+try {
+await this.$refs.inspectFormRef.validate()
+console.log(this.imagesList)
+const baseSubmitData = {
+"batchNo": this.paramsOptins.batchNo,
+"planNo": this.paramsOptins.planNo,
+"imgHost": "1",
+"imgList": this.getImgUrlList(this.imagesList),
+"inspectionState": this.inspectForm.isWorkOrder,
+"transState": this.inspectForm.isWorkOrder === '1' ? '1' : '2',
+"transWorkNo": "default'",
+"remark": this.inspectForm.content.trim()
         }
-
-        // 构造最终提交数据
-        let submitData = { ...baseSubmitData }
-        if (this.inspectForm.isWorkOrder === '2') {
-          // 紧急程度仍为必填，必传
-          submitData.pressingType = this.inspectForm.pressingType
-          // 关键修改：仅当希望完成时间有值时，才添加该参数
-          if (this.inspectForm.expectedFinishDate) {
-            submitData.expectedFinishDate = new Date(this.inspectForm.expectedFinishDate).getTime()
+let submitData = { ...baseSubmitData }
+if (this.inspectForm.isWorkOrder === '2') {
+submitData.pressingType = this.inspectForm.pressingType
+const busiLineEn = this.$setupCtx.getBusiLineEnByCn(this.inspectForm.busiLineCn)
+submitData.busiLine = busiLineEn
+submitData.orderName = this.inspectForm.orderName
+submitData.orderCode = this.inspectForm.orderCode
+if (this.inspectForm.expectedFinishDate) {
+submitData.expectedFinishDate = new Date(this.inspectForm.expectedFinishDate).getTime()
           }
         }
-
-        uni.showLoading({ title: '提交中...' })
-        await inspectionCreate(submitData)
-
-        uni.hideLoading()
-        uni.showToast({
-          title: '提交成功',
-          icon: 'success',
-          duration: 1000
+uni.showLoading({ title: '提交中...' })
+await inspectionCreate(submitData)
+uni.hideLoading()
+uni.showToast({
+title: '提交成功',
+icon: 'success',
+duration: 1000
         })
-
-        setTimeout(() => {
-          uni.reLaunch({
-            url: '/pages-sub/daily/patrol-manage/index'
+setTimeout(() => {
+uni.reLaunch({
+url: '/pages-sub/daily/patrol-manage/index'
           })
         }, 1000)
-
       } catch (error) {
-        uni.hideLoading()
-        if (!Array.isArray(error)) {
-          console.error('巡查表单提交失败：', error)
-          uni.showToast({
-            title: '提交失败，请重试',
-            icon: 'none',
-            duration: 2000
+uni.hideLoading()
+if (!Array.isArray(error)) {
+console.error('巡查表单提交失败：', error)
+uni.showToast({
+title: '提交失败，请重试',
+icon: 'none',
+duration: 2000
           })
         }
       }
@@ -437,20 +467,15 @@ export default {
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .u-page {
-  min-height: 100vh;
+min-height: 100vh;
 }
-
 .inspect-form-content {
-  background: #fff;
-  padding: 20rpx;
+background: #fff;
+padding: 20rpx;
 }
-
 .form-item {
-  margin-bottom: 20rpx;
+margin-bottom: 20rpx;
 }
-
-
-</style>
 \ No newline at end of file
+</style>
@@ -212,7 +212,7 @@ const loadProblemCascader = async (parentCode) =&gt; {
 // 表单Ref
 const workOrderFormRef = ref(null)
 const problemImgs = useUploadImgs({
-  maxCount: 3,
+  maxCount: 9,
   uploadText: '选择问题照片',
   sizeType: ['compressed'],
   formRef: workOrderFormRef,
@@ -116,6 +116,10 @@
               </template>
             </up-cell>
  
+
+            
+             <up-cell title="重点巡检区域" :value="orderDetail.keyInspection==0?'否':'是'" align="middle"></up-cell>
+
             <!-- 希望完成时间 -->
             <up-cell
                 v-if="orderDetail.expectedFinishDate!==0"
@@ -24,26 +24,22 @@
  
         <!-- 任务完成情况卡片 -->
         <view class="task-chart-card">
-         <view class="card-header">
-  <view class="unit-tip">数字指标</view>
-  <!-- ActionSheet 点击唤起 -->
-  <view class="sort-trigger" @click="openActionSheet">
-    {{ sortLabel }}
-    <up-icon name="arrow-down" size="14" style="margin-left:4rpx;"></up-icon>
-  </view>
-  <!-- ActionSheet组件 -->
-  <up-action-sheet
-    :show="showActionSheet"
-    :actions="actionSheetOptions"
-    @select="handleSheetSelect"
-    @close="showActionSheet = false"
-  />
-  <view class="date-picker-wrap">
-    <neo-datetime-pro v-model="dateRange" type="daterange" :clearable="false" placeholder="请选择日期范围"
-                    @confirm="handleDateConfirm" :max-date="maxDate" @popup-show="handlePopupShow"
-                    @popup-hide="handlePopupHide" />
-  </view>
-</view>
+          <view class="card-header">
+            <view class="unit-tip">数字指标</view>
+            <!-- ActionSheet 点击唤起 -->
+            <view class="sort-trigger" @click="openActionSheet">
+              {{ sortLabel }}
+              <up-icon name="arrow-down" size="14" style="margin-left:4rpx;"></up-icon>
+            </view>
+            <!-- ActionSheet组件 -->
+            <up-action-sheet :show="showActionSheet" :actions="actionSheetOptions" @select="handleSheetSelect"
+              @close="showActionSheet = false" />
+            <view class="date-picker-wrap">
+              <neo-datetime-pro v-model="dateRange" type="daterange" :clearable="false" placeholder="请选择日期范围"
+                @confirm="handleDateConfirm" :max-date="maxDate" @popup-show="handlePopupShow"
+                @popup-hide="handlePopupHide" />
+            </view>
+          </view>
  
  
           <!-- 双折线K线图 -->
@@ -52,23 +48,16 @@
               :option="klineOption" :width="chartWidth" :height="chartHeight" />
           </view> -->
  
-          <up-grid
-                :border="false"
-               col="4"
-        >
-            <up-grid-item
-                    v-for="(baseListItem,baseListIndex) in baseList"
-                    :key="baseListIndex"
-            >
-                <!-- <up-icon
-                        :customStyle="{paddingTop:20+'rpx'}"
-                        :name="baseListItem.name"
-                        :size="22"
-                ></up-icon> -->
-                 <text class="grid-text" style="font-size: 24px;">{{baseListItem.num}}</text>
-                <text class="grid-text">{{baseListItem.title}}</text>
+          <up-grid :border="false" col="4">
+            <up-grid-item v-for="(baseListItem, baseListIndex) in baseList" :key="baseListIndex">
+              <view class="grid-item-icon-box">
+                <up-icon :name="baseListItem.name" size="32" color="#1677ff"></up-icon>
+                <text class="grid-num-icon">{{ baseListItem.num }}</text>
+                <text class="grid-label-icon">{{ baseListItem.title }}</text>
+              </view>
             </up-grid-item>
-        </up-grid>
+          </up-grid>
+
         </view>
       </view>
  
@@ -98,13 +87,8 @@
         </view>
  
  
-        <scroll-view 
-          class="task-list-container" 
-          scroll-y 
-          @scroll="onListScroll" 
-          @scrolltoupper="handleTouchTop"
-          enhanced
-        >
+        <scroll-view class="task-list-container" scroll-y @scroll="onListScroll" @scrolltoupper="handleTouchTop"
+          enhanced>
           <view v-if="taskList.length === 0" class="empty-box">
             <up-empty />
           </view>
@@ -113,7 +97,7 @@
             <view class="task-item__content">
               <view class="name-fixed-wrap">
                 <view class="task-item__name ">
-                  事项{{ index + 1 }} 
+                  事项{{ index + 1 }}
                 </view>
                 <view class="task-name-text">
                   {{ item.taskName || '无' }}
@@ -121,7 +105,8 @@
               </view>
  
               <view v-if="currentTabValue === 0" class="task-item__footer" style="padding-left:  60px;">
-                <image class="loc-icon" src="https://img.jichengshanshui.com.cn:28207/appimg/定位icon@3x.png" mode="aspectFit"></image>
+                <image class="loc-icon" src="https://img.jichengshanshui.com.cn:28207/appimg/定位icon@3x.png"
+                  mode="aspectFit"></image>
                 <template v-if="isWalkTextMode">
                   <text>距离当前{{ item.distance }}m ·约{{ item.estimatedWalkingMinutes }}分钟步行</text>
                 </template>
@@ -143,7 +128,7 @@
 import { ref, computed, nextTick, watch } from 'vue';
 import { onShow, onUnload } from '@dcloudio/uni-app';
 import { useUserStore } from '@/pinia/user';
-// import { timeFormat } from '@/uni_modules/uview-plus/libs/function/date';
+import { timeFormat } from '@/uni_modules/uview-plus';
 import uniCharts from '@/components/uni-charts/uni-charts.vue';
 import { getUnreadCount } from "@/api/user";
 import {
@@ -211,8 +196,8 @@ const currentTabValue = ref(0);
 const dateRange = ref<string[]>([]);
 const yesterday = new Date();
 yesterday.setDate(yesterday.getDate() - 1);
-const maxDate = ref(timeFormat(yesterday, 'YYYY-MM-DD'));
-const minDate = '2026-01-06';
+const maxDate = ref(timeFormat(yesterday, 'yyyy-mm-dd'));
+// const minDate = '2026-01-06';
 const isDatePickerOpen = ref(false);
 const handlePopupShow = () => {
   isDatePickerOpen.value = true;
@@ -365,23 +350,12 @@ const fetchOrgIndicator = async (orgId: number, beginDate: string, endDate: stri
     });
     console.log('orgTaskIndicator 返回：', res);
     baseList.value = [
-      {
-        num: String(res.totalCnt ?? 0),
-        title: '应办任务数'
-      },
-      {
-        num: String(res.doneCnt ?? 0),
-        title: '已办任务数'
-      },
-      {
-        num: String(res.pendingCnt ?? 0),
-        title: '待办任务数'
-      },
-      {
-        num: String(res.overdueCnt ?? 0),
-        title: '超时未完成'
-      }
+      { num: String(res.totalCnt ?? 0), title: '应办任务数', name: 'file-text' },
+      { num: String(res.doneCnt ?? 0), title: '已办任务数', name: 'checkmark-circle' },
+      { num: String(res.pendingCnt ?? 0), title: '待办任务数', name: 'clock' },
+      { num: String(res.overdueCnt ?? 0), title: '超时未完成', name: 'close-circle' }
     ];
+
   } catch (err) {
     console.error('orgTaskIndicator 请求失败：', err);
   }
@@ -393,11 +367,13 @@ const initRecent7Days = () =&gt; {
   const end = new Date(now);
   end.setDate(end.getDate() - 1);
   const start = new Date(end);
+  console.log(start)
   start.setDate(start.getDate() - 6);
   dateRange.value = [
-    timeFormat(start, 'YYYY-MM-DD'),
-    timeFormat(end, 'YYYY-MM-DD')
+    timeFormat(start, 'yyyy-mm-dd'),
+    timeFormat(end, 'yyyy-mm-dd')
   ];
+  console.log(dateRange.value)
   initChartData(dateRange.value[0], dateRange.value[1]);
 };
  
@@ -640,17 +616,21 @@ $border-color: #e5e5e5;
     font-size: 16px;
     margin-bottom: 4px;
   }
+
   .login-desc {
     font-size: 16px;
   }
+
   .msg-icon {
     position: relative;
     padding: 5px;
     top: 10px;
     border-radius: 50%;
+
     &--hover {
       background-color: rgba(255, 255, 255, 0.2);
     }
+
     .msg-badge {
       position: absolute;
       top: -2px;
@@ -675,6 +655,7 @@ $border-color: #e5e5e5;
   opacity: 1;
   overflow: hidden;
 }
+
 .chart-wrap[hidden] {
   opacity: 0;
   height: 0;
@@ -695,6 +676,7 @@ $border-color: #e5e5e5;
   margin: 0 $spacing-lg $spacing-md;
   padding: $spacing-md;
   flex-shrink: 0;
+
   .card-header {
     display: flex;
     justify-content: space-between;
@@ -702,16 +684,19 @@ $border-color: #e5e5e5;
     font-size: 12px;
     color: $text-color-placeholder;
     margin-bottom: $spacing-md;
+
     .date-picker-wrap {
       border-radius: 3px;
       transition: background-color 0.2s;
       position: relative;
       z-index: 999;
+
       &:active {
         background-color: $bg-color;
       }
     }
   }
+
   .chart-container {
     width: 100%;
     height: 150px;
@@ -720,6 +705,7 @@ $border-color: #e5e5e5;
     justify-content: center;
   }
 }
+
 .con-wrap {
   border-radius: 8px;
   background-color: #fff;
@@ -758,6 +744,7 @@ $border-color: #e5e5e5;
   transition: all 0.2s ease;
   font-weight: 500;
 }
+
 .tab-capsule.active {
   color: #d4af37;
   background: #fff8dc;
@@ -775,7 +762,7 @@ $border-color: #e5e5e5;
 }
  
 .tip-top {
-  padding: 8px 0  0 70px;
+  padding: 8px 0 0 70px;
   flex-shrink: 0;
 }
  
@@ -789,6 +776,7 @@ $border-color: #e5e5e5;
 .empty-box {
   padding: 60rpx 0;
 }
+
 .sort-trigger {
   display: flex;
   align-items: center;
@@ -801,36 +789,44 @@ $border-color: #e5e5e5;
   padding: $spacing-md;
   transition: background-color 0.2s;
   border-bottom: 1px solid $border-color;
+
   &:last-child {
     border-bottom: none;
   }
+
   &--hover {
     background-color: $bg-color;
   }
+
   &__content {
     width: 100%;
   }
+
   .name-fixed-wrap {
     display: flex;
   }
+
   .task-item__name {
     width: 60px;
   }
- .task-name-text {
-  flex: 1;
-  font-size: 14px;
-  color: $text-color;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+
+  .task-name-text {
+    flex: 1;
+    font-size: 14px;
+    color: $text-color;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
   &__name {
     font-size: 15px;
     color: $text-color;
     display: inline-block;
   }
+
   &__footer {
     display: flex;
     align-items: flex-start;
@@ -841,6 +837,7 @@ $border-color: #e5e5e5;
     align-items: center;
   }
 }
+
 .loc-icon {
   width: 20px;
   height: 20px;
@@ -849,4 +846,23 @@ $border-color: #e5e5e5;
 .urgency-tag {
   color: #7D7D7D;
 }
+
+.grid-item-icon-box {
+  display:flex;
+  flex-direction:column;
+  align-items:center;
+  padding:16rpx;
+}
+.grid-num-icon {
+  font-size:40rpx;
+  font-weight:600;
+  color:#333;
+  margin-top:8rpx;
+}
+.grid-label-icon {
+  font-size:22rpx;
+  color:#666;
+  margin-top:4rpx;
+}
+
 </style>
 \ No newline at end of file
 <template>
-	<u-popup
-		:show="show"
-		mode="bottom"
-		:overlay="overlay"
-		:duration="duration"
-		:overlayStyle="overlayStyle"
-		:overlayOpacity="overlayOpacity"
-		:zIndex="zIndex"
-		:safeAreaInsetBottom="safeAreaInsetBottom"
-		:safeAreaInsetTop="safeAreaInsetTop"
-		:bgColor="bgColor"
-		:closeable="!pageInline"
+	<up-popup 
+		:show="popupShow" 
+		mode="bottom" 
+		:popup="false"
+		:mask="true" 
+		:closeable="closeable" 
+		:safe-area-inset-bottom="true"
+		:close-icon-color="closeIconColor" 
+		:z-index="uZIndex"
+		:maskCloseAble="maskCloseAble" 
 		@close="close"
-		@closed="$emit('closed')"
-		:round="round"
-		:pageInline="pageInline"
-		:closeOnClickOverlay="closeOnClickOverlay"
 	>
-		<view class="u-calendar">
-			<uHeader
-				:title="title"
-				:subtitle="subtitle"
-				:showSubtitle="showSubtitle"
-				:showTitle="showTitle"
-				:weekText="weekText"
-				:showSwitch="monthSwitch"
-				:showToday="showToday"
-				:todayText="todayText"
-				:todayDisabled="todayDisabled"
-				:prevDisabled="switchPrevDisabled"
-				:nextDisabled="switchNextDisabled"
-				:prevYearDisabled="switchPrevYearDisabled"
-				:nextYearDisabled="switchNextYearDisabled"
-				@prev="prevMonth"
-				@next="nextMonth"
-				@prevYear="prevYear"
-				@nextYear="nextYear"
-				@today="jumpToToday"
-			></uHeader>
-			<view v-if="showTimePanel" class="u-calendar__time-panel">
-				<view v-if="mode === 'single'" class="u-calendar__time-row">
-					<text class="u-calendar__time-date">{{ singleDateLabel }}</text>
-					<view class="u-calendar__time-trigger" @click="openTimePicker('single')">
-						<text class="u-calendar__time-text">{{ singleTime }}</text>
-					</view>
-				</view>
-				<view v-else-if="mode === 'range' && rangeResultMode === 'boundary'">
-					<view class="u-calendar__time-row">
-						<text class="u-calendar__time-date">{{ rangeStartDateLabel }}</text>
-						<view class="u-calendar__time-trigger" @click="openTimePicker('start')">
-							<text class="u-calendar__time-text">{{ rangeStartTime }}</text>
-						</view>
-					</view>
-					<view class="u-calendar__time-row">
-						<text class="u-calendar__time-date">{{ rangeEndDateLabel }}</text>
-						<view class="u-calendar__time-trigger" @click="openTimePicker('end')">
-							<text class="u-calendar__time-text">{{ rangeEndTime }}</text>
+		<view class="up-p-t-30 up-p-l-20 up-m-b-10" v-if="headerDirection ==='column'">
+			<up-steps v-if="popupShow" dot direction="column" v-model:current="tabsIndex">
+                <view  v-for="(item, index) in genTabsList"  @click="toFatherIndex(index)">
+                    <up-steps-item :title="item.name"/>
+                </view>
+			</up-steps>
+		</view>
+		<view class="up-p-t-20 up-m-b-10" v-else>
+			<up-tabs 
+				v-if="popupShow" 
+				:list="genTabsList"
+				:scrollable="true" 
+				v-model:current="tabsIndex" 
+				@change="tabsChange" 
+				ref="tabs"
+			></up-tabs>
+		</view>
+		<view class="area-box">
+			<view class="u-flex" :class="{ 'change':isChange }"
+				:style="{transform: optionsCols == 2 && isChange ? 'translateX(-33.3333333%)' : ''}">
+				<template v-for="(levelData, levelIndex) in levelList" :key="levelIndex">
+					<view 
+						v-if="optionsCols == 2 || levelIndex == tabsIndex" 
+						class="area-item"
+						:style="{ width: optionsCols == 2 ? '33.33333%' : '750rpx'}"
+					>
+						<view class="u-padding-10" :style="[levelPaneStyle, { height: '100%' }]">
+							<scroll-view :scroll-y="true" style="height: 100%">
+								<up-cell-group v-if="levelIndex === 0 || selectedValueIndexs[levelIndex - 1] !== undefined">
+									<up-cell 
+										v-for="(item,index) in levelData"
+										:title="item[labelKey]" 
+										:arrow="false"
+										:index="index" 
+										:key="index"
+										@click="levelChange(levelIndex, index)"
+									>
+										<template v-slot:right-icon>
+											<up-icon 
+												v-if="selectedValueIndexs[levelIndex] === index"
+												size="17" 
+												name="checkbox-mark"
+											></up-icon>
+										</template>
+									</up-cell>
+								</up-cell-group>
+							</scroll-view>
 						</view>
 					</view>
-				</view>
+				</template>
 			</view>
-			<scroll-view
-				v-if="!monthSwitch"
-				:style="{
-                    height: addUnit(listHeight, 'px')
-                }"
-				scroll-y
-				@scroll="onScroll"
-				:scroll-top="scrollTop"
-				:scrollIntoView="scrollIntoView"
-			>
-				<uMonth
-					:color="color"
-					:rowHeight="rowHeight"
-					:showMark="showMark"
-					:months="months"
-					:mode="mode"
-					:maxCount="maxCount"
-					:startText="startText"
-					:endText="endText"
-					:defaultDate="defaultDate"
-					:minDate="innerMinDate"
-					:maxDate="innerMaxDate"
-					:maxMonth="monthNum"
-					:readonly="readonly"
-					:maxRange="maxRange"
-					:rangePrompt="rangePrompt"
-					:showRangePrompt="showRangePrompt"
-					:allowSameDay="allowSameDay"
-					:forbidDays="forbidDays"
-					:forbidDaysToast="forbidDaysToast"
-					:monthFormat="monthFormat"
-					:todayDate="todayDate"
-					:todayColor="todayColor"
-					ref="month"
-					@monthSelected="monthSelected"
-					@updateMonthTop="onUpdateMonthTop"
-				></uMonth>
-			</scroll-view>
-			<view
-				v-else
-				:style="{
-                    height: addUnit(listHeight, 'px')
-                }"
-			>
-				<uMonth
-					:color="color"
-					:rowHeight="rowHeight"
-					:showMark="showMark"
-					:months="currentMonths"
-					:mode="mode"
-					:maxCount="maxCount"
-					:startText="startText"
-					:endText="endText"
-					:defaultDate="defaultDate"
-					:minDate="innerMinDate"
-					:maxDate="innerMaxDate"
-					:maxMonth="monthNum"
-					:readonly="readonly"
-					:maxRange="maxRange"
-					:rangePrompt="rangePrompt"
-					:showRangePrompt="showRangePrompt"
-					:allowSameDay="allowSameDay"
-					:forbidDays="forbidDays"
-					:forbidDaysToast="forbidDaysToast"
-					:monthFormat="monthFormat"
-					:todayDate="todayDate"
-					:todayColor="todayColor"
-					ref="month"
-					@monthSelected="monthSelected"
-					@updateMonthTop="onUpdateMonthTop"
-				></uMonth>
-			</view>
-			<slot name="footer" v-if="showConfirm">
-				<view class="u-calendar__confirm">
-					<u-button
-						shape="circle"
-						:text="
-                            buttonDisabled ? confirmDisabledText : confirmText
-                        "
-						:color="color"
-						@click="confirm"
-						:disabled="buttonDisabled"
-					></u-button>
-				</view>
-			</slot>
 		</view>
-	</u-popup>
-	<u-popup
-		:show="timePickerShow"
-		mode="center"
-		:round="8"
-		:closeOnClickOverlay="true"
-		@close="closeTimePicker"
-	>
-		<view class="u-calendar__time-picker">
-			<view class="u-calendar__time-picker__header">
-				<text class="u-calendar__time-picker__cancel" @click="closeTimePicker">取消</text>
-				<text class="u-calendar__time-picker__title">选择时间</text>
-				<text class="u-calendar__time-picker__confirm" @click="confirmTimePicker">确定</text>
+		<!-- 按钮区域 -->
+		<view class="u-cascader-action up-flex up-flex-between">
+			<view class="u-padding-20 up-flex-fill">
+				<up-button @click="handleCancel" type="default">{{ t("up.common.cancel") }}</up-button>
+			</view>
+			<view class="u-padding-20 up-flex-fill">
+				<up-button @click="handleConfirm" type="primary">{{ t("up.common.confirm") }}</up-button>
 			</view>
-			<picker-view class="u-calendar__time-picker__body" :value="timePickerValue" @change="onTimePickerChange">
-				<picker-view-column>
-					<view v-for="(item, index) in hourOptions" :key="`h-${index}`" class="u-calendar__time-picker__item">{{ item }}</view>
-				</picker-view-column>
-				<picker-view-column v-if="timePrecision !== 'hour'">
-					<view v-for="(item, index) in minuteOptions" :key="`m-${index}`" class="u-calendar__time-picker__item">{{ item }}</view>
-				</picker-view-column>
-				<picker-view-column v-if="timePrecision === 'second'">
-					<view v-for="(item, index) in secondOptions" :key="`s-${index}`" class="u-calendar__time-picker__item">{{ item }}</view>
-				</picker-view-column>
-			</picker-view>
 		</view>
-	</u-popup>
+	</up-popup>
 </template>
  
 <script>
-import uHeader from './header.vue'
-import uMonth from './month.vue'
-import { props } from './props.js'
-import util from './util.js'
-import dayjs from '../u-datetime-picker/dayjs.esm.min.js';
-import Calendar from '../../libs/util/calendar.js'
-import { mpMixin } from '../../libs/mixin/mpMixin.js'
-import { mixin } from '../../libs/mixin/mixin.js'
-import { addUnit, getPx, range, error, padZero } from '../../libs/function/index';
-import test from '../../libs/function/test';
 import { t } from '../../libs/i18n'
-/**
- * Calendar 日历
- * @description  此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中.
- * @tutorial https://uview-plus.jiangruyi.com/components/calendar.html
- *
- * @property {String}				title				标题内容 (默认 日期选择 )
- * @property {Boolean}				showTitle			是否显示标题  (默认 true )
- * @property {Boolean}				showSubtitle		是否显示副标题	(默认 true )
- * @property {String}				mode				日期类型选择  single-选择单个日期，multiple-可以选择多个日期，range-选择日期范围 （ 默认 'single' )
- * @property {String}				startText			mode=range时，第一个日期底部的提示文字  (默认 '开始' )
- * @property {String}				endText				mode=range时，最后一个日期底部的提示文字 (默认 '结束' )
- * @property {Array}				customList			自定义列表
- * @property {String}				color				主题色，对底部按钮和选中日期有效  (默认 ‘#3c9cff' )
- * @property {String | Number}		minDate				最小的可选日期	 (默认 0 )
- * @property {String | Number}		maxDate				最大可选日期  (默认 0 )
- * @property {Array | String| Date}	defaultDate			默认选中的日期，mode为multiple或range是必须为数组格式
- * @property {String | Number}		maxCount			mode=multiple时，最多可选多少个日期  (默认 	Number.MAX_SAFE_INTEGER  )
- * @property {String | Number}		rowHeight			日期行高 (默认 56 )
- * @property {Function}				formatter			日期格式化函数
- * @property {Boolean}				showLunar			是否显示农历  (默认 false )
- * @property {Boolean}				showMark			是否显示月份背景色 (默认 true )
- * @property {String}				confirmText			确定按钮的文字 (默认 '确定' )
- * @property {String}				confirmDisabledText	确认按钮处于禁用状态时的文字 (默认 '确定' )
- * @property {Boolean}				show				是否显示日历弹窗 (默认 false )
- * @property {Boolean}				overlay				是否显示遮罩 (默认 true )
- * @property {String | Number}		duration			动画时长，单位ms (默认 300 )
- * @property {Object | String}		overlayStyle		自定义遮罩的样式
- * @property {Number | String}		overlayOpacity		遮罩透明度，0-1之间 (默认 0.5 )
- * @property {String | Number}		zIndex				弹出层的z-index值 (默认 10075 )
- * @property {Boolean}				safeAreaInsetBottom	是否留出底部安全距离 (默认 true )
- * @property {Boolean}				safeAreaInsetTop	是否留出顶部安全距离（状态栏高度） (默认 false )
- * @property {String}				bgColor				弹窗背景色，设置为transparent可去除白色背景
- * @property {Boolean}				closeOnClickOverlay	是否允许点击遮罩关闭日历 (默认 false )
- * @property {Boolean}				readonly	        是否为只读状态，只读状态下禁止选择日期 (默认 false )
- * @property {String | Number}		maxRange	        日期区间最多可选天数，默认无限制，mode = range时有效
- * @property {String}				rangePrompt	        范围选择超过最多可选天数时的提示文案，mode = range时有效
- * @property {Boolean}				showRangePrompt	    范围选择超过最多可选天数时，是否展示提示文案，mode = range时有效 (默认 true )
- * @property {Boolean}				allowSameDay	    是否允许日期范围的起止时间为同一天，mode = range时有效 (默认 false )
- * @property {String}				rangeResultMode	    区间模式下确认返回值格式，all-返回区间内所有日期，boundary-仅返回起止日期 (默认 'all' )
- * @property {Boolean}				enableTime			是否开启时分秒选择 (默认 false )
- * @property {String}				timePrecision		时间精度，hour-仅时，minute-时分，second-时分秒 (默认 'minute' )
- * @property {String}				defaultTime			默认时间，支持HH/HH:mm/HH:mm:ss，不传则按00:00补齐
- * @property {Number|String}	    round				圆角值，默认无圆角  (默认 0 )
- * @property {Number|String}	    monthNum			最多展示的月份数量  (默认 3 )
- * @property {Boolean}	            monthSwitch			是否启用非滚动的单月切换模式  (默认 false )
- * @property {String}	            todayColor			今天日期的独立高亮颜色，默认跟随主题色
- * @property {Array}	            weekText			星期文案  (默认 ['一', '二', '三', '四', '五', '六', '日'] )
- *
- * @event {Function()} confirm 		点击确定按钮时触发		选择日期相关的返回参数
- * @event {Function()} close 		日历关闭时触发			可定义页面关闭时的回调事件
- * @event {Function()} closed 	日历已关闭（离场动画结束、弹窗真正消失后）触发
- * @example <u-calendar  :defaultDate="defaultDateMultiple" :show="show" mode="multiple" @confirm="confirm">
-	</u-calendar>
- * */
 export default {
-	name: 'u-calendar',
-	mixins: [mpMixin, mixin, props],
-	components: {
-		uHeader,
-		uMonth
-	},
-	data() {
-		return {
-			// 需要显示的月份的数组
-			months: [],
-			// 在月份滚动区域中，当前视图中月份的index索引
-			monthIndex: 0,
-			// 月份滚动区域的高度
-			listHeight: 0,
-			// month组件中选择的日期数组
-			selected: [],
-			scrollIntoView: '',
-			scrollIntoViewScroll: '',
-			scrollTop:0,
-			timePickerShow: false,
-			timePickerTarget: 'single',
-			timePickerValue: [0, 0, 0],
-			hourOptions: [],
-			minuteOptions: [],
-			secondOptions: [],
-			singleTime: '00:00',
-			rangeStartTime: '00:00',
-			rangeEndTime: '00:00',
-			// 过滤处理方法
-			innerFormatter: (value) => value
-		}
-	},
-	watch: {
-		scrollIntoView: {
-			immediate: true,
-			handler(n) {
-				// console.log('scrollIntoView', n)
-			}
-		},
-		selectedChange: {
-			immediate: true,
-			handler(n) {
-				this.setMonth()
-			}
-		},
-		timePrecision() {
-			this.initTimeOptions()
-			this.initTimeValues()
-		},
-		defaultTime() {
-			this.initTimeValues()
-		},
-		// 打开弹窗时，设置月份数据
+	name: 'up-cascader',
+	props: {
 		show: {
-			immediate: true,
-			handler(n) {
-				if (n) {
-					this.setMonth()
-					// 弹层每次打开都会重新挂载并滚动回默认月份，副标题指向的月份索引要一起复位，
-					// 否则会沿用上一次关闭前滚动到的月份，导致副标题与日历内容对应不上。
-					// 页面内模式的内容一直挂载着，滚动位置不会重置，所以不做处理
-					if (!this.pageInline) {
-						this.monthIndex = this.getDefaultMonthIndex()
-					}
-				} else {
-					// 关闭时重置scrollIntoView，否则会出现二次打开日历，当前月份数据显示不正确。
-					// scrollIntoView需要有一个值变动过程，才会产生作用。
-					this.scrollIntoView = ''
-				}
-			}
-		}
-	},
-	computed: {
-		// 由于maxDate和minDate可以为字符串(2021-10-10)，或者数值(时间戳)，但是dayjs如果接受字符串形式的时间戳会有问题，这里进行处理
-		innerMaxDate() {
-			return test.number(this.maxDate)
-				? Number(this.maxDate)
-				: this.maxDate
+			type: Boolean,
+			default: false
 		},
-		innerMinDate() {
-			return test.number(this.minDate)
-				? Number(this.minDate)
-				: this.minDate
-		},
-		todayDate() {
-			return dayjs().format('YYYY-MM-DD')
-		},
-		todayText() {
-			return t('up.calendar.today')
-		},
-		todayDisabled() {
-			const today = dayjs(this.todayDate)
-			const minDate = this.innerMinDate
-				? dayjs(this.innerMinDate)
-				: null
-			const maxDate = this.innerMaxDate
-				? dayjs(this.innerMaxDate)
-				: null
-			if (minDate && today.isBefore(minDate, 'day')) {
-				return true
-			}
-			if (maxDate && today.isAfter(maxDate, 'day')) {
-				return true
-			}
-			return false
-		},
-		// 多个条件的变化，会引起选中日期的变化，这里统一管理监听
-		selectedChange() {
-			return [this.innerMinDate, this.innerMaxDate, this.defaultDate]
-		},
-		subtitle() {
-			// 初始化时，this.months为空数组，所以需要特别判断处理
-			if (this.months.length) {
-				if (uni.getLocale() == 'zh-Hans' || uni.getLocale() == 'zh-Hant') {
-					return this.months[this.monthIndex].year + '年' + (this.months[this.monthIndex].month < 10 ? '0' + this.months[this.monthIndex].month : this.months[this.monthIndex].month) + '月'
-				} else {
-					return (this.months[this.monthIndex].month < 10 ? '0' + this.months[this.monthIndex].month : this.months[this.monthIndex].month) + '/' + this.months[this.monthIndex].year
-				}
-			} else {
-				return ''
+		data: {
+			type: Array,
+			default() {
+				return [];
 			}
 		},
-		currentMonths() {
-			if (this.monthSwitch && this.months.length) {
-				return [this.months[this.monthIndex]]
+		modelValue: {
+			type: Array,
+			default() {
+				return [];
 			}
-			return this.months
 		},
-		switchPrevDisabled() {
-			return this.monthIndex <= 0
+		valueKey: {
+			type: String,
+			default: 'value'
 		},
-		switchNextDisabled() {
-			return this.monthIndex >= this.months.length - 1
+		labelKey: {
+			type: String,
+			default: 'label'
 		},
-		switchPrevYearDisabled() {
-			return this.monthIndex - 12 < 0
+		childrenKey: {
+			type: String,
+			default: 'children'
 		},
-		switchNextYearDisabled() {
-			return this.monthIndex + 12 > this.months.length - 1
+		maskCloseAble: {
+			type: Boolean,
+			default: true
 		},
-		showTimePanel() {
-			if (!this.enableTime) return false
-			if (this.mode === 'single') return true
-			if (this.mode === 'range' && this.rangeResultMode === 'boundary') {
-				return true
-			}
-			return false
+		zIndex: {
+			type: [String, Number],
+			default: 0
 		},
-		singleDateLabel() {
-			return this.selected[0] || '--'
+		autoClose: {
+			type: Boolean,
+			default: false
 		},
-		rangeStartDateLabel() {
-			return this.selected[0] || '--'
+		headerDirection: {
+			type: String,
+			default: 'row'
 		},
-		rangeEndDateLabel() {
-			if (this.selected.length >= 2) {
-				return this.selected[this.selected.length - 1]
-			}
-			return '--'
+		optionsCols: {
+			type: [Number],
+			default: 2
 		},
-		buttonDisabled() {
-			// 如果为range类型，且选择的日期个数不足1个时，让底部的按钮出于disabled状态
-			if (this.mode === 'range') {
-				if (this.selected.length <= 1) {
-					return true
-				} else {
-					return false
-				}
-			} else {
-				return false
-			}
+		closeable: {
+			type: Boolean,
+			default: true
 		}
 	},
-	mounted() {
-		this.start = Date.now()
-		this.init()
+	data() {
+		return {
+			levelList: [],
+			selectedValueIndexs: [],
+			tabsIndex: 0,
+			popupShow: false,
+			confirmValues: []
+		}
 	},
-	emits: ["confirm", "close", "closed"],
-	methods: {
-		addUnit,
-		padTime(num) {
-			return String(num).padStart(2, '0')
-		},
-		initTimeOptions() {
-			this.hourOptions = Array.from({ length: 24 }, (_, i) => this.padTime(i))
-			this.minuteOptions = Array.from({ length: 60 }, (_, i) => this.padTime(i))
-			this.secondOptions = Array.from({ length: 60 }, (_, i) => this.padTime(i))
-		},
-		parseTimeValue(value = '') {
-			const raw = String(value || '').trim()
-			const parts = raw.length ? raw.split(':') : []
-			const getNumber = (index, max) => {
-				const current = Number(parts[index] || 0)
-				if (Number.isNaN(current)) return 0
-				return Math.max(0, Math.min(max, current))
-			}
-			const hour = getNumber(0, 23)
-			const minute = getNumber(1, 59)
-			const second = getNumber(2, 59)
-			return [hour, minute, second]
-		},
-		getDefaultTimeValue() {
-			const [hour, minute, second] = this.parseTimeValue(this.defaultTime)
-			if (this.timePrecision === 'hour') {
-				return this.padTime(hour)
-			}
-			if (this.timePrecision === 'second') {
-				return `${this.padTime(hour)}:${this.padTime(minute)}:${this.padTime(second)}`
-			}
-			return `${this.padTime(hour)}:${this.padTime(minute)}`
-		},
-		initTimeValues() {
-			const value = this.getDefaultTimeValue()
-			this.singleTime = value
-			this.rangeStartTime = value
-			this.rangeEndTime = value
-		},
-		timeToPickerValue(value = '') {
-			const [hour, minute, second] = this.parseTimeValue(value)
-			return [hour, minute, second]
-		},
-		pickerValueToTime(value = []) {
-			const hour = Number(value[0] || 0)
-			const minute = Number(value[1] || 0)
-			const second = Number(value[2] || 0)
-			if (this.timePrecision === 'hour') {
-				return this.padTime(hour)
-			}
-			if (this.timePrecision === 'second') {
-				return `${this.padTime(hour)}:${this.padTime(minute)}:${this.padTime(second)}`
-			}
-			return `${this.padTime(hour)}:${this.padTime(minute)}`
-		},
-		openTimePicker(target) {
-			this.timePickerTarget = target
-			let currentValue = this.singleTime
-			if (target === 'start') currentValue = this.rangeStartTime
-			if (target === 'end') currentValue = this.rangeEndTime
-			this.timePickerValue = this.timeToPickerValue(currentValue)
-			this.timePickerShow = true
-		},
-		onTimePickerChange(e) {
-			this.timePickerValue = e.detail.value
-		},
-		closeTimePicker() {
-			this.timePickerShow = false
-		},
-		confirmTimePicker() {
-			const value = this.pickerValueToTime(this.timePickerValue)
-			if (this.timePickerTarget === 'single') this.singleTime = value
-			if (this.timePickerTarget === 'start') this.rangeStartTime = value
-			if (this.timePickerTarget === 'end') this.rangeEndTime = value
-			this.timePickerShow = false
-		},
-		timeToSecond(timeText = '') {
-			const [hour, minute, second] = this.parseTimeValue(timeText)
-			return hour * 3600 + minute * 60 + second
-		},
-		validateSameDayRangeTime() {
-			if (!this.enableTime || this.mode !== 'range' || this.rangeResultMode !== 'boundary') {
-				return true
-			}
-			if (this.selected.length < 2) return true
-			const startDate = this.selected[0]
-			const endDate = this.selected[this.selected.length - 1]
-			if (startDate !== endDate) return true
-			const startSeconds = this.timeToSecond(this.rangeStartTime)
-			const endSeconds = this.timeToSecond(this.rangeEndTime)
-			if (endSeconds < startSeconds) {
-				uni.showToast({
-					title: '结束时间不能早于开始时间',
-					icon: 'none'
-				})
-				return false
-			}
-			return true
-		},
-		appendTime(dateText, timeText) {
-			return `${dateText} ${timeText}`
-		},
-		getConfirmValue(selected = this.selected) {
-			let result = selected
-			if (
-				this.mode === 'range' &&
-				this.rangeResultMode === 'boundary' &&
-				selected.length >= 2
-			) {
-				const len = selected.length - 1
-				result = [selected[0], selected[len]]
-			}
-			if (!this.showTimePanel || !this.enableTime) {
-				return result
-			}
-			if (this.mode === 'single' && result.length >= 1) {
-				return [this.appendTime(result[0], this.singleTime)]
-			}
-			if (this.mode === 'range' && this.rangeResultMode === 'boundary' && result.length >= 2) {
-				return [
-					this.appendTime(result[0], this.rangeStartTime),
-					this.appendTime(result[1], this.rangeEndTime)
-				]
-			}
-			return result
-		},
-		// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
-		setFormatter(e) {
-			this.innerFormatter = e
-		},
-		// month组件内部选择日期后，通过事件通知给父组件
-		monthSelected(e,scene ='init') {
-			this.selected = e
-			if (!this.showConfirm) {
-				// 在不需要确认按钮的情况下，如果为单选，或者范围多选且已选长度大于2，则直接进行返还
-				if (
-					this.mode === 'multiple' ||
-					this.mode === 'single' ||
-					(this.mode === 'range' && this.selected.length >= 2)
-				) {
-				   if( scene === 'init'){
-					 return
-				   }
-				   if( scene === 'tap') {
-					 if (!this.validateSameDayRangeTime()) return
-					 this.$emit('confirm', this.getConfirmValue())
-				   }
-				}
-			}
-		},
-		init() {
-			// 校验maxDate，不能小于minDate。
-			if (
-				this.innerMaxDate &&
-                this.innerMinDate &&
-				new Date(this.innerMaxDate).getTime() < new Date(this.innerMinDate).getTime()
-			) {
-				return error('maxDate不能小于minDate时间')
-			}
-			// 滚动区域的高度
-			let bottomPadding = 0;
-			if (this.pageInline) {
-				bottomPadding = 0
-			} else {
-				bottomPadding = 30
-			}
-			this.listHeight = this.rowHeight * (this.monthSwitch ? 6 : 5) + bottomPadding
-			this.initTimeOptions()
-			this.initTimeValues()
-			this.setMonth()
-		},
-		close() {
-			this.$emit('close')
-		},
-		// 点击确定按钮
-		confirm() {
-			if (!this.buttonDisabled) {
-				if (!this.validateSameDayRangeTime()) return
-				this.$emit('confirm', this.getConfirmValue())
-			}
-		},
-		// 获得两个日期之间的月份数
-		getMonths(minDate, maxDate) {
-			const minYear = dayjs(minDate).year()
-			const minMonth = dayjs(minDate).month() + 1
-			const maxYear = dayjs(maxDate).year()
-			const maxMonth = dayjs(maxDate).month() + 1
-			return (maxYear - minYear) * 12 + (maxMonth - minMonth) + 1
+	watch: {
+		data: {
+			handler() {
+				this.initLevelList();
+				this.setDefaultValue();
+			},
+			immediate: true
 		},
-		// 设置月份数据
-		setMonth() {
-			// 最小日期的毫秒数
-			const minDate = this.innerMinDate || dayjs().valueOf()
-			// 如果没有指定最大日期，则往后推3个月
-			const maxDate =
-				this.innerMaxDate ||
-				dayjs(minDate)
-					.add(this.monthNum - 1, 'month')
-					.valueOf()
-			// 最大最小月份之间的共有多少个月份，
-			const months = range(
-				1,
-				this.monthNum,
-				this.getMonths(minDate, maxDate)
-			)
-			// 记录上一次测量到的各月份top值，月份未发生变化时高度也不会变，
-			// 复用后可避免重新生成数据后onScroll没有判断依据
-			const topCache = {}
-			this.months.forEach(item => {
-				if (typeof item.top === 'number') {
-					topCache[`${item.year}-${item.month}`] = item.top
-				}
-			})
-			// 先清空数组
-			this.months = []
-			// 最大最小日期只需格式化一次，YYYY-MM-DD的字典序即时间序，可直接比较字符串
-			const minDateStr = dayjs(minDate).format('YYYY-MM-DD')
-			const maxDateStr = dayjs(maxDate).format('YYYY-MM-DD')
-			const formatter = this.formatter || this.innerFormatter
-			for (let i = 0; i < months; i++) {
-				// 每个月只构造一个dayjs对象，当月的日期数据都由它派生，
-				// 避免按天重复解析（monthNum较大时这里是主要开销）
-				const monthStart = dayjs(minDate).add(i, 'month')
-				const monthValue = monthStart.month() + 1
-				this.months.push({
-					date: new Array(monthStart.daysInMonth())
-						.fill(1)
-						.map((item, index) => {
-							// 日期，取值1-31
-							let day = index + 1
-							const current = monthStart.date(day)
-							// 星期，0-6，0为周日
-							const week = current.day()
-							const date = current.format('YYYY-MM-DD')
-							let bottomInfo = ''
-							if (this.showLunar) {
-								// 将日期转为农历格式
-								const lunar = Calendar.solar2lunar(
-									current.year(),
-									monthValue,
-									day
-								)
-								bottomInfo = lunar.IDayCn
-							}
-							let config = {
-								day,
-								week,
-								// 小于最小允许的日期，或者大于最大的日期，则设置为disabled状态
-								disabled:
-									date < minDateStr || date > maxDateStr,
-								// 返回一个日期对象，供外部的formatter获取当前日期的年月日等信息，进行加工处理
-								date: new Date(date),
-								// 已格式化好的日期字符串，供month组件比较使用，
-								// 省掉渲染期对每个日期格子的重复解析
-								dateStr: date,
-								bottomInfo,
-								dot: false,
-								month: monthValue
-							}
-							return formatter(config)
-						}),
-					// 当前所属的月份
-					month: monthValue,
-					// 当前年份
-					year: monthStart.year()
-				})
-			}
-			this.months.forEach(item => {
-				const cachedTop = topCache[`${item.year}-${item.month}`]
-				if (typeof cachedTop === 'number') {
-					item.top = cachedTop
+		show: {
+			handler(val) {
+				this.popupShow = val;
+				if (val) {
+					this.tabsIndex = 0;
+					this.initLevelList();
+					this.setDefaultValue();
 				}
-			})
-			if (this.monthSwitch) {
-				this.monthIndex = this.getDefaultMonthIndex()
-			}
-		},
-		getDefaultMonthIndex() {
-			let selected = dayjs().format('YYYY-MM')
-			if (this.defaultDate) {
-				if (!test.array(this.defaultDate)) {
-					selected = dayjs(this.defaultDate).format('YYYY-MM')
-				} else if (this.defaultDate.length) {
-					selected = dayjs(this.defaultDate[0]).format('YYYY-MM')
+			},
+			immediate: true
+		},
+		modelValue: {
+			handler() {
+				this.setDefaultValue();
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		isChange() {
+			return this.tabsIndex > 1;
+		},
+		genTabsList() {
+			let tabsList = [{ name: "请选择" }];
+			for (let i = 0; i < this.selectedValueIndexs.length; i++) {
+				if (this.selectedValueIndexs[i] !== undefined && this.levelList[i]) {
+					const selectedItem = this.levelList[i][this.selectedValueIndexs[i]];
+					if (selectedItem) {
+						tabsList[i] = { name: selectedItem[this.labelKey] };
+						if (i === this.selectedValueIndexs.length - 1 &&
+							selectedItem[this.childrenKey] &&
+							selectedItem[this.childrenKey].length > 0) {
+							tabsList.push({ name: "请选择" });
+						}
+					}
 				}
 			}
-			const index = this.months.findIndex(({ year, month }) => {
-				return `${year}-${padZero(month)}` === selected
-			})
-			return index === -1 ? 0 : index
+			return tabsList;
 		},
-		prevMonth() {
-			if (!this.switchPrevDisabled) {
-				this.monthIndex -= 1
-			}
-		},
-		nextMonth() {
-			if (!this.switchNextDisabled) {
-				this.monthIndex += 1
-			}
+		uZIndex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
 		},
-		prevYear() {
-			if (!this.switchPrevYearDisabled) {
-				this.monthIndex -= 12
-			}
+		closeIconColor() {
+			return 'var(--up-main-color, #303133)';
 		},
-		nextYear() {
-			if (!this.switchNextYearDisabled) {
-				this.monthIndex += 12
+		levelPaneStyle() {
+			return {
+				backgroundColor: 'var(--up-bg-color, #f7f7f7)'
+			};
+		}
+	},
+	emits: ['update:modelValue', 'update:show', 'change', 'confirm', 'cancel'],
+	methods: {
+		t,
+		// 获取选中值数组
+		getSelectedValues() {
+			const result = [];
+			for (let i = 0; i < this.selectedValueIndexs.length; i++) {
+				const selectedIndex = this.selectedValueIndexs[i];
+				if (selectedIndex === undefined) continue;
+				const list = this.levelList[i];
+				if (!list || !list[selectedIndex]) continue;
+				result.push(list[selectedIndex][this.valueKey]);
+			}
+			return result;
+		},
+		// 判断当前选中项是否为最后一级（叶子节点）
+		isCurrentLeafNode() {
+			const len = this.selectedValueIndexs.length;
+			if (len === 0) return false;
+			const lastLevel = len - 1;
+			const lastIndex = this.selectedValueIndexs[lastLevel];
+			const lastItem = this.levelList[lastLevel]?.[lastIndex];
+			if (!lastItem) return false;
+			// 无子级 = 最后一级
+			return !lastItem[this.childrenKey] || lastItem[this.childrenKey].length === 0;
+		},
+		initLevelList() {
+			if (this.data && this.data.length > 0) {
+				this.levelList = [this.data];
+				this.selectedValueIndexs = [];
+			} else {
+				this.levelList = [];
+				this.selectedValueIndexs = [];
 			}
 		},
-		jumpToToday() {
-			if (this.todayDisabled) {
-				return
+		setDefaultValue() {
+			if (!this.data || this.data.length === 0) {
+				this.confirmValues = [];
+				return;
 			}
-			const targetMonth = dayjs(this.todayDate).format('YYYY-MM')
-			const selectToday = () => {
-				if (this.mode === 'range') {
-					return
-				}
-				this.$refs.month && this.$refs.month.selectDate(this.todayDate)
+			if (!this.modelValue || this.modelValue.length === 0) {
+				this.confirmValues = [];
+				return;
 			}
-			if (this.monthSwitch) {
-				const todayMonthIndex = this.months.findIndex(({ year, month }) => {
-					return `${year}-${padZero(month)}` === targetMonth
-				})
-				if (todayMonthIndex !== -1) {
-					this.monthIndex = todayMonthIndex
-					this.$nextTick(selectToday)
+			this.selectedValueIndexs = [];
+			this.levelList = [];
+			let currentLevelData = this.data;
+
+			for (let i = 0; i < this.modelValue.length; i++) {
+				const value = this.modelValue[i];
+				const index = currentLevelData.findIndex(item => item[this.valueKey] === value);
+				this.levelList[i] = currentLevelData;
+
+				if (index !== -1) {
+					this.selectedValueIndexs.push(index);
+					if (currentLevelData[index][this.childrenKey]) {
+						currentLevelData = currentLevelData[index][this.childrenKey];
+					} else {
+						break;
+					}
+				} else {
+					break;
 				}
-				return
 			}
-			this.scrollIntoDefaultMonth(targetMonth)
-			this.$nextTick(selectToday)
+			this.confirmValues = this.getSelectedValues();
 		},
-		// 滚动到默认设置的月份
-		scrollIntoDefaultMonth(selected) {
-			// 查询默认日期在可选列表的下标
-			const _index = this.months.findIndex(({
-				  year,
-				  month
-			  }) => {
-				month = padZero(month)
-				return `${year}-${month}` === selected
-			})
-			if (_index !== -1) {
-				// 滚动位置是程序主动设置的，同步更新副标题指向的月份索引。
-				// 只依赖scroll事件的话，滚动位置没有真正变化时收不到事件，副标题就会停留在上一次的月份
-				this.monthIndex = _index
-				// #ifndef MP-WEIXIN
-				this.$nextTick(() => {
-					this.scrollIntoView = ''
-					this.scrollIntoView = `month-${_index}`
-					this.scrollIntoViewScroll = this.scrollIntoView
-				})
-				// #endif
-				// #ifdef MP-WEIXIN
-				// scrollTop与scrollIntoView同理，需要有一个值变动过程才会生效，
-				// 否则二次打开日历时沿用上次的数值，scroll-view不会滚动到默认月份
-				const _top = this.months[_index].top || 0;
-				this.scrollTop = 0;
-				if (_top !== 0) {
-					this.$nextTick(() => {
-						this.scrollTop = _top;
-					})
-				}
-				// #endif
-			}
+
+		close() {
+			this.popupShow = false;
+			this.levelList = [];
+			this.selectedValueIndexs = [];
+			this.tabsIndex = 0;
+			this.confirmValues = [];
+			this.$emit('update:show', false);
+			this.$emit('cancel');
 		},
-		// scroll-view滚动监听
-		onScroll(event) {
-			// 不允许小于0的滚动值，如果scroll-view到顶了，继续下拉，会出现负数值
-			const scrollTop = Math.max(0, event.detail.scrollTop)
-			// 月份的top值尚未测量出来时不做判断，否则所有月份的判断阈值相同，
-			// 会把副标题固定到最后一个月份上
-			if (!this.months.some(item => typeof item.top === 'number')) return
-			// 将当前滚动条数值，与各月份的top值比较，可以得出当前滚动到了哪一个月份的索引
-			let monthIndex = 0
-			for (let i = 0; i < this.months.length; i++) {
-				const top = this.months[i].top
-				if (typeof top !== 'number') continue
-				if (scrollTop >= top) {
-					monthIndex = i
+
+		tabsChange(item) {},
+		toFatherIndex(index) {
+			this.tabsIndex = index;
+		},
+		levelChange(levelIndex, index) {
+			this.$set(this.selectedValueIndexs, levelIndex, index);
+			this.selectedValueIndexs.splice(levelIndex + 1);
+			this.tabsIndex = Math.min(this.tabsIndex, levelIndex);
+			this.levelList.splice(levelIndex + 1);
+
+			const currentItem = this.levelList[levelIndex][index];
+			if (currentItem && currentItem[this.childrenKey] && currentItem[this.childrenKey].length > 0) {
+				if (this.levelList.length <= levelIndex + 1) {
+					this.levelList.push(currentItem[this.childrenKey]);
 				} else {
-					break
+					this.$set(this.levelList, levelIndex + 1, currentItem[this.childrenKey]);
+				}
+				this.tabsIndex = levelIndex + 1;
+				// 有子级，不自动确认
+				if (this.autoClose) return;
+			} else {
+				// 已选到最后一级，自动确认
+				if (this.autoClose) {
+					this.handleConfirm();
 				}
 			}
-			this.monthIndex = monthIndex
-			this.scrollIntoViewScroll = `month-${monthIndex}`
 		},
-		// 更新月份的top值
-		onUpdateMonthTop(topArr = []) {
-			if (this.monthSwitch) {
-				return
+		emitChange(closePopup = true) {
+			const result = this.getSelectedValues();
+			this.confirmValues = [...result];
+			this.$emit('change', this.confirmValues);
+			if (closePopup) {
+				this.close();
 			}
-			this.updateMonthTop(topArr)
 		},
-		updateMonthTop(topArr = []) {
-			// 设置对应月份的top值，用于onScroll方法更新月份
-			topArr.map((item, index) => {
-				this.months[index].top = item
-			})
-
-			// 获取默认日期的下标
-			if (!this.defaultDate) {
-				// 如果没有设置默认日期，则将当天日期设置为默认选中的日期
-				const selected = dayjs().format("YYYY-MM")
-				this.scrollIntoDefaultMonth(selected)
-				return
-			}
-			let selected = dayjs().format("YYYY-MM");
-			// 单选模式，可以是字符串或数组，Date对象等
-			if (!test.array(this.defaultDate)) {
-				selected = dayjs(this.defaultDate).format("YYYY-MM")
-			} else {
-				selected = dayjs(this.defaultDate[0]).format("YYYY-MM");
+		handleCancel() {
+			this.close();
+		},
+		handleConfirm() {
+			// 校验：必须选择到最后一级
+			if (!this.isCurrentLeafNode()) {
+				uni.showToast({ title: '请选择到最后一级', icon: 'none' });
+				return;
 			}
-			this.scrollIntoDefaultMonth(selected)
+			const values = this.getSelectedValues();
+			this.confirmValues = [...values];
+			// 向外输出 选中值数组
+			this.$emit('update:modelValue', values);
+			this.$emit('confirm', values);
+			this.close();
 		}
 	}
 }
 </script>
  
-<style lang="scss" scoped>
-.u-calendar {
-	color: var(--up-main-color, $u-main-color);
-	background-color: var(--up-card-bg-color, #ffffff);
-
-	&__time-panel {
-		padding: 8px 16px 0;
-	}
-
-	&__time-row {
-		height: 34px;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 6px;
-	}
-
-	&__time-date {
-		font-size: 13px;
-		color: #303133;
-	}
-
-	&__time-trigger {
-		min-width: 92px;
-		height: 30px;
-		padding: 0 10px;
-		border-radius: 15px;
-		border: 1px solid #dcdfe6;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	&__time-text {
-		font-size: 14px;
-		color: #303133;
-	}
-
-	&__time-picker {
-		width: 320px;
-		background-color: #ffffff;
-		border-radius: 8px;
+<style lang="scss">
+	.area-box {
+		width: 100%;
 		overflow: hidden;
-	}
-
-	&__time-picker__header {
-		height: 44px;
-		padding: 0 14px;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #f0f0f0;
-	}
-
-	&__time-picker__cancel {
-		font-size: 14px;
-		color: #909399;
-	}
+		height: 800rpx;
  
-	&__time-picker__title {
-		font-size: 15px;
-		color: #303133;
-		font-weight: 600;
-	}
+		>view {
+			width: 150%;
+			transition: transform 0.3s ease-in-out 0s;
+			transform: translateX(0);
  
-	&__time-picker__confirm {
-		font-size: 14px;
-		color: #3c9cff;
-	}
-
-	&__time-picker__body {
-		width: 320px;
-		height: 200px;
-	}
+		&.change {
+				transform: translateX(-33.3333333%);
+			}
+		}
  
-	&__time-picker__item {
-		height: 40px;
-		line-height: 40px;
-		text-align: center;
-		font-size: 16px;
-		color: #303133;
+		.area-item {
+			height: 800rpx;
+		}
 	}
  
-	&__confirm {
-		padding: 7px 18px;
+	.u-cascader-action {
+		border-top: 1px solid var(--up-border-color, #eee);
 	}
-}
-</style>
+</style>
 \ No newline at end of file