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

src/views/platform/platformReport.vue

@@ -85,7 +85,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="settlementStatus" label="结算状态">
-                <el-select v-model="recordForm1.settlementStatus" placeholder="请选择">
+                <el-select v-model="recordForm1.settlementStatus" placeholder="请选择" clearable>
                   <el-option :value="2" label="未结清"></el-option>
                   <el-option :value="1" label="已结清"></el-option>
                 </el-select>

src/views/receivable/documentary/index.vue

@@ -369,7 +369,7 @@
               <div style="display: flex; align-items: center; justify-content: center">
                 <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
                 <el-button link type="primary" @click="toEdit(scope.row, '2')">编辑</el-button>
-                <el-dropdown trigger="click" placement="bottom" @command="dropdownCommand">
+                <!-- <el-dropdown trigger="click" placement="bottom" @command="dropdownCommand">
                   <el-button link type="primary">
                     更多
                   </el-button>
@@ -378,7 +378,7 @@
                       <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
-                </el-dropdown>
+                </el-dropdown> -->
               </div>
             </template>
           </el-table-column>

src/views/receivable/handingFee/ticket.vue

@@ -73,7 +73,7 @@
       <el-button type="primary" @click="addTicket">添加应收</el-button>
     </div>
     <el-table :data="tableData" style="height: calc(100% - 350px)" show-summary
-      :summary-method="val => getSummaries(val, ['jqPremium', 'jqSuperviseCostsProportion', 'syPremium', 'sySuperviseCostsProportion', 'receivableAmount', 'receivableAmount4Car', 'receivableAmount4Other','carInsuranceSuperviseCostsPremiums','nonCarInsuranceSuperviseCostsPremiums'])">
+      :summary-method="val => getSummaries(val, ['jqPremium', 'syPremium', 'receivableAmount', 'receivableAmount4Car', 'receivableAmount4Other','carInsuranceSuperviseCostsPremiums','nonCarInsuranceSuperviseCostsPremiums'])">
       <template #empty>
         <div v-if="noData">暂无应收，点击<el-button link type="primary" @click="batchShow = true">导入应收</el-button></div>
         <div v-else>没有符合的应收单据~</div>