diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue
index b2b9e41..4671f23 100644
--- a/src/pages/mediation-management/index.vue
+++ b/src/pages/mediation-management/index.vue
@@ -216,7 +216,7 @@
             <div class="pt-8">
                 <div class="height-56 flex-row align-items-center justify-content-between">
                     <div class="f22 color-text-primary">案件列表</div>
-                    <div class="flex-row">
+                    <div class="flex-row" v-if="activeName != 'mediated'">
                         <el-button size="small" @click="handleConclude"><i class="el-icon-receiving f14 mr-4"></i>案件办结</el-button> 
                         <el-button size="small" @click="handleSMSSend"><i class="el-icon-message f14 mr-4"></i>发送短信</el-button> 
                         <el-button size="small" @click="handleBrainCall"><i class="el-icon-service f14 mr-4"></i>智能外呼</el-button> 
@@ -318,11 +318,17 @@
                                         </span>
                                         <span class="cursor-pointer" @click="CaseTraceDialog = {activeName:'7',title:'还款计划',caseNo:scope.row.caseNo,caseId:scope.row.id}">
                                             <p>还款计划</p>
-                                            <p class="color-000"><a class="color-274ea4">{{scope.row.statistics.plan == 0 ? '未设置':'已设置'}}</a></p>
+                                            <p class="color-000">
+                                                <a v-if="scope.row.statistics.plan == 0">未设置</a>
+                                                <a v-else class="color-274ea4">已设置</a>
+                                            </p>
                                         </span>
                                         <span class="cursor-pointer" @click="CaseTraceDialog = {activeName:'8',title:'还款凭证',caseNo:scope.row.caseNo,caseId:scope.row.id}">
                                             <p>还款凭证</p>
-                                            <p class="color-000"><a class="color-274ea4">已填{{scope.row.statistics.proof}}</a></p>
+                                            <p class="color-000">
+                                                <a v-if="scope.row.statistics.proof == 0">未填</a>
+                                                <a v-else class="color-274ea4">已填{{scope.row.statistics.proof}}</a>
+                                            </p>
                                         </span>
                                     </div>
                                     <!-- <div class="flex-row justify-content-end">
diff --git a/src/pages/mediation-page/components/RepaymentSchedule.vue b/src/pages/mediation-page/components/RepaymentSchedule.vue
index 7920416..b427cac 100644
--- a/src/pages/mediation-page/components/RepaymentSchedule.vue
+++ b/src/pages/mediation-page/components/RepaymentSchedule.vue
@@ -325,6 +325,33 @@ import api from "@/services/caseManagement";
             this.getplanlist()
         },
         methods: {
+            validatePass2(rule, value, callback){
+                if (value === '') {
+                    callback(new Error('请输入分期前偿还金额'));
+                } else if (!/^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0.\d{1,2}$/.test(value)) {
+                    callback(new Error('只能输入2位小数金额'));
+                } else if (value*1 > this.repaymentObj.totalAmount*1) {
+                    callback(new Error('分期前偿还金额不能大于还款金额!'));
+                } else {
+                    callback();
+                }
+            },
+            validatePass3 (rule, value, callback){
+                if (value === '') {
+                    callback(new Error('请选择还款截止日期'));
+                } else if (this.repaymentObj.partDate != '' && this.repaymentObj.partDate != undefined) {
+                    let date1 = new Date(value);//还款截止日期
+                    let date2 = new Date(this.repaymentObj.partDate);//分期前偿还日期
+                    let timestamp1 = date1.getTime();
+                    let timestamp2 = date2.getTime();
+                    if(timestamp2 > timestamp1)
+                    {
+                        callback(new Error('还款截止日期不能小于分期前偿还日期!'));
+                    }
+                } else {
+                    callback();
+                }
+            },
             handleSubmitRepayment(){
                 console.log(1,'handleSubmitRepayment')
                 this.$refs.ruleFormRepayment.validate((valid) => {
diff --git a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
index 6267d64..47b2c8d 100644
--- a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
+++ b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
@@ -199,7 +199,7 @@ export default {
                     { required: true, message: '请输入员工姓名', trigger: ['blur','change'] }
                 ],
                 cardNo: [
-                    { required: false, message: '请输入身份证号', trigger: 'change',},
+                    { required: true, message: '请输入身份证号', trigger: 'change',},
                     { pattern: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/, message: '请输入正确的身份证号', trigger: ['blur', 'change']}
                 ], 
                 roleIds: [
diff --git a/src/pages/workbench/index.vue b/src/pages/workbench/index.vue
index b6610df..4bc2734 100644
--- a/src/pages/workbench/index.vue
+++ b/src/pages/workbench/index.vue
@@ -28,34 +28,42 @@
                                     <span class="case-pro1">
                                         <p>案件总量</p>
                                         <p><a>{{caseprogressObj.caseTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress1.png">
                                     </span>
                                     <span class="case-pro2">
                                         <p>案件待分</p>
                                         <p><a>{{caseprogressObj.unassignTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress8.png">
                                     </span>
                                     <span class="case-pro3">
                                         <p>未触达</p>
                                         <p><a>{{caseprogressObj.notReachTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress3.png">
                                     </span>
-                                    <span class="case-pro1">
+                                    <span class="case-pro4">
                                         <p>调解中</p>
                                         <p><a>{{caseprogressObj.mediatingTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress2.png">
                                     </span>
-                                    <span class="case-pro2">
+                                    <span class="case-pro5">
                                         <p>调解成功</p>
                                         <p><a>{{caseprogressObj.mediateSuccess}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress5.png">
                                     </span>
-                                    <span class="case-pro3">
+                                    <span class="case-pro6">
                                         <p>已签署协议</p>
                                         <p><a>{{caseprogressObj.signTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress6.png">
                                     </span>
-                                    <span class="case-pro1">
+                                    <span class="case-pro7">
                                         <p>已司法确认</p>
                                         <p><a>{{caseprogressObj.judicialTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress4.png">
                                     </span>
-                                    <span class="case-pro2">
+                                    <span class="case-pro8">
                                         <p>已赋强公证</p>
                                         <p><a>{{caseprogressObj.notarizationTotal}}</a>件</p>
+                                        <img src="../../assets/image/workbench/progress7.png">
                                     </span>
                                 </div>
                             </div>
@@ -632,14 +640,14 @@
     .case-progress-cont{
         background-color: #fff;
         border-radius: 5px;
-        font-size: 16px;
+        font-size: 18px;
     }
     .case-progress{
-        background:url(../../assets/image/workbench/icon-bg.png) no-repeat;
+        // background:url(../../assets/image/workbench/icon-bg.png) no-repeat;
         background-size: 100% 100%;
         height: 460px;
         margin: auto;
-        color: #4E5969;
+        color: #fff;
         span{
             padding: 15px 0 0px 15px;
             width: 153px;
@@ -652,9 +660,56 @@
             margin-left: 20px;
         }
         span p{padding: 0;margin: 0;}
-        span a{color: #1D2129;font-size: 22px;}
+        span a{color: #fff;font-size: 22px;padding-left: 20px;}
+
+        .case-pro1,.case-pro2,.case-pro3,.case-pro4,.case-pro5,.case-pro6,
+        .case-pro7,.case-pro8
+        {
+            width: 157px;height: 105px;
+            position: relative;
+            border-radius: 8px;
+
+            img{
+                width:50px ;
+                right:10px;
+                position:absolute;
+            }
+        }
+        .case-pro1
+        {
+            background-color: #0fdfdc;
+        }
+        .case-pro2
+        {
+            background-color: #ffd900;
+        }
+        .case-pro3
+        {
+            background-color: #59a8ff;
+        }
+        .case-pro4
+        {
+            background-color: #ff87b1;
+        }
+        .case-pro5
+        {
+            background-color: #978bff;
+        }
+        .case-pro6
+        {
+            background-color: #ffb048;
+        }
+        .case-pro7
+        {
+            background-color: #df5965;
+        }
+        .case-pro8
+        {
+            background-color: #d69a5e;
+        }
+
     }
-    .case-pro1{width: 155px;height: 105px;}
+    
 }
 .casework-1{
     background-color: #ec9dd82b;