Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

youxiw2000
2 parents a61e115b baafd814
Showing 3 changed files with 3 additions and 2 deletions
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/office/conference/index.vue
trash-ui/src/views/office/leaveApplication/index.vue
@@ -690,7 +690,6 @@ export default {
             id: row.businessKey.split(":")[1],
           }
           getSupervision(params).then(res=>{
-            console.log(res)
             if(res.result==null){
               this.$message.error("获取纪检督察详情失败！请重试")
               return;
@@ -482,6 +482,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -236,4 +236,5 @@
   </div>
 </template>
  
-<script src="../../../api/leave" >
+<script src="../../../api/leave">
+</script>