Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvity.vue

@@ -263,7 +263,7 @@
       <div class="deleteContent1">活动完结报告</div>
       <div class="download" v-for="item in endTable.file">
         <div>{{ item.fileName }}</div>
-        <el-button type="primary" @click="delEndTableFile(item.fid)" size="mini">删除文件</el-button>
+        <el-button type="primary" @click="delEndTableFile(item.url)" size="mini">删除文件</el-button>
       </div>
       <div class="addMoneyBtn">
           <div class="jia">+</div>添加
@@ -294,7 +294,6 @@
 
 <script>
 import beUpload from '../../components/tool/beUpload'
-import { uuid } from 'vue-uuid';
     export default {
       components:{beUpload},
       data() {
@@ -341,11 +340,10 @@ import { uuid } from 'vue-uuid';
       },
       methods:{
         getFile(val) {//上传文件
-          val.fid = uuid.v1();
           this.endTable.file.push(val);
         },
-        delEndTableFile(id){
-          this.endTable.file = this.endTable.file.filter(item=>item.fid!=id);
+        delEndTableFile(url){
+          this.endTable.file = this.endTable.file.filter(item=>item.url!=url);
         },
         cancelEndTableFile(){
           if(this.endTable.file.length>=1){