Merge branch 'main' into 'stg'

Main See merge request cloud-mediate/mediate-manage-web!4
2025-02-08 03:20:46 +00:00 · 2025-02-08 03:20:46 +00:00 · a10b9b8a1b
commit a10b9b8a1b
parent 1b5dc2b214 19e0ade8ec
25 changed files with 65 additions and 20 deletions
--- a/src/pages/case-management-old/index.vue
+++ b/src/pages/case-management-old/index.vue
@ -525,10 +525,12 @@ import api from "@/services/caseManagement";
            // 重置
            hanldeReset() {
                for (let key in this.queryParam) {
-                this.queryParam[key] = ''
+                    this.queryParam[key] = ''
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/case-management/index.vue
+++ b/src/pages/case-management/index.vue
@ -599,6 +599,9 @@ import { values } from "lodash";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/case-mistake/components/importPackageDialog.vue
+++ b/src/pages/case-mistake/components/importPackageDialog.vue
@ -35,10 +35,10 @@
                        </el-row>
                        <el-row  type="flex" align="middle">
                            <el-col :span="24">
-                                <el-form-item label="委案机构" prop="entrustingAgencyName">
+                                <el-form-item label="金融机构" prop="entrustingAgencyName">
                                    <el-input
                                    v-model.trim="baseInfo.entrustingAgencyName"
-                                    placeholder="请输入委案机构"
+                                    placeholder="请输入金融机构"
                                    disabled
                                    maxlength="25"
                                    ></el-input>
--- a/src/pages/case-mistake/index.vue
+++ b/src/pages/case-mistake/index.vue
@ -53,7 +53,7 @@
                    <div class="f22 color-text-primary">列表</div>
                    <div class="flex-row">
                        <el-button size="small" type="primary" @click="handleImport">增量导入案件</el-button>
-                        <el-button size="small" @click="handleExport">导出错误案件</el-button>
+                        <el-button size="small" :disabled="tableData.length==0 ? true: false" @click="handleExport">导出错误案件</el-button>
                        <!-- <el-button size="small" @click="handleDelete">清空错误案件</el-button> -->
                    </div>
                </div>
@ -118,7 +118,7 @@ import cpkapi from "@/services/casePackageManagement";
                queryParam: {
                    id:'',
                    pkgName:'',//案件包名称
-                    entrustingAgencyName: '',//委案机构
+                    entrustingAgencyName: '',//金融机构
                    endTime: '',//结束时间
                    beginTime:'',//开始时间
                    willEnd:'',
--- a/src/pages/case-package/components/importPackageDialog.vue
+++ b/src/pages/case-package/components/importPackageDialog.vue
@ -32,10 +32,10 @@
                        </el-row>
                        <el-row  type="flex" align="middle">
                            <el-col :span="24">
-                                <el-form-item label="委案机构" prop="entrustingAgencyName">
+                                <el-form-item label="金融机构" prop="entrustingAgencyName">
                                    <el-input
                                    v-model.trim="baseInfo.entrustingAgencyName"
-                                    placeholder="请输入委案机构"
+                                    placeholder="请输入金融机构"
                                    clearable
                                    maxlength="25"
                                    ></el-input>
@ -137,7 +137,7 @@ import apipk from "@/services/casePackageManagement";
                        { required: true, message: '请输入案件包名', trigger: 'change',},
                    ],
                    entrustingAgencyName: [
-                        { required: true, message: '请输入委案机构', trigger: 'change',},
+                        { required: true, message: '请输入金融机构', trigger: 'change',},
                    ],
                    planStartTime: [
                        { required: true, message: '请输入委案时间', trigger: 'change',},
--- a/src/pages/case-package/index.vue
+++ b/src/pages/case-package/index.vue
@ -23,9 +23,9 @@
                        <el-row :gutter="56">
                            <el-col :span="8">
                                <div class="flex-row-center align-items-center height-40 mb-24">
-                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">委案机构</span>
+                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">金融机构</span>
                                    <el-select v-model="queryParam.entrustingAgencyName"
-                                           clearable placeholder="请选择委案机构"
+                                           clearable placeholder="请选择金融机构"
                                           @keydown.enter.native="handleSearch"
                                           class="width100">
                                        <el-option
@ -107,7 +107,7 @@
                        <el-table-column type="index" label="序号" width="55"></el-table-column>
                        <!-- <el-table-column type="selection" width="55" ></el-table-column> -->
                        <el-table-column prop="pkgName" label="案件包名称" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="entrustingAgencyName" label="委案机构" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="entrustingAgencyName" label="金融机构" show-overflow-tooltip ></el-table-column>
                        <el-table-column prop="channel" label="委案渠道" show-overflow-tooltip ></el-table-column>
                        <el-table-column prop="planStartTime" label="委案日期" show-overflow-tooltip >
                            <template slot-scope="scope">
@ -183,7 +183,7 @@ import api from "@/services/casePackageManagement";
                departmentOptions:[],//区域
                queryParam: {
                    pkgName:'',//案件包名称
-                    entrustingAgencyName: '',//委案机构
+                    entrustingAgencyName: '',//金融机构
                    endTime: '',//结束时间
                    beginTime:'',//开始时间
                    willEnd:'',
@ -198,7 +198,7 @@ import api from "@/services/casePackageManagement";
                importCaseDialog:null,//导入
                addCaseDialog:null,//新增
                editCaseDrawer:null,//编辑
-                orglist:[],//委案机构
+                orglist:[],//金融机构



@ -349,6 +349,9 @@ import api from "@/services/casePackageManagement";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/CallDialog.vue
+++ b/src/pages/event-tracing/components/CallDialog.vue
@ -157,6 +157,8 @@ import { size } from "lodash";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/officeDeliveryDialog.vue
+++ b/src/pages/event-tracing/components/officeDeliveryDialog.vue
@ -166,6 +166,9 @@ import api from "@/services/eventTracingApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/officeDialog.vue
+++ b/src/pages/event-tracing/components/officeDialog.vue
@ -162,6 +162,9 @@ import api from "@/services/eventTracingApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/officeSealDialog.vue
+++ b/src/pages/event-tracing/components/officeSealDialog.vue
@ -160,6 +160,8 @@ import caseManagementapi from "@/services/caseManagement";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/officeWriteDialog.vue
+++ b/src/pages/event-tracing/components/officeWriteDialog.vue
@ -167,6 +167,8 @@ import api from "@/services/eventTracingApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/repaymentDialog.vue
+++ b/src/pages/event-tracing/components/repaymentDialog.vue
@ -174,6 +174,8 @@ import caseapi from "@/services/caseManagement";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/components/voideDialog.vue
+++ b/src/pages/event-tracing/components/voideDialog.vue
@ -168,6 +168,8 @@ export default {
      }
      this.queryParam.current = 1
      this.queryParam.size = 10
+      this.activeUsage = ''
+      this.queryDate = ''
    },
    handleSearch() {
      this.queryParam.size = 10;
--- a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue
@ -147,6 +147,8 @@ import api from "@/services/eventTracingApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue
@ -131,6 +131,8 @@ import api from "@/services/eventTracingApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue
@ -128,6 +128,8 @@ import api from "@/services/eventTracingApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue
@ -159,6 +159,8 @@ export default {
      }
      this.queryParam.current = 1
      this.queryParam.size = 10
+      this.activeUsage = ''
+      this.queryDate = ''
    },
    handleSearch() {
      this.queryParam.size = 10;
--- a/src/pages/mediation-management/index.vue
+++ b/src/pages/mediation-management/index.vue
@ -689,6 +689,8 @@ import { values } from "lodash";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/mediation-package/index.vue
+++ b/src/pages/mediation-package/index.vue
@ -23,9 +23,9 @@
                        <el-row :gutter="56">
                            <el-col :span="8">
                                <div class="flex-row-center align-items-center height-40 mb-24">
-                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">委案机构</span>
+                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">金融机构</span>
                                    <el-select v-model="queryParam.entrustingAgencyName"
-                                           clearable placeholder="请选择委案机构"
+                                           clearable placeholder="请选择金融机构"
                                           @keydown.enter.native="handleSearch"
                                           class="width100">
                                        <el-option
@ -101,7 +101,7 @@
                        <el-table-column type="index" label="序号" width="55"></el-table-column>
                        <!-- <el-table-column type="selection" width="55" ></el-table-column> -->
                        <el-table-column prop="pkgName" label="案件包名称" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="entrustingAgencyName" label="委案机构" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="entrustingAgencyName" label="金融机构" show-overflow-tooltip ></el-table-column>
                        <el-table-column prop="channel" label="委案渠道" show-overflow-tooltip ></el-table-column>
                        <el-table-column label="委案开始日期" show-overflow-tooltip >
                            <template slot-scope="scope">
@ -219,7 +219,7 @@ import api from "@/services/casePackageManagement";
                departmentOptions:[],//区域
                queryParam: {
                    pkgName:'',//案件包名称
-                    entrustingAgencyName: '',//委案机构
+                    entrustingAgencyName: '',//金融机构
                    endTime: '',//结束时间
                    beginTime:'',//开始时间
                    willEnd:'',
@ -229,7 +229,7 @@ import api from "@/services/casePackageManagement";
                usageOption: ['今日','昨日', '近一周', '近一月', '近半年', '近一年'],
                tableData: [],
                total:0,
-                orglist:[],//委案机构
+                orglist:[],//金融机构

            }
        },
@ -282,6 +282,8 @@ import api from "@/services/casePackageManagement";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/mediation-page/components/LayoutContent.vue
+++ b/src/pages/mediation-page/components/LayoutContent.vue
@ -91,7 +91,7 @@
                <div class="case-detail-label f-weight500 f18 mb-8">基本信息</div>
                <div class="case-detail-des flex-column">
                  <span><a>案件包名称：</a><a>河北幸福消费金融股份有限公司012341</a></span>
-                  <span><a>委案机构：</a><a>{{ baseInfo.financialOrgName }}</a></span>
+                  <span><a>金融机构：</a><a>{{ baseInfo.financialOrgName }}</a></span>
                  <span><a>委案开始日期：</a><a>{{ baseInfo.planStartTime }}</a></span>
                  <span><a>委案到期日期：</a><a>{{ baseInfo.planStartTime }}</a></span>
                  <span><a>债务人姓名：</a><a v-for="(item,index) in baseInfo.debtorEntityList"
--- a/src/pages/payment-receipt/index.vue
+++ b/src/pages/payment-receipt/index.vue
@ -306,6 +306,8 @@ import smapi from "@/services/systemManage";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            handleSearch() {
                this.queryParam.size = 10;
--- a/src/pages/statistical-analysis/components/financialCase.vue
+++ b/src/pages/statistical-analysis/components/financialCase.vue
@ -190,6 +190,9 @@ import statisticalAnalysisApi from "@/services/statisticalAnalysisApi";
                this.queryParam.current = 1
                this.queryParam.size = 10

+                this.activeUsage = ''
+                this.queryDate = ''
+                
                this.setDateFast()
            },
            // 搜索
--- a/src/pages/statistical-analysis/components/mediateCalls.vue
+++ b/src/pages/statistical-analysis/components/mediateCalls.vue
@ -210,6 +210,8 @@ import statisticalAnalysisApi from "@/services/statisticalAnalysisApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            // 搜索
            handleSearch() {
--- a/src/pages/statistical-analysis/components/mediatorPerformance.vue
+++ b/src/pages/statistical-analysis/components/mediatorPerformance.vue
@ -196,6 +196,8 @@ import statisticalAnalysisApi from "@/services/statisticalAnalysisApi";
                }
                this.queryParam.current = 1
                this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
            },
            // 搜索
            handleSearch() {
--- a/src/services/casePackageManagement.js
+++ b/src/services/casePackageManagement.js
@ -25,7 +25,7 @@ const caseManagementApi = {
        return service.service.post(`${apiMediate}case_pkg/dispatchCase`, data)
    },

-    // 委案机构
+    // 金融机构
    postorgs: data => {
        return service.service.post(`${apiMediate}case_pkg/orgs`, data)
    },