From 10d8eaac7973c3be9fdf14d0551c0b4c6fd358a7 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 19 Jan 2024 14:36:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?web=E6=95=99=E5=B8=88=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Gz_Amounts/Index.cshtml | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml index 837494f80..538a7fd9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml @@ -11,14 +11,13 @@
- + - - - + + @@ -152,6 +151,7 @@ currentPage: 1, pageSize: 30, total: 0, + departmentOptions:[], //固定列 fixedColumn: [ { prop: 'UserNo', label: '部门名称' }, @@ -189,7 +189,16 @@ this.init() }, methods: { - init() { + async init() { + await Promise.all([ + this.NetRequest('/LR_OrganizationModule/Department/GetTree?companyId=207fa1a9-160c-4943-a89b-8fa4db0547ce&parentId=0', null, 'get').then(res => { + if (res) { + this.departmentOptions = res.map(e => { + return {value:e.id,label:e.text} + }) + } + }) + ]) this.getTableData() }, NetRequest(url, data, method = "POST") { @@ -251,7 +260,7 @@ }, // 删除 del() { - let ids = this.multipleSelection.map(e => e.id).toString() + let ids = this.multipleSelection.map(e => e.Id).toString() if (!ids) { this.$message.warning('请选择需要删除的数据！') return @@ -382,7 +391,7 @@ return } this.detailData = [] - let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/SaveForm', $.param({ keyValue: this.multipleSelection[0].id }), 'get') + let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/SaveForm', $.param({ keyValue: this.multipleSelection[0].Id }), 'get') this.trendsColumn = [{ porp: 'aaa', label: '动态1' }] this.dialogVisible1 = true }, From 09df5a6c3d3b888cbe61252f1f02526521fee821 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 19 Jan 2024 15:16:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?web=E6=95=99=E5=B8=88=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Gz_Amounts/Index.cshtml | 27 ++++++++++++++----- .../Learun.Application.Web.csproj | 4 +++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml index 0400f4363..95f8f4d3f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml @@ -22,7 +22,7 @@ - @*