@@ -122,11 +122,11 @@
border
show-overflow-tooltip
height="500">
-
+ @*
-
+ *@
@@ -154,21 +154,20 @@
departmentOptions:[],
//固定列
fixedColumn: [
- { prop: 'UserNo', label: '部门名称' },
- { prop: 'UserNo', label: '部门名称' },
- { prop: 'UserNo', label: '职员类型代码' },
- { prop: 'UserNo', label: '职员类型' },
+ { prop: 'DeptCode', label: '部门代码' },
+ { prop: 'DeptName', label: '部门名称' },
+ { prop: 'PersonTypeCode', label: '职员类型代码' },
+ { prop: 'PersonType', label: '职员类型' },
{ prop: 'UserNo', label: '职员代码' },
- { prop: 'UserNo', label: '职员姓名' },
- { prop: 'CreateTime', label: '发放时间' },
- { prop: 'UserNo', label: '发放次数' },
- { prop: 'UserNo', label: '扣款合计' },
- { prop: 'UserNo', label: '职员类型代码' },
+ { prop: 'RealName', label: '职员姓名' },
+ { prop: 'SendDate', label: '发放时间' },
+ { prop: 'SendCount', label: '发放次数' },
+ { prop: 'TotalDeduction', label: '扣款合计' },
{ prop: 'Year', label: '发放年份' },
{ prop: 'Month', label: '发放月份' },
- { prop: 'Amount', label: '实发合计' },
- { prop: 'UserNo', label: '备注' },
- { prop: 'UserNo', label: '审核人' }
+ { prop: 'TotalSend', label: '实发合计' },
+ { prop: 'Remark', label: '备注' },
+ { prop: 'Reviewer', label: '审核人' }
],
// 导入
dialogVisible: false,
@@ -247,7 +246,7 @@
}),
queryJson: JSON.stringify(this.query)
}
- let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetPageList', $.param(getParams), 'get')
+ let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetPageListCol', $.param(getParams), 'get')
this.tableData = result.rows
this.total = result.records
},
@@ -260,7 +259,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
@@ -391,8 +390,10 @@
return
}
this.detailData = []
- let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/SaveForm', $.param({ keyValue: this.multipleSelection[0].Id }), 'get')
- this.trendsColumn = [{ porp: 'aaa', label: '动态1' }]
+ let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetDetail', $.param({ userNo: this.multipleSelection[0].UserNo, year: this.multipleSelection[0].Year, month: this.multipleSelection[0].Month }), 'get')
+ debugger
+ this.detailData = result;
+ this.trendsColumn = [{ porp: 'Item2', label: 'Item1' }]
this.dialogVisible1 = true
},
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.js
index 0b5927f93..a3f6cbf60 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.js
@@ -88,14 +88,14 @@ var bootstrap = function ($, learun) {
},
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
- url: top.$.rootUrl + '/PersonnelManagement/Gz_Amounts/GetPageList',
+ url: top.$.rootUrl + '/PersonnelManagement/Gz_Amounts/GetPageListCol',
headData: [
//{ label: 'Id', name: 'Id', width: 200, align: "left" },
{ label: '年份', name: 'Year', width: 200, align: "left" },
{ label: '月份', name: 'Month', width: 200, align: "left" },
{ label: 'ItemId', name: 'ItemId', width: 200, align: "left" },
{ label: 'UserNo', name: 'UserNo', width: 200, align: "left" },
- { label: '金额', name: 'Amount', width: 200, align: "left" },
+ { label: 'ItemVal', name: 'OriVal', width: 200, align: "left" },
{ label: 'CreateTime', name: 'CreateTime', width: 200, align: "left" },
],
mainId: 'Id',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Form.cshtml
index 7e0d26100..453c7ec3b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Form.cshtml
@@ -3,25 +3,26 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Index.js
index de4937c3c..b7ad5f494 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Items/Index.js
@@ -60,24 +60,38 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/Gz_Items/DeleteForm', { keyValue: keyValue}, function () {
+ learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/Gz_Items/DeleteForm', { keyValue: keyValue }, function () {
});
}
});
}
});
+ // 展示/取消
+ $('#lr_show').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ if (learun.checkrow(keyValue)) {
+ learun.httpPost(top.$.rootUrl + '/PersonnelManagement/Gz_Items/Show', { keyValue: keyValue }, function (res) {
+ learun.alert.success(res.info);
+ })
+ }
+ });
},
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/PersonnelManagement/Gz_Items/GetPageList',
headData: [
- { label: 'Id', name: 'Id', width: 200, align: "left" },
- { label: 'Name', name: 'Name', width: 200, align: "left" },
- { label: 'IsShow', name: 'IsShow', width: 200, align: "left" },
- { label: 'ShowOrder', name: 'ShowOrder', width: 200, align: "left" },
- { label: 'CreateTime', name: 'CreateTime', width: 200, align: "left" },
+ { label: '编号', name: 'Id', width: 200, align: "left" },
+ { label: '名称', name: 'Name', width: 200, align: "left" },
+ {
+ label: '固定展示', name: 'IsShow', width: 200, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" : "否";
+ }
+ },
+ { label: '排序', name: 'ShowOrder', width: 200, align: "left" },
+ { label: '同步时间', name: 'CreateTime', width: 200, align: "left" },
],
- mainId:'Id',
+ mainId: 'Id',
isPage: true
});
page.search();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
index 81da9fa77..0aeb7a018 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
@@ -178,5 +178,5 @@