From bcefe9d3c85bbbb897ca50a943a52a28f0f8cbb5 Mon Sep 17 00:00:00 2001
From: tangchengming <445785772@qq.com>
Date: Sat, 8 Feb 2025 16:09:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9D=90=E5=B8=AD?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addOrEditRoleDialog.vue        | 144 ++++++++++++++++++
 .../take-management/index.vue                 | 140 +++++++++++++++++
 src/router/index.js                           |   6 +
 src/services/systemManage.js                  |  24 +++
 4 files changed, 314 insertions(+)
 create mode 100644 src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
 create mode 100644 src/pages/system-management/take-management/index.vue

diff --git a/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue b/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
new file mode 100644
index 0000000..932049f
--- /dev/null
+++ b/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
@@ -0,0 +1,144 @@
+<template>
+    <div>
+        <el-dialog
+            title="坐席绑定"
+            :visible="true"
+            width="400px"
+            append-to-body
+            :close-on-click-modal="false"
+            @close="handleClose">
+            <div class="dialog-content">
+                <el-form ref="ruleForm" 
+                    :model="userInfo" 
+                    :rules="rulesClient" 
+                    label-width="80px" 
+                    class="demo-ruleForm">
+                    <el-row  type="flex" align="middle">
+                        <el-col :span="24">
+                        <el-form-item label="用户" prop="name">
+                            <el-select v-model="userInfo.userId" placeholder="请选择">
+                                <el-option
+                                  v-for="item in userList"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                        </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row  type="flex" align="middle">
+                        <el-col :span="24">
+                        <el-form-item label="坐席电话" prop="remark">
+                            <el-select v-model="userInfo.seatTelephone" placeholder="请选择">
+                                <el-option
+                                  v-for="item in phoneList"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                        </el-form-item>
+                        </el-col>
+                    </el-row>                        
+                
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="handleClose()">取消</el-button>
+                <el-button type="primary" @click="handleSubmit()">确认</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import systemManageApi from "@/services/systemManage";
+export default {
+    name: 'addOrEditRoleDialog',
+    props: {
+        addOrEditRoleConfig: {
+            type: Boolean,
+            default: () => {
+                return false
+            }
+        },
+    },
+    data() {
+        return {
+            userInfo:{
+                userId:'',//用户
+                seatTelephone:'',//坐席电话
+            },
+            rulesClient: {
+                userId: [
+                    { required: true, message: '请选择用户', trigger: 'change',},
+                ],
+                seatTelephone: [
+                    { required: true, message: '请选择坐席电话', trigger: 'change',},
+                ],
+            },
+            phoneList: [],
+            userList: [],
+        }
+    },
+    mounted () {
+        this.getSeatPhone()
+        this.getSeatUnbindUser()
+    },
+    methods: {
+        getSeatPhone() {
+            systemManageApi.getSeatPhone({}).then(res => {
+                if (!res.code) {
+                    this.phoneList = res || []
+                }
+            })
+        },
+        getSeatUnbindUser() {
+            systemManageApi.getSeatUnbindUser({}).then(res => {
+                if (!res.code) {
+                    this.userList = res || []
+                }
+            })
+        },
+        handleSubmit() {
+            if(!this.$clickThrottle()) { return }
+            let _this=this;
+            this.$refs.ruleForm.validate((valid) => {
+                if(valid) {
+                    systemManageApi.seatUnbind(_this.userInfo).then(res => {
+                        this.$message({
+                            showClose: true,
+                            message: '绑定成功！',
+                            type: 'success'
+                        });
+                        this.$parent.getSeatList(1)
+                        this.handleClose()
+                    })
+                }
+            })
+                
+        },
+        handleClose() {
+            this.$emit('update:addOrEditRoleConfig', false)
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-content{
+    padding: $size16;
+    max-height:500px
+}
+
+::v-deep .el-dialog__header{
+    border-bottom: 1px solid $border-color-lighter !important;
+}
+
+::v-deep  .el-dialog__footer{
+    border-top: 1px solid $border-color-lighter !important;
+}
+</style>
+                
+    
\ No newline at end of file
diff --git a/src/pages/system-management/take-management/index.vue b/src/pages/system-management/take-management/index.vue
new file mode 100644
index 0000000..43e8f1b
--- /dev/null
+++ b/src/pages/system-management/take-management/index.vue
@@ -0,0 +1,140 @@
+<template>
+    <div class="layout-content-wrap background-color-fff border-radius-8">
+        <div class="border-b-solid-lighter-1 p-h-24">
+            <div class="flex-row justify-content-between height-56 align-items-center">
+                <div class="color-text-primary f22">坐席列表</div>
+                <div class="color-text-regular f14" >
+                    <el-button type="primary" @click="handleAddForm" size="small">新增</el-button>
+                </div>
+            </div>
+        </div>
+
+        <div class="layout-tabs-content-box">
+            <div class="">
+              <el-table ref="monthlyPlanTable"
+                :data="tableData"
+                :header-cell-style="{background:'#F5F7FA'}"
+                row-key="id"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+              >
+              <el-table-column
+                v-for="(item, i) in tableHead"
+                :key="i"
+                :prop="item.prop"
+                :label="item.label"
+                :width="item.width"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :formatter="item.formatter"
+                >
+                </el-table-column>  
+              <el-table-column  label="操作" width="100">
+                <template slot-scope="scope">
+                    <div class="flex-row">
+                        <div class="f14 color-1960F4 cursor-pointer mr-8" @click="handleAddForm(scope)">解绑</div>
+                    </div>
+                  
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <div class="text-center p-v-24">
+                  <el-pagination
+                      @size-change="getRoleList"
+                      @current-change="getRoleList"
+                      :current-page="queryData.current"
+                      :page-size="queryData.size"
+                      layout="total, prev, pager, next, jumper"
+                      :total="total">
+                  </el-pagination>
+            </div> 
+          </div>
+
+        </div>
+        <!-- 新增-编辑 -->
+        <addOrEditRoleDialog v-if="addOrEditRoleConfig" :addOrEditRoleConfig.sync="addOrEditRoleConfig" />
+    </div>
+</template>
+<script>
+import systemManageApi from "@/services/systemManage";
+export default {
+    components: {
+        addOrEditRoleDialog: () => import('./components/addOrEditRoleDialog.vue'),
+    },
+    data() {
+        return {
+            tableData:[],
+            tableHead: [
+                {
+                    prop: "userShowName",
+                    label: "用户名称",
+                    showOverflowTooltip: false,
+                    formatter: this.formatTable,
+                },
+                {
+                    prop: "seatTelephone",
+                    label: "座席电话",
+                    showOverflowTooltip: false,
+                    formatter: this.formatTable,
+                },
+                {
+                    prop: "bindTime",
+                    label: "绑定时间",
+                    showOverflowTooltip: false,
+                    formatter: this.formatTable,
+                },
+                
+            ],
+            queryData: {
+                current: 1,
+                size: 10,
+            },
+            total: 0,
+            addOrEditRoleConfig:null,//新增弹窗
+        }
+    },
+    created() {
+        this.getSeatList(1)
+    },
+    methods: {
+        getSeatList(val){
+            if(val!=undefined){this.queryData.current = val}
+            systemManageApi.getSeatList(this.queryData).then(res => {
+                if (!res.code) {
+                    this.tableData = res.records;
+                    this.total = res.total;
+                }
+            })
+        },
+        // 新增
+        handleAddForm(){
+            this.addOrEditRoleConfig = true
+        },
+        // 删除
+        handleDelete(scope){
+            this.$confirm("此操作将永久删除该角色, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                if(!this.$clickThrottle()) { return }//防止重复点击
+                systemManageApi.deleteRoleById({ id: scope.row.id }).then((res) => {
+                    
+                    this.$message.success("成功");
+                    this.getRoleList(1)
+                    
+                });
+            }).catch(() => {});
+        },
+        formatTable(row, column, cellValue, index) {
+            return cellValue || "-";
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.el-table--fit {
+    border:1px solid $border-color-lighter !important;
+    border-bottom: 0!important;
+}
+    
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 5ee00f7..861d49f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -99,6 +99,12 @@ const routes = [
             component: () => import("@/pages/system-management/department-management"),
             meta: { title: "团队管理", icon: 'menu-department-management' },
           },
+          {
+            path: "/system-management/take-management",
+            name: "/system-management/take-management",
+            component: () => import("@/pages/system-management/take-management"),
+            meta: { title: "坐席管理", icon: 'menu-take-management' },
+          },
         ]
       },
 
diff --git a/src/services/systemManage.js b/src/services/systemManage.js
index 3d9cd81..365fe43 100644
--- a/src/services/systemManage.js
+++ b/src/services/systemManage.js
@@ -77,6 +77,30 @@ const systemLogApi = {
     
     //========================end::角色相关======================================
 
+
+    //========================start::坐席相关======================================
+    // 角色列表
+    getSeatList: data => {
+        return service.service.post(`${apiAdmin}system/user/seat/page`, data)
+    },
+    // 座席绑定
+    seatBind: data => {
+        return service.service.post(`${apiAdmin}system/user/seat/bind`, data)
+    },
+    // 座席绑定
+    seatUnbind: data => {
+        return service.service.post(`${apiAdmin}system/user/seat/unbind`, data)
+    },
+    // 获取坐席电话
+    getSeatPhone: data => {
+        return service.service.get(`${apiAdmin}system/user/seat/phone`, data)
+    },
+    // 获取未绑定坐席用户
+    getSeatUnbindUser: data => {
+        return service.service.post(`${apiAdmin}system/user/seat/unbind/user`, data)
+    },
+    //========================end::坐席相关======================================
+
     //========================start::菜单管理======================================
     // 菜单列表
     getResourceList: data => {

From ca1bb469eb2978d4e0563ba7bbe510a388868641 Mon Sep 17 00:00:00 2001
From: tangchengming <445785772@qq.com>
Date: Sat, 8 Feb 2025 17:40:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=9D=90=E5=B8=AD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../take-management/components/addOrEditRoleDialog.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue b/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
index 932049f..d4401eb 100644
--- a/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
+++ b/src/pages/system-management/take-management/components/addOrEditRoleDialog.vue
@@ -15,13 +15,13 @@
                     class="demo-ruleForm">
                     <el-row  type="flex" align="middle">
                         <el-col :span="24">
-                        <el-form-item label="用户" prop="name">
+                        <el-form-item label="用户" prop="userId">
                             <el-select v-model="userInfo.userId" placeholder="请选择">
                                 <el-option
                                   v-for="item in userList"
-                                  :key="item.value"
-                                  :label="item.label"
-                                  :value="item.value">
+                                  :key="item.id"
+                                  :label="item.realName"
+                                  :value="item.id">
                                 </el-option>
                               </el-select>
                         </el-form-item>
@@ -29,7 +29,7 @@
                     </el-row>
                     <el-row  type="flex" align="middle">
                         <el-col :span="24">
-                        <el-form-item label="坐席电话" prop="remark">
+                        <el-form-item label="坐席电话" prop="seatTelephone">
                             <el-select v-model="userInfo.seatTelephone" placeholder="请选择">
                                 <el-option
                                   v-for="item in phoneList"

From 3c7fe3535516189aee63ed3fd3b1b4cf05e2bfa8 Mon Sep 17 00:00:00 2001
From: tangchengming <445785772@qq.com>
Date: Mon, 10 Feb 2025 15:51:05 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system-management/take-management/index.vue | 8 ++++----
 src/services/systemManage.js                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/system-management/take-management/index.vue b/src/pages/system-management/take-management/index.vue
index 43e8f1b..2dba8b2 100644
--- a/src/pages/system-management/take-management/index.vue
+++ b/src/pages/system-management/take-management/index.vue
@@ -111,16 +111,16 @@ export default {
         },
         // 删除
         handleDelete(scope){
-            this.$confirm("此操作将永久删除该角色, 是否继续?", "提示", {
+            this.$confirm("确定解绑坐席电话, 是否继续?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
             }).then(() => {
                 if(!this.$clickThrottle()) { return }//防止重复点击
-                systemManageApi.deleteRoleById({ id: scope.row.id }).then((res) => {
+                systemManageApi.seatUnbind({ id: scope.row.id }).then((res) => {
                     
-                    this.$message.success("成功");
-                    this.getRoleList(1)
+                    this.$message.success("解绑成功");
+                    this.getSeatList(1)
                     
                 });
             }).catch(() => {});
diff --git a/src/services/systemManage.js b/src/services/systemManage.js
index 365fe43..3d9eafa 100644
--- a/src/services/systemManage.js
+++ b/src/services/systemManage.js
@@ -87,7 +87,7 @@ const systemLogApi = {
     seatBind: data => {
         return service.service.post(`${apiAdmin}system/user/seat/bind`, data)
     },
-    // 座席绑定
+    // 座席解绑
     seatUnbind: data => {
         return service.service.post(`${apiAdmin}system/user/seat/unbind`, data)
     },

From 52d5385a656d0fe5560d16f45e34e40940af8903 Mon Sep 17 00:00:00 2001
From: liuxi <357439530@qq.com>
Date: Tue, 11 Feb 2025 10:57:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/common.scss                  |  3 ++
 .../components/caseAllocationDialog.vue       |  2 +-
 src/pages/case-management/detail/index.vue    |  2 +-
 src/pages/case-management/index.vue           | 17 +++++++---
 .../event-tracing/components/CallDialog.vue   | 33 ++++++++++++-------
 .../components/officeDeliveryDialog.vue       |  7 ++--
 .../event-tracing/components/officeDialog.vue |  7 ++--
 .../components/officeSealDialog.vue           |  7 ++--
 .../components/officeWriteDialog.vue          |  7 ++--
 .../components/repaymentDialog.vue            |  7 ++--
 .../event-tracing/components/smsDialog.vue    | 10 ++++--
 .../event-tracing/components/voideDialog.vue  |  7 ++--
 .../officeDeliveryDialogDetail.vue            |  7 ++--
 .../dtraceDetail/officeDialogDetail.vue       |  7 ++--
 .../dtraceDetail/officeWDialogDetail.vue      |  7 ++--
 .../dtraceDetail/smsDialogDetail.vue          | 14 +++++---
 src/pages/mediation-management/index.vue      |  2 ++
 .../components/MediationRoom.vue              |  7 +---
 src/pages/workbench/index.vue                 |  2 +-
 src/services/casePackageManagement.js         |  1 -
 src/utils/util.js                             |  2 +-
 21 files changed, 96 insertions(+), 62 deletions(-)

diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index c8f5953..77655c9 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -129,6 +129,9 @@ html{
 .color-4E5969{
   color: #4E5969;
 }
+.color-48b928{
+    color: #48b928 !important;
+  }
 
 .color-text-primary{
     color: $color-text-primary;
diff --git a/src/pages/case-management/components/caseAllocationDialog.vue b/src/pages/case-management/components/caseAllocationDialog.vue
index efdbc94..fd9dc47 100644
--- a/src/pages/case-management/components/caseAllocationDialog.vue
+++ b/src/pages/case-management/components/caseAllocationDialog.vue
@@ -342,7 +342,7 @@ import apipack from "@/services/casePackageManagement";
                             userList:chooseUser
                         }
 
-                        apipack.postpkgdispatchCase(data).then(res => {
+                        api.dispatchCase(data).then(res => {
                             this.$message({
                                 showClose: true,
                                 message: '调解案件分配成功！',
diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue
index 8118355..fd921b5 100644
--- a/src/pages/case-management/detail/index.vue
+++ b/src/pages/case-management/detail/index.vue
@@ -316,7 +316,7 @@
               <el-table-column label="操作" width="170">
                 <template slot-scope="scope">
                   <div class="flex-row align-items-center">
-                    <!-- <el-button size="mini" @click="handleCaseDelete(scope)">删除</el-button> -->
+                    <el-button size="mini" @click="handleCaseDelete(scope)">删除</el-button>
                     <el-button size="mini" @click="handleCaseShow(scope,fileList)">查看</el-button>
                   </div>
                 </template>
diff --git a/src/pages/case-management/index.vue b/src/pages/case-management/index.vue
index 5372170..688020a 100644
--- a/src/pages/case-management/index.vue
+++ b/src/pages/case-management/index.vue
@@ -211,7 +211,7 @@
                     </div>
                 </div>
                 <div class="height-56 flex-row align-items-center justify-content-between" style="height: 22px;margin-left: 10px;margin-top: -10px;margin-bottom: 5px">
-                    <div class="f22 color-text-primary"><el-checkbox  :indeterminate="indeterminate" @change="handleCheckAllChange">全选</el-checkbox></div>
+                    <div class="f22 color-text-primary"><el-checkbox  :indeterminate="indeterminate" v-model="checkedCheckAll" @change="handleCheckAllChange">全选</el-checkbox></div>
                 </div>
                 
                 <div class="case-table">
@@ -233,7 +233,7 @@
                                             <el-checkbox-group v-model="selectionData">
                                                 <!-- 此处的label是复选框右边显示的值，也是选中后的值。如果要一行的数据，直接使用row即可 -->
                                                 <!-- label的内容会显示在页面上，需要配合css把label的内容隐藏掉 -->
-                                                <el-checkbox :disabled="scope.row.caseStatus == 1 ? true :false" :key="scope.row.id" :label="scope.row.id"></el-checkbox>
+                                                <el-checkbox :disabled="scope.row.caseStatus == 0 || scope.row.caseStatus == 1 ? false :true" :key="scope.row.id" :label="scope.row.id"></el-checkbox>
                                             </el-checkbox-group>
                                         </span>
                                         <span class="f-weight500 color-000 f16">被申请人：
@@ -366,6 +366,7 @@ import { values } from "lodash";
         },
         data() {
             return {
+                checkedCheckAll:false,
                 CaseTraceDialog:null,//各种案件追踪记录
                 isCheck: false,//全选按钮绑定值
                 indeterminate: false,//全选按钮的不确定状态，选中数据selectionData的长度length符合  0 < selectionData.length < enabledDataList.length ，值为true
@@ -473,9 +474,13 @@ import { values } from "lodash";
             },
             // 全选
             handleCheckAllChange(value){
-
-                this.selectionData = value ? this.enabledDataList.map(el=>el.id) : [];
+                // this.selectionData = value ? this.enabledDataList.map(el=>el.id) : [];
+                // this.indeterminate = false;
+                let chooseData = this.enabledDataList.filter(el=>(el.caseStatus == 0 || el.caseStatus == 1))
+                console.log(chooseData,'chooseData')
+                this.selectionData = value ? chooseData.map(el=>el.id) : [];
                 this.indeterminate = false;
+
             },
 
             // 导入
@@ -574,6 +579,10 @@ import { values } from "lodash";
             },
             // 列表数据
             getCaseInfoList(val){
+                // 选择状态重置
+                this.selectionData = []
+                this.checkedCheckAll = false
+
                 this.queryParam.current = val
                 api.getCaseInfoList(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/CallDialog.vue b/src/pages/event-tracing/components/CallDialog.vue
index 7ca4888..5abdc5e 100644
--- a/src/pages/event-tracing/components/CallDialog.vue
+++ b/src/pages/event-tracing/components/CallDialog.vue
@@ -7,7 +7,7 @@
                 </div>
                 <el-collapse-transition>
                     <el-row :gutter="56">
-                        <el-col :span="8">
+                        <!-- <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>
                                 <el-input v-model.trim="queryParam.pkgName"
@@ -15,7 +15,7 @@
                                             @keydown.enter.native="handleSearch">
                                 </el-input>
                             </div>
-                        </el-col>
+                        </el-col> -->
                         <el-col :span="12">
                             <div class="justify-content-start  align-items-center height-40 mb-24">
                                 <span class="tabs__search-criteria-title flex-shrink-0 pr-16">操作时间</span>
@@ -30,7 +30,7 @@
                                 </el-date-picker>
                             </div>
                         </el-col>
-                        <el-col :span="4">
+                        <el-col :span="12">
                             <div class="flex-row align-items-center justify-content-end">
                                 <el-button @click="hanldeReset">重置</el-button>
                                 <el-button type="primary" @click="handleSearch">搜索</el-button>
@@ -54,17 +54,23 @@
                         <!-- <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="queueName" label="队列名称" show-overflow-tooltip ></el-table-column> -->
-                        <el-table-column prop="objectCount" label="外呼对象数" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="calledCount" label="已呼数" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="connectedCount" label="接通数" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="notConnectedCount" label="未接通数" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="notCalledCount" label="未呼数" show-overflow-tooltip ></el-table-column>
-                        <el-table-column prop="createByName" label="操作人" show-overflow-tooltip ></el-table-column>
                         <el-table-column label="操作时间" show-overflow-tooltip >
                             <template slot-scope="scope">
                                 <span >{{ scope.row.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
                             </template>
                         </el-table-column>
+                        <el-table-column prop="createByName" label="操作人" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="objectCount" label="外呼对象数" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="calledCount" label="已呼数" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="connectedCount" label="接通数" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="notConnectedCount" label="未接通数" show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="notCalledCount" label="未呼数" show-overflow-tooltip ></el-table-column>
+                        <!-- <el-table-column prop="createByName" label="操作人" show-overflow-tooltip ></el-table-column> -->
+                        <!-- <el-table-column label="操作时间" show-overflow-tooltip >
+                            <template slot-scope="scope">
+                                <span >{{ scope.row.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
+                            </template>
+                        </el-table-column> -->
                         
                         <el-table-column  label="操作" width="160">
                             <template slot-scope="scope">
@@ -130,7 +136,9 @@ import { size } from "lodash";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -167,8 +175,9 @@ import { size } from "lodash";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                // this.queryParam.planBegin = this.queryParam.beginTime
+                // this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_calling(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/officeDeliveryDialog.vue b/src/pages/event-tracing/components/officeDeliveryDialog.vue
index f24a289..251becd 100644
--- a/src/pages/event-tracing/components/officeDeliveryDialog.vue
+++ b/src/pages/event-tracing/components/officeDeliveryDialog.vue
@@ -153,7 +153,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -177,8 +179,7 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_served(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/officeDialog.vue b/src/pages/event-tracing/components/officeDialog.vue
index 2c474d7..2672710 100644
--- a/src/pages/event-tracing/components/officeDialog.vue
+++ b/src/pages/event-tracing/components/officeDialog.vue
@@ -149,7 +149,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -173,8 +175,7 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_generate(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/officeSealDialog.vue b/src/pages/event-tracing/components/officeSealDialog.vue
index 34f1e9f..9c255ec 100644
--- a/src/pages/event-tracing/components/officeSealDialog.vue
+++ b/src/pages/event-tracing/components/officeSealDialog.vue
@@ -147,7 +147,9 @@ import caseManagementapi from "@/services/caseManagement";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -170,8 +172,7 @@ import caseManagementapi from "@/services/caseManagement";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_seal(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/officeWriteDialog.vue b/src/pages/event-tracing/components/officeWriteDialog.vue
index 5706cb9..c0c27aa 100644
--- a/src/pages/event-tracing/components/officeWriteDialog.vue
+++ b/src/pages/event-tracing/components/officeWriteDialog.vue
@@ -154,7 +154,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -177,8 +179,7 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_sign(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/repaymentDialog.vue b/src/pages/event-tracing/components/repaymentDialog.vue
index 19190a7..7341960 100644
--- a/src/pages/event-tracing/components/repaymentDialog.vue
+++ b/src/pages/event-tracing/components/repaymentDialog.vue
@@ -161,7 +161,9 @@ import caseapi from "@/services/caseManagement";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -184,8 +186,7 @@ import caseapi from "@/services/caseManagement";
             },
             // 列表数据
             getProofList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_proof(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/smsDialog.vue b/src/pages/event-tracing/components/smsDialog.vue
index d761a39..1dcad41 100644
--- a/src/pages/event-tracing/components/smsDialog.vue
+++ b/src/pages/event-tracing/components/smsDialog.vue
@@ -149,7 +149,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -162,6 +164,8 @@ import api from "@/services/eventTracingApi";
                 }
                 this.queryParam.current = 1
                 this.queryParam.size = 10
+                this.activeUsage = ''
+                this.queryDate = ''
             },
             handleSearch() {
                 this.queryParam.size = 10;
@@ -170,8 +174,8 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
+                // this.queryParam.planEnd = this.queryParam.endTime
                 this.queryParam.current = val
                 api.posttrace_sms(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/components/voideDialog.vue b/src/pages/event-tracing/components/voideDialog.vue
index 3a88c2f..eaecfee 100644
--- a/src/pages/event-tracing/components/voideDialog.vue
+++ b/src/pages/event-tracing/components/voideDialog.vue
@@ -155,7 +155,9 @@ export default {
     handleChangeDate() {
       this.activeUsage = ''
       if (this.queryDate === null) {
-        this.setDateFast()
+        this.queryParam.beginTime = ''
+        this.queryParam.endTime = ''
+        this.queryDate = ''
       } else {
         this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
         this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -178,8 +180,7 @@ export default {
     },
     // 列表数据
     getList(val) {
-      this.queryParam.planBegin = this.queryParam.beginTime
-      this.queryParam.planEnd = this.queryParam.endTime
+      this.queryParam.startTime = this.queryParam.beginTime
       this.queryParam.current = val ? val : this.queryParam.current;
       api.posttrace_video(this.queryParam).then(res => {
         if (!res.code) {
diff --git a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue
index a5e2d46..802f887 100644
--- a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue
@@ -134,7 +134,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -157,8 +159,7 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_served_detail(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue
index f6a0ea5..5c4e335 100644
--- a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue
@@ -118,7 +118,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -141,8 +143,7 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_generate_detail(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue
index d8d8a8a..dbd6993 100644
--- a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue
@@ -115,7 +115,9 @@ import api from "@/services/eventTracingApi";
             handleChangeDate() {
                 this.activeUsage = ''
                 if(this.queryDate === null) {
-                    this.setDateFast()
+                    this.queryParam.beginTime = ''
+                    this.queryParam.endTime = ''
+                    this.queryDate = ''
                 }else {
                     this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
                     this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -138,8 +140,7 @@ import api from "@/services/eventTracingApi";
             },
             // 列表数据
             getList(val){
-                this.queryParam.planBegin = this.queryParam.beginTime
-                this.queryParam.planEnd = this.queryParam.endTime
+                this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
                 api.posttrace_sign_detail(this.queryParam).then(res => {
                     if (!res.code) {
diff --git a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue
index bfd55b9..1871011 100644
--- a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue
+++ b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue
@@ -9,7 +9,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.pkgName"
+              <el-input v-model.trim="queryParam.contact"
                         clearable placeholder="请输入短信接收人"
                         @keydown.enter.native="handleSearch">
               </el-input>
@@ -78,7 +78,7 @@
           <el-table-column prop="createByName" label="操作人" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作时间" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ scope.row.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
+              <span>{{ scope.row.updateAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
             </template>
           </el-table-column>
 
@@ -123,6 +123,7 @@ export default {
     return {
       queryDate: '',
       queryParam: {
+        contact:'',
         traceId: '',
         phone: '',
         beginTime: '',
@@ -146,7 +147,9 @@ export default {
     handleChangeDate() {
       this.activeUsage = ''
       if (this.queryDate === null) {
-        this.setDateFast()
+        this.queryParam.beginTime = ''
+        this.queryParam.endTime = ''
+        this.queryDate = ''
       } else {
         this.queryParam.beginTime = this.$util.getDayStart(this.queryDate[0])
         this.queryParam.endTime = this.$util.getDayEnd(this.queryDate[1])
@@ -169,8 +172,9 @@ export default {
     },
     // 列表数据
     getList(val) {
-      this.queryParam.planBegin = this.queryParam.beginTime
-      this.queryParam.planEnd = this.queryParam.endTime
+      this.queryParam.startTime = this.queryParam.beginTime
+      // this.queryParam.planBegin = this.queryParam.beginTime
+      // this.queryParam.planEnd = this.queryParam.endTime
       this.queryParam.current = val
       api.posttrace_sms_detail(this.queryParam).then(res => {
         if (!res.code) {
diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue
index eb6cdf8..157c5e5 100644
--- a/src/pages/mediation-management/index.vue
+++ b/src/pages/mediation-management/index.vue
@@ -695,6 +695,8 @@ import { values } from "lodash";
                 this.queryParam.size = 10
                 this.activeUsage = ''
                 this.queryDate = ''
+                this.activeName = 'all'
+                this.getCaseInfoList(1)
             },
             handleSearch() {
                 this.queryParam.size = 10;
diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index b41bd96..53983b4 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -340,12 +340,7 @@ export default {
         caseId:'',
         linkedWay:''
       },
-      materialTypeOptions: [
-        {label:'承诺账户',value:'1'},{label:'重点账户',value:'2'},{label:'拒联账户',value:'3'},{label:'已结清客户',value:'4'},
-        {label:'疑难账户',value:'5'},{label:'失联账户',value:'6'},{label:'半失联账户',value:'7'},{label:'部分还款账户',value:'8'},
-        {label:'适诉案件',value:'9'},{label:'可联账户',value:'10'},{label:'投诉倾向客户',value:'11'},{label:'分期客户',value:'12'},
-        {label:'其他/无标签',value:'13'}
-      ],
+      materialTypeOptions: this.$util.getMediationprogress(),
 
       queue: false,
       queueList: [],
diff --git a/src/pages/workbench/index.vue b/src/pages/workbench/index.vue
index e3d9834..7fed792 100644
--- a/src/pages/workbench/index.vue
+++ b/src/pages/workbench/index.vue
@@ -171,7 +171,7 @@
                                     <span>文书送达追踪</span><span><a>{{traceData.documentDeliveryTrackingCount.failed}}</a>/<a>{{traceData.documentDeliveryTrackingCount.total}}</a></span>
                                 </div>
                                 <div class="flex-row justify-content-between cursor-pointer" @click="eventTraDialog={traceType:7,title:'还款凭证登记'}">
-                                    <span>还款凭证登记</span><span><a>{{traceData.repaymentRecordTrackingCount.failed}}</a>/<a>{{traceData.repaymentRecordTrackingCount.total}}</a></span>
+                                    <span>还款凭证登记</span><span><a class="color-48b928">{{traceData.repaymentRecordTrackingCount.failed}}</a>/<a>{{traceData.repaymentRecordTrackingCount.total}}</a></span>
                                 </div>
                             </div>
                         </div>
diff --git a/src/services/casePackageManagement.js b/src/services/casePackageManagement.js
index f4e9ef8..cae2b8b 100644
--- a/src/services/casePackageManagement.js
+++ b/src/services/casePackageManagement.js
@@ -24,7 +24,6 @@ const caseManagementApi = {
     postpkgdispatchCase: data => {
         return service.service.post(`${apiMediate}case_pkg/dispatchCase`, data)
     },
-
     // 金融机构
     postorgs: data => {
         return service.service.post(`${apiMediate}case_pkg/orgs`, data)
diff --git a/src/utils/util.js b/src/utils/util.js
index 553b83d..ec46c8e 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -449,7 +449,7 @@ const util = {
         return [
             {label:'承诺账户',value:1},{label:'重点账户',value:2},{label:'拒联账户',value:3},{label:'已结清客户',value:4},
             {label:'疑难账户',value:5},{label:'失联账户',value:6},{label:'半失联账户',value:7},{label:'部分还款账户',value:8},
-            {label:'适诉案件',value:9},{label:'可联账户',value:11},{label:'投诉倾向客户',value:11},{label:'分期客户',value:12},
+            {label:'适诉案件',value:9},{label:'可联账户',value:10},{label:'投诉倾向客户',value:11},{label:'分期客户',value:12},
             {label:'其他/无标签',value:13}
           ]
     },