From df24e712b80a87c155fbe86ef7563377d2e8ad42 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Sun, 14 Dec 2025 19:59:18 +0800
Subject: [PATCH] 养护计划  添加 待优化

---
 pages-sub/daily/maintain-manage/add-record.vue          | 57 ++++++++++++++++++++++++++++++++-------------------------
 pages-sub/daily/maintain-manage/finish-plan-detail.vue  |  2 +-
 pages-sub/daily/maintain-manage/pending-plan-detail.vue |  6 +++---
 pages-sub/daily/maintain-manage/record-detail-list.vue  |  2 +-
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue
index 94d8880..2ba75d2 100644
--- a/pages-sub/daily/maintain-manage/add-record.vue
+++ b/pages-sub/daily/maintain-manage/add-record.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 核心：将所有 up-form-item 包裹在同一个 up-form 内 -->
     <view class="inspect-form-content commonPageLRpadding">
       <up-form
@@ -42,7 +42,7 @@
           ></up-upload>
         </up-form-item>
 
-        <!-- 3. 完成进度（滑块） -->
+        <!-- 3. 完成进度（滑块）- 核心修改：min绑定initProgress -->
         <up-form-item
             label="完成进度"
             prop="progress"
@@ -52,17 +52,18 @@
           <view class="progress-wrap">
             <up-slider
                 v-model="inspectForm.progress"
-                :min="initProgress"
-                :max="100"
-
-                active-color="#1989fa"
-                inactive-color="#e5e5e5"
-                block-size="24"
-                class="progress-slider"
+                :min="0"
+            :max="100"
+            active-color="#1989fa"
+            inactive-color="#e5e5e5"
+            block-size="24"
+            class="progress-slider"
+            @change="handleProgressChange"
             ></up-slider>
             <view class="progress-value">{{ inspectForm.progress }}%</view>
+            <!-- 优化提示文案：动态显示初始进度值 -->
             <view class="progress-tips" v-if="inspectForm.progress <= initProgress">
-              进度低于等于{{ initProgress }}%，无法调整
+              进度不能低于或等于{{ initProgress }}%，请调整
             </view>
           </view>
         </up-form-item>
@@ -135,7 +136,7 @@ export default {
             message: '请设置完成进度',
             trigger: ['change'],
             validator: (rule, value, callback) => {
-              // 自定义校验：进度必须大于初始进度值
+              // 自定义校验：进度必须大于初始进度值（兜底校验）
               if (value <= this.initProgress) {
                 callback(new Error(`完成进度必须大于${this.initProgress}%`))
               } else {
@@ -152,9 +153,9 @@ export default {
     this.paramsOptins = option
 
     // 从URL参数中获取进度值，默认0
-    this.initProgress = option.progress ? Number(option.progress) : 0
-    // 设置表单初始进度值
-    this.inspectForm.progress = this.initProgress
+    this.initProgress = option.finishPercent ? Number(option.finishPercent) : 0
+    // 设置表单初始进度值（若初始进度>0，默认设为初始进度+1，避免刚进入就提示）
+    this.inspectForm.progress = this.initProgress + 1 || 1
 
     console.log('初始进度值：', this.initProgress)
   },
@@ -165,6 +166,21 @@ export default {
   },
   methods: {
     /**
+     * 新增：进度滑块拖动后校验（兜底，防止手动修改值）
+     */
+    handleProgressChange(val) {
+      // 若拖动后值<=初始进度，强制重置为初始进度+1
+      if (val <= this.initProgress) {
+        this.inspectForm.progress = this.initProgress + 1
+        uni.showToast({
+          title: `进度不能低于${this.initProgress}%`,
+          icon: 'none',
+          duration: 1500
+        })
+      }
+    },
+
+    /**
      * 删除图片
      */
     deleteImg(event) {
@@ -300,7 +316,7 @@ export default {
         // 延迟跳转（等待提示框显示完成）
         setTimeout(() => {
           uni.redirectTo({
-            url: '/pages-sub/daily/maintain-manage/road-detail-list'
+            url: '/pages-sub/daily/maintain-manage/index'
           })
         }, 1000)
 
@@ -327,11 +343,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// 全局页面样式
-.u-page {
-  background-color: #f5f5f5;
-  min-height: 100vh;
-}
+
 
 // 巡查表单内容容器
 .inspect-form-content {
@@ -362,10 +374,5 @@ export default {
   }
 }
 
-// 表单项目间距
-.form-item {
-  margin-bottom: 20rpx;
-}
-
 
 </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 5ae7500..2a2fb91 100644
--- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 页面级加载组件 -->
     <up-loading-page
         v-if="loading"
diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
index 4d00c24..d5b60cd 100644
--- a/pages-sub/daily/maintain-manage/pending-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
@@ -93,12 +93,14 @@ const batchNo = ref('')
 const planNo = ref('')
 const finishState = ref('')
 const planTypeId = ref('')
+const finishPercent = ref('')
 
 // 页面加载接收参数（逻辑完全保留）
 onLoad((options) => {
   planNo.value = options.planNo;
   finishState.value = options.finishState
   planTypeId.value = options.planTypeId
+  finishPercent.value = options.finishPercent
 });
 
 // 页面显示时请求数据（逻辑完全保留）
@@ -135,7 +137,7 @@ const gotoFinishPlanDetail = (i) => {
 // 新增记录（逻辑完全保留）
 const addNewRecord = () => {
   uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planInfo.value[0].planNo}&batchNo=${batchNo.value}`,
+    url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}&finishPercent=${finishPercent.value}`,
   });
 };
 </script>
@@ -144,6 +146,4 @@ const addNewRecord = () => {
 .page-container {
 
 }
-
-
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/record-detail-list.vue b/pages-sub/daily/maintain-manage/record-detail-list.vue
index e4e56ab..21a5c25 100644
--- a/pages-sub/daily/maintain-manage/record-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/record-detail-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 页面级加载组件 -->
     <up-loading-page
         v-if="loading"
--
libgit2 0.21.4