From f0ec74d652d5a10dab291978081b2791c4210886 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Sat, 27 Dec 2025 20:18:30 +0800
Subject: [PATCH] 大区经理派单

---
 api/work-order-manage/work-order-manage.js                   |   8 ++++----
 common/utils/common.js                                       |  22 +++++++++++-----------
 pages-sub/problem/regional-order-manage/add-order.vue        | 653 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 pages-sub/problem/regional-order-manage/add-patrol-order.vue | 399 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages-sub/problem/regional-order-manage/index.vue            |  23 ++++++++++++++++++-----
 pages-sub/problem/regional-order-manage/order-detail.vue     |   9 +++++----
 pages-sub/problem/work-order-manage/add-order.vue            |   1 -
 pages-sub/problem/work-order-manage/index.vue                |   3 +++
 pages.json                                                   |   5 +++++
 9 files changed, 1091 insertions(+), 32 deletions(-)
 create mode 100644 pages-sub/problem/regional-order-manage/add-patrol-order.vue

diff --git a/api/work-order-manage/work-order-manage.js b/api/work-order-manage/work-order-manage.js
index cef9673..0e423b7 100644
--- a/api/work-order-manage/work-order-manage.js
+++ b/api/work-order-manage/work-order-manage.js
@@ -113,15 +113,15 @@ export const workorderCreate = (data) => {
 
 
 /**
- *  大区经理问题工单创建
+ *  问题工单创建  大区经理   全域巡查员   ai经理  督查员
  * @returns {Promise}
  */
-export const regionmgrWorkorderCreat = (data) => {
-  return post('/app-api/bpm/regionmgr/workorder',data);
+export const regionmgrWorkorderCreate = (data) => {
+  return post('/app-api/bpm/regionmgr/workorder/create',data);
 };
 
 /**
- *   app端统一审批入口  -- 大区经理
+ *   app端统一审批入口  -- 大区经理   全域巡查员   ai经理  督查员
  * @returns {Promise}
  */
 export const regionmgrUniversalApproval = (params) => {
diff --git a/common/utils/common.js b/common/utils/common.js
index 7a1e978..b3166a1 100644
--- a/common/utils/common.js
+++ b/common/utils/common.js
@@ -44,17 +44,17 @@ export const nextStepMap = {
 
 
 export const buzStatusMap = {
-  '000' :'巡查员发起',
-  "210" : '养护组长退回',
-  "110" : '养护组长分配',
-  "200" : '巡查员结束工单',
-  "100" : '巡查员重新发起',
-  "220" : '养护员退回',
-  "120" : '养护员实施',
-  "130" : '养护组长验收通过',
-  "230" : '养护组长验收不通过',
-  "140" : '巡查员验收通过',
-  "240" : '巡查员验收不通过',
+  '000' :'发起',
+  "210" : '退回',
+  "110" : '分配',
+  "200" : '结束工单',
+  "100" : '重新发起',
+  "220" : '退回',
+  "120" : '实施',
+  "130" : '验收通过',
+  "230" : '验收不通过',
+  "140" : '验收通过',
+  "240" : '验收不通过',
 }
 
 
diff --git a/pages-sub/problem/regional-order-manage/add-order.vue b/pages-sub/problem/regional-order-manage/add-order.vue
index 9648f9a..149cd3b 100644
--- a/pages-sub/problem/regional-order-manage/add-order.vue
+++ b/pages-sub/problem/regional-order-manage/add-order.vue
@@ -1,15 +1,654 @@
-<script lang="ts">
-import {defineComponent} from 'vue'
+<template>
+  <view class="page-container">
+    <view class="work-order-form-content commonPageLRpadding">
+      <up-form
+          label-position="left"
+          :model="workOrderForm"
+          ref="workOrderFormRef"
+          labelWidth="200rpx"
+      >
+        <!-- 1. 工单位置（地图选择） -->
+        <up-form-item
+            label="工单位置"
+            prop="workLocation"
+            border-bottom
+            required
+            @click="chooseWorkLocation(); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.workLocation"
+              border="none"
+              readonly
+              suffix-icon="map-fill"
+              placeholder="点击选择工单位置"
+          ></up-input>
+        </up-form-item>
+
+        <!-- 2. 工单名称（下拉框） -->
+        <up-form-item
+            label="工单名称"
+            prop="orderName"
+            border-bottom
+            required
+            @click="handleActionSheetOpen('orderName'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.orderName"
+              disabled
+              disabled-color="#ffffff"
+              placeholder="请选择工单名称"
+              border="none"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 3. 情况描述（文本域） -->
+        <up-form-item
+            label="情况描述"
+            prop="problemDesc"
+            required
+        >
+          <up-textarea
+              placeholder="请输入情况描述（最多200字）"
+              v-model.trim="workOrderForm.problemDesc"
+              count
+              maxlength="200"
+              rows="4"
+              @blur="() => workOrderFormRef.validateField('problemDesc')"
+          ></up-textarea>
+        </up-form-item>
+
+        <!-- 4. 问题照片 -->
+        <up-form-item label="问题照片" prop="problemImgs" required>
+          <up-upload
+              :file-list="problemImgs.imgList.value||[]"
+              @after-read="problemImgs.uploadImgs"
+              @delete="problemImgs.deleteImg"
+              multiple
+              :width="70"
+              :height="70"
+              :max-count="problemImgs.uploadConfig.maxCount"
+              :upload-text="problemImgs.uploadConfig.uploadText"
+              :size-type="problemImgs.uploadConfig.sizeType"
+          ></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="业务线"
+              prop="busiLineCn"
+              border-bottom
+              required
+          >
+            <up-radio-group
+                v-model="workOrderForm.busiLineCn"
+                placement="row"
+                @change="handleBusiLineChange"
+            >
+              <up-radio
+                  v-for="item in busiLineOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :name="item.name"
+              ></up-radio>
+            </up-radio-group>
+          </up-form-item>
+
+          <!-- 道路名称（下拉框） -->
+          <up-form-item
+              label="道路名称"
+              prop="roadName"
+              border-bottom
+              required
+              @click="handleActionSheetOpen('roadName'); hideKeyboard()"
+          >
+            <up-input
+                v-model="workOrderForm.roadName"
+                readonly
+                disabled-color="#ffffff"
+                placeholder="请先选择工单位置"
+                border="none"
+            ></up-input>
+            <template #right>
+              <up-icon name="arrow-right" size="16" ></up-icon>
+            </template>
+          </up-form-item>
+
+          <!-- 紧急程度选择 -->
+          <up-form-item
+              label="紧急程度"
+              prop="pressingTypeName"
+              border-bottom
+              required
+              @click="handleActionSheetOpen('pressingType'); hideKeyboard()"
+          >
+            <up-input
+                v-model="workOrderForm.pressingTypeName"
+                disabled
+                disabled-color="#ffffff"
+                placeholder="请选择紧急程度"
+                border="none"
+            ></up-input>
+            <template #right>
+              <up-icon name="arrow-right" size="16"></up-icon>
+            </template>
+          </up-form-item>
+        </view>
+
+        <!-- 5. 完成时间 -->
+        <up-form-item
+            label="希望完成时间"
+            prop="expectedFinishDate"
+            @click="show=true;hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.expectedFinishDate"
+              border="none"
+              readonly
+              placeholder="点击选择时间"
+          ></up-input>
+          <template #right>
+            <view v-if="workOrderForm.expectedFinishDate" @click.stop>
+              <up-icon
+                  name="close"
+                  size="16"
+                  @click.stop="clearExpectedFinishDate"
+              ></up-icon>
+            </view>
+            <up-icon name="arrow-right" size="16" v-else></up-icon>
+          </template>
+        </up-form-item>
+      </up-form>
+    </view>
+
+    <!-- 底部提交按钮 -->
+    <view class="fixed-bottom-btn-wrap">
+      <up-button
+          type="primary"
+          text="提交工单"
+          @click="submitWorkOrder"
+      ></up-button>
+    </view>
+
+    <!-- 合并后的通用下拉弹窗 -->
+    <up-action-sheet
+        :show="showActionSheet"
+        :actions="currentActionSheetData.list"
+        :title="currentActionSheetData.title"
+        @close="handleActionSheetClose"
+        @select="handleActionSheetSelect"
+    ></up-action-sheet>
+
+    <!-- 完成时间选择器 -->
+    <up-datetime-picker
+        :show="show"
+        v-model="expectedFinishDate"
+        mode="datetime"
+        :min-date="new Date()"
+        @cancel="show = false"
+        @confirm="expectedFinishDateConfirm"
+    ></up-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
+import { useUploadImgs } from '@/common/utils/useUploadImgs'
+import { getRoadListByLatLng } from '@/api/common'
+import { regionmgrUniversalApproval,  regionmgrWorkorderCreate } from '@/api/work-order-manage/work-order-manage'
+import { timeFormat } from '@/uni_modules/uview-plus'
+import { nextStepMap } from '@/common/utils/common'
+import { useUserStore } from '@/pinia/user';
+
+// ========== 状态管理 ==========
+const userStore = useUserStore();
+
+// ========== 业务线相关状态 ==========
+// 业务线映射表
+const busiLineMap = ref({
+  'yl': '园林',
+  'sz': '市政',
+  'wy': '物业',
+  '园林': 'yl',
+  '市政': 'sz',
+  '物业': 'wy'
+});
+
+// 业务线选项列表
+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()]
+  }));
+};
 
-export default defineComponent({
-  name: "add-order"
+// 工具方法：通过中文名称获取对应的英文标识
+const getBusiLineEnByCn = (cnName) => {
+  return busiLineMap.value[cnName] || '';
+};
+
+// ========== 表单Ref ==========
+const workOrderFormRef = ref(null)
+
+// ========== 公共上传逻辑复用 ==========
+const problemImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择问题照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'problemImgs'
+})
+
+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: '',
 })
+
+// ========== 表单校验规则 ==========
+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'] }
+  ],
+  problemDesc: [
+    { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
+    { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
+  ],
+  problemImgs: [problemImgs.imgValidateRule]
+})
+
+// ========== 生命周期 ==========
+onLoad((options) => {
+  // 初始化业务线选项
+  formatBusiLineOptions();
+  // 默认选中第一个业务线
+  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);
+      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);
+    }
+  }
+});
+
+onReady(() => {
+  if (workOrderFormRef.value) {
+    workOrderFormRef.value.setRules(workOrderFormRules)
+  }
+  console.log('工单表单规则初始化完成')
+})
+
+onShow(() => {
+  // 初始化工单名称列表
+  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
+  // 初始化紧急程度列表
+  pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
+})
+
+// ========== 核心方法 ==========
+const echoOrderData = (orderItem) => {
+  // 回显业务线
+  if (orderItem.busiLine) {
+    workOrderForm.busiLineCn = busiLineMap.value[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.problemDesc = orderItem.remark || '';
+  workOrderForm.lat = orderItem.lat || 0;
+  workOrderForm.lon = orderItem.lon || 0;
+  workOrderForm.expectedFinishDate =  timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')  || timeFormat(new Date(), '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'
+    }));
+    problemImgs.imgList.value = imgList;
+    problemImgs.rawImgList.value = imgList;
+  }
+
+  // 自动获取道路列表
+  if (orderItem.lat && orderItem.lon) {
+    getRoadListByBusiLine();
+  }
+};
+
+// 业务线切换事件
+const handleBusiLineChange = () => {
+  workOrderForm.roadName = '';
+  workOrderForm.roadId = 0;
+  roadNameList.value = [];
+  if (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;
+  }
+
+  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' });
+    }
+  } catch (err) {
+    uni.hideLoading();
+    console.error('获取道路名称失败：', err);
+    uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' });
+    roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }];
+  }
+};
+
+// ========== 通用弹窗方法 ==========
+const handleActionSheetOpen = (type) => {
+  if (type === 'roadName' && !workOrderForm.workLocation) {
+    uni.showToast({ title: '请先选择工单位置', icon: 'none' })
+    return
+  }
+
+  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
+}
+
+const handleActionSheetClose = () => {
+  showActionSheet.value = false
+  currentActionSheetData.type = ''
+  currentActionSheetData.list = []
+  currentActionSheetData.title = ''
+}
+
+const handleActionSheetSelect = (e) => {
+  const { type } = currentActionSheetData
+  switch (type) {
+    case 'roadName':
+      workOrderForm.roadName = e.name
+      workOrderForm.roadId = e.code
+      workOrderFormRef.value?.validateField('roadName')
+      break
+    case 'orderName':
+      workOrderForm.orderName = e.name
+      workOrderFormRef.value?.validateField('orderName')
+      break
+    case 'pressingType':
+      workOrderForm.pressingType = e.value
+      workOrderForm.pressingTypeName = e.name
+      workOrderFormRef.value?.validateField('pressingTypeName')
+      break
+  }
+  showActionSheet.value = false
+}
+
+const navigateBack = () => {
+  uni.reLaunch({
+    url: '/pages-sub/problem/work-order-manage/index',
+    fail: () => {
+      uni.navigateBack({ delta: 2 });
+    }
+  });
+}
+
+// 清除希望完成时间
+const clearExpectedFinishDate = ()=> {
+  workOrderForm.expectedFinishDate = ''
+}
+
+// 选择工单位置
+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')
+
+      await getRoadListByBusiLine();
+    },
+    fail: (err) => {
+      console.error('选择位置失败：', err)
+      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
+    }
+  })
+}
+
+// 完成时间确认
+const expectedFinishDateConfirm = (e) => {
+  workOrderForm.expectedFinishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+  show.value = false
+}
+
+// 隐藏键盘
+const hideKeyboard = () => {
+  uni.hideKeyboard()
+}
+
+// 提交工单
+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,
+      problemsImgs: problemImgs.getSuccessImgUrls(),
+      remark: workOrderForm.problemDesc.trim(),
+      latLonType: 2,
+      lat: workOrderForm.lat,
+      lon: workOrderForm.lon,
+      lonLatAddress: workOrderForm.workLocation,
+      pressingType: workOrderForm.pressingType,
+      orderName: workOrderForm.orderName,
+      expectedFinishDate: new Date(workOrderForm.expectedFinishDate).getTime(),
+      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: '重新提交工单',
+        ...commonSubmitData
+      }
+      res = await regionmgrUniversalApproval(renewSubmitData)
+    } else {
+      res = await regionmgrWorkorderCreate(commonSubmitData)
+    }
+
+    uni.hideLoading()
+    uni.showToast({
+      title: isRenew.value ? '重新提交成功' : '工单提交成功',
+      icon: 'success',
+      duration: 1000
+    })
+
+    setTimeout(() => {
+      uni.reLaunch({
+        url: '/pages-sub/problem/regional-order-manage/index'
+      })
+    }, 1000)
+  } catch (error) {
+    uni.hideLoading()
+
+    if (!Array.isArray(error)) {
+      console.error(isRenew.value ? '工单重新提交失败：' : '工单提交失败：', error)
+      uni.showToast({
+        title: isRenew.value ? error.msg : error.msg,
+        icon: 'none',
+        duration: 2000
+      })
+    }
+  }
+}
 </script>
 
-<template>
+<style lang="scss" scoped>
+// 全局页面样式
+.page-container {
+  min-height: 100vh;
+  padding-bottom: 100rpx; // 给底部按钮留空间
+}
 
-</template>
+// 工单表单内容容器
+.work-order-form-content {
+  background: #fff;
+}
+
+// 派单情况分组样式（核心：增加顶部间距）
+.dispatch-group {
+
+  padding-top: 20rpx; // 分组内顶部内边距，增强视觉区分
 
-<style scoped lang="scss">
+}
 
+// 派单情况标题样式
+.dispatch-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color:$u-primary;
+  margin-bottom: 20rpx;
+  padding-left: 10rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages-sub/problem/regional-order-manage/add-patrol-order.vue b/pages-sub/problem/regional-order-manage/add-patrol-order.vue
new file mode 100644
index 0000000..b418e2b
--- /dev/null
+++ b/pages-sub/problem/regional-order-manage/add-patrol-order.vue
@@ -0,0 +1,399 @@
+<template>
+  <view class="page-container">
+    <view class="work-order-form-content commonPageLRpadding">
+      <up-form
+          label-position="left"
+          :model="workOrderForm"
+          ref="workOrderFormRef"
+          labelWidth="200rpx"
+      >
+        <!-- 1. 工单位置（地图选择） -->
+        <up-form-item
+            label="工单位置1"
+            prop="workLocation"
+            border-bottom
+            required
+            @click="chooseWorkLocation(); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.workLocation"
+              border="none"
+              readonly
+              suffix-icon="map-fill"
+              placeholder="点击选择工单位置"
+          ></up-input>
+        </up-form-item>
+
+        <!-- 2. 工单名称（下拉框） -->
+        <up-form-item
+            label="工单名称"
+            prop="orderName"
+            border-bottom
+            required
+            @click="handleActionSheetOpen('orderName'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.orderName"
+              disabled
+              disabled-color="#ffffff"
+              placeholder="请选择工单名称"
+              border="none"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 3. 情况描述（文本域） -->
+        <up-form-item
+            label="情况描述"
+            prop="problemDesc"
+            required
+        >
+          <up-textarea
+              placeholder="请输入情况描述（最多200字）"
+              v-model.trim="workOrderForm.problemDesc"
+              count
+              maxlength="200"
+              rows="4"
+              @blur="() => workOrderFormRef.validateField('problemDesc')"
+          ></up-textarea>
+        </up-form-item>
+
+        <!-- 4. 问题照片 -->
+        <up-form-item label="问题照片" prop="problemImgs" required>
+          <up-upload
+              :file-list="problemImgs.imgList.value||[]"
+              @after-read="problemImgs.uploadImgs"
+              @delete="problemImgs.deleteImg"
+              multiple
+              :width="70"
+              :height="70"
+              :max-count="problemImgs.uploadConfig.maxCount"
+              :upload-text="problemImgs.uploadConfig.uploadText"
+              :size-type="problemImgs.uploadConfig.sizeType"
+          ></up-upload>
+        </up-form-item>
+
+      </up-form>
+    </view>
+
+    <!-- 底部提交按钮 -->
+    <view class="fixed-bottom-btn-wrap">
+      <up-button
+          type="primary"
+          text="提交工单"
+          @click="submitWorkOrder"
+      ></up-button>
+    </view>
+
+    <!-- 合并后的通用下拉弹窗 -->
+    <up-action-sheet
+        :show="showActionSheet"
+        :actions="currentActionSheetData.list"
+        :title="currentActionSheetData.title"
+        @close="handleActionSheetClose"
+        @select="handleActionSheetSelect"
+    ></up-action-sheet>
+
+  </view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
+import { useUploadImgs } from '@/common/utils/useUploadImgs'
+import { regionmgrUniversalApproval,  regionmgrWorkorderCreate } from '@/api/work-order-manage/work-order-manage'
+import { timeFormat } from '@/uni_modules/uview-plus'
+import { nextStepMap } from '@/common/utils/common'
+import { useUserStore } from '@/pinia/user';
+
+// ========== 状态管理 ==========
+const userStore = useUserStore();
+
+// ========== 业务线相关状态 ==========
+// 业务线映射表
+const busiLineMap = ref({
+  'yl': '园林',
+  'sz': '市政',
+  'wy': '物业',
+  '园林': 'yl',
+  '市政': 'sz',
+  '物业': 'wy'
+});
+
+// 业务线选项列表
+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'],
+  formRef: workOrderFormRef,
+  fieldName: 'problemImgs'
+})
+
+if (!Array.isArray(problemImgs.rawImgList.value)) {
+  problemImgs.rawImgList.value = [];
+}
+
+// ========== 页面状态 ==========
+const showActionSheet = ref(false)
+const currentActionSheetData = reactive({
+  type: '',
+  list: [],
+  title: ''
+})
+
+// ========== 重新提交相关状态 ==========
+const isRenew = ref(false);
+const renewOrderData = ref(null);
+
+// ========== 下拉列表数据 ==========
+const orderNameList = ref([])
+
+// ========== 工单表单数据 ==========
+const workOrderForm = reactive({
+  orderName: '',
+  problemDesc: '',
+  lat: 0,
+  lon: 0,
+  workLocation: '',
+})
+
+// ========== 表单校验规则 ==========
+const workOrderFormRules = reactive({
+  workLocation: [
+    { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
+  ],
+  orderName: [
+    { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
+  ],
+  problemDesc: [
+    { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
+    { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
+  ],
+  problemImgs: [problemImgs.imgValidateRule]
+})
+
+// ========== 生命周期 ==========
+onLoad((options) => {
+  // 初始化业务线选项
+  formatBusiLineOptions();
+
+  // 判断是否为重新提交状态
+  if (options.isRenew == 1 && options.tempKey) {
+    isRenew.value = true;
+    const tempKey = options.tempKey;
+
+    try {
+      const orderData = uni.getStorageSync(tempKey);
+      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);
+    }
+  }
+});
+
+onReady(() => {
+  if (workOrderFormRef.value) {
+    workOrderFormRef.value.setRules(workOrderFormRules)
+  }
+  console.log('工单表单规则初始化完成')
+})
+
+onShow(() => {
+  // 初始化工单名称列表
+  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
+})
+
+// ========== 核心方法 ==========
+const echoOrderData = (orderItem) => {
+  // 回显基础字段
+  workOrderForm.workLocation = orderItem.lonLatAddress || orderItem.roadName || '';
+  workOrderForm.orderName = orderItem.orderName || '';
+  workOrderForm.problemDesc = orderItem.remark || '';
+  workOrderForm.lat = orderItem.lat || 0;
+  workOrderForm.lon = orderItem.lon || 0;
+
+  // 回显图片
+  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'
+    }));
+    problemImgs.imgList.value = imgList;
+    problemImgs.rawImgList.value = imgList;
+  }
+};
+
+// ========== 通用弹窗方法 ==========
+const handleActionSheetOpen = (type) => {
+  const configMap = {
+    orderName: {
+      title: '请选择工单名称',
+      list: orderNameList.value
+    }
+  }
+
+  currentActionSheetData.type = type
+  currentActionSheetData.title = configMap[type].title
+  currentActionSheetData.list = configMap[type].list
+  showActionSheet.value = true
+}
+
+const handleActionSheetClose = () => {
+  showActionSheet.value = false
+  currentActionSheetData.type = ''
+  currentActionSheetData.list = []
+  currentActionSheetData.title = ''
+}
+
+const handleActionSheetSelect = (e) => {
+  const { type } = currentActionSheetData
+  switch (type) {
+    case 'orderName':
+      workOrderForm.orderName = e.name
+      workOrderFormRef.value?.validateField('orderName')
+      break
+  }
+  showActionSheet.value = false
+}
+
+const navigateBack = () => {
+  uni.reLaunch({
+    url: '/pages-sub/problem/work-order-manage/index',
+    fail: () => {
+      uni.navigateBack({ delta: 2 });
+    }
+  });
+}
+
+// 选择工单位置
+const chooseWorkLocation = () => {
+  uni.chooseLocation({
+    success: async (res) => {
+      workOrderForm.workLocation = res.name
+      workOrderForm.lat = res.latitude
+      workOrderForm.lon = res.longitude
+
+      workOrderFormRef.value?.validateField('workLocation')
+    },
+    fail: (err) => {
+      console.error('选择位置失败：', err)
+      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
+    }
+  })
+}
+
+// 隐藏键盘
+const hideKeyboard = () => {
+  uni.hideKeyboard()
+}
+
+// 提交工单
+const submitWorkOrder = async () => {
+  try {
+    await workOrderFormRef.value.validate()
+
+    const commonSubmitData = {
+      problemsImgs: problemImgs.getSuccessImgUrls(),
+      remark: workOrderForm.problemDesc.trim(),
+      latLonType: 2,
+      lat: workOrderForm.lat,
+      lon: workOrderForm.lon,
+      lonLatAddress: workOrderForm.workLocation,
+      orderName: workOrderForm.orderName,
+      sourceId: 1
+    }
+
+    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: '重新提交工单',
+        ...commonSubmitData
+      }
+      res = await regionmgrUniversalApproval(renewSubmitData)
+    } else {
+      res = await regionmgrWorkorderCreate(commonSubmitData)
+    }
+
+    uni.hideLoading()
+    uni.showToast({
+      title: isRenew.value ? '重新提交成功' : '工单提交成功',
+      icon: 'success',
+      duration: 1000
+    })
+
+    setTimeout(() => {
+      uni.reLaunch({
+        url: '/pages-sub/problem/regional-order-manage/index'
+      })
+    }, 1000)
+  } catch (error) {
+    uni.hideLoading()
+
+    if (!Array.isArray(error)) {
+      console.error(isRenew.value ? '工单重新提交失败：' : '工单提交失败：', error)
+      uni.showToast({
+        title: isRenew.value ? error.msg : error.msg,
+        icon: 'none',
+        duration: 2000
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// 全局页面样式
+.page-container {
+  min-height: 100vh;
+}
+
+// 工单表单内容容器
+.work-order-form-content {
+  background: #fff;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pages-sub/problem/regional-order-manage/index.vue b/pages-sub/problem/regional-order-manage/index.vue
index 35924dd..b779970 100644
--- a/pages-sub/problem/regional-order-manage/index.vue
+++ b/pages-sub/problem/regional-order-manage/index.vue
@@ -178,7 +178,7 @@
 <!--      </up-button>-->
 <!--    </view>-->
 
-    <view class="fixed-bottom-btn-wrap">
+    <view class="fixed-bottom-btn-wrap" v-if="isInspector">
       <up-button type="primary" size="large" @click="handleAddOrder">
         新增工单
       </up-button>
@@ -315,8 +315,11 @@ const paging = ref(null);
 const orderList = ref([]);
 // 角色控制（巡查员显示新增按钮）
 const isInspector = computed(() => {
+  // patrol_global  全域巡查员
+  // regional_manager  大区经理
   // 增加可选链，避免用户信息不存在报错
-  return userStore.userInfo?.roles?.includes('yl_inspector') || false;
+  // return userStore.userInfo?.roles?.includes('yl_inspector') || false;
+  return true
 });
 // 回退弹窗相关
 const rejectModalShow = ref(false); // 回退modal显示开关
@@ -586,9 +589,19 @@ const confirmReject = async () => {
 
 // 新增工单
 const handleAddOrder = () => {
-  uni.navigateTo({
-    url: '/pages-sub/problem/regional-order-manage/add-order'
-  });
+  // patrol_global  全域巡查员
+  // regional_manager  大区经理
+  console.log(userStore.userInfo?.roles.includes('patrol_global'))
+  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/wregional-order-manage/add-order'
+    });
+  }
 };
 
 // 验收弹窗 - 取消按钮（清空状态）
diff --git a/pages-sub/problem/regional-order-manage/order-detail.vue b/pages-sub/problem/regional-order-manage/order-detail.vue
index 8c9f022..4190bee 100644
--- a/pages-sub/problem/regional-order-manage/order-detail.vue
+++ b/pages-sub/problem/regional-order-manage/order-detail.vue
@@ -364,7 +364,8 @@ import {
   getDoneTaskDetail,
   getTodoTaskDetail,
   getApprovalDetail,
-  universalApproval
+  regionmgrUniversalApproval
+
 } from '@/api/work-order-manage/work-order-manage';
 import {nextStepMap, buzStatusMap, calculateFormatTimeDiff} from '@/common/utils/common'
 // 引入图片上传组合式函数
@@ -669,7 +670,7 @@ const confirmReject = async () => {
       "reason": rejectReasonTrim
     };
     // 调用回退工单接口
-    const res = await universalApproval(requestData);
+    const res = await regionmgrUniversalApproval(requestData);
     uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
 
     rejectModalShow.value = false;
@@ -750,7 +751,7 @@ const handleProcess = async (item: any) => {
               "reason": '结束工单'
             };
             // 调用回退工单接口
-            const res = await universalApproval(requestData);
+            const res = await regionmgrUniversalApproval(requestData);
             uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
             // 重新获取工单详情，刷新页面
             await DetailQuery(taskId.value);
@@ -811,7 +812,7 @@ const handleAcceptModalConfirm = async () => {
         "agree": acceptRadioValue.value
       }
     }
-    const acceptRes = await universalApproval(postData);
+    const acceptRes = await regionmgrUniversalApproval(postData);
     // 4. 操作成功处理
 
     handleAcceptModalCancel(); // 清空状态
diff --git a/pages-sub/problem/work-order-manage/add-order.vue b/pages-sub/problem/work-order-manage/add-order.vue
index d4b723d..628bb3d 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -331,7 +331,6 @@ onLoad((options) => {
   }
 
   // 判断是否为重新提交状态
-  console.log('434')
   console.log(options)
   if (options.isRenew == 1 && options.tempKey) {
     isRenew.value = true;
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index 40adf93..c8673f3 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -309,6 +309,9 @@ const orderList = ref([]);
 // 角色控制（巡查员显示新增按钮）
 const isInspector = computed(() => {
   // 增加可选链，避免用户信息不存在报错
+  // patrol_global  全域巡查员
+  // regional_manager  大区经理
+
   return userStore.userInfo?.roles?.includes('yl_inspector') || false;
 });
 // 回退弹窗相关
diff --git a/pages.json b/pages.json
index 8f25f83..050a0dc 100644
--- a/pages.json
+++ b/pages.json
@@ -160,6 +160,11 @@
 				},
 
 				{
+					"path": "regional-order-manage/add-patrol-order",
+					"style": { "navigationBarTitleText": "待派单" }
+				},
+
+				{
 					"path": "regional-order-manage/order-detail",
 					"style": { "navigationBarTitleText": "工单详情" }
 				}
--
libgit2 0.21.4