From a4ce4276096223506adfe73c27d5eb2303dfec1d Mon Sep 17 00:00:00 2001
From: 刘淇 <290219706@qq.com>
Date: Wed, 21 Oct 2026 14:15:54 +0800
Subject: [PATCH] 秩序管理组长 不让看巡查

---
 pages-sub/daily/maintain-manage/index.vue          |  8 +++++++-
 pages-sub/daily/maintain-manage/type-list-page.vue | 64 +++++++++++++++++++++++++++++-----------------------------------
 pages/index/index.vue                              |  2 +-
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue
index 5baaae1..987d92a 100644
--- a/pages-sub/daily/maintain-manage/index.vue
+++ b/pages-sub/daily/maintain-manage/index.vue
@@ -81,7 +81,7 @@
 <!--                </up-button>-->
 <!--              </view>-->
 
-              <view class="common-custom-btn" style="--btn-top: 28px;"  @click="goToDetail(item)">
+              <view class="common-custom-btn" style="--btn-top: 18px;"  @click="goToDetail(item)">
                 养护任务
               </view>
 <!--              <view class="u-body-item u-flex">-->
@@ -92,6 +92,11 @@
                 <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.planName || '-' }}</view>
+              </view>
+              
 
               <!-- <view class="u-body-item u-flex">
                 <view class="u-body-item-title">所属街道：</view>
@@ -280,6 +285,7 @@ const fetchData = async (pageNo, pageSize) => {
         roadName: searchValue.value.trim(),
         pageNo,
         pageSize,
+        finishState:1
         // finishState: activeStatus.value
       })
 
diff --git a/pages-sub/daily/maintain-manage/type-list-page.vue b/pages-sub/daily/maintain-manage/type-list-page.vue
index c2cdedb..d2339d4 100644
--- a/pages-sub/daily/maintain-manage/type-list-page.vue
+++ b/pages-sub/daily/maintain-manage/type-list-page.vue
@@ -24,11 +24,10 @@
                     <!-- 第二行：任务次数 + 去作业按钮 -->
                     <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 v-else-if="activeStatus === '2'" class="mini-btn" @click.stop="handleGoWork(item)">去查看</view>
-<view v-else-if="activeStatus === '3'" class="mini-btn" @click.stop="handleGoWork(item)">去查看</view>
+                        <!-- 待完成：去作业；已完成：去查看 -->
+                        <view v-if="activeStatus === '1'" class="mini-btn" @click.stop="handleGoWork(item)">去作业</view>
+                        <view v-else-if="activeStatus === '2'" class="mini-btn" @click.stop="handleGoWork(item)">去查看</view>
+                        <view v-else-if="activeStatus === '3'" class="mini-btn" @click.stop="handleGoWork(item)">去查看</view>
                     </view>
                     <!-- 第三行：有效期 + 结束任务按钮 -->
                     <view class="row row-3">
@@ -59,7 +58,6 @@
                 </view>
             </view>
         </up-modal>
-
         <!-- ========== 结束任务二次确认弹窗【新增】 ========== -->
         <up-modal :show="endTaskModalShow" title="提示" :closeOnClickOverlay="false" :showConfirmButton="true"
             :showCancelButton="true" @cancel="handleEndTaskModalCancel" @confirm="confirmEndTask">
@@ -67,7 +65,6 @@
                 <text>确定要结束该任务吗？结束后将不可再去作业。</text>
             </view>
         </up-modal>
-
     </view>
 </template>
 <script setup lang="ts">
@@ -77,16 +74,24 @@ import { useUserStore } from '@/pinia/user';
 import { maintainPlanNum, finishPlan, invalidatePlan } from "@/api/maintain-manage/maintain-manage";
 import { timeFormat } from '@/uni_modules/uview-plus';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
+
+/** 获取当天日期 yyyy-MM-dd */
+const getTodayStr = () => {
+  const d = new Date()
+  const year = d.getFullYear()
+  const month = String(d.getMonth() + 1).padStart(2, '0')
+  const day = String(d.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
 const userStore = useUserStore();
 const userRoles = computed<string[]>(() => userStore.userInfo?.roles || []);
-
 // 判断是否拥有置为失效权限：任意一个组长角色就可以
 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' },
@@ -139,14 +144,21 @@ const loadData = async () => {
         // 遍历state数组，每个状态，循环rawList里面所有batchNo请求
         for (const finishState of stateArr) {
             for (const item of originRawList) {
-                const res = await maintainPlanNum({
+                const apiParams: any = {
                     pageNo: 1,
                     pageSize: 10,
                     planNo: item.planNo || '',
                     planAttr: '',
                     finishState: finishState,
                     batchNo: item.batchNo
-                })
+                }
+                // 待完成状态追加当天日期 beginTime endTime
+                if (activeStatus.value === '1') {
+                    const today = getTodayStr()
+                    apiParams.beginTime = today
+                    apiParams.endTime = today
+                }
+                const res = await maintainPlanNum(apiParams)
                 if (Array.isArray(res.list)) {
                     tempResult.push(...res.list)
                 }
@@ -164,7 +176,6 @@ const loadData = async () => {
 const planTypeId = ref('')
 onLoad((options) => {
     planTypeId.value = options.planTypeId
-
 });
 // onShow 只保留一处，读取storage，只第一次读取storage
 onShow(async () => {
@@ -199,7 +210,6 @@ const handleInvalidModalCancel = () => {
     invalidReason.value = ''
     invalidImgs.clearImgs()
 }
-
 // 确认提交置为失效
 const confirmSetInvalid = async () => {
     const reason = invalidReason.value.trim()
@@ -208,23 +218,23 @@ const confirmSetInvalid = async () => {
         return
     }
     const item = currentInvalidItem.value
-    if (!item || !item.id) return
-
+    if (!item || !item.commitId) {
+        uni.showToast({ title: '缺少commitId，无法操作', icon: 'none' })
+        return
+    }
     uni.showLoading({ title: '提交中...', mask: true })
     try {
         // 获取上传成功图片url数组，拼接逗号
         const imgUrlArr = invalidImgs.getSuccessImgUrls()
         const invalidFiles = imgUrlArr.join(',')
-
         const params = {
-            id: item.id,
+            commitId: item.commitId,
             invalidReason: reason,
             invalidFiles: invalidFiles
         }
         console.log('置为失效提交参数：', params)
         // 调用接口 invalidatePlan
         await invalidatePlan(params)
-
         uni.showToast({ title: '操作成功', icon: 'success' })
         handleInvalidModalCancel()
         // 重新加载数据刷新列表
@@ -237,9 +247,8 @@ const confirmSetInvalid = async () => {
         uni.hideLoading()
     }
 }
-
 const handleGoWork = (item) => {
-  const isView = activeStatus.value 
+  const isView = activeStatus.value
     uni.navigateTo({
         url: `/pages-sub/daily/maintain-manage/now-list-page?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}`
     })
@@ -248,20 +257,17 @@ const handleEndTask = async (item) => {
     currentEndTaskItem.value = item
     endTaskModalShow.value = true
 }
-
 // 关闭结束任务弹窗
 const handleEndTaskModalCancel = () => {
     endTaskModalShow.value = false
     currentEndTaskItem.value = null
 }
-
 // 确认结束任务，真正调用接口【新增】
 const confirmEndTask = async () => {
     const item = currentEndTaskItem.value
     // commitId 由明细列表接口回填（commit_state=1），按钮只在有值时渲染
     if (!item || !item.commitId) return
     endTaskModalShow.value = false
-
     uni.showLoading({ title: '提交中...', mask: true })
     try {
         // 后端 /finish 只认 commitId，且要求本次养护至少有一条有效子上报
@@ -282,7 +288,6 @@ const confirmEndTask = async () => {
         currentEndTaskItem.value = null
     }
 }
-
 // 页面卸载清空，防止内存残留
 onUnload(() => {
     allTotalData.value = []
@@ -294,19 +299,16 @@ onUnload(() => {
     height: 100vh;
     background-color: #f5f5f5;
 }
-
 .sticky-wrap {
     background: #fff;
     border-bottom: 1rpx solid #eee;
 }
-
 .card-list {
     padding: 100rpx 20rpx 20rpx;
     display: flex;
     flex-direction: column;
     gap: 20rpx;
 }
-
 .task-card {
     background: #fff;
     border-radius: 12rpx;
@@ -315,34 +317,29 @@ onUnload(() => {
     flex-direction: column;
     gap: 20rpx;
 }
-
 .row {
     display: flex;
     align-items: center;
     justify-content: space-between;
     gap: 16rpx;
 }
-
 .plan-name {
     font-size: 30rpx;
     color: #333;
     font-weight: 500;
     flex: 1;
 }
-
 .btn-set-invalid {
     font-size: 26rpx;
     color: #1677ff;
     flex-shrink: 0;
     padding-left: 16rpx;
 }
-
 .info-text {
     font-size: 26rpx;
     color: #666;
     flex: 1;
 }
-
 .mini-btn {
     font-size: 24rpx;
     color: #333;
@@ -352,14 +349,12 @@ onUnload(() => {
     padding: 8rpx 20rpx;
     flex-shrink: 0;
 }
-
 // 弹窗样式，和回退弹窗保持一致
 .invalid-modal-content {
     width: 100%;
     box-sizing: border-box;
     padding: 10rpx 0;
 }
-
 .upload-wrap {
     .upload-title {
         font-size: 28rpx;
@@ -367,7 +362,6 @@ onUnload(() => {
         margin-bottom: 10rpx;
     }
 }
-
 .mt-20 {
     margin-top: 20rpx;
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 11725c6..ad286c3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -199,7 +199,7 @@ console.log('当前用户角色数组：', userRoles.value)
 
 // 权限控制角色列表：包含这些角色，则隐藏对应tab
 const hideYhRoleList = ['patrol_leader', 'patrol_global', 'yl_inspector', 'hjws_inspector', 'zxgl_inspector'];
-const hideXjRoleList = ['zxgl_worker', 'team_leader_hjws', 'hjws_worker', 'team_leader_wy', 'wy_worker', 'yl_worker', 'team_leader_yl'];
+const hideXjRoleList = ['zxgl_worker', 'team_leader_hjws', 'hjws_worker', 'team_leader_wy', 'wy_worker', 'yl_worker', 'team_leader_yl','team_leader_zxgl'];
 
 // ✅ 修复：用户角色数组 和 黑名单数组 存在交集 → 隐藏养护tab
 const showMainTabYh = computed(() => {
--
libgit2 0.21.4