工单

刘淇
1 parent 7b1f488f
Showing 4 changed files with 830 additions and 334 deletions
pages-sub/daily/maintain-manage/add-record.vue
pages-sub/problem/work-order-manage/add-order.vue
pages-sub/problem/work-order-manage/index.vue
pages.json
 <template>
-  <view class="u-page">
-    <view class="work-order-form-content commonPageLRpadding">
+  <view class="page-container">
+    <view class="inspect-form-content commonPageLRpadding">
       <up-form
           label-position="left"
-          :model="workOrderForm"
-          ref="workOrderFormRef"
-          labelWidth="160rpx"
+          :model="inspectForm"
+          ref="inspectFormRef"
+          labelWidth="140rpx"
       >
-        <!-- 1. 工单位置（地图选择） -->
+        <!-- 1. 巡查描述（文本域） -->
         <up-form-item
-            label="工单位置"
-            prop="workLocation"
-            border-bottom
-            required
-            @click="chooseWorkLocation(); hideKeyboard()"
+            prop="content"
+            class="form-item"
         >
-          <up-input
-              v-model="workOrderForm.workLocation"
-              border="none"
-              readonly
-              suffix-icon="map-fill"
-              placeholder="点击选择工单位置"
-          ></up-input>
+          <up-textarea
+              v-model="inspectForm.remark"
+              placeholder="请输入巡查描述"
+              maxlength="200"
+              count
+          ></up-textarea>
         </up-form-item>
  
-        <!-- 2. 道路名称（下拉框） -->
+        <!-- 2. 上传图片 -->
         <up-form-item
-            label="道路名称"
-            prop="roadName"
-            border-bottom
+            label="上传图片"
+            prop="images"
             required
-            @click="workOrderForm.workLocation ? (showRoadName = true, hideKeyboard()) : uni.showToast({title: '请先选择工单位置', icon: 'none'})"
-        >
-          <up-input
-              v-model="workOrderForm.roadName"
-              disabled
-              disabled-color="#ffffff"
-              placeholder="请先选择工单位置"
-              border="none"
-              :placeholder-style="workOrderForm.workLocation ? '' : 'color:#999;'"
-          ></up-input>
-          <template #right>
-            <up-icon name="arrow-right" size="16" :color="workOrderForm.workLocation ? '#333' : '#999'"></up-icon>
-          </template>
-        </up-form-item>
-
-        <!-- 3. 工单名称（下拉框） -->
-        <up-form-item
-            label="工单名称"
-            prop="orderName"
             border-bottom
-            required
-            @click="showOrderName = true; hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.orderName"
-              disabled
-              disabled-color="#ffffff"
-              placeholder="请选择工单名称"
-              border="none"
-          ></up-input>
-          <template #right>
-            <up-icon name="arrow-right" size="16"></up-icon>
-          </template>
-        </up-form-item>
-
-        <!-- 4. 情况描述（文本域） -->
-        <up-form-item
-            label="情况描述"
-            prop="problemDesc"
-            required
+            class="form-item"
         >
-          <up-textarea
-              placeholder="请输入情况描述（最多200字）"
-              v-model="workOrderForm.problemDesc"
-              count
-              maxlength="200"
-              rows="4"
-              @blur="() => workOrderFormRef.value?.validateField('problemDesc')"
-          ></up-textarea>
-        </up-form-item>
-
-        <!-- 问题照片（复用公共上传） -->
-        <up-form-item label="问题照片" prop="problemImgs" required>
           <up-upload
-              :file-list="problemImgs.imgList"
-              @after-read="problemImgs.uploadImgs"
-              @delete="problemImgs.deleteImg"
+              :file-list="imagesList"
+              @after-read="(event) => uploadImgs(event)"
+              @delete="(event) => deleteImg(event)"
+              @on-exceed="handleExceed"
               multiple
-              :max-count="problemImgs.uploadConfig.maxCount"
-              :upload-text="problemImgs.uploadConfig.uploadText"
-              :sizeType="problemImgs.uploadConfig.sizeType"
+              :max-count="3"
+              upload-text="选择图片"
+              del-color="#ff4d4f"
+              class="upload-wrap"
           ></up-upload>
         </up-form-item>
  
-        <!-- 完成照片（复用公共上传） -->
-        <up-form-item label="完成照片" prop="completeImgs" required class="mt-20">
-          <up-upload
-              :file-list="completeImgs.imgList"
-              @after-read="completeImgs.uploadImgs"
-              @delete="completeImgs.deleteImg"
-              multiple
-              :max-count="completeImgs.uploadConfig.maxCount"
-              :upload-text="completeImgs.uploadConfig.uploadText"
-              :sizeType="completeImgs.uploadConfig.sizeType"
-          ></up-upload>
-        </up-form-item>
+        <!-- 3. 完成进度（滑块） -->
+        <up-form-item
+            label="完成进度"
+            prop="progress"
  
-        <!-- 处理结果（不必填） -->
-        <up-form-item label="处理结果" prop="handleResult" class="mt-20">
-          <up-textarea
-              placeholder="请输入处理结果描述（最多200字，选填）"
-              v-model="workOrderForm.handleResult"
-              count
-              maxlength="200"
-              rows="4"
-              @blur="() => workOrderFormRef.value?.validateField('handleResult')"
-          ></up-textarea>
+            class="form-item"
+        >
+          <view class="progress-wrap">
+            <up-slider
+                v-model="inspectForm.progress"
+                :min="initProgress"
+                :max="100"
+                active-color="#1989fa"
+                inactive-color="#e5e5e5"
+                block-size="24"
+                :showValue="true"
+                class="progress-slider"
+                @changing="handleProgressChange"
+            ></up-slider>
+          </view>
         </up-form-item>
       </up-form>
     </view>
@@ -125,271 +69,270 @@
     <view class="fixed-bottom-btn-wrap">
       <up-button
           type="primary"
-          text="提交工单"
-          @click="submitWorkOrder"
+          text="提交"
+          @click="submitInspect"
+          :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"
       ></up-button>
     </view>
-
-    <!-- 道路名称下拉弹窗 -->
-    <up-action-sheet
-        :show="showRoadName"
-        :actions="roadNameList"
-        title="请选择道路名称"
-        @close="showRoadName = false"
-        @select="handleRoadNameSelect"
-    ></up-action-sheet>
-
-    <!-- 工单名称下拉弹窗 -->
-    <up-action-sheet
-        :show="showOrderName"
-        :actions="orderNameList"
-        title="请选择工单名称"
-        @close="showOrderName = false"
-        @select="handleOrderNameSelect"
-    ></up-action-sheet>
   </view>
 </template>
  
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { onReady, onShow } from '@dcloudio/uni-app' // 从uni-app导入小程序生命周期
+import { ref } from 'vue'
 import type { UniFormRef } from '@/uni_modules/uview-plus/types'
-import { useUploadImgs } from '@/common/utils/useUploadImgs' // 引入公共上传逻辑
-import { getRoadListByLatLng } from '@/api/common'
-import { createQuick } from '@/api/quick-order/quick-order'
-
-// 表单Ref
-const workOrderFormRef = ref<UniFormRef>(null)
-
-// ========== 复用公共上传逻辑 ==========
-// 1. 问题照片配置
-const problemImgs = useUploadImgs({
-  maxCount: 3, // 可自定义数量
-  uploadText: '选择问题照片',
-  sizeType: ['compressed'],
-  formRef: workOrderFormRef,
-  fieldName: 'problemImgs'
-})
-
-// 2. 完成照片配置
-const completeImgs = useUploadImgs({
-  maxCount: 3,
-  uploadText: '选择完成照片',
-  sizeType: ['compressed'],
-  formRef: workOrderFormRef,
-  fieldName: 'completeImgs'
-})
-
-// ========== 页面数据 ==========
-const showRoadName = ref(false)
-const showOrderName = ref(false)
-const roadNameList = ref<any[]>([])
-const orderNameList = ref<any[]>([])
-
-// 工单表单数据
-const workOrderForm = reactive({
-  roadId: 0,
-  roadName: '',
-  workLocation: '',
-  orderName: '',
-  problemDesc: '',
-  handleResult: '',
-  lat: 0,
-  lon: 0
-})
-
-// 表单校验规则
-const workOrderFormRules = reactive({
-  workLocation: [
-    { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
-  ],
-  roadName: [
-    { type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur'] }
-  ],
-  orderName: [
-    { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
-  ],
-  problemDesc: [
-    { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
-    { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
-  ],
-  problemImgs: [problemImgs.imgValidateRule], // 复用校验规则
-  completeImgs: [completeImgs.imgValidateRule] // 复用校验规则
-})
-
-// ========== 生命周期 ==========
-onReady(() => {
-  // 设置表单校验规则
-  workOrderFormRef.value?.setRules(workOrderFormRules)
-  console.log('工单表单规则初始化完成')
-})
-
-onShow(() => {
-  console.log(uni.$dict.getDictLabel('ai_image_status', 20))
-  console.log(uni.$dict.getDictSimpleList('work_name'))
-  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
-  console.log(orderNameList.value)
-})
-
-// ========== 方法 ==========
-/**
- * 返回上一页
- */
-const navigateBack = () => {
-  uni.navigateBack()
-}
-
-/**
- * 隐藏键盘
- */
-const hideKeyboard = () => {
-  uni.hideKeyboard()
-}
+const inspectFormRef = ref<UniFormRef>(null)
+</script>
  
-/**
- * 选择工单位置
- */
-const chooseWorkLocation = async () => {
-  uni.chooseLocation({
-    success: async (res) => {
-      workOrderForm.roadName = ''
-      workOrderForm.roadId = 0
-      roadNameList.value = []
+<script lang="ts">
+import { uploadImages } from '@/common/utils/upload'
+import { maintainCreate } from "@/api/maintain-manage/maintain-manage"
+
+export default {
+  data() {
+    return {
+      imagesList: [],
+      initProgress: 0,
+      inspectForm: {
+        remark: '',
+        progress: 0
+      },
+      paramsOptins: {},
+      inspectFormRules: {
+        images: [
+          {
+            required: true,
+            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
+              if (!hasSuccessImg || imgCount < 1) {
+                callback(new Error('最少需要上传1张图片'))
+              } else if (imgCount > 3) {
+                callback(new Error('最多只能上传3张图片'))
+              } else {
+                callback()
+              }
+            }
+          }
+        ],
+        // progress: [
+        //   {
+        //
+        //     required: true,
+        //     message: '请设置完成进度',
+        //     trigger: ['change'],
+        //     validator: (rule, value, callback) => {
+        //       // 第一步：校验是否为空/0
+        //       if (!value && value !== 0) {
+        //         callback(new Error('请设置完成进度'))
+        //       }
+        //       // 第二步：校验是否大于初始进度
+        //       else if (value <= this.initProgress) {
+        //         callback(new Error(`完成进度必须大于${this.initProgress}%`))
+        //       }
+        //       // 校验通过
+        //       else {
+        //         callback()
+        //       }
+        //     }
+        //   }
+        // ]
+      }
+    }
+  },
+  onLoad(option) {
+    console.log('页面参数：', option)
+    this.paramsOptins = option
+    // 初始化初始进度
+    this.initProgress = option.finishPercent ? Number(option.finishPercent)+1 : 0
+    // 关键修复：初始进度值设为 初始进度+1，避免刚进入就触发校验失败
+    this.inspectForm.progress = this.initProgress
+    console.log('初始进度值：', this.initProgress)
+  },
+  onReady() {
+    this.$refs.inspectFormRef.setRules(this.inspectFormRules)
+    console.log('巡查表单规则初始化完成')
+  },
+  methods: {
+    /**
+     * 进度滑块变化处理 - 核心优化：实时触发校验 + 状态更新
+     */
+    handleProgressChange(value) {
+      // // 1. 强制修正非法值（兜底）
+      // console.log(value)
+      // if (value <= this.initProgress) {
+      //   console.log('123')
+      //   this.inspectForm.progress = this.initProgress + 1
+      //   uni.showToast({
+      //     title: `进度不能低于${this.initProgress}%`,
+      //     icon: 'none',
+      //     duration: 1500
+      //   })
+      // }
+      //
+      // // 2. 关键：手动触发progress字段的校验，实时更新提示状态
+      // this.$nextTick(async () => {
+      //   try {
+      //     // 触发单个字段校验
+      //     await this.$refs.inspectFormRef.validateField('progress')
+      //   } catch (err) {
+      //     // 校验失败时uView会自动显示提示，此处无需额外处理
+      //     console.log('进度校验失败：', err)
+      //   }
+      // })
+    },
  
-      workOrderForm.workLocation = res.name
-      workOrderForm.lat = res.latitude
-      workOrderForm.lon = res.longitude
+    /**
+     * 删除图片
+     */
+    deleteImg(event) {
+      console.log('删除图片事件：', event)
+      this.imagesList.splice(event.index, 1)
+      this.$refs.inspectFormRef.validateField('images')
+      uni.showToast({ title: '图片删除成功', icon: 'success' })
+    },
  
-      workOrderFormRef.value?.validateField('workLocation')
-      workOrderFormRef.value?.validateField('roadName')
+    /**
+     * 上传图片
+     */
+    async uploadImgs(event) {
+      console.log('上传图片事件：', event)
+      const fileList = Array.isArray(event.file) ? event.file : [event.file]
+      const targetImgList = this.imagesList
+      const filePaths = fileList.map(item => item.url)
+      const tempItems = fileList.map(item => ({
+        ...item,
+        status: 'uploading',
+        message: '上传中'
+      }))
+      const startIndex = targetImgList.length
+      targetImgList.push(...tempItems)
  
       try {
-        uni.showLoading({ title: '获取道路名称中...' })
-        const roadRes = await getRoadListByLatLng({
-          companyCode: 'sls',
-          latitude: res.latitude,
-          longitude: res.longitude
+        const uploadResultUrls = await uploadImages({
+          filePaths: filePaths,
+          ignoreError: true
+        })
+        console.log('上传成功的URL列表：', uploadResultUrls)
+
+        uploadResultUrls.forEach((url, index) => {
+          if (targetImgList[startIndex + index]) {
+            targetImgList.splice(startIndex + index, 1, {
+              ...fileList[index],
+              status: 'success',
+              message: '',
+              url: url
+            })
+          }
         })
-        uni.hideLoading()
  
-        if (Array.isArray(roadRes)) {
-          roadNameList.value = roadRes.map((item) => ({
-            name: item.roadName || '',
-            code: item.roadCode || '',
-            id: item.roadId || 0
-          }))
+        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 {
-          roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }]
-          uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' })
+          uni.showToast({ title: `成功上传${fileList.length}张图片`, icon: 'success' })
         }
+
+        this.$refs.inspectFormRef.validateField('images')
       } catch (err) {
-        uni.hideLoading()
-        console.error('获取道路名称失败：', err)
-        uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' })
-        roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }]
+        console.error('图片上传失败：', err)
+        for (let i = 0; i < fileList.length; i++) {
+          if (targetImgList[startIndex + i]) {
+            targetImgList.splice(startIndex + i, 1, {
+              ...fileList[i],
+              status: 'failed',
+              message: '上传失败'
+            })
+          }
+        }
+        uni.showToast({ title: '图片上传失败，请重试', icon: 'none' })
+        this.$refs.inspectFormRef.validateField('images')
       }
     },
-    fail: (err) => {
-      console.error('选择位置失败：', err)
-      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
-    }
-  })
-}
  
-/**
- * 选择道路名称
- */
-const handleRoadNameSelect = (e: any) => {
-  console.log('选择道路名称：', e)
-  workOrderForm.roadName = e.name
-  workOrderForm.roadId = e.code
-  showRoadName.value = false
-  workOrderFormRef.value?.validateField('roadName')
-}
-
-/**
- * 选择工单名称
- */
-const handleOrderNameSelect = (e: any) => {
-  console.log(e)
-  workOrderForm.orderName = e.name
-  showOrderName.value = false
-  workOrderFormRef.value?.validateField('orderName')
-}
-
-/**
- * 提交工单
- */
-const submitWorkOrder = async () => {
-  try {
-    // 表单校验
-    await workOrderFormRef.value?.validate()
+    /**
+     * 处理图片超出数量限制
+     */
+    handleExceed() {
+      uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
+    },
  
-    const submitData = {
-      roadId: workOrderForm.roadId,
-      roadName: workOrderForm.roadName,
-      imgs: problemImgs.getSuccessImgUrls(), // 复用获取成功URL方法
-      longRangeImgList: completeImgs.getSuccessImgUrls(), // 复用获取成功URL方法
-      remark: workOrderForm.problemDesc,
-      handleResult: workOrderForm.handleResult,
-      latLonType: 2,
-      lat: workOrderForm.lat,
-      lon: workOrderForm.lon,
-      lonLatAddress: workOrderForm.workLocation,
-      pressingType: 2,
-      orderName: workOrderForm.orderName,
-      sourceId: 1,
-      sourceName: '园林',
-      thirdWorkNo: ''
-    }
+    /**
+     * 提取图片URL数组
+     */
+    getImgUrlList(imgList) {
+      return imgList.filter(item => item.status === 'success').map(item => item.url)
+    },
  
-    // 显示加载中
-    uni.showLoading({ title: '提交中...' })
+    /**
+     * 提交巡查表单
+     */
+    async submitInspect() {
+      console.log('当前完成进度：', this.inspectForm.progress)
+      try {
+        await this.$refs.inspectFormRef.validate()
+        console.log('图片列表：', this.imagesList)
+
+        const submitData = {
+          totalFinishPercent: this.inspectForm.progress,
+          "planNo": this.paramsOptins.planNo,
+          "imgHost": "1",
+          "beginImg": this.getImgUrlList(this.imagesList),
+          "commonUserList": [],
+          "remark": this.inspectForm.remark
+        }
  
-    // 调用提交接口
-    const res = await createQuick(submitData)
+        uni.showLoading({ title: '提交中...' })
+        await maintainCreate(submitData)
+        uni.hideLoading()
  
-    uni.hideLoading()
-    uni.showToast({
-      title: '工单提交成功',
-      icon: 'success',
-      duration: 1000
-    })
+        uni.showToast({
+          title: '提交成功',
+          icon: 'success',
+          duration: 1000
+        })
  
-    // 延迟跳转
-    setTimeout(() => {
-      uni.redirectTo({
-        url: '/pages-sub/daily/quick-order/index'
-      })
-    }, 1000)
-  } catch (error) {
-    uni.hideLoading()
+        setTimeout(() => {
+          uni.redirectTo({
+            url: '/pages-sub/daily/maintain-manage/index'
+          })
+        }, 1000)
  
-    if (!Array.isArray(error)) {
-      console.error('工单提交失败：', error)
-      uni.showToast({
-        title: '提交失败，请重试',
-        icon: 'none',
-        duration: 2000
-      })
+      } catch (error) {
+        uni.hideLoading()
+        if (!Array.isArray(error)) {
+          console.error('巡查表单提交失败：', error)
+          uni.showToast({
+            title: '提交失败，请重试',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }
     }
   }
 }
 </script>
  
 <style lang="scss" scoped>
-// 全局页面样式
-.u-page {
-  min-height: 100vh;
-}
-
-// 工单表单内容容器
-.work-order-form-content {
+.inspect-form-content {
   background: #fff;
+  padding: 20rpx;
+  margin-bottom: 20rpx;
 }
  
-.fixed-bottom-btn-wrap {
-  padding: 20rpx;
-  background: #fff;
+.progress-wrap {
+  width: 83%;
 }
-</style>
 \ No newline at end of file
+</style>
+
+<template>
+  <view class="page-container">
+    <!-- 顶部固定区域 -->
+    <up-sticky>
+      <view class="header-wrap">
+        <!-- 第一行：u-tabs 待办/已办切换  :scrollable="false"-->
+        <up-tabs
+            v-model="activeTab"
+            :list="tabList"
+            active-color="#1989fa"
+            inactive-color="#666"
+            font-size="30rpx"
+
+            @change="handleTabChange"
+        />
+
+        <!-- 第二行：下拉框 + 搜索框 -->
+        <view class="search-header">
+          <!-- 左侧下拉框 -->
+          <view class="select-wrap">
+            <up-select
+                v-model:current="selectedSortValue"
+                :options="sortOptions"
+                :showOptionsLabel="true"
+                @select="handleSortChange"
+                border="surround"
+                :style="{ flex: 1 }"
+            />
+          </view>
+
+          <!-- 右侧搜索框 -->
+          <view class="search-input-wrap">
+            <up-search
+                v-model="searchValue"
+                placeholder="请输入关键字"
+                @search="handleSearch"
+                bg-color="#f5f5f5"
+                :clearabled="false"
+                :show-action="true"
+                actionText="搜索"
+                :animation="true"
+                @custom="handleSearch"
+            />
+          </view>
+        </view>
+      </view>
+    </up-sticky>
+
+    <!-- 列表容器 -->
+    <z-paging
+        ref="paging"
+        v-model="orderList"
+        @query="queryList"
+        :auto-show-system-loading="true"
+
+    >
+      <template #empty>
+        <view class="empty-view" style="padding: 100rpx 0; text-align: center; color: #999;">
+          暂无工单数据
+        </view>
+      </template>
+
+      <view class="common-card-list" slot="top">
+        <!-- 待办工单卡片 -->
+        <up-card
+            v-if="activeTab === 0"
+            :border="false"
+            :foot-border-top="false"
+            v-for="(item, index) in orderList"
+            :key="`todo_${item.orderNo}_${index}`"
+            :show-head="false"
+            class="order-card"
+        >
+          <template #body>
+            <view class="card-body">
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">工单编号：</view>
+                <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</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.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.orderName || '未填写' }}</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.remark || '无' }}</view>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">紧急程度：</view>
+                <view class="u-line-1 u-body-value">
+                  <up-tag :type="getUrgencyType(item.urgencyLevel)">{{ item.urgencyLevel || '普通' }}</up-tag>
+                </view>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">提交时间：</view>
+                <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+              </view>
+              <!-- 操作按钮行 -->
+              <view class="u-body-item u-flex common-justify-between common-item-center mt-20">
+                <up-button type="warning" size="mini" @click="handleReject(item)">回退</up-button>
+                <up-button type="primary" size="mini" @click="handleProcess(item)">处理</up-button>
+                <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
+              </view>
+            </view>
+          </template>
+        </up-card>
+
+        <!-- 已办工单卡片 -->
+        <up-card
+            v-if="activeTab === 1"
+            :border="false"
+            :foot-border-top="false"
+            v-for="(item, index) in orderList"
+            :key="`done_${item.orderNo}_${index}`"
+            :show-head="false"
+            class="order-card"
+        >
+          <template #body>
+            <view class="card-body">
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">工单编号：</view>
+                <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</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.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.orderName || '未填写' }}</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.remark || '无' }}</view>
+              </view>
+              <view class="u-body-item u-flex common-justify-between common-item-center">
+                <view class="u-flex">
+                  <view class="u-body-item-title">紧急程度：</view>
+                  <view class="u-line-1 u-body-value">
+                    <up-tag :type="getUrgencyType(item.urgencyLevel)">{{ item.urgencyLevel || '普通' }}</up-tag>
+                  </view>
+                </view>
+                <up-button type="info" size="mini" @click="handleDetail(item)">工单详情</up-button>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">提交时间：</view>
+                <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+              </view>
+            </view>
+          </template>
+        </up-card>
+      </view>
+    </z-paging>
+
+    <!-- 底部新增工单按钮（仅巡查员显示） -->
+    <view v-if="isInspector" class="fixed-bottom-btn-wrap">
+      <up-button type="primary" size="large" @click="handleAddOrder">
+        新增工单
+      </up-button>
+    </view>
+
+    <!-- 回退原因弹窗 -->
+    <up-popup v-model="rejectPopupShow" mode="center" :close-on-click-overlay="false">
+      <view class="reject-popup">
+        <view class="popup-title">回退原因</view>
+        <up-textarea
+            v-model="rejectReason"
+            placeholder="请输入回退原因（必填）"
+            :required="true"
+            maxlength="-1"
+            rows="4"
+            class="mt-20"
+        />
+        <view class="upload-wrap mt-20">
+          <view class="upload-title">上传图片（选填）</view>
+          <up-upload
+              :action="uploadUrl"
+              :file-list="rejectFileList"
+              @after-read="handleAfterRead"
+              @delete="handleDeleteFile"
+              multiple
+              max-count="3"
+          />
+        </view>
+        <view class="popup-btn-wrap mt-40">
+          <up-button type="default" size="medium" @click="rejectPopupShow = false" class="mr-20">取消</up-button>
+          <up-button type="primary" size="medium" @click="confirmReject">确认提交</up-button>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { timeFormat } from '@/uni_modules/uview-plus';
+// 假设从用户store获取角色信息
+import { useUserStore } from '@/pinia/user';
+
+// ========== 状态管理 ==========
+const userStore = useUserStore();
+// 标签页切换
+const activeTab = ref(0); // 0-待办 1-已办
+const tabList = ref([
+  { name: '待办' },
+  { name: '已办' }
+]);
+// 排序下拉框
+const selectedSortValue = ref(1);
+const sortOptions = ref([
+  { name: '位置', id: 1 },
+  { name: '名称', id: 2 },
+  { name: '描述', id: 3 },
+  { name: '编号', id: 4 },
+]);
+// 搜索
+const searchValue = ref('');
+// 分页
+const paging = ref(null);
+const orderList = ref([]);
+// 角色控制（巡查员显示新增按钮）
+const isInspector = computed(() => {
+  // 假设用户角色字段为role，巡查员标识为inspector
+  return userStore.userInfo.roles === 'yl_inspector';
+});
+// 回退弹窗相关
+const rejectPopupShow = ref(false);
+const rejectReason = ref('');
+const rejectFileList = ref([]);
+const currentRejectItem = ref(null);
+// 上传地址（根据实际接口配置）
+const uploadUrl = ref('https://xxx.com/upload');
+
+// ========== 接口请求 ==========
+// 待办工单接口
+const getTodoOrderList = async (params) => {
+  // 替换为实际待办工单接口
+  const res = await uni.request({
+    url: '/api/order/todo',
+    method: 'POST',
+    data: params
+  });
+  return res.data;
+};
+
+// 已办工单接口
+const getDoneOrderList = async (params) => {
+  // 替换为实际已办工单接口
+  const res = await uni.request({
+    url: '/api/order/done',
+    method: 'POST',
+    data: params
+  });
+  return res.data;
+};
+
+// 分页查询列表
+const queryList = async (pageNo, pageSize) => {
+  try {
+    const apiParams = {
+      searchContent: searchValue.value.trim() || '',
+      pageNo,
+      pageSize,
+      type: selectedSortValue.value // 1-位置 2-工单名称 3-情况描述 4-工单编号
+    };
+
+    let res;
+    if (activeTab.value === 0) {
+      // 待办工单
+      res = await getTodoOrderList(apiParams);
+    } else {
+      // 已办工单
+      res = await getDoneOrderList(apiParams);
+    }
+
+    // 适配z-paging分页
+    paging.value.complete(res.list, res.total);
+  } catch (error) {
+    console.error('加载工单失败：', error);
+    paging.value?.complete(false);
+    uni.showToast({ title: '加载失败，请重试', icon: 'none' });
+  }
+};
+
+// ========== 事件处理 ==========
+// 标签页切换
+const handleTabChange = (index) => {
+  activeTab.value = index;
+  paging.value?.reload(); // 切换标签页刷新列表
+};
+
+// 排序变更
+const handleSortChange = (val) => {
+  selectedSortValue.value = val.id;
+  searchValue.value = '';
+  paging.value?.reload(); // 排序变更刷新列表
+};
+
+// 搜索
+const handleSearch = (val) => {
+  searchValue.value = val;
+  paging.value?.reload(); // 搜索刷新列表
+};
+
+// 工单详情
+const handleDetail = (item) => {
+  uni.navigateTo({
+    url: `/pages-sub/daily/quick-order/order-detail?id=${item.id}`
+  });
+};
+
+// 待办-处理工单
+const handleProcess = async (item) => {
+  try {
+    // 调用处理工单接口，获取跳转标识
+    const res = await uni.request({
+      url: '/api/order/process',
+      method: 'POST',
+      data: { orderId: item.id }
+    });
+
+    const { jumpType, jumpUrl } = res.data;
+    // 根据返回标识跳转不同页面
+    if (jumpType === 1) {
+      uni.navigateTo({ url: jumpUrl });
+    } else if (jumpType === 2) {
+      uni.redirectTo({ url: jumpUrl });
+    } else if (jumpType === 3) {
+      uni.switchTab({ url: jumpUrl });
+    }
+  } catch (error) {
+    console.error('处理工单失败：', error);
+    uni.showToast({ title: '处理失败，请重试', icon: 'none' });
+  }
+};
+
+// 待办-回退工单
+const handleReject = (item) => {
+  currentRejectItem.value = item;
+  rejectReason.value = '';
+  rejectFileList.value = [];
+  rejectPopupShow.value = true;
+};
+
+// 确认回退工单
+const confirmReject = async () => {
+  if (!rejectReason.value.trim()) {
+    uni.showToast({ title: '请填写回退原因', icon: 'none' });
+    return;
+  }
+
+  try {
+    // 调用回退工单接口
+    await uni.request({
+      url: '/api/order/reject',
+      method: 'POST',
+      data: {
+        orderId: currentRejectItem.value.id,
+        reason: rejectReason.value,
+        fileUrls: rejectFileList.value.map(file => file.url)
+      }
+    });
+
+    uni.showToast({ title: '回退成功', icon: 'success' });
+    rejectPopupShow.value = false;
+    paging.value?.reload(); // 刷新列表
+  } catch (error) {
+    console.error('回退工单失败：', error);
+    uni.showToast({ title: '回退失败，请重试', icon: 'none' });
+  }
+};
+
+// 新增工单
+const handleAddOrder = () => {
+  uni.navigateTo({
+    url: '/pages-sub/problem/work-order-manage/add-order'
+  });
+};
+
+// 紧急程度标签类型转换
+const getUrgencyType = (level) => {
+  switch (level) {
+    case '紧急':
+      return 'danger';
+    case '重要':
+      return 'warning';
+    case '普通':
+      return 'info';
+    default:
+      return 'default';
+  }
+};
+
+// 上传图片-读取后
+const handleAfterRead = (file) => {
+  rejectFileList.value.push(file);
+};
+
+// 上传图片-删除
+const handleDeleteFile = (index) => {
+  rejectFileList.value.splice(index, 1);
+};
+
+// 页面初始化
+onMounted(() => {
+  // 初始化加载列表
+  paging.value?.reload();
+});
+</script>
+
+<style scoped lang="scss">
+.page-container {
+  min-height: 100vh;
+  background-color: #f8f8f8;
+}
+
+// 顶部固定区域
+.header-wrap {
+  background-color: #fff;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+// 搜索栏样式
+.search-header {
+  display: flex;
+  align-items: center;
+  padding: 20rpx;
+  box-sizing: border-box;
+
+  .select-wrap {
+    width: 120rpx;
+    margin-right: 20rpx;
+
+    :deep(.u-select) {
+      width: 100%;
+      font-size: 28rpx;
+    }
+
+    :deep(.u-input__placeholder) {
+      font-size: 28rpx;
+    }
+  }
+
+  .search-input-wrap {
+    flex: 1;
+  }
+}
+
+// 工单卡片样式
+.common-card-list {
+  padding: 20rpx;
+}
+
+.order-card {
+  margin-bottom: 20rpx;
+  background-color: #fff;
+  border-radius: 12rpx;
+  overflow: hidden;
+}
+
+.card-body {
+  padding: 20rpx;
+
+  .u-body-item {
+    margin-bottom: 16rpx;
+    font-size: 28rpx;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    .u-body-item-title {
+      color: #666;
+      min-width: 120rpx;
+    }
+
+    .u-body-value {
+      color: #333;
+      flex: 1;
+    }
+  }
+
+  .mt-20 {
+    margin-top: 20rpx;
+  }
+}
+
+// 公共flex样式
+.u-flex {
+  display: flex;
+  align-items: center;
+}
+
+.common-justify-between {
+  justify-content: space-between;
+}
+
+.common-item-center {
+  align-items: center;
+}
+
+// 底部按钮
+.fixed-bottom-btn-wrap {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 20rpx;
+  background-color: #fff;
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+  :deep(.u-button) {
+    width: 100%;
+    height: 88rpx;
+    font-size: 32rpx;
+  }
+}
+
+// 回退弹窗样式
+.reject-popup {
+  width: 680rpx;
+  padding: 30rpx;
+  background-color: #fff;
+  border-radius: 12rpx;
+
+  .popup-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333;
+  }
+
+  .upload-title {
+    font-size: 28rpx;
+    color: #666;
+    margin-bottom: 10rpx;
+  }
+
+  .popup-btn-wrap {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+</style>
 \ No newline at end of file
@@ -377,7 +377,7 @@ const confirmReject = async () =&gt; {
 // 新增工单
 const handleAddOrder = () => {
   uni.navigateTo({
-    url: '/pages-sub/daily/quick-order/add-order'
+    url: '/pages-sub/problem/work-order-manage/add-order'
   });
 };
  
@@ -125,6 +125,12 @@
 					"style": { "navigationBarTitleText": "工单管理" }
 				},
 				{
+					"path": "work-order-manage/add-order",
+					"style": { "navigationBarTitleText": "新增工单" }
+				},
+
+
+				{
 					"path": "problem-allot/index",
 					"style": { "navigationBarTitleText": "问题分配" }
 				}