养护任务

刘淇
1 parent 1d3624b0
Showing 6 changed files with 202 additions and 420 deletions
common/config/env.js
pages-sub/daily/quick-order/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/work-order-manage/add-order.vue
pages/index/index.vue
@@ -2,10 +2,10 @@
 const env = {
   // 开发环境
   development: {
-    baseUrl: 'https://test.jichengshanshui.com.cn:28302',
+    // baseUrl: 'https://test.jichengshanshui.com.cn:28302',
     // https://test.jichengshanshui.com.cn:28302
  
-    // baseUrl: 'http://192.168.1.186:48081',
+    baseUrl: 'http://192.168.1.111:48081',
  
     uploadUrl: 'https://test.jichengshanshui.com.cn:28302',
     // baseApi:'admin-api',
@@ -191,11 +191,13 @@ export default {
         'wy': '物业',
         'zx': '秩序管理',
         'hj': '环境卫生',
+        'yw': '常规运维',
         '园林': 'yl',
         '市政': 'sz',
         '物业': 'wy',
         '秩序管理': 'zx',
         '环境卫生': 'hj',
+        '常规运维' : 'yw'
       },
       busiLineOptions: [], // 业务线选项列表
       // 问题照片列表
 <template>
   <view class="page-container">
     <view class="work-order-form-content commonPageLRpadding">
-      <up-form
-          label-position="left"
-          :model="workOrderForm"
-          ref="workOrderFormRef"
-          labelWidth="200rpx"
-      >
+      <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 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>
+        <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 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-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>
@@ -80,21 +38,13 @@
  
     <!-- 底部提交按钮 -->
     <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>
  
     <!-- 合并后的通用下拉弹窗 -->
-    <up-action-sheet
-        :show="showActionSheet"
-        :actions="currentActionSheetData.list"
-        :title="currentActionSheetData.title"
-        @close="handleActionSheetClose"
-        @select="handleActionSheetSelect"
-    ></up-action-sheet>
+    <up-action-sheet :show="showActionSheet" :actions="currentActionSheetData.list"
+      :title="currentActionSheetData.title" @close="handleActionSheetClose"
+      @select="handleActionSheetSelect"></up-action-sheet>
  
   </view>
 </template>
@@ -103,7 +53,7 @@
 import { ref, reactive } from 'vue'
 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 { qyUniversalApproval, qyWorkorderCreate } 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';
@@ -114,16 +64,18 @@ const userStore = useUserStore();
 // ========== 业务线相关状态 ==========
 // 业务线映射表
 const busiLineMap = ref({
-   'yl': '园林',
-        'sz': '市政',
-        'wy': '物业',
-        'zx': '秩序管理',
-        'hj': '环境卫生',
-        '园林': 'yl',
-        '市政': 'sz',
-        '物业': 'wy',
-        '秩序管理': 'zx',
-        '环境卫生': 'hj',
+  'yl': '园林',
+  'sz': '市政',
+  'wy': '物业',
+  'zx': '秩序管理',
+  'hj': '环境卫生',
+  'yw': '常规运维',
+  '园林': 'yl',
+  '市政': 'sz',
+  '物业': 'wy',
+  '秩序管理': 'zx',
+  '环境卫生': 'hj',
+  '常规运维': 'yw'
 });
  
 // 业务线选项列表
@@ -360,7 +312,7 @@ const submitWorkOrder = async () =&gt; {
         taskId: renewOrderData.value.taskId,
         operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
         agree: 0,
-        reason:  workOrderForm.problemDesc.trim(),
+        reason: workOrderForm.problemDesc.trim(),
         ...commonSubmitData
       }
       if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
@@ -407,6 +359,4 @@ const submitWorkOrder = async () =&gt; {
 .work-order-form-content {
   background: #fff;
 }
-
-
 </style>
 \ No newline at end of file
 <template>
   <view class="page-container">
     <view class="work-order-form-content commonPageLRpadding">
-      <up-form
-          label-position="left"
-          :model="workOrderForm"
-          ref="workOrderFormRef"
-          labelWidth="200rpx"
-      >
+      <up-form label-position="left" :model="workOrderForm" ref="workOrderFormRef" labelWidth="200rpx">
         <!-- 1. 工单位置（地图选择）【赋值回显 + 完全禁止修改】 -->
-        <up-form-item
-            label="工单位置"
-            prop="workLocation"
-            border-bottom
-            required
-        >
-          <up-input
-              v-model="workOrderForm.workLocation"
-              border="none"
-              disabled
-
-              placeholder="暂无工单位置"
-          ></up-input>
+        <up-form-item label="工单位置" prop="workLocation" border-bottom required>
+          <up-input v-model="workOrderForm.workLocation" border="none" disabled placeholder="暂无工单位置"></up-input>
         </up-form-item>
  
         <!-- 2. 问题类型（下拉框）【赋值回显 + 完全禁止修改】 -->
-        <up-form-item
-            label="问题类型"
-            prop="orderName"
-            border-bottom
-            required
-        >
-          <up-input
-              v-model="workOrderForm.orderName"
-              disabled
-
-              placeholder="暂无问题类型"
-              border="none"
-          ></up-input>
+        <up-form-item label="问题类型" prop="orderName" border-bottom required>
+          <up-input v-model="workOrderForm.orderName" disabled placeholder="暂无问题类型" border="none"></up-input>
         </up-form-item>
  
         <!-- 3. 情况描述（文本域）【赋值回显 + 完全禁止修改】 -->
-        <up-form-item
-            label="情况描述"
-            prop="problemDesc"
-            required
-        >
-          <up-textarea
-              v-model.trim="workOrderForm.problemDesc"
-              count
-              maxlength="200"
-              rows="4"
-              disabled
-              disabled-color="#333333"
-              placeholder="暂无情况描述"
-          ></up-textarea>
+        <up-form-item label="情况描述" prop="problemDesc" required>
+          <up-textarea v-model.trim="workOrderForm.problemDesc" count maxlength="200" rows="4" disabled
+            disabled-color="#333333" placeholder="暂无情况描述"></up-textarea>
         </up-form-item>
  
         <!-- 4. 问题照片【赋值回显 + 完全禁止修改/删除/新增】 -->
         <up-form-item label="问题照片" prop="problemImgs" required>
-          <up-upload
-              :file-list="problemImgs.imgList.value||[]"
-              disabled
-              multiple
-              :width="70"
-              :height="70"
-              :max-count="problemImgs.uploadConfig.maxCount"
-              :upload-text="problemImgs.uploadConfig.uploadText"
-              :size-type="problemImgs.uploadConfig.sizeType"
-          ></up-upload>
+          <up-upload :file-list="problemImgs.imgList.value || []" disabled 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>
  
         <!-- 派单情况分组（放在问题照片下方，增加间距） -->
@@ -75,61 +30,28 @@
           <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-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>
+          <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>
+              <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>
+          <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>
@@ -137,24 +59,11 @@
         </view>
  
         <!-- 5. 完成时间 -->
-        <up-form-item
-            label="希望完成时间"
-            prop="expectedFinishDate"
-            @click="show=true;hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.expectedFinishDate"
-              border="none"
-              readonly
-              placeholder="点击选择时间"
-          ></up-input>
+        <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>
+              <up-icon name="close" size="16" @click.stop="clearExpectedFinishDate"></up-icon>
             </view>
             <up-icon name="arrow-right" size="16" v-else></up-icon>
           </template>
@@ -164,31 +73,17 @@
  
     <!-- 底部提交按钮 -->
     <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>
  
     <!-- 合并后的通用下拉弹窗 -->
-    <up-action-sheet
-        :show="showActionSheet"
-        :actions="currentActionSheetData.list"
-        :title="currentActionSheetData.title"
-        @close="handleActionSheetClose"
-        @select="handleActionSheetSelect"
-    ></up-action-sheet>
+    <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>
+    <up-datetime-picker :show="show" v-model="expectedFinishDate" mode="datetime" :min-date="new Date()"
+      @cancel="show = false" @confirm="expectedFinishDateConfirm"></up-datetime-picker>
   </view>
 </template>
  
@@ -197,7 +92,7 @@ import { ref, reactive } from &#39;vue&#39;
 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'
+import { daquUniversalApproval, daquWorkorderCreate, qyUniversalApproval } 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';
@@ -209,15 +104,17 @@ const userStore = useUserStore();
 // 业务线映射表
 const busiLineMap = ref({
   'yl': '园林',
-        'sz': '市政',
-        'wy': '物业',
-        'zx': '秩序管理',
-        'hj': '环境卫生',
-        '园林': 'yl',
-        '市政': 'sz',
-        '物业': 'wy',
-        '秩序管理': 'zx',
-        '环境卫生': 'hj',
+  'sz': '市政',
+  'wy': '物业',
+  'zx': '秩序管理',
+  'hj': '环境卫生',
+  'yw': '常规运维',
+  '园林': 'yl',
+  '市政': 'sz',
+  '物业': 'wy',
+  '秩序管理': 'zx',
+  '环境卫生': 'hj',
+  '常规运维': 'yw'
 });
  
 // 业务线选项列表
@@ -386,7 +283,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) {
@@ -518,12 +415,12 @@ const navigateBack = () =&gt; {
 }
  
 // 清除希望完成时间
-const clearExpectedFinishDate = ()=> {
+const clearExpectedFinishDate = () => {
   workOrderForm.expectedFinishDate = ''
 }
  
 // 【注释无用方法：原选择工单位置方法，因为禁止修改，不需要点击触发】
-const chooseWorkLocation = () => {}
+const chooseWorkLocation = () => { }
  
 // 完成时间确认
 const expectedFinishDateConfirm = (e) => {
@@ -558,7 +455,7 @@ const submitWorkOrder = async () =&gt; {
       lonLatAddress: workOrderForm.workLocation,
       pressingType: workOrderForm.pressingType,
       orderName: workOrderForm.orderName,
-      expectedFinishDate: workOrderForm.expectedFinishDate==""?"":new Date(workOrderForm.expectedFinishDate).getTime(),
+      expectedFinishDate: workOrderForm.expectedFinishDate == "" ? "" : new Date(workOrderForm.expectedFinishDate).getTime(),
       sourceId: 1,
       sourceName: workOrderForm.busiLineCn,
       busiLine: busiLineEn,
@@ -568,7 +465,7 @@ const submitWorkOrder = async () =&gt; {
       taskId: renewOrderData.value.taskId,
       operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypePass || '',
       agree: 0,
-      reason:  workOrderForm.problemDesc.trim(),
+      reason: workOrderForm.problemDesc.trim(),
     }
  
     uni.showLoading({ title: '提交中...' })
@@ -581,7 +478,7 @@ const submitWorkOrder = async () =&gt; {
         taskId: renewOrderData.value.taskId,
         operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
         agree: 0,
-        reason:  workOrderForm.problemDesc.trim(),
+        reason: workOrderForm.problemDesc.trim(),
         ...commonSubmitData
       }
       res = await qyUniversalApproval(renewSubmitData)
@@ -637,7 +534,7 @@ const submitWorkOrder = async () =&gt; {
 .dispatch-title {
   font-size: 32rpx;
   font-weight: 600;
-  color:$u-primary;
+  color: $u-primary;
   margin-bottom: 20rpx;
   padding-left: 10rpx;
 }
 <template>
   <view class="page-container">
     <view class="work-order-form-content commonPageLRpadding">
-      <up-form
-          label-position="left"
-          :model="workOrderForm"
-          ref="workOrderFormRef"
-          labelWidth="200rpx"
-      >
+      <up-form label-position="left" :model="workOrderForm" ref="workOrderFormRef" labelWidth="200rpx">
         <!-- 业务线单选框：移入form内，作为第一个表单项（核心调整） -->
-        <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 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>
  
         <!-- 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 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="roadName"
-            border-bottom
-            required
-            @click="handleActionSheetOpen('roadName'); hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.roadName"
-              readonly
-              disabled-color="#ffffff"
-              placeholder="请先选择工单位置"
-              border="none"
-          ></up-input>
+        <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>
+            <up-icon name="arrow-right" size="16"></up-icon>
           </template>
         </up-form-item>
  
         <!-- 3. 问题类型（下拉框） -->
-        <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>
+        <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>
  
         <!-- 新增：紧急程度选择 -->
-        <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>
+        <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>
  
         <!-- 4. 情况描述（文本域） -->
-        <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 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>
  
         <!-- 问题照片（核心修复：绑定纯数组） -->
         <up-form-item label="问题照片" prop="problemImgs" border-bottom 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-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-item
-            label="希望完成时间"
-            prop="expectedFinishDate"
-            @click="show=true;hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.expectedFinishDate"
-              border="none"
-              readonly
-              placeholder="点击选择时间"
-          ></up-input>
+        <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包裹图标，添加双重@click.stop -->
             <view v-if="workOrderForm.expectedFinishDate" @click.stop>
-              <up-icon
-                  name="close"
-                  size="20"
-                  @click.stop="clearExpectedFinishDate"
-              ></up-icon>
+              <up-icon name="close" size="20" @click.stop="clearExpectedFinishDate"></up-icon>
             </view>
             <up-icon name="arrow-right" size="16" v-else></up-icon>
           </template>
@@ -167,31 +77,17 @@
  
     <!-- 底部提交按钮 -->
     <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>
  
     <!-- 合并后的通用下拉弹窗 -->
-    <up-action-sheet
-        :show="showActionSheet"
-        :actions="currentActionSheetData.list"
-        :title="currentActionSheetData.title"
-        @close="handleActionSheetClose"
-        @select="handleActionSheetSelect"
-    ></up-action-sheet>
+    <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>
+    <up-datetime-picker :show="show" v-model="expectedFinishDate" mode="datetime" :min-date="new Date()"
+      @cancel="show = false" @confirm="expectedFinishDateConfirm"></up-datetime-picker>
   </view>
 </template>
  
@@ -212,15 +108,17 @@ const userStore = useUserStore();
 // 业务线映射表（键：英文标识，值：中文名称；新增反向映射：中文->英文）
 const busiLineMap = ref({
   'yl': '园林',
-        'sz': '市政',
-        'wy': '物业',
-        'zx': '秩序管理',
-        'hj': '环境卫生',
-        '园林': 'yl',
-        '市政': 'sz',
-        '物业': 'wy',
-        '秩序管理': 'zx',
-        '环境卫生': 'hj',
+  'sz': '市政',
+  'wy': '物业',
+  'zx': '秩序管理',
+  'hj': '环境卫生',
+  'yw': '常规运维',
+  '园林': 'yl',
+  '市政': 'sz',
+  '物业': 'wy',
+  '秩序管理': 'zx',
+  '环境卫生': 'hj',
+  '常规运维': 'yw'
 });
  
 // 业务线选项列表（仅保留name字段=中文名称，适配单选框配置）
@@ -405,7 +303,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') : '';
  
   // 3. 上传图片回显（兼容useUploadImgs格式）
   if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
@@ -566,7 +464,7 @@ const navigateBack = () =&gt; {
 }
  
 // 新增：清除希望完成时间的方法
-const clearExpectedFinishDate = ()=> {
+const clearExpectedFinishDate = () => {
   workOrderForm.expectedFinishDate = ''
   // 清除后触发一次字段校验，确保校验状态更新
   // this.$refs.inspectFormRef.validateField('expectedFinishDate')
@@ -629,7 +527,7 @@ const submitWorkOrder = async () =&gt; {
       uni.showToast({ title: '业务线选择异常，请重新选择', icon: 'none' });
       return;
     }
-    console.log('完成时间：'+workOrderForm.expectedFinishDate)
+    console.log('完成时间：' + workOrderForm.expectedFinishDate)
     // 构建公共提交数据
     const commonSubmitData = {
       roadId: workOrderForm.roadId,
@@ -642,13 +540,13 @@ const submitWorkOrder = async () =&gt; {
       lonLatAddress: workOrderForm.workLocation,
       pressingType: workOrderForm.pressingType,
       orderName: workOrderForm.orderName,
-      expectedFinishDate:workOrderForm.expectedFinishDate=="" ?"": new Date(workOrderForm.expectedFinishDate).getTime(),
+      expectedFinishDate: workOrderForm.expectedFinishDate == "" ? "" : new Date(workOrderForm.expectedFinishDate).getTime(),
       sourceId: 1,
       sourceName: workOrderForm.busiLineCn, // 从form字段获取业务线中文名称
       busiLine: busiLineEn // 传递英文标识（yl/sz/wy），接口正常使用
     }
     console.log('工单数据')
-    console.log('完成时间：'+workOrderForm.expectedFinishDate)
+    console.log('完成时间：' + workOrderForm.expectedFinishDate)
     console.log(commonSubmitData)
     // 显示加载中
     uni.showLoading({ title: '提交中...' })
@@ -717,5 +615,4 @@ const submitWorkOrder = async () =&gt; {
 .work-order-form-content {
   background: #fff;
 }
-
 </style>
 \ No newline at end of file
@@ -56,9 +56,9 @@
  
  
         <!-- 动态组信息文案 -->
-        <view class="tip-top" style="padding: 8px 0  0 70px;">
+        <!-- <view class="tip-top" style="padding: 8px 0  0 70px;">
           <text>{{ tipText }}</text>
-        </view>
+        </view> -->
  
         <!-- 顶部进度提示栏 -->
         <view v-if="showTipHeader" class="tip-header">
@@ -97,7 +97,7 @@
                 <template v-else>
                   <text>{{ item.distance }}m ·</text>
                   <up-icon name="star-fill" color="#ffd21d" size="20"></up-icon>
-                  <text>历史完成率{{ item.efficiencyPercent }}%</text>
+                  <text>历史完成率{{ item.historyCompletionRate }}%</text>
                 </template>
               </view>
             </view>
@@ -124,28 +124,58 @@ import {
 const userStore = useUserStore();
 const deptId = computed(() => String(userStore.userInfo?.user?.deptId ?? ''));
  
-// ====================== 只需要在这里统一维护分组配置 ======================
+// ====================== 分组配置（多部门归属同一组） ======================
 type GroupItem = {
-  deptId: string;
+  deptIds: string[]; // 多个部门ID数组
   label: string;
   showTipHeader: boolean; // 是否展示顶部进度条
   useWalkText: boolean;   // 是否展示步行距离文案
 };
 const groupConfig: GroupItem[] = [
-  { deptId: '364', label: '[组2  A1B2 纯效率·有提醒]', showTipHeader: true, useWalkText: true },
-  { deptId: '337', label: '[组3  A2B1 个性化·无提醒]', showTipHeader: false, useWalkText: false },
-  { deptId: '338', label: '[组4  A2B2 个性化·有提醒]', showTipHeader: true, useWalkText: false },
+  // 组2 A1B2 纯效率·有提醒
+  {
+    deptIds: ['361', '363', '279', '277', '270'],
+    label: '[组2  A1B2 纯效率·有提醒]',
+    showTipHeader: true,
+    useWalkText: true
+  },
+  // 组3 A2B1 个性化·无提醒
+  {
+    deptIds: ['252', '273', '274', '337', '359', '360'],
+    label: '[组3  A2B1 个性化·无提醒]',
+    showTipHeader: false,
+    useWalkText: false
+  },
+  // 组4 A2B2 个性化·有提醒
+  {
+    deptIds: ['281', '272', '271', '338', '280'],
+    label: '[组4  A2B2 个性化·有提醒]',
+    showTipHeader: true,
+    useWalkText: false
+  },
 ];
-// 默认组1配置
-const defaultGroup: GroupItem = { deptId: '', label: '[组1  A1B1 纯效率·无提醒]', showTipHeader: false, useWalkText: true };
+// 默认组1：未匹配到的所有部门
+const defaultGroup: GroupItem = {
+  deptIds: [],
+  label: '[组1  A1B1 纯效率·无提醒]',
+  showTipHeader: false,
+  useWalkText: true
+};
  
-// 获取当前部门配置对象
+// 获取当前部门所属分组
 const currentGroup = computed(() => {
-  const target = groupConfig.find(item => item.deptId === deptId.value);
-  return target ?? defaultGroup;
+  const targetDept = deptId.value;
+  // 遍历匹配部门ID
+  for (const group of groupConfig) {
+    if (group.deptIds.includes(targetDept)) {
+      return group;
+    }
+  }
+  // 无匹配返回默认组1
+  return defaultGroup;
 });
  
-// 下面全部自动读取配置，无需写if/switch
+// 自动读取分组配置，无需修改其他业务代码
 const tipText = computed(() => currentGroup.value.label);
 const showTipHeader = computed(() => currentGroup.value.showTipHeader);
 const isWalkTextMode = computed(() => currentGroup.value.useWalkText);
@@ -308,6 +338,8 @@ const getCurrentLocation = (): Promise&lt;{ lon: string; lat: string }&gt; =&gt; {
               uni.getLocation({
                 type: 'gcj02',
                 success: (loc) => {
+                  console.log(loc.longitude)
+                   console.log(loc.latitude)
                   resolve({
                     lon: loc.longitude.toFixed(6),
                     lat: loc.latitude.toFixed(6)
@@ -337,6 +369,8 @@ const getCurrentLocation = (): Promise&lt;{ lon: string; lat: string }&gt; =&gt; {
           uni.getLocation({
             type: 'gcj02',
             success: (loc) => {
+               console.log(loc.longitude)
+                   console.log(loc.latitude)
               resolve({
                 lon: loc.longitude.toFixed(6),
                 lat: loc.latitude.toFixed(6)
@@ -694,14 +728,16 @@ $border-color: #e5e5e5;
   .task-item__name {
     width: 60px;
   }
-  .task-name-text {
-    flex: 1;
-    font-size: 14px;
-    color: $text-color;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
+ .task-name-text {
+  flex: 1;
+  font-size: 14px;
+  color: $text-color;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
   &__name {
     font-size: 15px;
     color: $text-color;