Merge branch 'main' into 'stg'

Main

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

src/main.js

@@ -87,8 +87,8 @@ new Vue({
         if(!interviewFlag)
         {
           // 判断当前登录人角色，如果是普通调解员，则默认展示区域且不可选择
-          let identifier = this.$store.state.userinfo.roleIdentifier
+          let identifier = this.$store.state.userinfo.roleIdentifierList
-          if(identifier.includes('manager'))
+          if(identifier.includes('manager') || identifier.includes('admin'))
           {
             router.push('/workbench')
           }

src/pages/case-management/components/CalllogDialog.vue

@@ -83,7 +83,7 @@ import api from "@/services/caseManagement";
             };
         },
         mounted () {
-            console.log(this.eventTraDialog,'this.eventTraDialog')
+            // console.log(this.eventTraDialog,'this.eventTraDialog')
             this.queryParam.caseId = this.eventTraDialog.caseId
             this.getmediate_record()
         },

src/pages/case-management/components/CaseTraceDialog.vue

@@ -66,7 +66,7 @@
 import api from "@/services/caseManagement";
     export default {
         components: {
-            eventTracingDialog: () => import('../../event-tracing/index.vue'),//事项追踪
+            // eventTracingDialog: () => import('../../event-tracing/index.vue'),//事项追踪
             RepaymentSchedule: () => import('../../mediation-page/components/RepaymentSchedule.vue'),//还款计划
             RepaymentRecordDialog: () => import('./RepaymentRecordDialog.vue'),//还款凭证
 
@@ -75,9 +75,6 @@ import api from "@/services/caseManagement";
             CalllogDialog: () => import('./CalllogDialog.vue'),//呼叫记录
 
             voideDialog: () => import('../../event-tracing/components/voideDialog.vue'),//视频调解追踪
-
-            smsDialogDetail: () => import('../../event-tracing/dtraceDetail/smsDialogDetail.vue'),//短信发送追踪明细
-
             officeDeliveryDialogDetail: () => import('../../event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue'),//文书送达追踪明细
             officeDialogDetail: () => import('../../event-tracing/dtraceDetail/officeDialogDetail.vue'),//文书生成追踪明细
             officeWDialogDetail: () => import('../../event-tracing/dtraceDetail/officeWDialogDetail.vue'),//文书签字追踪明细

src/pages/case-management/index.vue

@@ -388,6 +388,7 @@ import { values } from "lodash";
                 queryParam: {
                     mediateRecordStatus:[],
                     pkgId:'',
+                    pkgName:'',
                     financialOrgName:'',//金融机构名称
                     caseNo: '',//案件编号
                     productTypeId: '',//产品类型id
@@ -483,12 +484,11 @@ import { values } from "lodash";
                 // 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')
+                // console.log(chooseData,'chooseData')
                 this.selectionData = value ? chooseData.map(el=>el.id) : [];
                 this.indeterminate = false;
 
             },
-
             // 导入
             handleImport(){
                 this.importCaseDialog={
@@ -535,12 +535,6 @@ import { values } from "lodash";
                     });
                 }).catch(() => {});
             },
-            // 新增
-            // handleAddForm(){
-            //     this.addCaseDialog={
-            //         title:'新增案件',
-            //     }
-            // },
             handleConclude() {
                 // 批量办结
                 if (this.selectionData.length == 0) {
@@ -590,6 +584,7 @@ import { values } from "lodash";
                 this.checkedCheckAll = false
 
                 this.queryParam.current = val
+                this.queryParam.allCase = true//查询所有案件
                 api.getCaseInfoList(this.queryParam).then(res => {
                     if (!res.code) {
                         this.tableData = res.records;

src/pages/event-tracing/components/officeWriteDialog.vue

@@ -148,6 +148,9 @@ import api from "@/services/eventTracingApi";
         },
         mounted () {
             this.queryParam.caseNo = this.eventTraDialog.caseNo
+            if (this.eventTraDialog.caseId != undefined && this.eventTraDialog.caseId != '') {
+                this.queryParam.caseId = this.eventTraDialog.caseId
+            }
             this.getList(1)
         },
         methods: {

src/pages/event-tracing/components/repaymentDialog.vue

@@ -188,6 +188,7 @@ import caseapi from "@/services/caseManagement";
             getProofList(val){
                 this.queryParam.startTime = this.queryParam.beginTime
                 this.queryParam.current = val
+                this.queryParam.isDebatorUpload = 1
                 api.posttrace_proof(this.queryParam).then(res => {
                     if (!res.code) {
                         this.tableData = res.records;

src/pages/event-tracing/components/voideDialog.vue

@@ -149,6 +149,9 @@ export default {
   },
   mounted() {
     this.queryParam.caseNo = this.eventTraDialog.caseNo
+    if (this.eventTraDialog.caseId != undefined && this.eventTraDialog.caseId != '') {
+      this.queryParam.caseId = this.eventTraDialog.caseId
+    }
     this.getList(1)
   },
   methods: {

src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue

@@ -127,6 +127,10 @@ import api from "@/services/eventTracingApi";
         },
         mounted () {
             this.queryParam.caseNo = this.DialogDetail.caseNo
+            if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') {
+                this.queryParam.caseId = this.DialogDetail.caseId
+            }
+
             this.queryParam.traceId = this.DialogDetail.id
             this.getList(1)
         },

src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue

@@ -112,6 +112,9 @@ import api from "@/services/eventTracingApi";
         mounted () {
             this.queryParam.traceId = this.DialogDetail.id
             this.queryParam.caseNo = this.DialogDetail.caseNo
+            if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') {
+                this.queryParam.caseId = this.DialogDetail.caseId
+            }
             this.getList(1)
         },
         methods: {

src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue

@@ -108,6 +108,9 @@ import api from "@/services/eventTracingApi";
         },
         mounted () {
             this.queryParam.caseNo = this.DialogDetail.caseNo
+            if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') {
+                this.queryParam.caseId = this.DialogDetail.caseId
+            }
             this.queryParam.traceId = this.DialogDetail.id
             this.getList(1)
         },

src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue

@@ -140,6 +140,10 @@ export default {
     if (this.DialogDetail.caseNo != undefined && this.DialogDetail.caseNo != '') {
       this.queryParam.caseNo = this.DialogDetail.caseNo
     }
+    if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') {
+      this.queryParam.caseId = this.DialogDetail.caseId
+    }
+
     this.queryParam.traceId = this.DialogDetail.id
     this.getList(1)
   },

src/pages/layout/components/SideMenu.vue

@@ -47,8 +47,8 @@
             if(this.menuTree.length>0)
             {
                 // 判断当前登录人角色，如果是普通调解员，则默认展示区域且不可选择
-                let identifier = this.$store.state.userinfo.roleIdentifier
+                let identifier = this.$store.state.userinfo.roleIdentifierList
-                if(identifier.includes('manager'))
+                if(identifier.includes('manager') || identifier.includes('admin'))
                 {
                     // 案件管理员
                     this.menuTree.unshift({children:[],id:0,menuIcon:"menu-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbench"})

src/pages/login/index.vue

@@ -183,17 +183,12 @@ export default {
             if (res.user.resources.length > 0) {
               
               let url = "/workbenchcm";
-              let identifier = res.user.roleIdentifier
+              let identifier = res.user.roleIdentifierList
-              if(identifier.includes('manager'))
+              if(identifier.includes('manager') || identifier.includes('admin'))
               {
                 url = '/workbench'
               }
-              // let data= res.user.resources[0].children[0]
+
-              // if(data.children.length>0){
-              //     url = data.children[0].url
-              // }else{
-              //     url = data.url
-              // }
               this.$store.commit('setRoutes', url)
               this.$router.push(url)
             } else {

src/pages/mediation-management/index.vue

@@ -664,6 +664,7 @@ import { values } from "lodash";
                 this.checkedCheckAll = false
 
                 this.queryParam.current = val
+                this.queryParam.dispatch = true //默认已分案
                 api.getCaseInfoList(this.queryParam).then(res => {
                     if (!res.code) {
                         this.tableData = res.records;

src/pages/system-management/area-management/components/addOrEditDeptDialog.vue

@@ -40,7 +40,7 @@
                     </el-row>  
                     <el-row v-if="Object.keys(this.addOrEditDeptConfig.data).length>0 && this.addOrEditDeptConfig.data.pid != 0"  type="flex" align="middle">
                         <el-col :span="24">
-                        <el-form-item label="区域负责人" prop="remark">
+                        <el-form-item label="团队负责人" prop="remark">
                             <el-select v-model="deptInfo.directorIds" multiple placeholder="请选择" class="width100" :multiple-limit="5">
                                 <el-option
                                 v-for="item in usersOptions"

src/pages/system-management/area-management/index.vue

@@ -6,7 +6,7 @@
                 <div class="flex-row color-text-regular f14">
                     <div class="mr-24">
                         <el-input
-                            placeholder="请输入搜索内容"
+                            placeholder="请输入团队名称"
                             suffix-icon="el-icon-search"
                             v-model.trim="queryData.name"
                             size="small"

src/pages/system-management/user-management/components/addOrEditUserDialog.vue

@@ -109,7 +109,7 @@
                     <el-row  type="flex" align="middle">
                         <el-col :span="24">
                         <el-form-item label="选择团队" prop="teamId">
-                            <el-select v-model="userInfo.teamId" clear placeholder="请选择" class="width100">
+                            <el-select v-model="userInfo.teamId" clear placeholder="请选择" class="width100" clearable>
                                 <el-option
                                 v-for="item in teamOptions"
                                 :key="item.id"