From 960d294870319ad53a6a2c9c21c7500099ffa461 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 30 Oct 2024 21:13:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=9A=84=E9=99=84=E4=BB=B6=E7=9A=84=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=99=84=E4=BB=B6=E5=8A=A0=E4=B8=AA=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchFilesByTag.vue                | 14 +++++++++++++-
 src/views/project-management/filing/attachment.vue | 12 +++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue
index 7ab6181..44200da 100644
--- a/src/components/SearchFilesByTag.vue
+++ b/src/components/SearchFilesByTag.vue
@@ -4,6 +4,16 @@
       <el-form-item label="名称" prop="fileName">
         <el-input v-model="attachment.fileName" placeholder="请输入文件名查询" clearable filterable style="width: 300px"/>
       </el-form-item>
+      <el-form-item label="类型" prop="targetState" v-if="allFile">
+        <el-select v-model="attachment.targetState" placeholder="请选择类型" clearable  filterable style="width: 300px">
+          <el-option
+              v-for="item in cacheStore.getDict('archive_file_type')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="标签" prop="tag" v-if="type==='30'">
         <el-select v-model="attachment.tag" placeholder="请选择标签" clearable  filterable style="width: 300px">
           <el-option
@@ -39,8 +49,10 @@ import {ElNotification} from "element-plus";
 import {getTags} from "@/api/project-manage";
 import {computed, ref} from "vue";
 
+import {useCacheStore} from '@/stores/cache.js'
 const route = useRoute()
 const router = useRouter()
+const cacheStore = useCacheStore()
 const attachment = reactive({})
 const emit = defineEmits(['search','update:modelValue'])
 const props = defineProps({
@@ -154,11 +166,11 @@ const getTagsOption = () => {
   })
 }
 const handleSearch = () => {
-  // console.info("🚀 ~method:'attachment' -----", attachment)
   emit('search', attachment)
 }
 const handleReset=()=>{
   attachment.fileName=''
+  attachment.targetState=''
   attachment.tag=null
   emit('search', {})
 }
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 96e9610..4110a5e 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -329,6 +329,7 @@ const search = async (param) => {
   if( activeName.value=='all'){
     let params={
       targetId:projectId.value,
+      targetState:param.targetState,
       fileName:param.fileName
     }
     // param.targetId = projectId.value
@@ -337,9 +338,14 @@ const search = async (param) => {
       changeFileList(res)
     })
   }else {
-    param.targetId = projectId.value
-    param.targetState = activeName.value
-    searchFileList(param).then(res => {
+    let notAllParams={
+      ...param,
+      targetId:projectId.value,
+      targetState:activeName.value
+    }
+    // param.targetId = projectId.value
+    // param.targetState = activeName.value
+    searchFileList(notAllParams).then(res => {
       loading.value = false
       changeFileList(res)
     })