Merge remote-tracking branch 'origin/master' into feature/bfi-api-rate

# Conflicts:
#	src/views/payment/receipt-flow.vue

src/views/payment/payment-application-form.vue

@@ -44,7 +44,7 @@
                   collapse-tags-tooltip
                   :max-collapse-tags="1"
                   :disabled="readonly"
-                  placeholder="请选择预结算/正式结算单"
+                  placeholder="请输入"
                   class="payment-form-page__settlement-select"
                   @visible-change="handleSettlementSelectVisible"
                 >
@@ -448,7 +448,7 @@
         ></el-table
       >
       <div v-else>
-        <div class="payment-form-page__reference-search">
+        <el-card class="payment-form-page__reference-search">
           <el-form
             :model="referenceQuery"
             label-position="right"
@@ -486,7 +486,7 @@
               <el-button @click="resetReferenceSearch">清空</el-button>
             </div>
           </el-form>
-        </div>
+        </el-card>
         <el-tabs v-model="referenceTab" @tab-change="handleReferenceTabChange">
           <el-tab-pane v-if="canSelectFormalSettlement" label="正式结算单" name="formal">
             <el-table
@@ -1075,7 +1075,7 @@ export default {
         !this.form.preSettlementId &&
         !this.form.preSettlementIds?.length
       ) {
-        callback(new Error('请选择结算单'));
+        callback(new Error('请输入'));
         return;
       }
       callback();