From 9b4d718a9ac425b8b043ca845d9a4ba04e30c264 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 28 Jan 2026 14:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue | 4 ++--
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue | 13 ++++++++++---
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue | 4 ++--
uniapps/work-app/src/subPackages/workDetail/index.vue | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
index 5d3f891..3d0a7cf 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
@@ -56,8 +56,8 @@
<el-table-column label="操作" class-name="operation-btns" width="150">
<template v-slot="{ row }">
<el-link type="primary" @click="openForm('view', row)">查看</el-link>
- <el-link type="primary" @click="openForm('edit', row)">编辑</el-link>
- <el-link type="primary" @click="handleDelete(row)">删除</el-link>
+ <el-link type="primary" @click="openForm('edit', row)" v-if="row.isTheSameDepartment">编辑</el-link>
+ <el-link type="primary" @click="handleDelete(row)" v-if="row.isTheSameDepartment">删除</el-link>
</template>
</el-table-column>
</el-table>
@@ -88,7 +88,9 @@
gdDataEvaluationPageApi,
gdDataEvaluationRemoveApi,
} from '@/views/orderView/orderDataManage/evaluate/evaluateApi'
-
+import { useStore } from 'vuex'
+const store = useStore()
+const userDepartment = store.state.user.userInfo?.dept_id
// 初始化查询参数
const initSearchParams = () => ({
title: '', // 标题
@@ -121,7 +123,12 @@
loading.value = true
try {
const res = await gdDataEvaluationPageApi(searchParams.value)
+ res?.data?.data?.records.forEach(item => {
+ item.isTheSameDepartment = String(item.createDept) === String(userDepartment)
+ })
list.value = res?.data?.data?.records ?? []
+ console.log('list',list.value);
+
total.value = res?.data?.data?.total ?? 0
} finally {
loading.value = false
diff --git a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
index 5a8c4fc..d54e7a0 100644
--- a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="12">
<div class="label">区划级别</div>
- <div class="val"> {{ getDictLabel(formData.regionLevel, dictObj.divisionLevel) }}</div>
+ <div class="val"> {{ getDictLabel(formData.regionLevel, dictObj.regionLevel) }}</div>
</el-col>
<el-col :span="12">
<div class="label">区划排序</div>
@@ -86,7 +86,7 @@
placeholder="请选择"
clearable
>
- <el-option v-for="item in dictObj.divisionLevel" :key="item.dictKey"
+ <el-option v-for="item in dictObj.regionLevel" :key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey" />
</el-select>
diff --git a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue
index 3b33484..bdcccd5 100644
--- a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue
@@ -56,7 +56,7 @@
<el-table-column prop="parentName" show-overflow-tooltip label="上级区划名称" />
<el-table-column prop="regionLevel" show-overflow-tooltip label="区划级别">
<template v-slot="{ row }">
- {{ getDictLabel(row.regionLevel, dictObj.divisionLevel) }}
+ {{ getDictLabel(row.regionLevel, dictObj.regionLevel) }}
</template>
</el-table-column>
<el-table-column prop="sort" show-overflow-tooltip label="排序" />
@@ -177,7 +177,7 @@
// 获取字典列表
function getDictList() {
- return getDictionaryByCode('zoningStatus,divisionLevel').then(res => {
+ return getDictionaryByCode('zoningStatus,regionLevel').then(res => {
dictObj.value = res.data.data
})
}
diff --git a/uniapps/work-app/src/subPackages/workDetail/index.vue b/uniapps/work-app/src/subPackages/workDetail/index.vue
index e7dc9dc..71ed67e 100644
--- a/uniapps/work-app/src/subPackages/workDetail/index.vue
+++ b/uniapps/work-app/src/subPackages/workDetail/index.vue
@@ -30,7 +30,7 @@
<div class="workOrderContainer">
<div class="orderRow">
<div class="rowTitle">工单编号</div>
- <div>{{ workDetailData.eventCode }}</div>
+ <div>{{ workDetailData.eventNum }}</div>
</div>
<div class="orderRow">
<div class="rowTitle">工单处置人</div>
--
Gitblit v1.9.3