fix : 修复需求汇总详情功能

src/components/DetailComponent/CollectionDetail.vue

@@ -1,36 +1,70 @@
 <template>
   <div v-loading="loading">
-    <fvForm v-if="showForm" ref="form" :schema="schame">
-    </fvForm>
-    <baseTitle title="征集说明"></baseTitle>
-    <el-card style="width: 100%">
-      <div v-html="formData.collectExplain">
+    <el-form :model="formData" ref="form" label-width="auto">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="名称">
+            <span>{{ formData.requirementName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属公司">
+            <span>{{ formData.companyIds }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="征集类型">
+            <span>{{ formData.collectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="截止时间">
+            <span>{{ formData.deadline }}</span>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="征集说明"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <el-card style="width: 100%">
+              <div v-html="formData.collectExplain">
+              </div>
+            </el-card>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="附件列表"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <fvTable style="width: 100%;max-height: 200px" v-if="processViewer" :tableConfig="tableConfig"
+                     :data="formData.fileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="formData.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="formData.auditOpinion"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <operation-render v-if="processViewer" :operation-list="data.operationList"
+                            :state="data.state"/>
+          <process-diagram-viewer v-if="processViewer"/>
+        </div>
       </div>
-    </el-card>
-    <baseTitle title="附件列表"></baseTitle>
-    <fvTable style="width: 100%;max-height: 200px" v-if="processViewer" :tableConfig="tableConfig"
-             :data="formData.fileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-    <baseTitle title="审核意见"></baseTitle>
-    <el-form-item prop="auditOpinion">
-      <el-input
-          v-model="formData.auditOpinion"
-          :rows="3"
-          type="textarea"
-          placeholder="请输入审核意见"
-      />
-    </el-form-item>
-    <div class="approval-record">
-      <baseTitle title="审批记录"></baseTitle>
-      <div class="process">
-        <operation-render v-if="processViewer" :operation-list="data.operationList"
-                          :state="data.state"/>
-        <process-diagram-viewer v-if="processViewer"/>
-      </div>
-    </div>
+    </el-form>
   </div>
 </template>
 
@@ -38,8 +72,9 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {matterTree} from '@/utils/matterTree.js';
+import {downloadFile} from "@/api/project-demand";
 
-const emit = defineEmits(['getInfo','download'])
+const emit = defineEmits(['getInfo'])
 const form = ref()
 const showForm = ref(true)
 const loading = ref(false)
@@ -64,36 +99,6 @@ const props = defineProps({
     default: []
   },
 })
-const schame = computed(() => {
-  return [
-    {
-      label: '名称',
-      prop: 'requirementName',
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'companyIds',
-      colProps: {
-        span: 12
-      }
-    }, {
-      label: '征集类型',
-      prop: 'collectType',
-      colProps: {
-        span: 12
-      }
-    }, {
-      label: '截止时间',
-      prop: 'deadline',
-      colProps: {
-        span: 12
-      }
-    }
-  ]
-})
 const tableConfig = reactive({
   columns: [
     {
@@ -132,15 +137,17 @@ const tableConfig = reactive({
   ]
 })
 
-const init = (newVal) => {
-  newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
-  form.value.setValues(newVal)
-}
 const getInfo = () => {
   emit('getInfo')
 }
 const handleDownload = (row) => {
-  emit('download',row)
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
 }
 const getDataSourceOptionItem = (val) => {
   if (val instanceof Array) {
@@ -155,7 +162,8 @@ watch(() => props.companyOption, (newVal) => {
 }, {deep: true})
 watch(() => props.formData, (newVal) => {
   if (newVal) {
-    init(newVal)
+    newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
+    props.formData=newVal
   }
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {