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/outcomeData.vue |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 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 7db0c2e..dc6c7e4 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
@@ -23,6 +23,24 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="成果类型" prop="attachmentType">
+        <el-select
+          class="gd-select"
+		      popper-class="gd-select-popper"
+          v-model="searchParams.attachmentType"
+          placeholder="请选择"
+          clearable
+          @change="handleSearch"
+        >
+          <el-option
+            v-for="item in attachmentTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item >
         <el-button :icon="RefreshRight" @click="resetForm"></el-button>
         <el-button :icon="Search" color="#383874" @click="handleSearch"></el-button>
@@ -54,6 +72,12 @@
             </template>
           </el-table-column>
           <el-table-column prop="patrolTaskName" show-overflow-tooltip label="巡查任务名称" />
+          <el-table-column label="成果类型">
+            <template v-slot="{ row }">
+              {{ getAttachmentTypeLabel(row.attachmentType) }}
+            </template>
+          </el-table-column>
+          
           <el-table-column prop="shootTime" show-overflow-tooltip label="拍摄时间" />
           <el-table-column label="操作" class-name="operation-btns" width="120">
             <template v-slot="{ row }">
@@ -106,7 +130,8 @@
 const initSearchParams = () => ({
   current: 1,
   size: 10,
-  patrolTaskIds: []
+  patrolTaskIds: [],
+  attachmentType: ''
 })
 
 const searchParams = ref(initSearchParams())
@@ -117,6 +142,16 @@
 const selectedRows = ref([])
 const patrolTaskList = ref([])
 const dictObj = inject('dictObj')
+const attachmentTypeOptions = [
+	{ label: '媒体文件', value: 1 },
+	{ label: 'AI文件', value: 2 },
+	{ label: '主视频', value: 3 },
+]
+
+function getAttachmentTypeLabel(attachmentType) {
+	return attachmentTypeOptions.find(item => item.value === Number(attachmentType))?.label || ''
+}
+
 // 导出加载状态
 const exportLoading = ref(false)
 // 获取巡查任务列表
@@ -252,8 +287,8 @@
 let VideoShow = ref(false)
 let currentVideo = ref({})
 function videoClick(row) {
+	currentVideo.value = row
 	VideoShow.value = true
-  currentVideo.value = row
 }
 
 // 监听 workOrderId 变化

--
Gitblit v1.9.3