Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/components/order-search.vue

@@ -148,6 +148,7 @@
             :http-request="uploadFile"
             :before-upload="beforeUpload"
             :on-change="handleChange"
+			ref="uploadFile"
           >
             <el-button type="warning">批量导入</el-button>
           </el-upload>
@@ -178,7 +179,7 @@
   import CreateOrder from '../components/create-order.vue';
   import GroupOrder from '../components/group-order.vue';
   import { importFile } from '@/api/saleOrder';
-  import fileUrl from '@/assets/file/销售订单导入模板.xlsx';
+  import fileUrl from '@/assets/file/销售订单导入模板.xls';
   import { pullSalesOrder, deleteOrder } from '@/api/saleOrder';
   export default {
     props: {
@@ -348,6 +349,7 @@
         });
         importFile(fd).then((res) => {
           this.$emit('search', this.where);
+		  this.$refs.uploadFile.clearFiles()
         });
       }
     }