fix : 修复项目详情排版,组织机构管理排版

src/components/DetailComponent/ProjectApply.vue

@@ -1,6 +1,34 @@
 <template>
   <div class="apply-block">
-    <el-form :model="localFormData" ref="formRef" label-width="auto"  v-if="step!=='50'">
+    <el-row>
+      <el-col :span="24" v-if="title==='check'">
+        <baseTitle :title="'附件信息'"></baseTitle>
+      </el-col>
+      <el-form :model="attachmentParam" inline style="margin-top: 15px">
+        <el-form-item label="标签" prop="tag">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
+            <el-option
+                v-for="item in tagsOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+          <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
+        </el-form-item>
+      </el-form>
+        <fvTable style="width: 100%;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+                 :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
+          <template #empty>
+            <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
+          </template>
+        </fvTable>
+    </el-row>
+    <baseTitle :title="getTitleName(title)+'信息'"></baseTitle>
+    <el-form :model="localFormData" ref="formRef" label-width="auto" v-if="step!=='50'">
       <el-row>
         <el-col :span="24" v-if="title==='apply'">
           <el-form-item label="项目负责人" :required="true" prop="projectChargePerson"
@@ -30,6 +58,7 @@
                          v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/>
           </el-form-item>
         </el-col>
+
         <el-col :span="24">
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
@@ -115,6 +144,7 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElNotification} from "element-plus";
+import {getTags} from "@/api/project-manage";
 import {
   getApplyProcess,
   getPreProcess,
@@ -132,6 +162,7 @@ import {useTagsView} from '@/stores/tagsview.js'
 import Paging from "@/components/pagination/index.vue";
 import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 
+import {searchImplementationFileList} from "@/api/project-manage/attachment";
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
@@ -142,6 +173,53 @@ const projectChargePersonUserPicker = ref()
 const projectPersonUserList = ref([])
 const projectPersonUserPicker = ref()
 const singleList = ref([])
+const tagsOption = ref([])
+const uploadState = ref(false)
+const showAttachmentTable = ref(true)
+const otherAttachmentList = ref([])
+const attachmentParam = reactive({
+  tag: ''
+})
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -210,6 +288,64 @@ const name = ref(router.currentRoute.value.name)
 const deploymentId = ref()
 const selectRows = ref([])
 const projectId = ref(route.query.projectId)
+const getTagsOption = () => {
+  if (!route.query.projectId) return
+  getTags(route.query.projectId).then(res => {
+    if (res.code === 1000) {
+      tagsOption.value = res.data
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const handleSearch = () => {
+  let params = {
+    targetId: route.query.projectId,
+    targetState: "40"
+  }
+  if (attachmentParam.tag) {
+    tagsOption.value.forEach(item => {
+      if (item.value === attachmentParam.tag) {
+        attachmentParam.tag = item.label
+      }
+    })
+    params.tag = attachmentParam.tag
+  }
+  searchImplementationFileList(params).then(res => {
+    showAttachmentTable.value = false
+    if (res.code === 1000) {
+      otherAttachmentList.value = res.data.fileList
+      uploadState.value = res.data.upload
+      nextTick(() => {
+        showAttachmentTable.value = true
+      })
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+
+handleSearch()
+getTagsOption()
+const handleUpload = () => {
+  router.push({
+    name: 'Implementation/upload',
+    query: {
+      id:  route.query.requirementId,
+      state: route.query.state,
+      projectId:route.query.projectId,
+      step: '40'
+    }
+  })
+}
 const getProjectChargePersonUser = () => {
   console.log('list', projectChargePersonUserList.value)
   if (projectChargePersonUserList.value.length !== 0) {
@@ -372,109 +508,109 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async () => {
-    if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
-      if (localFormData.value.preProcess === undefined) {
-        ElNotification({
-          title: '提示',
-          message: '请选择前置流程!',
-          type: 'error'
-        })
-        return;
-      }
-    }
-    if(projectChargePersonUserList.value&&projectChargePersonUserList.value.length===0){
+  if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
+    if (localFormData.value.preProcess === undefined) {
       ElNotification({
         title: '提示',
-        message: '请选择项目负责人!',
+        message: '请选择前置流程!',
         type: 'error'
       })
       return;
     }
-    if(projectPersonUserList.value&&projectPersonUserList.value.length===0){
-      ElNotification({
-        title: '提示',
-        message: '请选择项目成员!',
-        type: 'error'
-      })
-      return;
-    }
-    let files = []
-    if (props.mode === 'resubmit') {
-      attachment.value.allFileList.forEach(item => {
-        files.push(getFileParam(item))
-      })
-    } else {
-      otherFileList.value.forEach(item => {
-        files.push(getFileParam(item))
-      })
-    }
-    if (attachment.value.singleFile == null) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else {
-      attachment.value.clearValidate()
-    }
-    let projectPersonIds = []
-    for (const item of projectPersonUserList.value) {
-      projectPersonIds.push(parseInt(item.id))
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: attachment.value.singleFile,
-      projectId: projectId.value,
-      preProcess: JSON.stringify(localFormData.value.preProcess)
-    }
-    console.log(params)
-    let res
-    if (props.step === '20') {
-      params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
-      params.projectPersonIds = projectPersonIds
-      if (props.mode === 'resubmit') {
-        res = await resubmitApply(params)
-      } else {
-        res = await projectApply(params)
-      }
-    } else if (props.step === '40') {
-      if (props.mode === 'resubmit') {
-        res = await resubmitCheck(params)
-      } else {
-        res = await projectCheck(params)
-      }
-    } else if (props.step === '50') {
-      if (props.mode === 'resubmit') {
-        res = await resubmitConclusion(params)
-      } else {
-        res = await projectConclusion(params)
-      }
-    }
+  }
+  if (projectChargePersonUserList.value && projectChargePersonUserList.value.length === 0) {
     ElNotification({
       title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
+      message: '请选择项目负责人!',
+      type: 'error'
     })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      if (props.step === '20') {
-        await router.push({
-          name: 'Initiation'
-        })
-      } else if (props.step === '40') {
-        await router.push({
-          name: 'Implementation'
-        })
-      } else if (props.step === '50') {
-        await router.push({
-          name: 'Filing'
-        })
-      }
+    return;
+  }
+  if (projectPersonUserList.value && projectPersonUserList.value.length === 0) {
+    ElNotification({
+      title: '提示',
+      message: '请选择项目成员!',
+      type: 'error'
+    })
+    return;
+  }
+  let files = []
+  if (props.mode === 'resubmit') {
+    attachment.value.allFileList.forEach(item => {
+      files.push(getFileParam(item))
+    })
+  } else {
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+  }
+  if (attachment.value.singleFile == null) {
+    attachment.value.validate()
+    ElNotification({
+      title: '提示',
+      message: '请上传附件',
+      type: 'error'
+    })
+    return;
+  } else {
+    attachment.value.clearValidate()
+  }
+  let projectPersonIds = []
+  for (const item of projectPersonUserList.value) {
+    projectPersonIds.push(parseInt(item.id))
+  }
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: files,
+    singleFile: attachment.value.singleFile,
+    projectId: projectId.value,
+    preProcess: JSON.stringify(localFormData.value.preProcess)
+  }
+  console.log(params)
+  let res
+  if (props.step === '20') {
+    params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
+    params.projectPersonIds = projectPersonIds
+    if (props.mode === 'resubmit') {
+      res = await resubmitApply(params)
+    } else {
+      res = await projectApply(params)
     }
+  } else if (props.step === '40') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitCheck(params)
+    } else {
+      res = await projectCheck(params)
+    }
+  } else if (props.step === '50') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitConclusion(params)
+    } else {
+      res = await projectConclusion(params)
+    }
+  }
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  if (res.code === 1000) {
+    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+    if (props.step === '20') {
+      await router.push({
+        name: 'Initiation'
+      })
+    } else if (props.step === '40') {
+      await router.push({
+        name: 'Implementation'
+      })
+    } else if (props.step === '50') {
+      await router.push({
+        name: 'Filing'
+      })
+    }
+  }
 }
 const init = async () => {
   let id = projectId.value