Merge remote-tracking branch 'websoft/master'

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

src/views/vehicle/customer-archive.vue

@@ -606,7 +606,6 @@
               v-model="ocrQualificationUploadFiles"
               :multiple="true"
               :limit="20"
-              accept=".pdf,.bmp,.jpeg,.png,.jpg,.doc,.docx,.ppt,.pptx,.xlsx,.xls,.eml,.msg,.zip"
               :max-size="500"
               button-text="OCR上传识别"
               :show-tip="false"
@@ -689,14 +688,10 @@
             accept=".pdf,.bmp,.jpeg,.png,.jpg,.doc,.docx,.ppt,.pptx,.xlsx,.xls,.eml,.msg,.zip"
             :max-size="500"
             button-text="上传附件"
-            :show-tip="false"
             :show-file-list="false"
             :show-uploading="true"
             @success="handleQualificationUploadSuccess"
           />
-          <span class="qualification-upload-bar__tip">
-            支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip，单个文件不超过500M
-          </span>
         </div>
       </section-card>
 
@@ -859,7 +854,13 @@
             </div>
           </el-form-item>
           <el-form-item label="备注" prop="remark" class="contact-form__compact-field">
-            <el-input v-model="contactForm.remark" maxlength="200" />
+            <el-input
+              v-model="contactForm.remark"
+              type="textarea"
+              :rows="2"
+              maxlength="500"
+              show-word-limit
+            />
           </el-form-item>
         </el-form>
       </section-card>
@@ -951,7 +952,13 @@
             <el-input v-model="receiptForm.bankAccount" maxlength="50" />
           </el-form-item>
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="receiptForm.remark" maxlength="200" />
+            <el-input
+              v-model="receiptForm.remark"
+              type="textarea"
+              :rows="2"
+              maxlength="500"
+              show-word-limit
+            />
           </el-form-item>
         </el-form>
       </section-card>
@@ -4559,7 +4566,7 @@ export default {
   display: flex;
   align-items: center;
   gap: 10px;
-  width: 97%;
+  width: 100%;
 }
 
 .business-term-field {
@@ -4650,21 +4657,33 @@ export default {
 }
 
 .qualification-upload-bar {
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
+  display: flex;
   align-items: center;
   margin-top: 12px;
   margin-bottom: 6px;
 
   :deep(.vehicle-attachment-upload) {
-    width: auto;
-  }
+    flex: 1;
+    display: flex;
+    align-items: center;
+    min-width: 0;
 
-  &__tip {
-    grid-column: 2;
-    color: #909399;
-    font-size: 13px;
-    text-align: center;
+    :deep(.el-upload) {
+      flex: 0 0 auto;
+      display: inline-flex;
+      align-items: center;
+    }
+
+    :deep(.el-upload__tip) {
+      margin-left: 30px;
+      color: #909399;
+      font-size: 13px;
+      line-height: 1.4;
+      text-align: left;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
 }