From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 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..e0bec14 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
@@ -51,7 +51,7 @@
<el-date-picker
class="gd-date-picker"
popper-class="gd-date-picker-popper"
- v-model="executeTime"
+ v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
@@ -68,6 +68,8 @@
</el-form>
<div class="gd-table-toolbar">
+ <el-button color="#F2F3F5" @click="requester = !requester">我是{{ requester ? '需求方' : '服务方' }}</el-button>
+
<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>
</div>
@@ -76,6 +78,7 @@
<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="工单编号" />
<el-table-column prop="workOrderType" show-overflow-tooltip label="工单类型">
@@ -83,22 +86,29 @@
{{ 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="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="openFormChange(row)">查看</el-link>
+ <!--<el-link @click="openForm('edit', row)">编辑</el-link>-->
<el-link @click="handleDelete(row)">删除</el-link>
</template>
</el-table-column>
@@ -125,10 +135,10 @@
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'
// 初始化查询参数
const initSearchParams = () => ({
@@ -140,8 +150,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([]) // 列表数据
@@ -155,19 +166,15 @@
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] })
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
} finally {
@@ -177,14 +184,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,7 +191,7 @@
// 重置查询
function resetForm() {
queryParamsRef.value?.resetFields()
- executeTime.value = []
+ dateRange.value = []
searchParams.value.current = 1
getList()
}
@@ -201,6 +200,19 @@
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完成待验_待全部验收、
+// 50验收通过_待结算、60结算完成_已结算
+function openFormChange(row) {
+ dialogVisible.value = true
+ nextTick(() => {
+ const mode = editStatus.includes(row.workOrderStatus) && requester.value ? 'edit' : 'view'
dialogRef.value?.open({ mode, row })
})
}
@@ -233,17 +245,9 @@
})
}
-// 获取部门树
-function getDeptTreeFun() {
- getDeptTree().then(res => {
- deptTree.value = res.data.data
- })
-}
-
onMounted(() => {
getList()
getDictList()
- getDeptTreeFun()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3