Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -920,7 +920,7 @@
                     :on-remove="removeOneFile"
                     :show-file-list="true"
             >
-                <div style="padding: 20px 0">
+                <div>
                     <i class="el-icon-upload" style="color: #3399ff"></i>
                     <p>点击或拖拽上传文件</p>
                 </div>
@@ -2785,6 +2785,26 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzrkStep1 {
+      /deep/ .el-upload-dragger {
+        background-color: #fff;
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        box-sizing: border-box;
+        width: 360px;
+        height: 75px;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+      }
+      /deep/ .el-dialog__body {
+        padding: 0 20px 10px;
+        color: #606266;
+        font-size: 14px;
+        word-break: break-all;
+      }
+      /deep/ .el-upload-dragger .el-icon-upload {
+        margin: 0;
+      }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;