From c64da17be716df2108e0fdf17834a588273f5828 Mon Sep 17 00:00:00 2001
From: 刘淇 <290219706@qq.com>
Date: Fri, 15 May 2026 11:33:18 +0800
Subject: [PATCH] 新的业务线
---
common/utils/common.js | 8 ++++++++
pages-sub/daily/maintain-manage/finish-plan-detail.vue | 2 +-
pages-sub/daily/maintain-manage/record-detail-list.vue | 2 +-
pages-sub/daily/patrol-manage/finish-plan-detail.vue | 4 ++--
pages-sub/daily/quick-order/add-order.vue | 24 ++++++++++++++----------
pages-sub/daily/quick-order/index.vue | 4 ++--
pages-sub/daily/quick-order/order-detail.vue | 4 ++--
pages-sub/problem/ai-manage/index.vue | 2 +-
pages-sub/problem/regional-order-manage/add-order.vue | 10 ++++++----
pages-sub/problem/regional-order-manage/add-patrol-order.vue | 22 +++++++++++++---------
pages-sub/problem/regional-order-manage/distribution-order.vue | 22 +++++++++++++---------
pages-sub/problem/regional-order-manage/index.vue | 2 +-
pages-sub/problem/regional-order-manage/order-detail.vue | 4 ++--
pages-sub/problem/work-order-manage/add-order.vue | 29 ++++++++++++++++-------------
pages-sub/problem/work-order-manage/index.vue | 4 ++--
pages-sub/problem/work-order-manage/order-detail.vue | 4 ++--
pages/workbench/index.vue | 50 +++++++++++++++++++++++++++++++++++++++-----------
17 files changed, 125 insertions(+), 72 deletions(-)
diff --git a/common/utils/common.js b/common/utils/common.js
index 0111653..30e87e0 100644
--- a/common/utils/common.js
+++ b/common/utils/common.js
@@ -247,6 +247,14 @@ export const translateRoles = (roles = []) => {
'wy_worker': '物业养护员',
'Inspector_global': '全域督察员',
'AI_dispatcher': 'AI工单派发人员',
+ 'zxgl_inspector': '秩序管理巡查员',
+ 'zxgl_worker': '秩序管理养护员',
+ 'team_leader_zxgl': '秩序管理组长',
+ 'team_leader_hjws': '环境卫生养护组长',
+ 'hjws_worker': '环境卫生养护员',
+ 'hjws_inspector': '环境卫生巡查员',
+ 'group_approver': '应急抢险集团审批人员',
+ 'rescue_person': '抢险上报人员',
};
// 过滤有效角色 + 翻译 + 中文逗号拼接
return roles
diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
index 098fc82..0bf3ab0 100644
--- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -27,7 +27,7 @@
align="middle"
>
-
+
-
+
-
+
@@ -33,7 +33,7 @@
align="middle"
>
-
+
-
+
@@ -164,11 +164,11 @@
@select="handleRoadNameSelect"
>
-
+
@@ -189,9 +189,13 @@ export default {
'yl': '园林',
'sz': '市政',
'wy': '物业',
+ 'zx': '秩序管理',
+ 'hj': '环境卫生',
'园林': 'yl',
'市政': 'sz',
- '物业': 'wy'
+ '物业': 'wy',
+ '秩序管理': 'zx',
+ '环境卫生': 'hj',
},
busiLineOptions: [], // 业务线选项列表
// 问题照片列表
@@ -210,7 +214,7 @@ export default {
roadId: 0, // 道路ID
roadName: '', // 道路名称
workLocation: '', // 工单位置
- orderName: '', // 工单名称
+ orderName: '', // 问题类型
problemDesc: '', // 情况描述
handleResult: '', // 处理结果描述（不必填）
lat: 0, // 纬度
@@ -228,7 +232,7 @@ export default {
{ type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur'] }
],
orderName: [
- { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
+ { type: 'string', required: true, message: '请选择问题类型', trigger: ['change', 'blur'] }
],
problemDesc: [
{ type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
@@ -275,7 +279,7 @@ export default {
},
onShow() {
this.orderNameList = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'));
- console.log('工单名称列表：', this.orderNameList);
+ console.log('问题类型列表：', this.orderNameList);
},
methods: {
// 初始化业务线选项
@@ -483,7 +487,7 @@ export default {
this.$refs.workOrderFormRef.validateField('roadName');
},
/**
- * 选择工单名称
+ * 选择问题类型
*/
handleOrderNameSelect(e) {
console.log(e);
diff --git a/pages-sub/daily/quick-order/index.vue b/pages-sub/daily/quick-order/index.vue
index b97afe6..d873fbd 100644
--- a/pages-sub/daily/quick-order/index.vue
+++ b/pages-sub/daily/quick-order/index.vue
@@ -117,7 +117,7 @@ import { ref } from 'vue';
import { workorderPage } from "@/api/quick-order/quick-order";
import { timeFormat } from '@/uni_modules/uview-plus';
const selectedSortValue = ref(1);
-// 1 位置 2 工单名称 3 情况描述 4 工单编号
+// 1 位置 2 问题类型 3 情况描述 4 工单编号
const sortOptions = ref([
{name: '位置', id: 1},
{name: '名称', id: 2},
@@ -136,7 +136,7 @@ const queryList = async (pageNo, pageSize) => {
searchContent: searchValue.value.trim() || '',
pageNo: pageNo,
pageSize: pageSize,
- type: selectedSortValue.value // 1 位置 2 工单名称 3 情况描述 4 工单编号
+ type: selectedSortValue.value // 1 位置 2 问题类型 3 情况描述 4 工单编号
};
console.log('请求参数：', apiParams);
const res = await workorderPage(apiParams);
diff --git a/pages-sub/daily/quick-order/order-detail.vue b/pages-sub/daily/quick-order/order-detail.vue
index 7b66ecb..dcf6451 100644
--- a/pages-sub/daily/quick-order/order-detail.vue
+++ b/pages-sub/daily/quick-order/order-detail.vue
@@ -53,9 +53,9 @@
-
+
diff --git a/pages-sub/problem/ai-manage/index.vue b/pages-sub/problem/ai-manage/index.vue
index e9bb73a..6173a24 100644
--- a/pages-sub/problem/ai-manage/index.vue
+++ b/pages-sub/problem/ai-manage/index.vue
@@ -73,7 +73,7 @@
{{ item.lonLatAddress || '-' }}
- 工单名称：
+ 问题类型：
{{ item.orderName || '未填写' }}
diff --git a/pages-sub/problem/regional-order-manage/add-order.vue b/pages-sub/problem/regional-order-manage/add-order.vue
index 82a8594..cb0cae9 100644
--- a/pages-sub/problem/regional-order-manage/add-order.vue
+++ b/pages-sub/problem/regional-order-manage/add-order.vue
@@ -24,9 +24,9 @@
>
-
+
@@ -211,7 +211,9 @@ const CONST = {
// 路由地址
PAGE_ORDER_LIST: '/pages-sub/problem/regional-order-manage/index',
// 业务线映射
- BUSI_LINE_MAP: { yl: '园林', sz: '市政', wy: '物业', '园林': 'yl', '市政': 'sz', '物业': 'wy' },
+ BUSI_LINE_MAP: { yl: '园林', sz: '市政', wy: '物业', '园林': 'yl', '市政': 'sz', '物业': 'wy', 'zx': '秩序管理',
+ 'hj': '环境卫生', '秩序管理': 'zx',
+ '环境卫生': 'hj', },
// 角色标识
ROLE: { MANAGER: 'regional_manager', INSPECTOR: 'Inspector_global', PATROL: 'patrol_global' }
}
diff --git a/pages-sub/problem/regional-order-manage/add-patrol-order.vue b/pages-sub/problem/regional-order-manage/add-patrol-order.vue
index f5bd2ff..1451e51 100644
--- a/pages-sub/problem/regional-order-manage/add-patrol-order.vue
+++ b/pages-sub/problem/regional-order-manage/add-patrol-order.vue
@@ -24,9 +24,9 @@
>
-
+
@@ -114,12 +114,16 @@ const userStore = useUserStore();
// ========== 业务线相关状态 ==========
// 业务线映射表
const busiLineMap = ref({
- 'yl': '园林',
- 'sz': '市政',
- 'wy': '物业',
- '园林': 'yl',
- '市政': 'sz',
- '物业': 'wy'
+ 'yl': '园林',
+ 'sz': '市政',
+ 'wy': '物业',
+ 'zx': '秩序管理',
+ 'hj': '环境卫生',
+ '园林': 'yl',
+ '市政': 'sz',
+ '物业': 'wy',
+ '秩序管理': 'zx',
+ '环境卫生': 'hj',
});
// 业务线选项列表
diff --git a/pages-sub/problem/regional-order-manage/distribution-order.vue b/pages-sub/problem/regional-order-manage/distribution-order.vue
index bdffc4a..41f9088 100644
--- a/pages-sub/problem/regional-order-manage/distribution-order.vue
+++ b/pages-sub/problem/regional-order-manage/distribution-order.vue
@@ -23,9 +23,9 @@
>
-
+
@@ -209,11 +209,15 @@ const userStore = useUserStore();
// 业务线映射表
const busiLineMap = ref({
'yl': '园林',
- 'sz': '市政',
- 'wy': '物业',
- '园林': 'yl',
- '市政': 'sz',
- '物业': 'wy'
+ 'sz': '市政',
+ 'wy': '物业',
+ 'zx': '秩序管理',
+ 'hj': '环境卫生',
+ '园林': 'yl',
+ '市政': 'sz',
+ '物业': 'wy',
+ '秩序管理': 'zx',
+ '环境卫生': 'hj',
});
// 业务线选项列表
@@ -372,7 +376,7 @@ const echoOrderData = (orderItem) => {
workOrderForm.busiLineCn = busiLineMap.value[orderItem.busiLine];
}
- // 回显基础字段【核心：工单位置/工单名称/情况描述 赋值】
+ // 回显基础字段【核心：工单位置/问题类型/情况描述 赋值】
workOrderForm.roadId = orderItem.roadId || 0;
workOrderForm.roadName = orderItem.roadName || '';
workOrderForm.workLocation = orderItem.lonLatAddress || orderItem.roadName || '';
diff --git a/pages-sub/problem/regional-order-manage/index.vue b/pages-sub/problem/regional-order-manage/index.vue
index 299d0a5..cfbfecc 100644
--- a/pages-sub/problem/regional-order-manage/index.vue
+++ b/pages-sub/problem/regional-order-manage/index.vue
@@ -79,7 +79,7 @@
{{ item.lonLatAddress || '-' }}
- 工单名称：
+ 问题类型：
{{ item.orderName || '未填写' }}
diff --git a/pages-sub/problem/regional-order-manage/order-detail.vue b/pages-sub/problem/regional-order-manage/order-detail.vue
index 969168e..bcf6519 100644
--- a/pages-sub/problem/regional-order-manage/order-detail.vue
+++ b/pages-sub/problem/regional-order-manage/order-detail.vue
@@ -42,10 +42,10 @@
-
+
- 工单名称
+ 问题类型
{{ orderDetail.orderName || '--' }}
diff --git a/pages-sub/problem/work-order-manage/add-order.vue b/pages-sub/problem/work-order-manage/add-order.vue
index 82f3659..4a3db84 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -67,9 +67,9 @@
-
+
@@ -212,12 +212,15 @@ const userStore = useUserStore();
// 业务线映射表（键：英文标识，值：中文名称；新增反向映射：中文->英文）
const busiLineMap = ref({
'yl': '园林',
- 'sz': '市政',
- 'wy': '物业',
- // 反向映射：用于通过中文名称（workOrderForm.busiLineCn）获取对应的英文标识
- '园林': 'yl',
- '市政': 'sz',
- '物业': 'wy'
+ 'sz': '市政',
+ 'wy': '物业',
+ 'zx': '秩序管理',
+ 'hj': '环境卫生',
+ '园林': 'yl',
+ '市政': 'sz',
+ '物业': 'wy',
+ '秩序管理': 'zx',
+ '环境卫生': 'hj',
});
// 业务线选项列表（仅保留name字段=中文名称，适配单选框配置）
@@ -308,7 +311,7 @@ const workOrderFormRules = reactive({
{ type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur'] }
],
orderName: [
- { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
+ { type: 'string', required: true, message: '请选择问题类型', trigger: ['change', 'blur'] }
],
pressingTypeName: [
{ type: 'string', required: true, message: '请选择紧急程度', trigger: ['change'] }
@@ -376,9 +379,9 @@ onShow(() => {
console.log(uni.$dict.getDictLabel('ai_image_status', 20))
console.log(uni.$dict.getDictSimpleList('work_name'))
- // 初始化工单名称列表
+ // 初始化问题类型列表
orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
- console.log('工单名称列表：', orderNameList.value)
+ console.log('问题类型列表：', orderNameList.value)
// 初始化紧急程度列表
pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
@@ -496,7 +499,7 @@ const handleActionSheetOpen = (type) => {
list: roadNameList.value
},
orderName: {
- title: '请选择工单名称',
+ title: '请选择问题类型',
list: orderNameList.value
},
pressingType: {
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index b47a6cf..d424777 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -319,7 +319,7 @@ const isInspector = computed(() => {
// patrol_global 全域巡查员
// regional_manager 大区经理
- return userStore.userInfo?.roles?.includes('yl_inspector') || false;
+ return ['yl_inspector', 'zxgl_inspector', 'hjws_inspector'].some(role => userStore.userInfo?.roles?.includes(role)) || false;
});
// 回退弹窗相关
const rejectModalShow = ref(false); // 回退modal显示开关
@@ -358,7 +358,7 @@ const queryList = async (pageNo, pageSize) => {
searchContent: searchValue.value.trim() || '',
pageNo,
pageSize,
- type: selectedSortValue.value // 1-位置 2-工单名称 3-情况描述 4-工单编号
+ type: selectedSortValue.value // 1-位置 2-问题类型 3-情况描述 4-工单编号
};
let res;
// 0-待办 1-已办 2-我发起的任务
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index 61f5c24..20b8825 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -42,10 +42,10 @@
-
+
- 工单名称
+ 问题类型
{{ orderDetail.orderName || '--' }}
diff --git a/pages/workbench/index.vue b/pages/workbench/index.vue
index 191d22a..ece1dad 100644
--- a/pages/workbench/index.vue
+++ b/pages/workbench/index.vue
@@ -9,11 +9,13 @@
>
-
+
你好{{ userInfo?.user?.nickname || '' }}
蓟城山水全域智能运营管理平台
+
+
@@ -22,6 +24,22 @@
mode="permission"
>
+
+
+ 本小程序仅限特定服务人群使用，需验证账号后方可登录
+
+
+ 前往登录
+
+
+