Merge remote-tracking branch 'websoft/master'

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

src/views/business/contract-manage.vue

@@ -275,32 +275,26 @@
                 <el-option label="是" :value="1" />
               </el-select>
             </el-form-item>
-            <el-form-item label="一式">
-              <div class="contract-manage-form__inline-number">
-                <el-input
-                  v-model="form.copyCount"
-                  placeholder="请输入"
-                  @input="value => integerInput('copyCount', value)"
-                />
-                <span>份</span>
-              </div>
+            <el-form-item label="一式（份）">
+              <el-input
+                v-model="form.copyCount"
+                placeholder="请输入"
+                @input="value => integerInput('copyCount', value)"
+              />
             </el-form-item>
-            <el-form-item label="回款账期">
-              <div class="contract-manage-form__inline-number">
-                <el-input
-                  v-model="form.paymentDays"
-                  placeholder="请输入"
-                  @input="value => integerInput('paymentDays', value)"
-                />
-                <span>天</span>
-              </div>
+            <el-form-item label="回款账期（天）">
+              <el-input
+                v-model="form.paymentDays"
+                placeholder="请输入"
+                @input="value => integerInput('paymentDays', value)"
+              />
             </el-form-item>
           </div>
           <el-form-item label="备注" prop="remark" class="contract-manage-form__remark">
             <el-input
               v-model="form.remark"
               type="textarea"
-              :rows="3"
+              :rows="2"
               maxlength="200"
               show-word-limit
               placeholder="请输入备注"
@@ -1047,27 +1041,11 @@ const AttachmentSection = defineComponent({
       [
         h('div', { class: 'dialog-section-title' }, this.title),
         h('div', { class: 'contract-manage-form__attachment-head' }, [
-          h('div', { class: 'contract-manage-form__attachment-actions' }, [
-            ...(!this.readonly
-              ? [
-                  h(VehicleAttachmentUpload, {
-                    modelValue: this.rows,
-                    fileTypes: this.attachmentFileTypes,
-                    maxSize: 500,
-                    showTip: false,
-                    showFileList: false,
-                    buttonText: '上传附件',
-                    'onUpdate:modelValue': this.handleChange,
-                    onChange: this.handleChange,
-                  }),
-                ]
-              : []),
-            h(
-              ElButton,
-              { type: 'primary', disabled: !this.rows.length, onClick: this.batchDownload },
-              () => '批量下载'
-            ),
-          ]),
+          h(
+            ElButton,
+            { type: 'primary', disabled: !this.rows.length, onClick: this.batchDownload },
+            () => '批量下载'
+          ),
         ]),
         h(
           ElTable,
@@ -1081,6 +1059,23 @@ const AttachmentSection = defineComponent({
           },
           () => columns
         ),
+        ...(!this.readonly
+          ? [
+              h('div', { class: 'contract-manage-form__attachment-upload' }, [
+                h(VehicleAttachmentUpload, {
+                  modelValue: this.rows,
+                  fileTypes: this.attachmentFileTypes,
+                  maxSize: 500,
+                  showTip: true,
+                  tip: '支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过500M',
+                  showFileList: false,
+                  buttonText: '上传附件',
+                  'onUpdate:modelValue': this.handleChange,
+                  onChange: this.handleChange,
+                }),
+              ]),
+            ]
+          : []),
       ]
     );
   },
@@ -2197,25 +2192,6 @@ export default {
     }
   }
 
-  &__inline-number {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    width: 360px;
-    max-width: 100%;
-
-    :deep(.el-input) {
-      flex: 1;
-      width: auto;
-      min-width: 0;
-    }
-
-    span {
-      flex: none;
-      color: #606266;
-    }
-  }
-
   &__billing-head,
   &__attachment-head {
     display: flex;
@@ -2318,22 +2294,29 @@ export default {
   margin-bottom: 16px;
 }
 
-:deep(.contract-manage-form__attachment-actions) {
-  display: inline-flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex-wrap: nowrap;
-  gap: 8px;
-  white-space: nowrap;
-}
+:deep(.contract-manage-form__attachment-upload) {
+  display: flex;
+  justify-content: flex-start;
+  margin-top: 12px;
 
-:deep(.contract-manage-form__attachment-actions .vehicle-attachment-upload) {
-  flex: 0 0 auto;
-  width: auto !important;
-}
+  :deep(.vehicle-attachment-upload) {
+    display: flex;
+    align-items: center;
+    width: auto;
+  }
 
-:deep(.contract-manage-form__attachment-actions .el-upload) {
-  display: inline-flex;
+  :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;
+    text-align: left;
+  }
 }
 
 .contract-manage-detail {
@@ -2383,4 +2366,8 @@ export default {
   white-space: normal;
   line-height: 1.2;
 }
+.contract-manage-form__tip {
+  color: #ff0000 !important;
+  font-size: 12px;
+}
 </style>