Merge remote-tracking branch 'origin/master'

src/views/sjzx/bomwh.vue

@@ -1151,6 +1151,13 @@ export default {
         this.tableupload.sort((a,b)=>{
           return( a.sort - b.sort)
         })
+      }else if (file.name.includes('.xls')|| file.name.includes('.xlsx') || file.name.includes('.cvs') ){
+        this.tltList2.push(file)
+        let a={czbh:'',ph:'',type:"",stype:"其他文件",name:file.name,sort:9}
+        this.tableupload.push(a);
+        this.tableupload.sort((a,b)=>{
+          return( a.sort - b.sort)
+        })
       }
       this.tableupload.sort((a,b)=>{
         //return( a[age] - b[age])