Merge remote-tracking branch 'origin/dev' into dev

王彪总
2 parents cd63e10a 00d835da
Showing 4 changed files with 70 additions and 42 deletions
common/config/env.js
pages-sub/daily/maintain-manage/finish-plan-detail.vue
pages-sub/daily/maintain-manage/now-list-page.vue
pages-sub/daily/maintain-manage/type-list-page.vue
@@ -2,12 +2,12 @@
 const env = {
   // 开发环境
   development: {
-    baseUrl: 'http://192.168.1.55:48081',
+       baseUrl: 'https://test.jichengshanshui.com.cn:28302',
     // https://test.jichengshanshui.com.cn:28302
  
     // baseUrl: 'http://192.168.1.111:48081',
  
-    uploadUrl: 'http://192.168.1.55:48081',
+    uploadUrl: 'https://test.jichengshanshui.com.cn:28302',
     // baseApi:'admin-api',
     // appApi:'app-api'
   },
@@ -199,10 +199,10 @@ const previewImage = (currentUrl, allUrls) =&gt; {
 /**
  * 获取工单详情
  */
-const getOrderDetail = async (planNo: string, commitId?: string) => {
+const getOrderDetail = async (planNo: string, commitId?: string, workRecordIndex: number = 0) => {
+  console.log('===传入的workRecordIndex===', workRecordIndex)
   try {
     loading.value = true;
-    // 后端 page 接口支持 commitId 精确过滤：从上报记录列表点「查看」时只展示这一条
     let queryData: any = {
       planNo: planNo,
       pageSize: commitId ? 1 : 100,
@@ -213,17 +213,24 @@ const getOrderDetail = async (planNo: string, commitId?: string) =&gt; {
     }
     const res = await detailList(queryData);
     console.log('接口返回：', res);
-
-    // 修复2：正确解析接口数据（res.data.list 而非 res.list）
     const list = res.data?.list || res.list || [];
-    // 预解析动态字段，避免模板里重复 JSON.parse
-    orderDetail.value = list.map(item => ({
-      ...item,
-      fieldRows: (item.fields || []).map(buildFieldRow)
-    }));
-
-    // 调试：打印格式化后的图片URL
-    console.log('格式化后图片URL：', formatImageUrls(orderDetail.value[0]?.beginImgList || []));
+
+    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
+        }
+      }
+      return {
+        ...item,
+        // ✅这里直接拿 workRecords[index].values，传给buildFieldRow渲染
+        fieldRows: useValues.map(buildFieldRow)
+      }
+    })
+
   } catch (error) {
     console.error('获取工单详情失败：', error);
     uni.showToast({title: '加载失败，请重试', icon: 'none'});
@@ -232,6 +239,8 @@ const getOrderDetail = async (planNo: string, commitId?: string) =&gt; {
   }
 };
  
+
+
 // ========== 动态配置字段（fieldValue）展示 ==========
 // 解析口径与 PC 端 FieldValueCell.vue + WorkRecordTab.vue 保持一致：
 // 后端 valueText 是「类型无关直拷、提交无校验」，历史格式与脏数据都可能出现，故所有解析一律降级、不抛异常。
@@ -528,12 +537,14 @@ const openGeo = (geo) =&gt; {
     fail: () => uni.showToast({title: '地图打开失败', icon: 'none'})
   });
 };
-
+  // const workRecordIndex = ref(0)
 // 页面加载
 onLoad((options) => {
-  const {planNo, commitId} = options;
+  const {planNo, commitId ,index} = options;
+  console.log("load:"+index)
+  const workRecordIndex= Number(index) 
   if (planNo) {
-    getOrderDetail(planNo, commitId);
+    getOrderDetail(planNo, commitId,workRecordIndex);
   } else {
     loading.value = false;
     uni.showToast({title: '缺少工单ID', icon: 'none'});
@@ -10,7 +10,7 @@
                 <view class="item-title">【第{{ item.sortNum || (index + 1) }}次上报】{{ planName }}</view>
                 <view class="item-row item-row-bottom">
                     <view class="item-time">提交时间：{{ timeFormat(item.createTime,'yyyy-mm-dd hh:MM:ss')}}</view>
-                    <view class="look-btn" @click="handleView(item,reportList[0])">查看</view>
+                    <view class="look-btn" @click="handleView(index,item,reportList[0])">查看</view>
                 </view>
             </view>
         </view>
@@ -92,11 +92,12 @@ const getReportList = async () =&gt; {
     }
 }
 // 查看上报详情
-const handleView = (item,i) => {
+const handleView = (index,item,i) => {
     console.log('查看详情', item)
+     console.log('查看详情', index)
     uni.navigateTo({
         // 后端 page 接口支持 commitId 精确过滤，必须带上，否则会把该计划全部上报都展示出来
-        url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${i.planNo}&commitId=${i.commitId}`
+        url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${i.planNo}&commitId=${i.commitId}&index=${index}`
     })
 }
 // 新增上报记录，把planNo + currentCommitId带到新增页面
@@ -23,9 +23,9 @@
                     </view>
                     <!-- 第二行：任务次数 + 去作业按钮 -->
                     <view class="row row-2">
-                         <view class="info-text"  v-if="activeStatus === '2'">完成次数：{{ item.planFinishNum }}次</view>
+                        <view class="info-text" v-if="activeStatus === '2'">完成次数：{{ item.planFinishNum }}次</view>
                         <view class="info-text" v-else>任务次数：第{{ item.planFinishNum +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="handleGoWorkLook(item)">去查看</view>
@@ -37,8 +37,8 @@
                         <view class="info-text u-line-1">有效期：{{ timeFormat(item.beginTime, 'yyyy-mm-dd') }}—{{
                             timeFormat(item.endTime, 'yyyy-mm-dd') }}
                         </view>
-                        <!-- 仅待完成且存在进行中的本次养护时才显示结束任务（commitId 由后端按 commit_state=1 回填） -->
-                        <view v-if="activeStatus === '1' && item.commitId" class="mini-btn"
+                        <!-- ✅ 修改：去掉item.commitId判断，待完成tab就一直展示结束任务 -->
+                        <view v-if="activeStatus === '1'" class="mini-btn"
                             @click.stop="handleEndTask(item)">结束任务</view>
                     </view>
                 </view>
@@ -66,7 +66,6 @@ import { onShow, onUnload, onLoad } from &#39;@dcloudio/uni-app&#39;
 import { useUserStore } from '@/pinia/user';
 import { maintainPlanNum, finishPlan, invalidatePlan, maintainCreate } from "@/api/maintain-manage/maintain-manage";
 import { timeFormat } from '@/uni_modules/uview-plus';
-
 /** 获取当天日期 yyyy-MM-dd */
 const getTodayStr = () => {
   const d = new Date()
@@ -101,7 +100,6 @@ const currentInvalidItem = ref(null)
 // ===================== 结束任务确认弹窗 =====================
 const endTaskModalShow = ref(false)
 const currentEndTaskItem = ref<any>(null)
-
 // 加载数据，根据当前activeStatus动态调用接口
 const loadData = async () => {
     console.log('123123')
@@ -150,7 +148,7 @@ const loadData = async () =&gt; {
         allTotalData.value = tempResult
     } catch (err) {
         console.error('批量请求接口异常', err)
-        uni.showToast({ title: '数据加载失败', icon: 'none' })
+        uni.showToast({ title: err.msg || '数据加载失败', icon: 'none', duration:2000 })
     } finally {
         uni.hideLoading()
         pagingRef.value?.reload()
@@ -193,7 +191,7 @@ const confirmSetInvalid = async () =&gt; {
     const item = currentInvalidItem.value
     console.log(currentInvalidItem.value)
     if (!item) {
-        uni.showToast({ title: '数据异常', icon: 'none' })
+        uni.showToast({ title: '数据异常', icon: 'none', duration:2000 })
         return
     }
     uni.showLoading({ title: '提交中...', mask: true })
@@ -213,25 +211,25 @@ const confirmSetInvalid = async () =&gt; {
             targetCommitId = createRes && typeof createRes === 'object' ? createRes.id : createRes
             if (!targetCommitId) {
                 uni.hideLoading()
-                uni.showToast({ title: '创建养护草稿失败，无法置为失效', icon: 'none' })
+                uni.showToast({ title: '创建养护草稿失败，无法置为失效', icon: 'none', duration:2000 })
                 return
             }
         }
-      
         const params = {
             commitId: targetCommitId,
+            invalidReason: '管理员手动置为失效',
+            invalidFiles: ''
         }
         console.log('置为失效提交参数：', params)
-         console.log(params.commitId)
-        await invalidatePlan({ commitId: params.commitId })
-        uni.showToast({ title: '操作成功', icon: 'success' })
+        await invalidatePlan(params)
+        uni.showToast({ title: '操作成功', icon: 'success', duration:2000 })
         handleInvalidModalCancel()
         // 重新加载数据刷新列表
         await loadData()
         pagingRef.value?.reload()
     } catch (err) {
         console.error(err)
-        uni.showToast({ title: '提交失败，请重试', icon: 'none' })
+        uni.showToast({ title: err?.msg || '提交失败，请重试', icon: 'none', duration:2000 })
     } finally {
         uni.hideLoading()
     }
@@ -248,8 +246,6 @@ const handleGoWorkLook = (item) =&gt; {
         url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}`
     })
 }
-
-
 const handleEndTask = async (item) => {
     currentEndTaskItem.value = item
     endTaskModalShow.value = true
@@ -259,23 +255,43 @@ const handleEndTaskModalCancel = () =&gt; {
     endTaskModalShow.value = false
     currentEndTaskItem.value = null
 }
-// 确认结束任务，真正调用接口
+// ✅改造confirmEndTask：没有commitId先maintainCreate，和置为失效逻辑保持一致
 const confirmEndTask = async () => {
     const item = currentEndTaskItem.value
-    if (!item || !item.commitId) return
+    if (!item) {
+        uni.showToast({ title: '数据异常', icon: 'none', duration:2000 })
+        return
+    }
     endTaskModalShow.value = false
     uni.showLoading({ title: '提交中...', mask: true })
     try {
-        await finishPlan({ commitId: item.commitId })
+        let targetCommitId = item.commitId
+        // 不存在commitId，先创建草稿
+        if (!targetCommitId) {
+            const submitData = {
+                planNo: item.planNo,
+                imgHost: '1',
+                beginImg: [],
+                commonUserList: [],
+                remark: ''
+            }
+            const createRes: any = await maintainCreate(submitData)
+            targetCommitId = createRes && typeof createRes === 'object' ? createRes.id : createRes
+            if (!targetCommitId) {
+                uni.hideLoading()
+                uni.showToast({ title: '创建养护草稿失败，无法结束任务', icon: 'none', duration:2000 })
+                return
+            }
+        }
+        await finishPlan({ commitId: targetCommitId })
         uni.hideLoading()
-        uni.showToast({ title: '结束任务成功', icon: 'success' })
+        uni.showToast({ title: '结束任务成功', icon: 'success', duration:2000 })
         await loadData()
         pagingRef.value?.reload()
     } catch (err) {
         console.error('结束任务失败', err)
         uni.hideLoading()
-        if (err && err.msg) return
-        uni.showToast({ title: '结束任务失败，请重试', icon: 'none' })
+        uni.showToast({ title: err?.msg || '结束任务失败，请重试', icon: 'none', duration:2000 })
     } finally {
         currentEndTaskItem.value = null
     }