Merge remote-tracking branch 'origin/dev2.0' into dev2.0

# Conflicts: # App.vue # pages-sub/daily/maintain-manage/index.vue # pages-sub/daily/maintain-manage/now-list-page.vue # pages-sub/daily/maintain-manage/type-list-page.vue # pages-sub/problem/ai-manage/index.vue # pages-sub/problem/regional-order-manage/index.vue # pages-sub/problem/regional-order-manage/list-detail.vue # pages-sub/problem/regional-order-manage/order-detail.vue # pages-sub/problem/work-order-manage/index.vue # pages-sub/problem/work-order-manage/order-detail.vue

Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts: # App.vue # pages-sub/daily/maintain-manage/index.vue # pages-sub/daily/maintain-manage/now-list-page.vue # pages-sub/daily/maintain-manage/type-list-page.vue # pages-sub/problem/ai-manage/index.vue # pages-sub/problem/regional-order-manage/index.vue # pages-sub/problem/regional-order-manage/list-detail.vue # pages-sub/problem/regional-order-manage/order-detail.vue # pages-sub/problem/work-order-manage/index.vue # pages-sub/problem/work-order-manage/order-detail.vue
王彪总
2 parents e93ebf16 9120066c
Showing 7 changed files with 656 additions and 642 deletions
pages-sub/daily/maintain-manage/index.vue
pages-sub/daily/maintain-manage/now-list-page.vue
pages-sub/daily/maintain-manage/type-list-page.vue
pages-sub/problem/ai-manage/index.vue
pages-sub/problem/regional-order-manage/index.vue
pages-sub/problem/regional-order-manage/list-detail.vue
pages-sub/problem/work-order-manage/order-detail.vue
@@ -80,6 +80,20 @@
  
           <template #body>
             <view class="card-body">
+<!--              <view class="">-->
+<!--                <up-button-->
+<!--                    type="primary"-->
+<!--                    size="mini"-->
+<!--                    @click="goToDetail(item)"-->
+<!--                    class="submit-record-btn"-->
+<!--                >-->
+<!--                  计划明细-->
+<!--                </up-button>-->
+<!--              </view>-->
+
+              <view class="common-custom-btn" style="--btn-top: 48px;"  @click="goToDetail(item)">
+                养护任务
+              </view>
 <!--              <view class="u-body-item u-flex">-->
 <!--                <view class="u-body-item-title">批次号：</view>-->
 <!--                <view class="u-line-1 u-body-value">{{ item.batchNo || '-' }}</view>-->
 <template>
-    <view class="page-wrap">
-        <!-- 顶部提示栏 -->
-        <view class="tip-bar" v-if="isView==1" >
-            一个任务可提交多次上报记录，每一次作业需如实上报。
-        </view>
-        <!-- 上报记录列表 -->
-        <view class="list-wrap" v-if="reportList.length > 0">
-            <view class="report-item" v-for="(item, index) in reportList[0].workRecords" :key="index">
-                <view class="item-title">【第{{ item.sortNum || (index + 1) }}次上报】{{ planName }}</view>
-                <view class="item-row item-row-bottom">
-                    <view class="item-time">提交时间：{{ timeFormat(item.createTime,'yyyy-mm-dd hh:MM:ss')}}</view>
-                    <view class="look-btn" @click="handleView(index,item,reportList[0])">查看</view>
-                </view>
-            </view>
-        </view>
-        <!-- 暂无数据 -->
-        <view class="empty-wrap" v-else>
-            <empty-view text="暂无数据"></empty-view>
-        </view>
-        <!-- 底部固定按钮 -->
-        <view class="fixed-bottom-btn-wrap" v-if="isView==1">
-            <up-button type="primary" size="large" block @click="handleAddReport">上报本次记录</up-button>
+  <view class="page-wrap">
+    <!-- 顶部提示栏 -->
+    <view class="tip-bar" v-if="isView==1" >
+      一个任务可提交多次上报记录，每一次作业需如实上报。
+    </view>
+    <!-- 上报记录列表 -->
+    <view class="list-wrap" v-if="reportList.length > 0">
+      <view class="report-item" v-for="(item, index) in reportList[0].workRecords" :key="index">
+        <view class="item-title">【第{{ item.sortNum || (index + 1) }}次上报】{{ planName }}</view>
+        <view class="item-row item-row-bottom">
+          <view class="item-time">提交时间：{{ timeFormat(item.createTime,'yyyy-mm-dd hh:MM:ss')}}</view>
+          <view class="look-btn" @click="handleView(index,item,reportList[0])">查看</view>
         </view>
+      </view>
     </view>
+    <!-- 暂无数据 -->
+    <view class="empty-wrap" v-else>
+      <empty-view text="暂无数据"></empty-view>
+    </view>
+    <!-- 底部固定按钮 -->
+    <view class="fixed-bottom-btn-wrap" v-if="isView==1">
+      <up-button type="primary" size="large" block @click="handleAddReport">上报本次记录</up-button>
+    </view>
+  </view>
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
@@ -43,184 +43,184 @@ const currentCommitId = ref(&#39;&#39;)
  
 // onLoad接收url传过来的planNo
 onLoad((options) => {
-    if (options.planNo) {
-        planNo.value = options.planNo
-         planTypeId.value = options.planTypeId
-          businessType.value = options.businessType
-          isView.value = options.isView
-        getReportList()
-    } else {
-        uni.showToast({ title: 'planNo参数缺失', icon: 'none' })
-    }
+  if (options.planNo) {
+    planNo.value = options.planNo
+    planTypeId.value = options.planTypeId
+    businessType.value = options.businessType
+    isView.value = options.isView
+    getReportList()
+  } else {
+    uni.showToast({ title: 'planNo参数缺失', icon: 'none' })
+  }
 })
 // 请求上报记录接口
 const getReportList = async () => {
-    console.log('3123')
-    uni.showLoading({ title: '加载中...', mask: true })
-    try {
-        // 传入planNo调取接口
-        let data = {
-            planNo: planNo.value,
-            pageNo: 1,
-            pageSize: 10
-        }
-        const res = await maintainPlanList(data)
-        // 接口返回list，无数据则reportList为空，页面自动显示empty
-        dataList.value = res?.list[0].workRecords
-        planName.value = res?.list[0].planName
-         reportList.value = res?.list || []
+  console.log('3123')
+  uni.showLoading({ title: '加载中...', mask: true })
+  try {
+    // 传入planNo调取接口
+    let data = {
+      planNo: planNo.value,
+      pageNo: 1,
+      pageSize: 10
+    }
+    const res = await maintainPlanList(data)
+    // 接口返回list，无数据则reportList为空，页面自动显示empty
+    dataList.value = res?.list[0].workRecords
+    planName.value = res?.list[0].planName
+    reportList.value = res?.list || []
  
-       
  
-        // ============ 新增逻辑：寻找commitState ===1 的commitId ============
-        currentCommitId.value = ''
-        if(reportList.value.length > 0){
-            // 找到第一条 commitState ===1 的数据
-            const activeItem = reportList.value.find(item => item.commitState === 1)
-            if(activeItem){
-                currentCommitId.value = activeItem.commitId || ''
-            }
-            // 没有找到 activeItem，currentCommitId保持 ''
-        }
-        // reportList为空直接 currentCommitId=''
  
-    } catch (err) {
-        console.error('获取上报记录失败', err)
-        // uni.showToast({ title: '加载失败', icon: 'none' })
-    } finally {
-        uni.hideLoading()
+    // ============ 新增逻辑：寻找commitState ===1 的commitId ============
+    currentCommitId.value = ''
+    if(reportList.value.length > 0){
+      // 找到第一条 commitState ===1 的数据
+      const activeItem = reportList.value.find(item => item.commitState === 1)
+      if(activeItem){
+        currentCommitId.value = activeItem.commitId || ''
+      }
+      // 没有找到 activeItem，currentCommitId保持 ''
     }
+    // reportList为空直接 currentCommitId=''
+
+  } catch (err) {
+    console.error('获取上报记录失败', err)
+    // uni.showToast({ title: '加载失败', icon: 'none' })
+  } finally {
+    uni.hideLoading()
+  }
 }
 // 查看上报详情
 const handleView = (index,item,i) => {
-    console.log('查看详情', item)
-     console.log('查看详情', index)
-    uni.navigateTo({
-        // 后端 page 接口支持 commitId 精确过滤，必须带上，否则会把该计划全部上报都展示出来
-        url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${i.planNo}&commitId=${i.commitId}&index=${index}`
-    })
+  console.log('查看详情', item)
+  console.log('查看详情', index)
+  uni.navigateTo({
+    // 后端 page 接口支持 commitId 精确过滤，必须带上，否则会把该计划全部上报都展示出来
+    url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${i.planNo}&commitId=${i.commitId}&index=${index}`
+  })
 }
 // 新增上报记录，把planNo + currentCommitId带到新增页面
 const handleAddReport = () => {
-    console.log('上报本次记录', currentCommitId.value)
-    uni.navigateTo({
-        url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}&planTypeId=${planTypeId.value}&businessType=${businessType.value}&commitId=${currentCommitId.value}`
-    })
+  console.log('上报本次记录', currentCommitId.value)
+  uni.navigateTo({
+    url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}&planTypeId=${planTypeId.value}&businessType=${businessType.value}&commitId=${currentCommitId.value}`
+  })
 }
 </script>
 <style scoped lang="scss">
 .page-wrap {
-    min-height: 100vh;
-    // 底部固定栏（按钮 88rpx + 上下各 24rpx）+ 安全区
-    padding-bottom: calc(180rpx + constant(safe-area-inset-bottom));
-    padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
-    background: #F4F6FA;
+  min-height: 100vh;
+  // 底部固定栏（按钮 88rpx + 上下各 24rpx）+ 安全区
+  padding-bottom: calc(180rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+  background: #F4F6FA;
 }
 // 顶部提示条：浅蓝底 + 蓝字 + 圆形感叹号（设计稿 .banner）
 .tip-bar {
-    display: flex;
-    align-items: flex-start;
-    gap: 12rpx;
-    margin: 24rpx 24rpx 0;
-    padding: 16rpx 24rpx;
-    background-color: #EBF3FF;
-    border-radius: 16rpx;
-    color: #2563EB;
-    font-size: 24rpx;
-    line-height: 1.6;
+  display: flex;
+  align-items: flex-start;
+  gap: 12rpx;
+  margin: 24rpx 24rpx 0;
+  padding: 16rpx 24rpx;
+  background-color: #EBF3FF;
+  border-radius: 16rpx;
+  color: #2563EB;
+  font-size: 24rpx;
+  line-height: 1.6;
  
-    &::before {
-        content: "!";
-        box-sizing: border-box;
-        flex: 0 0 auto;
-        width: 30rpx;
-        height: 30rpx;
-        margin-top: 4rpx;
-        line-height: 26rpx;
-        text-align: center;
-        font-size: 22rpx;
-        font-weight: 600;
-        color: #2563EB;
-        border: 2rpx solid #2563EB;
-        border-radius: 50%;
-    }
+  &::before {
+    content: "!";
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    width: 30rpx;
+    height: 30rpx;
+    margin-top: 4rpx;
+    line-height: 26rpx;
+    text-align: center;
+    font-size: 22rpx;
+    font-weight: 600;
+    color: #2563EB;
+    border: 2rpx solid #2563EB;
+    border-radius: 50%;
+  }
 }
 // 记录卡片列表：卡片之间 24rpx（设计稿 .body）
 .list-wrap {
-    display: flex;
-    flex-direction: column;
-    gap: 24rpx;
-    padding: 24rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+  padding: 24rpx;
 }
 // 卡片：白底 / 8px 圆角 / 卡片阴影（设计稿 .card）
 .report-item {
-    padding: 24rpx;
-    background-color: #ffffff;
-    border-radius: 16rpx;
-    box-shadow: 0 4rpx 16rpx rgba(17, 24, 39, 0.06);
+  padding: 24rpx;
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  box-shadow: 0 4rpx 16rpx rgba(17, 24, 39, 0.06);
  
-    .item-title {
-        font-size: 32rpx;
-        color: #1F2937;
-        font-weight: 500;
-        line-height: 1.4;
-        margin-bottom: 16rpx;
-    }
-    .item-row {
-        font-size: 26rpx;
-        color: #4B5563;
-        margin-bottom: 12rpx;
-    }
-    .item-row-bottom {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 0;
-    }
-    // 查看：次要操作，白底描边（设计稿 .btn 次级按钮）
-    .look-btn {
-        box-sizing: border-box;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        min-width: 120rpx;
-        height: 56rpx;
-        padding: 0 24rpx;
-        font-size: 24rpx;
-        color: #4B5563;
-        background-color: #ffffff;
-        border: 1rpx solid #E8EBF0;
-        border-radius: 8rpx;
-        flex-shrink: 0;
-    }
+  .item-title {
+    font-size: 32rpx;
+    color: #1F2937;
+    font-weight: 500;
+    line-height: 1.4;
+    margin-bottom: 16rpx;
+  }
+  .item-row {
+    font-size: 26rpx;
+    color: #4B5563;
+    margin-bottom: 12rpx;
+  }
+  .item-row-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 0;
+  }
+  // 查看：次要操作，白底描边（设计稿 .btn 次级按钮）
+  .look-btn {
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 120rpx;
+    height: 56rpx;
+    padding: 0 24rpx;
+    font-size: 24rpx;
+    color: #4B5563;
+    background-color: #ffffff;
+    border: 1rpx solid #E8EBF0;
+    border-radius: 8rpx;
+    flex-shrink: 0;
+  }
 }
 .empty-wrap {
-    padding-top: 120rpx;
+  padding-top: 120rpx;
 }
 // 底部固定操作栏：白底 + 上分隔线 + 蓝色渐变主按钮（设计稿 .bar / .btn.pri）
 .fixed-bottom-btn-wrap {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 10;
-    padding: 24rpx 24rpx calc(24rpx + constant(safe-area-inset-bottom));
-    padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
-    background-color: #ffffff;
-    border-top: 1rpx solid #E8EBF0;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10;
+  padding: 24rpx 24rpx calc(24rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+  background-color: #ffffff;
+  border-top: 1rpx solid #E8EBF0;
  
-    :deep(.u-button) {
-        height: 88rpx !important;
-        border-radius: 16rpx !important;
-        border: none !important;
-        /* 与顶部导航栏同色 */
-        background-color: #2563EB !important;
-        background-image: none !important;
-    }
+  :deep(.u-button) {
+    height: 88rpx !important;
+    border-radius: 16rpx !important;
+    border: none !important;
+    /* 与顶部导航栏同色 */
+    background-color: #2563EB !important;
+    background-image: none !important;
+  }
  
-    :deep(.u-button__text) {
-        font-size: 30rpx !important;
-        font-weight: 500 !important;
-    }
+  :deep(.u-button__text) {
+    font-size: 30rpx !important;
+    font-weight: 500 !important;
+  }
 }
 </style>
 <template>
-    <view class="page-container">
-        <up-sticky>
-            <view class="sticky-wrap">
-                <up-tabs v-model="activeStatus" :list="statusTabs" line-width="44rpx" active-color="#2563EB"
-                    inactive-color="#4B5563" :scrollable="false" @change="handleStatusChange"></up-tabs>
+  <view class="page-container">
+    <up-sticky>
+      <view class="sticky-wrap">
+        <up-tabs v-model="activeStatus" :list="statusTabs" line-width="44rpx" active-color="#2563EB"
+                 inactive-color="#4B5563" :scrollable="false" @change="handleStatusChange"></up-tabs>
+      </view>
+    </up-sticky>
+    <z-paging ref="pagingRef" v-model="currentList" @query="fetchData" :auto-show-system-loading="true">
+      <template #empty>
+        <empty-view />
+      </template>
+      <view class="card-list">
+        <view class="task-card" v-for="(item, index) in currentList" :key="`${item.planNo}_${index}`">
+          <!-- 计划名称 -->
+          <view class="card-head">
+            <view class="plan-name u-line-1">{{ item.planName || '无计划名称' }}</view>
+          </view>
+          <!-- 任务次数 -->
+          <view class="info-row">
+            <view class="info-label">任务次数</view>
+            <view class="info-value" v-if="activeStatus === '2'">完成 {{ item.planFinishNum }} 次</view>
+            <!-- 一次一条期次（planNum=1）时「第几次」取期次序号，历史多条次数的期次仍按完成次数递增 -->
+            <view class="info-value" v-else>第 {{ item.planNum === 1 ? (item.sortNum || 1) : (item.planFinishNum + 1) }} 次</view>
+          </view>
+          <!-- 有效期 -->
+          <view class="info-row">
+            <!-- timeFormat(start, 'yyyy-mm-dd'), -->
+            <view class="info-label">有效期</view>
+            <view class="info-value u-line-1">{{ timeFormat(item.beginTime, 'yyyy-mm-dd') }}—{{
+                timeFormat(item.endTime, 'yyyy-mm-dd') }}
             </view>
-        </up-sticky>
-        <z-paging ref="pagingRef" v-model="currentList" @query="fetchData" :auto-show-system-loading="true">
-            <template #empty>
-                <empty-view />
-            </template>
-            <view class="card-list">
-                <view class="task-card" v-for="(item, index) in currentList" :key="`${item.planNo}_${index}`">
-                    <!-- 计划名称 -->
-                    <view class="card-head">
-                        <view class="plan-name u-line-1">{{ item.planName || '无计划名称' }}</view>
-                    </view>
-                    <!-- 任务次数 -->
-                    <view class="info-row">
-                        <view class="info-label">任务次数</view>
-                        <view class="info-value" v-if="activeStatus === '2'">完成 {{ item.planFinishNum }} 次</view>
-                        <!-- 一次一条期次（planNum=1）时「第几次」取期次序号，历史多条次数的期次仍按完成次数递增 -->
-                        <view class="info-value" v-else>第 {{ item.planNum === 1 ? (item.sortNum || 1) : (item.planFinishNum + 1) }} 次</view>
-                    </view>
-                    <!-- 有效期 -->
-                    <view class="info-row">
-                        <!-- timeFormat(start, 'yyyy-mm-dd'), -->
-                        <view class="info-label">有效期</view>
-                        <view class="info-value u-line-1">{{ timeFormat(item.beginTime, 'yyyy-mm-dd') }}—{{
-                            timeFormat(item.endTime, 'yyyy-mm-dd') }}
-                        </view>
-                    </view>
-                    <!-- 操作区：统一收底，与信息区用分隔线隔开 -->
-                    <view class="action-row">
-                        <!-- 待完成且一次都没上报过才允许置为失效；已有养护记录（进行中/已完成过）不再显示 -->
-                        <view v-if="activeStatus === '1' && !hasReport(item)" class="mini-btn btn-brand-soft"
-                            @click.stop="handleSetInvalid(item)">
-                            置为失效
-                        </view>
-                        <view class="action-right">
-                            <!-- ✅ 修改：去掉item.commitId判断，待完成tab就一直展示结束任务 -->
-                            <view v-if="activeStatus === '1'" class="mini-btn btn-brand-outline"
-                                @click.stop="handleEndTask(item)">结束任务</view>
-                            <!-- 待完成：去作业；已完成：去查看 -->
-                            <view v-if="activeStatus === '1'" class="mini-btn btn-brand-solid" @click.stop="handleGoWork(item)">去作业</view>
-                            <view v-else-if="activeStatus === '2'" class="mini-btn mini-btn--info" @click.stop="handleGoWorkLook(item)">去查看</view>
-                            <view v-else-if="activeStatus === '3'" class="mini-btn mini-btn--info" @click.stop="handleGoWorkLook(item)">去查看</view>
-                        </view>
-                    </view>
-                </view>
+          </view>
+          <!-- 操作区：统一收底，与信息区用分隔线隔开 -->
+          <view class="action-row">
+            <!-- 待完成且一次都没上报过才允许置为失效；已有养护记录（进行中/已完成过）不再显示 -->
+            <view v-if="activeStatus === '1' && !hasReport(item)" class="mini-btn btn-brand-soft"
+                  @click.stop="handleSetInvalid(item)">
+              置为失效
             </view>
-        </z-paging>
-        <!-- ========== 置为失效 弹窗（必须填写失效原因） ========== -->
-        <up-modal :show="invalidModalShow" title="置为失效" :closeOnClickOverlay="false" :showConfirmButton="true"
-            :showCancelButton="true" @cancel="handleInvalidModalCancel" @confirm="confirmSetInvalid">
-            <view class="invalid-modal-content">
-                <view class="invalid-modal-label">
-                    <text class="invalid-modal-required">*</text>
-                    <text>失效原因</text>
-                </view>
-                <up-textarea v-model="invalidReason" placeholder="请输入失效原因" :maxlength="200" count
-                    height="100" border="surround"></up-textarea>
-                <view class="invalid-modal-label">
-                    <text>失效凭证（选填，最多3张）</text>
-                </view>
-                <up-upload :file-list="invalidImages" @after-read="uploadInvalidImgs"
-                    @delete="deleteInvalidImg" @on-exceed="handleInvalidExceed" multiple :max-count="3"
-                    upload-text="选择图片" del-color="#ff4d4f" class="upload-wrap"></up-upload>
+            <view class="action-right">
+              <!-- ✅ 修改：去掉item.commitId判断，待完成tab就一直展示结束任务 -->
+              <view v-if="activeStatus === '1'" class="mini-btn btn-brand-outline"
+                    @click.stop="handleEndTask(item)">结束任务</view>
+              <!-- 待完成：去作业；已完成：去查看 -->
+              <view v-if="activeStatus === '1'" class="mini-btn btn-brand-solid" @click.stop="handleGoWork(item)">去作业</view>
+              <view v-else-if="activeStatus === '2'" class="mini-btn mini-btn--info" @click.stop="handleGoWorkLook(item)">去查看</view>
+              <view v-else-if="activeStatus === '3'" class="mini-btn mini-btn--info" @click.stop="handleGoWorkLook(item)">去查看</view>
             </view>
-        </up-modal>
-        <!-- ========== 结束任务二次确认弹窗 ========== -->
-        <up-modal :show="endTaskModalShow" title="提示" :closeOnClickOverlay="false" :showConfirmButton="true"
-            :showCancelButton="true" @cancel="handleEndTaskModalCancel" @confirm="confirmEndTask">
-            <view class="end-task-modal-content">
-                <text>确定要结束吗？</text>
-            </view>
-        </up-modal>
-    </view>
+          </view>
+        </view>
+      </view>
+    </z-paging>
+    <!-- ========== 置为失效 弹窗（必须填写失效原因） ========== -->
+    <up-modal :show="invalidModalShow" title="置为失效" :closeOnClickOverlay="false" :showConfirmButton="true"
+              :showCancelButton="true" @cancel="handleInvalidModalCancel" @confirm="confirmSetInvalid">
+      <view class="invalid-modal-content">
+        <view class="invalid-modal-label">
+          <text class="invalid-modal-required">*</text>
+          <text>失效原因</text>
+        </view>
+        <up-textarea v-model="invalidReason" placeholder="请输入失效原因" :maxlength="200" count
+                     height="100" border="surround"></up-textarea>
+        <view class="invalid-modal-label">
+          <text>失效凭证（选填，最多3张）</text>
+        </view>
+        <up-upload :file-list="invalidImages" @after-read="uploadInvalidImgs"
+                   @delete="deleteInvalidImg" @on-exceed="handleInvalidExceed" multiple :max-count="3"
+                   upload-text="选择图片" del-color="#ff4d4f" class="upload-wrap"></up-upload>
+      </view>
+    </up-modal>
+    <!-- ========== 结束任务二次确认弹窗 ========== -->
+    <up-modal :show="endTaskModalShow" title="提示" :closeOnClickOverlay="false" :showConfirmButton="true"
+              :showCancelButton="true" @cancel="handleEndTaskModalCancel" @confirm="confirmEndTask">
+      <view class="end-task-modal-content">
+        <text>确定要结束吗？</text>
+      </view>
+    </up-modal>
+  </view>
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
@@ -96,9 +96,9 @@ const getTodayStr = () =&gt; {
 // 有养护记录的任务不允许置为失效
 const hasReport = (item: any) => !!item?.commitId || Number(item?.planFinishNum || 0) > 0
 const statusTabs = ref([
-    { name: '待完成', id: '1' },
-    { name: '已失效', id: '3' },
-    { name: '已完成', id: '2' }
+  { name: '待完成', id: '1' },
+  { name: '已失效', id: '3' },
+  { name: '已完成', id: '2' }
 ])
 const activeStatus = ref('1')
 const pagingRef = ref(null)
@@ -119,339 +119,339 @@ const endTaskModalShow = ref(false)
 const currentEndTaskItem = ref<any>(null)
 // 加载数据，根据当前activeStatus动态调用接口
 const loadData = async () => {
-    console.log('123123')
-    if (!originRawList || originRawList.length === 0) {
-        // 没有批次时要显式结束分页，否则 z-paging 收不到 complete，页面一直停在加载中
-        allTotalData.value = []
-        pagingRef.value?.complete([], 0)
-        return
+  console.log('123123')
+  if (!originRawList || originRawList.length === 0) {
+    // 没有批次时要显式结束分页，否则 z-paging 收不到 complete，页面一直停在加载中
+    allTotalData.value = []
+    pagingRef.value?.complete([], 0)
+    return
+  }
+  uni.showLoading({ title: '加载数据...', mask: true })
+  try {
+    const tempResult: any[] = []
+    // 获取需要请求的finishState数组
+    let stateArr: string[] = []
+    if (activeStatus.value === '1') {
+      // 待完成，只查1
+      stateArr = ['1']
+    } else if (activeStatus.value === '3') {
+      // 已失效，同时查3、4
+      stateArr = ['3', '4']
+    } else if (activeStatus.value === '2') {
+      // 已完成，只查2
+      stateArr = ['2']
     }
-    uni.showLoading({ title: '加载数据...', mask: true })
-    try {
-        const tempResult: any[] = []
-        // 获取需要请求的finishState数组
-        let stateArr: string[] = []
+    // 遍历state数组
+    for (const finishState of stateArr) {
+      // originRawList 为batchNo字符串数组，循环每一个batchNo去请求
+      for (const batchNoItem of originRawList) {
+        const apiParams: any = {
+          pageNo: 1,
+          pageSize: 10,
+          planNo: '',
+          planAttr: '',
+          finishState: finishState,
+          batchNo: batchNoItem
+        }
+        // 待完成状态追加当天日期 beginTime endTime
         if (activeStatus.value === '1') {
-            // 待完成，只查1
-            stateArr = ['1']
-        } else if (activeStatus.value === '3') {
-            // 已失效，同时查3、4
-            stateArr = ['3', '4']
-        } else if (activeStatus.value === '2') {
-            // 已完成，只查2
-            stateArr = ['2']
+          const today = getTodayStr()
+          apiParams.beginTime = today
+          apiParams.endTime = today
         }
-        // 遍历state数组
-        for (const finishState of stateArr) {
-            // originRawList 为batchNo字符串数组，循环每一个batchNo去请求
-            for (const batchNoItem of originRawList) {
-                const apiParams: any = {
-                    pageNo: 1,
-                    pageSize: 10,
-                    planNo: '',
-                    planAttr: '',
-                    finishState: finishState,
-                    batchNo: batchNoItem
-                }
-                // 待完成状态追加当天日期 beginTime endTime
-                if (activeStatus.value === '1') {
-                    const today = getTodayStr()
-                    apiParams.beginTime = today
-                    apiParams.endTime = today
-                }
-                const res = await maintainPlanNum(apiParams)
-                if (Array.isArray(res.list)) {
-                    tempResult.push(...res.list)
-                }
-            }
+        const res = await maintainPlanNum(apiParams)
+        if (Array.isArray(res.list)) {
+          tempResult.push(...res.list)
         }
-        allTotalData.value = tempResult
-    } catch (err) {
-        console.error('批量请求接口异常', err)
-        uni.showToast({ title: err.msg || '数据加载失败', icon: 'none', duration:2000 })
-    } finally {
-        uni.hideLoading()
-        pagingRef.value?.reload()
+      }
     }
+    allTotalData.value = tempResult
+  } catch (err) {
+    console.error('批量请求接口异常', err)
+    uni.showToast({ title: err.msg || '数据加载失败', icon: 'none', duration:2000 })
+  } finally {
+    uni.hideLoading()
+    pagingRef.value?.reload()
+  }
 }
 const planTypeId = ref('')
 onLoad((options) => {
-    planTypeId.value = options.planTypeId
+  planTypeId.value = options.planTypeId
 });
 // onShow 只保留一处，读取storage，originRawList接收batchNo字符串数组
 onShow(async () => {
-    originRawList = uni.getStorageSync('temp_maintain_rawList') || []
-    await loadData()
+  originRawList = uni.getStorageSync('temp_maintain_rawList') || []
+  await loadData()
 })
 // z-paging分页查询，直接使用allTotalData
 const fetchData = async (pageNo, pageSize) => {
-    await new Promise(resolve => setTimeout(resolve, 300))
-    const filterList = allTotalData.value
-    const start = (pageNo - 1) * pageSize
-    const pageData = filterList.slice(start, start + pageSize)
-    pagingRef.value?.complete(pageData, filterList.length)
+  await new Promise(resolve => setTimeout(resolve, 300))
+  const filterList = allTotalData.value
+  const start = (pageNo - 1) * pageSize
+  const pageData = filterList.slice(start, start + pageSize)
+  pagingRef.value?.complete(pageData, filterList.length)
 }
 const handleStatusChange = async (tabItem) => {
-    activeStatus.value = tabItem.id
-    // 切换tab，重新拉接口
-    await loadData()
+  activeStatus.value = tabItem.id
+  // 切换tab，重新拉接口
+  await loadData()
 }
 // 打开失效弹窗
 const handleSetInvalid = (item) => {
-    currentInvalidItem.value = item
-    invalidReason.value = ''
-    invalidImages.value = []
-    invalidModalShow.value = true
+  currentInvalidItem.value = item
+  invalidReason.value = ''
+  invalidImages.value = []
+  invalidModalShow.value = true
 }
 // 关闭弹窗，重置数据
 const handleInvalidModalCancel = () => {
-    invalidModalShow.value = false
-    currentInvalidItem.value = null
-    invalidReason.value = ''
-    invalidImages.value = []
+  invalidModalShow.value = false
+  currentInvalidItem.value = null
+  invalidReason.value = ''
+  invalidImages.value = []
 }
 // 失效凭证上传（最多 3 张，与 add-record 的图片上传保持一致）
 const uploadInvalidImgs = async (event: any) => {
-    const fileList = Array.isArray(event.file) ? event.file : [event.file]
-    const validFiles = fileList.filter((item: any) => item && item.url)
-    if (!validFiles.length) return
-    const startIndex = invalidImages.value.length
-    invalidImages.value.push(...validFiles.map((item: any) => ({ ...item, status: 'uploading', message: '上传中' })))
-    try {
-        const urls = await uploadImages({ filePaths: validFiles.map((item: any) => item.url), ignoreError: true })
-        urls.forEach((url: string, index: number) => {
-            if (invalidImages.value[startIndex + index]) {
-                invalidImages.value.splice(startIndex + index, 1, {
-                    ...validFiles[index], status: 'success', message: '', url
-                })
-            }
+  const fileList = Array.isArray(event.file) ? event.file : [event.file]
+  const validFiles = fileList.filter((item: any) => item && item.url)
+  if (!validFiles.length) return
+  const startIndex = invalidImages.value.length
+  invalidImages.value.push(...validFiles.map((item: any) => ({ ...item, status: 'uploading', message: '上传中' })))
+  try {
+    const urls = await uploadImages({ filePaths: validFiles.map((item: any) => item.url), ignoreError: true })
+    urls.forEach((url: string, index: number) => {
+      if (invalidImages.value[startIndex + index]) {
+        invalidImages.value.splice(startIndex + index, 1, {
+          ...validFiles[index], status: 'success', message: '', url
         })
-        for (let i = urls.length; i < validFiles.length; i++) {
-            if (invalidImages.value[startIndex + i]) {
-                invalidImages.value.splice(startIndex + i, 1, {
-                    ...validFiles[i], status: 'failed', message: '上传失败'
-                })
-            }
-        }
-        if (urls.length < validFiles.length) {
-            uni.showToast({ title: `成功上传${urls.length}张，失败${validFiles.length - urls.length}张`, icon: 'none' })
-        }
-    } catch (err) {
-        console.error('失效凭证上传失败：', err)
-        for (let i = 0; i < validFiles.length; i++) {
-            if (invalidImages.value[startIndex + i]) {
-                invalidImages.value.splice(startIndex + i, 1, {
-                    ...validFiles[i], status: 'failed', message: '上传失败'
-                })
-            }
-        }
-        uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
+      }
+    })
+    for (let i = urls.length; i < validFiles.length; i++) {
+      if (invalidImages.value[startIndex + i]) {
+        invalidImages.value.splice(startIndex + i, 1, {
+          ...validFiles[i], status: 'failed', message: '上传失败'
+        })
+      }
     }
+    if (urls.length < validFiles.length) {
+      uni.showToast({ title: `成功上传${urls.length}张，失败${validFiles.length - urls.length}张`, icon: 'none' })
+    }
+  } catch (err) {
+    console.error('失效凭证上传失败：', err)
+    for (let i = 0; i < validFiles.length; i++) {
+      if (invalidImages.value[startIndex + i]) {
+        invalidImages.value.splice(startIndex + i, 1, {
+          ...validFiles[i], status: 'failed', message: '上传失败'
+        })
+      }
+    }
+    uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
+  }
 }
 const deleteInvalidImg = (event: any) => {
-    invalidImages.value.splice(event.index, 1)
+  invalidImages.value.splice(event.index, 1)
 }
 const handleInvalidExceed = () => {
-    uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
+  uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
 }
 // 确认提交置为失效
 const confirmSetInvalid = async () => {
-    const item = currentInvalidItem.value
-    console.log(currentInvalidItem.value)
-    if (!item) {
-        uni.showToast({ title: '数据异常', icon: 'none', duration:2000 })
-        return
-    }
-    // 失效原因必填：为空时不关闭弹窗、不发起任何请求
-    const reason = (invalidReason.value || '').trim()
-    if (!reason) {
-        uni.showToast({ title: '请填写失效原因', icon: 'none', duration:2000 })
-        return
-    }
-    // 图片还在上传时不能提交，否则会把空 url 或本地路径传给后端
-    if (invalidImages.value.some((file: any) => file.status === 'uploading')) {
-        uni.showToast({ title: '图片上传中，请稍候', icon: 'none', duration:2000 })
+  const item = currentInvalidItem.value
+  console.log(currentInvalidItem.value)
+  if (!item) {
+    uni.showToast({ title: '数据异常', icon: 'none', duration:2000 })
+    return
+  }
+  // 失效原因必填：为空时不关闭弹窗、不发起任何请求
+  const reason = (invalidReason.value || '').trim()
+  if (!reason) {
+    uni.showToast({ title: '请填写失效原因', icon: 'none', duration:2000 })
+    return
+  }
+  // 图片还在上传时不能提交，否则会把空 url 或本地路径传给后端
+  if (invalidImages.value.some((file: any) => file.status === 'uploading')) {
+    uni.showToast({ title: '图片上传中，请稍候', icon: 'none', duration:2000 })
+    return
+  }
+  const invalidFiles = invalidImages.value
+      .filter((file: any) => file.status === 'success' && file.url)
+      .map((file: any) => file.url)
+  uni.showLoading({ title: '提交中...', mask: true })
+  try {
+    let targetCommitId = item.commitId
+    // ✅ 如果没有 commitId，先执行 maintainCreate 创建草稿
+    if (!targetCommitId) {
+      const submitData = {
+        planNo: item.planNo,
+        imgHost: '1',
+        beginImg: [],
+        commonUserList: [],
+        remark: ''
+      }
+      const createRes: any = await maintainCreate(submitData)
+      // 兼容后端两种返回：裸id / {id:xxx}
+      targetCommitId = createRes && typeof createRes === 'object' ? createRes.id : createRes
+      if (!targetCommitId) {
+        uni.hideLoading()
+        uni.showToast({ title: '创建养护草稿失败，无法置为失效', icon: 'none', duration:2000 })
         return
+      }
     }
-    const invalidFiles = invalidImages.value
-        .filter((file: any) => file.status === 'success' && file.url)
-        .map((file: any) => file.url)
-    uni.showLoading({ title: '提交中...', mask: true })
-    try {
-        let targetCommitId = item.commitId
-        // ✅ 如果没有 commitId，先执行 maintainCreate 创建草稿
-        if (!targetCommitId) {
-            const submitData = {
-                planNo: item.planNo,
-                imgHost: '1',
-                beginImg: [],
-                commonUserList: [],
-                remark: ''
-            }
-            const createRes: any = await maintainCreate(submitData)
-            // 兼容后端两种返回：裸id / {id:xxx}
-            targetCommitId = createRes && typeof createRes === 'object' ? createRes.id : createRes
-            if (!targetCommitId) {
-                uni.hideLoading()
-                uni.showToast({ title: '创建养护草稿失败，无法置为失效', icon: 'none', duration:2000 })
-                return
-            }
-        }
-        const params = {
-            commitId: targetCommitId,
-            // 使用弹窗中填写的原因（必填），不再写死默认文案
-            invalidReason: reason,
-            // 后端 invalidFiles 是 List<String>，无图时传空数组
-            invalidFiles
-        }
-        console.log('置为失效提交参数：', params)
-        await invalidatePlan(params)
-        uni.showToast({ title: '操作成功', icon: 'success', duration:2000 })
-        handleInvalidModalCancel()
-        // 重新加载数据刷新列表
-        await loadData()
-        pagingRef.value?.reload()
-    } catch (err) {
-        console.error(err)
-        uni.showToast({ title: err?.msg || '提交失败，请重试', icon: 'none', duration:2000 })
-    } finally {
-        uni.hideLoading()
+    const params = {
+      commitId: targetCommitId,
+      // 使用弹窗中填写的原因（必填），不再写死默认文案
+      invalidReason: reason,
+      // 后端 invalidFiles 是 List<String>，无图时传空数组
+      invalidFiles
     }
+    console.log('置为失效提交参数：', params)
+    await invalidatePlan(params)
+    uni.showToast({ title: '操作成功', icon: 'success', duration:2000 })
+    handleInvalidModalCancel()
+    // 重新加载数据刷新列表
+    await loadData()
+    pagingRef.value?.reload()
+  } catch (err) {
+    console.error(err)
+    uni.showToast({ title: err?.msg || '提交失败，请重试', icon: 'none', duration:2000 })
+  } finally {
+    uni.hideLoading()
+  }
 }
 const handleGoWork = (item) => {
   const isView = activeStatus.value
-    uni.navigateTo({
-        url: `/pages-sub/daily/maintain-manage/now-list-page?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}`
-    })
+  uni.navigateTo({
+    url: `/pages-sub/daily/maintain-manage/now-list-page?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}`
+  })
 }
 const handleGoWorkLook = (item) => {
   const isView = activeStatus.value
-    uni.navigateTo({
-        url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}`
-    })
+  uni.navigateTo({
+    url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}`
+  })
 }
 const handleEndTask = async (item) => {
-    currentEndTaskItem.value = item
-    endTaskModalShow.value = true
+  currentEndTaskItem.value = item
+  endTaskModalShow.value = true
 }
 // 关闭结束任务弹窗
 const handleEndTaskModalCancel = () => {
-    endTaskModalShow.value = false
-    currentEndTaskItem.value = null
+  endTaskModalShow.value = false
+  currentEndTaskItem.value = null
 }
 // ✅改造confirmEndTask：没有commitId先maintainCreate，和置为失效逻辑保持一致
 const confirmEndTask = async () => {
-    const item = currentEndTaskItem.value
-    if (!item) {
-        uni.showToast({ title: '数据异常', icon: 'none', duration:2000 })
-        return
-    }
-    endTaskModalShow.value = false
-    uni.showLoading({ title: '提交中...', mask: true })
-    try {
-        const targetCommitId = item.commitId
-        // 没有进行中的上报说明本次还没作业：后端结束任务要求至少一条正常作业记录，
-        // 先建草稿再结束必定失败，还会留下一条永远「进行中」的脏草稿，这里直接拦下。
-        if (!targetCommitId) {
-            uni.hideLoading()
-            uni.showToast({ title: '请先添加作业记录后再结束任务', icon: 'none', duration: 2000 })
-            return
-        }
-        await finishPlan({ commitId: targetCommitId })
-        uni.hideLoading()
-        uni.showToast({ title: '结束任务成功', icon: 'success', duration:2000 })
-        await loadData()
-        pagingRef.value?.reload()
-    } catch (err) {
-        console.error('结束任务失败', err)
-        uni.hideLoading()
-        uni.showToast({ title: err?.msg || '结束任务失败，请重试', icon: 'none', duration:2000 })
-    } finally {
-        currentEndTaskItem.value = null
+  const item = currentEndTaskItem.value
+  if (!item) {
+    uni.showToast({ title: '数据异常', icon: 'none', duration:2000 })
+    return
+  }
+  endTaskModalShow.value = false
+  uni.showLoading({ title: '提交中...', mask: true })
+  try {
+    const targetCommitId = item.commitId
+    // 没有进行中的上报说明本次还没作业：后端结束任务要求至少一条正常作业记录，
+    // 先建草稿再结束必定失败，还会留下一条永远「进行中」的脏草稿，这里直接拦下。
+    if (!targetCommitId) {
+      uni.hideLoading()
+      uni.showToast({ title: '请先添加作业记录后再结束任务', icon: 'none', duration: 2000 })
+      return
     }
+    await finishPlan({ commitId: targetCommitId })
+    uni.hideLoading()
+    uni.showToast({ title: '结束任务成功', icon: 'success', duration:2000 })
+    await loadData()
+    pagingRef.value?.reload()
+  } catch (err) {
+    console.error('结束任务失败', err)
+    uni.hideLoading()
+    uni.showToast({ title: err?.msg || '结束任务失败，请重试', icon: 'none', duration:2000 })
+  } finally {
+    currentEndTaskItem.value = null
+  }
 }
 // 页面卸载清空，防止内存残留
 onUnload(() => {
-    allTotalData.value = []
-    originRawList = []
+  allTotalData.value = []
+  originRawList = []
 })
 </script>
 <style scoped lang="scss">
 .page-container {
-    height: 100vh;
-    background-color: #F4F6FA;
+  height: 100vh;
+  background-color: #F4F6FA;
 }
 .sticky-wrap {
-    background: #fff;
-    border-bottom: 1rpx solid #E8EBF0;
+  background: #fff;
+  border-bottom: 1rpx solid #E8EBF0;
 }
 /* 卡片列表：页面左右 24rpx、卡片之间 24rpx（设计稿 .body）
  * 顶部留白 = 吸顶 Tabs 高度 + 12px 间距，z-paging 内容从容器顶部起算，
  * 不留这段会被吸顶 Tabs 盖住卡片标题（与原页面 padding-top:100rpx 等效） */
 .card-list {
-    padding: 112rpx 24rpx 24rpx;
-    display: flex;
-    flex-direction: column;
-    gap: 24rpx;
+  padding: 112rpx 24rpx 24rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
 }
 /* 卡片：12px 内边距 / 8px 圆角 / 卡片阴影（设计稿 .tcard） */
 .task-card {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 24rpx;
-    box-shadow: 0 4rpx 16rpx rgba(17, 24, 39, 0.06);
-    display: flex;
-    flex-direction: column;
+  background: #fff;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  box-shadow: 0 4rpx 16rpx rgba(17, 24, 39, 0.06);
+  display: flex;
+  flex-direction: column;
 }
 /* 标题行：标题占满剩余宽度，状态标签靠右（设计稿 .tcard-head） */
 .card-head {
-    display: flex;
-    align-items: center;
-    gap: 16rpx;
-    margin-bottom: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+  margin-bottom: 16rpx;
 }
 .plan-name {
-    flex: 1;
-    min-width: 0;
-    font-size: 32rpx;
-    color: #1F2937;
-    font-weight: 500;
-    line-height: 1.4;
+  flex: 1;
+  min-width: 0;
+  font-size: 32rpx;
+  color: #1F2937;
+  font-weight: 500;
+  line-height: 1.4;
 }
 .info-row {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 16rpx;
-    margin-bottom: 6rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16rpx;
+  margin-bottom: 6rpx;
 }
 .info-label {
-    font-size: 26rpx;
-    color: #9CA3AF;
-    flex-shrink: 0;
+  font-size: 26rpx;
+  color: #9CA3AF;
+  flex-shrink: 0;
 }
 .info-value {
-    flex: 1;
-    min-width: 0;
-    font-size: 26rpx;
-    color: #4B5563;
-    text-align: right;
+  flex: 1;
+  min-width: 0;
+  font-size: 26rpx;
+  color: #4B5563;
+  text-align: right;
 }
 /* 操作区统一收底：上 16rpx 留白 + 分隔线（设计稿 .tcard-foot） */
 .action-row {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 16rpx;
-    margin-top: 16rpx;
-    padding-top: 16rpx;
-    border-top: 1rpx solid #E8EBF0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16rpx;
+  margin-top: 16rpx;
+  padding-top: 16rpx;
+  border-top: 1rpx solid #E8EBF0;
 }
 .action-right {
-    display: flex;
-    align-items: center;
-    gap: 16rpx;
-    margin-left: auto;
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+  margin-left: auto;
 }
 // 置为失效（红字）/ 去作业（蓝）/ 去查看（灰）/ 结束任务（白底描边）
 // 尺寸与配色统一由全局 .btn-text-danger、.mini-btn 系列控制
@@ -459,42 +459,42 @@ onUnload(() =&gt; {
  * 浅底（置为失效） / 描边（结束任务） / 实心（去作业）
  * 需 !important 覆盖全局 .mini-btn 的白字与 .btn-text-danger 等既有配色 */
 .btn-brand-soft {
-    color: #3b9dff !important;
-    background-color: #EAF4FF !important;
+  color: #3b9dff !important;
+  background-color: #EAF4FF !important;
 }
  
 .btn-brand-outline {
-    color: #3b9dff !important;
-    background-color: #ffffff !important;
-    border: 1rpx solid #3b9dff;
+  color: #3b9dff !important;
+  background-color: #ffffff !important;
+  border: 1rpx solid #3b9dff;
 }
  
 .btn-brand-solid {
-    color: #ffffff !important;
-    background-color: #3b9dff !important;
+  color: #ffffff !important;
+  background-color: #3b9dff !important;
 }
 .invalid-modal-content {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 10rpx 0;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10rpx 0;
 }
  
 /* 失效原因（必填）：标签 + 输入域 */
 .invalid-modal-label {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    margin-bottom: 16rpx;
-    font-size: 28rpx;
-    color: #1F2937;
+  display: flex;
+  align-items: center;
+  gap: 6rpx;
+  margin-bottom: 16rpx;
+  font-size: 28rpx;
+  color: #1F2937;
 }
  
 .invalid-modal-required {
-    color: #DC2626;
+  color: #DC2626;
 }
  
 /* 失效凭证上传：与上方原因输入框保持同样的间距 */
 .upload-wrap {
-    margin-top: 16rpx;
+  margin-top: 16rpx;
 }
 </style>
@@ -151,9 +151,9 @@
                 <view class="u-body-item-title">
                   紧急程度：{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
                 </view>
-<!--                <view>-->
-<!--                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
-<!--                </view>-->
+                <!--                <view>-->
+                <!--                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+                <!--                </view>-->
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单状态：</view>
@@ -62,9 +62,9 @@
         >
           <template #body>
             <view class="card-body">
-<!--              <view v-if="activeTab !== 0" class="ml-10">-->
-<!--                <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
-<!--              </view>-->
+              <!--              <view v-if="activeTab !== 0" class="ml-10">-->
+              <!--                <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+              <!--              </view>-->
  
               <view class="common-custom-btn " v-if="activeTab !== 0"  style="--btn-top: 130px;"  @click="handleDetail(item)">
                 工单详情
@@ -89,13 +89,13 @@
  
               <view class="u-body-item u-flex common-justify-between common-item-center">
                 <view class="u-body-item-title">紧急程度：{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) || '-' }}</view>
-<!--                <view class="u-line-1 u-body-value flex-1 text-right">-->
-<!--                  {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) || '-' }}-->
-<!--                </view>-->
+                <!--                <view class="u-line-1 u-body-value flex-1 text-right">-->
+                <!--                  {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) || '-' }}-->
+                <!--                </view>-->
                 <!-- 只有 我发起的(1)、已办(2) 显示该行的详情按钮 -->
-<!--                <view v-if="activeTab !== 0" class="ml-10">-->
-<!--                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
-<!--                </view>-->
+                <!--                <view v-if="activeTab !== 0" class="ml-10">-->
+                <!--                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+                <!--                </view>-->
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单状态：</view>
@@ -2,24 +2,24 @@
   <view class="page-container">
     <!-- 页面加载 -->
     <up-loading-page
-      v-if="loading"
-      :loading="true"
-      title="加载中..."
-      color="#2563EB"
+        v-if="loading"
+        :loading="true"
+        title="加载中..."
+        color="#2563EB"
     ></up-loading-page>
  
     <view v-else class="main-content" :class="'pb-rows-' + actionBarRows">
       <!-- 顶部标签栏 -->
       <up-sticky :bgColor="'#fff'">
         <up-tabs
-          v-model="activeTopTab"
-          :list="topTabList"
-          :scrollable="false"
-          sticky
-          active-color="#2563EB"
-          inactive-color="#606266"
-          class="top-tabs"
-          @click="activeTopTabClick"
+            v-model="activeTopTab"
+            :list="topTabList"
+            :scrollable="false"
+            sticky
+            active-color="#2563EB"
+            inactive-color="#606266"
+            class="top-tabs"
+            @click="activeTopTabClick"
         ></up-tabs>
       </up-sticky>
  
@@ -68,17 +68,17 @@
             </up-cell>
  
             <up-cell
-              title="紧急程度"
-              :value="uni.$dict.getDictLabel('workorder_pressing_type', orderDetail.pressingType) || '--'"
-              align="middle"
+                title="紧急程度"
+                :value="uni.$dict.getDictLabel('workorder_pressing_type', orderDetail.pressingType) || '--'"
+                align="middle"
             ></up-cell>
  
             <up-cell title="提交人" :value="orderDetail.userName || '--'" align="middle"></up-cell>
  
             <up-cell
-              title="提交时间"
-              :value="timeFormat(orderDetail.createTime, 'yyyy-mm-dd hh:MM:ss') || '--'"
-              align="middle"
+                title="提交时间"
+                :value="timeFormat(orderDetail.createTime, 'yyyy-mm-dd hh:MM:ss') || '--'"
+                align="middle"
             ></up-cell>
  
             <up-cell v-if="orderDetail.handleResult">
@@ -94,11 +94,11 @@
               <template #value>
                 <view class="cell-content-wrap">
                   <up-album
-                    v-if="!!orderDetail.problemsImgs?.length"
-                    :urls="orderDetail.problemsImgs.slice(0, 3)"
-                    singleSize="70"
-                multipleSize="70"
-                    :preview-full-image="true"
+                      v-if="!!orderDetail.problemsImgs?.length"
+                      :urls="orderDetail.problemsImgs.slice(0, 3)"
+                      singleSize="70"
+                      multipleSize="70"
+                      :preview-full-image="true"
                   ></up-album>
                   <text v-else class="empty-text">暂无问题照片</text>
                 </view>
@@ -106,19 +106,19 @@
             </up-cell>
  
             <up-cell
-              v-if="orderDetail.expectedFinishDate"
-              title="希望完成时间"
-              :value="timeFormat(orderDetail.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')"
-              align="middle"
-              :border="false"
+                v-if="orderDetail.expectedFinishDate"
+                title="希望完成时间"
+                :value="timeFormat(orderDetail.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')"
+                align="middle"
+                :border="false"
             ></up-cell>
  
             <up-cell
-              v-if="orderDetail.finishDate"
-              title="工单完结时间"
-              :value="timeFormat(orderDetail.finishDate, 'yyyy-mm-dd hh:MM:ss')"
-              align="middle"
-              :border="false"
+                v-if="orderDetail.finishDate"
+                title="工单完结时间"
+                :value="timeFormat(orderDetail.finishDate, 'yyyy-mm-dd hh:MM:ss')"
+                align="middle"
+                :border="false"
             ></up-cell>
           </up-cell-group>
  
@@ -137,22 +137,22 @@
               </up-cell>
             </up-cell-group>
             <up-tabs
-              @change="imgTabChange"
-              v-model="activeImgTab"
-              :list="imgTabList"
-              :scrollable="false"
-              active-color="#2563EB"
-              inactive-color="#606266"
-              class="img-tabs"
+                @change="imgTabChange"
+                v-model="activeImgTab"
+                :list="imgTabList"
+                :scrollable="false"
+                active-color="#2563EB"
+                inactive-color="#606266"
+                class="img-tabs"
             ></up-tabs>
             <view class="img-tab-content">
               <up-album
-                v-if="currentImgList.length"
-                :urls="currentImgList.slice(0, 3)"
-                :singleSize="70"
-                :multipleSize="70"
-                :preview-full-image="true"
-                class="img-album custom-album"
+                  v-if="currentImgList.length"
+                  :urls="currentImgList.slice(0, 3)"
+                  :singleSize="70"
+                  :multipleSize="70"
+                  :preview-full-image="true"
+                  class="img-album custom-album"
               ></up-album>
               <text v-else class="empty-img-text">养护员未上传图片</text>
             </view>
@@ -162,18 +162,18 @@
         <!-- 流程节点 Tab -->
         <view v-show="activeTopTab === 1" class="process-content">
           <up-steps
-            v-if="processData.activityNodes && processData.activityNodes.length"
-            :list="processData.activityNodes"
-            :current="getCurrentStepIndex()"
-            direction="column"
-            active-color="#2563EB"
-            inactive-color="#909399"
-            class="vertical-steps"
+              v-if="processData.activityNodes && processData.activityNodes.length"
+              :list="processData.activityNodes"
+              :current="getCurrentStepIndex()"
+              direction="column"
+              active-color="#2563EB"
+              inactive-color="#909399"
+              class="vertical-steps"
           >
             <template>
               <up-steps-item
-                v-for="(item, index) in processData.activityNodes"
-                :key="`${item.id}_${index}`"
+                  v-for="(item, index) in processData.activityNodes"
+                  :key="`${item.id}_${index}`"
               >
                 <template #content>
                   <view class="step-content-wrap">
@@ -199,12 +199,12 @@
                     </view>
                     <view class="step-album-wrap">
                       <up-album
-                        v-if="item.tasks && item.tasks[0]?.attattmentUrls && item.tasks[0].attattmentUrls.length"
-                        :urls="item.tasks[0].attattmentUrls.slice(0, 3)"
-                        :singleSize="70"
-                        :multipleSize="70"
-                        :preview-full-image="true"
-                        class="step-album"
+                          v-if="item.tasks && item.tasks[0]?.attattmentUrls && item.tasks[0].attattmentUrls.length"
+                          :urls="item.tasks[0].attattmentUrls.slice(0, 3)"
+                          :singleSize="70"
+                          :multipleSize="70"
+                          :preview-full-image="true"
+                          class="step-album"
                       ></up-album>
                     </view>
                   </view>
@@ -213,10 +213,10 @@
             </template>
           </up-steps>
           <up-empty
-            v-else
-            mode="data"
-            title="暂无流程节点数据"
-            class="empty-process"
+              v-else
+              mode="data"
+              title="暂无流程节点数据"
+              class="empty-process"
           ></up-empty>
         </view>
       </view>
@@ -251,35 +251,35 @@
  
     <!-- 回退弹窗 -->
     <up-modal
-      :show="rejectModalShow"
-      title="回退原因"
-      :closeOnClickOverlay="false"
-      :showConfirmButton="true"
-      :showCancelButton="true"
-      @cancel="handleRejectModalCancel"
-      @confirm="confirmReject"
+        :show="rejectModalShow"
+        title="回退原因"
+        :closeOnClickOverlay="false"
+        :showConfirmButton="true"
+        :showCancelButton="true"
+        @cancel="handleRejectModalCancel"
+        @confirm="confirmReject"
     >
       <view class="reject-modal-content">
         <up-textarea
-          v-model.trim="rejectReason"
-          placeholder="请输入回退原因（必填）"
-          rows="6"
-          :count="200"
-          maxlength="200"
-          class="reject-textarea"
+            v-model.trim="rejectReason"
+            placeholder="请输入回退原因（必填）"
+            rows="6"
+            :count="200"
+            maxlength="200"
+            class="reject-textarea"
         />
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传回退图片（选填）</view>
           <up-upload
-            :file-list="rejectImgs.rawImgList.value || []"
-            @after-read="rejectImgs.uploadImgs"
-            @delete="rejectImgs.deleteImg"
-            multiple
-            width="70"
-            height="70"
-            :max-count="rejectImgs.uploadConfig.maxCount"
-            :upload-text="rejectImgs.uploadConfig.uploadText"
-            :size-type="rejectImgs.uploadConfig.sizeType"
+              :file-list="rejectImgs.rawImgList.value || []"
+              @after-read="rejectImgs.uploadImgs"
+              @delete="rejectImgs.deleteImg"
+              multiple
+              width="70"
+              height="70"
+              :max-count="rejectImgs.uploadConfig.maxCount"
+              :upload-text="rejectImgs.uploadConfig.uploadText"
+              :size-type="rejectImgs.uploadConfig.sizeType"
           />
         </view>
       </view>
@@ -287,13 +287,13 @@
  
     <!-- 验收弹窗 -->
     <up-modal
-      :show="acceptModalShow"
-      title="验收"
-      :closeOnClickOverlay="false"
-      :showConfirmButton="true"
-      :showCancelButton="true"
-      @cancel="handleAcceptModalCancel"
-      @confirm="handleAcceptModalConfirm"
+        :show="acceptModalShow"
+        title="验收"
+        :closeOnClickOverlay="false"
+        :showConfirmButton="true"
+        :showCancelButton="true"
+        @cancel="handleAcceptModalCancel"
+        @confirm="handleAcceptModalConfirm"
     >
       <view class="accept-modal-content">
         <view class="radio-group-wrap">
@@ -304,26 +304,26 @@
         </view>
         <view class="textarea-wrap mt-30">
           <up-textarea
-            v-model.trim="acceptReason"
-            placeholder="请输入验收原因（必填，最多200字）"
-            :required="true"
-            maxlength="200"
-            rows="5"
-            count
+              v-model.trim="acceptReason"
+              placeholder="请输入验收原因（必填，最多200字）"
+              :required="true"
+              maxlength="200"
+              rows="5"
+              count
           />
         </view>
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传验收图片（选填）</view>
           <up-upload
-            :file-list="acceptImgs.rawImgList.value || []"
-            @after-read="acceptImgs.uploadImgs"
-            @delete="acceptImgs.deleteImg"
-            multiple
-            width="70"
-            height="70"
-            :max-count="acceptImgs.uploadConfig.maxCount"
-            :upload-text="acceptImgs.uploadConfig.uploadText"
-            :size-type="acceptImgs.uploadConfig.sizeType"
+              :file-list="acceptImgs.rawImgList.value || []"
+              @after-read="acceptImgs.uploadImgs"
+              @delete="acceptImgs.deleteImg"
+              multiple
+              width="70"
+              height="70"
+              :max-count="acceptImgs.uploadConfig.maxCount"
+              :upload-text="acceptImgs.uploadConfig.uploadText"
+              :size-type="acceptImgs.uploadConfig.sizeType"
           />
         </view>
       </view>
@@ -382,8 +382,8 @@ const callApprovalApi = async (params: any, taskKey: string) =&gt; {
  
 const navToOrderPage = (path: string, query = {}) => {
   const queryStr = Object.keys(query)
-    .map(k => `${k}=${encodeURIComponent(query[k])}`)
-    .join('&')
+      .map(k => `${k}=${encodeURIComponent(query[k])}`)
+      .join('&')
   const url = queryStr ? `${path}?${queryStr}` : path
   uni.navigateTo({ url })
 }
@@ -631,8 +631,8 @@ const activeTopTabClick = async (item: any) =&gt; {
     if (res && res.activityNodes && res.activityNodes.length) {
       // 过滤未开始(status = -1)的预测节点：退回后 BPM 会返回后续待处理节点，工单时间线只展示已发生/进行中的节点
       const formatNodes = res.activityNodes
-        .filter(node => node.status !== -1)
-        .map(node => ({ ...node, title: node.name }))
+          .filter(node => node.status !== -1)
+          .map(node => ({ ...node, title: node.name }))
       processData.value = { ...res, activityNodes: formatNodes }
     } else {
       processData.value = res
@@ -671,8 +671,8 @@ const handleRenew = (item: any) =&gt; {
   const tempKey = setOrderStorage(item, 'renew_order')
   if (!tempKey) return
   const url = USER_ROLES.includes('patrol_global')
-    ? '/pages-sub/problem/regional-order-manage/add-patrol-order'
-    : '/pages-sub/problem/regional-order-manage/add-order'
+      ? '/pages-sub/problem/regional-order-manage/add-patrol-order'
+      : '/pages-sub/problem/regional-order-manage/add-order'
   navToOrderPage(url, { isRenew: 1, tempKey })
 }
  
@@ -874,8 +874,8 @@ const handleAcceptModalConfirm = async () =&gt; {
         workerDataId: item.id,
         taskId: item.taskId,
         operateType: acceptRadioValue.value === '0'
-          ? nextStepMap[item.taskKey].operateTypePass
-          : nextStepMap[item.taskKey].operateTypeNoPass,
+            ? nextStepMap[item.taskKey].operateTypePass
+            : nextStepMap[item.taskKey].operateTypeNoPass,
         reason
       }
     }
@@ -886,8 +886,8 @@ const handleAcceptModalConfirm = async () =&gt; {
         taskId: item.taskId,
         workerDataId: item.id,
         operateType: acceptRadioValue.value === '0'
-          ? nextStepMap[item.taskKey].operateTypePass
-          : nextStepMap[item.taskKey].operateTypeNoPass,
+            ? nextStepMap[item.taskKey].operateTypePass
+            : nextStepMap[item.taskKey].operateTypeNoPass,
         reason,
         agree: acceptRadioValue.value
       }
@@ -95,7 +95,7 @@
               </template>
             </up-cell>
  
-             <up-cell title="重点巡检区域" :value="orderDetail.keyInspection==0?'否':'是'" align="middle"></up-cell>
+            <up-cell title="重点巡检区域" :value="orderDetail.keyInspection==0?'否':'是'" align="middle"></up-cell>
  
             <!-- 希望完成时间 -->
             <up-cell