From 4b3c357f2fa24a27eac3fe59cbf64e34255ab212 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 30 Jun 2026 11:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 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 6c49bcb..89a664d 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
@@ -6,28 +6,58 @@
</el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="工单名称" prop="workOrderName">
- <el-input class="gd-input gray" 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-cascader class="gd-cascader gray" popper-class="gd-cascader-popper" v-model="searchParams.workOrderType"
- :options="workOrderTypeXT" :props="taskTypeFilterCascaderProps" placeholder="请选择" clearable
- @change="handleSearch" />
+ <el-cascader
+ class="gd-cascader gray"
+ popper-class="gd-cascader-popper"
+ v-model="searchParams.workOrderType"
+ :options="workOrderTypeXT"
+ :props="taskTypeCascaderProps"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ />
</el-form-item>
<el-form-item label="工单状态" prop="workOrderStatus">
- <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
+ 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 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-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">
@@ -38,8 +68,7 @@
<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 v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
新增工单
</el-button>
</div>
@@ -85,9 +114,14 @@
</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>
@@ -109,7 +143,11 @@
import testDock from '@/assets/docx/testDocx.docx'
import testPdf from '@/assets/pdf/testPdf.pdf'
import { useStore } from 'vuex'
-import { getTaskTypeLabel, normalizeTaskTypeOptions, taskTypeFilterCascaderProps } from '../taskTypeOptions'
+import {
+ getTaskTypeLabel,
+ normalizeTaskTypeOptions,
+ taskTypeCascaderProps,
+} from '../taskTypeOptions'
const store = useStore()
const activeName = ref('all')
@@ -148,7 +186,7 @@
provide('workOrderTypeXT', workOrderTypeXT)
// 获取列表
-async function getList () {
+async function getList() {
const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
@@ -157,6 +195,7 @@
startTime: range[0],
endTime: range[1],
createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
+ workOrderType: searchParams?.value?.workOrderType?.join?.(','),
})
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
@@ -166,27 +205,27 @@
}
// 查询
-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 })
@@ -196,7 +235,7 @@
// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
// 50验收通过_待结算、60结算完成_已结算
-function openFormChange (row) {
+function openFormChange(row) {
dialogVisible.value = true
nextTick(() => {
const mode = ['11'].includes(row.workOrderStatus) && permission.value.order_release ? 'edit' : 'view'
@@ -223,7 +262,7 @@
}
// 删除
-async function handleDelete (row) {
+async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
type: 'warning',
@@ -239,12 +278,12 @@
}
// 勾选值设置
-function handleSelectionChange (rows) {
+function handleSelectionChange(rows) {
selectedIds.value = rows.map(item => item.id)
}
// 获取字典
-function getDictList () {
+function getDictList() {
getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,taskStatus').then(res => {
dictObj.value = res.data.data
})
@@ -254,7 +293,7 @@
}
// 获取两个tab的总条数
-async function getTabTotals () {
+async function getTabTotals() {
// 获取全部tab的总数
const allRes = await gdWorkOrderPageApi({
current: 1,
--
Gitblit v1.9.3