Merge branch 'main' into 'stg'

修改bug

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

src/pages/case-management/index.vue

@@ -462,13 +462,19 @@ import { values } from "lodash";
             },
             // 调解员数据
             getMediateUserList(){
-                let deptId = ''
+                // let deptId = ''
-                if(JSON.parse(sessionStorage.getItem('userInfo'))){
+                // if(JSON.parse(sessionStorage.getItem('userInfo'))){
-                    deptId = JSON.parse(sessionStorage.getItem('userInfo')).deptId
+                //     deptId = JSON.parse(sessionStorage.getItem('userInfo')).deptId
-                }
+                // }
-                smapi.getUserByDeptList({ids:[deptId]}).then(res => {
+                // smapi.getUserByDeptList({ids:[deptId]}).then(res => {
+                //     if (!res.code) {
+                //         this.MediateUserList = res
+                //     }
+                // })
+
+                smapi.getUserList({current:1,size:500,type:2}).then(res => {
                     if (!res.code) {
-                        this.MediateUserList = res
+                        this.MediateUserList = res.records
                     }
                 })
             },

src/pages/case-package/components/caseAllocationDialog.vue

@@ -127,6 +127,8 @@ import apipack from "@/services/casePackageManagement";
                 departmentOptions:[],//区域
                 checkedAll:[],
                 chooseChecked:[],
+
+                deptUsers:[]
             };
         },
         mounted () {
@@ -158,10 +160,33 @@ import apipack from "@/services/casePackageManagement";
             },
             // 根据区域id列表查看用户列表
             getByDeptList(){
+
+                // 当前区域自身
+                let deptList = []
+                let userlistmy = []
+                api.getUserByDeptList({ids:[this.deptId]}).then(res => {
+                    res.forEach(item =>{
+                        userlistmy.push({
+                            id:item.id,
+                            realName:item.realName,
+                            checked:false
+                        }) 
+                    })
+                })
+
+                deptList.push({
+                    deptId:this.deptId,
+                    name:this.departmentOptions.find(item=>{ return item.id == this.deptId}).name,
+                    count:this.departmentOptions.find(item=>{ return item.id == this.deptId}).count,
+                    checked:false,
+                    values:userlistmy
+                })
+                
+                // 下属区域或团队
                 api.getDeptList({companyId:this.$store.state.userinfo.companyId,current:1,size:500,pid:this.deptId}).then(res => {
                     if (!res.code) 
                     {
-                        let deptList = []
+                        // let deptList = []
                         res.records.forEach(item =>{
                             let userlist = []
                             api.getUserByDeptList({ids:[item.id]}).then(res => {
@@ -184,7 +209,6 @@ import apipack from "@/services/casePackageManagement";
                             })
                         })
                         this.peopleList = deptList
-                        
                     }
                 })
             },
@@ -387,6 +411,6 @@ import apipack from "@/services/casePackageManagement";
         margin-bottom:0;
     }
 }
-.min-height350{min-height: 350px;}
+.min-height350{height: 350px;}
 .department-dept ::v-deep .el-checkbox__label {color: $color-000000}
 </style>

src/pages/mediation-page/components/RepaymentCertificate.vue

@@ -265,7 +265,7 @@ import api from "@/services/caseManagement";
 
             updateClick(index,proofitem){
                 this.updateRow = index;
-                this.repaymentObj = proofitem
+                this.repaymentObj = JSON.parse(JSON.stringify(proofitem))
                 this.repaymentObj.mediaPath = [proofitem.proofUrl]
                 this.fileList = [{url: proofitem.proofUrl,fileName:'上传'}]
             },