Merge pull request 'fix : 修复功能' (#146) from dj into master

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

src/components/FileUpload.vue

@@ -23,16 +23,8 @@
           <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
         </template>
       </el-table-column>
-      <el-table-column prop="tag" label="标签" align="center">
-        <template #default="scope">
-          <el-input v-model="scope.row.tag" size="mini" placeholder="请输入标签"/>
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="操作">
         <template #default="scope">
-<!--          <a :href="scope.row.url">-->
-<!--            下载-->
-<!--          </a>-->
           <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
             删除
           </el-button>

src/views/projectdemand/demandcollection/add.vue

@@ -57,6 +57,7 @@
 </template>
 
 <script setup lang="jsx">
+import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
@@ -64,6 +65,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {ElMessage} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
 
+const authStore = useAuthStore()
 const router = useRouter()
 const route = useRoute()
 const dateValue = ref()
@@ -79,7 +81,7 @@ const processDiagramViewer = ref(false)
 const typeOption = ref([
   {
     label: "需求征集",
-    value: '00'
+    value: '需求征集'
   }
 ])
 const companyOption = ref([
@@ -100,16 +102,23 @@ const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
 const loading = ref(false)
-const localData = reactive({
-  affiliatedCompany: []
-})
 const processStore = useProcessStore()
 const processInstanceData = ref()
 
 const getFile = (val) => {
-  fileList.value = val
+  console.log('val', val)
+  let fileObj = {}
+  let newFileArray = []
+  val.forEach(item => {
+    fileObj = {
+      fileId: item.id,
+      tag: formData.value.collectType,
+      userId: authStore.userinfo.userId
+    }
+    newFileArray.push(fileObj)
+  })
+  fileList.value=newFileArray
 }
-
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
@@ -155,7 +164,6 @@ const getDetailInfo = async () => {
   })
 }
 
-
 const handleBack = () => {
   history.back()
 }

src/views/projectdemand/demandcollection/detail.vue

@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属公司">
-              <span>{{ formData.affiliatedCompany }}</span>
+              <span>{{ formData.companyIds }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -38,7 +38,7 @@
             <el-form-item>
               <el-table :data="formData.fileList" style="width: 100%">
                 <el-table-column label="序号" type="index" align="center" width="80"/>
-                <el-table-column prop="originalFilename" label="文件名" align="center"/>
+                <el-table-column prop="fileName" label="文件名" align="center"/>
                 <el-table-column prop="tag" label="标签" align="center"/>
                 <el-table-column prop="size" label="文件大小" align="center">
                   <template #default="scope">
@@ -140,6 +140,11 @@ init()
 </script>
 
 <style lang="scss" scoped>
+a {
+  cursor: pointer;
+  font-size: 12px;
+  color: #2a99ff;
+}
 .detail-block {
   display: flex;
   justify-content: space-between;