diff --git a/common/config/env.js b/common/config/env.js
index 7a23172..280a05c 100644
--- a/common/config/env.js
+++ b/common/config/env.js
@@ -3,6 +3,8 @@ const env = {
   // 开发环境
   development: {
     baseUrl: 'https://test.jichengshanshui.com.cn:28302',
+    // https://test.jichengshanshui.com.cn:28302
+
     uploadUrl: 'https://test.jichengshanshui.com.cn:28302',
     // baseApi:'admin-api',
     // appApi:'app-api'
diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue
index 2ba75d2..0026e6f 100644
--- a/pages-sub/daily/maintain-manage/add-record.vue
+++ b/pages-sub/daily/maintain-manage/add-record.vue
@@ -1,6 +1,5 @@
 <template>
   <view class="page-container">
-    <!-- 核心：将所有 up-form-item 包裹在同一个 up-form 内 -->
     <view class="inspect-form-content commonPageLRpadding">
       <up-form
           label-position="left"
@@ -42,32 +41,27 @@
           ></up-upload>
         </up-form-item>
 
-        <!-- 3. 完成进度（滑块）- 核心修改：min绑定initProgress -->
+        <!-- 3. 完成进度（滑块） -->
         <up-form-item
             label="完成进度"
             prop="progress"
-            required
+
             class="form-item"
         >
           <view class="progress-wrap">
             <up-slider
                 v-model="inspectForm.progress"
-                :min="0"
-            :max="100"
-            active-color="#1989fa"
-            inactive-color="#e5e5e5"
-            block-size="24"
-            class="progress-slider"
-            @change="handleProgressChange"
+                :min="initProgress"
+                :max="100"
+                active-color="#1989fa"
+                inactive-color="#e5e5e5"
+                block-size="24"
+                :showValue="true"
+                class="progress-slider"
+                @changing="handleProgressChange"
             ></up-slider>
-            <view class="progress-value">{{ inspectForm.progress }}%</view>
-            <!-- 优化提示文案：动态显示初始进度值 -->
-            <view class="progress-tips" v-if="inspectForm.progress <= initProgress">
-              进度不能低于或等于{{ initProgress }}%，请调整
-            </view>
           </view>
         </up-form-item>
-
       </up-form>
     </view>
 
@@ -86,28 +80,23 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import type { UniFormRef } from '@/uni_modules/uview-plus/types'
-// 定义ref供选项式API使用
 const inspectFormRef = ref<UniFormRef>(null)
 </script>
 
 <script lang="ts">
-import { uploadImages } from '@/common/utils/upload';
-import { maintainCreate } from  "@/api/maintain-manage/maintain-manage";
+import { uploadImages } from '@/common/utils/upload'
+import { maintainCreate } from "@/api/maintain-manage/maintain-manage"
 
 export default {
   data() {
     return {
-      // 图片列表
       imagesList: [],
-      // 从URL获取的初始进度值
       initProgress: 0,
-      // 巡查表单数据
       inspectForm: {
-        remark: '',        // 巡查描述
-        progress: 0         // 完成进度（0-100）
+        remark: '',
+        progress: 0
       },
-      paramsOptins: {},     // 接受参数
-      // 表单校验规则
+      paramsOptins: {},
       inspectFormRules: {
         images: [
           {
@@ -115,10 +104,8 @@ export default {
             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) {
@@ -129,55 +116,71 @@ export default {
             }
           }
         ],
-        progress: [
-          {
-            type: 'number',
-            required: true,
-            message: '请设置完成进度',
-            trigger: ['change'],
-            validator: (rule, value, callback) => {
-              // 自定义校验：进度必须大于初始进度值（兜底校验）
-              if (value <= this.initProgress) {
-                callback(new Error(`完成进度必须大于${this.initProgress}%`))
-              } else {
-                callback()
-              }
-            }
-          }
-        ]
+        // progress: [
+        //   {
+        //
+        //     required: true,
+        //     message: '请设置完成进度',
+        //     trigger: ['change'],
+        //     validator: (rule, value, callback) => {
+        //       // 第一步：校验是否为空/0
+        //       if (!value && value !== 0) {
+        //         callback(new Error('请设置完成进度'))
+        //       }
+        //       // 第二步：校验是否大于初始进度
+        //       else if (value <= this.initProgress) {
+        //         callback(new Error(`完成进度必须大于${this.initProgress}%`))
+        //       }
+        //       // 校验通过
+        //       else {
+        //         callback()
+        //       }
+        //     }
+        //   }
+        // ]
       }
     }
   },
   onLoad(option) {
     console.log('页面参数：', option)
     this.paramsOptins = option
-
-    // 从URL参数中获取进度值，默认0
-    this.initProgress = option.finishPercent ? Number(option.finishPercent) : 0
-    // 设置表单初始进度值（若初始进度>0，默认设为初始进度+1，避免刚进入就提示）
-    this.inspectForm.progress = this.initProgress + 1 || 1
-
+    // 初始化初始进度
+    this.initProgress = option.finishPercent ? Number(option.finishPercent)+1 : 0
+    // 关键修复：初始进度值设为 初始进度+1，避免刚进入就触发校验失败
+    this.inspectForm.progress = this.initProgress
     console.log('初始进度值：', this.initProgress)
   },
   onReady() {
-    // 兼容微信小程序，通过setRules设置校验规则
     this.$refs.inspectFormRef.setRules(this.inspectFormRules)
     console.log('巡查表单规则初始化完成')
   },
   methods: {
     /**
-     * 新增：进度滑块拖动后校验（兜底，防止手动修改值）
+     * 进度滑块变化处理 - 核心优化：实时触发校验 + 状态更新
      */
-    handleProgressChange(val) {
-      // 若拖动后值<=初始进度，强制重置为初始进度+1
-      if (val <= this.initProgress) {
-        this.inspectForm.progress = this.initProgress + 1
-        uni.showToast({
-          title: `进度不能低于${this.initProgress}%`,
-          icon: 'none',
-          duration: 1500
-        })
-      }
+    handleProgressChange(value) {
+      // // 1. 强制修正非法值（兜底）
+      // console.log(value)
+      // if (value <= this.initProgress) {
+      //   console.log('123')
+      //   this.inspectForm.progress = this.initProgress + 1
+      //   uni.showToast({
+      //     title: `进度不能低于${this.initProgress}%`,
+      //     icon: 'none',
+      //     duration: 1500
+      //   })
+      // }
+      //
+      // // 2. 关键：手动触发progress字段的校验，实时更新提示状态
+      // this.$nextTick(async () => {
+      //   try {
+      //     // 触发单个字段校验
+      //     await this.$refs.inspectFormRef.validateField('progress')
+      //   } catch (err) {
+      //     // 校验失败时uView会自动显示提示，此处无需额外处理
+      //     console.log('进度校验失败：', err)
+      //   }
+      // })
     },
 
     /**
@@ -186,7 +189,6 @@ export default {
     deleteImg(event) {
       console.log('删除图片事件：', event)
       this.imagesList.splice(event.index, 1)
-      // 删除图片后重新校验图片字段
       this.$refs.inspectFormRef.validateField('images')
       uni.showToast({ title: '图片删除成功', icon: 'success' })
     },
@@ -198,7 +200,6 @@ export default {
       console.log('上传图片事件：', 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,
@@ -242,7 +243,6 @@ export default {
           uni.showToast({ title: `成功上传${fileList.length}张图片`, icon: 'success' })
         }
 
-        // 上传完成后重新校验图片字段
         this.$refs.inspectFormRef.validateField('images')
       } catch (err) {
         console.error('图片上传失败：', err)
@@ -256,8 +256,6 @@ export default {
           }
         }
         uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
-
-        // 上传失败后重新校验图片字段
         this.$refs.inspectFormRef.validateField('images')
       }
     },
@@ -282,38 +280,28 @@ export default {
     async submitInspect() {
       console.log('当前完成进度：', this.inspectForm.progress)
       try {
-        // 先执行表单校验
         await this.$refs.inspectFormRef.validate()
         console.log('图片列表：', this.imagesList)
 
-        // 构造提交数据
         const submitData = {
-          // "batchNo": this.paramsOptins.batchNo,
-          totalFinishPercent:this.inspectForm.progress,
+          totalFinishPercent: this.inspectForm.progress,
           "planNo": this.paramsOptins.planNo,
           "imgHost": "1",
           "beginImg": this.getImgUrlList(this.imagesList),
-          "commonUserList":[],
-          // "userId": '',
-          // "userName": '',
-          "remark": this.inspectForm.remark // 备注中记录进度
+          "commonUserList": [],
+          "remark": this.inspectForm.remark
         }
 
-        // 显示加载中
         uni.showLoading({ title: '提交中...' })
-
         await maintainCreate(submitData)
-
         uni.hideLoading()
+
         uni.showToast({
           title: '提交成功',
           icon: 'success',
           duration: 1000
         })
-        // uni.navigateTo({
-        //   url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}&finishPercent=${item.finishPercent}`
-        // })
-        // 延迟跳转（等待提示框显示完成）
+
         setTimeout(() => {
           uni.redirectTo({
             url: '/pages-sub/daily/maintain-manage/index'
@@ -321,14 +309,8 @@ export default {
         }, 1000)
 
       } catch (error) {
-        // 隐藏加载框
         uni.hideLoading()
-
-        // 区分是表单校验失败还是接口调用失败
-        if (Array.isArray(error)) {
-          // 表单校验失败 - 静默处理（uView会自动提示）
-        } else {
-          // 接口调用失败
+        if (!Array.isArray(error)) {
           console.error('巡查表单提交失败：', error)
           uni.showToast({
             title: '提交失败，请重试',
@@ -343,36 +325,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
-
-// 巡查表单内容容器
 .inspect-form-content {
   background: #fff;
   padding: 20rpx;
   margin-bottom: 20rpx;
 }
 
-// 进度滑块样式
 .progress-wrap {
-  width: 100%;
-
-  .progress-slider {
-    margin: 20rpx 0;
-  }
-
-  .progress-value {
-    text-align: right;
-    font-size: 28rpx;
-    color: #333;
-    margin-bottom: 10rpx;
-  }
-
-  .progress-tips {
-    font-size: 24rpx;
-    color: #ff4d4f;
-    margin-top: 10rpx;
-  }
+  width: 83%;
 }
-
-
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
index 2a2fb91..aef513e 100644
--- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -10,8 +10,6 @@
 
     <!-- 内容容器 -->
     <view v-else class="content-wrap">
-
-
       <template v-for="(i, index) in orderDetail" :key="index">
         <!-- 工单详情内容 -->
         <up-cell-group :border="false" inset style="margin: 20rpx;">
@@ -42,13 +40,13 @@
           <!-- 4. 情况描述 -->
           <up-cell
               title="计划有效期"
-              :value="`${timeFormat(i.beginTime,'yy-mm-dd hh:MM:ss')} 至 ${timeFormat(i. endTime,'yy-mm-dd hh:MM:ss')}`"
+              :value="`${timeFormat(i.beginTime,'yyyy-mm-dd')} 至 ${timeFormat(i. endTime,'yyyy-mm-dd')}`"
               class="up-line-1"
               align="middle"
           ></up-cell>
 
           <!-- 5. 问题照片（核心修复：判断条件+空值处理） -->
-          <up-cell title="照片" >
+          <up-cell title="照片">
             <template #value>
               <view class="cell-content-wrap">
 
@@ -71,15 +69,15 @@
               :value="i.remark || '--'"
               class="up-line-1"
               align="middle"
-              :border="false"
+
           ></up-cell>
 
           <up-cell
               title="提交时间"
-              :value="timeFormat(i.finishTime,'yy-mm-dd hh:MM:ss') || '--'"
+              :value="timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') || '--'"
               class="up-line-1"
               align="middle"
-              :border="false"
+
           ></up-cell>
 
 
@@ -99,34 +97,35 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from 'vue';
-import { detailList } from "@/api/maintain-manage/maintain-manage";
-import { onLoad, onShow } from '@dcloudio/uni-app';
-import { timeFormat } from '@/uni_modules/uview-plus';
-
+import {ref} from 'vue';
+import {detailList} from "@/api/maintain-manage/maintain-manage";
+import {onLoad} from '@dcloudio/uni-app';
+import {timeFormat} from '@/uni_modules/uview-plus';
 // 状态管理
 const loading = ref(true);
 const orderDetail = ref([]);
 
 
-
 /**
  * 获取工单详情
  */
-const getOrderDetail = async (planNo: string) => {
+const getOrderDetail = async (plan_no: string) => {
   try {
     loading.value = true;
-    const res = await detailList({  planNo });
+    const res = await detailList({plan_no});
     console.log('接口返回：', res);
     // 优化：确保图片数组为数组类型，避免非数组导致渲染错误
-    orderDetail.value = {
-      ...res,
-      problemImgsList: Array.isArray(res.problemImgsList) ? res.problemImgsList : [],
-      completeImgsList: Array.isArray(res.completeImgsList) ? res.completeImgsList : []
-    };
+    // orderDetail.value
+    // orderDetail.value = {
+    //   ...res,
+    //   problemImgsList: Array.isArray(res.problemImgsList) ? res.problemImgsList : [],
+    //   completeImgsList: Array.isArray(res.completeImgsList) ? res.completeImgsList : []
+    // };
+
+    orderDetail.value = res;
   } catch (error) {
     console.error('获取工单详情失败：', error);
-    uni.showToast({ title: '加载失败，请重试', icon: 'none' });
+    uni.showToast({title: '加载失败，请重试', icon: 'none'});
   } finally {
     loading.value = false;
   }
@@ -134,86 +133,24 @@ const getOrderDetail = async (planNo: string) => {
 
 // 页面加载
 onLoad((options) => {
-  const { planNo } = options;
+  const {planNo} = options;
   if (planNo) {
     getOrderDetail(planNo);
   } else {
     loading.value = false;
-    uni.showToast({ title: '缺少工单ID', icon: 'none' });
+    uni.showToast({title: '缺少工单ID', icon: 'none'});
   }
 });
 </script>
 
 <style scoped lang="scss">
-// 页面基础样式
-.u-page {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  box-sizing: border-box;
-}
 
 // 内容容器
 .content-wrap {
   background: #fff;
   width: 100%;
   box-sizing: border-box;
-  overflow-y: auto;
-  min-height: calc(100vh - 40rpx);
-}
-
-
-
-// 空文本样式
-.empty-text {
-  color: #999;
-  font-size: 28rpx;
-  line-height: 80rpx;
-  display: block;
-  text-align: left;
-}
-
-// 优化uview组件样式
-:deep(.up-cell-group) {
-  --u-cell-group-background-color: #fff;
-  --u-cell-group-border-radius: 12rpx;
-  --u-cell-group-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
-
-:deep(.up-cell) {
-  --u-cell-title-font-size: 28rpx;
-  --u-cell-value-font-size: 28rpx;
-  --u-cell-title-color: #666;
-  --u-cell-value-color: #333;
-  --u-cell-padding: 20rpx 15rpx;
-  --u-cell-border-color: #f5f5f5;
-}
-
-// 相册样式优化（关键：适配图片展示）
-:deep(.up-album) {
-  width: 100%;
-  box-sizing: border-box;
-}
-
-:deep(.up-album__list) {
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0;
-  margin: 0;
-}
-
-:deep(.up-album__item) {
-  width: calc(33.333% - 10rpx);
-  height: 200rpx; // 固定图片高度，避免变形
-  margin: 5rpx;
-  border-radius: 8rpx;
-  overflow: hidden;
-  background-color: #f8f8f8;
-}
-
-:deep(.up-album__image) {
-  width: 100%;
-  height: 100%;
-  object-fit: cover; // 图片裁剪填充，避免拉伸
+  margin-bottom: 20rpx;
 }
 
 
diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
index d5b60cd..7590e54 100644
--- a/pages-sub/daily/maintain-manage/pending-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
@@ -119,7 +119,8 @@ onShow(() => {
 const getPlanDetail = async () => {
   const queryData = {
     planNo: planNo.value,
-    planTypeId: planTypeId.value
+    planTypeId: planTypeId.value,
+    finishState:finishState.value
   }
   console.log(queryData)
   const planInfoRes = await notFinish(queryData)
diff --git a/pages-sub/daily/maintain-manage/road-detail-list.vue b/pages-sub/daily/maintain-manage/road-detail-list.vue
index f5c8885..cde04be 100644
--- a/pages-sub/daily/maintain-manage/road-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/road-detail-list.vue
@@ -50,12 +50,14 @@
             :foot-border-top="false"
             v-for="(item,index) in planList"
             :key="`${item.planNo}_${index}`"
-
         >
           <!-- 自定义标题区域 -->
           <template #head>
             <view class="card-header">
               <view class="common-card-title  u-line-1">{{ item.planName || '无计划名称' }}</view>
+              <!-- 已失效标识 -->
+              <up-text type="error" v-if="item.finishState === '3'"  text="错误" class="invalid-tag"></up-text>
+<!--              <view v-if="item.finishState === '3'" class="invalid-tag">已失效</view>-->
             </view>
           </template>
 
@@ -80,8 +82,12 @@
                       size="mini"
                       @click="submitRecord(item)"
                       class="submit-record-btn"
+
+                      :disabled="item.finishState === '3'"
+                      :class="{ 'disabled-btn': item.finishState === '3' }"
                   >
-                    提交记录
+
+                    {{ item.finishState === '3' ? '补交记录' : '提交记录' }}
                   </up-button>
                 </view>
               </view>
@@ -120,7 +126,6 @@ const activeStatus = ref('1')
 const searchValue = ref('')
 const planList = ref([])
 const pagingRef = ref(null)
-const loading = ref(false)
 const roadId = ref('')
 const finishState = ref('')
 // 搜索占位符
@@ -148,6 +153,10 @@ const handleSearch = () => {
   pagingRef.value?.reload()
 }
 const submitRecord = (item) => {
+  // 已失效状态下直接返回，不执行跳转
+  if (item.finishState === '3') {
+    return
+  }
   console.log('提交记录：', item.finishPercent)
   if (item.finishPercent == 0) {
     uni.navigateTo({
@@ -161,7 +170,6 @@ const submitRecord = (item) => {
 }
 const queryList = async (pageNo, pageSize) => {
   try {
-    loading.value = true
     const paramsData = {
       pageNo: pageNo,
       pageSize: pageSize,
@@ -174,12 +182,10 @@ const queryList = async (pageNo, pageSize) => {
     console.log(res)
     const listData = res?.list || res || []
     pagingRef.value?.complete(listData)
-    loading.value = false
   } catch (error) {
     console.error('请求失败：', error)
     uni.showToast({title: '加载失败，请重试', icon: 'none'})
     pagingRef.value?.complete(false)
-    loading.value = false
   }
 }
 // ========== 生命周期 ==========
@@ -187,9 +193,10 @@ onLoad((options) => {
   getUrlParams(options)
 })
 onShow(() => {
-  if (roadId.value) {
-    pagingRef.value?.reload()
-  }
+  // if (roadId.value) {
+  //   pagingRef.value?.reload()
+  // }
+  pagingRef.value?.reload()
 })
 
 </script>
@@ -197,7 +204,6 @@ onShow(() => {
 <style scoped lang="scss">
 .page-container {
 }
-
 // 顶部吸顶区域样式
 .sticky-header {
   background-color: #ffffff;
@@ -209,6 +215,21 @@ onShow(() => {
   }
 }
 
+// 卡片头部样式
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+// 禁用按钮样式
+.disabled-btn {
+  background-color: #c0c4cc !important;
+  border-color: #c0c4cc !important;
+  color: #fff !important;
+  pointer-events: none; // 防止点击
+  opacity: 0.7;
+}
 
 
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/patrol-manage/add-patrol-record/index.vue b/pages-sub/daily/patrol-manage/add-patrol-record.vue
index af8f8ae..0e7a68e 100644
--- a/pages-sub/daily/patrol-manage/add-patrol-record/index.vue
+++ b/pages-sub/daily/patrol-manage/add-patrol-record.vue
@@ -40,7 +40,7 @@
               del-color="#ff4d4f"
               class="upload-wrap"
           ></up-upload>
-<!--          <view class="tips">（最少1张，最多3张）</view>-->
+          <!--          <view class="tips">（最少1张，最多3张）</view>-->
         </up-form-item>
 
         <!-- 3. 转为工单（单选框） -->
@@ -286,7 +286,7 @@ export default {
         // // 延迟跳转（等待提示框显示完成）
         setTimeout(() => {
           uni.redirectTo({
-            url: '/pages-sub/patrol-manage/patrol-plan/index'
+            url: '/pages-sub/daily/patrol-manage/index'
           })
         }, 1000)
 
diff --git a/pages-sub/daily/patrol-manage/finish-plan-detail/index.vue b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
index e4e56ab..4fb2e07 100644
--- a/pages-sub/daily/patrol-manage/finish-plan-detail/index.vue
+++ b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 页面级加载组件 -->
     <up-loading-page
         v-if="loading"
@@ -10,24 +10,25 @@
 
     <!-- 内容容器 -->
     <view v-else class="content-wrap">
-
-
       <template v-for="(i, index) in orderDetail" :key="index">
         <!-- 工单详情内容 -->
-        <up-cell-group :border="false" inset style="margin: 20rpx;">
-          <!-- 1. 工单编号 -->
+        <up-cell-group :border="false" inset >
+          <!-- 1. 工单名称 -->
           <up-cell
-              :title="i.planName"
-
-              class="up-line-1"
               align="middle"
-          ></up-cell>
+          >
+            <template #title>
+              <view  class="up-line-1">{{i.planName || '--'}}</view>
+            </template>
+<!--            <template #value>-->
+<!--              <view  class="up-line-1">{{orderDetail.planName || '&#45;&#45;'}}</view>-->
+<!--            </template>-->
+          </up-cell>
 
           <!-- 2. 工单位置 -->
           <up-cell
               title="计划编码"
               :value="i.planNo || '--'"
-              class="up-line-1"
               align="middle"
           ></up-cell>
 
@@ -35,20 +36,18 @@
           <up-cell
               title="养护周期"
               :value="`${i.rate}${uni.$dict.getDictLabel('cycle_id_type', i.cycleId)}`"
-              class="up-line-1"
               align="middle"
           ></up-cell>
 
           <!-- 4. 情况描述 -->
           <up-cell
               title="计划有效期"
-              :value="`${timeFormat(i.beginTime,'yy-mm-dd hh:MM:ss')} 至 ${timeFormat(i. endTime,'yy-mm-dd hh:MM:ss')}`"
-              class="up-line-1"
+              :value="`${timeFormat(i.beginTime,'yyyy-mm-dd')} 至 ${timeFormat(i. endTime,'yyyy-mm-dd')}`"
               align="middle"
           ></up-cell>
 
           <!-- 5. 问题照片（核心修复：判断条件+空值处理） -->
-          <up-cell title="照片" >
+          <up-cell title="照片">
             <template #value>
               <view class="cell-content-wrap">
 
@@ -67,26 +66,26 @@
 
           <!-- 7. 处理结果 -->
           <up-cell
-              title="巡查描述"
-              :value="i.remark || '--'"
-              class="up-line-1"
               align="middle"
-              :border="false"
-          ></up-cell>
+          >
+            <template #title>
+              <view  style="min-width: 200rpx">巡查描述</view>
+            </template>
+            <template #value>
+              <view  class="up-line-1">{{i.remark || '--'}}</view>
+            </template>
+          </up-cell>
 
           <up-cell
               title="提交时间"
-              :value="timeFormat(i.finishTime,'yy-mm-dd hh:MM:ss') || '--'"
-              class="up-line-1"
+              :value="timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') || '--'"
               align="middle"
-              :border="false"
-          ></up-cell>
 
+          ></up-cell>
 
           <up-cell
               title="提交人"
               :value="i.userName || '--'"
-              class="up-line-1"
               align="middle"
               :border="false"
           ></up-cell>
@@ -99,10 +98,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from 'vue';
-import { inspectioDetailByPlanno } from "@/api/patrol-manage/patrol-plan";
-import { onLoad, onShow } from '@dcloudio/uni-app';
-import { timeFormat } from '@/uni_modules/uview-plus';
+import {ref} from 'vue';
+import {inspectioDetailByPlanno} from "@/api/patrol-manage/patrol-plan";
+import {onLoad} from '@dcloudio/uni-app';
+import {timeFormat} from '@/uni_modules/uview-plus';
 // 状态管理
 const loading = ref(true);
 const orderDetail = ref([]);
@@ -114,17 +113,13 @@ const orderDetail = ref([]);
 const getOrderDetail = async (plan_no: string) => {
   try {
     loading.value = true;
-    const res = await inspectioDetailByPlanno({ plan_no });
+    const res = await inspectioDetailByPlanno({plan_no});
     console.log('接口返回：', res);
-    // 优化：确保图片数组为数组类型，避免非数组导致渲染错误
-    orderDetail.value = {
-      ...res,
-      problemImgsList: Array.isArray(res.problemImgsList) ? res.problemImgsList : [],
-      completeImgsList: Array.isArray(res.completeImgsList) ? res.completeImgsList : []
-    };
+
+    orderDetail.value = res;
   } catch (error) {
     console.error('获取工单详情失败：', error);
-    uni.showToast({ title: '加载失败，请重试', icon: 'none' });
+    uni.showToast({title: '加载失败，请重试', icon: 'none'});
   } finally {
     loading.value = false;
   }
@@ -132,86 +127,24 @@ const getOrderDetail = async (plan_no: string) => {
 
 // 页面加载
 onLoad((options) => {
-  const { planNo } = options;
+  const {planNo} = options;
   if (planNo) {
     getOrderDetail(planNo);
   } else {
     loading.value = false;
-    uni.showToast({ title: '缺少工单ID', icon: 'none' });
+    uni.showToast({title: '缺少工单ID', icon: 'none'});
   }
 });
 </script>
 
 <style scoped lang="scss">
-// 页面基础样式
-.u-page {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  box-sizing: border-box;
-}
 
 // 内容容器
 .content-wrap {
   background: #fff;
   width: 100%;
   box-sizing: border-box;
-  overflow-y: auto;
-  min-height: calc(100vh - 40rpx);
-}
-
-
-
-// 空文本样式
-.empty-text {
-  color: #999;
-  font-size: 28rpx;
-  line-height: 80rpx;
-  display: block;
-  text-align: left;
-}
-
-// 优化uview组件样式
-:deep(.up-cell-group) {
-  --u-cell-group-background-color: #fff;
-  --u-cell-group-border-radius: 12rpx;
-  --u-cell-group-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
-
-:deep(.up-cell) {
-  --u-cell-title-font-size: 28rpx;
-  --u-cell-value-font-size: 28rpx;
-  --u-cell-title-color: #666;
-  --u-cell-value-color: #333;
-  --u-cell-padding: 20rpx 15rpx;
-  --u-cell-border-color: #f5f5f5;
-}
-
-// 相册样式优化（关键：适配图片展示）
-:deep(.up-album) {
-  width: 100%;
-  box-sizing: border-box;
-}
-
-:deep(.up-album__list) {
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0;
-  margin: 0;
-}
-
-:deep(.up-album__item) {
-  width: calc(33.333% - 10rpx);
-  height: 200rpx; // 固定图片高度，避免变形
-  margin: 5rpx;
-  border-radius: 8rpx;
-  overflow: hidden;
-  background-color: #f8f8f8;
-}
-
-:deep(.up-album__image) {
-  width: 100%;
-  height: 100%;
-  object-fit: cover; // 图片裁剪填充，避免拉伸
+  margin-bottom: 20rpx;
 }
 
 
diff --git a/pages-sub/daily/patrol-manage/patrol-plan/index.vue b/pages-sub/daily/patrol-manage/index.vue
index 715d1e3..a32aac6 100644
--- a/pages-sub/daily/patrol-manage/patrol-plan/index.vue
+++ b/pages-sub/daily/patrol-manage/index.vue
@@ -1,7 +1,8 @@
 <template>
   <view class="page-container">
     <!-- 顶部固定区域：Tabs + 搜索框 -->
-    <view class="top-fixed">
+    <up-sticky>
+      <view class="sticky-header">
       <u-tabs
           :list="tabList"
           :is-scroll="false"
@@ -31,50 +32,69 @@
           style="margin: 20rpx 20rpx 0"
       ></up-search>
     </view>
-
+    </up-sticky>
 
     <z-paging
-        ref="paging"
+        ref="pagingRef"
         v-model="planList"
         @query="queryList"
-
+        :auto-show-system-loading="true"
     >
       <template #empty>
         <empty-view/>
       </template>
       <!-- 计划卡片列表 -->
-      <view class="card-list">
+      <view  class="common-card-list" style="padding-top: 94px;">
+
+        <up-card
+            :border="false"
+            :foot-border-top="false"
+            :head-border-bottom="false"
+            v-for="(item,index) in planList"
+            :key="`${item.batchNo}_${index}`"
+            :show-head="false"
+        >
+          <template #body>
+            <view class="card-body">
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">道路名称：</view>
+                <view class="u-line-1 u-body-value">{{ item.roadName || '-' }}</view>
+              </view>
 
-        <view class="plan-card" v-for="(item, index) in planList" :key="item.batchNo">
-          <view class="card-content">
-            <view class="row-item">
-              <text class="label">道路名称：</text>
-              <text class="value up-line-1">{{ item.roadName }}</text>
-            </view>
-            <view class="row-item">
-              <text class="label">所属街道：</text>
-              <text class="value up-line-1">{{ item.streetName }}</text>
-            </view>
-            <view class="row-item flex-between">
-              <view>
-                <text class="label">养护级别：</text>
-                <text class="value">{{uni.$dict.getDictLabel('conserve_level', item.levelId)}}</text>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">所属街道：</view>
+                <view class="u-line-1 u-body-value">{{ item.streetName }}
+                </view>
               </view>
-              <text class="detail-btn" @click="gotoDetail(item)">计划明细</text>
-            </view>
-            <view class="row-item">
-              <text class="label">计划类型：</text>
 
-              <text class="value up-line-1">  {{uni.$dict.getDictLabel('inspection_maintain_type', item.planTypeId)}}</text>
-            </view>
-            <view class="row-item">
-              <text class="label">计划时间：</text>
-<!--              <text class="value up-line-1">{{ formatPlanTime(item.beginTime, item.endTime) }}</text>-->
-              <text class="value up-line-1">{{ timeFormat(item.beginTime,'yyyy-mm-dd')}} 至 {{ timeFormat(item.endTime,'yyyy-mm-dd')}} </text>
+              <view class="u-body-item u-flex common-item-center common-justify-between">
+                <view class="u-body-item-title">养护级别： {{uni.$dict.getDictLabel('conserve_level', item.levelId) || '-'}}</view>
+                <view class="u-line-1">
+                  <up-button
+                      type="primary"
+                      size="mini"
+                      @click="gotoDetail(item)"
+                      class="submit-record-btn"
+                  >
+                    计划明细
+                  </up-button>
+                </view>
+              </view>
 
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">计划类型：</view>
+                <view class="u-line-1 u-body-value">{{uni.$dict.getDictLabel('inspection_maintain_type', item.planTypeId)}}</view>
+              </view>
+
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">计划时间：</view>
+                <view class="u-line-1 u-body-value">{{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
+                  {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+                </view>
+              </view>
             </view>
-          </view>
-        </view>
+          </template>
+        </up-card>
       </view>
 
     </z-paging>
@@ -92,16 +112,15 @@ const tabList = ref([
   {name: '已失效', id: '3'},
   {name: '已完成', id: '2'}
 ]);
-
+const pagingRef = ref(null)
 const activeTab = ref('1');
 // 搜索相关
 const searchValue = ref('');
 // 分页相关
-const pageNo = ref(1);
-const pageSize = ref(10);
+// const pageNo = ref(1);
+// const pageSize = ref(10);
 
 const planList = ref([]);
-const paging = ref(null);
 
 
 // Tab切换
@@ -110,17 +129,17 @@ const handleTabChange = (val) => {
   console.log(activeTab.value)
   activeTab.value = val.id
   searchValue.value = ''
-  paging.value.reload()
+  pagingRef.value.reload()
 };
 // 搜索/清空搜索
 const handleSearch = () => {
   // searchValue.value = '';
   console.log(searchValue.value)
-  paging.value.reload()
+  pagingRef.value.reload()
 };
 const handleSearchClear = () => {
   // searchValue.value = ''
-  paging.value.reload()
+  pagingRef.value.reload()
 };
 // 加载数据
 const queryList = async (pageNo, pageSize) => {
@@ -134,97 +153,42 @@ const queryList = async (pageNo, pageSize) => {
     console.log('请求参数：', params);
     const res = await inspectionPlanPage(params);
     console.log('接口返回：', res);
-    paging.value.complete(res.list);
+    pagingRef.value.complete(res.list);
   } catch (error) {
     console.error('加载失败：', error);
     // 修复点4：加载失败调用complete(false)
-    paging.value?.complete(false);
+    pagingRef.value?.complete(false);
     uni.showToast({title: '加载失败，请重试', icon: 'none'});
   }
 };
 // 跳转明细
 const gotoDetail = (item) => {
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/pending-plan-detail/index?batchNo=${item.batchNo}&status=${activeTab.value}`
+    url: `/pages-sub/daily/patrol-manage/pending-plan-detail?batchNo=${item.batchNo}&status=${activeTab.value}`
   });
 };
 // 修复点5：优化页面生命周期逻辑
 onLoad(() => {
-  // auto=true时，z-paging会自动触发query，此处可省略手动调用；若需强制初始化，可加：
-  // paging.value?.triggerQuery();
+  // auto=true时，z-pagingRef会自动触发query，此处可省略手动调用；若需强制初始化，可加：
+  // pagingRef.value?.triggerQuery();
 });
 // 仅在页面从明细页返回时，若有数据则刷新当前tab数据（避免干扰上拉加载）
 onShow(() => {
+  pagingRef.value?.reload()
 });
 </script>
 
 <style scoped lang="scss">
-/* 样式保持不变，仅补充z-paging容器高度 */
 .page-container {
-  min-height: 100vh;
-  background-color: #f8f8f8;
-}
-
-.top-fixed {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 999;
-  background-color: #fff;
-  padding-bottom: 10rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
 
-/* 修复：确保列表容器不被顶部遮挡，且z-paging能识别滚动区域 */
-.card-list {
-  padding: 170rpx 20rpx 20rpx;
-  /* 关键：给z-paging足够的滚动空间 */
-}
-
-.plan-card {
-  background-color: #fff;
-  border-radius: 12rpx;
-  padding: 20rpx;
-  margin-bottom: 15rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
-}
-
-.card-content {
-  display: flex;
-  flex-direction: column;
-  gap: 12rpx;
-}
-
-.row-item {
-  display: flex;
-  align-items: center;
-  font-size: 28rpx;
-  line-height: 1.5;
-}
-
-.flex-between {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.label {
-  color: #999;
-  width: 140rpx;
-  flex-shrink: 0;
-}
-
-.value {
-  color: #333;
-  flex: 1;
 }
+.sticky-header {
+  background-color: #ffffff;
+  padding-bottom: 10rpx;
+  border-bottom: 1px solid #eee;
 
-.detail-btn {
-  color: #1989fa;
-  font-size: 26rpx;
-  padding: 0 10rpx;
+  .search-input {
+    margin: 20rpx 20rpx 10rpx !important;
+  }
 }
-
-
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/patrol-manage/pending-plan-detail/index.vue b/pages-sub/daily/patrol-manage/pending-plan-detail.vue
index 7ad2fe2..7e80165 100644
--- a/pages-sub/daily/patrol-manage/pending-plan-detail/index.vue
+++ b/pages-sub/daily/patrol-manage/pending-plan-detail.vue
@@ -1,61 +1,79 @@
 <template>
-  <view class="pending-plan-detail">
-    <!-- 计划详情卡片 -->
-    <view class="detail-card" v-for="i in planInfo" :key="i.planNo">
-      <!-- 标题行 -->
-      <view class="detail-item">
-        <text class="label">计划名称：</text>
-        <text class="value up-line-1">{{ i.planName || '-' }}</text>
-      </view>
-
-      <!-- 计划编码行 -->
-      <view class="detail-item">
-        <text class="label">计划编码：</text>
-        <text class="value up-line-1">{{ i.planNo || '-' }}</text>
-      </view>
-
-      <!-- 养护周期行 -->
-      <view class="detail-item">
-        <text class="label">养护周期：</text>
-        <text class="value up-line-1">{{ i.rate || '-' }} {{ uni.$dict.getDictLabel('cycle_id_type', i.cycleId) }}
-        </text>
-      </view>
-      <!--      cycle_id_type-->
-      <!-- 计划完成次数行 -->
-      <view class="detail-item">
-        <text class="label">计划完成次数：</text>
-        <text class="value up-line-1">{{ i.planNum || 0 }} 次</text>
-      </view>
-
-      <!-- 已完成次数行 + 查看记录按钮 -->
-      <view class="detail-item flex-between">
-        <view class="left-wrap">
-          <text class="label">已完成次数：</text>
-          <text class="value up-line-1">{{ planInfo.i || 0 }} 次</text>
-        </view>
-        <!-- 查看记录按钮（限制宽度+紧凑样式） -->
-
-        <up-button
-            v-if="i.planFinishNum>0"
-            type="primary"
-            size="mini"
-            @click="gotoFinishPlanDetail(i)"
-            :style="{ width: '80px', height: '28px', fontSize: '14px', borderRadius: 4 }"
-        >
-          查看记录
-        </up-button>
-      </view>
-
-      <!-- 计划有效期行 -->
-      <view class="detail-item">
-        <text class="label">计划有效期：</text>
-        <!--        <text class="value up-line-1">{{ planInfo && planInfo.validTime ? planInfo.validTime : '-' }}</text>-->
-        <text class="value up-line-1">{{ timeFormat(i.beginTime, 'yyyy-mm-dd') }} 至
-          {{ timeFormat(i.endTime, 'yyyy-mm-dd') }}
-        </text>
-      </view>
+  <view class="page-container">
+
+    <view class="common-card-list" style=" ">
+      <up-card
+          :border="false"
+          :foot-border-top="false"
+          v-for="(item,index) in planInfo"
+          :key="`${item.planNo}_${index}`"
+      >
+        <!-- 自定义标题区域 -->
+        <template #head>
+          <view class="card-header">
+            <view class="common-card-title  u-line-1">{{ item.planName || '无计划名称' }}</view>
+            <!-- 已失效标识 -->
+            <up-text type="error" v-if="item.finishState === '3'"  text="错误" class="invalid-tag">已失效</up-text>
+            <!--              <view v-if="item.finishState === '3'" class="invalid-tag">已失效</view>-->
+          </view>
+        </template>
+
+        <template #body>
+          <view class="card-body">
+            <view class="u-body-item u-flex">
+              <view class="u-body-item-title">计划编码：</view>
+              <view class="u-line-1 u-body-value">{{ item.planNo || '-' }}</view>
+            </view>
+            <view class="u-body-item u-flex">
+              <view class="u-body-item-title">养护周期：</view>
+              <view class="u-line-1 u-body-value">{{ item.rate || '-' }}
+                {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
+              </view>
+            </view>
+
+            <view class="u-body-item u-flex common-item-center common-justify-between">
+              <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
+              <view class="u-line-1">
+                <up-button
+                    v-if="item.finishState === '3'"
+                    type="primary"
+                    size="mini"
+                    @click="gotoFinishPlanDetail(item)"
+                    class="submit-record-btn"
+                    :disabled="true"
+                >
+                  补交记录
+                </up-button>
+
+                <up-button
+                    v-if="item.finishState !== '3' && item.planFinishNum>0"
+                    type="primary"
+                    size="mini"
+                    @click="gotoFinishPlanDetail(item)"
+                    class="submit-record-btn"
+                >
+                  提交记录
+                </up-button>
+              </view>
+            </view>
+
+            <view class="u-body-item u-flex">
+              <view class="u-body-item-title">已完成次数：</view>
+              <view class="u-line-1 u-body-value">{{ item.planFinishNum || 0 }}</view>
+            </view>
+
+            <view class="u-body-item u-flex">
+              <view class="u-body-item-title">计划有效期：</view>
+              <view class="u-line-1 u-body-value">{{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
+                {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+              </view>
+            </view>
+          </view>
+        </template>
+      </up-card>
     </view>
 
+
     <!-- 底部新增记录按钮     status=3-->
     <view class="fixed-bottom-btn-wrap" v-if="finishState==1">
       <up-button
@@ -111,7 +129,7 @@ const getPlanDetail = async () => {
 // 跳转到已完成计划明细
 const gotoFinishPlanDetail = (i) => {
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/finish-plan-detail/index?planNo=${i.planNo}`
+    url: `/pages-sub/daily/patrol-manage/finish-plan-detail?planNo=${i.planNo}`
 
 
   });
@@ -119,57 +137,11 @@ const gotoFinishPlanDetail = (i) => {
 // 新增记录
 const addNewRecord = () => {
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/add-patrol-record/index?planNo=${planInfo.value[0].planNo}&batchNo=${batchNo.value}`,
+    url: `/pages-sub/daily/patrol-manage/add-patrol-record?planNo=${planInfo.value[0].planNo}&batchNo=${batchNo.value}`,
   });
 };
 </script>
 
 <style scoped lang="scss">
-.pending-plan-detail {
-
-}
-
-.detail-card {
-  padding: 20rpx;
-  background-color: #fff;
-  margin-bottom: 20px;
-}
-
-.detail-item {
-  display: flex;
-  align-items: center;
-  font-size: 28rpx;
-  line-height: 1.8;
-  padding: 10rpx 0;
-  border-bottom: 1px solid #f5f5f5;
-
-  &:last-child {
-    border-bottom: none;
-  }
-}
-
-.flex-between {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  .left-wrap {
-    display: flex;
-    align-items: center;
-    flex: 1; // 占满剩余空间，按钮靠右
-  }
-}
-
-.label {
-  color: #999;
-  width: 200rpx;
-  flex-shrink: 0;
-}
-
-.value {
-  color: #333;
-  flex: 1;
-  word-break: break-all;
-}
 
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/quick-order/index.vue b/pages-sub/daily/quick-order/index.vue
index 766e54c..b67e79b 100644
--- a/pages-sub/daily/quick-order/index.vue
+++ b/pages-sub/daily/quick-order/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 顶部固定搜索栏 -->
     <up-sticky>
       <view class="search-header">
@@ -37,36 +37,62 @@
         ref="paging"
         v-model="orderList"
         @query="queryList"
-        :top="100"
-        :bottom="120"
+        :auto-show-system-loading="true"
     >
       <template #empty>
         <empty-view/>
       </template>
 
-      <!-- 修复：新增列表容器，配置顶部内边距 -->
-      <view class="order-list">
-        <view class="order-card" v-for="item in orderList" :key="item.orderNo">
-          <view class="order-item up-line-1">工单编号：{{ item.orderNo }}</view>
-          <view class="order-item up-line-1">工单位置：{{ item.roadName || '未填写' }}</view>
-          <view class="order-item up-line-1">工单名称：{{ item.orderName || '未填写' }}</view>
-          <view class="order-item up-line-1">情况描述：{{ item.remark || '无' }}</view>
-          <view class="order-footer">
-            <view class="submit-time up-line-1">提交时间：{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
-            <up-button
-                type="primary"
-                size="mini"
-                @click="handleDetail(item)"
-                :style="{ width: '80px', height: '28px', fontSize: '14px', borderRadius: 4 }"
-            >
-              工单详情
-            </up-button>
-          </view>
-        </view>
+      <view class="common-card-list" style=" padding-top: 100rpx;">
+        <up-card
+            :border="false"
+            :foot-border-top="false"
+            v-for="(item,index) in orderList"
+            :key="`${item.orderNo}_${index}`"
+            :show-head="false"
+        >
+
+          <template #body>
+            <view class="card-body">
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">工单编号：</view>
+                <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</view>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">工单位置：</view>
+                <view class="u-line-1 u-body-value">{{ item.roadName || '-' }}</view>
+              </view>
+
+              <view class="u-body-item u-flex ">
+                <view class="u-body-item-title">工单名称：</view>
+                <view class="u-line-1 u-body-value"> {{ item.orderName || '未填写' }}</view>
+              </view>
+
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">情况描述：</view>
+                <view class="u-line-1 u-body-value">{{ item.remark || '无' }}</view>
+              </view>
+
+              <view class="u-body-item u-flex common-item-center common-justify-between">
+                <view class="u-body-item-title u-body-value">提交时间：{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+                <view class="">
+                  <up-button
+                      type="primary"
+                      size="mini"
+                      @click="handleDetail(item)"
+
+                  >
+                    工单详情
+                  </up-button>
+                </view>
+
+              </view>
+            </view>
+          </template>
+        </up-card>
       </view>
     </z-paging>
 
-    <!-- 修复：补充底部按钮样式层级 -->
     <view class="fixed-bottom-btn-wrap">
       <up-button type="primary" size="large" @click="handleAddOrder">
         新增工单
@@ -76,12 +102,9 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref } from 'vue';
 import { workorderPage } from "@/api/quick-order/quick-order";
 import { timeFormat } from '@/uni_modules/uview-plus';
-// ========== 修复1：声明所有核心响应式变量 ==========
-// 顶部/底部高度（rpx）
-// 排序相关：适配up-select的格式
 const selectedSortValue = ref(1);
 // 1 位置 2 工单名称 3 情况描述 4 工单编号
 const sortOptions = ref([
@@ -91,16 +114,13 @@ const sortOptions = ref([
   {name: '编号', id: 4},
 ]);
 // 分页相关（核心：声明orderList）
-const pageNo = ref(1);
-const pageSize = ref(10);
 const paging = ref(null);
 const orderList = ref([]); // 修复：新增列表变量
 // 搜索相关
 const searchValue = ref('');
-// ========== 修复3：适配z-paging回调参数 ==========
+// ========== 适配z-paging回调参数 ==========
 const queryList = async (pageNo, pageSize) => {
   try {
-    // 修复：z-paging的query回调参数是对象 {pageNo, pageSize}
     const apiParams = {
       searchContent: searchValue.value.trim() || '',
       pageNo: pageNo,
@@ -143,8 +163,6 @@ const handleAddOrder = () => {
 </script>
 
 <style scoped lang="scss">
-
-
 // 顶部搜索栏
 .search-header {
   display: flex;
@@ -168,48 +186,10 @@ const handleAddOrder = () => {
       font-size: 28rpx;
     }
   }
-
   .search-input-wrap {
     flex: 3;
   }
 }
 
-// 修复：列表容器样式（核心）
-.order-list {
-  padding: 120rpx 20rpx 20rpx; // 顶部内边距避开搜索栏
-  box-sizing: border-box;
-}
-
-// 工单卡片样式
-.order-card {
-  background-color: #fff;
-  border-radius: 12rpx;
-  padding: 24rpx;
-  margin-bottom: 20rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-
-  .order-item {
-    font-size: 28rpx;
-    color: #333;
-    line-height: 48rpx;
-    margin-bottom: 8rpx;
-  }
-
-  .order-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .submit-time {
-      flex: 1;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      font-size: 26rpx;
-      color: #666;
-    }
-
-  }
-}
 
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/quick-order/order-detail.vue b/pages-sub/daily/quick-order/order-detail.vue
index 21f7353..826a742 100644
--- a/pages-sub/daily/quick-order/order-detail.vue
+++ b/pages-sub/daily/quick-order/order-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 页面级加载组件 -->
     <up-loading-page
         v-if="loading"
@@ -11,14 +11,12 @@
     <!-- 内容容器 -->
     <view v-else class="content-wrap">
       <!-- 空状态 -->
-      <view v-if="!Object.keys(orderDetail).length" class="empty-wrap">
-        <text class="empty-icon">📄</text>
-        <text class="empty-text">暂无工单详情</text>
-        <text class="empty-subtext">请检查工单ID是否正确</text>
+      <view v-if="!Object.keys(orderDetail).length" >
+        <empty-view />
       </view>
 
       <!-- 工单详情内容 -->
-      <up-cell-group :border="false" inset style="margin: 20rpx;" v-else>
+      <up-cell-group :border="false" inset  v-else>
         <!-- 1. 工单编号 -->
         <up-cell
             title="工单编号"
@@ -29,11 +27,16 @@
 
         <!-- 2. 工单位置 -->
         <up-cell
-            title="工单位置"
-            :value="orderDetail.roadName || '--'"
-            class="up-line-1"
             align="middle"
-        ></up-cell>
+        >
+          <template #title>
+            <view  style="min-width: 200rpx">工单位置</view>
+          </template>
+          <template #value>
+            <view  class="up-line-1">{{orderDetail.roadName || '--'}}</view>
+          </template>
+
+        </up-cell>
 
         <!-- 3. 工单名称 -->
         <up-cell
@@ -45,11 +48,15 @@
 
         <!-- 4. 情况描述 -->
         <up-cell
-            title="情况描述"
-            :value="orderDetail.remark || '--'"
-            class="up-line-1"
             align="middle"
-        ></up-cell>
+        >
+          <template #title>
+            <view  style="min-width: 200rpx">情况描述</view>
+          </template>
+          <template #value>
+            <view  class="up-line-1">{{orderDetail.remark || '--'}}</view>
+          </template>
+        </up-cell>
 
         <!-- 5. 问题照片（核心修复：判断条件+空值处理） -->
         <up-cell title="问题照片" >
@@ -87,12 +94,16 @@
 
         <!-- 7. 处理结果 -->
         <up-cell
-            title="处理结果"
-            :value="orderDetail.handleResult || '--'"
-            class="up-line-1"
             align="middle"
             :border="false"
-        ></up-cell>
+        >
+          <template #title>
+            <view  style="min-width: 200rpx">处理结果</view>
+          </template>
+          <template #value>
+            <view  class="up-line-1">{{orderDetail.handleResult || '--'}}</view>
+          </template>
+        </up-cell>
       </up-cell-group>
     </view>
   </view>
@@ -102,6 +113,7 @@
 import { ref, reactive } from 'vue';
 import { inspectionPlanDetail } from "@/api/quick-order/quick-order";
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import EmptyView from "../../../components/empty-view/empty-view.vue";
 
 // 状态管理
 const loading = ref(true);
@@ -145,9 +157,7 @@ onLoad((options) => {
 <style scoped lang="scss">
 // 页面基础样式
 .u-page {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  box-sizing: border-box;
+
 }
 
 // 内容容器
@@ -155,93 +165,9 @@ onLoad((options) => {
   background: #fff;
   width: 100%;
   box-sizing: border-box;
-  overflow-y: auto;
-  min-height: calc(100vh - 40rpx);
-}
-
-
-
-// 空文本样式
-.empty-text {
-  color: #999;
-  font-size: 28rpx;
-  line-height: 80rpx;
-  display: block;
-  text-align: left;
-}
-
-// 优化uview组件样式
-:deep(.up-cell-group) {
-  --u-cell-group-background-color: #fff;
-  --u-cell-group-border-radius: 12rpx;
-  --u-cell-group-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
-
-:deep(.up-cell) {
-  --u-cell-title-font-size: 28rpx;
-  --u-cell-value-font-size: 28rpx;
-  --u-cell-title-color: #666;
-  --u-cell-value-color: #333;
-  --u-cell-padding: 20rpx 15rpx;
-  --u-cell-border-color: #f5f5f5;
-}
-
-// 相册样式优化（关键：适配图片展示）
-:deep(.up-album) {
-  width: 100%;
-  box-sizing: border-box;
 }
 
-:deep(.up-album__list) {
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0;
-  margin: 0;
-}
 
-:deep(.up-album__item) {
-  width: calc(33.333% - 10rpx);
-  height: 200rpx; // 固定图片高度，避免变形
-  margin: 5rpx;
-  border-radius: 8rpx;
-  overflow: hidden;
-  background-color: #f8f8f8;
-}
 
-:deep(.up-album__image) {
-  width: 100%;
-  height: 100%;
-  object-fit: cover; // 图片裁剪填充，避免拉伸
-}
-
-// 原生空状态样式
-.empty-wrap {
-  margin-top: 200rpx;
-  text-align: center;
-}
-
-.empty-icon {
-  font-size: 80rpx;
-  display: block;
-  margin-bottom: 20rpx;
-  color: #ddd;
-}
 
-.empty-text {
-  font-size: 28rpx;
-  color: #999;
-  display: block;
-}
-
-.empty-subtext {
-  font-size: 24rpx;
-  color: #ccc;
-  margin-top: 10rpx;
-  display: block;
-}
-
-// 加载组件样式
-:deep(.up-loading-page) {
-  margin-top: 100rpx;
-}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 2db0d02..c006e8f 100644
--- a/pages.json
+++ b/pages.json
@@ -31,13 +31,13 @@
 			"root": "pages-sub/daily",
 			"pages": [
 				{
-					"path": "patrol-manage/patrol-plan/index",
+					"path": "patrol-manage/index",
 					"style": {
 						"navigationBarTitleText": "巡查计划"
 					}
 				},
 				{
-					"path": "patrol-manage/pending-plan-detail/index",
+					"path": "patrol-manage/pending-plan-detail",
 					"style": {
 						"navigationBarTitleText": "计划明细",
 						"enablePullDownRefresh": false
@@ -45,7 +45,7 @@
 				},
 
 				{
-					"path": "patrol-manage/finish-plan-detail/index",
+					"path": "patrol-manage/finish-plan-detail",
 					"style": {
 						"navigationBarTitleText": "已完成计划明细",
 						"enablePullDownRefresh": false
@@ -53,7 +53,7 @@
 				},
 
 				{
-					"path": "patrol-manage/add-patrol-record/index",
+					"path": "patrol-manage/add-patrol-record",
 					"style": {
 						"navigationBarTitleText": "添加巡查记录",
 						"enablePullDownRefresh": false