diff --git a/api/maintain-manage/maintain-manage.js b/api/maintain-manage/maintain-manage.js
index cd259b7..67ed039 100644
--- a/api/maintain-manage/maintain-manage.js
+++ b/api/maintain-manage/maintain-manage.js
@@ -1,5 +1,5 @@
 
-import { post, get } from '@/common/utils/request';
+import { post, get, put } from '@/common/utils/request';
 
 /**
  * 道路汇总
@@ -34,6 +34,15 @@ export const maintainCreate = (data) => {
 };
 
 /**
+ *  新增养护计划并完成
+ * @returns {Promise}
+ */
+export const maintainCreateFinish = (data) => {
+  return post('/app-api/app/garden/maintain-plan-commit/create-and-finish',data);
+};
+
+
+/**
  *  未完成养护计划
  * @returns {Promise}
  */
@@ -51,3 +60,59 @@ export const detailList = (params) => {
 };
 
 
+/**
+ *  查询单条上报记录
+ * @returns {Promise}
+ */
+export const getDetailList = (params) => {
+  return get('/admin-api/garden/maintain-plan-commit/get',params);
+};
+
+
+
+
+/**
+ *  养护道路
+ * @returns {Promise}
+ */
+export const  maintainPlan= (params) => {
+  return get('/admin-api/garden/maintain-plan/page',params);
+};
+/**
+ *  养护类型次数
+ * @returns {Promise}
+ */
+export const  maintainPlanNum= (params) => {
+  return get('/admin-api/garden/maintain-plan-detail/page',params);
+};
+
+
+/**
+ *  查询上报记录列表
+ * @returns {Promise}
+ */
+export const  maintainPlanList= (params) => {
+  return get('/app-api/app/garden/maintain-plan-commit/page',params);
+};
+
+
+/**
+ *  直接结束
+ * @returns {Promise}
+ */
+export const  finishPlan= (params) => {
+  return post('/app-api/app/garden/maintain-plan-commit/finish',params);
+};
+
+/**
+ *  设为失效
+ * @returns {Promise}
+ */
+export const  invalidatePlan= (params) => {
+  return put('/admin-api/garden/maintain-plan-detail/invalidate',params);
+};
+
+
+
+
+
diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue
index 3c91a41..1de49f5 100644
--- a/pages-sub/daily/maintain-manage/add-record.vue
+++ b/pages-sub/daily/maintain-manage/add-record.vue
@@ -4,44 +4,40 @@
       <up-form label-position="left" :model="inspectForm" ref="inspectFormRef" label-width="140rpx">
         <!-- ========== 动态表单区域 ========== -->
         <template v-for="item in dynamicFields" :key="item.fieldCode">
-          <up-form-item :label="item.fieldName" :prop="item.fieldCode" class="form-item" @click="openPickerIfNeeded(item)">
+          <up-form-item :label="item.fieldName" :prop="item.fieldCode" class="form-item"
+            @click="openPickerIfNeeded(item)">
 
             <!-- type 1 数值：u-number-box，最多2位小数，min=0，max取item.length -->
             <view v-if="item.fieldType === 1" class="number-box-wrap">
-             <u-number-box 
-  v-model="inspectForm[item.fieldCode]" 
-  min="1" 
-  :step="1"
-  :max="item.length ? 10 ** Number(item.length) - 1 : null"
-  :placeholder="`请输入${item.fieldName}${item.unit} `" 
-  @change="valChange(item)"
-  @blur="valChange(item)"
-  class="large-number-box">
-</u-number-box>
+              <u-number-box v-model="inspectForm[item.fieldCode]" min="1" :step="1"
+                :max="item.length ? 10 ** Number(item.length) - 1 : null"
+                :placeholder="`请输入${item.fieldName}${item.unit} `" @change="valChange(item)" @blur="valChange(item)"
+                class="large-number-box">
+              </u-number-box>
 
               <text class="unit-text" v-if="item.unit">{{ item.unit }}</text>
             </view>
             <!-- type 2 文本 -->
             <up-input v-else-if="item.fieldType === 2" v-model="inspectForm[item.fieldCode]"
-                      :maxlength="item.length || 50" :placeholder="`请输入${item.fieldName}`"></up-input>
+              :maxlength="item.length || 50" :placeholder="`请输入${item.fieldName}`"></up-input>
             <!-- 分层选项（3枚举/6多选，且选项带 path）：统一只读入口，点开分组弹层选择。
                  必须放在下面的 3/6 分支之前——v-else-if 短路，放后面就永远进不来 -->
             <up-input v-else-if="isGroupedField(item)" v-model="labelMap[item.fieldCode]" readonly
-                      disabled-color="#ffffff" :placeholder="`请选择${item.fieldName}`" border="none">
+              disabled-color="#ffffff" :placeholder="`请选择${item.fieldName}`" border="none">
               <template #right>
                 <up-icon name="arrow-right" size="16"></up-icon>
               </template>
             </up-input>
             <!-- type3 枚举：多选 multiple=1 使用复选框组（name 必须是 value，提交按逗号拼接 value，与值格式契约一致） -->
             <u-checkbox-group v-else-if="item.fieldType === 3 && item.multiple === 1"
-                              v-model="inspectForm[item.fieldCode]">
+              v-model="inspectForm[item.fieldCode]">
               <u-checkbox v-for="opt in item.selectOptions" :key="opt.value" :label="opt.label" :name="opt.value">
 
               </u-checkbox>
             </u-checkbox-group>
             <!-- type3 枚举：单选 用up-action-sheet 底部选择 -->
             <up-input v-else-if="item.fieldType === 3" v-model="labelMap[item.fieldCode]" readonly
-                      disabled-color="#ffffff" :placeholder="`请选择${item.fieldName}`" border="none">
+              disabled-color="#ffffff" :placeholder="`请选择${item.fieldName}`" border="none">
               <template #right>
                 <up-icon name="arrow-right" size="16"></up-icon>
               </template>
@@ -59,7 +55,7 @@
             <view v-else-if="item.fieldType === 6" class="multi-wrap">
               <u-checkbox-group v-model="inspectForm[item.fieldCode]" @change="onMultiChange(item)">
                 <u-checkbox v-for="opt in item.selectOptions" :key="opt.value" :label="opt.label" :name="opt.value"
-                            :disabled="isOptionLocked(item, opt)">
+                  :disabled="isOptionLocked(item, opt)">
                 </u-checkbox>
               </u-checkbox-group>
               <!-- 有限上限时提示已选数。上限靠「禁用未选中项」实现：u-checkbox 的勾选态在组件内部，回写 v-model 撤不掉 -->
@@ -73,22 +69,12 @@
               </view>
             </view>
             <!-- type7 图片：多张上传，提交 JSON 数组(URL) -->
-        <!-- type7 图片：多张上传，提交 JSON 数组(URL) -->
-<!-- type7 图片：多张上传，提交 JSON 数组(URL)【对齐工单上传组件】 -->
-<up-upload 
-  v-else-if="item.fieldType === 7" 
-  :file-list="fileListMap[item.fieldCode] || []"
-  @after-read="(event) => uploadFieldFiles(item, event)" 
-  @delete="(event) => deleteFieldFile(item, event)"
-  multiple 
-  width="70"
-  height="70"
-  :sizeType="['compressed']"
-  :max-count="pickCountOf(item, 5)" 
-  upload-text="选择图片" 
-  del-color="#ff4d4f"
-  class="upload-wrap"
-></up-upload>
+            <!-- type7 图片：多张上传，提交 JSON 数组(URL) -->
+            <!-- type7 图片：多张上传，提交 JSON 数组(URL)【对齐工单上传组件】 -->
+            <up-upload v-else-if="item.fieldType === 7" :file-list="fileListMap[item.fieldCode] || []"
+              @after-read="(event) => uploadFieldFiles(item, event)" @delete="(event) => deleteFieldFile(item, event)"
+              multiple width="70" height="70" :sizeType="['compressed']" :max-count="pickCountOf(item, 5)"
+              upload-text="选择图片" del-color="#ff4d4f" class="upload-wrap"></up-upload>
 
 
             <!-- type8 附件：微信只能从聊天记录选文件（无通用文件选择器），提交 JSON 数组(URL) -->
@@ -98,21 +84,21 @@
                 <text class="file-del" @click.stop="deleteFieldFile(item, { index: idx })">删除</text>
               </view>
               <up-button size="small" type="primary" plain :text="fileButtonText(item)"
-                         @click.stop="chooseFieldFiles(item)"></up-button>
+                @click.stop="chooseFieldFiles(item)"></up-button>
             </view>
             <!-- type9 关联记录：底部选择，提交 JSON 数组 [{id,name}] -->
             <up-input v-else-if="item.fieldType === 9" v-model="labelMap[item.fieldCode]" readonly
-                      disabled-color="#ffffff" :placeholder="`请选择${item.fieldName}`" border="none">
+              disabled-color="#ffffff" :placeholder="`请选择${item.fieldName}`" border="none">
               <template #right>
                 <up-icon name="arrow-right" size="16"></up-icon>
               </template>
             </up-input>
             <!-- type10 链接：URL 输入，提交裸 URL -->
             <up-input v-else-if="item.fieldType === 10" v-model.trim="inspectForm[item.fieldCode]"
-                      :placeholder="`请输入${item.fieldName}（http/https 开头）`"></up-input>
+              :placeholder="`请输入${item.fieldName}（http/https 开头）`"></up-input>
             <!-- type11 地理位置：uni.chooseLocation 选点，提交 JSON 对象 {lng,lat,address} -->
             <up-input v-else-if="item.fieldType === 11" v-model="labelMap[item.fieldCode]" readonly
-                      disabled-color="#ffffff" :placeholder="`点击选择${item.fieldName}`" border="none">
+              disabled-color="#ffffff" :placeholder="`点击选择${item.fieldName}`" border="none">
               <template #right>
                 <up-icon name="arrow-right" size="16"></up-icon>
               </template>
@@ -138,38 +124,40 @@
         </up-form-item> -->
       </up-form>
     </view>
-    <!-- 底部提交按钮 -->
-   <view v-if="dynamicFields.length === 0" class="empty-field-tip">
-  <text>请去平台配置业务类型字段</text>
-</view>
-<!-- ========== 底部提交按钮：只有存在动态字段才显示 ========== -->
-<view class="fixed-bottom-btn-wrap" v-if="dynamicFields.length > 0">
-<up-button type="primary" text="提交" @click="submitInspect"
-style="width: 100%; height: 88rpx; font-size:32rpx; border-radius: 0;"></up-button>
-</view>
+    <!-- 底部双按钮 -->
+    <view v-if="dynamicFields.length === 0" class="empty-field-tip">
+      <text>请去平台配置业务类型字段</text>
+    </view>
+    <view class="fixed-bottom-btn-wrap" v-if="dynamicFields.length > 0">
+      <view class="btn-item btn-left" @click="submitInspect">
+        <text>提交</text>
+      </view>
+      <view class="btn-item btn-right" @click="submitAndFinish">
+        <text>提交并结束本次任务</text>
+      </view>
+    </view>
     <!-- uview-plus 日期时间选择器（全局复用） -->
     <up-datetime-picker :show="datePickerShow" v-model="datePickerValue" mode="datetime" close-on-click-overlay
-                        @confirm="onDateConfirm" @cancel="onDateClose" @close="onDateClose"></up-datetime-picker>
+      @confirm="onDateConfirm" @cancel="onDateClose" @close="onDateClose"></up-datetime-picker>
     <!-- ActionSheet 底部选择弹窗 -->
     <up-action-sheet :show="actionSheet.show" :actions="actionSheet.options" @select="onActionSheetSelect"
-                     @close="actionSheet.show = false" cancel-text="取消"></up-action-sheet>
+      @close="actionSheet.show = false" cancel-text="取消"></up-action-sheet>
     <!-- 分层选项选择器（选项带 path 的动态字段） -->
     <grouped-picker :show="groupPicker.show" :title="groupPicker.title" :options="groupPicker.options"
-                    :multiple="groupPicker.multiple" :max-count="groupPicker.maxCount"
-                    :need-quantity="groupPicker.needQuantity" :value="groupPicker.value"
-                    :container-width="groupPicker.containerWidth"
-                    :quantities="groupPicker.quantities" @update:show="groupPicker.show = $event"
-                    @confirm="onGroupedConfirm"></grouped-picker>
+      :multiple="groupPicker.multiple" :max-count="groupPicker.maxCount" :need-quantity="groupPicker.needQuantity"
+      :value="groupPicker.value" :container-width="groupPicker.containerWidth" :quantities="groupPicker.quantities"
+      @update:show="groupPicker.show = $event" @confirm="onGroupedConfirm"></grouped-picker>
   </view>
 </template>
 
 <script lang="ts">
 import { uploadImages } from '@/common/utils/upload'
-import { maintainCreate } from "@/api/maintain-manage/maintain-manage"
+import { maintainCreate, maintainCreateFinish } from "@/api/maintain-manage/maintain-manage"
 import { getByType, getOptionsByCode, getMaterialByCode, workRecordSubmit } from "@/api/common"
 export default {
   data() {
     return {
+      submitting: false,
       imagesList: [],
       initProgress: 0,
       inspectForm: {
@@ -234,7 +222,7 @@ export default {
         // 数量单位不再传进弹层（原型列表行右侧只有步进器，没有单位），页面行内仍显示 item.unit
         unit: '',
         // 新增：由父页面点击时赋值
-  containerWidth: 0
+        containerWidth: 0
       }
     }
   },
@@ -328,15 +316,15 @@ export default {
       this.groupPicker.needQuantity = item.fieldType === 6 && this.needQty(item)
       this.groupPicker.value = multiple ? (this.inspectForm[code] || []).slice() : (this.inspectForm[code] || '')
       this.groupPicker.quantities = Object.assign({}, this.qtyMap[code] || {})
-     // ========== 新增：点击打开弹窗瞬间，获取父表单容器宽度 ==========
-  const query = uni.createSelectorQuery().in(this)
-  query.select('.inspect-form-content').boundingClientRect((rect) => {
-    if (rect && rect.width) {
-      // rect.width 单位 px，直接传给子组件
-      this.groupPicker.containerWidth = rect.width
-    }
-    this.groupPicker.show = true
-  }).exec()
+      // ========== 新增：点击打开弹窗瞬间，获取父表单容器宽度 ==========
+      const query = uni.createSelectorQuery().in(this)
+      query.select('.inspect-form-content').boundingClientRect((rect) => {
+        if (rect && rect.width) {
+          // rect.width 单位 px，直接传给子组件
+          this.groupPicker.containerWidth = rect.width
+        }
+        this.groupPicker.show = true
+      }).exec()
     },
     /**
      * 分层弹层确定回调。写入位置与原有两条路径完全一致（inspectForm/labelMap/qtyMap），
@@ -363,8 +351,8 @@ export default {
       // 物料带 currentNum 时在展示名后附库存余量（只影响展示名，提交的 materialName 仍取干净的 opt.label）
       this.actionSheet.options = (item.selectOptions || []).map(opt => {
         const stock = opt.currentNum === null || opt.currentNum === undefined || opt.currentNum === ''
-            ? NaN
-            : Number(opt.currentNum)
+          ? NaN
+          : Number(opt.currentNum)
         return {
           name: isNaN(stock) ? opt.label : `${opt.label}（库存${stock}${opt.unit || ''}）`,
           value: opt.value
@@ -487,9 +475,9 @@ export default {
           // 3物料为标量（领用数量），默认 0 = 本次不领用、不扣库存
           if (field.fieldType === 6 && this.needQty(field)) {
             const qty = {}
-            ;(field.selectOptions || []).forEach(opt => {
-              qty[opt.value] = ''
-            })
+              ; (field.selectOptions || []).forEach(opt => {
+                qty[opt.value] = ''
+              })
             this.qtyMap[field.fieldCode] = qty
           }
           if (field.fieldType === 3 && field.optionSource === 3) {
@@ -657,50 +645,50 @@ export default {
      * 7/8/9/11 的值是数组或对象，async-validator 的 required 按默认 string 类型判定，
      * 会放过「空数组」「null」⇒ 必须用 validator 显式判空，否则未选也能提交
      */
-buildRequiredRule(field: any) {
-  const type = field.fieldType
-  if (type === 6 || type === 7 || type === 8) {
-    const action = type === 6 ? '请选择' : '请上传'
-    return {
-      required: true,
-      trigger: ['change','blur'],
-      validator: (rule, value, callback) => {
-        Array.isArray(value) && value.length > 0 ? callback() : callback(new Error(`${action}${field.fieldName}`))
+    buildRequiredRule(field: any) {
+      const type = field.fieldType
+      if (type === 6 || type === 7 || type === 8) {
+        const action = type === 6 ? '请选择' : '请上传'
+        return {
+          required: true,
+          trigger: ['change', 'blur'],
+          validator: (rule, value, callback) => {
+            Array.isArray(value) && value.length > 0 ? callback() : callback(new Error(`${action}${field.fieldName}`))
+          }
+        }
       }
-    }
-  }
-  if (type === 9 || type === 11) {
-    return {
-      required: true,
-      trigger: ['change','blur'],
-      validator: (rule, value, callback) => {
-        value ? callback() : callback(new Error(type === 9 ? `请选择${field.fieldName}` : `请选择${field.fieldName}的位置`))
+      if (type === 9 || type === 11) {
+        return {
+          required: true,
+          trigger: ['change', 'blur'],
+          validator: (rule, value, callback) => {
+            value ? callback() : callback(new Error(type === 9 ? `请选择${field.fieldName}` : `请选择${field.fieldName}的位置`))
+          }
+        }
       }
-    }
-  }
-  // ========= 新增：数值类型单独校验 =========
-  if (type === 1) {
-    return {
-      required: true,
-      trigger: ['change','blur'],
-      validator: (rule, value, callback) => {
-        // 空字符串、null、undefined 才是空；数字 1,7,100 全部合法
-        if (value === '' || value === null || value === undefined) {
-          callback(new Error(`请填写${field.fieldName}`))
-        } else {
-          callback()
+      // ========= 新增：数值类型单独校验 =========
+      if (type === 1) {
+        return {
+          required: true,
+          trigger: ['change', 'blur'],
+          validator: (rule, value, callback) => {
+            // 空字符串、null、undefined 才是空；数字 1,7,100 全部合法
+            if (value === '' || value === null || value === undefined) {
+              callback(new Error(`请填写${field.fieldName}`))
+            } else {
+              callback()
+            }
+          }
         }
       }
-    }
-  }
-  // 2文本 /4日期 /5布尔 /10链接
-  const action = type === 3 || type === 5 ? '请选择' : '请填写'
-  return { 
-    required: true, 
-    message: `${action}${field.fieldName}`, 
-    trigger: ['change','blur'] 
-  }
-},
+      // 2文本 /4日期 /5布尔 /10链接
+      const action = type === 3 || type === 5 ? '请选择' : '请填写'
+      return {
+        required: true,
+        message: `${action}${field.fieldName}`,
+        trigger: ['change', 'blur']
+      }
+    },
 
     /** 幂等流水号（后端按 userId+clientSeq 去重，命中则返回已存在的 recordId） */
     genClientSeq() {
@@ -727,26 +715,26 @@ buildRequiredRule(field: any) {
     /**
  * 7图片 上传（u-upload 的 after-read 回调）【对齐工单上传逻辑】
  */
-uploadFieldFiles(item: any, event: any) {
-  console.log('动态图片上传', item.fieldName, event)
-  const rawFile = event && event.file
-  const fileList = Array.isArray(rawFile) ? rawFile : [rawFile]
-  const targetImgList = this.fileListMap[item.fieldCode] || (this.fileListMap[item.fieldCode] = [])
-  const filePaths = fileList.map(file => file.url)
-  // const tempItems = fileList.map(item => ({
-  //   ...item,
-  //   status: 'uploading',
-  //   message: '上传中'
-  // }))
-  // const startIndex = targetImgList.length
-  // targetImgList.push(...tempItems)
+    uploadFieldFiles(item: any, event: any) {
+      console.log('动态图片上传', item.fieldName, event)
+      const rawFile = event && event.file
+      const fileList = Array.isArray(rawFile) ? rawFile : [rawFile]
+      const targetImgList = this.fileListMap[item.fieldCode] || (this.fileListMap[item.fieldCode] = [])
+      const filePaths = fileList.map(file => file.url)
+      // const tempItems = fileList.map(item => ({
+      //   ...item,
+      //   status: 'uploading',
+      //   message: '上传中'
+      // }))
+      // const startIndex = targetImgList.length
+      // targetImgList.push(...tempItems)
 
-  this.uploadToField(item, fileList.filter(file => file && file.url).map(file => ({
-    url: file.url,
-    name: file.name || '',
-    size: file.size
-  })))
-},
+      this.uploadToField(item, fileList.filter(file => file && file.url).map(file => ({
+        url: file.url,
+        name: file.name || '',
+        size: file.size
+      })))
+    },
 
     /**
      * 8附件 选择并上传。
@@ -783,65 +771,65 @@ uploadFieldFiles(item: any, event: any) {
      * 把选中的本地文件逐个上传并把 http 地址回填到 fileListMap / inspectForm。
      * 7图片与8附件共用（uploadImages 是通用 uni.uploadFile，不限图片类型）
      */
-   async uploadToField(item: any, files: any[]) {
-const code = item.fieldCode
-const maxCount = this.maxCountOf(item, 5)
-const maxSizeMb = this.maxSizeMbOf(item, 5)
-const validFiles = (files || []).filter(file => file && file.url && !this.isOversize(file, maxSizeMb))
-if (!validFiles.length) {
-return
-}
-const targetList = this.fileListMap[code] || (this.fileListMap[code] = [])
-if (targetList.length + validFiles.length > maxCount) {
-uni.showToast({ title: `最多只能上传${maxCount}个`, icon: 'none' })
-return
-}
-// 保存起始下标
-const startIndex = targetList.length
-// 只在这里push一次
-targetList.push(...validFiles.map(file => ({
-url: file.url, status: 'uploading', message: '上传中', name: file.name || ''
-})))
-try {
-const uploadResultUrls = await uploadImages({
-filePaths: validFiles.map(file => file.url),
-ignoreError: true
+    async uploadToField(item: any, files: any[]) {
+      const code = item.fieldCode
+      const maxCount = this.maxCountOf(item, 5)
+      const maxSizeMb = this.maxSizeMbOf(item, 5)
+      const validFiles = (files || []).filter(file => file && file.url && !this.isOversize(file, maxSizeMb))
+      if (!validFiles.length) {
+        return
+      }
+      const targetList = this.fileListMap[code] || (this.fileListMap[code] = [])
+      if (targetList.length + validFiles.length > maxCount) {
+        uni.showToast({ title: `最多只能上传${maxCount}个`, icon: 'none' })
+        return
+      }
+      // 保存起始下标
+      const startIndex = targetList.length
+      // 只在这里push一次
+      targetList.push(...validFiles.map(file => ({
+        url: file.url, status: 'uploading', message: '上传中', name: file.name || ''
+      })))
+      try {
+        const uploadResultUrls = await uploadImages({
+          filePaths: validFiles.map(file => file.url),
+          ignoreError: true
         })
-uploadResultUrls.forEach((url, index) => {
-// 用startIndex + index 替换对应条目
-if (targetList[startIndex + index]) {
-targetList.splice(startIndex + index, 1, {
-url, status: 'success', message: '', name: validFiles[index].name || ''
+        uploadResultUrls.forEach((url, index) => {
+          // 用startIndex + index 替换对应条目
+          if (targetList[startIndex + index]) {
+            targetList.splice(startIndex + index, 1, {
+              url, status: 'success', message: '', name: validFiles[index].name || ''
             })
           }
         })
-for (let i = uploadResultUrls.length; i < validFiles.length; i++) {
-if (targetList[startIndex + i]) {
-targetList.splice(startIndex + i, 1, {
-url: validFiles[i].url, status: 'failed', message: '上传失败', name: validFiles[i].name || ''
+        for (let i = uploadResultUrls.length; i < validFiles.length; i++) {
+          if (targetList[startIndex + i]) {
+            targetList.splice(startIndex + i, 1, {
+              url: validFiles[i].url, status: 'failed', message: '上传失败', name: validFiles[i].name || ''
             })
           }
         }
-if (uploadResultUrls.length < validFiles.length) {
-uni.showToast({
-title: `成功${uploadResultUrls.length}个，失败${validFiles.length - uploadResultUrls.length}个`,
-icon: 'none'
+        if (uploadResultUrls.length < validFiles.length) {
+          uni.showToast({
+            title: `成功${uploadResultUrls.length}个，失败${validFiles.length - uploadResultUrls.length}个`,
+            icon: 'none'
           })
         }
       } catch (err) {
-console.error(`【${code}】文件上传失败：`, err)
-for (let i = 0; i < validFiles.length; i++) {
-if (targetList[startIndex + i]) {
-targetList.splice(startIndex + i, 1, {
-url: validFiles[i].url, status: 'failed', message: '上传失败', name: validFiles[i].name || ''
+        console.error(`【${code}】文件上传失败：`, err)
+        for (let i = 0; i < validFiles.length; i++) {
+          if (targetList[startIndex + i]) {
+            targetList.splice(startIndex + i, 1, {
+              url: validFiles[i].url, status: 'failed', message: '上传失败', name: validFiles[i].name || ''
             })
           }
         }
-uni.showToast({ title: '上传失败，请重试', icon: 'none' })
+        uni.showToast({ title: '上传失败，请重试', icon: 'none' })
       }
-this.syncFileValue(item)
-this.$refs.inspectFormRef.validateField(code)
-},
+      this.syncFileValue(item)
+      this.$refs.inspectFormRef.validateField(code)
+    },
 
     /**
      * 删除 7图片/8附件 的某一个已选文件
@@ -893,12 +881,12 @@ this.$refs.inspectFormRef.validateField(code)
           fields.push(row)
         } else if (type === 3) {
           // 3枚举：单选取裸 value；历史「枚举+是否多选」存逗号分隔
-         fields.push({
-  fieldCode: code,
-  valueText: item.multiple === 1 
-    ? (Array.isArray(value) ? value.join(',') : String(value || '')) 
-    : String(value)
-})
+          fields.push({
+            fieldCode: code,
+            valueText: item.multiple === 1
+              ? (Array.isArray(value) ? value.join(',') : String(value || ''))
+              : String(value)
+          })
         } else if (type === 6) {
           const selected = (item.selectOptions || []).filter(opt => (value || []).indexOf(opt.value) > -1)
           if (this.needQty(item)) {
@@ -934,6 +922,70 @@ this.$refs.inspectFormRef.validateField(code)
       }
       return fields
     },
+
+    async submitAndFinish() {
+     
+      try {
+        await this.$refs.inspectFormRef.validate()
+        const dynamicValues = this.buildDynamicFields()
+        if (!this.clientSeq) {
+          this.clientSeq = this.genClientSeq()
+        }
+        uni.showLoading({ title: '提交中...' })
+         console.log('dsahdjashj')
+        // this.submitting = true
+
+        // if (!this.commitId) {
+        //   const submitData = {
+        //     planNo: this.paramsOptins.planNo,
+        //     imgHost: this.getImgUrlList(this.imagesList),
+        //     commonUserList: [],
+        //     remark: this.inspectForm.remark.trim(),
+        //   }
+        //   const commitRes: any = await maintainCreate(submitData)
+        //   this.commitId = commitRes && typeof commitRes === 'object' ? commitRes.id : commitRes
+        // }
+
+        // if (dynamicValues.length > 0 && this.commitId) {
+        //   await workRecordSubmit({
+        //     businessType: this.paramsOptins.businessType,
+        //     bizType: 3,
+        //     bizId: this.commitId,
+        //     workTypeId: Number(this.paramsOptins.planTypeId),
+        //     clientSeq: this.clientSeq,
+        //     remark: this.inspectForm.remark.trim(),
+        //     fields: dynamicValues
+        //   })
+        // }
+
+        // 新增：调用【提交并结束】接口
+        await maintainCreateFinish({
+          submitData
+        })
+
+        uni.hideLoading()
+        uni.showToast({ title: '提交并结束任务成功', icon: 'success', duration: 1000 })
+        setTimeout(() => {
+          uni.reLaunch({ url: '/pages-sub/daily/maintain-manage/index' })
+        }, 1000)
+      } catch (error) {
+        uni.hideLoading()
+        // if (Array.isArray(error)) return
+        // console.error('提交并结束失败', error)
+        // const backendMsg = error && error.msg
+        // if (this.commitId) {
+        //   uni.showToast({
+        //     title: backendMsg ? `养护记录已提交：${backendMsg}` : '养护记录已提交，结束任务接口失败',
+        //     icon: 'none', duration: 2500
+        //   })
+        // } else if (!backendMsg) {
+        //   uni.showToast({ title: '提交失败，请重试', icon: 'none', duration: 2000 })
+        // }
+      } finally {
+        // this.submitting = false
+      }
+    },
+
     /**
      * 提交养护记录 —— 双写两条链路：
      * ① maintain-plan-commit/create：养护计划本身（描述 + 图片 + 人员），返回 commit.id
@@ -942,11 +994,12 @@ this.$refs.inspectFormRef.validateField(code)
      */
     async submitInspect() {
       // 调试打印，打开小程序控制台查看
-  console.log('=====调试=====')
-  console.log('dynamicFields', this.dynamicFields)
-  this.dynamicFields.forEach(item=>{
-    console.log(item.fieldCode, this.inspectForm[item.fieldCode], typeof this.inspectForm[item.fieldCode])
-  })
+      console.log('=====调试=====')
+      console.log('dynamicFields', this.dynamicFields)
+      if (this.submitting) return
+      this.dynamicFields.forEach(item => {
+        console.log(item.fieldCode, this.inspectForm[item.fieldCode], typeof this.inspectForm[item.fieldCode])
+      })
       try {
         await this.$refs.inspectFormRef.validate()
         const dynamicValues = this.buildDynamicFields()
@@ -954,6 +1007,7 @@ this.$refs.inspectFormRef.validateField(code)
           this.clientSeq = this.genClientSeq()
         }
         uni.showLoading({ title: '提交中...' })
+        this.submitting = true
         // ① 养护计划本体：仅首次提交时写入
         if (!this.commitId) {
           const submitData = {
@@ -1017,11 +1071,13 @@ this.$refs.inspectFormRef.validateField(code)
 .page-container {
   padding-bottom: 120rpx;
 }
+
 .inspect-form-content {
   background: #fff;
   padding: 20rpx;
   margin-bottom: 20rpx;
 }
+
 .date-input-wrap {
   width: 100%;
 }
@@ -1033,35 +1089,42 @@ this.$refs.inspectFormRef.validateField(code)
     height: 72rpx;
     font-size: 32rpx;
   }
+
   :deep(.u-number-box__btn) {
     width: 64rpx;
     height: 72rpx;
   }
 }
+
 .number-box-wrap {
   display: flex;
   align-items: center;
   gap: 16rpx;
+
   .unit-text {
     font-size: 28rpx;
     color: #333;
   }
 }
+
 // 6多选：复选框组 + needQuantity 时每个已选项一行数量输入
 .multi-wrap {
   width: 100%;
+
   .multi-hint {
     display: block;
     margin-top: 8rpx;
     font-size: 24rpx;
     color: #909399;
   }
+
   .qty-list {
     margin-top: 16rpx;
     padding-left: 20rpx;
     border-left: 4rpx solid #f0f0f0;
   }
 }
+
 // 数量行（6多选的每个已选项 / 3物料的领用数量共用）
 .qty-row {
   display: flex;
@@ -1069,6 +1132,7 @@ this.$refs.inspectFormRef.validateField(code)
   justify-content: space-between;
   gap: 16rpx;
   padding: 8rpx 0;
+
   .qty-label {
     flex: 1;
     min-width: 0;
@@ -1076,20 +1140,24 @@ this.$refs.inspectFormRef.validateField(code)
     color: #333;
   }
 }
+
 .qty-row-material {
   margin-top: 12rpx;
   padding-top: 12rpx;
   border-top: 1rpx solid #f0f0f0;
 }
+
 // 8附件：自绘文件列表 + 选择按钮（微信无通用文件选择器，走 chooseMessageFile）
 .file-wrap {
   width: 100%;
+
   .file-row {
     display: flex;
     align-items: center;
     justify-content: space-between;
     gap: 16rpx;
     padding: 8rpx 0;
+
     .file-name {
       flex: 1;
       min-width: 0;
@@ -1099,6 +1167,7 @@ this.$refs.inspectFormRef.validateField(code)
       white-space: nowrap;
       text-overflow: ellipsis;
     }
+
     .file-del {
       font-size: 26rpx;
       color: #ff4d4f;
@@ -1113,5 +1182,38 @@ this.$refs.inspectFormRef.validateField(code)
   color: #999;
 }
 
+.fixed-bottom-btn-wrap {
+  background-color: #ffffff;
+  display: flex;
+  .btn-item {
+    flex: 1;
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #fff;
+  }
+
+  .btn-left {
+    background: #1989fa;
+  }
+
+  .btn-right {
+    background: #8b572a;
+    /* 褐色 */
+  }
+}
+
+// 页面底部预留空白，防止表单内容被固定按钮遮挡
+.page-container {
+  padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+}
 
+.empty-field-tip {
+  text-align: center;
+  padding: 80rpx 20rpx;
+  font-size: 30rpx;
+  color: #999;
+}
 </style>
diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
index f7e7b62..3400bbf 100644
--- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -154,7 +154,7 @@
 
 <script setup lang="ts">
 import {ref} from 'vue';
-import {detailList} from "@/api/maintain-manage/maintain-manage";
+import {detailList,getDetailList} from "@/api/maintain-manage/maintain-manage";
 import {onLoad} from '@dcloudio/uni-app';
 import {timeFormat} from '@/uni_modules/uview-plus';
 
@@ -199,15 +199,15 @@ const previewImage = (currentUrl, allUrls) => {
 /**
  * 获取工单详情
  */
-const getOrderDetail = async (planNo: string) => {
+const getOrderDetail = async (id: string) => {
   try {
     loading.value = true;
     let queryData = {
-      planNo: planNo,
-      pageSize: 100,
-      pageNo: 1,
+      id: id,
+      // pageSize: 100,
+      // pageNo: 1,
     };
-    const res = await detailList(queryData);
+    const res = await getDetailList(queryData);
     console.log('接口返回：', res);
 
     // 修复2：正确解析接口数据（res.data.list 而非 res.list）
@@ -527,9 +527,9 @@ const openGeo = (geo) => {
 
 // 页面加载
 onLoad((options) => {
-  const {planNo} = options;
-  if (planNo) {
-    getOrderDetail(planNo);
+  const {id} = options;
+  if (id) {
+    getOrderDetail(id);
   } else {
     loading.value = false;
     uni.showToast({title: '缺少工单ID', icon: 'none'});
diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue
index 2a98361..5baaae1 100644
--- a/pages-sub/daily/maintain-manage/index.vue
+++ b/pages-sub/daily/maintain-manage/index.vue
@@ -185,7 +185,7 @@
 <script setup>
 import { ref, computed } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
-import { roadPage, planTypePage } from "@/api/maintain-manage/maintain-manage";
+import {  maintainPlan } from "@/api/maintain-manage/maintain-manage";
 import { timeFormat } from '@/uni_modules/uview-plus';
 
 // 初始化响应式数据
@@ -274,26 +274,14 @@ const handleSearch = () => {
 const fetchData = async (pageNo, pageSize) => {
   try {
     let res = null
-    // 道路类型请求
-    if (activeType.value === '道路') {
-      res = await roadPage({
+   const currentType = typeTabs.value.find(item => item.name === activeType.value)
+      res = await maintainPlan({
+        // planTypeId: currentType?.planTypeId || '',
         roadName: searchValue.value.trim(),
         pageNo,
         pageSize,
-        finishState: activeStatus.value
+        // finishState: activeStatus.value
       })
-    } else {
-      // 其他养护类型请求
-      // 找到当前类型对应的planTypeId
-      const currentType = typeTabs.value.find(item => item.name === activeType.value)
-      res = await planTypePage({
-        planTypeId: currentType?.planTypeId || '',
-        planName: searchValue.value.trim(),
-        pageNo,
-        pageSize,
-        finishState: activeStatus.value
-      })
-    }
 
     // 告诉z-paging数据加载完成
     // res.list为当前页数据，res.total为总条数（如果接口返回）
@@ -313,8 +301,9 @@ const goToDetail = (item) => {
   // })
 
   uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/type-list?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}`
-  })
+    url: `/pages-sub/daily/maintain-manage/type-list?roadName=${encodeURIComponent(item.roadName)}&levelId=${item.levelId}`
+})
+
 }
 
 // 提交记录
diff --git a/pages-sub/daily/maintain-manage/now-list-page.vue b/pages-sub/daily/maintain-manage/now-list-page.vue
index 89487b0..5e9421e 100644
--- a/pages-sub/daily/maintain-manage/now-list-page.vue
+++ b/pages-sub/daily/maintain-manage/now-list-page.vue
@@ -1,121 +1,149 @@
 <template>
-  <view class="page-wrap">
-    <!-- 顶部提示栏 -->
-    <view class="tip-bar">
-      一个任务可提交多次上报记录，每一次作业需如实上报。
-    </view>
-
-    <!-- 上报记录列表 -->
-    <view class="list-wrap" v-if="reportList.length > 0">
-      <view class="report-item" v-for="(item, index) in reportList" :key="index">
-        <view class="item-title">【第{{ item.no }}次上报】{{ item.taskName }}</view>
-       
-        <view class="item-row item-row-bottom">
-          <view class="item-time">提交时间：{{ item.submitTime }}</view>
-          <view class="look-btn" @click="handleView(item)">查看</view>
+    <view class="page-wrap">
+        <!-- 顶部提示栏 -->
+        <view class="tip-bar">
+            一个任务可提交多次上报记录，每一次作业需如实上报。
+        </view>
+        <!-- 上报记录列表 -->
+        <view class="list-wrap" v-if="reportList.length > 0">
+            <view class="report-item" v-for="(item, index) in reportList" :key="index">
+                <view class="item-title">【第{{ index+1 }}次上报】{{ item.planName }}{{ item.planName }}</view>
+                <view class="item-row item-row-bottom">
+                    <view class="item-time">提交时间：{{ item.submitTime }}</view>
+                    <view class="look-btn" @click="handleView(item)">查看</view>
+                </view>
+            </view>
+        </view>
+        <!-- 暂无数据 -->
+        <view class="empty-wrap" v-else>
+            <empty-view text="暂无数据"></empty-view>
+        </view>
+        <!-- 底部固定按钮 -->
+        <view class="fixed-bottom-btn-wrap">
+            <up-button type="primary" size="large" block @click="handleAddReport">上报本次记录</up-button>
         </view>
-      </view>
-    </view>
-
-    <!-- 暂无数据 -->
-    <view class="empty-wrap" v-else>
-      <empty-view text="暂无数据"></empty-view>
-    </view>
-
-    <!-- 底部固定按钮 -->
-    <view class="fixed-bottom-btn-wrap">
-      <up-button type="primary" size="large" block @click="handleAddReport">上报本次记录</up-button>
     </view>
-  </view>
 </template>
-
 <script setup lang="ts">
 import { ref } from 'vue'
+import { onShow, onLoad } from '@dcloudio/uni-app'
+import { maintainPlanList } from "@/api/maintain-manage/maintain-manage";
 
 // 上报记录数据
-const reportList = ref([
-  {
-    no:3,
-    taskName:'德胜门东大街月季补植',
-    varityName:'果汁阳台月季',
-    submitTime:'2026-06-22 14:34:33'
-  },
-  {
-    no:2,
-    taskName:'德胜门东大街月季补植',
-    varityName:'蓝色风暴月季',
-    submitTime:'2026-06-21 10:34:33'
-  },
-  {
-    no:1,
-    taskName:'德胜门东大街月季补植',
-    varityName:'金丝雀月季',
-    submitTime:'2026-06-20 10:34:33'
-  }
-])
+const reportList = ref<any[]>([])
+let planNo = ref('')
+let planTypeId = ref('')
+let businessType = ref('')
+// onLoad接收url传过来的planNo
+onLoad((options) => {
+    if (options.planNo) {
+        planNo.value = options.planNo
+         planTypeId.value = options.planTypeId
+          businessType.value = options.businessType
+        // planTypeId=${item.planTypeId}&businessType=${item.busiLine}
+        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
+        reportList.value = res?.list || []
+    } catch (err) {
+        console.error('获取上报记录失败', err)
+        uni.showToast({ title: '加载失败', icon: 'none' })
+    } finally {
+        uni.hideLoading()
+    }
+}
 
 // 查看上报详情
 const handleView = (item) => {
-  console.log('查看详情', item)
-  uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/finish-plan-detail`
-  })
+    console.log('查看详情', item)
+    uni.navigateTo({
+        url: `/pages-sub/daily/maintain-manage/finish-plan-detail?id=${item.commitId}`
+    })
 }
-
-// 新增上报记录
+// 新增上报记录，把planNo带到新增页面
 const handleAddReport = () => {
-  console.log('上报本次记录')
-     uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/add-record`
-  })
+    console.log('上报本次记录')
+    uni.navigateTo({
+        url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}&planTypeId=${planTypeId.value}&businessType=${businessType.value}`
+    })
 }
 </script>
-
 <style scoped lang="scss">
 .page-wrap {
-  min-height: 100vh;
-  padding-bottom: 120rpx; // 给底部按钮预留空间
-  background: #ffffff;
+    min-height: 100vh;
+    padding-bottom: 120rpx; // 给底部按钮预留空间
+    background: #ffffff;
 }
+
 // 顶部黄色提示条
 .tip-bar {
-  background-color: #f9e0a2;
-  color: #6b4b00;
-  font-size: 28rpx;
-  padding:24rpx 20rpx;
-  line-height:1.5;
+    background-color: #f9e0a2;
+    color: #6b4b00;
+    font-size: 28rpx;
+    padding: 24rpx 20rpx;
+    line-height: 1.5;
 }
 
 .list-wrap {
-  padding: 0;
+    padding: 0;
 }
+
 .report-item {
-  padding:30rpx 24rpx;
-  border-bottom:1rpx solid #eee;
-  .item-title {
-    font-size:32rpx;
-    color:#222;
-    font-weight:500;
-    margin-bottom:20rpx;
-  }
-  .item-row {
-    font-size:28rpx;
-    color:#555;
-    margin-bottom:12rpx;
-  }
-  .item-row-bottom {
-    display:flex;
-    justify-content:space-between;
-    align-items:center;
-    margin-bottom:0;
-  }
-  .look-btn {
-    font-size:28rpx;
-    color:#1989fa;
-  }
+    padding: 30rpx 24rpx;
+    border-bottom: 1rpx solid #eee;
+
+    .item-title {
+        font-size: 32rpx;
+        color: #222;
+        font-weight: 500;
+        margin-bottom: 20rpx;
+    }
+
+    .item-row {
+        font-size: 28rpx;
+        color: #555;
+        margin-bottom: 12rpx;
+    }
+
+    .item-row-bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 0;
+    }
+
+    .look-btn {
+        font-size: 28rpx;
+        color: #1989fa;
+    }
 }
+
 .empty-wrap {
-  padding-top: 120rpx;
+    padding-top: 120rpx;
 }
 
+.fixed-bottom-btn-wrap {
+    //   position: fixed;
+    //   bottom: 0;
+    //   left:0;
+    //   width:100%;
+    //   padding:20rpx;
+    //   background:#fff;
+}
 </style>
diff --git a/pages-sub/daily/maintain-manage/type-list-page.vue b/pages-sub/daily/maintain-manage/type-list-page.vue
index de65692..6ddaee4 100644
--- a/pages-sub/daily/maintain-manage/type-list-page.vue
+++ b/pages-sub/daily/maintain-manage/type-list-page.vue
@@ -1,168 +1,186 @@
 <template>
-  <view class="page-container">
-    <up-sticky>
-      <view class="sticky-wrap">
-        <up-tabs
-          v-model="activeStatus"
-          :list="statusTabs"
-          line-width="40rpx"
-          active-color="#1989fa"
-          inactive-color="#666"
-          :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="row row-1">
-            <view class="plan-name u-line-1">{{ item.planName || '无计划名称' }}</view>
-            <view
-              v-if="isMaintainLeader"
-              class="btn-set-invalid"
-              @click.stop="handleSetInvalid(item)"
-            >
-              置为失效
+    <view class="page-container">
+        <up-sticky>
+            <view class="sticky-wrap">
+                <up-tabs v-model="activeStatus" :list="statusTabs" line-width="40rpx" active-color="#1989fa"
+                    inactive-color="#666" :scrollable="false" @change="handleStatusChange"></up-tabs>
             </view>
-          </view>
-          <!-- 第二行：任务次数 + 去作业按钮 -->
-          <view class="row row-2">
-            <view class="info-text">任务次数：第{{ item.taskTimes || 1 }}次</view>
-            <view class="mini-btn" @click.stop="handleGoWork(item)">去作业</view>
-          </view>
-          <!-- 第三行：有效期 + 结束任务按钮 -->
-          <view class="row row-3">
-            <view class="info-text u-line-1">有效期：{{ item.beginTime || '-' }}—{{ item.endTime || '-' }}</view>
-            <view class="mini-btn" @click.stop="handleEndTask(item)">结束任务</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">
-        <up-textarea
-          v-model.trim="invalidReason"
-          placeholder="请输入失效原因（必填）"
-          rows="6"
-          :count="200"
-          maxlength="200"
-          class="invalid-textarea"
-        />
-        <view class="upload-wrap mt-20">
-          <view class="upload-title">上传图片（选填）</view>
-          <up-upload
-            :file-list="invalidImgs.rawImgList.value || []"
-            @after-read="invalidImgs.uploadImgs"
-            @delete="invalidImgs.deleteImg"
-            multiple
-            width="70"
-            height="70"
-            :max-count="invalidImgs.uploadConfig.maxCount"
-            :upload-text="invalidImgs.uploadConfig.uploadText"
-            :size-type="invalidImgs.uploadConfig.sizeType"
-          />
-        </view>
-      </view>
-    </up-modal>
-  </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="row row-1">
+                        <view class="plan-name u-line-1">{{ item.planName || '无计划名称' }}</view>
+                        <!-- 权限：包含team_leader_yl / team_leader_wy / team_leader_hjws 并且当前是待完成tab，才显示置为失效 -->
+                        <view v-if="hasInvalidPerm && activeStatus === '1'" class="btn-set-invalid"
+                            @click.stop="handleSetInvalid(item)">
+                            置为失效
+                        </view>
+                    </view>
+                    <!-- 第二行：任务次数 + 去作业按钮 -->
+                    <view class="row row-2">
+                        <view class="info-text">任务次数：第{{ item.plannum || 1 }}次</view>
+                        <!-- 仅待完成才显示去作业 -->
+                        <view v-if="activeStatus === '1'" class="mini-btn" @click.stop="handleGoWork(item)">去作业</view>
+                    </view>
+                    <!-- 第三行：有效期 + 结束任务按钮 -->
+                    <view class="row row-3">
+                         <!-- timeFormat(start, 'yyyy-mm-dd'), --> 
+                        <view class="info-text u-line-1">有效期：{{  timeFormat(item.beginTime, 'yyyy-mm-dd') }}—{{ timeFormat(item.endTime, 'yyyy-mm-dd') }}
+                        </view>
+                        <!-- 仅待完成才显示结束任务 -->
+                        <view v-if="activeStatus === '1'" class="mini-btn" @click.stop="handleEndTask(item)">结束任务</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">
+                <up-textarea v-model.trim="invalidReason" placeholder="请输入失效原因（必填）" rows="6" :count="200"
+                    maxlength="200" class="invalid-textarea" />
+                <view class="upload-wrap mt-20">
+                    <view class="upload-title">上传图片（选填）</view>
+                    <up-upload :file-list="invalidImgs.rawImgList.value || []" @after-read="invalidImgs.uploadImgs"
+                        @delete="invalidImgs.deleteImg" multiple width="70" height="70"
+                        :max-count="invalidImgs.uploadConfig.maxCount"
+                        :upload-text="invalidImgs.uploadConfig.uploadText"
+                        :size-type="invalidImgs.uploadConfig.sizeType" />
+                </view>
+            </view>
+        </up-modal>
+    </view>
 </template>
-
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
+import { onShow, onUnload,onLoad } from '@dcloudio/uni-app'
 import { useUserStore } from '@/pinia/user';
-// 引入图片上传hook（和你回退弹窗同一个工具）
+import { maintainPlanNum, finishPlan, invalidatePlan } from "@/api/maintain-manage/maintain-manage";
+import { timeFormat } from '@/uni_modules/uview-plus';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
-
 const userStore = useUserStore();
 const userRoles = computed<string[]>(() => userStore.userInfo?.roles || []);
-const isMaintainLeader = computed(() => userRoles.value.includes('yl_worker'))
+
+// 判断是否拥有置为失效权限：任意一个组长角色就可以
+const hasInvalidPerm = computed(() => {
+    const roles = userRoles.value
+    const leaderRoles = ['team_leader_yl', 'team_leader_wy', 'team_leader_hjws']
+    return leaderRoles.some(key => roles.includes(key))
+})
 
 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)
 const currentList = ref([])
-
+// 保存上一页传过来的原始数组
+let originRawList: any[] = []
+// 合并之后全部接口返回的总数据
+const allTotalData = ref<any[]>([])
 // ===================== 失效弹窗状态 =====================
 const invalidModalShow = ref(false)
 const invalidReason = ref('')
 const currentInvalidItem = ref(null)
 // 图片上传实例，和回退保持一致，最多3张
 const invalidImgs = useUploadImgs({
-  maxCount: 3,
-  uploadText: '选择失效图片',
-  sizeType: ['compressed'],
-  formRef: null,
-  fieldName: 'invalidImgs'
+    maxCount: 3,
+    uploadText: '选择失效图片',
+    sizeType: ['compressed'],
+    formRef: null,
+    fieldName: 'invalidImgs'
 })
-
-const mockAllData = [
-  { planNo: 'MH20260616001', planName: '德胜门东大街大街月季补植', taskTimes: 1, beginTime: '2026/06/16', endTime: '2026/12/31', finishState: '1' },
-  { planNo: 'MH20260616002', planName: '西长安街行道树修剪养护作业任务', taskTimes: 2, beginTime: '2026/05/01', endTime: '2026/11/30', finishState: '1' },
-  { planNo: 'MH20260616003', planName: '北三环绿地浇水、防寒养护专项任务超长名称测试文字溢出', taskTimes: 1, beginTime: '2026/04/10', endTime: '2026/12/20', finishState: '1' },
-  { planNo: 'MH20260616004', planName: '奥森园区绿地保洁日常养护', taskTimes: 3, beginTime: '2026/03/01', endTime: '2026/10/15', finishState: '3' },
-  { planNo: 'MH20260616005', planName: '护城河沿岸病虫害防治专项作业', taskTimes: 2, beginTime: '2026/02/15', endTime: '2026/09/30', finishState: '2' },
-  { planNo: 'MH20260616006', planName: '朝阳公园施肥、除草春季养护任务', taskTimes: 1, beginTime: '2026/04/05', endTime: '2026/11/10', finishState: '1' },
-  { planNo: 'MH20260616007', planName: '中关村大街灌木修剪与枯枝清理', taskTimes: 4, beginTime: '2026/01/20', endTime: '2026/12/25', finishState: '1' },
-  { planNo: 'MH20260616008', planName: '永定河滨河绿地冬季防寒浇水作业', taskTimes: 1, beginTime: '2026/07/01', endTime: '2026/12/31', finishState: '3' },
-  { planNo: 'MH20260616009', planName: '颐和园外围绿带病虫害防治', taskTimes: 2, beginTime: '2026/05/20', endTime: '2026/10/20', finishState: '2' },
-  { planNo: 'MH20260616010', planName: '上地街道行道树补植更换任务', taskTimes: 1, beginTime: '2026/06/01', endTime: '2026/12/20', finishState: '1' }
-]
-
+// 加载数据，根据当前activeStatus动态调用接口
+const loadData = async () => {
+    // originRawList = uni.getStorageSync('temp_maintain_rawList')
+    console.log('123123')
+    if (!originRawList || originRawList.length === 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']
+        }
+        // 遍历state数组，每个状态，循环rawList里面所有batchNo请求
+        for (const finishState of stateArr) {
+            for (const item of originRawList) {
+                const res = await maintainPlanNum({
+                    pageNo: 1,
+                    pageSize: 10,
+                    planNo: item.planNo || '',
+                    planAttr: '',
+                    finishState: finishState,
+                    batchNo: item.batchNo
+                })
+                if (Array.isArray(res.list)) {
+                    tempResult.push(...res.list)
+                }
+            }
+        }
+        allTotalData.value = tempResult
+    } catch (err) {
+        console.error('批量请求接口异常', err)
+        uni.showToast({ title: '数据加载失败', icon: 'none' })
+    } finally {
+        uni.hideLoading()
+        pagingRef.value?.reload()
+    }
+}
+const planTypeId = ref('')
+onLoad((options) => {
+    planTypeId.value = options.planTypeId
+    
+});
+// onShow 只保留一处，读取storage，只第一次读取storage
+onShow(async () => {
+    originRawList = uni.getStorageSync('temp_maintain_rawList') || []
+    // ✅ 读取完立刻删除，防止脏数据
+    // uni.removeStorageSync('temp_maintain_rawList')
+    await loadData()
+})
+// z-paging分页查询，直接使用allTotalData
 const fetchData = async (pageNo, pageSize) => {
-  await new Promise(resolve => setTimeout(resolve, 400))
-  const filterList = mockAllData.filter(item => item.finishState === activeStatus.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 = (item) => {
-  activeStatus.value = item.id
-  pagingRef.value?.reload()
+const handleStatusChange = async (tabItem) => {
+    activeStatus.value = tabItem.id
+    // 切换tab，重新拉接口
+    await loadData()
 }
-
 // 打开失效弹窗
 const handleSetInvalid = (item) => {
-  currentInvalidItem.value = item
-  invalidReason.value = ''
-  invalidImgs.clearImgs()
-  invalidModalShow.value = true
+    currentInvalidItem.value = item
+    invalidReason.value = ''
+    invalidImgs.clearImgs()
+    invalidModalShow.value = true
 }
-
 // 关闭弹窗，重置数据
 const handleInvalidModalCancel = () => {
-  invalidModalShow.value = false
-  invalidReason.value = ''
-  invalidImgs.clearImgs()
+    invalidModalShow.value = false
+    invalidReason.value = ''
+    invalidImgs.clearImgs()
 }
 
 // 确认提交置为失效
@@ -173,23 +191,27 @@ const confirmSetInvalid = async () => {
     return
   }
   const item = currentInvalidItem.value
-  if (!item) return
+  if (!item || !item.id) return
 
   uni.showLoading({ title: '提交中...', mask: true })
   try {
-    // 这里后续替换真实接口，获取上传图片url： invalidImgs.getSuccessImgUrls()
-    const imgList = invalidImgs.getSuccessImgUrls()
-    console.log('置为失效提交参数：', {
-      planNo: item.planNo,
-      reason,
-      imgList
-    })
+    // 获取上传成功图片url数组，拼接逗号
+    const imgUrlArr = invalidImgs.getSuccessImgUrls()
+    const invalidFiles = imgUrlArr.join(',')
 
-    // ============ 此处替换后端接口调用 ============
-    // await api.setTaskInvalid({ ... })
+    const params = {
+      id: item.id,
+      invalidReason: reason,
+      invalidFiles: invalidFiles
+    }
+    console.log('置为失效提交参数：', params)
+    // 调用接口 invalidatePlan
+    await invalidatePlan(params)
 
     uni.showToast({ title: '操作成功', icon: 'success' })
     handleInvalidModalCancel()
+    // 重新加载数据刷新列表
+    await loadData()
     pagingRef.value?.reload()
   } catch (err) {
     console.error(err)
@@ -200,84 +222,117 @@ const confirmSetInvalid = async () => {
 }
 
 const handleGoWork = (item) => {
-   
-      uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/now-list-page?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}`
-  })
+    uni.navigateTo({
+        // 重点：把planNo传过去
+        url: `/pages-sub/daily/maintain-manage/now-list-page?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}`
+    })
+}
+const handleEndTask = async (item) => {
+    console.log(item)
+  uni.showLoading({ title: '提交中...', mask: true })
+  try {
+    // 接口 finishPlan，传 planNo
+    await finishPlan({
+      planNo: item.planNo
+    })
+    uni.showToast({ title: '结束任务成功', icon: 'success' })
+    // 操作成功，重新加载数据，刷新列表
+    await loadData()
+    pagingRef.value?.reload()
+  } catch (err) {
+    console.error('结束任务失败', err)
+    uni.showToast({ title: '结束任务失败，请重试', icon: 'none' })
+  } finally {
+    uni.hideLoading()
+  }
 }
-const handleEndTask = (item) => console.log('结束任务', item)
 
-onShow(() => pagingRef.value?.reload())
+// 页面卸载清空，防止内存残留
+onUnload(() => {
+    allTotalData.value = []
+    originRawList = []
+})
 </script>
-
 <style scoped lang="scss">
 .page-container {
-  height: 100vh;
-  background-color: #f5f5f5;
+    height: 100vh;
+    background-color: #f5f5f5;
 }
+
 .sticky-wrap {
-  background: #fff;
-  border-bottom: 1rpx solid #eee;
+    background: #fff;
+    border-bottom: 1rpx solid #eee;
 }
+
 .card-list {
-  padding:100rpx 20rpx 20rpx;
-  display: flex;
-  flex-direction: column;
-  gap: 20rpx;
+    padding: 100rpx 20rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
 }
+
 .task-card {
-  background: #fff;
-  border-radius: 12rpx;
-  padding: 24rpx;
-  display: flex;
-  flex-direction: column;
-  gap: 20rpx;
+    background: #fff;
+    border-radius: 12rpx;
+    padding: 24rpx;
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
 }
+
 .row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 16rpx;
 }
+
 .plan-name {
-  font-size: 30rpx;
-  color: #333;
-  font-weight: 500;
-  flex: 1;
+    font-size: 30rpx;
+    color: #333;
+    font-weight: 500;
+    flex: 1;
 }
+
 .btn-set-invalid {
-  font-size: 26rpx;
-  color: #1677ff;
-  flex-shrink: 0;
-  padding-left: 16rpx;
+    font-size: 26rpx;
+    color: #1677ff;
+    flex-shrink: 0;
+    padding-left: 16rpx;
 }
+
 .info-text {
-  font-size: 26rpx;
-  color: #666;
-  flex: 1;
+    font-size: 26rpx;
+    color: #666;
+    flex: 1;
 }
+
 .mini-btn {
-  font-size: 24rpx;
-  color: #333;
-  background: #f5f5f5;
-  border: 1rpx solid #ddd;
-  border-radius: 6rpx;
-  padding: 8rpx 20rpx;
-  flex-shrink: 0;
+    font-size: 24rpx;
+    color: #333;
+    background: #f5f5f5;
+    border: 1rpx solid #ddd;
+    border-radius: 6rpx;
+    padding: 8rpx 20rpx;
+    flex-shrink: 0;
 }
 
 // 弹窗样式，和回退弹窗保持一致
 .invalid-modal-content {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 10rpx 0;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10rpx 0;
 }
+
 .upload-wrap {
-  .upload-title {
-    font-size: 28rpx;
-    color: #333;
-    margin-bottom: 10rpx;
-  }
+    .upload-title {
+        font-size: 28rpx;
+        color: #333;
+        margin-bottom: 10rpx;
+    }
+}
+
+.mt-20 {
+    margin-top: 20rpx;
 }
-.mt-20 { margin-top: 20rpx; }
 </style>
diff --git a/pages-sub/daily/maintain-manage/type-list.vue b/pages-sub/daily/maintain-manage/type-list.vue
index 30c0bd4..4d0e57a 100644
--- a/pages-sub/daily/maintain-manage/type-list.vue
+++ b/pages-sub/daily/maintain-manage/type-list.vue
@@ -1,87 +1,204 @@
 <template>
-  <view class="tag-wrap">
-    <!-- 动态渲染标签列表 -->
-    <view class="tag-item" v-for="(item, idx) in tagList" :key="idx" hover-class="tag-item--hover" @click="toNextPage">
-      <view class="tag-text">
-        <!-- 文字区域：超长省略号，数字括号单独放后面，永远可见 -->
-        <text class="tag-name">{{ item.label }}</text>
-        <text class="tag-count">（{{ item.count }}）</text>
-      </view>
-     
+    <view class="tag-wrap">
+        <!-- 动态渲染标签列表 -->
+        <template v-if="tagList.length > 0">
+            <view class="tag-item" v-for="(item, idx) in tagList" :key="idx" hover-class="tag-item--hover"
+                @click="toNextPage(item)">
+                <view class="tag-text">
+                    <!-- 文字区域：超长省略号，数字括号单独放后面，永远可见 -->
+                    <text class="tag-name">{{ item.label }}</text>
+                    <text class="tag-count">（{{ item.count }}）</text>
+                </view>
+            </view>
+        </template>
+        <template v-else>
+            <view style="padding-top: 30px;text-align: center;width: 100%;">暂无养护类型，请去平台配置</view>
+        </template>
     </view>
-  </view>
 </template>
-
 <script setup lang="ts">
 import { ref } from 'vue'
-
-// 数据源，完全动态，你可以接口返回覆盖
-const tagList = ref([
-  { label: '补植', count: 5 },
-  { label: '修剪', count: 2 },
-  { label: '浇水、防寒', count: 3 },
-  { label: '绿地保洁', count: 3 },
-  { label: '病虫害防治', count: 3 },
-  { label: '施肥、除草', count: 4 },
-  // 测试超长文本
-  { label: '非常长的养护任务名称测试文字溢出效果', count: 9 },
-])
-
-const toNextPage = (item)=> {
+import { maintainPlan, maintainPlanNum } from "@/api/maintain-manage/maintain-manage";
+import { getDictLabel } from '@/common/utils/dict';
+import { useUserStore } from '@/pinia/user';
+// 新增维护仓库
+// import { useMaintainStore } from '@/pinia/maintain';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const userStore = useUserStore();
+// const maintainStore = useMaintainStore();
+// 标签列表，合并之后的数据结构
+// rawList：保存该分类下全部原始数据，用于点击跳转
+const tagList = ref<Array<{
+    label: string,
+    count: number,
+    rawList: any[],
+    planTypeId: string | number
+}>>([])
+const roadName = ref<string | null>(null)
+const levelId = ref<string | null>(null)
+onLoad((options) => {
+    roadName.value = decodeURIComponent(options.roadName)
+    levelId.value = decodeURIComponent(options.levelId);
+});
+onShow(() => {
+    if (!roadName.value) {
+        uni.showToast({
+            title: '道路不存在',
+            icon: 'none'
+        });
+        return;
+    }
+    fetchData();
+});
+// 第一步：获取plan列表
+const fetchData = async () => {
+    try {
+        const res = await maintainPlan({
+            roadName: roadName.value,
+            levelId: levelId.value
+        })
+        console.log('maintainPlan返回', res)
+        if (!Array.isArray(res.list) || res.list.length === 0) {
+            tagList.value = []
+            uni.showToast({
+                title: '暂无养护类型',
+                icon: 'none'
+            });
+            return
+        }
+        await requestBatchList(res.list)
+    } catch (error) {
+        console.error('请求失败：', error)
+        uni.showToast({ title: '网络异常，请重试', icon: 'none' })
+    }
+}
+// 串行遍历所有batchNo，逐个调用第二个接口
+const requestBatchList = async (list: any[]) => {
+    const resultTags: any[] = []
+    for (const item of list) {
+        try {
+            const numRes = await maintainPlanNum({
+                pageNo: 1,
+                pageSize: 10,
+                planNo: '',
+                planAttr: item.planAttr ?? '',
+                finishState: 1,
+                batchNo: item.batchNo
+            })
+            const total = numRes?.total || 0
+            // 字典转换，把planTypeId转为养护类型名称
+            const typeLabel = getDictLabel('maintain_type', item.planTypeId)
+            resultTags.push({
+                label: typeLabel,
+                planTypeId: item.planTypeId,
+                count: total,
+                // 保留原始整条数据
+                originItem: item
+            })
+        } catch (err) {
+            console.error('batch请求异常', item.batchNo, err)
+            const typeLabel = getDictLabel('maintain_type', item.planTypeId)
+            resultTags.push({
+                label: typeLabel,
+                planTypeId: item.planTypeId,
+                count: 0,
+                originItem: item
+            })
+        }
+    }
+    console.log(resultTags)
+    // ========== 分组合并相同养护类型，count累加，保存原始数组 ==========
+    const groupMap = new Map<string, {
+        count: number,
+        rawList: any[],
+        planTypeId: string | number
+    }>()
+    for (const item of resultTags) {
+        console.log(item);
+        const name = item.label
+        if (!name) continue // 过滤字典为空的脏数据
+        if (groupMap.has(name)) {
+            const groupData = groupMap.get(name)!
+            groupData.count += item.count
+            groupData.rawList.push(item.originItem)
+        } else {
+            groupMap.set(name, {
+                count: item.count,
+                rawList: [item.originItem],
+                planTypeId: item.planTypeId
+            })
+        }
+    }
+    // map转为数组给页面渲染
+    const groupList: any[] = []
+    groupMap.forEach((group, label) => {
+        groupList.push({
+            label,
+            count: group.count,
+            rawList: group.rawList,
+            planTypeId: group.planTypeId
+        })
+    })
+    tagList.value = groupList
+    console.log(tagList.value)
+}
+// 标签点击跳转，rawList存入storage，并且把planTypeId拼到url传给下一页
+const toNextPage = (item: any) => {
+    // maintainStore.setRawList(item.rawList)
+    uni.setStorageSync('temp_maintain_rawList', item.rawList)
     uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/type-list-page?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}`
-  })
+        url: `/pages-sub/daily/maintain-manage/type-list-page?planTypeId=${item.planTypeId}`
+    })
 }
 </script>
-
 <style scoped lang="scss">
 .tag-wrap {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 24rpx;
-  padding: 30rpx;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 24rpx;
+    padding: 30rpx;
 }
 
 .tag-item {
-  display: inline-flex;
-  align-items: center;
-  background: #e8f3ff;
-  border: 1rpx solid #94c5ff;
-  border-radius: 8rpx;
-  padding: 16rpx 24rpx;
-  max-width: 320rpx; // 限制标签最大宽度，超出自动省略
-  transition: all 0.2s;
-  &--hover {
-    background: #d8eaff;
-  }
+    display: inline-flex;
+    align-items: center;
+    background: #e8f3ff;
+    border: 1rpx solid #94c5ff;
+    border-radius: 8rpx;
+    padding: 16rpx 24rpx;
+    max-width: 320rpx; // 限制标签最大宽度，超出自动省略
+    transition: all 0.2s;
+
+    &--hover {
+        background: #d8eaff;
+    }
 }
 
 .tag-text {
-  display: flex;
-  align-items: center;
-  flex: 1;
-  overflow: hidden;
+    display: flex;
+    align-items: center;
+    flex: 1;
+    overflow: hidden;
 }
 
 .tag-name {
-  // 核心：文字超长省略，只对名称生效
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #1677ff;
-  font-size: 28rpx;
+    // 核心：文字超长省略，只对名称生效
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: #1677ff;
+    font-size: 28rpx;
 }
 
 .tag-count {
-  color: #1677ff;
-  font-size: 28rpx;
-  flex-shrink: 0; // 重点！禁止压缩，保证（数字）永远显示
-  margin-left: 4rpx;
+    color: #1677ff;
+    font-size: 28rpx;
+    flex-shrink: 0; // 重点！禁止压缩，保证（数字）永远显示
+    margin-left: 4rpx;
 }
 
 .tag-icon {
-  flex-shrink: 0;
-  margin-left: 12rpx;
+    flex-shrink: 0;
+    margin-left: 12rpx;
 }
 </style>
-
diff --git a/pinia/maintain.js b/pinia/maintain.js
new file mode 100644
index 0000000..ed6e830
--- /dev/null
+++ b/pinia/maintain.js
@@ -0,0 +1,16 @@
+import { defineStore } from 'pinia'
+export const useMaintainStore = defineStore('maintain', {
+  state() {
+    return {
+      planRawList: []
+    }
+  },
+  actions: {
+    setRawList(list) {
+      this.planRawList = list 
+    },
+    clearRawList() {
+      this.planRawList = []
+    }
+  }
+})