Merge branch 'dev' of maopiao/mp-ui-pc into test

src/views/business/goods/index.vue

@@ -418,6 +418,7 @@ export default {
           type: 'success'
         })
       }).catch(() => {
+        this.$refs.upload.clearFiles();
         this.vloading.close();
       })
     },

src/views/business/salesite/index.vue

@@ -119,7 +119,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['business:salesite:export']"
+          v-hasPermi="['business:salesite:import']"
           >批量导入门店</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -597,6 +597,7 @@ export default {
           this.getList()
         }
       }).catch(response => {
+        this.$refs.upload.clearFiles();
         this.vloading.close();
       })
     },