Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!458

src/views/purchase/transferOrder/index.vue

@@ -75,7 +75,7 @@
           <el-button-group>
             <el-button type="primary" size="mini" @click="addOrder">新增</el-button>
           </el-button-group>
-          <!-- <el-button-group>
+          <el-button-group>
             <el-dropdown @command="btnImport">
               <el-button type="primary" size="mini">
                 导入<i class="el-icon-arrow-down el-icon--right"></i>
@@ -87,7 +87,7 @@
                 </el-upload>
               </el-dropdown-menu>
             </el-dropdown>
-          </el-button-group> -->
+          </el-button-group>
         </div>
 
         <el-table 
@@ -613,6 +613,7 @@ export default {
     },
     // 上传文件
     onUpload (file) {
+      this.loading = true;
       let formData = new FormData()
       formData.append('file',file.file)
       importData(formData).then((res) => {
@@ -627,6 +628,8 @@ export default {
         this.$message.error(e.message)
       }).finally((e) => {
         this.$refs['upload'].clearFiles();
+        this.resetList();
+        this.loading = false;
       })
     },
     //流程收回