From 2cb7fb5ed332bc92e8164da8cc8754d32c8adcd9 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 27 Nov 2025 09:38:34 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.4' into test
---
src/views/tickets/ticket.vue | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 344db58..7f4703a 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -131,7 +131,7 @@
>
批量审核
</el-button>
-
+
<el-button
v-if="permissionList.exportBtn"
type="success"
@@ -149,7 +149,7 @@
class="ztzf-public-general-el-table custom-header"
ref="elTable"
:data="tableData"
- v-loading="loading"
+ v-loading="loading"
@selection-change="handleSelectionChange"
border
style="width: 100%"
@@ -171,40 +171,40 @@
</el-tooltip-copy>
</template>
</el-table-column>
-
+
<el-table-column prop="department" label="所属部门" show-overflow-tooltip />
-
+
<el-table-column prop="startTime" label="发起任务时间" width="160" show-overflow-tooltip />
-
+
<el-table-column prop="aiType" label="关联算法" show-overflow-tooltip />
-
+
<el-table-column prop="type" label="工单类型" width="110" show-overflow-tooltip>
<template #default="{ row }">
{{ getTypeLabel(row.type) }}
</template>
</el-table-column>
-
+
<el-table-column prop="content" label="工单内容" width="132" show-overflow-tooltip>
<template #default="{ row }">
{{ row.address || row.content }}
</template>
</el-table-column>
-
+
<el-table-column prop="creator" label="创建人" width="120" show-overflow-tooltip />
-
+
<el-table-column prop="handler" label="处理人" width="120" show-overflow-tooltip />
-
- <el-table-column
- v-if="['all', 'completed', 'myTickets'].includes(activeTab)"
- label="复核状态"
- prop="isReview"
+
+ <el-table-column
+ v-if="['all', 'completed', 'myTickets'].includes(activeTab)"
+ label="复核状态"
+ prop="isReview"
width="90"
>
<template #default="{ row }">
<span>{{ showIsReviewText(row) }}</span>
</template>
</el-table-column>
-
+
<el-table-column label="工单状态" prop="status" width="90">
<template #default="{ row }">
<span :style="getStatusTagType(row.status) ? 'color:' + getStatusTagType(row.status) : ''">
@@ -212,7 +212,7 @@
</span>
</template>
</el-table-column>
-
+
<!-- 操作列 -->
<el-table-column label="操作" width="200" align="center">
<template #default="{ row }">
@@ -222,15 +222,15 @@
删除
</el-button>
</template>
-
+
<template v-else>
<el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
</template>
-
+
<template v-if="row.status === 4 && !isProd">
<el-button type="text" icon="el-icon-download" @click="exportTheTick(row)">导出</el-button>
</template>
-
+
<template v-if="permission.tickets_repeat_review">
<el-button
v-if="row.status === 4 && row.isReview !== 1"
@@ -510,7 +510,7 @@
const checkedKeys = ref([])
const inputMapShowDefaultCenter = ref(null)
const userInfo = computed(() => store.state.user.userInfo)
-const permission = computed(() => store.state.user.permission);
+const permission = computed(() => store.state.user.permission);
// 计算属性
const firstRowData = computed(() => {
@@ -521,7 +521,7 @@
const tabPending = permission.value?.tickets_tab_pending === true//待审核
const tabMyTickets = permission.value?.tickets_tab_mytickets === true //我的工单
const tabALL = permission.value?.tickets_allWorkOrders === true //全部工单
- const tabInProgress= permission.value?.tickets_inProgress === true //处理中
+ const tabInProgress= permission.value?.tickets_inProgress === true //处理中
const tabProcessing= permission.value?.tickets_pending === true //待处理
const tabCompleted= permission.value?.tickets_wasDone === true //已完成
return tabs.value
@@ -558,7 +558,7 @@
const defaultActiveTab = computed(() => {
const hasAllTab = filteredTabs.value.some(tab => tab.name === 'all')
const hasPendingTab = filteredTabs.value.some(tab => tab.name === 'pending')
-
+
// 如果没有全部工单权限，但有待审核权限，则默认显示待审核
if (!hasAllTab && hasPendingTab) {
return 'pending'
@@ -710,7 +710,7 @@
}
})
dataList.value = filteredData
-
+
}
})
}
@@ -825,7 +825,7 @@
})) || []
algorithms2.value = _.cloneDeep(algorithms.value)
-
+
userNameToIdMap.value = {}
dept_data.forEach(dept => {
(dept.user_data || []).forEach(user => {
@@ -864,7 +864,7 @@
function mapStatus(status) {
const statusTextMap = {
-
+
2: '待审核',
0: '待处理',
3: '处理中',
@@ -890,8 +890,8 @@
}
try {
const response = await getstatusCount(params)
- const statusCount = response.data.data || {}
- const totalCount = Object.values(statusCount).reduce((sum, count) => sum + (count || 0), 0)
+ const statusCount = response.data.data || {}
+ const totalCount = Object.values(statusCount).reduce((sum, count) => sum + (count || 0), 0)
tabs.value.forEach(tab => {
if (tab.name === 'all') {
tab.count = totalCount
@@ -1000,7 +1000,7 @@
await getStepInfoData(row.orderNumber)
currentDetail.value.status = row.status
-
+
currentDetail.value = {
...detailData,
showQR: false,
@@ -1436,7 +1436,7 @@
}
})
}
-
+
if (tab) {
const isTabValid = filteredTabs.value.some(t => t.name === tab)
if (isTabValid) {
@@ -1483,7 +1483,7 @@
right: 0;
padding: 0 30px;
- z-index: 1000;
+ z-index: 1000;
}
:deep(.custom-header th.el-table__cell) {
color: rgba(0, 0, 0, 0.85);
@@ -1518,13 +1518,13 @@
:deep(.el-table__header-wrapper) {
background-color: #f5f7fa;
}
-
+
:deep(.el-table th) {
background-color: #f5f7fa;
color: #606266;
font-weight: 600;
}
-
+
:deep(.el-table--border) {
border: 1px solid #ebeef5;
}
--
Gitblit v1.9.3