完成巡查计划详情

刘淇
1 parent 83208d2e
Showing 12 changed files with 400 additions and 140 deletions
api/patrol-manage/patrol-plan.js
common/utils/dict.js
main.js
pages-sub/daily/patrol-manage/add-patrol-record/index.vue
pages-sub/daily/patrol-manage/finish-plan-detail/index.vue
pages-sub/daily/patrol-manage/patrol-plan/index.vue
pages-sub/daily/patrol-manage/pending-plan-detail/index.vue
pages-sub/daily/quick-order/add-order.vue
pages-sub/daily/quick-order/order-detail.vue
pages-sub/daily/quick-order/order-list.vue
pages.json
pages/workbench/index.vue
@@ -26,10 +26,20 @@ export const inspectionPlanDetail = (data) =&gt; {
   return post('/app-api/app/garden/inspection-plan-detail/get-details',data);
 };
+
+// app-api/app/garden/inspection-plan-commit/get/by/plan_no?plan_no=P1765032669066674'
+/**
+ *  巡查计划完成详情
+ * @returns {Promise}
+ */
+export const inspectioDetailByPlanno = (params) => {
+  return get('/app-api/app/garden/inspection-plan-commit/get/by/plan_no',params);
+};
+
 /**
- * 模块列表用这个
+ *  巡查计划完成详情
  * @returns {Promise}
  */
-export const moduleList = () => {
-  return get('/app-api/member/app-module/list');
+export const inspectionCreate = (data) => {
+  return post('/app-api/app/garden/inspection-plan-commit/create',data);
 };
@@ -68,4 +68,73 @@ export const getDictSimpleList = (dictType) =&gt; {
     value: item.value || '',
     label: item.label || ''
   }));
+};
+
+/**
+ * 字典格式转换工具：{label, value} ↔ {name, value}（兼容笔误的vulue，同时支持正确value）
+ * 注：若需转换为 {name, vulue}（拼写错误），代码中已兼容，可按需切换
+ */
+
+/**
+ * 核心转换：将 {label, value} 数组转换为 {name, value} 数组（主流正确写法）
+ * @param {Array} list 源数组，例：[{label: "绿地卫生", value: "绿地卫生"}]
+ * @returns {Array} 转换后数组，例：[{name: "绿地卫生", value: "绿地卫生"}]
+ */
+export const transformLabelValueToNameValue = (list) => {
+  // 空值保护：非数组直接返回空数组
+  if (!Array.isArray(list) || list.length === 0) return [];
+
+  return list.map(item => {
+    // 兼容item为null/undefined的情况，兜底空字符串
+    const safeItem = item || {};
+    return {
+      name: safeItem.label || '',
+      value: safeItem.value || '' // 正确的value字段
+      // 若需转换为 vulue（拼写错误），替换为：vulue: safeItem.value || ''
+    };
+  });
+};
+
+/**
+ * 单对象转换：将 {label, value} 转换为 {name, value}
+ * @param {Object} item 源对象，例：{label: "绿地卫生", value: "绿地卫生"}
+ * @returns {Object} 转换后对象，例：{name: "绿地卫生", value: "绿地卫生"}
+ */
+export const transformSingleLabelValueToNameValue = (item) => {
+  const safeItem = item || {};
+  return {
+    name: safeItem.label || '',
+    value: safeItem.value || ''
+    // 若需 vulue：vulue: safeItem.value || ''
+  };
+};
+
+/**
+ * 反向转换：{name, value} → {label, value}（可选，用于回显）
+ * @param {Array} list 源数组
+ * @returns {Array} 转换后数组
+ */
+export const transformNameValueToLabelValue = (list) => {
+  if (!Array.isArray(list) || list.length === 0) return [];
+
+  return list.map(item => {
+    const safeItem = item || {};
+    return {
+      label: safeItem.name || '',
+      value: safeItem.value || safeItem.vulue || '' // 兼容vulue拼写错误
+    };
+  });
+};
+
+
+
+// 导出全部方法的集合（方便全局注册）
+export default {
+  getDictList,
+  getDictLabel,
+  getDictValue,
+  getDictSimpleList,
+  transformLabelValueToNameValue,
+  transformSingleLabelValueToNameValue,
+  transformNameValueToLabelValue
 };
 \ No newline at end of file
@@ -5,10 +5,11 @@ import uviewPlus from &#39;@/uni_modules/uview-plus&#39;
 import pinia from '@/pinia/index'
 import EmptyView from '@/components/empty-view/empty-view.vue';
 import UploadImage from '@/components/upload-image/upload-image.vue';
-
+import dictUtils from '@/common/utils/dict';
 // #ifdef VUE3
 import { createSSRApp } from 'vue'
-
+// 挂载到uni全局
+uni.$dict = dictUtils;
 export function createApp() {
   // 2. 创建 Vue 实例
   const app = createSSRApp(App)
@@ -18,6 +19,8 @@ export function createApp() {
   // 4. 注册 Pinia（核心：在 app 挂载前注册）
   app.use(pinia)
+  // 全局注入字典工具（关键：provide需在app实例上注册）
+  // app.provide('$dict', dictUtils);
   app.component('EmptyView', EmptyView)
   app.component('UploadImage', UploadImage)
   // 5. 返回 app + pinia（可选，便于调试）
@@ -29,21 +32,3 @@ export function createApp() {
 // #endif
-// 全局注册（可选）：如果需要全局使用，可在 main.js 中注册为全局方法：
-// javascript
-// 运行
-// import { createSSRApp } from 'vue';
-// import * as dictUtils from '@/utils/dict';
-//
-// export function createApp() {
-//   const app = createSSRApp(App);
-//   // 注册全局字典方法
-//   app.config.globalProperties.$dict = dictUtils;
-//   return { app };
-// }
-// 组件中使用：
-// javascript
-// 运行
-// import { getCurrentInstance } from 'vue';
-// const { proxy } = getCurrentInstance();
-// const label = proxy.$dict.getDictLabel('ai_image_status', 10);
@@ -40,7 +40,7 @@
               del-color="#ff4d4f"
               class="upload-wrap"
           ></up-upload>
-          <view class="tips">（最少1张，最多3张）</view>
+<!--          <view class="tips">（最少1张，最多3张）</view>-->
         </up-form-item>
         <!-- 3. 转为工单（单选框） -->
@@ -92,6 +92,8 @@ const inspectFormRef = ref&lt;UniFormRef&gt;(null)
 <script lang="ts">
 import { uploadImages } from '@/common/utils/upload';
+import { inspectionCreate } from  "@/api/patrol-manage/patrol-plan";
+
 export default {
   data() {
@@ -100,14 +102,15 @@ export default {
       imagesList: [],
       // 单选列表
       radioList: [
-        { label: '是', value: '1' },
-        { label: '否', value: '2' }
+        { label: '是', value: '2' },
+        { label: '否', value: '1' }
       ],
       // 巡查表单数据
       inspectForm: {
         content: '',        // 巡查描述
-        isWorkOrder: '1'    // 是否转为工单 1:是（默认） 2:否
+        isWorkOrder: '2'    // 是否转为工单 1:否（默认） 2:是
       },
+      paramsOptins:{},//接受参数
       // 表单校验规则
       inspectFormRules: {
         images: [
@@ -136,6 +139,10 @@ export default {
       }
     }
   },
+  onLoad(option){
+    console.log(option)
+    this.paramsOptins = option
+  },
   onReady() {
     // 兼容微信小程序，通过setRules设置校验规则
     this.$refs.inspectFormRef.setRules(this.inspectFormRules)
@@ -246,39 +253,42 @@ export default {
       try {
         // 先执行表单校验
         await this.$refs.inspectFormRef.validate()
-
+        console.log(this.imagesList)
         // 构造提交数据
         const submitData = {
-          content: this.inspectForm.content,
-          images: this.getImgUrlList(this.imagesList),
-          isWorkOrder: this.inspectForm.isWorkOrder // 1=是，2=否
+          // content: this.inspectForm.content,
+          // images: this.getImgUrlList(this.imagesList),
+          // isWorkOrder: this.inspectForm.isWorkOrder // 1=否，2=是
+
+
+          "batchNo": this.paramsOptins.batchNo,
+          "planNo":this.paramsOptins.planNo,
+          "imgHost": "1",
+          "imgList": this.getImgUrlList(this.imagesList),
+          "inspectionState": this.inspectForm.isWorkOrder,
+          "transState": this.inspectForm.isWorkOrder==1?'1':'2',
+          "transWorkNo": "default'",
+          "remark": this.inspectForm.isWorkOrder
         }
         // 显示加载中
         uni.showLoading({ title: '提交中...' })
-        // 这里替换为实际的接口调用
-        // const res = await yourSubmitApi(submitData)
-
-        // 模拟接口调用延迟
-        await new Promise(resolve => setTimeout(resolve, 1500))
+        await inspectionCreate(submitData)
         uni.hideLoading()
         uni.showToast({
           title: '提交成功',
           icon: 'success',
-          duration: 1500
+          duration: 1000
         })
-        // 重置表单（保留默认值：转为工单=是）
+        // // 延迟跳转（等待提示框显示完成）
         setTimeout(() => {
-          this.$refs.inspectFormRef.resetFields()
-          this.imagesList = []
-          this.inspectForm = {
-            content: '',
-            isWorkOrder: '1' // 重置后仍默认选中“是”
-          }
-        }, 1500)
+          uni.redirectTo({
+            url: '/pages-sub/patrol-manage/patrol-plan/index'
+          })
+        }, 1000)
       } catch (error) {
         // 隐藏加载框
-<script setup lang="ts">
+<template>
+  <view class="u-page">
+    <!-- 页面级加载组件 -->
+    <up-loading-page
+        v-if="loading"
+        :loading="true"
+        title="加载中..."
+        color="#3c9cff"
+    ></up-loading-page>
-</script>
+    <!-- 内容容器 -->
+    <view v-else class="content-wrap">
+
+
+      <template v-for="(i, index) in orderDetail" :key="index">
+        <!-- 工单详情内容 -->
+        <up-cell-group :border="false" inset style="margin: 20rpx;">
+          <!-- 1. 工单编号 -->
+          <up-cell
+              :title="i.planName"
+
+              class="up-line-1"
+              align="middle"
+          ></up-cell>
+
+          <!-- 2. 工单位置 -->
+          <up-cell
+              title="计划编码"
+              :value="i.planNo || '--'"
+              class="up-line-1"
+              align="middle"
+          ></up-cell>
+
+          <!-- 3. 工单名称 -->
+          <up-cell
+              title="养护周期"
+              :value="`${i.rate}${uni.$dict.getDictLabel('cycle_id_type', i.cycleId)}`"
+              class="up-line-1"
+              align="middle"
+          ></up-cell>
+
+          <!-- 4. 情况描述 -->
+          <up-cell
+              title="计划有效期"
+              :value="`${timeFormat(i.beginTime,'yy-mm-dd hh:MM:ss')} 至 ${timeFormat(i. endTime,'yy-mm-dd hh:MM:ss')}`"
+              class="up-line-1"
+              align="middle"
+          ></up-cell>
+
+          <!-- 5. 问题照片（核心修复：判断条件+空值处理） -->
+          <up-cell title="照片" >
+            <template #value>
+              <view class="cell-content-wrap">
+
+                <!-- 修复1：正确判断problemImgsList，补充空数组默认值 -->
+                <up-album
+                    v-if="!!i.imgList?.length"
+                    :urls="i.imgList || []"
+                    singleSize="70"
+                    :preview-full-image="true"
+
+                ></up-album>
+                <text v-else class="empty-text">暂无问题照片</text>
+              </view>
+            </template>
+          </up-cell>
+
+          <!-- 7. 处理结果 -->
+          <up-cell
+              title="巡查描述"
+              :value="i.remark || '--'"
+              class="up-line-1"
+              align="middle"
+              :border="false"
+          ></up-cell>
+
+          <up-cell
+              title="提交时间"
+              :value="timeFormat(i.finishTime,'yy-mm-dd hh:MM:ss') || '--'"
+              class="up-line-1"
+              align="middle"
+              :border="false"
+          ></up-cell>
+
+
+          <up-cell
+              title="提交人"
+              :value="i.userName || '--'"
+              class="up-line-1"
+              align="middle"
+              :border="false"
+          ></up-cell>
+        </up-cell-group>
+      </template>
-<template>
+    </view>
+  </view>
 </template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+import { inspectioDetailByPlanno } from "@/api/patrol-manage/patrol-plan";
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { timeFormat } from '@/uni_modules/uview-plus';
+// 状态管理
+const loading = ref(true);
+const orderDetail = ref([]);
+
+
+/**
+ * 获取工单详情
+ */
+const getOrderDetail = async (plan_no: string) => {
+  try {
+    loading.value = true;
+    const res = await inspectioDetailByPlanno({ plan_no });
+    console.log('接口返回：', res);
+    // 优化：确保图片数组为数组类型，避免非数组导致渲染错误
+    orderDetail.value = {
+      ...res,
+      problemImgsList: Array.isArray(res.problemImgsList) ? res.problemImgsList : [],
+      completeImgsList: Array.isArray(res.completeImgsList) ? res.completeImgsList : []
+    };
+  } catch (error) {
+    console.error('获取工单详情失败：', error);
+    uni.showToast({ title: '加载失败，请重试', icon: 'none' });
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 页面加载
+onLoad((options) => {
+  const { planNo } = options;
+  if (planNo) {
+    getOrderDetail(planNo);
+  } else {
+    loading.value = false;
+    uni.showToast({ title: '缺少工单ID', icon: 'none' });
+  }
+});
+</script>
+
 <style scoped lang="scss">
+// 页面基础样式
+.u-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  box-sizing: border-box;
+}
+
+// 内容容器
+.content-wrap {
+  background: #fff;
+  width: 100%;
+  box-sizing: border-box;
+  overflow-y: auto;
+  min-height: calc(100vh - 40rpx);
+}
+
+
+
+// 空文本样式
+.empty-text {
+  color: #999;
+  font-size: 28rpx;
+  line-height: 80rpx;
+  display: block;
+  text-align: left;
+}
+
+// 优化uview组件样式
+:deep(.up-cell-group) {
+  --u-cell-group-background-color: #fff;
+  --u-cell-group-border-radius: 12rpx;
+  --u-cell-group-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+:deep(.up-cell) {
+  --u-cell-title-font-size: 28rpx;
+  --u-cell-value-font-size: 28rpx;
+  --u-cell-title-color: #666;
+  --u-cell-value-color: #333;
+  --u-cell-padding: 20rpx 15rpx;
+  --u-cell-border-color: #f5f5f5;
+}
+
+// 相册样式优化（关键：适配图片展示）
+:deep(.up-album) {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+:deep(.up-album__list) {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0;
+  margin: 0;
+}
+
+:deep(.up-album__item) {
+  width: calc(33.333% - 10rpx);
+  height: 200rpx; // 固定图片高度，避免变形
+  margin: 5rpx;
+  border-radius: 8rpx;
+  overflow: hidden;
+  background-color: #f8f8f8;
+}
+
+:deep(.up-album__image) {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; // 图片裁剪填充，避免拉伸
+}
+
 </style>
 \ No newline at end of file
@@ -58,13 +58,14 @@
             <view class="row-item flex-between">
               <view>
                 <text class="label">养护级别：</text>
-                <text class="value">{{ levelMap[item.levelId] || '未知级别' }}</text>
+                <text class="value">{{uni.$dict.getDictLabel('conserve_level', item.levelId)}}</text>
               </view>
               <text class="detail-btn" @click="gotoDetail(item)">计划明细</text>
             </view>
             <view class="row-item">
               <text class="label">计划类型：</text>
-              <text class="value up-line-1">{{ planTypeMap[item.planTypeId] || '未知类型' }}</text>
+
+              <text class="value up-line-1">  {{uni.$dict.getDictLabel('inspection_maintain_type', item.planTypeId)}}</text>
             </view>
             <view class="row-item">
               <text class="label">计划时间：</text>
@@ -101,17 +102,7 @@ const pageSize = ref(10);
 const planList = ref([]);
 const paging = ref(null);
-// 养护级别/计划类型映射
-const levelMap = {
-  11: '一级养护',
-  12: '二级养护',
-  13: '三级养护'
-};
-const planTypeMap = {
-  3001: '日常养护',
-  3002: '专项养护',
-  3003: '应急养护'
-};
+
 // Tab切换
 const handleTabChange = (val) => {
@@ -164,9 +155,6 @@ onLoad(() =&gt; {
 });
 // 仅在页面从明细页返回时，若有数据则刷新当前tab数据（避免干扰上拉加载）
 onShow(() => {
-  if (planList.value.length > 0 && pageNo.value === 1) {
-    queryList();
-  }
 });
 </script>
 <template>
   <view class="pending-plan-detail">
     <!-- 计划详情卡片 -->
-    <view class="detail-card">
+    <view class="detail-card" v-for="i in planInfo" :key="i.planNo">
       <!-- 标题行 -->
       <view class="detail-item">
         <text class="label">计划名称：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.title ? planInfo.title : '-' }}</text>
+        <text class="value up-line-1">{{ i.planName || '-' }}</text>
       </view>
       <!-- 计划编码行 -->
       <view class="detail-item">
         <text class="label">计划编码：</text>
-        <text class="value up-line-1">{{ planInfo.planNo ? planInfo.planNo : '-' }}</text>
+        <text class="value up-line-1">{{ i.planNo || '-' }}</text>
       </view>
       <!-- 养护周期行 -->
       <view class="detail-item">
         <text class="label">养护周期：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.rate ? planInfo.rate : '-' }}</text>
+        <text class="value up-line-1">{{ i.rate || '-' }} {{ uni.$dict.getDictLabel('cycle_id_type', i.cycleId) }}
+        </text>
       </view>
-
+      <!--      cycle_id_type-->
       <!-- 计划完成次数行 -->
       <view class="detail-item">
         <text class="label">计划完成次数：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.planNum ? planInfo.planNum : 0 }} 次</text>
+        <text class="value up-line-1">{{ i.planNum || 0 }} 次</text>
       </view>
       <!-- 已完成次数行 + 查看记录按钮 -->
       <view class="detail-item flex-between">
         <view class="left-wrap">
           <text class="label">已完成次数：</text>
-          <text class="value up-line-1">{{ planInfo && planInfo.planFinishNum ? planInfo.planFinishNum : 0 }} 次</text>
+          <text class="value up-line-1">{{ planInfo.i || 0 }} 次</text>
         </view>
         <!-- 查看记录按钮（限制宽度+紧凑样式） -->
+
         <up-button
+            v-if="i.planFinishNum>0"
             type="primary"
             size="mini"
-            @click="gotoFinishPlanDetail"
+            @click="gotoFinishPlanDetail(i)"
             :style="{ width: '80px', height: '28px', fontSize: '14px', borderRadius: 4 }"
         >
           查看记录
@@ -46,17 +49,19 @@
       <!-- 计划有效期行 -->
       <view class="detail-item">
         <text class="label">计划有效期：</text>
-<!--        <text class="value up-line-1">{{ planInfo && planInfo.validTime ? planInfo.validTime : '-' }}</text>-->
-        <text class="value up-line-1">{{ timeFormat(planInfo.beginTime,'yyyy-mm-dd')}} 至 {{ timeFormat(planInfo.endTime,'yyyy-mm-dd')}} </text>
+        <!--        <text class="value up-line-1">{{ planInfo && planInfo.validTime ? planInfo.validTime : '-' }}</text>-->
+        <text class="value up-line-1">{{ timeFormat(i.beginTime, 'yyyy-mm-dd') }} 至
+          {{ timeFormat(i.endTime, 'yyyy-mm-dd') }}
+        </text>
       </view>
     </view>
-    <!-- 底部新增记录按钮 -->
-    <view class="fixed-bottom-btn-wrap">
+    <!-- 底部新增记录按钮     status=3-->
+    <view class="fixed-bottom-btn-wrap" v-if="finishState==1">
       <up-button
           type="primary"
           size="default"
-          @click="submit"
+          @click="addNewRecord"
           :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"
       >
         新增记录
@@ -71,13 +76,15 @@ import { ref } from &#39;vue&#39;;
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { inspectionPlanDetail } from "@/api/patrol-manage/patrol-plan";
 // 响应式数据定义
-const planInfo = ref({});
+const planInfo = ref([]);
 const batchNo = ref('')
+const planNo = ref('')
 const finishState = ref('')
 // 页面加载接收参数
 onLoad((options) => {
   console.log('计划ID：', options.batchNo);
   batchNo.value = options.batchNo;
+  // planNo.value = options.planNo;
   finishState.value = options.status
 });
 // 页面显示时请求数据
@@ -98,46 +105,32 @@ const getPlanDetail = async () =&gt; {
   }
   console.log(queryData)
   const planInfoRes = await inspectionPlanDetail(queryData)
-  planInfo.value = planInfoRes[0]
+  planInfo.value = planInfoRes
   console.log(planInfoRes)
 };
 // 跳转到已完成计划明细
-const gotoFinishPlanDetail = () => {
-
+const gotoFinishPlanDetail = (i) => {
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/finish-plan-detail/index?batchNo=${planInfo.value.code}`
+    url: `/pages-sub/daily/patrol-manage/finish-plan-detail/index?planNo=${i.planNo}`
   });
 };
 // 新增记录
 const addNewRecord = () => {
-  if (!planInfo.value || !planInfo.value.code) {
-    uni.showToast({
-      title: '计划数据未加载完成',
-      icon: 'none'
-    });
-    return;
-  }
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/add-patrol-record/index?batchNo=${planInfo.value.code}`
+    url: `/pages-sub/daily/patrol-manage/add-patrol-record/index?planNo=${planInfo.value[0].planNo}&batchNo=${batchNo.value}`,
   });
 };
 </script>
 <style scoped lang="scss">
 .pending-plan-detail {
-  background-color: #f8f8f8;
-  display: flex;
-  flex-direction: column;
-  min-height: 100vh; // 恢复最小高度，保证页面占满屏幕
-  padding-bottom: 88rpx; // 给底部按钮留空间
+
 }
 .detail-card {
   padding: 20rpx;
   background-color: #fff;
-  border-radius: 12rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
-  flex: 1;
+  margin-bottom: 20px;
 }
 .detail-item {
@@ -108,14 +108,14 @@
         </up-form-item>
         <!-- 处理结果（不必填） -->
-        <up-form-item label="处理结果" prop="handleResultDesc" class="mt-20">
+        <up-form-item label="处理结果" prop="handleResult" class="mt-20">
           <up-textarea
               placeholder="请输入处理结果描述（最多200字，选填）"
-              v-model="workOrderForm.handleResultDesc"
+              v-model="workOrderForm.handleResult"
               count
               maxlength="200"
               rows="4"
-              @blur="() => $refs.workOrderFormRef.validateField('handleResultDesc')"
+              @blur="() => $refs.workOrderFormRef.validateField('handleResult')"
           ></up-textarea>
         </up-form-item>
@@ -151,17 +151,30 @@
 </template>
 <script setup lang="ts">
-import {ref} from 'vue'
+import {ref, inject} from 'vue'
+
 import type {UniFormRef} from '@/uni_modules/uview-plus/types'
 // 定义ref供选项式API使用
 const workOrderFormRef = ref<UniFormRef>(null)
+//
+// // 注入全局字典工具
+// const $dict = inject('$dict');
+// const dictLabel = ref('');
+// const modeList = ref([]);
+//
+
+
 </script>
 <script lang="ts">
 import {getRoadListByLatLng} from '@/api/common'
 import {uploadImages} from '@/common/utils/upload';
 import {createQuick} from '@/api/quick-order/quick-order'
-import {toast} from '@/uni_modules/uview-plus'
+// import { getCurrentInstance } from 'vue';
+// const { proxy } = getCurrentInstance();
+// const label = $dict.getDictLabel('ai_image_status', 10);
+// const opdata = $dict.getDictLabel('ai_image_status');
+// console.log(opdata)
 export default {
   data() {
@@ -176,9 +189,9 @@ export default {
       // 下拉列表数据
       roadNameList: [],
       orderNameList: [
-        {name: '绿地卫生', code: 'ORDER001'},
-        {name: '设施维修', code: 'ORDER002'},
-        {name: '垃圾清理', code: 'ORDER003'}
+        // {name: '绿地卫生', code: 'ORDER001'},
+        // {name: '设施维修', code: 'ORDER002'},
+        // {name: '垃圾清理', code: 'ORDER003'}
       ],
       // 工单表单数据
       workOrderForm: {
@@ -187,7 +200,7 @@ export default {
         workLocation: '',              // 工单位置
         orderName: '',                 // 工单名称
         problemDesc: '',               // 情况描述
-        handleResultDesc: '',          // 处理结果描述（不必填）
+        handleResult: '',          // 处理结果描述（不必填）
         lat: 0,                        // 纬度
         lon: 0                         // 经度
       },
@@ -239,6 +252,12 @@ export default {
     this.$refs.workOrderFormRef.setRules(this.workOrderFormRules)
     console.log('工单表单规则初始化完成')
   },
+  onShow(){
+    console.log(uni.$dict.getDictLabel('ai_image_status', 20))
+    console.log(uni.$dict.getDictSimpleList('work_name'))
+    this.orderNameList = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
+    console.log(this.orderNameList)
+  },
   methods: {
     /**
      * 返回上一页
@@ -406,6 +425,7 @@ export default {
      * 选择工单名称
      */
     handleOrderNameSelect(e) {
+      console.log(e)
       this.workOrderForm.orderName = e.name
       this.showOrderName = false
       this.$refs.workOrderFormRef.validateField('orderName')
@@ -439,7 +459,7 @@ export default {
           imgs: this.getImgUrlList(this.problemImgsList),
           longRangeImgList: this.getImgUrlList(this.completeImgsList),
           remark: this.workOrderForm.problemDesc,
-          handleResultDesc: this.workOrderForm.handleResultDesc,
+          handleResult: this.workOrderForm.handleResult,
           latLonType: 2,
           lat: this.workOrderForm.lat,
           lon: this.workOrderForm.lon,
@@ -461,7 +481,7 @@ export default {
         uni.showToast({
           title: '工单提交成功',
           icon: 'success',
-          duration: 1500
+          duration: 1000
         })
         // 延迟跳转（等待提示框显示完成）
@@ -469,7 +489,7 @@ export default {
           uni.redirectTo({
             url: '/pages-sub/daily/quick-order/index'
           })
-        }, 1500)
+        }, 1000)
       } catch (error) {
         // 隐藏加载框
         uni.hideLoading()
@@ -88,7 +88,7 @@
         <!-- 7. 处理结果 -->
         <up-cell
             title="处理结果"
-            :value="orderDetail.handleResultDesc || '--'"
+            :value="orderDetail.handleResult || '--'"
             class="up-line-1"
             align="middle"
             :border="false"
-<script setup lang="ts">
-
-</script>
-
-<template>
-
-</template>
-
-<style scoped lang="scss">
-
-</style>
 \ No newline at end of file
@@ -39,7 +39,7 @@
 				{
 					"path": "patrol-manage/pending-plan-detail/index",
 					"style": {
-						"navigationBarTitleText": "待完成计划明细",
+						"navigationBarTitleText": "计划明细",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -41,6 +41,7 @@
                     v-for="(listItem,listIndex) in parentModule.children"
                     :key="listItem.id"
                     @click="handleMenuClick(listItem)"
+                    class="grid-item-wrap"
                 >
                   <u-image
                       :src="listItem.icon "
@@ -53,7 +54,7 @@
                   <text class="grid-text">{{ listItem.name }}</text>
                 </up-grid-item>
               </up-grid>
-              <up-toast ref="uToastRef"/>
+
             </view>
           </template>
         </up-card>
@@ -160,6 +161,9 @@ const handleMenuClick = (item: MenuItem) =&gt; {
   position: relative;
   background-color: #fff;
 }
+.grid-item-wrap{
+  margin-top: 20px;
+}
 /* 蓝色块样式 */
 .blue-decor-block {
@@ -179,18 +183,6 @@ const handleMenuClick = (item: MenuItem) =&gt; {
   padding-top: 160px;
 }
-/* 第一张卡片层级 */
-.first-card-position {
-  position: relative;
-  z-index: 3;
-}
-
-/* 仅补充标题文字基础样式（确保显示，不修改卡片其他样式） */
-.card-title-text {
-  font-size: 32rpx;
-  color: #333;
-  font-weight: 600;
-}
 /* 网格文字样式（保留原始） */
 .grid-text {
@@ -200,8 +192,5 @@ const handleMenuClick = (item: MenuItem) =&gt; {
   margin-top: 10rpx;
 }
-/* 加载页样式优化（可选） */
-:deep(.up-loading-page) {
-  background-color: rgba(255, 255, 255, 0.9);
-}
+
 </style>
 \ No newline at end of file