详细

刘淇
1 parent 1d77d32a
Showing 4 changed files with 54 additions and 165 deletions
pages-sub/daily/maintain-manage/finish-plan-detail.vue
pages-sub/daily/maintain-manage/index.vue
pages-sub/daily/maintain-manage/type-list-page.vue
pages-sub/daily/maintain-manage/type-list.vue
@@ -85,11 +85,7 @@
             </template>
           </up-cell> -->
-          <up-cell
-              title="提交时间"
-              :value="i.createTime==null?'--':timeFormat(i.createTime,'yyyy-mm-dd hh:MM:ss')"
-              align="middle"
-          ></up-cell>
+         
           <up-cell
               title="提交人"
@@ -97,6 +93,12 @@
               align="middle"
           ></up-cell>
+
+          <up-cell
+              title="提交时间"
+              :value="i.createTime==null?'--':timeFormat(i.createTime,'yyyy-mm-dd hh:MM:ss')"
+              align="middle"
+          ></up-cell>
         </up-cell-group>
         <!-- 动态配置的养护字段填报值（garden_work_record/garden_work_field_value），未填报过则整段不显示 -->
@@ -108,6 +110,11 @@
     title=""
 >
   <up-cell v-for="(f, fi) in i.fieldRows" :key="fi"  align="middle">
+     <!-- <up-cell
+              title="提交时间"
+              :value="i.createTime==null?'--':timeFormat(i.createTime,'yyyy-mm-dd hh:MM:ss')"
+              align="middle"
+          ></up-cell> -->
     <template #title>
 <view class="field-cell-title-multi">{{f.name}}</view>
   </template>
@@ -199,8 +206,8 @@ const previewImage = (currentUrl, allUrls) =&gt; {
 /**
  * 获取工单详情
  */
-const getOrderDetail = async (planNo: string, commitId?: string, workRecordIndex: number = 0) => {
-  console.log('===传入的workRecordIndex===', workRecordIndex)
+const getOrderDetail = async (planNo: string, commitId?: string) => {
+  console.log('getOrderDetail')
   try {
     loading.value = true;
     let queryData: any = {
@@ -216,21 +223,13 @@ const getOrderDetail = async (planNo: string, commitId?: string, workRecordIndex
     const list = res.data?.list || res.list || [];
     orderDetail.value = list.map(item => {
-      let useValues: any[] = []
-      // 取 workRecords 指定下标的 values
-      if (Array.isArray(item.workRecords) && item.workRecords.length > 0) {
-        const targetRecord = item.workRecords[workRecordIndex];
-        if (targetRecord && Array.isArray(targetRecord.values)) {
-          useValues = targetRecord.values
-        }
-      }
+      // ✅直接使用接口返回的 item.fields，不再读取 workRecords
+      const useValues = Array.isArray(item.fields) ? item.fields : []
       return {
         ...item,
-        // ✅这里直接拿 workRecords[index].values，传给buildFieldRow渲染
         fieldRows: useValues.map(buildFieldRow)
       }
     })
-
   } catch (error) {
     console.error('获取工单详情失败：', error);
     uni.showToast({title: '加载失败，请重试', icon: 'none'});
@@ -241,6 +240,7 @@ const getOrderDetail = async (planNo: string, commitId?: string, workRecordIndex
+
 // ========== 动态配置字段（fieldValue）展示 ==========
 // 解析口径与 PC 端 FieldValueCell.vue + WorkRecordTab.vue 保持一致：
 // 后端 valueText 是「类型无关直拷、提交无校验」，历史格式与脏数据都可能出现，故所有解析一律降级、不抛异常。
@@ -540,16 +540,15 @@ const openGeo = (geo) =&gt; {
   // const workRecordIndex = ref(0)
 // 页面加载
 onLoad((options) => {
-  const {planNo, commitId ,index} = options;
-  console.log("load:"+index)
-  const workRecordIndex= Number(index) 
+  const {planNo, commitId } = options;
   if (planNo) {
-    getOrderDetail(planNo, commitId,workRecordIndex);
+    getOrderDetail(planNo, commitId);
   } else {
     loading.value = false;
     uni.showToast({title: '缺少工单ID', icon: 'none'});
   }
 });
+
 </script>
 <style scoped lang="scss">
@@ -81,7 +81,7 @@
 <!--                </up-button>-->
 <!--              </view>-->
-              <view class="common-custom-btn" style="--btn-top: 18px;"  @click="goToDetail(item)">
+              <view class="common-custom-btn" style="--btn-top: 48px;"  @click="goToDetail(item)">
                 养护任务
               </view>
 <!--              <view class="u-body-item u-flex">-->
@@ -104,6 +104,12 @@
                 </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('business_line', item.busiLine) || item.busiLine || '-' }}</view>
+</view>
+
+
               <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>
@@ -302,14 +308,11 @@ const fetchData = async (pageNo, pageSize) =&gt; {
 // 跳转到计划明细页面
 const goToDetail = (item) => {
-  // uni.navigateTo({
-  //   url: `/pages-sub/daily/maintain-manage/road-detail-list?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}`
-  // })
-
+  // 存入完整对象给下一页
+  uni.setStorageSync('temp_maintain_item', item)
   uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/type-list?roadName=${encodeURIComponent(item.roadName)}&planTypeId=${item.planTypeId}`
-})
-
+    url: `/pages-sub/daily/maintain-manage/type-list`
+  })
 }
 // 提交记录
@@ -48,14 +48,14 @@
         <up-modal :show="invalidModalShow" title="提示" :closeOnClickOverlay="false" :showConfirmButton="true"
             :showCancelButton="true" @cancel="handleInvalidModalCancel" @confirm="confirmSetInvalid">
             <view class="invalid-modal-content">
-                <text>确定要置为失效该任务吗？</text>
+                <text>确定置为失效吗？</text>
             </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>
+                <text>确定要结束吗？</text>
             </view>
         </up-modal>
     </view>
@@ -18,143 +18,41 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
-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：保存该分类下全部原始数据，用于点击跳转
+import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+
 const tagList = ref<Array<{
-    label: string,
-    count: number,
-    rawList: any[],
     planTypeId: string | number
+    planTypeName: string
+    batchNos: string[]
+    todayPendingCount: 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) {
+    // 从storage拿上一页传过来完整对象
+    const item = uni.getStorageSync('temp_maintain_item')
+    if (!item) {
         uni.showToast({
-            title: '道路不存在',
+            title: '数据异常，请返回重试',
             icon: 'none'
         });
         return;
     }
-    fetchData();
+    // 直接取planTypes
+    tagList.value = item.planTypes || []
 });
-// 第一步：获取plan列表
-const fetchData = async () => {
-    try {
-        const res = await maintainPlan({
-            roadName: roadName.value,
-            //  roadName: '月坛南街',
-             pageNo:1,
-        pageSize:100,
-             finishState:1
-            // levelId: levelId.value
-        })
-        console.log('maintainPlan返回', res)
-        if (res.list.length  == 0) {
-            tagList.value = []
-            uni.showToast({
-                title: '暂无养护类型',
-                icon: 'none'
-            });
-            return
-        }
-         tagList.value = res.list[0].planTypes
-        // 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传给下一页
+
+// 标签点击跳转，batchNos存入storage，并且把planTypeId拼到url传给下一页
 const toNextPage = (item: any) => {
-    // maintainStore.setRawList(item.rawList)
     uni.setStorageSync('temp_maintain_rawList', item.batchNos)
     uni.navigateTo({
         url: `/pages-sub/daily/maintain-manage/type-list-page?planTypeId=${item.planTypeId}`
     })
 }
+
+// 页面卸载清理缓存，防止脏数据
+onUnload(()=>{
+    uni.removeStorageSync('temp_maintain_item')
+})
 </script>
 <style scoped lang="scss">
 .tag-wrap {
@@ -163,7 +61,6 @@ const toNextPage = (item: any) =&gt; {
     gap: 24rpx;
     padding: 30rpx;
 }
-
 .tag-item {
     display: inline-flex;
     align-items: center;
@@ -171,39 +68,29 @@ const toNextPage = (item: any) =&gt; {
     border: 1rpx solid #94c5ff;
     border-radius: 8rpx;
     padding: 16rpx 24rpx;
-    max-width: 320rpx; // 限制标签最大宽度，超出自动省略
+    max-width: 320rpx;
     transition: all 0.2s;
-
     &--hover {
         background: #d8eaff;
     }
 }
-
 .tag-text {
     display: flex;
     align-items: center;
     flex: 1;
     overflow: hidden;
 }
-
 .tag-name {
-    // 核心：文字超长省略，只对名称生效
     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;
-}
-
-.tag-icon {
     flex-shrink: 0;
-    margin-left: 12rpx;
+    margin-left: 4rpx;
 }
 </style>