From 3cf3cd88a7b7a49e3300e8e8c1e9034eb69a3429 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 27 Feb 2026 08:40:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 116 ++++++++++++++++++---------------------------------------
1 files changed, 37 insertions(+), 79 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index 3c6a5c3..5c7261d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -6,63 +6,30 @@
</el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="任务名称" prop="patrolTaskName">
- <el-input
- class="gd-input gray"
- v-model="searchParams.patrolTaskName"
- placeholder="请输入"
- clearable
- @clear="handleSearch"
- />
+ <el-input class="gd-input gray" v-model="searchParams.patrolTaskName" placeholder="请输入" clearable
+ @clear="handleSearch" />
</el-form-item>
<el-form-item label="任务类型" prop="patrolTaskType">
- <el-select
- class="gd-select gray"
- popper-class="gd-select-popper"
- v-model="searchParams.patrolTaskType"
- 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.patrolTaskType"
+ 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="taskStatus">
- <el-select
- class="gd-select gray"
- popper-class="gd-select-popper"
- v-model="searchParams.taskStatus"
- placeholder="请选择"
- clearable
- @change="handleSearch"
- >
- <el-option
- v-for="item in dictObj.taskStatus"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.taskStatus"
+ placeholder="请选择" clearable @change="handleSearch">
+ <el-option v-for="item in dictObj.taskStatus" :key="item.dictKey" :label="item.dictValue"
+ :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">
@@ -71,13 +38,14 @@
</el-form-item>
</el-form>
- <div class="gd-table-toolbar">
- <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
- 拆分工单
- </el-button>
- </div>
-
<div class="gd-table-container" v-loading="loading">
+ <div class="gd-table-toolbar">
+ <el-button v-if="permission.flyOrder_add" :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" />-->
@@ -91,7 +59,7 @@
</el-table-column>
<el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
<template v-slot="{ row }">
- <span :style="{color: colors?.[row?.taskStatus]}">
+ <span :style="{ color: colors?.[row?.taskStatus] }">
{{ getDictLabel(row.taskStatus, dictObj.taskStatus) }}
</span>
</template>
@@ -109,25 +77,15 @@
</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>
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
- <ViewDiaLog
- ref="viewDiaLogRef"
- @success="getList"
- @refusalAccept="refusalAccept"
- v-if="viewDiaLogVisible"
- v-model="viewDiaLogVisible"
- />
+ <ViewDiaLog ref="viewDiaLogRef" @success="getList" @refusalAccept="refusalAccept" v-if="viewDiaLogVisible"
+ v-model="viewDiaLogVisible" />
</basic-container>
</template>
<script setup>
@@ -190,7 +148,7 @@
// 获取列表
-async function getList() {
+async function getList () {
const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
@@ -207,20 +165,20 @@
}
}
-function tabsClick(tab, event) {
+function tabsClick (tab, event) {
activeName.value = tab.props.name
resetForm()
handleSearch()
}
// 查询
-function handleSearch() {
+function handleSearch () {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm() {
+function resetForm () {
queryParamsRef.value?.resetFields()
dateRange.value = []
searchParams.value.current = 1
@@ -228,7 +186,7 @@
}
// 新增/编辑/查看 弹框
-function openForm(mode, row) {
+function openForm (mode, row) {
dialogVisible.value = true
nextTick(() => {
dialogRef.value?.open({ mode, row })
@@ -237,7 +195,7 @@
// 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回
// 5审核通过、6待验收、7拒绝验收、8验收通过
-function viewDiaLogView(row) {
+function viewDiaLogView (row) {
viewDiaLogVisible.value = true
nextTick(() => {
let mode = ['1', '4'].includes(row.taskStatus) && permission.value.flyOrder_add ? 'edit' : 'view'
@@ -246,7 +204,7 @@
}
// 勾选值设置
-function handleSelectionChange(rows) {
+function handleSelectionChange (rows) {
selectedIds.value = rows.map(item => item.id)
}
@@ -257,20 +215,20 @@
}
provide('routeOptions', routeOptions)
provide('getAirName', getAirName)
-function getAirList() {
+function getAirList () {
airlineListApi({}).then(res => {
routeOptions.value = res.data.data || []
})
}
// 获取字典
-function getDictList() {
+function getDictList () {
getDictionaryByCode('workOrderType,deviceLoadDemand,taskStatus').then(res => {
dictObj.value = res.data.data
})
}
-function refusalAccept(row) {
+function refusalAccept (row) {
dialogVisible.value = true
nextTick(() => {
dialogRef.value?.open({ mode: 'edit', row })
@@ -278,7 +236,7 @@
}
// 获取两个tab的总条数
-async function getTabTotals() {
+async function getTabTotals () {
const allRes = await gdPatrolTaskPageApi({
current: 1,
size: 1,
--
Gitblit v1.9.3