From 2a72de08a42793df8e01c123681b5303543d8fea Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 14 May 2024 22:16:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue                 |  11 +-
 src/views/project-demand/collection/add.vue   |  57 +++++----
 .../project-management/initiation/apply.vue   | 117 +++++++++++++++++-
 3 files changed, 153 insertions(+), 32 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 2992a8f..a08f25b 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -6,10 +6,11 @@
              with-credentials
              :multiple="maxSize > 0"
              :data="uploadParams"
-             :show-file-list="false"
+             :show-file-list="showFileList"
              :auto-upload="true"
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
+             :on-error="uploadError"
   >
     <el-button color="#DED0B2" :loading="loading">上传文件</el-button>
   </el-upload>
@@ -37,6 +38,10 @@ const props = defineProps({
   maxSize: {
     type: Number,
     default: 30
+  },
+  showFileList: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -77,6 +82,10 @@ const handleUploadSuccess = (res, file) => {
   fileList.value.push(data)
   emit("getFile", fileList.value)
 }
+const uploadError=(err)=>{
+  loading.value = false
+  ElMessage.error("上传失败，请稍后再试！")
+}
 
 </script>
 
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index b73264d..a449ece 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -33,10 +33,12 @@
       </div>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300" v-if="showTinymce"/>
+    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"
+             v-if="showTinymce"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig" :data="formData.fileList" :isSettingCol="false" :pagination="false">
+    <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig" :data="formData.fileList"
+             :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
       </template>
@@ -136,27 +138,27 @@ const tableConfig = reactive({
         return (
             <div>
               <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
-              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+              <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
             </div>
         )
       }
     }
   ]
 })
-const compositeParam=(item)=>{
-    return  {
-      fileId: item.id,
-      size: item.size,
-      originalFileName: item.originalFilename,
-      fileType: item.fileType,
-      url: item.url,
-      processNodeTag: null,
-      tag: formData.value.collectType,
-      userId: authStore.userinfo.userId
-    }
+const compositeParam = (item) => {
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    processNodeTag: null,
+    tag: formData.value.collectType,
+    userId: authStore.userinfo.userId
+  }
 }
 const getFile = (val) => {
-  console.log('上传文件',val)
+  console.log('上传文件', val)
   showTable.value = false
   nextTick(() => {
     showTable.value = true
@@ -165,14 +167,14 @@ const getFile = (val) => {
   let newFileArray = []
   if (route.query.isAdd === undefined) {
     val.forEach(item => {
-      fileObj =compositeParam(item)
+      fileObj = compositeParam(item)
       newFileArray.push(fileObj)
       formData.value.fileList.push(fileObj)
     })
     fileList.value = formData.value.fileList
   } else {
     val.forEach(item => {
-      fileObj =compositeParam(item)
+      fileObj = compositeParam(item)
       newFileArray.push(fileObj)
     })
     formData.value.fileList = newFileArray
@@ -241,7 +243,6 @@ const handleResubmit = () => {
 const getDetailInfo = async () => {
   getFormInfo(route.query.id).then(res => {
     if (res.code === 1000) {
-      console.log(res)
       ElMessage.success(res.msg)
       formData.value = res.data
       showTinymce.value = false
@@ -257,26 +258,23 @@ const getDetailInfo = async () => {
 const handleBack = () => {
   history.back()
 }
-const beforeRemove = (row) => {
+const handleDelete = (row) => {
   ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    handleRemove(row)
+    deleteFile(row.fileId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success("删除成功");
+        fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
+      }
+    });
   }).catch(() => {
     ElMessage.warning("用户取消删除! ");
   })
 }
 
-const handleRemove = (row) => {
-  deleteFile(row.fileId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success("删除成功");
-      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
-    }
-  });
-};
 onMounted(async () => {
   loading.value = true
   await init()
@@ -292,9 +290,10 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-empty__description){
+:deep(.el-empty__description) {
   margin-top: 0;
 }
+
 .add-block {
   //display: flex;
   //justify-content: space-between;
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 1abd1a9..c0c9c01 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -1,23 +1,136 @@
 <template>
   <div class="apply-block">
     <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
-      <baseTitle title="项目立项-申请"></baseTitle>
+      <baseTitle title="项目立项申请"></baseTitle>
       <el-row>
         <el-col :span="12">
           <el-form-item label="前置流程">
             <el-input v-model="formData.requirementName" clearable></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="项目立项附件" prop="attachment">
+            <file-upload @getFile="getAttachment" :showFileList="true"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="其他文件">
+            <el-card style="width: 100%">
+              <file-upload @getFile="getOtherFile" :showFileList="true"/>
+              <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+                       :data="otherFileList" :isSettingCol="false" :pagination="false">
+                <template #empty>
+                  <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                </template>
+              </fvTable>
+            </el-card>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+    </div>
   </div>
 </template>
 
 <script setup lang="jsx">
+import FileUpload from "@/components/FileUpload.vue";
+
 const formData = ref({})
 const rules = reactive({
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+  attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
 })
+const fileList = ref(null)
+const applyForm = ref()
+const showTable = ref(true)
+const otherFileList = ref([])
+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',
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+
+const compositeParam = (item) => {
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    processNodeTag: null,
+    tag: formData.value.collectType
+  }
+}
+const getAttachment = (val) => {
+  console.log('上传文件', val)
+  showTable.value = false
+  nextTick(() => {
+    showTable.value = true
+  })
+  let fileObj = {}
+  let newFileArray = []
+  if (route.query.isAdd === undefined) {
+    val.forEach(item => {
+      fileObj = compositeParam(item)
+      newFileArray.push(fileObj)
+      formData.value.fileList.push(fileObj)
+    })
+    fileList.value = formData.value.fileList
+  } else {
+    val.forEach(item => {
+      fileObj = compositeParam(item)
+      newFileArray.push(fileObj)
+    })
+    formData.value.fileList = newFileArray
+    fileList.value = newFileArray
+  }
+}
+const getOtherFile = () => {
+
+}
+const handleSubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+
+  })
+}
 </script>
 
 <style scoped>

From b2369d17026acb81e8abc7979e18cc1fcbf72439 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 15 May 2024 00:17:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implementation/check.vue                  |  13 ++
 .../implementation/detail.vue                 |  49 +++++
 .../implementation/index.vue                  | 200 +++++++++++++++++-
 3 files changed, 252 insertions(+), 10 deletions(-)
 create mode 100644 src/views/project-management/implementation/check.vue
 create mode 100644 src/views/project-management/implementation/detail.vue

diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
new file mode 100644
index 0000000..3832ce4
--- /dev/null
+++ b/src/views/project-management/implementation/check.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "check"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
new file mode 100644
index 0000000..386dc31
--- /dev/null
+++ b/src/views/project-management/implementation/detail.vue
@@ -0,0 +1,49 @@
+<template>
+<div class="detail-block">
+  <el-tabs
+      v-model="activeName"
+      type="card"
+      class="demo-tabs"
+      @tab-click="handleClick"
+  >
+    <el-tab-pane label="需求征集" name="first">
+
+    </el-tab-pane>
+    <el-tab-pane label="需求上报" name="second"></el-tab-pane>
+    <el-tab-pane label="项目立项" name="third" ></el-tab-pane>
+    <el-tab-pane label="项目实施" name="third" :disabled="true"></el-tab-pane>
+  </el-tabs>
+</div>
+</template>
+
+<script setup lang="jsx">
+const activeName = ref('first')
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+  if(tab.index.value === 0){
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.detail-block{
+  padding-top: 15px;
+  :deep(.el-tabs__nav-scroll){
+    width: 100%;
+    display: flex;
+    .el-tabs__nav{
+      display: flex;
+      flex: 1;
+      .el-tabs__item{
+        flex: 1;
+        font-size: 16px;
+      }
+      .is-active{
+        color: black;
+        background-color: #DED0B2;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 9c8ed39..433f00c 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -1,15 +1,195 @@
 <template>
-  <div>
-    项目实施
-  </div>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
 </template>
 
-<script>
-export default {
-  name: "index"
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {reactive, shallowRef} from "vue";
+
+const router = useRouter()
+const searchConfig = reactive([
+  {
+    label: '名称',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '项目类型',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目类型',
+      clearable: true,
+      filterable: true,
+    }
+  },
+  {
+    label: '项目影响',
+    prop: 'projectEffect',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目影响',
+      clearable: true,
+      filterable: true,
+    },
+    colProps: {}
+  },
+  {
+    label: '研发主体',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择研发主体',
+      clearable: true,
+      filterable: true,
+    }
+  },
+
+  {
+    label: '起止时间',
+    prop: 'time',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择起止时间',
+      clearable: true,
+    },
+    colProps: {}
+  },
+  {
+    label: '最小金额',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '最大金额',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+])
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    {
+      type: 'selection',
+      prop: 'selection'
+    },
+    {
+      prop: 'name',
+      label: '名称',
+      align: 'center'
+    },
+    {
+      prop: 'company',
+      label: '所属公司',
+      align: 'center'
+    },
+    {
+      prop: 'projectType',
+      label: '项目类型',
+      align: 'center'
+    },
+    {
+      prop: 'productMainBody',
+      label: '研发主体',
+      align: 'center'
+    },
+    {
+      prop: 'projectEffect',
+      label: '项目影响',
+      align: 'center'
+    },
+    {
+      prop: 'survey',
+      label: '经营概况',
+      align: 'center'
+    },
+    {
+      prop: 'time',
+      label: '起止时间',
+      align: 'center'
+    },
+    {
+      prop: 'status',
+      label: '状态',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        if (row.state === '3') {
+          btn.push({label: '验收', func: () => handleCheck(row), type: 'primary'})
+        } else if (row.state === '4') {
+          btn.push({label: '台账', func: () => handleStandingBook(row), type: 'primary'})
+          btn.push({label: '附件', func: () => handleAttachment(row), type: 'primary'})
+          btn.push({label: '分摊', func: () => handleShare(row), type: 'primary'})
+        }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.auth}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '',
+  params: {},
+  btns: [
+    {name: '生成分摊报表', key: '_export', color: '#DED0B2',auth: ''}
+  ]
+})
+
+const search = (val) => {
+  tableConfig.params = {...val}
+  tableIns.value.refresh()
 }
+
+const handleDetail = (row) => {
+  router.push({
+    name:'Implementation/detail',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+
 </script>
-
-<style scoped>
-
-</style>

From 9ae0b7547cf7ed522a9dd6e0a58ef9eb342d3e18 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 15 May 2024 00:18:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/initiation/detail.vue  | 44 +++++++++++++++++--
 .../project-management/initiation/edit.vue    | 12 -----
 .../project-management/initiation/index.vue   |  4 +-
 3 files changed, 42 insertions(+), 18 deletions(-)
 delete mode 100644 src/views/project-management/initiation/edit.vue

diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 8ad911c..aeebf62 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,12 +1,48 @@
 <template>
-<div>
-  项目立项详情
+<div class="detail-block">
+  <el-tabs
+      v-model="activeName"
+      type="card"
+      class="demo-tabs"
+      @tab-click="handleClick"
+  >
+    <el-tab-pane label="需求征集" name="first">
+
+    </el-tab-pane>
+    <el-tab-pane label="需求上报" name="second"></el-tab-pane>
+    <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
+  </el-tabs>
 </div>
 </template>
 
 <script setup lang="jsx">
+const activeName = ref('first')
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+  if(tab.index.value === 0){
+
+  }
+}
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.detail-block{
+  padding-top: 15px;
+  :deep(.el-tabs__nav-scroll){
+    width: 100%;
+    display: flex;
+    .el-tabs__nav{
+      display: flex;
+      flex: 1;
+      .el-tabs__item{
+        flex: 1;
+        font-size: 16px;
+      }
+      .is-active{
+        color: black;
+        background-color: #DED0B2;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/project-management/initiation/edit.vue b/src/views/project-management/initiation/edit.vue
deleted file mode 100644
index 94125ec..0000000
--- a/src/views/project-management/initiation/edit.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <div>
-    项目立项编辑
-  </div>
-</template>
-
-<script setup lang="jsx">
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index c7c865f..c47dcbc 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -129,7 +129,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'status',
-      label: '发布状态',
+      label: '状态',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
@@ -165,7 +165,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/workflow/mosr/requirement',
+  api: '',
   params: {},
 })
 

From 08579c8aadb801e42e202d071a33ad0cb38d6e7f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 15 May 2024 09:48:38 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue               |  2 +-
 src/views/project-demand/collection/add.vue | 70 +++++++++------------
 2 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index a08f25b..76a8939 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -80,7 +80,7 @@ const handleUploadSuccess = (res, file) => {
   showTable.value = true
   let data = res.data
   fileList.value.push(data)
-  emit("getFile", fileList.value)
+  emit("getFile", res.data)
 }
 const uploadError=(err)=>{
   loading.value = false
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index a449ece..faa33f5 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -36,7 +36,7 @@
     <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"
              v-if="showTinymce"/>
     <baseTitle title="申请文件"></baseTitle>
-    <file-upload @getFile="getFile"/>
+    <file-upload ref="uploadFile" @getFile="getFile"/>
     <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -80,7 +80,8 @@ const formData = ref({
   companyIds: '',
   collectType: '',
   deadline: '',
-  collectExplain: ''
+  collectExplain: '',
+  fileList: []
 })
 const showTinymce = ref(true)
 const processDiagramViewer = ref(false)
@@ -92,9 +93,9 @@ const typeOption = ref([
 ])
 const companyOption = ref([])
 const form = ref(null)
-const fileList = ref(null)
+const fileList = ref([])
 const loading = ref(false)
-const showTable = ref(false)
+const showTable = ref(true)
 const processStore = useProcessStore()
 const processInstanceData = ref()
 const rules = reactive({
@@ -146,6 +147,10 @@ const tableConfig = reactive({
   ]
 })
 const compositeParam = (item) => {
+  let tag=''
+  if(!formData.value.collectType&&router.currentRoute.value.name==='Collection/add'){
+    tag='需求征集'
+  }
   return {
     fileId: item.id,
     size: item.size,
@@ -153,34 +158,18 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     processNodeTag: null,
-    tag: formData.value.collectType,
+    tag: tag,
     userId: authStore.userinfo.userId
   }
 }
 const getFile = (val) => {
   console.log('上传文件', val)
   showTable.value = false
+  let fileObj = compositeParam(val)
+  formData.value.fileList.push(fileObj)
   nextTick(() => {
     showTable.value = true
   })
-  let fileObj = {}
-  let newFileArray = []
-  if (route.query.isAdd === undefined) {
-    val.forEach(item => {
-      fileObj = compositeParam(item)
-      newFileArray.push(fileObj)
-      formData.value.fileList.push(fileObj)
-    })
-    fileList.value = formData.value.fileList
-  } else {
-    val.forEach(item => {
-      fileObj = compositeParam(item)
-      newFileArray.push(fileObj)
-    })
-    formData.value.fileList = newFileArray
-    fileList.value = newFileArray
-  }
-
 }
 
 const init = async () => {
@@ -200,18 +189,23 @@ const init = async () => {
     })
   })
 }
-
+const submitParam=()=>{
+  return {
+    collectExplain: formData.value.collectExplain,
+    collectType: formData.value.collectType,
+    companyIds: formData.value.companyIds,
+    deadline: formData.value.deadline,
+    requirementId: formData.value.requirementId?formData.value.requirementId:0,
+    requirementName: formData.value.requirementName,
+    files: formData.value.fileList,
+    deploymentId: processInstanceData.value.deploymentId
+  }
+}
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    let params = {
-      ...formData.value,
-      requirementId: 0,
-      files: fileList.value,
-      deploymentId: processInstanceData.value.deploymentId
-    }
-    let res = await addRequirement(params)
+    let res = await addRequirement(submitParam())
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
@@ -224,11 +218,7 @@ const handleSubmit = async (instance) => {
   })
 }
 const handleResubmit = () => {
-  resubmit({
-    ...formData.value,
-    files: fileList.value,
-    deploymentId: processInstanceData.value.deploymentId
-  }).then(res => {
+  resubmit(submitParam()).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
@@ -246,8 +236,10 @@ const getDetailInfo = async () => {
       ElMessage.success(res.msg)
       formData.value = res.data
       showTinymce.value = false
+      showTable.value = false
       nextTick(() => {
         showTinymce.value = true
+        showTable.value = true
       })
     } else {
       ElMessage.error(res.msg)
@@ -267,7 +259,7 @@ const handleDelete = (row) => {
     deleteFile(row.fileId).then(res => {
       if (res.code === 1000) {
         ElMessage.success("删除成功");
-        fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
+        formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
       }
     });
   }).catch(() => {
@@ -281,12 +273,8 @@ onMounted(async () => {
   if (route.query.id) {
     await getDetailInfo()
   }
-  nextTick(() => {
-    showTable.value = true
-  })
   loading.value = false
 })
-
 </script>
 
 <style lang="scss" scoped>