转工单选择是传紧急程度和希望完成时间

刘淇
1 parent 2f1e3176
Showing 12 changed files with 382 additions and 95 deletions
api/regional-order-manage/regional-order-manage.js
common/utils/common.js
common/utils/useUploadImgs.js
pages-sub/daily/patrol-manage/add-patrol-record.vue
pages-sub/daily/quick-order/add-order.vue
pages-sub/daily/quick-order/order-detail.vue
pages-sub/problem/regional-order-manage/add-order.vue
pages-sub/problem/regional-order-manage/index.vue
pages-sub/problem/regional-order-manage/order-detail.vue
pages-sub/problem/work-order-manage/add-order.vue
pages-sub/problem/work-order-manage/order-detail.vue
pages.json
@@ -55,4 +55,111 @@ export const buzStatusMap = {
   "230" : '养护组长验收不通过',
   "140" : '巡查员验收通过',
   "240" : '巡查员验收不通过',
-}
 \ No newline at end of file
+}
+
+
+/**
+ * 计算两个时间的时间差，返回格式化字符串（天/小时/分钟/秒，按需显示，无无效单位）
+ * @param {string | Date | number} startTime - 开始时间（时间字符串/Date对象/10位/13位时间戳）
+ * @param {string | Date | number} endTime - 结束时间（时间字符串/Date对象/10位/13位时间戳）
+ * @returns {string} - 格式化时间差字符串（如：3天5小时2分钟30秒、3小时2分钟30秒、2分钟30秒、30秒）
+ */
+export const calculateFormatTimeDiff = (startTime, endTime) => {
+  // 辅助函数：将任意合法时间格式转换为13位毫秒级时间戳
+  const to13BitTimestamp = (time) => {
+    let timestamp = 0;
+
+    // 情况1：数字类型（时间戳）
+    if (typeof time === 'number') {
+      const timeStr = time.toString();
+      if (timeStr.length === 10) {
+        timestamp = time * 1000; // 10位秒级转13位毫秒级
+      } else if (timeStr.length === 13) {
+        timestamp = time; // 13位毫秒级直接使用
+      } else {
+        console.error('非法时间戳：仅支持10位/13位数字', time);
+        return 0;
+      }
+      return timestamp;
+    }
+
+    // 情况2：Date对象
+    if (time instanceof Date) {
+      timestamp = time.getTime();
+      if (isNaN(timestamp)) {
+        console.error('无效的Date对象', time);
+        return 0;
+      }
+      return timestamp;
+    }
+
+    // 情况3：字符串类型
+    if (typeof time === 'string') {
+      const timeStr = time.trim().replace(/\//g, '-'); // 统一分隔符，兼容YYYY/MM/DD
+      const date = new Date(timeStr);
+      timestamp = date.getTime();
+      if (isNaN(timestamp)) {
+        console.error('无效的时间字符串', time);
+        return 0;
+      }
+      return timestamp;
+    }
+
+    // 非法类型
+    console.error('不支持的时间类型：仅支持string/Date/number', time);
+    return 0;
+  };
+
+  // 1. 统一转换为13位时间戳
+  const startTimestamp = to13BitTimestamp(startTime);
+  const endTimestamp = to13BitTimestamp(endTime);
+
+  // 2. 校验时间戳有效性
+  if (startTimestamp === 0 || endTimestamp === 0) {
+    return '0秒';
+  }
+
+  // 3. 计算总毫秒差（取绝对值，确保时间差为正数，不影响单位计算）
+  const totalMsDiff = Math.abs(endTimestamp - startTimestamp);
+
+  // 4. 定义时间单位换算（毫秒）
+  const oneDayMs = 24 * 60 * 60 * 1000;
+  const oneHourMs = 60 * 60 * 1000;
+  const oneMinuteMs = 60 * 1000;
+  const oneSecondMs = 1000;
+
+  // 5. 计算各单位的差值（向下取整，获取整数单位）
+  const days = Math.floor(totalMsDiff / oneDayMs);
+  const remainingMsAfterDay = totalMsDiff % oneDayMs; // 扣除天数后剩余的毫秒数
+
+  const hours = Math.floor(remainingMsAfterDay / oneHourMs);
+  const remainingMsAfterHour = remainingMsAfterDay % oneHourMs; // 扣除小时后剩余的毫秒数
+
+  const minutes = Math.floor(remainingMsAfterHour / oneMinuteMs);
+  const remainingMsAfterMinute = remainingMsAfterHour % oneMinuteMs; // 扣除分钟后剩余的毫秒数
+
+  const seconds = Math.floor(remainingMsAfterMinute / oneSecondMs);
+
+  // 6. 组装格式化字符串（按需添加单位，无无效单位）
+  const timeParts = [];
+  if (days > 0) {
+    timeParts.push(`${days}天`);
+  }
+  if (hours > 0 || (days > 0 && hours === 0)) { // 有天数时，小时即使为0也可保留（可选：删除 || 后的条件则不显示0小时）
+    timeParts.push(`${hours}小时`);
+  }
+  if (minutes > 0 || (timeParts.length > 0 && minutes === 0)) { // 有天/小时时，分钟即使为0也可保留（可选：删除 || 后的条件则不显示0分钟）
+    timeParts.push(`${minutes}分钟`);
+  }
+  // 秒数始终保留（即使为0，保证最后有一个有效单位）
+  timeParts.push(`${seconds}秒`);
+
+  // 7. 过滤掉可能存在的「0单位」（可选优化：避免出现“0小时”等无效字段）
+  const validTimeParts = timeParts.filter(part => {
+    const num = parseInt(part);
+    return num > 0 || (timeParts.length === 1 && num === 0); // 仅当只有秒数时，允许0秒
+  });
+
+  // 8. 拼接并返回结果
+  return validTimeParts.join('');
+};
 \ No newline at end of file
@@ -17,6 +17,8 @@ export function useUploadImgs(config) {
     // 核心修复：初始化为纯数组，且格式适配u-upload
     const imgList = ref([])
+    // 确保 rawImgList 响应式对象的初始值也是空数组
+    // const rawImgList = ref([]);
     /**
      * 新增：清空所有图片
 <template>
   <view class="u-page">
-    <!-- 核心：将所有 up-form-item 包裹在同一个 up-form 内 -->
+    <!-- 原有模板内容不变，仅调整表单校验相关配置 -->
     <view class="inspect-form-content commonPageLRpadding">
       <up-form
           label-position="left"
           :model="inspectForm"
           ref="inspectFormRef"
-          labelWidth="140rpx"
+          labelWidth="190rpx"
       >
-        <!-- 1. 巡查描述（文本域） -->
+        <!-- 1. 巡查描述 -->
         <up-form-item
             label="巡查描述"
             prop="content"
@@ -41,11 +41,12 @@
               upload-text="选择图片"
               del-color="#ff4d4f"
               class="upload-wrap"
+              width="70"
+              height="70"
           ></up-upload>
-          <!--          <view class="tips">（最少1张，最多3张）</view>-->
         </up-form-item>
-        <!-- 3. 转为工单（单选框） -->
+        <!-- 3. 转为工单 -->
         <up-form-item
             label="转为工单"
             prop="isWorkOrder"
@@ -57,6 +58,7 @@
               active-color="#1989fa"
               direction="row"
               class="radio-group"
+              @change="handleWorkOrderChange"
           >
             <up-radio
                 :custom-style="{marginRight: '40rpx'}"
@@ -70,6 +72,51 @@
           </up-radio-group>
         </up-form-item>
+        <!-- 紧急程度（仍为必填） -->
+<!--        v-if="inspectForm.isWorkOrder === '2'"-->
+        <up-form-item
+            v-if="inspectForm.isWorkOrder === '2'"
+            label="紧急程度"
+            prop="pressingTypeName"
+            border-bottom
+            required
+            class="form-item"
+            @click="handleActionSheetOpen('pressingType')"
+        >
+          <up-input
+              v-model="inspectForm.pressingTypeName"
+              disabled
+              disabled-color="#ffffff"
+              placeholder="请选择紧急程度"
+              border="none"
+
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 希望完成时间（移除 required 属性，改为非必填） -->
+<!--        v-if="inspectForm.isWorkOrder === '2'"-->
+        <up-form-item
+            v-if="inspectForm.isWorkOrder === '2'"
+            label="希望完成时间"
+            prop="expectedFinishDate"
+            class="form-item"
+            @click="show = true;  uni.hideKeyboard()"
+        >
+        <up-input
+            v-model="inspectForm.expectedFinishDate"
+            border="none"
+            readonly
+            placeholder="点击选择时间"
+
+        ></up-input>
+        <template #right>
+          <up-icon name="arrow-right" size="16"></up-icon>
+        </template>
+        </up-form-item>
+
       </up-form>
     </view>
@@ -82,38 +129,59 @@
           :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"
       ></up-button>
     </view>
+
+    <!-- 紧急程度下拉弹窗 -->
+    <up-action-sheet
+        :show="showActionSheet"
+        :actions="pressingTypeList"
+        title="请选择紧急程度"
+        @close="handleActionSheetClose"
+        @select="handlePressingTypeSelect"
+    ></up-action-sheet>
+
+    <!-- 完成时间选择器 -->
+    <up-datetime-picker
+        :show="show"
+        v-model="datetimeValue"
+        mode="datetime"
+        :min-date="new Date()"
+        @cancel="show = false"
+        @confirm="expectedFinishDateConfirm"
+    ></up-datetime-picker>
   </view>
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
 import type { UniFormRef } from '@/uni_modules/uview-plus/types'
-// 定义ref供选项式API使用
 const inspectFormRef = ref<UniFormRef>(null)
 </script>
 <script lang="ts">
 import { uploadImages } from '@/common/utils/upload';
 import { inspectionCreate } from  "@/api/patrol-manage/patrol-plan";
-
+import { timeFormat } from '@/uni_modules/uview-plus'
 export default {
   data() {
     return {
-      // 图片列表
       imagesList: [],
-      // 单选列表
       radioList: [
         { label: '否', value: '1' },
         { label: '是', value: '2' }
       ],
-      // 巡查表单数据
+      pressingTypeList: [],
       inspectForm: {
-        content: '',        // 巡查描述
-        isWorkOrder: '1'    // 是否转为工单 1:否（默认） 2:是
+        content: '',
+        isWorkOrder: '1',
+        pressingTypeName: '',
+        pressingType: '',
+        expectedFinishDate: '' // 非必填，可空
       },
-      paramsOptins:{},//接受参数
-      // 表单校验规则
+      paramsOptins: {},
+      showActionSheet: false,
+      show: false,
+      datetimeValue: Date.now(),
       inspectFormRules: {
         images: [
           {
@@ -121,7 +189,6 @@ export default {
             message: '请上传图片',
             trigger: 'change',
             validator: (rule, value, callback) => {
-              // 自定义校验规则：检查是否有成功上传的图片
               const hasSuccessImg = this.imagesList.some(item => item.status === 'success')
               const imgCount = this.imagesList.filter(item => item.status === 'success').length
@@ -135,42 +202,104 @@ export default {
             }
           }
         ],
-
         content: [
           { type: 'string', required: true, message: '请输入工单描述', trigger: ['change'] }
         ],
         isWorkOrder: [
           { type: 'string', required: true, message: '请选择是否转为工单', trigger: ['change'] }
+        ],
+        pressingTypeName: [
+          {
+            required: true,
+            message: '请选择紧急程度',
+            trigger: 'change',
+            validator: (rule, value, callback) => {
+              if (this.inspectForm.isWorkOrder === '2' && !value) {
+                callback(new Error('请选择紧急程度'))
+              } else {
+                callback()
+              }
+            }
+          }
+        ],
+        // 关键修改：希望完成时间 移除必填校验，或改为非必填
+        expectedFinishDate: [
+          {
+            // 移除 required: true，改为非必填
+            message: '请选择有效的希望完成时间', // 仅当有值时，校验格式（可选）
+            trigger: 'change',
+            validator: (rule, value, callback) => {
+              // 只有当字段有值时，才校验时间格式是否有效
+              if (value && !/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$/.test(value)) {
+                callback(new Error('请选择有效的希望完成时间'))
+              } else {
+                callback() // 无值时直接通过校验
+              }
+            }
+          }
         ]
       }
     }
   },
   onLoad(option){
-    console.log(option)
     this.paramsOptins = option
+    this.getPressingTypeDict()
   },
   onReady() {
-    // 兼容微信小程序，通过setRules设置校验规则
     this.$refs.inspectFormRef.setRules(this.inspectFormRules)
-    console.log('巡查表单规则初始化完成')
   },
   methods: {
-    /**
-     * 删除图片
-     */
+    getPressingTypeDict() {
+      const dictList = uni.$dict.getDictSimpleList('workorder_pressing_type')
+      this.pressingTypeList = uni.$dict.transformLabelValueToNameValue(dictList)
+      console.log(this.pressingTypeList)
+    },
+
+    handleWorkOrderChange() {
+      if (this.inspectForm.isWorkOrder === '1') {
+        this.inspectForm.pressingTypeName = ''
+        this.inspectForm.pressingType = ''
+        this.inspectForm.expectedFinishDate = '' // 清空非必填字段
+        this.$refs.inspectFormRef.validateField(['pressingTypeName', 'expectedFinishDate'])
+      }
+    },
+
+
+    handleActionSheetOpen(type) {
+      uni.hideKeyboard()
+      console.log('showActionSheet')
+      if (type === 'pressingType') {
+        console.log('showActionSheet')
+        this.showActionSheet = true
+      }
+      uni.hideKeyboard()
+    },
+
+    handleActionSheetClose() {
+      this.showActionSheet = false
+    },
+
+    handlePressingTypeSelect(e) {
+      console.log(e)
+      this.inspectForm.pressingTypeName = e.name
+      this.inspectForm.pressingType = e.value
+      this.showActionSheet = false
+      this.$refs.inspectFormRef.validateField('pressingTypeName')
+    },
+
+    expectedFinishDateConfirm(e) {
+      this.inspectForm.expectedFinishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+      this.show = false
+      this.$refs.inspectFormRef.validateField('expectedFinishDate')
+    },
+
     deleteImg(event) {
-      console.log('删除图片事件：', event)
       this.imagesList.splice(event.index, 1)
-      // 删除图片后重新校验图片字段
       this.$refs.inspectFormRef.validateField('images')
       uni.showToast({ title: '图片删除成功', icon: 'success' })
     },
-    /**
-     * 上传图片
-     */
     async uploadImgs(event) {
-      console.log('上传图片事件：', event)
       const fileList = Array.isArray(event.file) ? event.file : [event.file]
       const targetImgList = this.imagesList
@@ -188,7 +317,6 @@ export default {
           filePaths: filePaths,
           ignoreError: true
         })
-        console.log('上传成功的URL列表：', uploadResultUrls)
         uploadResultUrls.forEach((url, index) => {
           if (targetImgList[startIndex + index]) {
@@ -203,21 +331,11 @@ export default {
         if (uploadResultUrls.length < fileList.length) {
           const failCount = fileList.length - uploadResultUrls.length
-          for (let i = uploadResultUrls.length; i < fileList.length; i++) {
-            if (targetImgList[startIndex + i]) {
-              targetImgList.splice(startIndex + i, 1, {
-                ...fileList[i],
-                status: 'failed',
-                message: '上传失败'
-              })
-            }
-          }
           uni.showToast({ title: `成功上传${uploadResultUrls.length}张，失败${failCount}张`, icon: 'none' })
         } else {
           uni.showToast({ title: `成功上传${fileList.length}张图片`, icon: 'success' })
         }
-        // 上传完成后重新校验图片字段
         this.$refs.inspectFormRef.validateField('images')
       } catch (err) {
         console.error('图片上传失败：', err)
@@ -231,55 +349,48 @@ export default {
           }
         }
         uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
-
-        // 上传失败后重新校验图片字段
         this.$refs.inspectFormRef.validateField('images')
       }
     },
-    /**
-     * 处理图片超出数量限制
-     */
     handleExceed() {
       uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
     },
-    /**
-     * 提取图片URL数组
-     */
     getImgUrlList(imgList) {
       return imgList.filter(item => item.status === 'success').map(item => item.url)
     },
-    /**
-     * 提交巡查表单
-     */
     async submitInspect() {
       console.log('当前选择是否转为工单：', this.inspectForm.isWorkOrder)
       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=是
-
+        // 构造基础提交数据
+        const baseSubmitData = {
           "batchNo": this.paramsOptins.batchNo,
-          "planNo":this.paramsOptins.planNo,
+          "planNo": this.paramsOptins.planNo,
           "imgHost": "1",
           "imgList": this.getImgUrlList(this.imagesList),
           "inspectionState": this.inspectForm.isWorkOrder,
-          "transState": this.inspectForm.isWorkOrder==1?'1':'2',
+          "transState": this.inspectForm.isWorkOrder === '1' ? '1' : '2',
           "transWorkNo": "default'",
           "remark": this.inspectForm.content.trim()
         }
-        // 显示加载中
-        uni.showLoading({ title: '提交中...' })
+        // 构造最终提交数据
+        let submitData = { ...baseSubmitData }
+        if (this.inspectForm.isWorkOrder === '2') {
+          // 紧急程度仍为必填，必传
+          submitData.pressingType = this.inspectForm.pressingType
+          // 关键修改：仅当希望完成时间有值时，才添加该参数
+          if (this.inspectForm.expectedFinishDate) {
+            submitData.expectedFinishDate = new Date(this.inspectForm.expectedFinishDate).getTime()
+          }
+        }
+        uni.showLoading({ title: '提交中...' })
         await inspectionCreate(submitData)
         uni.hideLoading()
@@ -289,7 +400,6 @@ export default {
           duration: 1000
         })
-        // // 延迟跳转（等待提示框显示完成）
         setTimeout(() => {
           uni.reLaunch({
             url: '/pages-sub/daily/patrol-manage/index'
@@ -297,14 +407,8 @@ export default {
         }, 1000)
       } catch (error) {
-        // 隐藏加载框
         uni.hideLoading()
-
-        // 区分是表单校验失败还是接口调用失败
-        if (Array.isArray(error)) {
-          // 表单校验失败 - 静默处理（uView会自动提示）
-        } else {
-          // 接口调用失败
+        if (!Array.isArray(error)) {
           console.error('巡查表单提交失败：', error)
           uni.showToast({
             title: '提交失败，请重试',
@@ -319,14 +423,18 @@ export default {
 </script>
 <style lang="scss" scoped>
-// 全局页面样式
 .u-page {
+  min-height: 100vh;
 }
-// 巡查表单内容容器
 .inspect-form-content {
   background: #fff;
   padding: 20rpx;
 }
+.form-item {
+  margin-bottom: 20rpx;
+}
+
+
 </style>
 \ No newline at end of file
@@ -89,6 +89,8 @@
               @after-read="(event) => uploadImgs(event, 'problemImgsList')"
               @delete="(event) => deleteImg(event, 'problemImgsList')"
               multiple
+              width="70"
+              height="70"
               :max-count="3"
               upload-text="选择问题照片"
           ></up-upload>
@@ -101,6 +103,8 @@
               @after-read="(event) => uploadImgs(event, 'completeImgsList')"
               @delete="(event) => deleteImg(event, 'completeImgsList')"
               multiple
+              width="70"
+              height="70"
               :max-count="3"
               :sizeType="['compressed']"
               upload-text="选择完成照片"
@@ -65,11 +65,11 @@
             <!-- 修复1：正确判断problemImgsList，补充空数组默认值 -->
             <up-album
-                v-if="!!orderDetail.problemImgsList?.length"
-                :urls="orderDetail.problemImgsList || []"
+                v-if="!!orderDetail.problemsImgs?.length"
+                :urls="orderDetail.problemsImgs || []"
                 singleSize="70"
                 :preview-full-image="true"
-
+                multipleSize="70"
             ></up-album>
             <text v-else class="empty-text">暂无问题照片</text>
           </view>
@@ -81,9 +81,10 @@
           <template #value>
           <view class="cell-content-wrap">
             <up-album
-                v-if="!!orderDetail.completeImgsList?.length"
-                :urls="orderDetail.completeImgsList || []"
+                v-if="!!orderDetail.endImgs?.length"
+                :urls="orderDetail.endImgs || []"
                 singleSize="70"
+                multipleSize="70"
                 :preview-full-image="true"
             ></up-album>
@@ -131,8 +132,8 @@ const getOrderDetail = async (id: string) =&gt; {
     // 优化：确保图片数组为数组类型，避免非数组导致渲染错误
     orderDetail.value = {
       ...res,
-      problemImgsList: Array.isArray(res.problemImgsList) ? res.problemImgsList : [],
-      completeImgsList: Array.isArray(res.completeImgsList) ? res.completeImgsList : []
+      problemsImgs: Array.isArray(res.problemsImgs) ? res.problemsImgs : [],
+      endImgs: Array.isArray(res.endImgs) ? res.endImgs : []
     };
   } catch (error) {
     console.error('获取工单详情失败：', error);
+<script lang="ts">
+import {defineComponent} from 'vue'
+
+export default defineComponent({
+  name: "add-order"
+})
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
 \ No newline at end of file
+<script lang="ts">
+import {defineComponent} from 'vue'
+
+export default defineComponent({
+  name: "index"
+})
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
 \ No newline at end of file
+<script lang="ts">
+import {defineComponent} from 'vue'
+
+export default defineComponent({
+  name: "order-detail"
+})
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
 \ No newline at end of file
@@ -103,7 +103,7 @@
         <!-- 问题照片（核心修复：绑定纯数组） -->
         <up-form-item label="问题照片" prop="problemImgs" required>
           <up-upload
-              :file-list="problemImgs.imgList"
+              :file-list="problemImgs.imgList.value||[]"
               @after-read="problemImgs.uploadImgs"
               @delete="problemImgs.deleteImg"
               multiple
@@ -185,10 +185,11 @@ const problemImgs = useUploadImgs({
   fieldName: 'problemImgs'
 })
-// 核心修复：监听响应式数组变化，同步更新纯数组（解决u-upload不刷新问题）
-watch(() => problemImgs.rawImgList.value, (newVal) => {
-  problemImgs.imgList = newVal
-}, { deep: true })
+// 无需再手动初始化普通数组，直接使用 ref 响应式数据
+if (!Array.isArray(problemImgs.rawImgList.value)) {
+  problemImgs.rawImgList.value = [];
+}
+
 // ========== 页面状态 ==========
 // 通用弹窗控制
@@ -318,7 +319,7 @@ const echoOrderData = (orderItem) =&gt; {
   workOrderForm.problemDesc = orderItem.remark || '';
   workOrderForm.lat = orderItem.lat || 0;
   workOrderForm.lon = orderItem.lon || 0;
-  workOrderForm.expectedFinishDate = orderItem.expectedFinishDate || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss');
+  workOrderForm.expectedFinishDate =  timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')  || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss');
   // 2. 上传图片回显（兼容useUploadImgs格式）
   if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
@@ -327,7 +328,7 @@ const echoOrderData = (orderItem) =&gt; {
       name: `renew_img_${index}`,
       status: 'success' // 标记为已上传状态
     }));
-    problemImgs.imgList = imgList;
+    problemImgs.imgList.value = imgList;
     problemImgs.rawImgList.value = imgList;
   }
@@ -513,7 +514,8 @@ const submitWorkOrder = async () =&gt; {
       lonLatAddress: workOrderForm.workLocation,
       pressingType: workOrderForm.pressingType,
       orderName: workOrderForm.orderName,
-      expectedFinishDate: workOrderForm.expectedFinishDate,
+      // expectedFinishDate: workOrderForm.expectedFinishDate,
+      expectedFinishDate: new Date(workOrderForm.expectedFinishDate).getTime(),
       sourceId: 1,
       sourceName: '园林',
       busiLine: 'yl'
@@ -80,7 +80,7 @@
             ></up-cell>
             <!-- 处理结果 -->
-            <up-cell>
+            <up-cell v-if="orderDetail.handleResult">
               <template #title>
                 <view style="min-width: 200rpx">处理结果</view>
               </template>
@@ -109,15 +109,17 @@
             <!-- 希望完成时间 -->
             <up-cell
+                v-if="orderDetail.expectedFinishDate"
                 title="希望完成时间"
-                :value="orderDetail.expectedFinishDate === 0 ? '未设置' : timeFormat(orderDetail.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')"
+                :value="timeFormat(orderDetail.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')"
                 align="middle"
                 :border="false"
             ></up-cell>
             <up-cell
+                v-if="orderDetail.finishDate"
                 title="工单完结时间"
-                :value="orderDetail.finishDate === 0 ? '暂无' : timeFormat(orderDetail.finishDate, 'yyyy-mm-dd hh:MM:ss')"
+                :value="timeFormat(orderDetail.finishDate, 'yyyy-mm-dd hh:MM:ss')"
                 align="middle"
                 :border="false"
             ></up-cell>
@@ -198,6 +200,11 @@
                         <text v-if="item.endTime"> 至 {{ timeFormat(item.endTime, 'yyyy-mm-dd hh:MM:ss') }}</text>
                         <text v-else class="processing-tag">（处理中）</text>
                       </view>
+
+                      <view class="reason-line up-line-1" v-if="index!==0&&item.endTime">
+                        总耗时：{{ calculateFormatTimeDiff(item.startTime , item.endTime) }}
+                      </view>
+
                       <!-- 原因行 -->
                       <view class="reason-line up-line-2" v-if="item.tasks && item.tasks[0]?.reason">
                         描述：{{ getLimitReason(item.tasks && item.tasks[0]?.reason) }}
@@ -321,7 +328,7 @@ import {
   getApprovalDetail,
   universalApproval
 } from '@/api/work-order-manage/work-order-manage';
-import { nextStepMap, buzStatusMap } from '@/common/utils/common'
+import { nextStepMap, buzStatusMap, calculateFormatTimeDiff } from '@/common/utils/common'
 // 引入图片上传组合式函数
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
@@ -134,8 +134,6 @@
 					"style": { "navigationBarTitleText": "分配工单" }
 				},
-
-
 				{
 					"path": "work-order-manage/order-detail",
 					"style": { "navigationBarTitleText": "工单详情" }
@@ -145,11 +143,24 @@
 					"style": { "navigationBarTitleText": "养护任务" }
 				},
-
-
 				{
 					"path": "problem-allot/index",
 					"style": { "navigationBarTitleText": "问题分配" }
+				},
+
+				{
+					"path": "regional-order-manage/index",
+					"style": { "navigationBarTitleText": "工单管理" }
+				},
+
+				{
+					"path": "regional-order-manage/add-order",
+					"style": { "navigationBarTitleText": "待派单" }
+				},
+
+				{
+					"path": "regional-order-manage/order-detail",
+					"style": { "navigationBarTitleText": "工单详情" }
 				}
 			]
 		},