Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/platform/platformReport.vue

@@ -76,6 +76,12 @@
                 <el-date-picker v-model="recordForm1.settlementTime" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+              <el-form-item prop="receivePaymentDate" label="回款时间">
+                <el-date-picker v-model="recordForm1.receivePaymentDate" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="settlementStatus" label="结算状态">
@@ -320,6 +326,8 @@ const initData2 = () => {
     invoiceId: recordForm1.value.invoiceId,
     startTime: recordForm1.value.settlementTime?.[0],
     endTime: recordForm1.value.settlementTime?.[1],
+    receivePaymentDateBegin: recordForm1.value.receivePaymentDate?.[0],
+    receivePaymentDateEnd: recordForm1.value.receivePaymentDate?.[1],
     pages: pages.value,
     size: size.value,
     settlementStatus: recordForm1.value.settlementStatus,