Merge pull request 'fix : 修复上传文件功能' (#145) from dj into master

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

src/components/FileUpload.vue

@@ -15,20 +15,24 @@
   </el-upload>
   <div v-if="showTable||fileList.length!==0">
     <el-table :data="fileList" style="width: 100%">
-      <el-table-column prop="originalFilename" label="文件名"/>
+      <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column prop="fileType" label="文件类型"/>
+      <el-table-column prop="originalFilename" label="文件名" align="center"/>
-      <el-table-column prop="size" label="文件大小">
+      <el-table-column prop="size" label="文件大小" align="center">
         <template #default="scope">
           {{ parseInt(scope.row.size / 1024) }}KB
-<!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
+          <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
         </template>
       </el-table-column>
-<!--      <el-table-column prop="tag" label="标签"/>-->
+      <el-table-column prop="tag" label="标签" align="center">
-      <el-table-column fixed="right" label="操作">
         <template #default="scope">
-          <a :href="scope.row.url">
+          <el-input v-model="scope.row.tag" size="mini" placeholder="请输入标签"/>
-            下载
+        </template>
-          </a>
+      </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>
@@ -86,17 +90,16 @@ const beforeUpload = (file) => {
   // if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
   //   ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
   // } else {
-  loading.value=true
+  loading.value = true
   return true
   // }
 }
 const handleUploadSuccess = (res, file) => {
-
   if (res.code !== 1000) {
-    loading.value=false
+    loading.value = false
     ElMessage.error("上传失败")
   } else {
-    loading.value=false
+    loading.value = false
     ElMessage.success("上传成功")
   }
   showTable.value = true

src/views/projectdemand/demandcollection/detail.vue

@@ -33,12 +33,26 @@
               </el-card>
             </el-form-item>
           </el-col>
-          <baseTitle title="申请文件"></baseTitle>
+          <baseTitle title="附件列表"></baseTitle>
           <el-col :span="24">
             <el-form-item>
-              <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
+              <el-table :data="formData.fileList" style="width: 100%">
-                       @headBtnClick="headBtnClick"
+                <el-table-column label="序号" type="index" align="center" width="80"/>
-                       :pagination="false"></fvTable>
+                <el-table-column prop="originalFilename" label="文件名" align="center"/>
+                <el-table-column prop="tag" label="标签" align="center"/>
+                <el-table-column prop="size" label="文件大小" align="center">
+                  <template #default="scope">
+                    {{ parseInt(scope.row.size / 1024) }}KB
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="操作">
+                  <template #default="scope">
+                    <a :href="scope.row.url">
+                      下载
+                    </a>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -86,36 +100,6 @@ const processDiagramViewer = ref(false)
 const processTree = ref()
 const formData = ref({})
 const auditOpinion = ref('')
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'roleName',
-      label: '文件名',
-      align: 'center'
-    },
-    {
-      prop: 'roleKey',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      width: '200px',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载
-              </el-button>
-            </div>
-        )
-      }
-    }
-  ],
-  api: ''
-})
 const handleSubmit = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,