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/orderManage/orderManage/index.vue | 172 +++++++++++++++++++++++++++------------------------------
1 files changed, 82 insertions(+), 90 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 50f0e85..f9cfff9 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,68 +1,35 @@
<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">
- <el-input
- class="gd-input"
- v-model="searchParams.workOrderName"
- placeholder="请输入"
- clearable
- @clear="handleSearch"
- />
+ <el-input class="gd-input gray" v-model="searchParams.workOrderName" placeholder="请输入" clearable
+ @clear="handleSearch" />
</el-form-item>
<el-form-item label="工单类型" prop="workOrderType">
- <el-select
- class="gd-select"
- popper-class="gd-select-popper"
- v-model="searchParams.workOrderType"
- placeholder="请选择"
- clearable
- @change="handleSearch"
- >
- <el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.workOrderType"
+ placeholder="请选择" clearable @change="handleSearch">
+ <el-option v-for="item in dictObj.workOrderType" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="工单状态" prop="workOrderStatus">
- <el-select
- class="gd-select"
- popper-class="gd-select-popper"
- v-model="searchParams.workOrderStatus"
- placeholder="请选择"
- clearable
- @change="handleSearch"
- >
- <el-option
- v-for="item in dictObj.workOrderStatus"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.workOrderStatus"
+ placeholder="请选择" clearable @change="handleSearch">
+ <el-option v-for="item in dictObj.workOrderStatus" :key="item.dictKey"
+ :label="item.dictValue.split('_')[1]" :value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="执行时间" prop="executeTime">
- <el-date-picker
- class="gd-date-picker"
- popper-class="gd-date-picker-popper"
- v-model="dateRange"
- type="daterange"
- range-separator="-"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- value-format="YYYY-MM-DD HH:mm:ss"
- @change="handleSearch"
- />
+ <el-date-picker class="gd-date-picker gray" popper-class="gd-date-picker-popper" v-model="dateRange"
+ type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+ value-format="YYYY-MM-DD HH:mm:ss" @change="handleSearch" />
</el-form-item>
<el-form-item class="gd-search-actions">
@@ -71,18 +38,16 @@
</el-form-item>
</el-form>
- <div class="gd-table-toolbar">
-<!-- <el-button color="#F2F3F5" @click="requester = !requester">我是{{ requester ? '需求方' : '服务方' }}</el-button>-->
-<!-- <el-button color="#F2F3F5" @click="previewVisible = true">预览</el-button>-->
-
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')" v-if="requester">新增</el-button>
- <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()" v-if="requester">删除</el-button>
- </div>
-
<div class="gd-table-container" v-loading="loading">
+ <div class="gd-table-toolbar">
+ <el-button v-if="permission.order_release" :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" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" />
<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="工单编号" />
@@ -93,7 +58,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="工单状态">
@@ -107,32 +74,25 @@
{{ dayjs(row.executeEndTime).format('YYYY-MM-DD') }}
</template>
</el-table-column>
- <el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
<el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
+ <el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
<el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
- <el-link @click="openFormChange(row)">查看</el-link>
- <!--<el-link @click="openForm('edit', row)">编辑</el-link>-->
- <el-link @click="handleDelete(row)" v-if="requester">删除</el-link>
+ <el-link type="primary" @click="openFormChange(row)">查看</el-link>
</template>
</el-table-column>
</el-table>
</div>
<div class="gd-pagination-parent">
- <el-pagination
- popper-class="gd-select-popper"
- v-model:current-page="searchParams.current"
- v-model:page-size="searchParams.size"
- layout="total, prev, pager, next, sizes"
- :total="total"
- @change="getList"
- />
+ <el-pagination popper-class="gd-select-popper" v-model:current-page="searchParams.current"
+ v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
+ @change="getList" />
</div>
</div>
- <PreviewFiles v-model="previewVisible" :src="testDock" type="docx"/>
+ <PreviewFiles v-model="previewVisible" :src="testDock" type="docx" />
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
</basic-container>
</template>
@@ -151,8 +111,9 @@
import { useStore } from 'vuex'
const store = useStore()
-const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
const activeName = ref('all')
+
+const permission = computed(() => store.state.user.permission)
// 初始化查询参数
const initSearchParams = () => ({
@@ -164,10 +125,11 @@
current: 1, // 当前页
size: 10, // 每页大小
})
-// const requester = ref(true)
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列表
@@ -181,11 +143,9 @@
workOrderStatus: [], // 工单状态
})
provide('dictObj', dictObj)
-provide('requester', requester)
-
// 获取列表
-async function getList() {
+async function getList () {
const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
@@ -203,48 +163,60 @@
}
// 查询
-function handleSearch() {
+function handleSearch () {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm() {
+function resetForm () {
queryParamsRef.value?.resetFields()
dateRange.value = []
searchParams.value.current = 1
getList()
}
-function tabsClick(tab, event) {
+function tabsClick (tab, event) {
activeName.value = tab.props.name
resetForm()
handleSearch()
}
// 新增/编辑/查看 弹框
-function openForm(mode, row) {
+function openForm (mode, row) {
dialogVisible.value = true
nextTick(() => {
dialogRef.value?.open({ mode, row })
})
}
-const editStatus = ['0','11','24','25']
-provide('editStatus', editStatus)
// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、
-// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、24响应中_拒绝取消、
-// 25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
+// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
+// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
// 50验收通过_待结算、60结算完成_已结算
-function openFormChange(row) {
+function openFormChange (row) {
dialogVisible.value = true
nextTick(() => {
- const mode = editStatus.includes(row.workOrderStatus) && requester.value ? 'edit' : 'view'
+ const mode = ['11'].includes(row.workOrderStatus) && permission.value.order_release ? 'edit' : 'view'
dialogRef.value?.open({ mode, row })
})
}
+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) {
+async function handleDelete (row) {
const tips = row ? '该条' : '选中的项'
await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
type: 'warning',
@@ -260,18 +232,38 @@
}
// 勾选值设置
-function handleSelectionChange(rows) {
+function handleSelectionChange (rows) {
selectedIds.value = rows.map(item => item.id)
}
// 获取字典
-function getDictList() {
- getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,patrolTaskType,taskStatus').then(res => {
+function getDictList () {
+ 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