From 3e73a924a5f569ed8f9959f32045e2a3036af536 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 26 Dec 2024 18:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=A7=A3=E5=91=98=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/mediation-management/index.vue | 5 +- src/pages/mediation-package/index.vue | 205 ++++++------------ .../components/addOrEditUserDialog.vue | 36 ++- src/services/casePackageManagement.js | 6 + 4 files changed, 105 insertions(+), 147 deletions(-) diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue index e3df601..4002fec 100644 --- a/src/pages/mediation-management/index.vue +++ b/src/pages/mediation-management/index.vue @@ -475,9 +475,12 @@ import { values } from "lodash"; }, created() { - if (this.$route.query.dataKey != undefined) { + if (this.$route.query.pkgId != undefined) { this.queryParam.pkgId = this.$route.query.pkgId; } + if (this.$route.query.pkgName != undefined) { + this.queryParam.pkgName = this.$route.query.pkgName; + } this.getCaseInfoList(1) }, computed:{ diff --git a/src/pages/mediation-package/index.vue b/src/pages/mediation-package/index.vue index 764a199..6b53d46 100644 --- a/src/pages/mediation-package/index.vue +++ b/src/pages/mediation-package/index.vue @@ -97,31 +97,87 @@
- + - + - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -141,15 +197,7 @@
- - - - - - - - @@ -157,10 +205,6 @@ import api from "@/services/casePackageManagement"; export default { components: { - importPackageDialog: () => import('./components/importPackageDialog'),//导入 - addCaseDialog: () => import('./components/addCaseDialog'),//新增 - // editCaseDrawer: () => import('./components/editCaseDrawer'),//编辑 - caseAllocationDialog: () => import('./components/caseAllocationDialog'),//案件分配 }, data() { @@ -185,19 +229,11 @@ import api from "@/services/casePackageManagement"; usageOption: ['今日','昨日', '近一周', '近一月', '近半年', '近一年'], tableData: [], total:0, - uniqueSelection:[], - caseAllocationDialog:null,//案件分配弹框 - importCaseDialog:null,//导入 - addCaseDialog:null,//新增 - editCaseDrawer:null,//编辑 orglist:[],//委案机构 - - } }, created() { - this.getOrgList() this.getCaseInfoList(1) }, @@ -224,107 +260,12 @@ import api from "@/services/casePackageManagement"; } }) }, - // 导入 - handleImport(){ - this.importCaseDialog={ - title:'批量导入案件', - } - }, - // 批量删除 - handleBatchDelete(){ - if(this.uniqueSelection.length==0){ - this.$message.warning("请先选择你要删除的列表数据"); - return - } - this.$confirm("请确定是否删除这些数据?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }).then(() => { - if(!this.$clickThrottle()) { return }//防止重复点击 - - let data = { - ids:this.uniqueSelection - } - api.deleteCaseBatch(data).then((res) => { - - this.$message.success("成功"); - this.getCaseInfoList(1) - - }); - }).catch(() => {}); - }, - // 单条删除 - handleDelete(scope){ - this.$confirm("请确定是否删除此条数据?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }).then(() => { - if(!this.$clickThrottle()) { return }//防止重复点击 - api.CasePkgdeleteById({id:scope.row.id}).then((res) => { - - this.$message.success("删除成功"); - this.getCaseInfoList(1) - - }); - }).catch(() => {}); - }, - //撤回分案 - handleBackCase(scope){ - this.$confirm("请确定是否撤回分案?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }).then(() => { - if(!this.$clickThrottle()) { return }//防止重复点击 - api.postpkgquash({id:scope.row.id}).then((res) => { - this.$message.success("撤回分案成功"); - this.getCaseInfoList(1) - - }); - }).catch(() => {}); - }, - // 新增 - handleAddForm(){ - this.addCaseDialog={ - title:'新增案件', - } - }, - // 案件分配 - handleCaseAllocation(scope){ - if((scope.row.caseTotal - scope.row.assignTotal) <= 0) - { - this.$message({ - showClose: true, - message: '该案件包没有待分配的案件！', - type: 'warning' - }); - return false - } - - - this.caseAllocationDialog={ - title:'案件分配', - ObjectInfo:scope.row - } - }, - // 编辑 - handleEdit(scope){ - this.editCaseDrawer={ - title:'编辑案件', - data:scope.row, - currentPage:this.queryParam.current - } - }, // 列表数据 getCaseInfoList(val){ - - this.queryParam.planBegin = this.queryParam.beginTime this.queryParam.planEnd = this.queryParam.endTime this.queryParam.current = val - api.getCasePkgQuery(this.queryParam).then(res => { + api.postquery_by_case(this.queryParam).then(res => { if (!res.code) { this.tableData = res.records; this.total = res.total; @@ -405,16 +346,6 @@ import api from "@/services/casePackageManagement"; } }, - - handleSelectionChange(val){ - console.log('获取val',val) - this.uniqueSelection = [] - val.forEach((row)=>{ - this.uniqueSelection.push(row.id) - }) - console.log('uniqueSelection',this.uniqueSelection) - - }, } } diff --git a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue index d001870..f3d502e 100644 --- a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue +++ b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue @@ -121,7 +121,7 @@ - + @@ -175,8 +175,7 @@ export default { deptId:'', deptIds:[], type: 2, - status:1, - identity:3 + status:1 }, rulesClient: { password: [ @@ -216,10 +215,17 @@ export default { handleSubmit(){ if(!this.$clickThrottle()) { return } let _this=this; - console.log(_this.userInfo,'_this.userInfo') this.$refs.ruleForm.validate(async(valid) => { if (valid) { _this.userInfo.username = _this.userInfo.phone; + + if(_this.userInfo.teamId!=''){ + _this.userInfo.deptId = _this.userInfo.teamId; + } + else + { + _this.userInfo.deptId = _this.userInfo.regionId; + } if(Object.keys(this.addOrEditUserConfig.data).length>0) { api.updateUserById(_this.userInfo).then(res => { @@ -315,7 +321,7 @@ export default { }, regionChange(type){ this.teamOptions = [] - if(type != 0){ this.userInfo.teamId = '' } + if(type != 0){ this.userInfo.teamId = null } if(this.userInfo.regionId != '') { api.getDeptList({current: 1,size: 100,companyId:this.$store.state.userinfo.companyId,pid:this.userInfo.regionId}).then(res => { @@ -335,9 +341,21 @@ export default { if(Object.keys(this.addOrEditUserConfig.data).length>0) { - this.userInfo = JSON.parse(JSON.stringify(this.addOrEditUserConfig.data)); - this.userInfo.regionId = '0' - this.userInfo.teamId = '' + let dataJson=JSON.parse(JSON.stringify(this.addOrEditUserConfig.data)); + this.userInfo.id = dataJson.id; + this.userInfo.deptId = dataJson.deptId; + this.userInfo.email = dataJson.email; + this.userInfo.phone = dataJson.phone; + this.userInfo.realName = dataJson.realName; + this.userInfo.remark = dataJson.remark; + this.userInfo.roleIds = dataJson.roleIds; + this.userInfo.regionId = ''; + this.userInfo.teamId = ''; + // this.userInfo.regionId = '0' + // this.userInfo.teamId = '' + // this.userInfo.teamId = '' + // {"deptId":10,"email":"","headUrl":"","id":46,"identity":2,"phone":"18381082759","realName":"熊静霞", + // "remark":"","resources":[],"roleIds":[11],"showName":"熊静霞","status":1,"tenantKey":"","type":2,"typeName":"","updateAt":"2024-12-24 05:58:23","updateBy":46,"username":"18381082759","regionId":"10","teamId":""} } diff --git a/src/services/casePackageManagement.js b/src/services/casePackageManagement.js index 77b52c7..128dcf0 100644 --- a/src/services/casePackageManagement.js +++ b/src/services/casePackageManagement.js @@ -30,6 +30,12 @@ const caseManagementApi = { return service.service.post(`${apiMediate}case_pkg/orgs`, data) }, + // 调解人员的案件包 + postquery_by_case: data => { + return service.service.post(`${apiMediate}case_pkg/query-by-case`, data) + }, + + //========================end::案件包管理====================================== }