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

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

src/views/settlement/components/formal-settlement-editor.vue

@@ -675,24 +675,27 @@
     </div>
 
     <el-dialog v-model="candidate.visible" title="选择预结算单" width="88%" append-to-body>
-      <el-form
-        :model="candidate.query"
-        inline
-        label-position="right"
-        label-width="88px"
-        class="formal-editor__candidate-search"
-      >
-        <el-form-item label="预结算单号"
+      <el-card>
+        <el-form
+          :model="candidate.query"
+          inline
+          label-position="right"
+          label-width="88px"
+          class="formal-editor__candidate-search"
+        >
+          <el-form-item label="预结算单号"
           ><el-input v-model="candidate.query.preSettlementNo" clearable
-        /></el-form-item>
-        <el-form-item label="合同编号"
+          /></el-form-item>
+          <el-form-item label="合同编号"
           ><el-input v-model="candidate.query.contractNo" clearable
-        /></el-form-item>
-        <el-form-item
+          /></el-form-item>
+          <el-form-item
           ><el-button @click="resetCandidates">重置</el-button
           ><el-button type="primary" @click="loadCandidates">查询</el-button></el-form-item
-        >
-      </el-form>
+          >
+        </el-form>
+      </el-card>
+
       <el-table
         ref="candidateTable"
         v-loading="candidate.loading"