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

src/views/platform/platformReport.vue

@@ -60,9 +60,9 @@
             <template #default="scope">
               <el-button link type="primary" @click="handleSettlementDetail(scope.row)">查看明细</el-button>
             </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane> -->
+</el-table-column>
+</el-table>
+</el-tab-pane> -->
       <el-tab-pane style="height: 100%" name="2" label="对接人结算报表">
         <el-form v-model="recordForm1" label-width="120">
           <el-row :gutter="20">
@@ -77,6 +77,15 @@
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="settlementStatus" label="结算状态">
+                <el-select v-model="recordForm1.settlementStatus" placeholder="请选择">
+                  <el-option :value="0" label="已开票未结清"></el-option>
+                  <el-option :value="1" label="已结清"></el-option>
+                  <el-option :value="2" label="未开票"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="initData2()">查询</el-button>
               <el-button plain type="primary" @click="handleReset(2)">重置</el-button>
@@ -85,12 +94,12 @@
           </el-row>
         </el-form>
         <el-table height="calc(100% - 142px)" :data="recordData1" show-summary
-          :summary-method="val => getSummaries(val, ['totalReceivable','settledAmount','unSettledAmount'])">
+          :summary-method="val => getSummaries(val, ['totalReceivable', 'settledAmount', 'unSettledAmount'])">
           <el-table-column prop="receiver" label="对接人"></el-table-column>
-          <el-table-column prop="totalReceivable" label="应收总计" ></el-table-column>
-          <el-table-column prop="settledAmount" label="已结算总计" ></el-table-column>
-          <el-table-column prop="unSettledAmount" label="未结算总计" ></el-table-column>
-          <el-table-column prop="totalPaymentDifference" label="回款差额" ></el-table-column>
+          <el-table-column prop="totalReceivable" label="应收总计"></el-table-column>
+          <el-table-column prop="settledAmount" label="已结算总计"></el-table-column>
+          <el-table-column prop="unSettledAmount" label="未结算总计"></el-table-column>
+          <el-table-column prop="totalPaymentDifference" label="回款差额"></el-table-column>
 
         </el-table>
         <div class="pagination">
@@ -147,7 +156,7 @@
           </el-row>
         </el-form>
         <el-table height="calc(100% - 192px)" :data="recordData2" show-summary
-          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts','jqPremium','syPremium','jyPremium','taxPremium','jqSuperviseCostsProportion','sySuperviseCostsProportion','jySuperviseCostsProportion'])">
+          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'syPremium', 'jyPremium', 'taxPremium', 'jqSuperviseCostsProportion', 'sySuperviseCostsProportion', 'jySuperviseCostsProportion'])">
           <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="contactPerson" label="对接人" width="150"></el-table-column>
@@ -187,7 +196,9 @@ const route = useRoute();
 const router = useRouter();
 // 结算记录
 let recordForm = ref({})
-let recordForm1 = ref({})
+let recordForm1 = ref({
+  settlementStatus: '',
+})
 let recordForm2 = ref({})
 let recordData = ref([])
 let recordData1 = ref([])
@@ -312,6 +323,7 @@ const initData2 = () => {
     endTime: recordForm1.value.settlementTime?.[1],
     pages: pages.value,
     size: size.value,
+    settlementStatus: recordForm1.value.settlementStatus,
     invoiceTypes: ['5', '6']
   }).then((res: any) => {
     if (res.code == 200) {