From 0bdbb3fce49bb4e8266a9e5cb4cf6a903e88223d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 08 Apr 2026 19:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 405710e..484bcdc 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>
@@ -31,11 +31,11 @@
</el-form-item>
</el-form>
- <div class="gd-table-toolbar">
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增评价</el-button>
- </div>
-
<div class="gd-table-container" v-loading="loading">
+ <div class="gd-table-toolbar">
+ <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增评价</el-button>
+ </div>
+
<div class="gd-table-content gd-table-content-bg">
<el-table class="gd-table" :data="list">
<el-table-column label="序号" width="80">
@@ -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 = '0'
+ 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