From 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 15:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index da197d7..2955350 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -1,8 +1,8 @@
<template>
<basic-container>
<el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick">
- <el-tab-pane label="全部 " name="all"></el-tab-pane>
- <el-tab-pane label="我的任务工单" name="my"></el-tab-pane>
+ <el-tab-pane :label="`全部（${allTotal}）`" name="all"></el-tab-pane>
+ <el-tab-pane :label="`我的任务工单（${myTotal}）`" name="my"></el-tab-pane>
</el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="工单名称" prop="workOrderName">
@@ -72,31 +72,14 @@
</el-form>
<div class="gd-table-toolbar">
-
- <el-button
- v-if="permission.order_release"
- :icon="Plus"
- color="#4C34FF"
- type="primary"
- @click="openForm('add')"
- >
- 新增
+ <el-button v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
+ 新增工单
</el-button>
-<!-- <el-button
- :icon="Delete"
- color="#4C34FF"
- :disabled="!selectedIds.length"
- @click="handleDelete()"
- v-if="permission.order_delete"
- >
- 删除
- </el-button>-->
</div>
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" v-if="permission.order_delete" />
<el-table-column type="index" width="64" label="序号" />
<el-table-column prop="workOrderName" show-overflow-tooltip label="工单名称" />
<el-table-column prop="workOrderCode" show-overflow-tooltip label="工单编号" />
@@ -107,7 +90,9 @@
</el-table-column>
<el-table-column prop="status" show-overflow-tooltip label="阶段状态">
<template v-slot="{ row }">
- {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus).split('_')[0] }}
+ <span :style="{color: colors?.[row?.workOrderStatus]}">
+ {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus).split('_')[0] }}
+ </span>
</template>
</el-table-column>
<el-table-column prop="workOrderStatus" show-overflow-tooltip label="工单状态">
@@ -127,8 +112,6 @@
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link type="primary" @click="openFormChange(row)">查看</el-link>
- <!--<el-link type="primary" @click="openForm('edit', row)">编辑</el-link>-->
-<!-- <el-link type="primary" @click="handleDelete(row)" v-if="permission.order_delete">删除</el-link>-->
</template>
</el-table-column>
</el-table>
@@ -168,7 +151,6 @@
const activeName = ref('all')
const permission = computed(() => store.state.user.permission)
-console.log(permission.value, 'permission')
// 初始化查询参数
const initSearchParams = () => ({
@@ -183,6 +165,8 @@
const searchParams = ref(initSearchParams()) // 查询参数
const dateRange = ref([]) // 执行时间范围
const total = ref(0) // 总条数
+const allTotal = ref(0) // 全部tab总条数
+const myTotal = ref(0) // 我的任务工单tab总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const selectedIds = ref([]) // 勾选的ID列表
@@ -254,6 +238,20 @@
})
}
+const colors = {
+ 10: '#AE00FF',
+ 11: '#AE00FF',
+ 20: '#002BFF',
+ 21: '#002BFF',
+ 22: '#002BFF',
+ 23: '#002BFF',
+ 30: '#FF5106',
+ 31: '#FF5106',
+ 40: '#FF0000',
+ 50: '#008CFF',
+ 60: '#019612',
+}
+
// 删除
async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
@@ -277,12 +275,32 @@
// 获取字典
function getDictList() {
- getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,patrolTaskType,taskStatus').then(res => {
+ getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,taskStatus').then(res => {
dictObj.value = res.data.data
})
}
+// 获取两个tab的总条数
+async function getTabTotals() {
+ // 获取全部tab的总数
+ const allRes = await gdWorkOrderPageApi({
+ current: 1,
+ size: 1,
+ createUser: '',
+ })
+ allTotal.value = allRes?.data?.data?.total ?? 0
+
+ // 获取我的任务工单tab的总数
+ const myRes = await gdWorkOrderPageApi({
+ current: 1,
+ size: 1,
+ createUser: store.state.user.userInfo.user_id,
+ })
+ myTotal.value = myRes?.data?.data?.total ?? 0
+}
+
onMounted(() => {
+ getTabTotals()
getList()
getDictList()
})
--
Gitblit v1.9.3