From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 118 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 45 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 46fe23e..496a025 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,9 +1,13 @@
<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-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="工单名称" prop="workOrderName">
<el-input
- class="gd-input"
+ class="gd-input gray"
v-model="searchParams.workOrderName"
placeholder="请输入"
clearable
@@ -13,7 +17,7 @@
<el-form-item label="工单类型" prop="workOrderType">
<el-select
- class="gd-select"
+ class="gd-select gray"
popper-class="gd-select-popper"
v-model="searchParams.workOrderType"
placeholder="请选择"
@@ -31,7 +35,7 @@
<el-form-item label="工单状态" prop="workOrderStatus">
<el-select
- class="gd-select"
+ class="gd-select gray"
popper-class="gd-select-popper"
v-model="searchParams.workOrderStatus"
placeholder="请选择"
@@ -41,7 +45,7 @@
<el-option
v-for="item in dictObj.workOrderStatus"
:key="item.dictKey"
- :label="item.dictValue"
+ :label="item.dictValue.split('_')[1]"
:value="item.dictKey"
/>
</el-select>
@@ -49,9 +53,9 @@
<el-form-item label="执行时间" prop="executeTime">
<el-date-picker
- class="gd-date-picker"
+ class="gd-date-picker gray"
popper-class="gd-date-picker-popper"
- v-model="executeTime"
+ v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
@@ -68,14 +72,18 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
- <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
+<!-- <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-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="selection" width="46" v-if="requester"/>
+ <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="工单编号" />
<el-table-column prop="workOrderType" show-overflow-tooltip label="工单类型">
@@ -83,23 +91,30 @@
{{ getDictLabel(row.workOrderType, dictObj.workOrderType) }}
</template>
</el-table-column>
- <el-table-column prop="status" show-overflow-tooltip label="阶段状态" />
+ <el-table-column prop="status" show-overflow-tooltip label="阶段状态">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus).split('_')[0] }}
+ </template>
+ </el-table-column>
<el-table-column prop="workOrderStatus" show-overflow-tooltip label="工单状态">
<template v-slot="{ row }">
- {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus) }}
+ {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus).split('_')[1] }}
</template>
</el-table-column>
<el-table-column prop="executeTime" show-overflow-tooltip label="执行时间范围">
- <template v-slot="{ row }">{{ row.executeStartTime }} ~ {{ row.executeEndTime }}</template>
+ <template v-slot="{ row }">
+ {{ dayjs(row.executeStartTime).format('YYYY-MM-DD') }} ~
+ {{ dayjs(row.executeEndTime).format('YYYY-MM-DD') }}
+ </template>
</el-table-column>
+ <el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
<el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
- <el-table-column prop="createDeptName" 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="openForm('view', row)">查看</el-link>
- <el-link @click="openForm('edit', row)">编辑</el-link>
- <el-link @click="handleDelete(row)">删除</el-link>
+ <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>
</template>
</el-table-column>
</el-table>
@@ -117,6 +132,7 @@
</div>
</div>
+ <PreviewFiles v-model="previewVisible" :src="testDock" type="docx"/>
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
</basic-container>
</template>
@@ -125,10 +141,18 @@
import { onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictionaryByCode } from '@/api/system/dictbiz'
-import { getDeptTree } from '@/api/system/dept'
-import { getDictLabel } from '@ztzf/utils'
+import { dateRangeFormat, getDictLabel } from '@ztzf/utils'
import FormDiaLog from './FormDiaLog.vue'
import { gdWorkOrderPageApi, gdWorkOrderRemoveApi } from './orderManageApi'
+import dayjs from 'dayjs'
+import PreviewFiles from '@/components/PreviewFiles/PreviewFiles.vue'
+import testDock from '@/assets/docx/testDocx.docx'
+import testPdf from '@/assets/pdf/testPdf.pdf'
+import { useStore } from 'vuex'
+
+const store = useStore()
+const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
+const activeName = ref('all')
// 初始化查询参数
const initSearchParams = () => ({
@@ -140,8 +164,9 @@
current: 1, // 当前页
size: 10, // 每页大小
})
+// const requester = ref(true)
const searchParams = ref(initSearchParams()) // 查询参数
-const executeTime = ref([]) // 执行时间范围
+const dateRange = ref([]) // 执行时间范围
const total = ref(0) // 总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
@@ -149,25 +174,27 @@
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const dialogVisible = ref(false)
+const previewVisible = ref(false)
const dictObj = ref({
deviceLoadDemand: [], // 设备负载需求
workOrderType: [], // 工单类型
workOrderStatus: [], // 工单状态
})
provide('dictObj', dictObj)
-const deptTree = ref([]) // 部门树
-const treeProps = {
- label: 'name',
- children: 'children',
-}
-provide('deptTree', deptTree)
-provide('treeProps', treeProps)
+provide('requester', requester)
+
// 获取列表
async function getList() {
+ const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
- const res = await gdWorkOrderPageApi(searchParams.value)
+ const res = await gdWorkOrderPageApi({
+ ...searchParams.value,
+ startTime: range[0],
+ endTime: range[1],
+ createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
+ })
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
} finally {
@@ -177,14 +204,6 @@
// 查询
function handleSearch() {
- // 处理执行时间范围
- if (executeTime.value && executeTime.value.length === 2) {
- searchParams.value.executeStartTime = executeTime.value[0]
- searchParams.value.executeEndTime = executeTime.value[1]
- } else {
- searchParams.value.executeStartTime = ''
- searchParams.value.executeEndTime = ''
- }
searchParams.value.current = 1
getList()
}
@@ -192,15 +211,32 @@
// 重置查询
function resetForm() {
queryParamsRef.value?.resetFields()
- executeTime.value = []
+ dateRange.value = []
searchParams.value.current = 1
getList()
+}
+
+function tabsClick(tab, event) {
+ activeName.value = tab.props.name
+ resetForm()
+ handleSearch()
}
// 新增/编辑/查看 弹框
function openForm(mode, row) {
dialogVisible.value = true
nextTick(() => {
+ dialogRef.value?.open({ mode, row })
+ })
+}
+// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、
+// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、24响应中_拒绝取消、
+// 25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
+// 50验收通过_待结算、60结算完成_已结算
+function openFormChange(row) {
+ dialogVisible.value = true
+ nextTick(() => {
+ const mode = ['11','25'].includes(row.workOrderStatus) && requester.value ? 'edit' : 'view'
dialogRef.value?.open({ mode, row })
})
}
@@ -228,22 +264,14 @@
// 获取字典
function getDictList() {
- getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus').then(res => {
+ getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,patrolTaskType,taskStatus').then(res => {
dictObj.value = res.data.data
- })
-}
-
-// 获取部门树
-function getDeptTreeFun() {
- getDeptTree().then(res => {
- deptTree.value = res.data.data
})
}
onMounted(() => {
getList()
getDictList()
- getDeptTreeFun()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3