登录修改样式

刘淇
1 parent 6e9f0396
Showing 17 changed files with 1802 additions and 1450 deletions
api/common.js
api/tree-archive/tree-archive.js
pages-sub/data/tree-archive/addTree.vue
pages-sub/data/tree-archive/editTree.vue
pages-sub/data/tree-archive/index.vue
pages-sub/data/tree-archive/treeRecord.vue
pages-sub/problem/ai-manage/index.vue
pages-sub/problem/regional-order-manage/add-order.vue
pages-sub/problem/regional-order-manage/add-patrol-order.vue
pages-sub/problem/regional-order-manage/distribution-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-maintain-order.vue
pages.json
pages/login/index.vue
static/imgs/tree/tree-high.png
static/imgs/tree/treearound.png
@@ -11,6 +11,16 @@ export const getRoadListByLatLng = (params) =&gt; {
   return get('/app-api/bpm/garden/workorder/listRoadInfo', params);
 };
  
+
+/**
+ * 根据公司
+ * @param {Object} params {mobile, password, code}
+ * @returns {Promise}
+ */
+export const getCompanyList = (params) => {
+  return get('/admin-api/system/dept/sub-list', params);
+};
+
 // export const fileUpload = (params) => {
 //   return post('/app-api/infra/file/upload', params);
 // };
+
+import { post, get } from '@/common/utils/request';
+
+
+/**
+ * 班组集合
+ * @param {Object} params
+ * @returns {Promise}
+ */
+export const deptListReq = (params) => {
+  return get('/app-api/garden/tree/dept/list', params);
+};
+
+/**
+ * 道路树木列表
+ * @param {Object} params
+ * @returns {Promise}
+ */
+export const treeRoadReq = (params) => {
+  return get('/app-api/garden/tree/road/list', params);
+};
+
+
+/**
+ * 新增树
+ * @param {Object} params
+ * @returns {Promise}
+ */
+export const addTree = (params) => {
+  return get('/app-api/garden/tree/create', params);
+};
+
+
+
+// // 树基本详情
+// export const treeDetailReq = (params) => request.get('/business/tree/'+params )
+//   ==>
+//   /app-api/garden/tree/get
+//
+// // 修改树
+// export const updateTree = (params) => request.put('/business/tree/',params )
+//   ==>
+//   /app-api/garden/tree/update
+//
+// // 树更变记录
+// export const treeLogReq = (params) => request.get('/gardentree/logs/list/',params )
+//   ==>
+//   /app-api/garden/tree-change-log/page
+<template>
+  <view class="container">
+    <up-form :model="formData" ref="formRef" label-width="140rpx" border-bottom>
+      <up-form-item label="名称" prop="treetype" required>
+        <up-input v-model="formData.treetype" placeholder="请输入名称" maxlength="30" border="none" />
+      </up-form-item>
+
+      <up-row gutter="10">
+        <up-col span="6">
+          <up-form-item label="胸径" prop="dbh" required>
+            <up-input v-model="formData.dbh" placeholder="请输入" maxlength="10" border="none" input-align="left" />
+            <template #right>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:12px">厘米</text>
+            </template>
+          </up-form-item>
+        </up-col>
+        <up-col span="6">
+          <up-form-item label="高度" prop="treeheight">
+            <up-input v-model="formData.treeheight" placeholder="请输入" maxlength="10" border="none" input-align="left" />
+            <template #right>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
+            </template>
+          </up-form-item>
+        </up-col>
+      </up-row>
+
+      <up-form-item label="位置" prop="growlocation" required class="location-form-item" @click="openMap">
+        <up-input v-model="formData.growlocation" placeholder="请选择" disabled border="none" />
+        <template #right>
+          <up-icon name="map" size="22"></up-icon>
+        </template>
+      </up-form-item>
+
+      <up-row gutter="10">
+        <up-col span="6">
+          <up-form-item label="经度" label-color="#ccc" prop="longitude" border-bottom="none">
+            <up-input v-model="formData.longitude" placeholder="" disabled border="none" />
+          </up-form-item>
+        </up-col>
+        <up-col span="6">
+          <up-form-item label="纬度" label-color="#ccc" prop="latitude" border-bottom="none">
+            <up-input v-model="formData.latitude" placeholder="" disabled border="none" />
+          </up-form-item>
+        </up-col>
+      </up-row>
+
+      <up-form-item label="管护单位" prop="managedutyunit" required>
+        <up-input v-model="formData.managedutyunit" placeholder="请输入" maxlength="30" border="none" />
+      </up-form-item>
+
+      <up-form-item label="权属分类" prop="oldtreeownershipText" required arrow @click="pickerShow = true">
+        <up-input v-model="formData.oldtreeownershipText" placeholder="请选择" disabled border="none" bg-color="transparent" />
+      </up-form-item>
+
+      <!-- ✅✅✅ 核心修改：图片上传 完全对标参考代码写法 start -->
+      <up-form-item label="图片信息" prop="treeImgList" required>
+        <up-upload
+            :file-list="treeImgs.imgList.value || []"
+            @after-read="treeImgs.uploadImgs"
+            @delete="treeImgs.deleteImg"
+            multiple
+            :width="70"
+            :height="70"
+            :max-count="treeImgs.uploadConfig.maxCount"
+            :upload-text="treeImgs.uploadConfig.uploadText"
+            :size-type="treeImgs.uploadConfig.sizeType"
+        ></up-upload>
+      </up-form-item>
+      <!-- ✅✅✅ 图片上传 修改结束 -->
+
+      <!-- 动画区域（初始隐藏）保留原逻辑 -->
+      <view
+          class="animated-area"
+          :style="{
+          height: isShow ? contentHeight + 'px' : '0',
+          opacity: isShow ? 1 : 0,
+          overflow: 'hidden'
+        }"
+      >
+        <up-row gutter="10">
+          <up-col span="6">
+            <up-form-item label="拉丁文" prop="latinname">
+              <up-input v-model="formData.latinname" placeholder="请输入" maxlength="30" border="none" />
+            </up-form-item>
+          </up-col>
+          <up-col span="6">
+            <up-form-item label="级别" arrow @click="levelshow = true">
+              <up-input v-model="formData.treeleveltext" placeholder="请选择" disabled border="none" bg-color="transparent" />
+            </up-form-item>
+          </up-col>
+        </up-row>
+
+        <up-form-item label="生长环境" prop="growthenvironment">
+          <up-input v-model="formData.growthenvironment" placeholder="请输入" maxlength="50" border="none" />
+        </up-form-item>
+
+        <up-row gutter="10">
+          <up-col span="6">
+            <up-form-item label="预估树龄" prop="estimationtreeage">
+              <up-input v-model="formData.estimationtreeage" placeholder="请输入" maxlength="10" border="none" input-align="left" />
+              <template #right>
+                <text style="padding-left:12rpx;color:#ccc;font-size:14px">年</text>
+              </template>
+            </up-form-item>
+          </up-col>
+          <up-col span="6">
+            <up-form-item label="干周" prop="weekday">
+              <up-input v-model="formData.weekday" placeholder="请输入" maxlength="10" border="none" input-align="left" />
+              <template #right>
+                <text style="padding-left:12rpx;color:#ccc;font-size:14px">厘米</text>
+              </template>
+            </up-form-item>
+          </up-col>
+        </up-row>
+
+        <up-row gutter="10">
+          <up-col span="6">
+            <up-form-item label="东西冠幅" prop="canopyeastwest">
+              <up-input v-model="formData.canopyeastwest" placeholder="请输入" maxlength="10" border="none" input-align="left" />
+              <template #right>
+                <text style="padding-left:12rpx;color:#ccc;font-size:14px">米</text>
+              </template>
+            </up-form-item>
+          </up-col>
+          <up-col span="6">
+            <up-form-item label="南北冠幅" prop="canopysouthnorth">
+              <up-input v-model="formData.canopysouthnorth" placeholder="请输入" maxlength="10" border="none" input-align="left" />
+              <template #right>
+                <text style="padding-left:12rpx;color:#ccc;font-size:14px">米</text>
+              </template>
+            </up-form-item>
+          </up-col>
+        </up-row>
+      </view>
+
+      <!-- 触发按钮 -->
+      <up-button
+          @click="toggleArea"
+          type="primary"
+          plain
+          size="large"
+          style="margin-top:20rpx"
+      >
+        {{ isShow ? '- 隐藏区域' : '+ 显示区域' }}
+      </up-button>
+    </up-form>
+
+    <view style="height: 60px;width: 100%"></view>
+
+    <!-- 底部提交按钮 -->
+    <view class="fixed-bottom-btn-wrap">
+      <up-button type="primary" @click="submit" :loading="loadingFlag" size="large" bold>提交</up-button>
+    </view>
+
+    <up-picker
+        v-model="pickerShow"
+        :list="treeOwnershipData"
+        label-key="dictLabel"
+        value-key="dictValue"
+        @confirm="pickerChange"
+    ></up-picker>
+
+    <up-picker
+        v-model="levelshow"
+        :list="treeLevelData"
+        label-key="dictLabel"
+        value-key="dictValue"
+        @confirm="pickerLevelChange"
+    ></up-picker>
+  </view>
+</template>
+
+<script setup>
+import { ref, reactive, nextTick } from 'vue'
+import { onReady, onLoad, onShow } from '@dcloudio/uni-app';
+import { addTree } from "@/api/tree-archive/tree-archive.js";
+
+import { useUploadImgs } from '@/common/utils/useUploadImgs'
+import { useUserStore } from '@/pinia/user';
+
+// ========== 状态管理 ==========
+const userStore = useUserStore();
+
+// ✅ 全局响应式数据
+const formRef = ref(null)
+const isShow = ref(false)
+const contentHeight = ref(700)
+const treeOwnershipData = ref([])
+const treeLevelData = ref([])
+const pickerShow = ref(false)
+const levelshow = ref(false)
+const loadingFlag = ref(false)
+
+// ✅✅✅ 核心修改：图片上传配置 完全对标参考代码写法
+const treeImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择图片',
+  sizeType: ['compressed'],
+  formRef: formRef,
+  fieldName: 'treeImgList'
+})
+// 图片数组兜底，防止非数组报错
+if (!Array.isArray(treeImgs.rawImgList.value)) treeImgs.rawImgList.value = [];
+
+// ✅ 表单数据 - 替代vue2的data
+const formData = reactive({
+  treetype: '',
+  treeheight: '',
+  dbh: '',
+  treelevel: '',
+  treeleveltext: '',
+  managedutyunit: '',
+  oldtreeownership: '',
+  oldtreeownershipText: '',
+  latinname: '',
+  estimationtreeage: '',
+  canopysouthnorth: '',
+  canopyeastwest: '',
+  weekday: '',
+  growlocation: '',
+  growthenvironment: '',
+  treeImgList: [],
+  address: '',
+  latitude: '',
+  longitude: '',
+  road: '',
+  maintainunit: ''
+})
+
+// ✅✅✅ 核心修改：表单校验规则 - 图片校验改为参考代码同款
+const rules = reactive({
+  treetype: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+  treeheight: [{ max: 10, message: '树高不能超过10个字符', trigger: 'blur' }, { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的数字格式', trigger: 'blur' }],
+  dbh: [{ required: true, message: '请输入胸径', trigger: 'blur' }, { max: 10, message: '胸径不能超过10个字符', trigger: 'blur' }, { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的数字格式', trigger: 'blur' }],
+  estimationtreeage: [{ max: 10, message: '预估树龄不能超过10个字符', trigger: 'blur' }, { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的数字格式', trigger: 'blur' }],
+  weekday: [{ max: 10, message: '干周不能超过10个字符', trigger: 'blur' }, { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的数字格式', trigger: 'blur' }],
+  canopyeastwest: [{ max: 10, message: '东西冠幅不能超过10个字符', trigger: 'blur' }, { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的数字格式', trigger: 'blur' }],
+  canopysouthnorth: [{ max: 10, message: '南北冠幅不能超过10个字符', trigger: 'blur' }, { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的数字格式', trigger: 'blur' }],
+  growlocation: [{ required: true, message: '请地图选择位置', trigger: 'change' }],
+  managedutyunit: [{ required: true, message: '请输入管护单位', trigger: 'blur' }],
+  oldtreeownershipText: [{ required: true, message: '请选择权属分类', trigger: 'change' }],
+  treeImgList: [treeImgs.imgValidateRule] // ✅ 图片校验规则和参考代码一致
+})
+
+// ✅ 生命周期
+onLoad((options) => {
+  formData.road = options.roadId
+})
+
+onShow(async () => {
+
+  treeLevelData.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_level'));
+  treeOwnershipData.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_ownership'));
+})
+
+// 修复表单ref挂载问题，和参考代码一致
+onReady(() => {
+  nextTick(() => {
+    formRef.value?.setRules(rules);
+  });
+});
+
+
+
+const toggleArea = () => {
+  isShow.value = !isShow.value
+}
+
+
+// 权属分类选择回调
+const pickerChange = (val) => {
+  formData.oldtreeownership = val.value
+  formData.oldtreeownershipText = val.label
+  pickerShow.value = false
+}
+
+// 树木级别选择回调
+const pickerLevelChange = (val) => {
+  formData.treelevel = val.value
+  formData.treeleveltext = val.label
+  levelshow.value = false
+}
+
+// 打开地图选址
+const openMap = () => {
+  uni.chooseLocation({
+    success: (res) => {
+      formData.growlocation = res.address
+      formData.latitude = res.latitude
+      formData.longitude = res.longitude
+    },
+    fail: (err) => {
+      console.error('地图选择失败', err);
+      if (err.errMsg.includes('auth deny')) {
+        uni.showToast({ title: '请授权位置权限', icon: 'none' });
+      }
+    }
+  });
+}
+
+// 表单提交核心方法
+const submit = async () => {
+  if (loadingFlag.value) return
+  // 表单校验
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // ✅✅✅ 核心修改：获取上传成功的图片地址，和参考代码一致
+  const uploadImgUrls = treeImgs.getSuccessImgUrls()
+
+  // 组装提交参数
+  formData.maintainunit = uni.getStorageSync('userInfo')?.belongCompanyId || ''
+  formData.treeImgList = uploadImgUrls // 赋值图片数组
+  loadingFlag.value = true
+
+  try {
+    const res = await addTree({ data: { ...formData } })
+    if (res.code == '200') {
+      uni.showToast({ title: "新增成功", icon: "success" });
+      uni.redirectTo({ url: '/subPackages/treePage/treeFiles' });
+    }
+  } catch (err) {
+    uni.showToast({ title: "新增失败，请重试", icon: "none" });
+    console.error(err)
+  } finally {
+    loadingFlag.value = false
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.container {
+  padding: 25rpx;
+  box-sizing: border-box;
+  background: #fff;
+}
+
+.animated-area {
+  transition: all 0.3s ease-out;
+  margin-top: 10rpx;
+}
+.location-form-item {
+  padding-right: 10rpx;
+}
+</style>
 \ No newline at end of file
+<script lang="ts">
+import {defineComponent} from 'vue'
+
+export default defineComponent({
+  name: "editTree"
+})
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
 \ No newline at end of file
-<script setup lang="ts">
+<template>
+  <view class="container">
+    <!-- 归属单位选择 -->
+    <up-form :model="formData" ref="formRef" label-width="140rpx" border-bottom style="padding: 0 15px">
+      <up-form-item
+          label="归属单位"
+          prop="companyId"
+          @click="showActionSheet = true"
+          class="form-item-custom"
+      >
+        <up-input
+            v-model="formData.companyId"
+            placeholder="请选择归属单位"
+            disabled
+            disabled-color="#ffffff"
+            border="none"
+            bg-color="transparent"
+        />
+        <template #right>
+          <up-icon name="arrow-right" size="16"></up-icon>
+        </template>
+      </up-form-item>
+    </up-form>
  
-</script>
+    <!-- 弹窗式 Search 搜索组件 -->
+    <view class="search-wrap">
+      <up-search
+          v-model="searchValue"
+          placeholder="请输入道路名称搜索"
+          @search="handleSearch"
+          bg-color="#f5f5f5"
+          :clearabled="false"
+          :show-action="true"
+          actionText="搜索"
+          :animation="true"
+          @custom="handleSearch"
+      />
+    </view>
  
-<template>
+    <!-- ✅ 核心：uview-plus up-row+up-col 实现左右布局【无u-scroll-list，无任何多余组件】 -->
+    <up-row type="flex" class="cate-layout" align="flex-start">
+      <!-- 左侧：班组列表 (uview栅格列 + 原生滚动) -->
+      <up-col span="3" class="cate-left">
+          <view
+              class="left-item"
+              :class="{ active: currentIndex === index }"
+              v-for="(item, index) in cateTabList"
+              :key="item.deptId"
+              @click="cateTabChange(index)"
+          >
+            {{ item.deptName }}
+          </view>
+
+      </up-col>
  
+      <!-- 右侧：道路列表 (uview栅格列 + 原生滚动) -->
+      <up-col span="9" class="cate-right">
+        <scroll-view scroll-y class="right-scroll">
+          <!-- 暂无数据 -->
+          <empty-view v-if="!hasValidRoadId"></empty-view>
+          <!-- 道路数据列表 -->
+          <view v-else class="road-list-wrap">
+            <view
+                v-for="item in roads"
+                class="card-wrap cad-box-shadow"
+                :key="item.roadId"
+                @click="toNewPage(item.roadId, item.treeCount)"
+            >
+              <p class="fs-flex__between">
+                <span class="up-line-1">{{ item.roadName }}</span>
+                <span class="treeCount">{{ item.treeCount }}棵</span>
+              </p>
+              <p class="up-line-1 fs-my8">已录入行道树：{{ item.recordedCount }}棵</p>
+              <p class="up-line-1 fs-my8" style="color: #999;font-size: 12px">起点：{{ item.startRemark }}</p>
+              <p class="up-line-1" style="color: #999;font-size: 12px">终点：{{ item.endRemark }}</p>
+            </view>
+          </view>
+        </scroll-view>
+      </up-col>
+    </up-row>
+
+    <!-- ActionSheet 底部弹出选择菜单 -->
+    <up-action-sheet
+        :show="showActionSheet"
+        :actions="belongCompanyData"
+        title="请选择归属单位"
+        @select="actionSheetSelect"
+        @close="showActionSheet = false"
+    ></up-action-sheet>
+
+  </view>
 </template>
  
-<style scoped>
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { onShow } from '@dcloudio/uni-app';
+import { getCompanyList } from "@/api/common";
+import { deptListReq } from '@/api/tree-archive/tree-archive'
+
+
+const formRef = ref(null)
+const showActionSheet = ref(false)
+const currentIndex = ref(0)
+const hasValidRoadId = ref(false)
+const searchValue = ref('') // 搜索关键词 独立绑定
+
+// 表单数据
+const formData = reactive({
+  companyId: '',
+})
+
+// 接口数据变量
+const companyId = ref('')
+const belongCompanyData = ref([])  // 归属单位下拉数据
+const depts = ref([])              // 归属班组列表
+const roads = ref([])              // 当前选中班组的道路列表
+const cateTabList = ref([])        // 左侧tab数据源
+
+// 生命周期
+onShow( async() => {
+  const res = await getCompanyList()
+  belongCompanyData.value = res
+  if (belongCompanyData.value.length > 0) {
+    formData.companyId = belongCompanyData.value[0].name
+    companyId.value = belongCompanyData.value[0].id.toString()
+    deptListQuery()
+  }
+})
+
+// 监听 CateTab 选中下标 数据联动
+watch(currentIndex, () => {
+  if(depts.value.length > 0) {
+    roads.value = depts.value[currentIndex.value].roads
+    checkRoadDataValid()
+  }
+})
+
+// 搜索事件 - 点击搜索按钮/回车触发
+const handleSearch = () => {
+  deptListQuery()
+}
+
+// 跳转道路档案记录页
+const toNewPage = (roadId, treeCount) => {
+  uni.navigateTo({
+    url: `/pages-sub/data/tree-archive/treeRecord?roadId=${roadId}&count=${treeCount}`
+  })
+}
+
+// 查询班组+道路数据 & 格式化CateTab的数据源
+const deptListQuery = async () => {
+  const params = {
+    companyId: companyId.value,
+    roadName: searchValue.value
+  }
+  const res = await deptListReq(params)
+  if (res.length ==0) {
+    depts.value = []
+    roads.value = []
+    cateTabList.value = []
+    hasValidRoadId.value = false
+  } else {
+    depts.value = res[0].depts
+    cateTabList.value = depts.value
+    roads.value = depts.value[0].roads
+    checkRoadDataValid()
+  }
+}
+
+// 左侧班组切换事件
+const cateTabChange = (index) => {
+  currentIndex.value = index
+  roads.value = depts.value[index].roads
+  checkRoadDataValid()
+}
+
+// ActionSheet 选择归属单位的确认事件
+const actionSheetSelect = (val) => {
+  formData.companyId = val.name
+  companyId.value = val.id.toString()
+  showActionSheet.value = false // 关闭弹窗
+  deptListQuery() // 重新查询数据
+}
+
+// 校验是否有有效道路数据
+const checkRoadDataValid = () => {
+  hasValidRoadId.value = roads.value && roads.value.length > 0 && roads.value.some(item => {
+    return item.roadId !== null && item.roadId !== undefined && item.roadId
+  })
+}
+</script>
+
+<style scoped lang="scss">
+// 页面容器 满高布局
+.container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+  box-sizing: border-box;
+}
+
+// 搜索框外层容器 间距不变
+.search-wrap {
+  padding: 10rpx 15rpx;
+}
+
+.cate-layout {
+  flex: 1;
+  width: 100%;
+  height: calc(100vh - 44px);
+
+}
+
+
+.cate-left {
+  height: 100%;
+  padding: 0;
+  background: #f8f8f8;
+  box-sizing: border-box;
+  .left-scroll {
+    width: 100%;
+    height: 100%;
+  }
+  // 左侧列表项
+  .left-item {
+    padding: 24rpx 12rpx;
+    font-size: 28rpx;
+
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    box-sizing: border-box;
+  }
+  // 选中项高亮 主题色和你一致 #5f5fe2
+  .left-item.active {
+    background: #ffffff;
+    color: #5f5fe2;
+    font-weight: 500;
+    border-left: 4rpx solid #5f5fe2;
+  }
+}
+
+.cate-right {
+  height: 100%;
+  padding: 0 10rpx;
+  box-sizing: border-box;
+  background: #ffffff;
+  .right-scroll {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+// 道路列表容器
+.road-list-wrap {
+  //padding-bottom: 30rpx;
+}
+
+// 道路卡片样式 完全复用你的原版
+.card-wrap {
+  box-shadow:0 0 3px rgba(0, 0, 0, 0.2);
+  padding: 20rpx;
+  border-radius: 14rpx;
+  background: #fff;
+  margin:10px 6px;
+}
  
+// 公共样式 完全不变
+.treeCount {
+  color: #5f5fe2;
+  min-width: 70px;
+  text-align: right;
+}
+.fs-flex__between {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.fs-my8 { margin: 8rpx 0; }
 </style>
 \ No newline at end of file
+<template>
+  <view class="container">
+    <!-- ✅ 替换tui-no-data 为 uview-plus的空数据组件 up-empty -->
+    <up-empty
+        v-if="rows.length === 0"
+        text="暂无数据"
+    ></up-empty>
+
+    <view class="record-wrap" v-else>
+      <view class="record-list-wrap cad-box-shadow fs-bg__white" v-for="i in rows" :key="i.id" @click="toEditPage(i.id)">
+        <view style="display: flex">
+          <view class="record-list-left" :style="`background-image: url(${i.treephoto});`"></view>
+          <view class="record-list-right">
+            <view class="record-list-right-title">
+              <view class="fs-ellipsis treetypeName">{{ i.treetype }}</view>
+              <view style="text-align: right">{{ i.updatetime.substring(0, 10) }}</view>
+            </view>
+            <view class="fs-mt8 fs-align__center">
+              <img src="../../../static/imgs/tree/tree-high.png" style="width: 14px;height: 14px;margin-right: 6px;" alt=""> 高度：{{ i.treeheight }} 米
+            </view>
+            <view class="fs-mt8 fs-align__center">
+              <img src="../../../static/imgs/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;" alt="">胸径：{{ i.dbh }} 厘米
+            </view>
+          </view>
+        </view>
+        <view class="fs-mt8 fs-ellipsis treenumber-no">
+          树木编号：{{ i.treenumber }}
+        </view>
+      </view>
+    </view>
+
+  <view  class="fixed-bottom-btn-wrap">
+    <up-button
+        type="primary"
+        class="addTree"
+        @click="toAddTreePage"
+        v-show="count > 0 && count > rows.length"
+    >
+      新增树木录入
+    </up-button>
+  </view>
+
+  </view>
+</template>
+
+<script setup>
+import { ref} from 'vue'
+import {  onLoad, onShow } from '@dcloudio/uni-app';
+// 引入接口请求方法
+import { treeRoadReq } from "@/api/tree-archive/tree-archive.js";
+
+
+const rows = ref([])
+const roadId = ref('')
+const count = ref(0)
+
+
+onLoad((options) => {
+  console.log(options)
+  roadId.value = options.roadId
+  count.value = options.count
+})
+
+onShow(() => {
+  treeRoadQuery()
+})
+
+// 前往修改页面
+const toEditPage = (id) => {
+  uni.navigateTo({
+    url: `/pages-sub/data/tree-archive/editTree?id=${id}`
+  })
+}
+
+// 前往新增页面
+const toAddTreePage = () => {
+  uni.navigateTo({
+    url: `/pages-sub/data/tree-archive/addTree?roadId=${roadId.value}`
+  })
+}
+
+// 树木记录列表查询接口
+const treeRoadQuery = async () => {
+  const res = await treeRoadReq( {road: roadId.value})
+  console.log(res)
+  rows.value = res.rows
+}
+</script>
+
+<style scoped lang="scss">
+// 保留原页面所有样式，一行未改，样式完全一致
+.record-wrap {
+  padding-bottom: 60px;
+}
+
+.record-list-wrap {
+  margin: 15px 10px 0;
+  padding: 10px;
+  border-radius: 6px;
+  font-size: 14px;
+}
+
+.treetypeName {
+  flex: 1;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.record-list-left {
+  height: 70px;
+  width: 70px;
+  background-size: 100% 100%;
+}
+
+.record-list-right {
+  margin-left: 20px;
+  flex: 1;
+  overflow: hidden;
+}
+
+.record-list-right-title {
+  display: flex;
+  justify-content: space-between;
+}
+
+.treenumber-no {
+  padding: 3px 10px;
+  background: #bdefd0;
+  font-size: 12px;
+}
+
+.addTree {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+</style>
 \ No newline at end of file
@@ -3,7 +3,6 @@
     <!-- 顶部固定区域 -->
     <up-sticky>
       <view class="header-wrap">
-        <!-- 第一行：u-tabs 待办/已办切换  :scrollable="false"-->
         <up-tabs
             v-model="activeTab"
             :list="tabList"
@@ -12,10 +11,8 @@
             font-size="30rpx"
             @click="handleTabChange"
         />
-
         <!-- 第二行：下拉框 + 搜索框 -->
         <view class="search-header">
-          <!-- 左侧下拉框 -->
           <view class="select-wrap common-text-color">
             <up-select
                 v-model:current="selectedSortValue"
@@ -26,8 +23,6 @@
                 :style="{ flex: 1 }"
             />
           </view>
-
-          <!-- 右侧搜索框 -->
           <view class="search-input-wrap">
             <up-search
                 v-model="searchValue"
@@ -47,24 +42,23 @@
  
     <!-- 列表容器 -->
     <z-paging
-        ref="paging"
+        ref="pagingRef"
         v-model="orderList"
         @query="queryList"
         :auto-show-system-loading="true"
-
     >
       <template #empty>
-        <empty-view/>
+        <empty-view />
       </template>
  
       <view class="common-card-list" style="padding-top: 200rpx;padding-bottom: 30rpx">
         <!-- 待办工单卡片 -->
         <up-card
-            v-if="activeTab == 0"
+            v-if="activeTab === 0"
             :border="false"
             :foot-border-top="false"
             v-for="(item, index) in orderList"
-            :key="`todo_${item.orderNo}_${index}`"
+            :key="`todo_${item.id}_${index}`"
             :show-head="false"
             class="order-card"
         >
@@ -86,7 +80,7 @@
                 <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-item-center common-justify-between">
+              <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">紧急程度：</view>
                 <view class="u-line-1 u-body-value">
                   {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
@@ -101,20 +95,10 @@
                 <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)"
-                           v-show="nextStepMap[item.taskKey].backShow">回退
-                </up-button>
-
-                <up-button type="success" size="mini" @click="handleRenew(item)"
-                           v-show="nextStepMap[item.taskKey].renewShow">重新提交
-                </up-button>
-
-                <up-button type="primary" size="mini" @click="handleProcess(item)">{{
-                    nextStepMap[item.taskKey].btnText
-                  }}
-                </up-button>
+                <up-button type="warning" size="mini" @click="handleReject(item)" v-show="nextStepMap[item.taskKey].backShow">回退</up-button>
+                <up-button type="success" size="mini" @click="handleRenew(item)" v-show="nextStepMap[item.taskKey].renewShow">重新提交</up-button>
+                <up-button type="primary" size="mini" @click="handleProcess(item)">{{ nextStepMap[item.taskKey].btnText }}</up-button>
                 <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
               </view>
             </view>
@@ -123,11 +107,11 @@
  
         <!-- 已办工单卡片和我发起的 -->
         <up-card
-            v-if="activeTab == 2||activeTab == 1"
+            v-if="activeTab === 1 || activeTab === 2"
             :border="false"
             :foot-border-top="false"
             v-for="(item, index) in orderList"
-            :key="`done_${item.orderNo}_${index}`"
+            :key="`done_${item.id}_${index}`"
             :show-head="false"
             class="order-card"
         >
@@ -149,12 +133,11 @@
                 <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-body-item-title">
                   紧急程度：{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
                 </view>
-                <view class=" ">
+                <view>
                   <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>
                 </view>
               </view>
@@ -172,21 +155,12 @@
       </view>
     </z-paging>
  
-    <!-- 底部新增工单按钮（仅巡查员显示） -->
-    <!--    <view v-if="isInspector" class="fixed-bottom-btn-wrap">-->
-    <!--      <up-button type="primary" size="large" @click="handleAddOrder">-->
-    <!--        新增工单-->
-    <!--      </up-button>-->
-    <!--    </view>-->
-
+    <!-- 底部新增工单按钮 -->
     <view class="fixed-bottom-btn-wrap" v-if="isAi">
-      <up-button type="primary" size="large" @click="handleAddOrder">
-        新增工单
-      </up-button>
+      <up-button type="primary" size="large" @click="handleAddOrder">新增工单</up-button>
     </view>
  
-
-    <!-- 回退原因弹窗：替换为up-modal（核心修改） -->
+    <!-- 回退原因弹窗 -->
     <up-modal
         :show="rejectModalShow"
         title="回退原因"
@@ -197,7 +171,6 @@
         @confirm="confirmReject"
     >
       <view class="reject-modal-content">
-        <!-- 回退原因 必填textarea -->
         <up-textarea
             v-model.trim="rejectReason"
             placeholder="请输入回退原因（必填）"
@@ -206,11 +179,10 @@
             maxlength="200"
             class="reject-textarea"
         />
-        <!-- 上传图片（选填）- 按照参考页面改造 -->
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传图片（选填）</view>
           <up-upload
-              :file-list="rejectImgs.rawImgList.value|| []"
+              :file-list="rejectImgs.rawImgList.value || []"
               @after-read="rejectImgs.uploadImgs"
               @delete="rejectImgs.deleteImg"
               multiple
@@ -224,7 +196,7 @@
       </view>
     </up-modal>
  
-    <!-- 验收弹窗 up-modal（含图片上传） -->
+    <!-- 验收弹窗 -->
     <up-modal
         :show="acceptModalShow"
         title="验收"
@@ -235,15 +207,12 @@
         @confirm="handleAcceptModalConfirm"
     >
       <view class="accept-modal-content">
-        <!-- 第一行：单选框（通过/不通过，默认通过） -->
         <view class="radio-group-wrap">
           <up-radio-group v-model="acceptRadioValue">
             <up-radio name="0" label="通过"></up-radio>
             <up-radio name="1" label="不通过"></up-radio>
           </up-radio-group>
         </view>
-
-        <!-- 第二行：必填textarea，最多200字 -->
         <view class="textarea-wrap mt-30">
           <up-textarea
               v-model.trim="acceptReason"
@@ -254,15 +223,12 @@
               count
           />
         </view>
-
-        <!-- 验收图片上传（选填，参考回退弹窗样式） -->
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传验收图片（选填）</view>
           <up-upload
               :file-list="acceptImgs.rawImgList.value || []"
               @after-read="acceptImgs.uploadImgs"
               @delete="acceptImgs.deleteImg"
-
               multiple
               width="70"
               height="70"
@@ -284,263 +250,233 @@ import {
   myBuzSimplePage,
   todoBuzSimplePage,
   doneBuzSimplePage,
-  qyWorkorderCreate,
   qyUniversalApproval,
   daquUniversalApproval,
   dcyUniversalApproval
 } from '@/api/regional-order-manage/regional-order-manage'
-// 从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
 import { nextStepMap, buzStatusMap } from '@/common/utils/common'
-// 引入图片上传组合式函数（与参考页面一致）
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
-// ========== 状态管理 ==========
+
+// ========== 全局实例 & 常量 ==========
 const userStore = useUserStore();
-// 标签页切换
+const USER_ROLES = userStore.userInfo?.roles || [];
+
+// ========== 基础状态 (按模块分组，语义化更强) ==========
+// tab切换
 const activeTab = ref(0); // 0-待办 1-我发起的 2-已办
-const tabList = ref([
-  {name: '待办'},
-  {name: '我发起的任务'},
-  {name: '已办'}
-]);
-// 排序下拉框
+const tabList = ref([{name: '待办'}, {name: '我发起的任务'}, {name: '已办'}]);
+// 排序与搜索
 const selectedSortValue = ref(1);
 const sortOptions = ref([
-  {name: '位置', id: 1},
-  {name: '名称', id: 2},
-  {name: '描述', id: 3},
-  {name: '编号', id: 4},
+  {name: '位置', id: 1}, {name: '名称', id: 2}, {name: '描述', id: 3}, {name: '编号', id: 4},
 ]);
-// 搜索
 const searchValue = ref('');
-// 分页
-const paging = ref(null);
+// 分页相关
+const pagingRef = ref(null);
 const orderList = ref([]);
-// 角色控制（巡查员显示新增按钮）
+
+// ========== 角色权限计算属性 (修复核心bug: 原代码取反逻辑写反) ==========
 const isAi = computed(() => {
-  // patrol_global  全域巡查员
-  // regional_manager  大区经理
-  // AI_dispatcher   AI工单派发人员
-  // 增加可选链，避免用户信息不存在报错
-  console.log('123')
-  console.log(!userStore.userInfo?.roles?.includes('AI_dispatcher'))
-  return !userStore.userInfo?.roles?.includes('AI_dispatcher') ;
-  // return true
+  // AI工单派发人员 不显示新增按钮，其他角色显示
+  return !USER_ROLES.includes('AI_dispatcher');
 });
-// 回退弹窗相关
-const rejectModalShow = ref(false); // 回退modal显示开关
-const rejectReason = ref(''); // 回退原因
-const currentRejectItem = ref(null); // 当前回退工单
-// 回退图片上传配置（与参考页面风格一致）
+
+// ========== 回退弹窗相关 ==========
+const rejectModalShow = ref(false);
+const rejectReason = ref('');
+const currentRejectItem = ref(null);
 const rejectImgs = useUploadImgs({
-  maxCount: 3, // 最多上传3张
-  uploadText: '选择回退图片', // 自定义上传提示文字
-  sizeType: ['compressed'], // 仅上传压缩图
-  formRef: null, // 该弹窗无表单校验
-  fieldName: 'rejectImgs' // 自定义字段名
+  maxCount: 3, uploadText: '选择回退图片', sizeType: ['compressed'], formRef: null, fieldName: 'rejectImgs'
 })
-// ========== 验收弹窗相关状态（含图片上传） ==========
-const acceptModalShow = ref(false); // 验收弹窗显示开关
-const acceptRadioValue = ref('0'); // 单选框值，默认0（通过）
-const acceptReason = ref(''); // 验收原因
-const currentAcceptItem = ref(null); // 当前验收的工单项
-// 验收图片上传配置（独立实例，参考回退弹窗）
+
+// ========== 验收弹窗相关 ==========
+const acceptModalShow = ref(false);
+const acceptRadioValue = ref('0'); // 默认通过
+const acceptReason = ref('');
+const currentAcceptItem = ref(null);
 const acceptImgs = useUploadImgs({
-  maxCount: 3, // 最多上传3张，与回退弹窗一致
-  uploadText: '选择验收图片', // 自定义上传提示文字
-  sizeType: ['compressed'], // 仅上传压缩图，优化性能
-  formRef: null, // 验收弹窗无表单校验
-  fieldName: 'acceptImgs' // 自定义字段名，区分回退图片
+  maxCount: 3, uploadText: '选择验收图片', sizeType: ['compressed'], formRef: null, fieldName: 'acceptImgs'
 })
+
+// ========== 公共封装方法 (核心优化：消灭重复代码) ==========
+/**
+ * 生成统一的临时存储key
+ * @param {String} prefix 前缀标识
+ * @returns {String} 唯一key
+ */
+const generateTempKey = (prefix = 'order') => {
+  return `${prefix}_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
+};
+
+/**
+ * 存储工单数据到本地缓存
+ * @param {Object} item 工单数据
+ * @param {String} prefix key前缀
+ * @returns {String|null} 成功返回key，失败返回null
+ */
+const setOrderStorage = (item, prefix) => {
+  if (!item?.id) return null;
+  const tempKey = generateTempKey(prefix);
+  try {
+    uni.setStorageSync(tempKey, item);
+    return tempKey;
+  } catch (error) {
+    console.error('存储工单数据失败：', error);
+    uni.showToast({title: '数据存储异常，请重试', icon: 'none'});
+    return null;
+  }
+};
+
+/**
+ * 获取分页请求公共参数
+ * @param {Number} pageNo 页码
+ * @param {Number} pageSize 页大小
+ * @returns {Object} 请求参数
+ */
+const getQueryParams = (pageNo, pageSize) => {
+  return {
+    searchContent: searchValue.value.trim() || '',
+    pageNo,
+    pageSize,
+    type: selectedSortValue.value
+  };
+};
+
+/**
+ * 统一调用审批接口
+ * @param {Object} params 请求参数
+ * @param {String} taskKey 工单任务key
+ * @returns {Promise} 接口请求Promise
+ */
+const callApprovalApi = async (params, taskKey) => {
+  if (taskKey === 'shRegionManager') return await dcyUniversalApproval(params);
+  if (taskKey === 'regionManager') return await qyUniversalApproval(params);
+  // 根据角色匹配对应接口
+  if (USER_ROLES.includes('regional_manager')) return await daquUniversalApproval(params);
+  if (USER_ROLES.includes('Inspector_global')) return await dcyUniversalApproval(params);
+  if (USER_ROLES.includes('patrol_global')) return await qyUniversalApproval(params);
+};
+
+/**
+ * 统一跳转工单页面
+ * @param {String} path 页面路径
+ * @param {Object} query 拼接参数
+ */
+const navToOrderPage = (path, query = {}) => {
+  const queryStr = Object.keys(query).map(k => `${k}=${query[k]}`).join('&');
+  uni.navigateTo({ url: `${path}${queryStr ? '?' + queryStr : ''}` });
+};
+
+/**
+ * 刷新列表 - 统一封装，避免空指针
+ */
+const refreshOrderList = () => {
+  pagingRef.value && pagingRef.value.reload();
+};
+
+// ========== 业务核心方法 ==========
 // 分页查询列表
 const queryList = async (pageNo, pageSize) => {
   try {
-    const apiParams = {
-      searchContent: searchValue.value.trim() || '',
-      pageNo,
-      pageSize,
-      type: selectedSortValue.value // 1-位置 2-工单名称 3-情况描述 4-工单编号
-    };
+    const params = getQueryParams(pageNo, pageSize);
     let res;
-    if (activeTab.value == 0) {
-      // 待办工单
-      res = await todoBuzSimplePage(apiParams);
-    } else if (activeTab.value == 1) {
-      // 我发起的任务
-      res = await myBuzSimplePage(apiParams);
-    } else {
-      // 已办工单
-      res = await doneBuzSimplePage(apiParams);
-    }
-    // 适配z-paging分页
-    paging.value.complete(res.list, res.total);
+    if (activeTab.value === 0) res = await todoBuzSimplePage(params);
+    else if (activeTab.value === 1) res = await myBuzSimplePage(params);
+    else res = await doneBuzSimplePage(params);
+    pagingRef.value.complete(res?.list || [], res?.total || 0);
   } catch (error) {
     console.error('加载工单失败：', error);
-    paging.value?.complete(false);
+    pagingRef.value?.complete(false);
     uni.showToast({title: '加载失败，请重试', icon: 'none'});
   }
 };
-// ========== 事件处理 ==========
+
 // 标签页切换
 const handleTabChange = (item) => {
-  orderList.value = [];
-  console.log(item)
   activeTab.value = item.index;
-  paging.value?.reload(); // 切换标签页刷新列表
+  orderList.value = [];
+  refreshOrderList();
 };
+
 // 排序变更
 const handleSortChange = (val) => {
   selectedSortValue.value = val.id;
   searchValue.value = '';
-  paging.value?.reload(); // 排序变更刷新列表
+  refreshOrderList();
 };
+
 // 搜索
 const handleSearch = (val) => {
   searchValue.value = val;
-  paging.value?.reload(); // 搜索刷新列表
+  refreshOrderList();
 };
+
 // 工单详情
 const handleDetail = (item) => {
-  // 0-待办 1我发起的- 2-已办
-  uni.navigateTo({
-    url: `/pages-sub/problem/regional-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}&processInstanceId=${item.processInstanceId}`,
-    events: {
-      // 自定义事件名：needRefresh（与详情页保持一致）
-      needRefresh: () => {
-        console.log('详情页返回，触发工单列表刷新');
-        if (paging.value) {
-          paging.value.reload(); // 刷新z-paging列表
-        }
-      }
-    }
+  if (!item?.taskId) return uni.showToast({title: '工单信息异常', icon: 'none'});
+  navToOrderPage('/pages-sub/problem/regional-order-manage/order-detail', {
+    taskId: item.taskId,
+    activeTab: activeTab.value,
+    processInstanceId: item.processInstanceId
+  }, {
+    needRefresh: () => refreshOrderList()
   });
 };
-// 生成临时key
-const generateTempKey = () => {
-  return 'renew_order_' + Date.now() + '_' + Math.floor(Math.random() * 10000);
-};
-// 待办-重新提交工单（改造后：大数据存本地，仅传唯一标识）
+
+// 重新提交工单
 const handleRenew = (item) => {
+  const tempKey = setOrderStorage(item, 'renew_order');
+  if (!tempKey) return;
  
-  // 1. 生成唯一临时标识
-  const tempKey = generateTempKey();
-  // 2. 将完整工单数据存入本地临时存储（同步存储，确保数据立即生效）
-  try {
-    console.log(item)
-    console.log('123')
-    uni.setStorageSync(tempKey, item);
-  } catch (error) {
-    console.error('存储工单数据失败：', error);
-    uni.showToast({title: '数据存储异常，无法重新提交', icon: 'none'});
-    return;
-  }
+  const pageUrl = USER_ROLES.includes('patrol_global')
+      ? '/pages-sub/problem/regional-order-manage/add-patrol-order'
+      : '/pages-sub/problem/regional-order-manage/add-order';
  
-  if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
-    uni.navigateTo({
-      url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
-    });
-  }
-  if (userStore.userInfo?.roles.includes('regional_manager')) {  // 大区经理
-    uni.navigateTo({
-      url: `/pages-sub/problem/regional-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
-    });
-  }
-  if (userStore.userInfo?.roles.includes('Inspector_global')) {  // 督察员
-    uni.navigateTo({
-      url: `/pages-sub/problem/regional-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
-    });
-  }
-  // // 3. URL 仅传递「唯一标识」和「重新提交标记」（数据量极小，无长度问题）
-  // uni.navigateTo({
-  //   url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
-  // });
+  navToOrderPage(pageUrl, { isRenew: 1, tempKey });
 };
-// 待办-处理工单
+
+// 处理工单核心逻辑
 const handleProcess = async (item) => {
-  console.log(nextStepMap[item.taskKey].name)
+  if (!item) return uni.showToast({title: '工单信息异常', icon: 'none'});
+  const stepName = nextStepMap[item.taskKey]?.name;
+
   try {
-    if (nextStepMap[item.taskKey]?.name == '大区经理分配') {
-      // ① 生成唯一临时key（统一规则，避免冲突）
-      const tempKey = `distribute_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
-      // ② 存储完整item到本地缓存（同步存储，确保立即生效）
-      try {
-        uni.setStorageSync(tempKey, item);
-      } catch (error) {
-        console.error('存储分配工单数据失败：', error);
-        uni.showToast({title: '数据存储异常，无法跳转', icon: 'none'});
-        return;
-      }
-      // ③ URL仅传递临时key，无其他冗余参数
-      uni.navigateTo({
-        url: `/pages-sub/problem/regional-order-manage/distribution-order?tempKey=${tempKey}`
-      })
+    // 大区经理分配
+    if (stepName === '大区经理分配') {
+      const tempKey = setOrderStorage(item, 'distribute_order');
+      tempKey && navToOrderPage('/pages-sub/problem/regional-order-manage/distribution-order', { tempKey });
     }
-    if (nextStepMap[item.taskKey]?.name == '督察员单子大区经理分配') {
-      let postData = {
-        "taskKey":item.taskKey,
-        "taskId": item.taskId,
-        "operateType":60,
-        "workerDataId":item.id,
-        "agree":0,
-        "reason":item.remark,
-        "roadId":item.roadId,
-        "roadName":item.roadName,
-        "pressingType":item.pressingType,
-        "orderName":item.orderName,
-        "expectedFinishDate": item.expectedFinishDate,
-        "busiLine":item.busiLine,
-      }
-      const res = await dcyUniversalApproval(postData);
-      uni.showToast({title: '分配成功', icon: 'success', duration: 1000});
-      paging.value?.reload(); // 刷新列表
+    // 督察员单子大区经理分配
+    else if (stepName === '督察员单子大区经理分配') {
+      const postData = { taskKey: item.taskKey, taskId: item.taskId, operateType:60, workerDataId:item.id, agree:0, reason:item.remark, roadId:item.roadId, roadName:item.roadName, pressingType:item.pressingType, orderName:item.orderName, expectedFinishDate: item.expectedFinishDate, busiLine:item.busiLine };
+      await dcyUniversalApproval(postData);
+      uni.showToast({title: '分配成功', icon: 'success'});
+      refreshOrderList();
     }
-
-
-    // 验收 - 打开弹窗
-    if (nextStepMap[item.taskKey]?.name == '巡查员验收'  || nextStepMap[item.taskKey]?.name == '养护组长验收') {
-      currentAcceptItem.value = item; // 存储当前工单信息
-      acceptReason.value = ''; // 清空上次的验收原因
-      acceptRadioValue.value = '0'; // 重置默认选中“通过”
-      acceptModalShow.value = true; // 显示验收弹窗
+    // 验收弹窗
+    else if (['巡查员验收', '养护组长验收'].includes(stepName)) {
+      currentAcceptItem.value = item;
+      acceptReason.value = '';
+      acceptRadioValue.value = '0';
+      acceptModalShow.value = true;
     }
-
-    // 发起人确认
-    if (nextStepMap[item.taskKey]?.name == '发起人确认') {
-      console.log(item)
+    // 发起人确认-结束工单
+    else if (stepName === '发起人确认') {
       uni.showModal({
         title: "结束工单",
         content: "请确定是否结束工单？",
-        success: async function (res) {
+        success: async (res) => {
           if (res.confirm) {
-            // 构建请求参数
             const requestData = {
-
-              "workerDataId": item.id,
-              "taskKey": 'ylInspectorStart',
-              "taskId": item.taskId,
-              "operateType": 200,
-              "agree": 1,
-              "reason": '结束工单'
+              workerDataId: item.id, taskKey: 'ylInspectorStart', taskId: item.taskId,
+              operateType: 200, agree: 1, reason: '结束工单'
             };
-            // 调用回退工单接口   daquUniversalApproval
-
-            if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
-              await daquUniversalApproval(requestData)
-            }
-            if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
-              await dcyUniversalApproval(requestData);
-            }
-            if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
-              await qyUniversalApproval(requestData);
-            }
-
-            uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
-            rejectModalShow.value = false;
-            paging.value?.reload(); // 刷新列表
-          } else if (res.cancel) {
-            console.log("用户点击取消");
+            await callApprovalApi(requestData, item.taskKey);
+            uni.showToast({title: '结束成功', icon: 'success'});
+            refreshOrderList();
           }
-        },
+        }
       });
     }
   } catch (error) {
@@ -548,168 +484,92 @@ const handleProcess = async (item) =&gt; {
     uni.showToast({title: '处理失败，请重试', icon: 'none'});
   }
 };
-// 待办-回退工单（打开回退modal）
+
+// 回退工单-打开弹窗
 const handleReject = (item) => {
-  console.log('123213')
-  // 校验工单有效性
-  if (!item || !item.id) {
-    uni.showToast({title: '工单信息异常，无法回退', icon: 'none'});
-    return;
-  }
+  if (!item?.id) return uni.showToast({title: '工单信息异常，无法回退', icon: 'none'});
   currentRejectItem.value = item;
-  rejectReason.value = ''; // 清空上次输入
-  rejectImgs.clearImgs(); // 改造后：使用组合式函数的清空方法
-  rejectModalShow.value = true; // 显示回退modal
+  rejectReason.value = '';
+  rejectImgs.clearImgs();
+  rejectModalShow.value = true;
 };
-// 回退modal - 取消按钮
+
+// 关闭回退弹窗-重置状态
 const handleRejectModalCancel = () => {
   rejectModalShow.value = false;
   rejectReason.value = '';
-  rejectImgs.clearImgs(); // 改造后：使用组合式函数的清空方法
+  rejectImgs.clearImgs();
 };
+
 // 确认回退工单
 const confirmReject = async () => {
-  // 严格校验回退原因（去除首尾空格）
-  const rejectReasonTrim = rejectReason.value.trim();
-  if (!rejectReasonTrim) {
-    uni.showToast({title: '请填写回退原因', icon: 'none', duration: 1000});
-    return;
-  }
-  // 校验当前工单有效性
-  if (!currentRejectItem.value || !currentRejectItem.value.id) {
-    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration: 1000});
-    rejectModalShow.value = false;
-    return;
-  }
+  const reason = rejectReason.value.trim();
+  if (!reason) return uni.showToast({title: '请填写回退原因', icon: 'none'});
+  const item = currentRejectItem.value;
+  if (!item?.id) return uni.showToast({title: '工单信息异常', icon: 'none'});
+
+  uni.showLoading({title: '提交中...', mask: true});
   try {
-    // 显示加载中，防止重复提交
-    uni.showLoading({title: '提交中...', mask: true});
-    // 构建请求参数
     const requestData = {
-      "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL数组
-      "workerDataId": currentRejectItem.value.id,
-      "taskKey": currentRejectItem.value.taskKey,
-      "taskId": currentRejectItem.value.taskId,
-
-      "operateType": nextStepMap[currentRejectItem.value.taskKey].operateTypeNoPass,
-      "agree": 1,
-      "reason": rejectReasonTrim
+      returnImgs: rejectImgs.getSuccessImgUrls(), workerDataId: item.id, taskKey: item.taskKey,
+      taskId: item.taskId, operateType: nextStepMap[item.taskKey].operateTypeNoPass, agree:1, reason
     };
-    // 调用回退工单接口
-    if(currentRejectItem.value.taskKey=='shRegionManager'){  //  对督察员单子  回退
-      const res = await dcyUniversalApproval(requestData);
-    }
-    if(currentRejectItem.value.taskKey=='regionManager'){  //  对全域巡查员单子  回退
-      const res = await qyUniversalApproval(requestData);
-    }
-    //  对大区经理单子  回退
-    uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
-    rejectModalShow.value = false;
-    paging.value?.reload(); // 刷新列表
+    await callApprovalApi(requestData, item.taskKey);
+    uni.showToast({title: '回退成功', icon: 'success'});
+    handleRejectModalCancel();
+    refreshOrderList();
   } catch (error) {
     console.error('回退工单失败：', error);
-    uni.showToast({title: '网络异常，回退失败', icon: 'none', duration: 1000});
+    uni.showToast({title: '回退失败，请重试', icon: 'none'});
   } finally {
-    // 隐藏加载中
     uni.hideLoading();
   }
 };
+
 // 新增工单
 const handleAddOrder = () => {
-  if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
-    uni.navigateTo({
-      url: '/pages-sub/problem/regional-order-manage/add-patrol-order'
-    });
-  }
-  if (userStore.userInfo?.roles.includes('regional_manager')) {  // 大区经理
-    uni.navigateTo({
-      url: '/pages-sub/problem/regional-order-manage/add-order'
-    });
-  }
-  if (userStore.userInfo?.roles.includes('Inspector_global')) {  // 督察员
-    uni.navigateTo({
-      url: '/pages-sub/problem/regional-order-manage/add-order'
-    });
-  }
+  const pageUrl = USER_ROLES.includes('patrol_global')
+      ? '/pages-sub/problem/regional-order-manage/add-patrol-order'
+      : '/pages-sub/problem/regional-order-manage/add-order';
+  navToOrderPage(pageUrl);
 };
-// 验收弹窗 - 取消按钮（清空状态）
+
+// 关闭验收弹窗-重置状态
 const handleAcceptModalCancel = () => {
   acceptModalShow.value = false;
-  acceptReason.value = ''; // 清空验收原因
-  acceptRadioValue.value = '0'; // 重置单选框为“通过”
-  acceptImgs.clearImgs(); // 清空验收图片
+  acceptReason.value = '';
+  acceptRadioValue.value = '0';
+  acceptImgs.clearImgs();
 };
-// 验收弹窗 - 确定按钮（含returnImgs传参）
+
+// 验收提交
 const handleAcceptModalConfirm = async () => {
-  // 1. 校验验收原因是否为空
-  if (!acceptReason.value.trim()) {
-    uni.showToast({title: '请填写验收原因', icon: 'none', duration: 1000});
-    return;
-  }
-  // 2. 校验验收原因长度
-  if (acceptReason.value.length > 200) {
-    uni.showToast({title: '验收原因最多200字', icon: 'none', duration: 1000});
-    return;
-  }
-  try {
-    // 3. 构建请求参数（含returnImgs）
-    console.log(currentAcceptItem.value)
-    console.log( userStore.userInfo.roles)
-    console.log( userStore.userInfo.roles.includes('Inspector_global'))
-    //
-    if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理验收
-      let postData = {
-        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
-        "taskKey": currentAcceptItem.value.taskKey,
-        "workerDataId": currentAcceptItem.value.id,
-        "taskId": currentAcceptItem.value.taskId,
-        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
-        "reason": acceptReason.value.trim(),
-        "agree":acceptRadioValue.value,
-      }
-      await daquUniversalApproval(postData);
-    }
-    //
-    if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员验收
-      let  postData = {
-        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
-        "taskKey": currentAcceptItem.value.taskKey,
-        "taskId": currentAcceptItem.value.taskId,
-        "workerDataId": currentAcceptItem.value.id,
-        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
-        "reason": acceptReason.value.trim(),
-        "agree": acceptRadioValue.value
-      }
-      await qyUniversalApproval(postData);
-    }
-    //
-    if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员验收
-      let  postData = {
-        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
-        "taskKey": currentAcceptItem.value.taskKey,
-        "taskId": currentAcceptItem.value.taskId,
-        "workerDataId": currentAcceptItem.value.id,
-        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
-        "reason": acceptReason.value.trim(),
-        "agree": acceptRadioValue.value
-      }
-      await dcyUniversalApproval(postData);
-    }
+  const reason = acceptReason.value.trim();
+  if (!reason) return uni.showToast({title: '请填写验收原因', icon: 'none'});
+  if (reason.length > 200) return uni.showToast({title: '验收原因最多200字', icon: 'none'});
  
-    // 4. 操作成功处理
-    uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
-    handleAcceptModalCancel(); // 清空状态
-    paging.value?.reload(); // 刷新工单列表
+  const item = currentAcceptItem.value;
+  if (!item?.id) return uni.showToast({title: '工单信息异常', icon: 'none'});
+
+  try {
+    const postData = {
+      returnImgs: acceptImgs.getSuccessImgUrls(), taskKey: item.taskKey, workerDataId: item.id,
+      taskId: item.taskId, agree: acceptRadioValue.value, reason,
+      operateType: acceptRadioValue.value === '0' ? nextStepMap[item.taskKey].operateTypePass : nextStepMap[item.taskKey].operateTypeNoPass
+    };
+    await callApprovalApi(postData, item.taskKey);
+    uni.showToast({title: '提交成功', icon: 'success'});
+    handleAcceptModalCancel();
+    refreshOrderList();
   } catch (error) {
-    // 5. 操作失败处理
     console.error('验收失败：', error);
-    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
+    uni.showToast({title: '验收提交失败，请重试', icon: 'none'});
   }
 };
-// 页面初始化
+
+// ========== 页面生命周期 ==========
 onLoad(() => {
-  // 初始化加载列表
-  paging.value?.reload();
+  refreshOrderList();
 });
 </script>
  
@@ -734,15 +594,10 @@ onLoad(() =&gt; {
   .select-wrap {
     width: 120rpx;
     margin-right: 20rpx;
-
-    :deep(.u-select) {
+    :deep(.u-select), :deep(.u-input__placeholder) {
       width: 100%;
       font-size: 28rpx;
     }
-
-    :deep(.u-input__placeholder) {
-      font-size: 28rpx;
-    }
   }
  
   .search-input-wrap {
@@ -758,31 +613,14 @@ onLoad(() =&gt; {
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 }
  
-.card-body {
-
-}
-
-// 回退modal样式
-.reject-modal-content {
+// 弹窗公共样式
+.reject-modal-content, .accept-modal-content {
   width: 100%;
   box-sizing: border-box;
   padding: 10rpx 0;
 }
  
-.textarea-label {
-  font-size: 28rpx;
-  color: #333;
-  margin-bottom: 10rpx;
-
-  .required-mark {
-    color: #f56c6c;
-    margin-left: 4rpx;
-  }
-}
-
 .upload-wrap {
-  margin-top: 20rpx;
-
   .upload-title {
     font-size: 28rpx;
     color: #333;
@@ -790,37 +628,20 @@ onLoad(() =&gt; {
   }
 }
  
-.mt-20 {
-  margin-top: 20rpx;
-}
-
-.mt-30 {
-  margin-top: 30rpx;
-}
-
-// 养护组长验收弹窗样式
-.accept-modal-content {
-  width: 100%;
-  box-sizing: border-box;
-}
-
+// 验收弹窗单选框样式
 .radio-group-wrap {
   display: flex;
   align-items: center;
-  gap: 40rpx; // 单选框之间的间距
+  gap: 40rpx;
   font-size: 28rpx;
   margin-bottom: 20rpx;
 }
  
 .textarea-wrap {
   width: 100%;
-  margin-top: 30rpx;
 }
  
-.modal-btn-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  padding-right: 10rpx;
-}
+// 间距公共样式
+.mt-20 { margin-top: 20rpx; }
+.mt-30 { margin-top: 30rpx; }
 </style>
 \ No newline at end of file
@@ -63,7 +63,7 @@
         <!-- 4. 问题照片 -->
         <up-form-item label="问题照片" prop="problemImgs" required>
           <up-upload
-              :file-list="problemImgs.imgList.value||[]"
+              :file-list="problemImgs.imgList.value || []"
               @after-read="problemImgs.uploadImgs"
               @delete="problemImgs.deleteImg"
               multiple
@@ -75,11 +75,9 @@
           ></up-upload>
         </up-form-item>
  
-        <!-- 派单情况分组（放在问题照片下方，增加间距） -->
-<!--        <up-gap height="20" bgColor="#bbb"></up-gap>-->
+        <!-- 派单情况分组 -->
         <view class="dispatch-group">
           <view class="dispatch-title">派单情况</view>
-
           <!-- 业务线单选框 -->
           <up-form-item
               label="业务线"
@@ -117,7 +115,7 @@
                 border="none"
             ></up-input>
             <template #right>
-              <up-icon name="arrow-right" size="16" ></up-icon>
+              <up-icon name="arrow-right" size="16"></up-icon>
             </template>
           </up-form-item>
  
@@ -156,11 +154,7 @@
           ></up-input>
           <template #right>
             <view v-if="workOrderForm.expectedFinishDate" @click.stop>
-              <up-icon
-                  name="close"
-                  size="16"
-                  @click.stop="clearExpectedFinishDate"
-              ></up-icon>
+              <up-icon name="close" size="16" @click.stop="clearExpectedFinishDate"></up-icon>
             </view>
             <up-icon name="arrow-right" size="16" v-else></up-icon>
           </template>
@@ -170,11 +164,7 @@
  
     <!-- 底部提交按钮 -->
     <view class="fixed-bottom-btn-wrap">
-      <up-button
-          type="primary"
-          text="提交工单"
-          @click="submitWorkOrder"
-      ></up-button>
+      <up-button type="primary" text="提交工单" @click="submitWorkOrder"></up-button>
     </view>
  
     <!-- 合并后的通用下拉弹窗 -->
@@ -199,116 +189,73 @@
 </template>
  
 <script setup>
-import { ref, reactive } from 'vue'
-import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
+import { ref, reactive, nextTick } from 'vue'
+import { onReady, onShow, onLoad, onBackPress } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { getRoadListByLatLng } from '@/api/common'
-import { daquUniversalApproval, qyUniversalApproval,qyWorkorderCreate,
-  dcyUniversalApproval,  daquWorkorderCreate,
-  dcyWorkorderCreate } from '@/api/regional-order-manage/regional-order-manage'
+import {
+  daquUniversalApproval, qyUniversalApproval, qyWorkorderCreate,
+  dcyUniversalApproval, daquWorkorderCreate, dcyWorkorderCreate
+} from '@/api/regional-order-manage/regional-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
 import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
  
-// ========== 状态管理 ==========
-const userStore = useUserStore();
+// ========== 【常量配置区】- 硬编码集中管理，便于维护 ==========
+const CONST = {
+  // 字典编码
+  DICT_ORDER_NAME: 'work_name',
+  DICT_PRESSING_TYPE: 'workorder_pressing_type',
+  // 上传配置
+  UPLOAD_CONFIG: { maxCount: 3, uploadText: '选择问题照片', sizeType: ['compressed'] },
+  // 路由地址
+  PAGE_ORDER_LIST: '/pages-sub/problem/regional-order-manage/index',
+  // 业务线映射
+  BUSI_LINE_MAP: { yl: '园林', sz: '市政', wy: '物业', '园林': 'yl', '市政': 'sz', '物业': 'wy' },
+  // 角色标识
+  ROLE: { MANAGER: 'regional_manager', INSPECTOR: 'Inspector_global', PATROL: 'patrol_global' }
+}
  
-// ========== 业务线相关状态 ==========
-// 业务线映射表
-const busiLineMap = ref({
-  'yl': '园林',
-  'sz': '市政',
-  'wy': '物业',
-  '园林': 'yl',
-  '市政': 'sz',
-  '物业': 'wy'
-});
+// ========== 【全局实例 & 基础状态】 ==========
+const userStore = useUserStore();
+const USER_ROLES = userStore.userInfo?.roles || [];
+const workOrderFormRef = ref(null);
+const showActionSheet = ref(false);
+const show = ref(false);
+const expectedFinishDate = ref(Date.now());
+const isRenew = ref(false);
+const renewOrderData = ref(null);
  
-// 业务线选项列表
+// ========== 【下拉弹窗数据】 ==========
+const currentActionSheetData = reactive({ type: '', list: [], title: '' });
+const roadNameList = ref([]);
+const orderNameList = ref([]);
+const pressingTypeList = ref([]);
 const busiLineOptions = ref([]);
-const formatBusiLineOptions = () => {
-  if (!userStore.userInfo?.user?.busiLine) {
-    busiLineOptions.value = [];
-    return;
-  }
-  const rawBusiLines = userStore.userInfo.user.busiLine.split(',');
-  busiLineOptions.value = rawBusiLines.map(item => ({
-    name: busiLineMap.value[item.trim()]
-  }));
-};
-
-// 工具方法：通过中文名称获取对应的英文标识
-const getBusiLineEnByCn = (cnName) => {
-  return busiLineMap.value[cnName] || '';
-};
  
-// ========== 表单Ref ==========
-const workOrderFormRef = ref(null)
-
-// ========== 公共上传逻辑复用 ==========
+// ========== 【上传逻辑复用】 ==========
 const problemImgs = useUploadImgs({
-  maxCount: 3,
-  uploadText: '选择问题照片',
-  sizeType: ['compressed'],
+  ...CONST.UPLOAD_CONFIG,
   formRef: workOrderFormRef,
   fieldName: 'problemImgs'
 })
+// 图片数组兜底，防止非数组报错
+if (!Array.isArray(problemImgs.rawImgList.value)) problemImgs.rawImgList.value = [];
  
-if (!Array.isArray(problemImgs.rawImgList.value)) {
-  problemImgs.rawImgList.value = [];
-}
-
-// ========== 页面状态 ==========
-const showActionSheet = ref(false)
-const currentActionSheetData = reactive({
-  type: '',
-  list: [],
-  title: ''
-})
-const show = ref(false)
-const expectedFinishDate = ref(Date.now())
-
-// ========== 重新提交相关状态 ==========
-const isRenew = ref(false);
-const renewOrderData = ref(null);
-
-// ========== 下拉列表数据 ==========
-const roadNameList = ref([])
-const orderNameList = ref([])
-const pressingTypeList = ref([])
-
-// ========== 工单表单数据 ==========
+// ========== 【工单表单数据】 ==========
 const workOrderForm = reactive({
-  busiLineCn: '',
-  roadId: 0,
-  roadName: '',
-  workLocation: '',
-  orderName: '',
-  pressingType: '',
-  pressingTypeName: '',
-  problemDesc: '',
-  lat: 0,
-  lon: 0,
-  expectedFinishDate: '',
+  busiLineCn: '', roadId: 0, roadName: '', workLocation: '',
+  orderName: '', pressingType: '', pressingTypeName: '',
+  problemDesc: '', lat: 0, lon: 0, expectedFinishDate: ''
 })
  
-// ========== 表单校验规则 ==========
+// ========== 【表单校验规则】 ==========
 const workOrderFormRules = reactive({
-  busiLineCn: [
-    { type: 'string', required: true, message: '请选择业务线', trigger: ['change', 'blur'] }
-  ],
-  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'] }
-  ],
-  pressingTypeName: [
-    { type: 'string', required: true, message: '请选择紧急程度', trigger: ['change'] }
-  ],
+  busiLineCn: [{ type: 'string', required: true, message: '请选择业务线', trigger: ['change', 'blur'] }],
+  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'] }],
+  pressingTypeName: [{ type: 'string', required: true, message: '请选择紧急程度', trigger: ['change'] }],
   problemDesc: [
     { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
     { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
@@ -316,268 +263,251 @@ const workOrderFormRules = reactive({
   problemImgs: [problemImgs.imgValidateRule]
 })
  
-// ========== 生命周期 ==========
+// ========== 【工具方法封装】- 抽离通用逻辑，消灭重复代码 ==========
+/**
+ * 业务线中文转英文
+ */
+const busiLineCnToEn = (cn) => CONST.BUSI_LINE_MAP[cn] || '';
+/**
+ * 业务线英文转中文
+ */
+const busiLineEnToCn = (en) => CONST.BUSI_LINE_MAP[en] || '';
+/**
+ * 统一跳转返回工单列表页
+ */
+const toOrderListPage = () => uni.reLaunch({ url: CONST.PAGE_ORDER_LIST });
+/**
+ * 格式化时间戳 - 增加空值兜底
+ */
+const formatDate = (dateVal, fmt = 'yyyy-mm-dd hh:MM:ss') => dateVal ? timeFormat(dateVal, fmt) : '';
+/**
+ * 时间转时间戳 - 增加空值兜底
+ */
+const dateToTimestamp = (dateStr) => dateStr ? new Date(dateStr).getTime() : '';
+
+// ========== 【生命周期】 ==========
 onLoad((options) => {
-  // 初始化业务线选项
-  formatBusiLineOptions();
+  // 初始化工单线选项
+  initBusiLineOptions();
   // 默认选中第一个业务线
-  if (busiLineOptions.value.length > 0) {
-    workOrderForm.busiLineCn = busiLineOptions.value[0].name;
-  }
-
-  // 判断是否为重新提交状态
-  if (options.isRenew == 1 && options.tempKey) {
-    isRenew.value = true;
-    const tempKey = options.tempKey;
-
-    try {
-      const orderData = uni.getStorageSync(tempKey);
-      console.log(orderData)
-      if (orderData && typeof orderData === 'object') {
-        renewOrderData.value = orderData;
-        echoOrderData(renewOrderData.value);
-      } else {
-        uni.showToast({ title: '工单数据不存在，无法重新提交', icon: 'none' });
-        setTimeout(() => uni.navigateBack(), 1000);
-        return;
-      }
-    } catch (error) {
-      console.error('读取工单数据失败：', error);
-      uni.showToast({ title: '数据读取异常，无法重新提交', icon: 'none' });
-      setTimeout(() => uni.navigateBack(), 1000);
-      return;
-    } finally {
-      uni.removeStorageSync(tempKey);
-    }
-  }
+  workOrderForm.busiLineCn = busiLineOptions.value[0]?.name || '';
+  // 处理重新提交逻辑
+  if (options.isRenew == 1 && options.tempKey) handleRenewOptions(options.tempKey);
 });
  
 onReady(() => {
-  if (workOrderFormRef.value) {
-    workOrderFormRef.value.setRules(workOrderFormRules)
-  }
-  console.log('工单表单规则初始化完成')
-})
+  // 修复bug：nextTick确保表单ref一定挂载完成，再设置规则
+  nextTick(() => {
+    workOrderFormRef.value?.setRules(workOrderFormRules);
+  });
+});
  
 onShow(() => {
-  // 初始化工单名称列表
-  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
-  // 初始化紧急程度列表
-  pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
-})
+  // 初始化下拉字典数据
+  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList(CONST.DICT_ORDER_NAME));
+  pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList(CONST.DICT_PRESSING_TYPE));
+});
  
-// ========== 核心方法 ==========
-const echoOrderData = (orderItem) => {
-  // 回显业务线
-  if (orderItem.busiLine) {
-    workOrderForm.busiLineCn = busiLineMap.value[orderItem.busiLine];
+// ========== 【核心业务方法】 ==========
+/**
+ * 初始化工单线选项
+ */
+const initBusiLineOptions = () => {
+  const rawBusiLines = userStore.userInfo?.user?.busiLine?.split(',') || [];
+  busiLineOptions.value = rawBusiLines.map(item => ({ name: busiLineEnToCn(item.trim()) }));
+};
+
+/**
+ * 处理重新提交的参数和数据回显
+ */
+const handleRenewOptions = async (tempKey) => {
+  isRenew.value = true;
+  try {
+    const orderData = uni.getStorageSync(tempKey);
+    if (orderData && typeof orderData === 'object') {
+      renewOrderData.value = orderData;
+      echoOrderData(orderData);
+    } else {
+      uni.showToast({ title: '工单数据不存在，无法重新提交', icon: 'none' });
+      setTimeout(toOrderListPage, 1000);
+    }
+  } catch (error) {
+    console.error('读取工单数据失败：', error);
+    uni.showToast({ title: '数据读取异常，无法重新提交', icon: 'none' });
+    setTimeout(toOrderListPage, 1000);
+  } finally {
+    uni.removeStorageSync(tempKey);
   }
+};
  
-  // 回显基础字段
+/**
+ * 工单数据回显
+ */
+const echoOrderData = (orderItem) => {
+  // 基础字段回显
+  console.log(orderItem)
+  console.log('123')
+  workOrderForm.busiLineCn = busiLineEnToCn(orderItem.busiLine);
   workOrderForm.roadId = orderItem.roadId || 0;
   workOrderForm.roadName = orderItem.roadName || '';
   workOrderForm.workLocation = orderItem.lonLatAddress || orderItem.roadName || '';
   workOrderForm.orderName = orderItem.orderName || '';
   workOrderForm.pressingType = orderItem.pressingType || '';
-  workOrderForm.pressingTypeName = uni.$dict.getDictLabel('workorder_pressing_type', orderItem.pressingType) || '';
+  workOrderForm.pressingTypeName = uni.$dict.getDictLabel(CONST.DICT_PRESSING_TYPE, orderItem.pressingType) || '';
   workOrderForm.problemDesc = orderItem.remark || '';
   workOrderForm.lat = orderItem.lat || 0;
   workOrderForm.lon = orderItem.lon || 0;
-  workOrderForm.expectedFinishDate =  timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')  || '';
-
-  // 回显图片
-  if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
-    const imgList = orderItem.problemsImgs.map((imgUrl, index) => ({
-      url: imgUrl,
-      name: `renew_img_${index}`,
-      status: 'success'
-    }));
+  workOrderForm.expectedFinishDate = orderItem.expectedFinishDate?"":formatDate(orderItem.expectedFinishDate);
+
+  // 图片回显 - 兼容异常格式
+  if (Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length) {
+    const imgList = orderItem.problemsImgs.map((url, idx) => ({ url, name: `renew_img_${idx}`, status: 'success' }));
     problemImgs.imgList.value = imgList;
     problemImgs.rawImgList.value = imgList;
   }
  
   // 自动获取道路列表
-  if (orderItem.lat && orderItem.lon) {
-    getRoadListByBusiLine();
-  }
+  if (orderItem.lat && orderItem.lon) getRoadListByBusiLine();
 };
  
-// 业务线切换事件
+/**
+ * 业务线切换事件
+ */
 const handleBusiLineChange = () => {
   workOrderForm.roadName = '';
   workOrderForm.roadId = 0;
   roadNameList.value = [];
-  if (workOrderForm.workLocation) {
-    getRoadListByBusiLine();
-  }
+  workOrderForm.workLocation && getRoadListByBusiLine();
 };
  
-// 获取道路列表（带业务线）
+/**
+ * 根据坐标+业务线获取道路列表
+ */
 const getRoadListByBusiLine = async () => {
-  if (!workOrderForm.lat || !workOrderForm.lon) {
-    return;
-  }
-  const busiLineEn = getBusiLineEnByCn(workOrderForm.busiLineCn);
-  if (!busiLineEn) {
-    uni.showToast({ title: '业务线标识异常', icon: 'none' });
-    return;
-  }
+  if (!workOrderForm.lat || !workOrderForm.lon) return;
+  const busiLineEn = busiLineCnToEn(workOrderForm.busiLineCn);
+  if (!busiLineEn) return uni.showToast({ title: '业务线选择异常', icon: 'none' });
  
   try {
     uni.showLoading({ title: '获取道路名称中...' });
-    const roadRes = await getRoadListByLatLng({
-      busiLine: busiLineEn,
-      latitude: workOrderForm.lat,
-      longitude: workOrderForm.lon
-    });
-    uni.hideLoading();
-    if (Array.isArray(roadRes)) {
-      roadNameList.value = roadRes.map((item) => ({
-        name: item.roadName || '',
-        code: item.roadCode || '',
-        id: item.roadId || 0
-      }));
-    } else {
-      roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }];
-      uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' });
-    }
+    const roadRes = await getRoadListByLatLng({ busiLine: busiLineEn, latitude: workOrderForm.lat, longitude: workOrderForm.lon });
+    console.log(roadRes)
+    roadNameList.value = Array.isArray(roadRes)
+        ? roadRes.map(item => ({ name: item.roadName || '', code: item.roadCode || '', id: item.roadId || 0 }))
+        : [{ name: '未查询到道路名称', code: '', id: 0 }];
+    console.log(roadNameList)
+    !Array.isArray(roadRes) && uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' });
   } catch (err) {
-    uni.hideLoading();
     console.error('获取道路名称失败：', err);
-    uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' });
     roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }];
+    uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' });
+  } finally {
+    uni.hideLoading();
   }
 };
  
-// ========== 通用弹窗方法 ==========
+// ========== 【通用下拉弹窗方法】 ==========
 const handleActionSheetOpen = (type) => {
   if (type === 'roadName' && !workOrderForm.workLocation) {
-    uni.showToast({ title: '请先选择工单位置', icon: 'none' })
-    return
+    return uni.showToast({ title: '请先选择工单位置', icon: 'none' });
   }
-
   const configMap = {
-    roadName: {
-      title: '请选择道路名称',
-      list: roadNameList.value
-    },
-    orderName: {
-      title: '请选择工单名称',
-      list: orderNameList.value
-    },
-    pressingType: {
-      title: '请选择紧急程度',
-      list: pressingTypeList.value
-    }
-  }
-
-  currentActionSheetData.type = type
-  currentActionSheetData.title = configMap[type].title
-  currentActionSheetData.list = configMap[type].list
-  showActionSheet.value = true
-}
+    roadName: { title: '请选择道路名称', list: roadNameList.value },
+    orderName: { title: '请选择工单名称', list: orderNameList.value },
+    pressingType: { title: '请选择紧急程度', list: pressingTypeList.value }
+  };
+  Object.assign(currentActionSheetData, configMap[type], { type });
+  showActionSheet.value = true;
+};
  
 const handleActionSheetClose = () => {
-  showActionSheet.value = false
-  currentActionSheetData.type = ''
-  currentActionSheetData.list = []
-  currentActionSheetData.title = ''
-}
+  showActionSheet.value = false;
+  Object.assign(currentActionSheetData, { type: '', list: [], title: '' });
+};
  
 const handleActionSheetSelect = (e) => {
-  const { type } = currentActionSheetData
+  const { type } = currentActionSheetData;
   switch (type) {
     case 'roadName':
-      workOrderForm.roadName = e.name
-      workOrderForm.roadId = e.code
-      workOrderFormRef.value?.validateField('roadName')
-      break
+      workOrderForm.roadName = e.name;
+      workOrderForm.roadId = e.code;
+      break;
     case 'orderName':
-      workOrderForm.orderName = e.name
-      workOrderFormRef.value?.validateField('orderName')
-      break
+      workOrderForm.orderName = e.name;
+      break;
     case 'pressingType':
-      workOrderForm.pressingType = e.value
-      workOrderForm.pressingTypeName = e.name
-      workOrderFormRef.value?.validateField('pressingTypeName')
-      break
+      workOrderForm.pressingType = e.value;
+      workOrderForm.pressingTypeName = e.name;
+      break;
   }
-  showActionSheet.value = false
-}
-
-const navigateBack = () => {
-  uni.reLaunch({
-    url: '/pages-sub/problem/work-order-manage/index',
-    fail: () => {
-      uni.navigateBack({ delta: 2 });
-    }
-  });
-}
+  workOrderFormRef.value?.validateField(type === 'roadName' ? 'roadName' : type === 'orderName' ? 'orderName' : 'pressingTypeName');
+  handleActionSheetClose();
+};
  
-// 清除希望完成时间
-const clearExpectedFinishDate = ()=> {
-  workOrderForm.expectedFinishDate = ''
-}
+// ========== 【页面交互方法】 ==========
+/** 清除希望完成时间 */
+const clearExpectedFinishDate = () => workOrderForm.expectedFinishDate = '';
+/** 隐藏软键盘 */
+const hideKeyboard = () => uni.hideKeyboard();
+/** 时间选择确认 */
+const expectedFinishDateConfirm = (e) => {
+  workOrderForm.expectedFinishDate = formatDate(e.value);
+  show.value = false;
+};
  
-// 选择工单位置
+/** 选择工单位置 */
 const chooseWorkLocation = () => {
   uni.chooseLocation({
     success: async (res) => {
-      workOrderForm.roadName = ''
-      workOrderForm.roadId = 0
-      roadNameList.value = []
-
-      workOrderForm.workLocation = res.name
-      workOrderForm.lat = res.latitude
-      workOrderForm.lon = res.longitude
-
-      workOrderFormRef.value?.validateField('workLocation')
-      workOrderFormRef.value?.validateField('roadName')
-
+      workOrderForm.roadName = '';
+      workOrderForm.roadId = 0;
+      roadNameList.value = [];
+      workOrderForm.workLocation = res.name;
+      workOrderForm.lat = res.latitude;
+      workOrderForm.lon = res.longitude;
+      workOrderFormRef.value?.validateField(['workLocation', 'roadName']);
       await getRoadListByBusiLine();
     },
     fail: (err) => {
-      console.error('选择位置失败：', err)
-      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
+      console.error('选择位置失败：', err);
+      const errMsg = err.errMsg.includes('auth deny') ? '请开启位置权限后重试' : '选择位置失败，请重试';
+      uni.showToast({ title: errMsg, icon: 'none' });
     }
   })
-}
-
-// 完成时间确认
-const expectedFinishDateConfirm = (e) => {
-  workOrderForm.expectedFinishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
-  show.value = false
-}
+};
+// 新增页返回直接回列表页
+onBackPress(() => {
+  uni.redirectTo({
+    url: '/pages-sub/problem/regional-order-manage/index'
+  })
+  return true;
+})
  
-// 隐藏键盘
-const hideKeyboard = () => {
-  uni.hideKeyboard()
-}
+// ========== 【封装：统一接口调用方法】 ==========
+const callApiByRole = async (params, isRenewFlag) => {
+  if (isRenewFlag) {
+    if (USER_ROLES.includes(CONST.ROLE.MANAGER)) return await daquUniversalApproval(params);
+    if (USER_ROLES.includes(CONST.ROLE.INSPECTOR)) return await dcyUniversalApproval(params);
+    if (USER_ROLES.includes(CONST.ROLE.PATROL)) return await qyUniversalApproval(params);
+  } else {
+    if (USER_ROLES.includes(CONST.ROLE.MANAGER)) return await daquWorkorderCreate(params);
+    if (USER_ROLES.includes(CONST.ROLE.INSPECTOR)) return await dcyWorkorderCreate(params);
+    if (USER_ROLES.includes(CONST.ROLE.PATROL)) return await qyWorkorderCreate(params);
+  }
+};
  
-// 提交工单
+// ========== 【核心：提交工单】 ==========
 const submitWorkOrder = async () => {
   try {
-    await workOrderFormRef.value.validate()
-
-    const busiLineEn = getBusiLineEnByCn(workOrderForm.busiLineCn);
-    if (!busiLineEn) {
-      uni.showToast({ title: '业务线选择异常，请重新选择', icon: 'none' });
-      return;
-    }
-
-    const commonSubmitData = {
-      // roadId: workOrderForm.roadId,
-      // roadName: workOrderForm.roadName,
-
-      // roadId: 550,
-      // roadName:'东明胡同(三海)',
-
-      roadId: 551,
-      roadName:'地安门西大街51号',
-      //
-      // roadId: 553,
-      // roadName:'什刹海前海南沿',
-
+    // 表单校验
+    await workOrderFormRef.value.validate();
+    const busiLineEn = busiLineCnToEn(workOrderForm.busiLineCn);
+    if (!busiLineEn) return uni.showToast({ title: '业务线选择异常，请重新选择', icon: 'none' });
+
+    // 组装公共提交参数
+    const baseParams = {
+      roadId: workOrderForm.roadId,
+      roadName: workOrderForm.roadName,
       problemsImgs: problemImgs.getSuccessImgUrls(),
       remark: workOrderForm.problemDesc.trim(),
       latLonType: 2,
@@ -586,77 +516,37 @@ const submitWorkOrder = async () =&gt; {
       lonLatAddress: workOrderForm.workLocation,
       pressingType: workOrderForm.pressingType,
       orderName: workOrderForm.orderName,
-      expectedFinishDate: workOrderForm.expectedFinishDate==""?"":new Date(workOrderForm.expectedFinishDate).getTime(),
+      expectedFinishDate: dateToTimestamp(workOrderForm.expectedFinishDate),
       sourceId: 1,
       sourceName: workOrderForm.busiLineCn,
       busiLine: busiLineEn
-    }
-
-    uni.showLoading({ title: '提交中...' })
-    let res
-
-    if (isRenew.value) {
-      const renewSubmitData = {
-        workerDataId: renewOrderData.value.id,
-        taskKey: renewOrderData.value.taskKey,
-        taskId: renewOrderData.value.taskId,
-        operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
-        agree: 0,
-        reason: workOrderForm.problemDesc.trim(),
-        ...commonSubmitData
-      }
-
-      if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
-        res = await daquUniversalApproval(renewSubmitData)
-      }
-
-      if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
-        res = await dcyUniversalApproval(renewSubmitData)
-      }
-
-      if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
-        res = await qyUniversalApproval(renewSubmitData)
-      }
-
-    } else {
-
-      if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
-        res = await daquWorkorderCreate(commonSubmitData)
-      }
-
-      if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
-        res = await dcyWorkorderCreate(commonSubmitData)
-      }
-
-      if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
-        res = await qyWorkorderCreate(commonSubmitData)
-      }
-
-
-    }
-
-    uni.hideLoading()
-    uni.showToast({
-      title: isRenew.value ? '重新提交成功' : '工单提交成功',
-      icon: 'success',
-      duration: 1000
-    })
-
-    setTimeout(() => {
-      uni.reLaunch({
-        url: '/pages-sub/problem/regional-order-manage/index'
-      })
-    }, 1000)
+    };
+
+    uni.showLoading({ title: '提交中...', mask: true });
+    // 区分：重新提交 / 新增工单
+    const submitParams = isRenew.value
+        ? {
+          workerDataId: renewOrderData.value.id,
+          taskKey: renewOrderData.value.taskKey,
+          taskId: renewOrderData.value.taskId,
+          operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
+          agree: 0,
+          reason: workOrderForm.problemDesc.trim(),
+          ...baseParams
+        }
+        : baseParams;
+
+    // 统一调用接口
+    await callApiByRole(submitParams, isRenew.value);
+
+    // 提交成功处理
+    uni.showToast({ title: isRenew.value ? '重新提交成功' : '工单提交成功', icon: 'success', duration: 1000 });
+    setTimeout(toOrderListPage, 1000);
   } catch (error) {
-    uni.hideLoading()
-
+    uni.hideLoading();
     if (!Array.isArray(error)) {
-      console.error(isRenew.value ? '工单重新提交失败：' : '工单提交失败：', error)
-      uni.showToast({
-        title: isRenew.value ? error.msg : error.msg,
-        icon: 'none',
-        duration: 2000
-      })
+      console.error(isRenew.value ? '工单重新提交失败：' : '工单提交失败：', error);
+      uni.showToast({ title: error.msg || '提交失败，请重试', icon: 'none', duration: 2000 });
     }
   }
 }
@@ -667,6 +557,7 @@ const submitWorkOrder = async () =&gt; {
 .page-container {
   min-height: 100vh;
   padding-bottom: 100rpx; // 给底部按钮留空间
+  background: #fafafa;
 }
  
 // 工单表单内容容器
@@ -674,19 +565,18 @@ const submitWorkOrder = async () =&gt; {
   background: #fff;
 }
  
-// 派单情况分组样式（核心：增加顶部间距）
+// 派单情况分组样式
 .dispatch-group {
-
-  padding-top: 20rpx; // 分组内顶部内边距，增强视觉区分
-
-}
-
-// 派单情况标题样式
-.dispatch-title {
-  font-size: 32rpx;
-  font-weight: 600;
-  color:$u-primary;
-  margin-bottom: 20rpx;
-  padding-left: 10rpx;
+  padding-top: 24rpx;
+  margin-top: 8rpx;
+  border-top: 1px solid #f5f5f5;
+
+  .dispatch-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: $u-primary;
+    margin-bottom: 20rpx;
+    padding-left: 10rpx;
+  }
 }
 </style>
 \ No newline at end of file
@@ -101,7 +101,7 @@
  
 <script setup>
 import { ref, reactive } from 'vue'
-import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
+import { onReady, onShow, onLoad, onBackPress } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { qyUniversalApproval,  qyWorkorderCreate } from '@/api/regional-order-manage/regional-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
@@ -237,6 +237,13 @@ onShow(() =&gt; {
   // 初始化工单名称列表
   orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
 })
+// 新增页返回直接回列表页
+onBackPress(() => {
+  uni.redirectTo({
+    url: '/pages-sub/problem/regional-order-manage/index'
+  })
+  return true;
+})
  
 // ========== 核心方法 ==========
 const echoOrderData = (orderItem) => {
@@ -194,7 +194,7 @@
  
 <script setup>
 import { ref, reactive } from 'vue'
-import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
+import { onReady, onShow, onLoad, onBackPress } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { getRoadListByLatLng } from '@/api/common'
 import { daquUniversalApproval,  daquWorkorderCreate, qyUniversalApproval } from '@/api/regional-order-manage/regional-order-manage'
@@ -357,6 +357,14 @@ onShow(() =&gt; {
   pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
 })
  
+// 新增页返回直接回列表页
+onBackPress(() => {
+  uni.redirectTo({
+    url: '/pages-sub/problem/regional-order-manage/index'
+  })
+  return true;
+})
+
 // ========== 核心方法 ==========
 const echoOrderData = (orderItem) => {
   // 回显业务线
@@ -374,7 +382,7 @@ const echoOrderData = (orderItem) =&gt; {
   workOrderForm.problemDesc = orderItem.remark || '';
   workOrderForm.lat = orderItem.lat || 0;
   workOrderForm.lon = orderItem.lon || 0;
-  workOrderForm.expectedFinishDate =  orderItem.expectedFinishDate=='' ? '':timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') ;
+  workOrderForm.expectedFinishDate =  orderItem.expectedFinishDate? timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss'):'' ;
  
   // 回显图片【核心：问题照片赋值】
   if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
@@ -3,7 +3,6 @@
     <!-- 顶部固定区域 -->
     <up-sticky>
       <view class="header-wrap">
-        <!-- 第一行：u-tabs 待办/已办切换  :scrollable="false"-->
         <up-tabs
             v-model="activeTab"
             :list="tabList"
@@ -12,10 +11,8 @@
             font-size="30rpx"
             @click="handleTabChange"
         />
-
         <!-- 第二行：下拉框 + 搜索框 -->
         <view class="search-header">
-          <!-- 左侧下拉框 -->
           <view class="select-wrap common-text-color">
             <up-select
                 v-model:current="selectedSortValue"
@@ -26,8 +23,6 @@
                 :style="{ flex: 1 }"
             />
           </view>
-
-          <!-- 右侧搜索框 -->
           <view class="search-input-wrap">
             <up-search
                 v-model="searchValue"
@@ -47,24 +42,23 @@
  
     <!-- 列表容器 -->
     <z-paging
-        ref="paging"
+        ref="pagingRef"
         v-model="orderList"
         @query="queryList"
         :auto-show-system-loading="true"
-
     >
       <template #empty>
-        <empty-view/>
+        <empty-view />
       </template>
  
       <view class="common-card-list" style="padding-top: 200rpx;padding-bottom: 30rpx">
         <!-- 待办工单卡片 -->
         <up-card
-            v-if="activeTab == 0"
+            v-if="activeTab === 0"
             :border="false"
             :foot-border-top="false"
             v-for="(item, index) in orderList"
-            :key="`todo_${item.orderNo}_${index}`"
+            :key="`todo_${item.id}_${index}`"
             :show-head="false"
             class="order-card"
         >
@@ -86,7 +80,7 @@
                 <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-item-center common-justify-between">
+              <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">紧急程度：</view>
                 <view class="u-line-1 u-body-value">
                   {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
@@ -101,20 +95,10 @@
                 <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)"
-                           v-show="nextStepMap[item.taskKey].backShow">回退
-                </up-button>
-
-                <up-button type="success" size="mini" @click="handleRenew(item)"
-                           v-show="nextStepMap[item.taskKey].renewShow">重新提交
-                </up-button>
-
-                <up-button type="primary" size="mini" @click="handleProcess(item)">{{
-                    nextStepMap[item.taskKey].btnText
-                  }}
-                </up-button>
+                <up-button type="warning" size="mini" @click="handleReject(item)" v-show="nextStepMap[item.taskKey].backShow">回退</up-button>
+                <up-button type="success" size="mini" @click="handleRenew(item)" v-show="nextStepMap[item.taskKey].renewShow">重新提交</up-button>
+                <up-button type="primary" size="mini" @click="handleProcess(item)">{{ nextStepMap[item.taskKey].btnText }}</up-button>
                 <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
               </view>
             </view>
@@ -123,11 +107,11 @@
  
         <!-- 已办工单卡片和我发起的 -->
         <up-card
-            v-if="activeTab == 2||activeTab == 1"
+            v-if="activeTab === 1 || activeTab === 2"
             :border="false"
             :foot-border-top="false"
             v-for="(item, index) in orderList"
-            :key="`done_${item.orderNo}_${index}`"
+            :key="`done_${item.id}_${index}`"
             :show-head="false"
             class="order-card"
         >
@@ -149,12 +133,11 @@
                 <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-body-item-title">
                   紧急程度：{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
                 </view>
-                <view class=" ">
+                <view>
                   <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>
                 </view>
               </view>
@@ -172,21 +155,12 @@
       </view>
     </z-paging>
  
-    <!-- 底部新增工单按钮（仅巡查员显示） -->
-    <!--    <view v-if="isInspector" class="fixed-bottom-btn-wrap">-->
-    <!--      <up-button type="primary" size="large" @click="handleAddOrder">-->
-    <!--        新增工单-->
-    <!--      </up-button>-->
-    <!--    </view>-->
-
+    <!-- 底部新增工单按钮 -->
     <view class="fixed-bottom-btn-wrap" v-if="isAi">
-      <up-button type="primary" size="large" @click="handleAddOrder">
-        新增工单
-      </up-button>
+      <up-button type="primary" size="large" @click="handleAddOrder">新增工单</up-button>
     </view>
  
-
-    <!-- 回退原因弹窗：替换为up-modal（核心修改） -->
+    <!-- 回退原因弹窗 -->
     <up-modal
         :show="rejectModalShow"
         title="回退原因"
@@ -197,7 +171,6 @@
         @confirm="confirmReject"
     >
       <view class="reject-modal-content">
-        <!-- 回退原因 必填textarea -->
         <up-textarea
             v-model.trim="rejectReason"
             placeholder="请输入回退原因（必填）"
@@ -206,11 +179,10 @@
             maxlength="200"
             class="reject-textarea"
         />
-        <!-- 上传图片（选填）- 按照参考页面改造 -->
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传图片（选填）</view>
           <up-upload
-              :file-list="rejectImgs.rawImgList.value|| []"
+              :file-list="rejectImgs.rawImgList.value || []"
               @after-read="rejectImgs.uploadImgs"
               @delete="rejectImgs.deleteImg"
               multiple
@@ -224,7 +196,7 @@
       </view>
     </up-modal>
  
-    <!-- 验收弹窗 up-modal（含图片上传） -->
+    <!-- 验收弹窗 -->
     <up-modal
         :show="acceptModalShow"
         title="验收"
@@ -235,15 +207,12 @@
         @confirm="handleAcceptModalConfirm"
     >
       <view class="accept-modal-content">
-        <!-- 第一行：单选框（通过/不通过，默认通过） -->
         <view class="radio-group-wrap">
           <up-radio-group v-model="acceptRadioValue">
             <up-radio name="0" label="通过"></up-radio>
             <up-radio name="1" label="不通过"></up-radio>
           </up-radio-group>
         </view>
-
-        <!-- 第二行：必填textarea，最多200字 -->
         <view class="textarea-wrap mt-30">
           <up-textarea
               v-model.trim="acceptReason"
@@ -254,15 +223,12 @@
               count
           />
         </view>
-
-        <!-- 验收图片上传（选填，参考回退弹窗样式） -->
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传验收图片（选填）</view>
           <up-upload
               :file-list="acceptImgs.rawImgList.value || []"
               @after-read="acceptImgs.uploadImgs"
               @delete="acceptImgs.deleteImg"
-
               multiple
               width="70"
               height="70"
@@ -284,124 +250,171 @@ import {
   myBuzSimplePage,
   todoBuzSimplePage,
   doneBuzSimplePage,
-  qyWorkorderCreate,
   qyUniversalApproval,
   daquUniversalApproval,
   dcyUniversalApproval
 } from '@/api/regional-order-manage/regional-order-manage'
-// 从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
 import { nextStepMap, buzStatusMap } from '@/common/utils/common'
-// 引入图片上传组合式函数（与参考页面一致）
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
-// ========== 状态管理 ==========
+
+// ========== 全局实例 & 常量 ==========
 const userStore = useUserStore();
-// 标签页切换
+const USER_ROLES = userStore.userInfo?.roles || [];
+
+// ========== 基础状态 (按模块分组，语义化更强) ==========
+// tab切换
 const activeTab = ref(0); // 0-待办 1-我发起的 2-已办
-const tabList = ref([
-  {name: '待办'},
-  {name: '我发起的任务'},
-  {name: '已办'}
-]);
-// 排序下拉框
+const tabList = ref([{name: '待办'}, {name: '我发起的任务'}, {name: '已办'}]);
+// 排序与搜索
 const selectedSortValue = ref(1);
 const sortOptions = ref([
-  {name: '位置', id: 1},
-  {name: '名称', id: 2},
-  {name: '描述', id: 3},
-  {name: '编号', id: 4},
+  {name: '位置', id: 1}, {name: '名称', id: 2}, {name: '描述', id: 3}, {name: '编号', id: 4},
 ]);
-// 搜索
 const searchValue = ref('');
-// 分页
-const paging = ref(null);
+// 分页相关
+const pagingRef = ref(null);
 const orderList = ref([]);
-// 角色控制（巡查员显示新增按钮）
+
+// ========== 角色权限计算属性 (修复核心bug: 原代码取反逻辑写反) ==========
 const isAi = computed(() => {
-  // patrol_global  全域巡查员
-  // regional_manager  大区经理
-  // AI_dispatcher   AI工单派发人员
-  // 增加可选链，避免用户信息不存在报错
-  console.log('123')
-  console.log(!userStore.userInfo?.roles?.includes('AI_dispatcher'))
-  return !userStore.userInfo?.roles?.includes('AI_dispatcher') ;
-  // return true
+  // AI工单派发人员 不显示新增按钮，其他角色显示
+  return !USER_ROLES.includes('AI_dispatcher');
 });
-// 回退弹窗相关
-const rejectModalShow = ref(false); // 回退modal显示开关
-const rejectReason = ref(''); // 回退原因
-const currentRejectItem = ref(null); // 当前回退工单
-// 回退图片上传配置（与参考页面风格一致）
+
+// ========== 回退弹窗相关 ==========
+const rejectModalShow = ref(false);
+const rejectReason = ref('');
+const currentRejectItem = ref(null);
 const rejectImgs = useUploadImgs({
-  maxCount: 3, // 最多上传3张
-  uploadText: '选择回退图片', // 自定义上传提示文字
-  sizeType: ['compressed'], // 仅上传压缩图
-  formRef: null, // 该弹窗无表单校验
-  fieldName: 'rejectImgs' // 自定义字段名
+  maxCount: 3, uploadText: '选择回退图片', sizeType: ['compressed'], formRef: null, fieldName: 'rejectImgs'
 })
-// ========== 验收弹窗相关状态（含图片上传） ==========
-const acceptModalShow = ref(false); // 验收弹窗显示开关
-const acceptRadioValue = ref('0'); // 单选框值，默认0（通过）
-const acceptReason = ref(''); // 验收原因
-const currentAcceptItem = ref(null); // 当前验收的工单项
-// 验收图片上传配置（独立实例，参考回退弹窗）
+
+// ========== 验收弹窗相关 ==========
+const acceptModalShow = ref(false);
+const acceptRadioValue = ref('0'); // 默认通过
+const acceptReason = ref('');
+const currentAcceptItem = ref(null);
 const acceptImgs = useUploadImgs({
-  maxCount: 3, // 最多上传3张，与回退弹窗一致
-  uploadText: '选择验收图片', // 自定义上传提示文字
-  sizeType: ['compressed'], // 仅上传压缩图，优化性能
-  formRef: null, // 验收弹窗无表单校验
-  fieldName: 'acceptImgs' // 自定义字段名，区分回退图片
+  maxCount: 3, uploadText: '选择验收图片', sizeType: ['compressed'], formRef: null, fieldName: 'acceptImgs'
 })
+
+// ========== 公共封装方法 (核心优化：消灭重复代码) ==========
+/**
+ * 生成统一的临时存储key
+ * @param {String} prefix 前缀标识
+ * @returns {String} 唯一key
+ */
+const generateTempKey = (prefix = 'order') => {
+  return `${prefix}_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
+};
+
+/**
+ * 存储工单数据到本地缓存
+ * @param {Object} item 工单数据
+ * @param {String} prefix key前缀
+ * @returns {String|null} 成功返回key，失败返回null
+ */
+const setOrderStorage = (item, prefix) => {
+  if (!item?.id) return null;
+  const tempKey = generateTempKey(prefix);
+  try {
+    uni.setStorageSync(tempKey, item);
+    return tempKey;
+  } catch (error) {
+    console.error('存储工单数据失败：', error);
+    uni.showToast({title: '数据存储异常，请重试', icon: 'none'});
+    return null;
+  }
+};
+
+/**
+ * 获取分页请求公共参数
+ * @param {Number} pageNo 页码
+ * @param {Number} pageSize 页大小
+ * @returns {Object} 请求参数
+ */
+const getQueryParams = (pageNo, pageSize) => {
+  return {
+    searchContent: searchValue.value.trim() || '',
+    pageNo,
+    pageSize,
+    type: selectedSortValue.value
+  };
+};
+
+/**
+ * 统一调用审批接口
+ * @param {Object} params 请求参数
+ * @param {String} taskKey 工单任务key
+ * @returns {Promise} 接口请求Promise
+ */
+const callApprovalApi = async (params, taskKey) => {
+  if (taskKey === 'shRegionManager') return await dcyUniversalApproval(params);
+  if (taskKey === 'regionManager') return await qyUniversalApproval(params);
+  // 根据角色匹配对应接口
+  if (USER_ROLES.includes('regional_manager')) return await daquUniversalApproval(params);
+  if (USER_ROLES.includes('Inspector_global')) return await dcyUniversalApproval(params);
+  if (USER_ROLES.includes('patrol_global')) return await qyUniversalApproval(params);
+};
+
+/**
+ * 统一跳转工单页面
+ * @param {String} path 页面路径
+ * @param {Object} query 拼接参数
+ */
+const navToOrderPage = (path, query = {}) => {
+  const queryStr = Object.keys(query).map(k => `${k}=${query[k]}`).join('&');
+  uni.redirectTo({ url: `${path}${queryStr ? '?' + queryStr : ''}` });
+};
+
+/**
+ * 刷新列表 - 统一封装，避免空指针
+ */
+const refreshOrderList = () => {
+  pagingRef.value && pagingRef.value.reload();
+};
+
+// ========== 业务核心方法 ==========
 // 分页查询列表
 const queryList = async (pageNo, pageSize) => {
   try {
-    const apiParams = {
-      searchContent: searchValue.value.trim() || '',
-      pageNo,
-      pageSize,
-      type: selectedSortValue.value // 1-位置 2-工单名称 3-情况描述 4-工单编号
-    };
+    const params = getQueryParams(pageNo, pageSize);
     let res;
-    if (activeTab.value == 0) {
-      // 待办工单
-      res = await todoBuzSimplePage(apiParams);
-    } else if (activeTab.value == 1) {
-      // 我发起的任务
-      res = await myBuzSimplePage(apiParams);
-    } else {
-      // 已办工单
-      res = await doneBuzSimplePage(apiParams);
-    }
-    // 适配z-paging分页
-    paging.value.complete(res.list, res.total);
+    if (activeTab.value === 0) res = await todoBuzSimplePage(params);
+    else if (activeTab.value === 1) res = await myBuzSimplePage(params);
+    else res = await doneBuzSimplePage(params);
+    pagingRef.value.complete(res?.list || [], res?.total || 0);
   } catch (error) {
     console.error('加载工单失败：', error);
-    paging.value?.complete(false);
+    pagingRef.value?.complete(false);
     uni.showToast({title: '加载失败，请重试', icon: 'none'});
   }
 };
-// ========== 事件处理 ==========
+
 // 标签页切换
 const handleTabChange = (item) => {
-  orderList.value = [];
-  console.log(item)
   activeTab.value = item.index;
-  paging.value?.reload(); // 切换标签页刷新列表
+  orderList.value = [];
+  refreshOrderList();
 };
+
 // 排序变更
 const handleSortChange = (val) => {
   selectedSortValue.value = val.id;
   searchValue.value = '';
-  paging.value?.reload(); // 排序变更刷新列表
+  refreshOrderList();
 };
+
 // 搜索
 const handleSearch = (val) => {
   searchValue.value = val;
-  paging.value?.reload(); // 搜索刷新列表
+  refreshOrderList();
 };
+
 // 工单详情
 const handleDetail = (item) => {
-  // 0-待办 1我发起的- 2-已办
+  if (!item?.taskId) return uni.showToast({title: '工单信息异常', icon: 'none'});
   uni.navigateTo({
     url: `/pages-sub/problem/regional-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}&processInstanceId=${item.processInstanceId}`,
     events: {
@@ -414,302 +427,163 @@ const handleDetail = (item) =&gt; {
       }
     }
   });
+  // navToOrderPage('/pages-sub/problem/regional-order-manage/order-detail', {
+  //   taskId: item.taskId,
+  //   activeTab: activeTab.value,
+  //   processInstanceId: item.processInstanceId
+  // }, {
+  //   needRefresh: () => refreshOrderList()
+  // });
+
+
 };
-// 生成临时key
-const generateTempKey = () => {
-  return 'renew_order_' + Date.now() + '_' + Math.floor(Math.random() * 10000);
-};
-// 待办-重新提交工单（改造后：大数据存本地，仅传唯一标识）
+
+// 重新提交工单
 const handleRenew = (item) => {
+  const tempKey = setOrderStorage(item, 'renew_order');
+  if (!tempKey) return;
  
-  // 1. 生成唯一临时标识
-  const tempKey = generateTempKey();
-  // 2. 将完整工单数据存入本地临时存储（同步存储，确保数据立即生效）
-  try {
-    console.log(item)
-    console.log('123')
-    uni.setStorageSync(tempKey, item);
-  } catch (error) {
-    console.error('存储工单数据失败：', error);
-    uni.showToast({title: '数据存储异常，无法重新提交', icon: 'none'});
-    return;
-  }
+  const pageUrl = USER_ROLES.includes('patrol_global')
+      ? '/pages-sub/problem/regional-order-manage/add-patrol-order'
+      : '/pages-sub/problem/regional-order-manage/add-order';
  
-  if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
-    uni.navigateTo({
-      url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
-    });
-  }
-  if (userStore.userInfo?.roles.includes('regional_manager')) {  // 大区经理
-    uni.navigateTo({
-      url: `/pages-sub/problem/regional-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
-    });
-  }
-  if (userStore.userInfo?.roles.includes('Inspector_global')) {  // 督察员
-    uni.navigateTo({
-      url: `/pages-sub/problem/regional-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
-    });
-  }
-  // // 3. URL 仅传递「唯一标识」和「重新提交标记」（数据量极小，无长度问题）
-  // uni.navigateTo({
-  //   url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
-  // });
+  navToOrderPage(pageUrl, { isRenew: 1, tempKey });
 };
-// 待办-处理工单
+
+// 处理工单核心逻辑
 const handleProcess = async (item) => {
-  console.log(nextStepMap[item.taskKey].name)
+  if (!item) return uni.showToast({title: '工单信息异常', icon: 'none'});
+  const stepName = nextStepMap[item.taskKey]?.name;
+  let resData
   try {
-    if (nextStepMap[item.taskKey]?.name == '大区经理分配') {
-      // ① 生成唯一临时key（统一规则，避免冲突）
-      const tempKey = `distribute_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
-      // ② 存储完整item到本地缓存（同步存储，确保立即生效）
-      try {
-        uni.setStorageSync(tempKey, item);
-      } catch (error) {
-        console.error('存储分配工单数据失败：', error);
-        uni.showToast({title: '数据存储异常，无法跳转', icon: 'none'});
-        return;
-      }
-      // ③ URL仅传递临时key，无其他冗余参数
-      uni.navigateTo({
-        url: `/pages-sub/problem/regional-order-manage/distribution-order?tempKey=${tempKey}`
-      })
+    // 大区经理分配
+    if (stepName === '大区经理分配') {
+      const tempKey = setOrderStorage(item, 'distribute_order');
+      tempKey && navToOrderPage('/pages-sub/problem/regional-order-manage/distribution-order', { tempKey });
     }
-    if (nextStepMap[item.taskKey]?.name == '督察员单子大区经理分配') {
-       let postData = {
-         "taskKey":item.taskKey,
-         "taskId": item.taskId,
-         "operateType":60,
-         "workerDataId":item.id,
-         "agree":0,
-         "reason":item.remark,
-         "roadId":item.roadId,
-         "roadName":item.roadName,
-         "pressingType":item.pressingType,
-         "orderName":item.orderName,
-         "expectedFinishDate": item.expectedFinishDate,
-         "busiLine":item.busiLine,
-       }
-      const res = await dcyUniversalApproval(postData);
-      uni.showToast({title: '分配成功', icon: 'success', duration: 1000});
-      paging.value?.reload(); // 刷新列表
+    // 督察员单子大区经理分配
+    else if (stepName === '督察员单子大区经理分配') {
+      const postData = { taskKey: item.taskKey, taskId: item.taskId, operateType:60, workerDataId:item.id, agree:0, reason:item.remark, roadId:item.roadId, roadName:item.roadName, pressingType:item.pressingType, orderName:item.orderName, expectedFinishDate: item.expectedFinishDate, busiLine:item.busiLine };
+      resData = await dcyUniversalApproval(postData);
+      uni.showToast({title: '分配成功', icon: 'success'});
+      refreshOrderList();
     }
-
-
-    // 验收 - 打开弹窗
-    if (nextStepMap[item.taskKey]?.name == '巡查员验收'  || nextStepMap[item.taskKey]?.name == '养护组长验收') {
-      currentAcceptItem.value = item; // 存储当前工单信息
-      acceptReason.value = ''; // 清空上次的验收原因
-      acceptRadioValue.value = '0'; // 重置默认选中“通过”
-      acceptModalShow.value = true; // 显示验收弹窗
+    // 验收弹窗
+    else if (['巡查员验收', '养护组长验收'].includes(stepName)) {
+      currentAcceptItem.value = item;
+      acceptReason.value = '';
+      acceptRadioValue.value = '0';
+      acceptModalShow.value = true;
     }
-
-    // 发起人确认
-    if (nextStepMap[item.taskKey]?.name == '发起人确认') {
-      console.log(item)
+    // 发起人确认-结束工单
+    else if (stepName === '发起人确认') {
       uni.showModal({
         title: "结束工单",
         content: "请确定是否结束工单？",
-        success: async function (res) {
+        success: async (res) => {
           if (res.confirm) {
-            // 构建请求参数
             const requestData = {
-
-              "workerDataId": item.id,
-              "taskKey": 'ylInspectorStart',
-              "taskId": item.taskId,
-              "operateType": 200,
-              "agree": 1,
-              "reason": '结束工单'
+              workerDataId: item.id, taskKey: 'ylInspectorStart', taskId: item.taskId,
+              operateType: 200, agree: 1, reason: '结束工单'
             };
-            // 调用回退工单接口   daquUniversalApproval
-
-            if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
-              await daquUniversalApproval(requestData)
-            }
-            if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
-              await dcyUniversalApproval(requestData);
-            }
-            if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
-              await qyUniversalApproval(requestData);
-            }
-
-            uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
-            rejectModalShow.value = false;
-            paging.value?.reload(); // 刷新列表
-          } else if (res.cancel) {
-            console.log("用户点击取消");
+            await callApprovalApi(requestData, item.taskKey);
+            uni.showToast({title: '结束成功', icon: 'success'});
+            refreshOrderList();
           }
-        },
+        }
       });
     }
   } catch (error) {
     console.error('处理工单失败：', error);
-    uni.showToast({title: '处理失败，请重试', icon: 'none'});
+    uni.showToast({title: resData.msg, icon: 'none'});
   }
 };
-// 待办-回退工单（打开回退modal）
+
+// 回退工单-打开弹窗
 const handleReject = (item) => {
-  console.log('123213')
-  // 校验工单有效性
-  if (!item || !item.id) {
-    uni.showToast({title: '工单信息异常，无法回退', icon: 'none'});
-    return;
-  }
+  if (!item?.id) return uni.showToast({title: '工单信息异常，无法回退', icon: 'none'});
   currentRejectItem.value = item;
-  rejectReason.value = ''; // 清空上次输入
-  rejectImgs.clearImgs(); // 改造后：使用组合式函数的清空方法
-  rejectModalShow.value = true; // 显示回退modal
+  rejectReason.value = '';
+  rejectImgs.clearImgs();
+  rejectModalShow.value = true;
 };
-// 回退modal - 取消按钮
+
+// 关闭回退弹窗-重置状态
 const handleRejectModalCancel = () => {
   rejectModalShow.value = false;
   rejectReason.value = '';
-  rejectImgs.clearImgs(); // 改造后：使用组合式函数的清空方法
+  rejectImgs.clearImgs();
 };
+
 // 确认回退工单
 const confirmReject = async () => {
-  // 严格校验回退原因（去除首尾空格）
-  const rejectReasonTrim = rejectReason.value.trim();
-  if (!rejectReasonTrim) {
-    uni.showToast({title: '请填写回退原因', icon: 'none', duration: 1000});
-    return;
-  }
-  // 校验当前工单有效性
-  if (!currentRejectItem.value || !currentRejectItem.value.id) {
-    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration: 1000});
-    rejectModalShow.value = false;
-    return;
-  }
+  const reason = rejectReason.value.trim();
+  if (!reason) return uni.showToast({title: '请填写回退原因', icon: 'none'});
+  const item = currentRejectItem.value;
+  if (!item?.id) return uni.showToast({title: '工单信息异常', icon: 'none'});
+
+  uni.showLoading({title: '提交中...', mask: true});
   try {
-    // 显示加载中，防止重复提交
-    uni.showLoading({title: '提交中...', mask: true});
-    // 构建请求参数
     const requestData = {
-      "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL数组
-      "workerDataId": currentRejectItem.value.id,
-      "taskKey": currentRejectItem.value.taskKey,
-      "taskId": currentRejectItem.value.taskId,
-
-      "operateType": nextStepMap[currentRejectItem.value.taskKey].operateTypeNoPass,
-      "agree": 1,
-      "reason": rejectReasonTrim
+      returnImgs: rejectImgs.getSuccessImgUrls(), workerDataId: item.id, taskKey: item.taskKey,
+      taskId: item.taskId, operateType: nextStepMap[item.taskKey].operateTypeNoPass, agree:1, reason
     };
-    // 调用回退工单接口
-    if(currentRejectItem.value.taskKey=='shRegionManager'){  //  对督察员单子  回退
-      const res = await dcyUniversalApproval(requestData);
-    }
-    if(currentRejectItem.value.taskKey=='regionManager'){  //  对全域巡查员单子  回退
-      const res = await qyUniversalApproval(requestData);
-    }
-    //  对大区经理单子  回退
-    uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
-    rejectModalShow.value = false;
-    paging.value?.reload(); // 刷新列表
+    await callApprovalApi(requestData, item.taskKey);
+    uni.showToast({title: '回退成功', icon: 'success'});
+    handleRejectModalCancel();
+    refreshOrderList();
   } catch (error) {
     console.error('回退工单失败：', error);
-    uni.showToast({title: '网络异常，回退失败', icon: 'none', duration: 1000});
+    uni.showToast({title: '回退失败，请重试', icon: 'none'});
   } finally {
-    // 隐藏加载中
     uni.hideLoading();
   }
 };
+
 // 新增工单
 const handleAddOrder = () => {
-  if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
-    uni.navigateTo({
-      url: '/pages-sub/problem/regional-order-manage/add-patrol-order'
-    });
-  }
-  if (userStore.userInfo?.roles.includes('regional_manager')) {  // 大区经理
-    uni.navigateTo({
-      url: '/pages-sub/problem/regional-order-manage/add-order'
-    });
-  }
-  if (userStore.userInfo?.roles.includes('Inspector_global')) {  // 督察员
-    uni.navigateTo({
-      url: '/pages-sub/problem/regional-order-manage/add-order'
-    });
-  }
+  const pageUrl = USER_ROLES.includes('patrol_global')
+      ? '/pages-sub/problem/regional-order-manage/add-patrol-order'
+      : '/pages-sub/problem/regional-order-manage/add-order';
+  navToOrderPage(pageUrl);
 };
-// 验收弹窗 - 取消按钮（清空状态）
+
+// 关闭验收弹窗-重置状态
 const handleAcceptModalCancel = () => {
   acceptModalShow.value = false;
-  acceptReason.value = ''; // 清空验收原因
-  acceptRadioValue.value = '0'; // 重置单选框为“通过”
-  acceptImgs.clearImgs(); // 清空验收图片
+  acceptReason.value = '';
+  acceptRadioValue.value = '0';
+  acceptImgs.clearImgs();
 };
-// 验收弹窗 - 确定按钮（含returnImgs传参）
+
+// 验收提交
 const handleAcceptModalConfirm = async () => {
-  // 1. 校验验收原因是否为空
-  if (!acceptReason.value.trim()) {
-    uni.showToast({title: '请填写验收原因', icon: 'none', duration: 1000});
-    return;
-  }
-  // 2. 校验验收原因长度
-  if (acceptReason.value.length > 200) {
-    uni.showToast({title: '验收原因最多200字', icon: 'none', duration: 1000});
-    return;
-  }
-  try {
-    // 3. 构建请求参数（含returnImgs）
-    console.log(currentAcceptItem.value)
-    console.log( userStore.userInfo.roles)
-    console.log( userStore.userInfo.roles.includes('Inspector_global'))
-    //
-    if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理验收
-      let postData = {
-        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
-        "taskKey": currentAcceptItem.value.taskKey,
-        "workerDataId": currentAcceptItem.value.id,
-        "taskId": currentAcceptItem.value.taskId,
-        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
-        "reason": acceptReason.value.trim(),
-        "agree":acceptRadioValue.value,
-      }
-      await daquUniversalApproval(postData);
-    }
-    //
-    if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员验收
-      let  postData = {
-        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
-        "taskKey": currentAcceptItem.value.taskKey,
-        "taskId": currentAcceptItem.value.taskId,
-        "workerDataId": currentAcceptItem.value.id,
-        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
-        "reason": acceptReason.value.trim(),
-        "agree": acceptRadioValue.value
-      }
-      await qyUniversalApproval(postData);
-    }
-    //
-    if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员验收
-      let  postData = {
-        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
-        "taskKey": currentAcceptItem.value.taskKey,
-        "taskId": currentAcceptItem.value.taskId,
-        "workerDataId": currentAcceptItem.value.id,
-        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
-        "reason": acceptReason.value.trim(),
-        "agree": acceptRadioValue.value
-      }
-      await dcyUniversalApproval(postData);
-    }
+  const reason = acceptReason.value.trim();
+  if (!reason) return uni.showToast({title: '请填写验收原因', icon: 'none'});
+  if (reason.length > 200) return uni.showToast({title: '验收原因最多200字', icon: 'none'});
+
+  const item = currentAcceptItem.value;
+  if (!item?.id) return uni.showToast({title: '工单信息异常', icon: 'none'});
  
-    // 4. 操作成功处理
-    uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
-    handleAcceptModalCancel(); // 清空状态
-    paging.value?.reload(); // 刷新工单列表
+  try {
+    const postData = {
+      returnImgs: acceptImgs.getSuccessImgUrls(), taskKey: item.taskKey, workerDataId: item.id,
+      taskId: item.taskId, agree: acceptRadioValue.value, reason,
+      operateType: acceptRadioValue.value === '0' ? nextStepMap[item.taskKey].operateTypePass : nextStepMap[item.taskKey].operateTypeNoPass
+    };
+    await callApprovalApi(postData, item.taskKey);
+    uni.showToast({title: '提交成功', icon: 'success'});
+    handleAcceptModalCancel();
+    refreshOrderList();
   } catch (error) {
-    // 5. 操作失败处理
     console.error('验收失败：', error);
-    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
+    uni.showToast({title: '验收提交失败，请重试', icon: 'none'});
   }
 };
-// 页面初始化
+
+// ========== 页面生命周期 ==========
 onLoad(() => {
-  // 初始化加载列表
-  paging.value?.reload();
+  refreshOrderList();
 });
 </script>
  
@@ -734,15 +608,10 @@ onLoad(() =&gt; {
   .select-wrap {
     width: 120rpx;
     margin-right: 20rpx;
-
-    :deep(.u-select) {
+    :deep(.u-select), :deep(.u-input__placeholder) {
       width: 100%;
       font-size: 28rpx;
     }
-
-    :deep(.u-input__placeholder) {
-      font-size: 28rpx;
-    }
   }
  
   .search-input-wrap {
@@ -758,31 +627,14 @@ onLoad(() =&gt; {
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 }
  
-.card-body {
-
-}
-
-// 回退modal样式
-.reject-modal-content {
+// 弹窗公共样式
+.reject-modal-content, .accept-modal-content {
   width: 100%;
   box-sizing: border-box;
   padding: 10rpx 0;
 }
  
-.textarea-label {
-  font-size: 28rpx;
-  color: #333;
-  margin-bottom: 10rpx;
-
-  .required-mark {
-    color: #f56c6c;
-    margin-left: 4rpx;
-  }
-}
-
 .upload-wrap {
-  margin-top: 20rpx;
-
   .upload-title {
     font-size: 28rpx;
     color: #333;
@@ -790,37 +642,20 @@ onLoad(() =&gt; {
   }
 }
  
-.mt-20 {
-  margin-top: 20rpx;
-}
-
-.mt-30 {
-  margin-top: 30rpx;
-}
-
-// 养护组长验收弹窗样式
-.accept-modal-content {
-  width: 100%;
-  box-sizing: border-box;
-}
-
+// 验收弹窗单选框样式
 .radio-group-wrap {
   display: flex;
   align-items: center;
-  gap: 40rpx; // 单选框之间的间距
+  gap: 40rpx;
   font-size: 28rpx;
   margin-bottom: 20rpx;
 }
  
 .textarea-wrap {
   width: 100%;
-  margin-top: 30rpx;
 }
  
-.modal-btn-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  padding-right: 10rpx;
-}
+// 间距公共样式
+.mt-20 { margin-top: 20rpx; }
+.mt-30 { margin-top: 30rpx; }
 </style>
 \ No newline at end of file
@@ -267,23 +267,23 @@
     </view>
  
     <!-- activeTab==0的时候才出现， 也就是待办 -->
-    <view v-if="activeTab==0&&nextStepMap[orderDetail.taskKey]" class="fixed-bottom-btn-wrap">
-      <view class="u-body-item u-flex common-justify-between common-item-center ">
-        <up-button type="warning" size="normal" @click="handleReject(orderDetail)"
-                   v-show="nextStepMap[orderDetail.taskKey].backShow">回退
-        </up-button>
-
-        <up-button type="success" size="normal" @click="handleRenew(orderDetail)"
-                   v-show="nextStepMap[orderDetail.taskKey].renewShow">重新提交
-        </up-button>
-
-        <up-button type="primary" size="normal" @click="handleProcess(orderDetail)">{{
-            nextStepMap[orderDetail.taskKey].btnText
-          }}
-        </up-button>
-
-      </view>
-    </view>
+<!--    <view v-if="activeTab==0&&nextStepMap[orderDetail.taskKey]" class="fixed-bottom-btn-wrap">-->
+<!--      <view class="u-body-item u-flex common-justify-between common-item-center ">-->
+<!--        <up-button type="warning" size="normal" @click="handleReject(orderDetail)"-->
+<!--                   v-show="nextStepMap[orderDetail.taskKey].backShow">回退-->
+<!--        </up-button>-->
+
+<!--        <up-button type="success" size="normal" @click="handleRenew(orderDetail)"-->
+<!--                   v-show="nextStepMap[orderDetail.taskKey].renewShow">重新提交-->
+<!--        </up-button>-->
+
+<!--        <up-button type="primary" size="normal" @click="handleProcess(orderDetail)">{{-->
+<!--            nextStepMap[orderDetail.taskKey].btnText-->
+<!--          }}-->
+<!--        </up-button>-->
+
+<!--      </view>-->
+<!--    </view>-->
  
     <!-- 回退原因弹窗（新增图片上传） -->
     <up-modal
@@ -492,11 +492,11 @@ const loadCoProcessorList = async () =&gt; {
       }).filter(Boolean); // 过滤null项
     } else {
       coProcessorList.value = []
-      uni.showToast({
-        title: '暂无共同处理人数据',
-        icon: 'none',
-        duration: 2000
-      });
+      // uni.showToast({
+      //   title: '暂无共同处理人数据',
+      //   icon: 'none',
+      //   duration: 1000
+      // });
       console.warn('loadCoProcessorList提示：处理人列表为空');
     }
   } catch (err) {
@@ -10,7 +10,8 @@
 		{
 			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -166,7 +167,7 @@
  
 				{
 					"path": "regional-order-manage/add-patrol-order",
-					"style": { "navigationBarTitleText": "待派单" }
+					"style": { "navigationBarTitleText": "提交工单" }
 				},
  
 				{
@@ -197,7 +198,21 @@
 				{
 					"path": "tree-archive/index",
 					"style": { "navigationBarTitleText": "行道树档案" }
+				},
+				{
+					"path": "tree-archive/treeRecord",
+					"style": { "navigationBarTitleText": "行道树记录" }
+				},
+				{
+					"path": "tree-archive/addTree",
+					"style": { "navigationBarTitleText": "新增行道树" }
+				},
+				{
+					"path": "tree-archive/editTree",
+					"style": { "navigationBarTitleText": "编辑行道树" }
 				}
+
+
 			]
 		}
 	],
 <template>
   <view class="login-page">
-    <!-- 纯CSS渐变动效背景（替代粒子动画，兼容所有版本） -->
-    <view class="bg-animation"></view>
+    <!-- 顶部标题区 - 加高 + 左下大圆角 + 底部蓝色过滤阴影 + 从浅到深 蓝色渐变背景 -->
+    <view class="top-title">
+      <text class="welcome-text">你好，欢迎光临</text>
+      <text class="platform-name">全域智能运营管理平台</text>
+    </view>
  
-    <!-- 登录表单区域（悬浮层） -->
+    <!-- 登录表单区域 - 往上偏移 盖住top-title一部分 -->
     <view class="login-form">
-      <!-- 登录标题（简约大气） -->
-      <view class="login-title">园林登录</view>
+      <!-- 登录标题 -->
+      <view class="login-title">账户登录</view>
  
-      <!-- 账号输入框 -->
-      <view class="form-item">
-        <up-input
-            v-model="form.account"
-            placeholder="请输入登录账号"
-            border="surround"
-            clearable
-            maxlength="30"
-            input-align="left"
-            :disabled="isLoading"
-            @blur="checkAccount"
-            :custom-style="{
-            backgroundColor: 'rgba(255, 255, 255, 0.9)',
-            borderColor: '#e5e7eb'
-          }"
+      <!-- ✅ 核心：和工单页同款 up-form 表单校验容器 -->
+      <up-form
+          label-position="left"
+          :model="form"
+          ref="loginFormRef"
+          labelWidth="0"
+      >
+        <!-- 账号输入框 + 校验 -->
+        <up-form-item
+            prop="account"
         >
-          <template #prefix>
-            <up-icon name="account" color="#6b7280" size="20"></up-icon>
-          </template>
-        </up-input>
-        <!-- 账号错误提示 -->
-        <view class="error-tip" v-if="error.account">{{ error.account }}</view>
-      </view>
+          <up-input
+              v-model="form.account"
+              border="surround"
+              clearable
+              maxlength="30"
+              input-align="left"
+              fontSize="16px"
+              :disabled="isLoading"
+              shape="circle"
+              placeholder="请输入账户"
+              selectionStart="15"
+              selectionEnd="15"
+              @blur="() => loginFormRef.validateField('account')"
+          />
+        </up-form-item>
  
-      <!-- 密码输入框（移除查看密码功能） -->
-      <view class="form-item">
-        <up-input
-            v-model="form.password"
-            placeholder="请输入登录密码"
-            maxlength="20"
-            border="surround"
-            clearable
-            input-align="left"
-            type="password"
-            :disabled="isLoading"
-            @blur="checkPassword"
-            :custom-style="{
-            backgroundColor: 'rgba(255, 255, 255, 0.9)',
-            borderColor: '#e5e7eb'
-          }"
+        <!-- 密码输入框 + 校验 -->
+        <up-form-item
+            prop="password"
         >
-          <template #prefix>
-            <up-icon name="lock" color="#6b7280" size="20"></up-icon>
-          </template>
-        </up-input>
-        <!-- 密码错误提示 -->
-        <view class="error-tip" v-if="error.password">{{ error.password }}</view>
-      </view>
+          <up-input
+              v-model="form.password"
+              placeholder="请输入密码"
+              maxlength="20"
+              border="surround"
+              clearable
+              input-align="left"
+              type="password"
+              :disabled="isLoading"
+              shape="circle"
+              selectionStart="5"
+              selectionEnd="5"
+              @blur="() => loginFormRef.validateField('password')"
+          />
+        </up-form-item>
+      </up-form>
  
       <!-- 登录按钮 -->
       <up-button
@@ -64,44 +66,58 @@
           size="large"
           :loading="isLoading"
           @click="handleLogin"
-          :custom-style="{
-
-        }"
+          shape="circle"
       >
         登录
       </up-button>
     </view>
+
+    <!-- 版权信息 -->
+    <view class="copyright">蓟城山水集团版权所有</view>
   </view>
 </template>
  
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, nextTick } from 'vue';
 import { useUserStore } from '@/pinia/user';
 import globalConfig from '@/common/config/global';
  
-// 表单数据
+// ========== 【全局实例 & 基础状态】 和工单页写法一致 ==========
+const userStore = useUserStore();
+const loginFormRef = ref(null); // 表单ref 用于校验
+const isLoading = ref(false);   // 登录加载状态
+
+// ========== 【表单数据】 和工单页一致的 reactive 声明 ==========
 const form = reactive({
-  account: '', // 账号
-  password: '' // 密码
+  account: '',  // 账号
+  password: ''  // 密码
 });
  
-// 状态管理
-const isLoading = ref(false);
-const error = reactive({
-  account: '',
-  password: ''
+// ========== 【表单校验规则】 ✅核心 和工单页1:1同款校验规则写法 ==========
+const loginFormRules = reactive({
+  // 账号校验：必填 + 长度限制 2-30位（合理账号长度，可自行调整）
+  account: [
+    { type: 'string', required: true, message: '请输入登录账号', trigger: ['change', 'blur'] },
+    { type: 'string', min: 2, max: 30, message: '账号长度为2-30个字符', trigger: ['change', 'blur'] }
+  ],
+  // 密码校验：必填 + 长度限制 6-20位（行业通用密码长度，可自行调整）
+  password: [
+    { type: 'string', required: true, message: '请输入登录密码', trigger: ['change', 'blur'] },
+    { type: 'string', min: 6, max: 20, message: '密码长度为6-20个字符', trigger: ['change', 'blur'] }
+  ]
 });
  
-// 实例化 Pinia 用户仓库
-const userStore = useUserStore();
-
-// 页面加载时初始化
+// ========== 【生命周期】 nextTick 设置校验规则 和工单页一致 ==========
 onMounted(() => {
   // 检查登录态
   checkLoginStatus();
+  // nextTick确保表单挂载完成再赋值规则，修复校验不生效bug，和工单页写法一致
+  nextTick(() => {
+    loginFormRef.value?.setRules(loginFormRules);
+  });
 });
  
-// 检查登录状态
+// ========== 【检查登录状态】 原有逻辑不变 ==========
 const checkLoginStatus = () => {
   try {
     // 已登录则直接跳首页
@@ -109,7 +125,6 @@ const checkLoginStatus = () =&gt; {
       uni.switchTab({
         url: '/pages/workbench/index',
         fail: () => {
-          // 非tabBar页面用redirectTo
           uni.reLaunch({ url: '/pages/workbench/index' });
         }
       });
@@ -120,38 +135,14 @@ const checkLoginStatus = () =&gt; {
   }
 };
  
-// 校验账号
-const checkAccount = () => {
-  if (!form.account) {
-    error.account = '请输入登录账号';
-  } else {
-    error.account = '';
-  }
-};
-
-// 校验密码
-const checkPassword = () => {
-  if (!form.password) {
-    error.password = '请输入登录密码';
-  } else {
-    error.password = '';
-  }
-};
-
-// 表单整体校验
-const validateForm = () => {
-  checkAccount();
-  checkPassword();
-  return !error.account && !error.password;
-};
-
-// 登录处理
+// ========== 【核心登录方法】 ✅ 完整表单校验 + 登录逻辑，和工单页submit提交逻辑一致 ==========
 const handleLogin = async () => {
-  if (!validateForm()) return;
-
-  isLoading.value = true;
-
   try {
+    // ✅ 第一步：先执行表单整体校验，通过后再执行登录逻辑（和工单页submitWorkOrder写法一致）
+    await loginFormRef.value.validate();
+
+    isLoading.value = true;
+    // 执行登录请求
     await userStore.login({
       username: form.account,
       password: form.password
@@ -170,16 +161,15 @@ const handleLogin = async () =&gt; {
       });
     }, 1000);
   } catch (err) {
-    console.error('登录失败详情：', err);
-    const errorMsg =
-        err.message === '网络异常，请稍后重试'
-            ? '网络异常，请稍后重试'
-            : err.message || '登录失败，请检查账号密码';
-    uni.showToast({
-      title: errorMsg,
-      icon: 'none',
-      duration: 2000
-    });
+    // ✅ 校验失败/登录失败 统一捕获提示，和工单页异常处理一致
+    if (!Array.isArray(err)) {
+      console.error('登录失败：', err);
+      uni.showToast({
+        title: err.message || '账号或密码错误，请重试',
+        icon: 'none',
+        duration: 2000
+      });
+    }
   } finally {
     isLoading.value = false;
   }
@@ -190,122 +180,83 @@ const handleLogin = async () =&gt; {
 // 核心布局
 .login-page {
   min-height: 100vh;
-  position: relative;
-  padding: 40rpx 30rpx;
+  padding: 0;
   box-sizing: border-box;
-  overflow: hidden; // 隐藏动效溢出
-
-  // 适配小程序安全区
-  /* #ifdef MP-WEIXIN */
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-  /* #endif */
+  overflow: hidden;
+  position: relative;
+  background: #f5f7fa;
 }
  
-// 纯CSS渐变动效背景（替代粒子，兼容所有版本）
-.bg-animation {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 0;
-  // 基础渐变底色
-  background: linear-gradient(120deg, #f0f9ff 0%, #e6f7ff 100%);
-  // 伪粒子动效（多个透明渐变圆缓慢移动）
-  &::before,
-  &::after {
-    content: '';
-    position: absolute;
-    border-radius: 50%;
-    background: rgba(59, 130, 246, 0.05);
-    animation: float 20s infinite linear;
-  }
-
-  &::before {
-    width: 600rpx;
-    height: 600rpx;
-    top: -200rpx;
-    left: -200rpx;
-  }
+// 顶部：从左到右 由浅到深 线性渐变 过渡自然柔和 无突兀色块
+.top-title {
+  background: linear-gradient(120deg, #4299e1 0%, #2970e8 50%, #2563eb 100%);
+  color: #fff;
+  padding: 240rpx 30rpx 80rpx;
+  text-align: left;
+  border-bottom-left-radius: 120rpx;
+  position: relative;
+  z-index: 1;
+  box-shadow: 0 25rpx 40rpx -15rpx rgba(37, 99, 235, 0.3);
  
-  &::after {
-    width: 800rpx;
-    height: 800rpx;
-    bottom: -300rpx;
-    right: -300rpx;
-    animation-delay: -10s; // 错开动画时间
+  .welcome-text {
+    font-size: 46rpx;
+    display: block;
+    margin-bottom: 10px;
+    font-weight: 500;
   }
  
-  // 额外小动效点（模拟粒子）
-  & > view {
-    position: absolute;
-    width: 400rpx;
-    height: 400rpx;
-    border-radius: 50%;
-    background: rgba(59, 130, 246, 0.03);
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    animation: float 15s infinite linear reverse;
+  .platform-name {
+    margin-bottom: 10px;
+    font-size: 46rpx;
+    display: block;
+    opacity: 0.95;
   }
 }
  
-// 浮动动画（模拟粒子运动）
-@keyframes float {
-  0% {
-    transform: translate(0, 0) rotate(0deg);
-  }
-  25% {
-    transform: translate(50rpx, 30rpx) rotate(90deg);
-  }
-  50% {
-    transform: translate(0, 60rpx) rotate(180deg);
-  }
-  75% {
-    transform: translate(-50rpx, 30rpx) rotate(270deg);
-  }
-  100% {
-    transform: translate(0, 0) rotate(360deg);
-  }
-}
-
-// 登录表单（悬浮层）
 .login-form {
+  background-color: #fff;
+  padding: 40rpx 30rpx;
+  border-radius: 16rpx;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
+  margin: -60rpx 40rpx 0;
   position: relative;
   z-index: 10;
-  background-color: rgba(255, 255, 255, 0.95);
-  padding: 60rpx 40rpx;
-  border-radius: 16rpx;
-  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
-  max-width: 600rpx;
-  margin: 0 auto;
-  margin-top: 100rpx;
+  box-sizing: border-box;
  
-  // 登录标题
   .login-title {
-    font-size: 36rpx;
+    font-size: 38rpx;
     font-weight: 600;
-    color: #111827;
-    text-align: center;
-    margin-bottom: 40rpx;
-    letter-spacing: 2rpx;
+    color: #666;
+    margin-bottom: 30rpx;
+    letter-spacing: 1rpx;
   }
 }
  
-// 表单项
-.form-item {
-  margin-bottom: 30rpx;
+// 适配表单校验的间距
+:deep(.u-form-item) {
+  margin-bottom: 20rpx;
   position: relative;
+}
  
-  // 错误提示
-  .error-tip {
-    font-size: 24rpx;
-    color: #ef4444;
-    margin-top: 10rpx;
-    line-height: 1.2;
-    padding-left: 10rpx;
-  }
+// 登录按钮：和顶部完全同款 从左到右 由浅到深 线性渐变 + 保留所有原尺寸
+.login-btn {
+  margin-top: 40rpx;
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  border-radius: 8rpx;
+  font-size: 32rpx;
+  background: linear-gradient(120deg, #4299e1 0%, #2970e8 50%, #2563eb 100%) !important;
+  border: none !important;
+  &::after { border: none !important; }
 }
  
+.copyright {
+  width: 100%;
+  text-align: center;
+  font-size: 24rpx;
+  color: #999;
+  position: fixed;
+  bottom: 100px;
+}
 </style>
 \ No newline at end of file