Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/contract-manage-change.vue

src/views/business/project-apply.vue

@@ -428,7 +428,7 @@
             <el-input
               v-model="form.projectIntro"
               type="textarea"
-              :rows="4"
+              :rows="2"
               placeholder="请填写备注信息"
               maxlength="200"
               show-word-limit
@@ -438,7 +438,7 @@
             <el-input
               v-model="form.profitRemark"
               type="textarea"
-              :rows="4"
+              :rows="2"
               placeholder="请填写备注信息"
               maxlength="200"
               show-word-limit
@@ -448,7 +448,7 @@
             <el-input
               v-model="form.riskPoint"
               type="textarea"
-              :rows="4"
+              :rows="2"
               placeholder="请填写备注信息"
               maxlength="200"
               show-word-limit
@@ -458,7 +458,7 @@
             <el-input
               v-model="form.emergencyPlan"
               type="textarea"
-              :rows="4"
+              :rows="2"
               placeholder="请填写备注信息"
               maxlength="200"
               show-word-limit
@@ -535,9 +535,9 @@
             class="project-apply-form__upload"
             :readonly="dialogReadonly"
             :file-types="attachmentFileTypes"
-            :max-size="50"
+            :max-size="500"
             button-text="上传附件"
-            tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件大小限制50M"
+            tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过500M"
             @change="handleAttachmentChange"
           />
         </div>
@@ -585,7 +585,7 @@
             <el-input
               v-model="form.changeContent"
               type="textarea"
-              :rows="5"
+              :rows="2"
               placeholder="2000字以内"
               maxlength="2000"
               show-word-limit
@@ -596,7 +596,7 @@
             <el-input
               v-model="form.changeReason"
               type="textarea"
-              :rows="5"
+              :rows="2"
               placeholder="2000字以内"
               maxlength="2000"
               show-word-limit
@@ -2075,6 +2075,23 @@ export default {
     border-radius: 6px;
     padding: 12px 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+
+    :deep(.vehicle-attachment-upload) {
+      display: flex;
+      align-items: center;
+    }
+
+    :deep(.el-upload) {
+      display: inline-flex;
+    }
+
+    :deep(.el-upload__tip) {
+      display: inline-block;
+      margin: 0 0 0 30px;
+      color: #909399;
+      font-size: 13px;
+      line-height: 1.4;
+    }
   }
 
   &__change-textarea {