From 4bd1d49cfdb8e74c20975a706fd46a9787211041 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 10 Feb 2026 11:09:31 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 4fc1e27..e45e4ff 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
@@ -19,7 +19,7 @@
placeholder="请选择"
clearable
@change="handleSearch"
- :disabled="permission.sjyy_shtg"
+
>
<el-option v-for="item in isResolvedOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
@@ -92,6 +92,7 @@
const store = useStore()
const userDepartment = store.state.user.userInfo?.dept_id
const permission = computed(() => store.state.user.permission);
+const userInfo = computed(() => store.state.user.userInfo)
// 初始化查询参数
const initSearchParams = () => ({
title: '', // 标题
@@ -112,10 +113,16 @@
label: 'name',
children: 'children',
}
-const isResolvedOptions = [
- { label: '否', value: '0' },
- { label: '是', value: '1' },
-]
+const isResolvedOptions = computed(() => {
+ if (permission.value.sjyy_shtg && userInfo.value.role_name !== 'administrator') {
+ return [{ label: '是', value: '1' }]
+ } else {
+ return [
+ { label: '否', value: '0' },
+ { label: '是', value: '1' },
+ ]
+ }
+})
provide('deptTree', deptTree)
provide('treeProps', treeProps)
provide('isResolvedOptions', isResolvedOptions)
@@ -126,12 +133,15 @@
try {
// 根据权限设置查询参数
const params = { ...searchParams.value }
- if (permission.value.sjyy_shtg) {
+ if (permission.value.sjyy_shtg && userInfo.value.role_name !== 'administrator') {
params.isQueryAll = true
params.isResolved = '1'
+ console.log('params',params);
+
} else {
params.isQueryAll = false
- delete params.isResolved
+ // delete params.isResolved
+
}
const res = await gdDataEvaluationPageApi(params)
res?.data?.data?.records.forEach(item => {
--
Gitblit v1.9.3