From 40ba5f9a42931871104e124bb44becbd6ef979e4 Mon Sep 17 00:00:00 2001
From: 刘淇 <290219706@qq.com>
Date: Mon, 19 Oct 2026 17:06:08 +0800
Subject: [PATCH] 结束二次确定

---
 pages-sub/daily/maintain-manage/type-list-page.vue | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 1 file changed, 81 insertions(+), 52 deletions(-)

diff --git a/pages-sub/daily/maintain-manage/type-list-page.vue b/pages-sub/daily/maintain-manage/type-list-page.vue
index 6ddaee4..fef0130 100644
--- a/pages-sub/daily/maintain-manage/type-list-page.vue
+++ b/pages-sub/daily/maintain-manage/type-list-page.vue
@@ -29,8 +29,9 @@
                     </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') }}
+                        <!-- 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>
@@ -54,11 +55,20 @@
                 </view>
             </view>
         </up-modal>
+
+        <!-- ========== 结束任务二次确认弹窗【新增】 ========== -->
+        <up-modal :show="endTaskModalShow" title="提示" :closeOnClickOverlay="false" :showConfirmButton="true"
+            :showCancelButton="true" @cancel="handleEndTaskModalCancel" @confirm="confirmEndTask">
+            <view class="end-task-modal-content">
+                <text>确定要结束该任务吗？结束后将不可再去作业。</text>
+            </view>
+        </up-modal>
+
     </view>
 </template>
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { onShow, onUnload,onLoad } from '@dcloudio/uni-app'
+import { onShow, onUnload, onLoad } from '@dcloudio/uni-app'
 import { useUserStore } from '@/pinia/user';
 import { maintainPlanNum, finishPlan, invalidatePlan } from "@/api/maintain-manage/maintain-manage";
 import { timeFormat } from '@/uni_modules/uview-plus';
@@ -89,6 +99,9 @@ const allTotalData = ref<any[]>([])
 const invalidModalShow = ref(false)
 const invalidReason = ref('')
 const currentInvalidItem = ref(null)
+// ===================== 结束任务确认弹窗【新增】 =====================
+const endTaskModalShow = ref(false)
+const currentEndTaskItem = ref<any>(null)
 // 图片上传实例，和回退保持一致，最多3张
 const invalidImgs = useUploadImgs({
     maxCount: 3,
@@ -147,7 +160,7 @@ const loadData = async () => {
 const planTypeId = ref('')
 onLoad((options) => {
     planTypeId.value = options.planTypeId
-    
+
 });
 // onShow 只保留一处，读取storage，只第一次读取storage
 onShow(async () => {
@@ -185,40 +198,40 @@ const handleInvalidModalCancel = () => {
 
 // 确认提交置为失效
 const confirmSetInvalid = async () => {
-  const reason = invalidReason.value.trim()
-  if (!reason) {
-    uni.showToast({ title: '请填写失效原因', icon: 'none' })
-    return
-  }
-  const item = currentInvalidItem.value
-  if (!item || !item.id) return
+    const reason = invalidReason.value.trim()
+    if (!reason) {
+        uni.showToast({ title: '请填写失效原因', icon: 'none' })
+        return
+    }
+    const item = currentInvalidItem.value
+    if (!item || !item.id) return
 
-  uni.showLoading({ title: '提交中...', mask: true })
-  try {
-    // 获取上传成功图片url数组，拼接逗号
-    const imgUrlArr = invalidImgs.getSuccessImgUrls()
-    const invalidFiles = imgUrlArr.join(',')
+    uni.showLoading({ title: '提交中...', mask: true })
+    try {
+        // 获取上传成功图片url数组，拼接逗号
+        const imgUrlArr = invalidImgs.getSuccessImgUrls()
+        const invalidFiles = imgUrlArr.join(',')
 
-    const params = {
-      id: item.id,
-      invalidReason: reason,
-      invalidFiles: invalidFiles
-    }
-    console.log('置为失效提交参数：', params)
-    // 调用接口 invalidatePlan
-    await invalidatePlan(params)
+        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)
-    uni.showToast({ title: '提交失败，请重试', icon: 'none' })
-  } finally {
-    uni.hideLoading()
-  }
+        uni.showToast({ title: '操作成功', icon: 'success' })
+        handleInvalidModalCancel()
+        // 重新加载数据刷新列表
+        await loadData()
+        pagingRef.value?.reload()
+    } catch (err) {
+        console.error(err)
+        uni.showToast({ title: '提交失败，请重试', icon: 'none' })
+    } finally {
+        uni.hideLoading()
+    }
 }
 
 const handleGoWork = (item) => {
@@ -228,23 +241,39 @@ const handleGoWork = (item) => {
     })
 }
 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()
-  }
+    currentEndTaskItem.value = item
+    endTaskModalShow.value = true
+}
+
+// 关闭结束任务弹窗
+const handleEndTaskModalCancel = () => {
+    endTaskModalShow.value = false
+    currentEndTaskItem.value = null
+}
+
+// 确认结束任务，真正调用接口【新增】
+const confirmEndTask = async () => {
+    const item = currentEndTaskItem.value
+    if (!item || !item.planNo) return
+    endTaskModalShow.value = false
+
+    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()
+        currentEndTaskItem.value = null
+    }
 }
 
 // 页面卸载清空，防止内存残留
--
libgit2 0.21.4