From 9e98e7d0fe92ce312af646ccc78ee720ea1ddc1e Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 23 Apr 2026 13:58:12 +0800
Subject: [PATCH] feat: 判空处理
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue
index 89cce0b..c602d60 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue
@@ -1,14 +1,17 @@
<template>
<div class="outcome-container">
<el-form ref="searchRef" :model="searchParams" class="gd-search-form">
- <el-form-item label="巡查任务名称" prop="patrolTaskName">
+ <el-form-item label="巡查任务名称" prop="patrolTaskIds">
<el-select
- class="gd-select"
- popper-class="gd-select-popper"
- v-model="searchParams.patrolTaskId"
+ class="gd-select"
+ popper-class="gd-select-popper"
+ collapse-tags
+ collapse-tags-tooltip
+ v-model="searchParams.patrolTaskIds"
placeholder="请选择"
clearable
- filterable
+
+ multiple
@change="handleSearch"
>
<el-option
@@ -21,8 +24,8 @@
</el-form-item>
<el-form-item >
- <!-- <el-button :icon="RefreshRight" @click="resetForm"></el-button>
- <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button> -->
+ <el-button :icon="RefreshRight" @click="resetForm"></el-button>
+ <el-button :icon="Search" color="#383874" @click="handleSearch"></el-button>
<el-button :icon="Download" color="#4C34FF" :loading="exportLoading" :disabled="exportLoading" @click="handleBatchDownload">下载</el-button>
</el-form-item>
@@ -33,7 +36,7 @@
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="46" />
<el-table-column type="index" label="序号" width="80" />
- <el-table-column label="图片" width="120">
+ <el-table-column label="图片" >
<template v-slot="{ row }">
<el-image
v-if="row.resultUrl"
@@ -48,7 +51,7 @@
</el-table-column>
<el-table-column prop="patrolTaskName" show-overflow-tooltip label="巡查任务名称" />
<el-table-column prop="shootTime" show-overflow-tooltip label="拍摄时间" />
- <el-table-column label="操作" class-name="operation-btns" width="150">
+ <el-table-column label="操作" class-name="operation-btns" width="120">
<template v-slot="{ row }">
<!-- <el-link type="primary" @click="handleDownload(row)">下载</el-link> -->
<el-link type="primary" @click="handleDelete(row)">删除</el-link>
@@ -91,7 +94,7 @@
const initSearchParams = () => ({
current: 1,
size: 10,
- patrolTaskId: ''
+ patrolTaskIds: []
})
const searchParams = ref(initSearchParams())
@@ -120,7 +123,10 @@
try {
const res = await gdTaskResultPageApi({
...searchParams.value,
- id: props.workOrderId
+ workOrderId: props.workOrderId,
+ patrolTaskIds: searchParams.value.patrolTaskIds.length
+ ? searchParams.value.patrolTaskIds.join(',')
+ : ''
})
list.value = res?.data?.data?.records || []
total.value = res?.data?.data?.total || 0
@@ -137,9 +143,10 @@
// 重置搜索
function resetForm() {
- searchRef.value?.resetFields()
- searchParams.value.current = 1
- getList()
+ searchRef.value?.resetFields()
+ searchParams.value = { ...initSearchParams() }
+ selectedRows.value = []
+ getList()
}
// 选择变化
@@ -188,7 +195,7 @@
const url = URL.createObjectURL(blob)
const a = document.createElement('a')
a.href = url
- a.download = `成果数据批量_${dayjs().format('YYYYMMDDHHmmss')}`
+ a.download = `成果数据_${dayjs().format('YYYYMMDDHHmmss')}`
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
@@ -225,14 +232,15 @@
// 监听 workOrderId 变化
watch(
- () => props.workOrderId,
- (newWorkOrderId) => {
- if (newWorkOrderId) {
- getList()
- getPatrolTaskList()
- }
- },
- { immediate: true }
+ () => props.workOrderId,
+ (newWorkOrderId) => {
+ if (newWorkOrderId) {
+ resetForm()
+ getList()
+ getPatrolTaskList()
+ }
+ },
+ { immediate: true }
)
onMounted(() => {
@@ -242,7 +250,7 @@
<style scoped lang="scss">
.outcome-container {
- height: 679px;
+ height: 680px;
display: flex;
flex-direction: column;
overflow: hidden;
--
Gitblit v1.9.3