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

src/views/finance/modules/auditDetail.vue

@@ -1048,7 +1048,7 @@
           <el-table-column prop="rightsCount" label="发放数量" align="center"></el-table-column>
           <el-table-column prop="packagePrice" label="总价" align="center">
             <template #default="scope">
-              <div>{{ scope.row.packagePrice * scope.row.rightsCount || scope.row.settlePrice * scope.row.rightsCount }}
+              <div>{{ scope.row.packagePrice * scope.row.rightsCount || scope.row.contractRate * scope.row.rightsCount }}
               </div>
             </template>
           </el-table-column>

src/views/insurancePolicy/orderDetail.vue

@@ -1097,7 +1097,7 @@
           <el-table-column prop="rightsCount" label="发放数量" align="center"></el-table-column>
           <el-table-column prop="packagePrice" label="总价" align="center">
             <template #default="scope">
-              <div>{{ scope.row.packagePrice * scope.row.rightsCount || scope.row.settlePrice * scope.row.rightsCount }}
+              <div>{{ scope.row.packagePrice * scope.row.rightsCount || scope.row.contractRate * scope.row.rightsCount }}
               </div>
             </template>
           </el-table-column>

src/views/platform/platformReport.vue

@@ -50,7 +50,6 @@
         <el-table height="calc(100% - 190px)" :data="recordData" row-key="companyId"
           :summary-method="val => getSummaries(val)" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="240"></el-table-column>
-          <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
           <el-table-column prop="contactPerson" label="对接人" width="240"></el-table-column>
           <el-table-column prop="contactPersonPhone" label="对接人手机号" width="240"></el-table-column>
           <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>

src/views/receivable/documentary/ticket.vue

@@ -29,7 +29,7 @@
           <el-date-picker v-if="item.name == 'signYear'" style="width: 350px" format="YYYY" value-format="YYYY"
             v-model="yearrangesearch" type="yearrange" range-separator="-" :disabled="item.type == '为空'"
             @change="handlePtlAgreementChange(index, $event)" />
-          <el-select v-if="item.name == 'signDate'" v-model="item.search" style="width: 350px">
+          <el-select v-if="item.name == 'signDate'" v-model="item.search" style="width: 350px" clearable>
             <el-option value="1" label="1月"></el-option>
             <el-option value="2" label="2月"></el-option>
             <el-option value="3" label="3月"></el-option>

src/views/receivable/handingFee/index.vue

@@ -46,7 +46,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
+            <el-col :span="8">
+              <el-form-item label="结算状态">
+                <el-select v-model="receivableForm.invoiceSettlementStatus" placeholder="请选择" clearable>
+                  <el-option label="已开票未结算" value="0"></el-option>
+                  <el-option label="已结算" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col v-show="isTrue" :span="8">
               <el-form-item label="订单号">
                 <el-input v-model="receivableForm.orderNo" placeholder="请输入" clearable></el-input>
@@ -1080,6 +1087,7 @@ const getCommissionReceivableList = () => {
     companyId: receivableForm.value?.companyId,
     signingStartTime: receivableForm.value?.signingTime?.[0],
     signingEndTime: receivableForm.value?.signingTime?.[1],
+    invoiceSettlementStatus: receivableForm.value?.invoiceSettlementStatus,
     orderNo: receivableForm.value?.orderNo,
     agreementId: receivableForm.value?.agreementId,
     deptId: receivableForm.value?.deptId?.join(),