Merge pull request 'master' (#904) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/904

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', {})
 }

src/components/SelectPreProcess.vue

@@ -23,7 +23,7 @@
         <el-button @click="handleReset">重置</el-button>
       </el-form-item>
       <el-form-item>
-        <el-tag style="font-size: 14px">{{ getPreProcessTag(localFormData.projectImpact,basicData.projectImpact) }}</el-tag>
+        <el-tag type="danger" style="font-size: 16px;color: red;" >特别提示：{{ getPreProcessTag(localFormData.projectImpact,basicData.projectImpact) }}</el-tag>
       </el-form-item>
     </el-form>
     <el-table :data="preProcessList" v-loading="loading"

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)
     })