Merge branch 'main' into 'stg'

修改bug

See merge request cloud-mediate/mediate-manage-web!65

src/pages/mediation-management/index.vue

@@ -509,7 +509,30 @@ import { values } from "lodash";
                     this.$message.warning(`请至少选中一个调解案件！`)
                     return
                 }
-                api.callingBatchcall({caseIdList: this.selectionData}).then(res => {
+
+                let chooseData = this.enabledDataList.filter(el=>(el.caseStatus == 0 || el.caseStatus == 1))
+
+                let caseCllList = []
+                let mainCaseId = null
+                chooseData.forEach(item =>{
+                    mainCaseId = null
+                    if(item.jointDebt == 1){
+                        // 有共债 mainCaseId
+                        item.caseId = item.mainCaseId
+                        mainCaseId = item.mainCaseId
+                        if(!caseCllList.find(item=>{return item.caseId == mainCaseId}))
+                        {
+                            caseCllList.push(item)
+                        }
+                    }
+                    else
+                    {
+                        caseCllList.push(item)
+                    } 
+                })
+
+                let caseCllIds = caseCllList.map(item =>{ return item.id})
+                api.callingBatchcall({caseIdList: caseCllIds}).then(res => {
                     this.$message.success("智能外呼成功");
                     // this.getCaseInfoList(1)
                     this.jumpUrl(`/mediation-page?sourcePage=sourcePage&caseId=${this.selectionData[0]}&queue=1`)
@@ -662,7 +685,7 @@ import { values } from "lodash";
                 // 选择状态重置
                 this.selectionData = []
                 this.checkedCheckAll = false
-
+                
                 this.queryParam.current = val
                 this.queryParam.dispatch = true //默认已分案
                 api.getCaseInfoList(this.queryParam).then(res => {

src/pages/payment-receipt/index.vue

@@ -32,7 +32,7 @@
                             <el-col :span="6">
                                 <div class="flex-row-center align-items-center height-40 mb-24">
                                     <span class="tabs__search-criteria-title flex-shrink-0 pr-16">金融机构名称</span>
-                                    <el-input v-model.trim="queryParam.financiaOrgName"
+                                    <el-input v-model.trim="queryParam.financialOrgName"
                                               clearable placeholder="请输入金融机构名称"
                                               @keydown.enter.native="handleSearch">
                                     </el-input>
@@ -199,7 +199,7 @@ import smapi from "@/services/systemManage";
                 activeUsage: '',
                 queryParam: {
                     pkgId:'',
-                    financiaOrgName:'',//金融机构名称
+                    financialOrgName:'',//金融机构名称
                     caseNo: '',//案件编号
                     respondent:'',//债券人姓名
                     respondentPhone:'',//债务人手机号