Merge branch 'master' into 测试

src/views/group/oa/exporting-procurement-plan/index.vue

@@ -1,9 +1,13 @@
 <template>
   <el-card class="box-card">
-    <div style="padding: 10px 0">上传导出模板进行导出采购计划文件</div>
+    <el-upload class="upload-demo" :show-file-list="false" drag action="##" :http-request="giveawayServerLog">
+      <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+      <div class="el-upload__text">上传导出模板进行导出采购计划文件</div>
+    </el-upload>
+    <!-- <div style="padding: 10px 0">上传导出模板进行导出采购计划文件</div>
     <el-upload :show-file-list="false" action="##" :http-request="giveawayServerLog">
       <el-button style="background: #20b2aa; color: #fff; border: 1px solid #20b2aa">上传</el-button>
-    </el-upload>
+    </el-upload> -->
   </el-card>
 </template>