+
-
+
-
-
-
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js
index f68a30b54..b24f20f7d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js
@@ -15,7 +15,26 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
+
$('#AIIsInStorage').lrDataItemSelect({
code: 'YesOrNoBit', select: function (val) {
if (val) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml
index 23c6f1cca..a79ab04d3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml
@@ -12,25 +12,23 @@
}
-
- 序号*
-
-
-
-
- 所在库房*
-
-
-
- 是否在库*
-
-
-
- 资产属性*
-
-
-
@*所在库位
-
-
-
- 报废时间*
-
-
-
+
*@
报废提示时间*
- 序号*
+
-
金隅编号
+ 资产编号
-
资产名称
+ 名称
@@ -53,16 +28,42 @@
+ 使用人员
+
+
+ 楼宇名称*
+
+
+
+ @*房间号
+
+ @**@
+
+
*@
是否在库*
+
+ 资产型号
+
+ @*资产属性*
+
+
+
+ 报废时间*
+
+
+
+
*@
报废提示时间*
+ 计量单位
-
资产原值
+ 资产价值
@@ -81,67 +82,10 @@
- 增加方式
-
- 入账日期
-
-
-
- 行驶发证日期
-
-
-
品牌
-
- 生产厂家
-
- 产权形式
-
-
-
- 建筑结构
-
-
-
- 权属证号
-
-
-
- 车辆用途
-
-
-
- 车牌号
-
-
-
- 车架号
-
-
-
- 使用性质
-
-
-
- 发动机号
-
-
-
- 会计凭证号
-
-
-
- 排气量
-
-
-
建筑面积
-
- 资产规格
@@ -164,7 +108,7 @@
取得日期
-
+
产品序列号
@@ -235,17 +179,20 @@
-
折旧年限
+ 折旧年限（月）
月折旧额
-
+残值率
-
-
+
+残值率
+
+
+
+
权属说明
@@ -257,5 +204,66 @@
+
+ @*
+
+ 入账日期
+
+
+
+ 行驶发证日期
+
+
+
+
+ 品牌
+
+
+
+ 产权形式
+
+
+
+ 建筑结构
+
+
+
+ 权属证号
+
+
+
+ 车辆用途
+
+
+
+ 车牌号
+
+
+
+ 车架号
+
+
+
+ 使用性质
+
+
+
+ 发动机号
+
+
+
+ 会计凭证号
+
+
+
+ 排气量
+
+
+
*@
+
+
+
建筑面积
+
+
-
+
- ![]()
- ![]()
*@
![]()
+
/// 表单页
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.cshtml
index fc3c10fbf..df596efbd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.cshtml
@@ -3,29 +3,29 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
- @*
+ @*编号*
- *@
-
-
金隅资产编号
+ 资产编号
- @*
+ 所在库房*
- *@
+ @*编号*
+ *@
-
资产名称
+ 名称
@@ -38,7 +36,7 @@
*@
-
单位组织
+ 部门
@@ -56,32 +54,42 @@
+ @*
+
*@
/// 人事归档
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js
index 66e2b8326..0fb5e7356 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js
@@ -14,7 +14,6 @@ var bootstrap = function ($, learun) {
var page = {
init: function () {
$('#lr_verify').hide();
- page.initleft();
page.initGrid();
page.bind();
},
@@ -99,74 +98,42 @@ var bootstrap = function ($, learun) {
$parent.find('.active').removeClass('active');
$this.addClass('active');
categoryId = $this.attr('data-value');
+ if (categoryId == 3) {
+ categoryId = 1;
+ F_EnabledMark = true;
+ } else {
+ F_EnabledMark = false;
+ }
page.search();
});
},
initGrid: function () {
- $('#gridtable').lrAuthorizeJfGrid({
- url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList',
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
headData: [
+ { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
+ { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" },
+ { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" },
+ { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" },
+ { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
+ { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
+ { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
{
- label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) {
- if (row.F_SchemeName != row.F_Title && row.F_Title) {
- return row.F_SchemeName + "(" + row.F_Title + ")";
- }
- else {
- return row.F_SchemeName;
- }
+ label: '合同开始时间', name: 'LC_htkssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
- //{
- // label: "等级", name: "F_Level", width: 60, align: "center",
- // formatter: function (cellvalue) {
- // switch (cellvalue) {
- // case 0:
- // return '普通';
- // break;
- // case 1:
- // return '重要';
- // break;
- // case 2:
- // return '紧急';
- // break;
- // default:
- // return '普通';
- // break;
- // }
- // }
- //},
{
- label: "状态", name: "F_EnabledMark", width: 70, align: "center",
- formatter: function (cellvalue, row) {
- if (row.F_IsFinished == 0) {
- if (cellvalue == 1) {
- if (row.F_IsUrge == "1" && categoryId == '2') {
- return "催办加急";
- }
- return "运行中";
- } else if (cellvalue == 2) {
- return "草稿";
- } else {
- return "作废";
- }
- }
- else {
- return "结束";
- }
-
+ label: '合同结束时间', name: 'LC_htjssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
- { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" },
- {
- label: "时间", name: "F_CreateDate", width: 150, align: "left",
- formatter: function (cellvalue) {
- return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss');
- }
- }
+ { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" },
+ { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }
],
mainId: 'F_Id',
isPage: true,
- sidx: 'F_CreateDate DESC',
+ sidx: 'F_ModifyDate DESC',
dblclick: function () {
page.eye();
}
@@ -177,21 +144,12 @@ var bootstrap = function ($, learun) {
param = param || {};
param.StartTime = logbegin;
param.EndTime = logend;
- param.categoryId = categoryId;
- param.F_Category = '合同类';
+ param.F_IsFinished = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
},
eye: function () {
- var processId = $('#gridtable').jfGridValue('F_Id') || '';
- var title = $('#gridtable').jfGridValue('F_Title');
- var schemeName = $('#gridtable').jfGridValue('F_SchemeName');
-
- if (schemeName != title && title) {
- title = schemeName + "(" + title + ")";
- }
- else {
- title = schemeName;
- }
+ var processId = $('#gridtable').jfGridValue('LC_ID') || '';
+ var title = $('#gridtable').jfGridValue('LC_htmc');
if (learun.checkrow(processId)) {
learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs
index e5d471f8a..1338f1914 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs
@@ -28,6 +28,11 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
{
return View();
}
+ [HttpGet]
+ public ActionResult ApiIndex()
+ {
+ return View();
+ }
///
/// 清空
///
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml
index 250b7b699..e765d5c7b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml
@@ -15,6 +15,10 @@
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js
index 266c69772..c21750b10 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js
@@ -19,6 +19,18 @@ var bootstrap = function ($, learun) {
$('#lr_refresh').on('click', function () {
location.reload();
});
+ $('#lr_viewlog').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('F_OperateUserId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'online',
+ title: '访问监控',
+ url: top.$.rootUrl + '/Permission/Perm_FunctionVisit/IndexForCount?F_UserId='+keyValue,
+ height: 500,
+ width: 800
+ });
+ }
+ });
},
initGrid: function () {
$('#gridtable').jfGrid({
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs
index 0976f20ae..f78fa4972 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs
@@ -28,6 +28,12 @@ namespace Learun.Application.Web.Areas.Permission.Controllers
{
return View();
}
+
+ [HttpGet]
+ public ActionResult IndexForCount()
+ {
+ return View();
+ }
///
+
*@
+
序号*
+
+
-
序号*
-
+ 使用人员
+
-
所在库房*
-
+ @*所在库房*
+ *@
-
所在库位*
-
+ 楼宇名称*
+
-
使用人员
-
+ 房间号*
+
+ @**@
资产型号
+
资产属性
+
+ 计量单位
-
+
-
资产原值
+ 资产价值
@@ -101,74 +109,116 @@
-
+ 入账日期
-
+ 生产厂家
+
+
+
+ 资产规格
+
+
+
用途
+
-
行驶发证日期
-
+ 采购组织形式
+
-
品牌
-
+ 预算项目编号
+
-
+ 生产厂家
-
+ 取得方式
+
+
+
+ 取得日期
+
+
+
+ 产品序列号
+
+
+
+ 销售商
+
+
+
+ 合同编号
+
+
+
+ 发票号
+
+
+
配置标准分类名称
+
-
产权形式
-
+ 保修截止日期
+
-
建筑结构
-
+ 入账形式
+
-
权属证号
-
+ 价值类型
+
-
车辆用途
-
+ 财政拨款
+
-
车牌号
-
+ 非财政拨款
+
-
车架号
-
+ 使用状况
+
-
使用性质
-
+ 投入使用日期
+
-
发动机号
-
+ 管理部门
+
-
会计凭证号
-
+ 折旧状态
+
-
排气量
-
+ 折旧方法
+
-
建筑面积
-
+ 已提折旧月数
+
-
资产规格
-
+ 累计折旧
+
-
+ 用途
-
+ 折旧年限
+
+
+
+ 月折旧额
+
+
+ 残值率
+
+
+
权属说明
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js
index d336f7797..40bd669bb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js
@@ -15,7 +15,26 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AIIsInStorage').lrDataItemSelect({ code: 'YesOrNoBit' });
$('#ScrapRemindTime').lrDataItemSelect({ code: 'ScrapRemindTime' });
$('#AIDepartment').lrselect({
@@ -29,6 +48,7 @@ var bootstrap = function ($, learun) {
$('#AIASSClass').lrDataSourceSelect({ code: 'Ass_AssetsType', value: 'atid', text: 'aname' });
$('#AIASSState').lrDataItemSelect({ code: 'AssState' });
$('#AIAddType').lrDataItemSelect({ code: 'AssAddType' });
+ $('#AIAssType').lrDataItemSelect({ code: 'AssType' });
},
initData: function () {
if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml
index 5012c51c7..33c661e4a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml
@@ -34,7 +34,7 @@
-
金隅编号
+ 资产编号
@@ -46,12 +46,12 @@
-
库房
+ 楼宇名称
-
库房位置
-
+ 房间号
+
资产状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml
index a20bc8a37..4ce50138f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml
@@ -46,12 +46,12 @@
-
库房
+ 楼宇名称
-
库房位置
-
+ 房间号
+
资产状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
index 75f18e3e8..98abf4fb1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
@@ -32,7 +32,26 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 400, 400);
- $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AIASSState').lrDataItemSelect({ code: 'AssState' });
$('#AIDepartment').lrDepartmentSelect();
// 刷新
@@ -212,7 +231,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
+ label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -224,7 +243,19 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
+ {
+ label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
//{
// label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml
index 780f465f7..7002896a4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml
@@ -46,12 +46,12 @@
-
库房
+ 楼宇名称
-
库房位置
-
+ 房间号
+
资产状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
index 87c6210bf..f85486799 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
@@ -25,7 +25,26 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 400, 400);
- $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AIASSState').lrDataItemSelect({ code: 'AssState' });
$('#AIDepartment').lrDepartmentSelect();
// 刷新
@@ -177,7 +196,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
+ label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -189,7 +208,19 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
+ {
+ label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
//{
// label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml
index 4ed9ca29d..6157ee2e6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml
@@ -42,12 +42,12 @@
-
库房
+ 楼宇名称
-
库房位置
-
+ 房间号
+
资产状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
index fe5f7f1bb..05d2b03a0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
@@ -33,7 +33,26 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 400, 400);
- $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AIASSState').lrDataItemSelect({ code: 'AssState' });
$('#AIAssType').lrDataItemSelect({ code: 'AssType' });
$('#AIDepartment').lrDepartmentSelect();
@@ -77,7 +96,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
+ label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -89,7 +108,19 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
+ {
+ label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
index 6435c585f..6574ec3c4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
@@ -66,12 +66,12 @@
-
所在库房*
+ 楼宇名称*
-
所在库位
-
+ 房间号
+
生成明细*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js
index 71a903561..573c02e53 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js
@@ -100,7 +100,26 @@ var bootstrap = function ($, learun) {
$('#AAISource').lrDataItemSelect({ code: 'zcly' });
$('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
$('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
- $('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AAIHasDetail').lrDataItemSelect({
code: 'YesOrNoBit', select: function (item) {
if (item != null && item != undefined) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.cshtml
index 05ed98aab..c8726f195 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.cshtml
@@ -67,12 +67,12 @@
-
所在库房*
+ 楼宇名称*
-
所在库位
-
+ 房间号
+
生成明细*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.js
index 8e7674e05..cb9f336d8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.js
@@ -96,7 +96,26 @@ var bootstrap = function ($, learun) {
$('#AAISource').lrDataItemSelect({ code: 'zcly' });
$('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
$('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
- $('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AIIStorageId').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AIIStoragePosition').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AAIHasDetail').lrDataItemSelect({ code: 'YesOrNoBit' });
$('#AAIPhoto').lrUploader();
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
index 6badb154c..ebfbf2ef8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
@@ -89,7 +89,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+ label: '楼宇名称', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_InventoryItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_InventoryItemApply/Form.js
index 5b6023e13..eba57ffb8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_InventoryItemApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_InventoryItemApply/Form.js
@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
{ label: '资产名称', name: 'aname', width: 150, align: 'left' },
{ label: "英文名称", name: "aename", width: 100, align: "left" },
{
- label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+ label: '楼宇名称', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
@@ -52,7 +52,20 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '所在库位', name: 'aiistorageposition', width: 150, align: 'left' },
+ //{ label: '房间号', name: 'aiistorageposition', width: 150, align: 'left' },
+ {
+ label: "房间号", name: "aiistorageposition", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: '是否在库', name: 'aiisinstorage', width: 150, align: 'left', formatter: function (val, row) {
if (val) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.cshtml
index fa347c80a..f59030221 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.cshtml
@@ -18,12 +18,12 @@
-
所在库房
+ 楼宇名称
-
所在库位
-
+ 房间号
+
是否在库
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.js
index f19c7c03a..657223ca2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.js
@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
{ label: '资产名称', name: 'aname', width: 150, align: 'left' },
{ label: "英文名称", name: "aename", width: 100, align: "left" },
{
- label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+ label: '楼宇名称', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
@@ -52,7 +52,19 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: '所在库位', name: 'aiistorageposition', width: 150, align: 'left' },
+ {
+ label: "房间号", name: "aiistorageposition", width: 150, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: '是否在库', name: 'aiisinstorage', width: 150, align: 'left', formatter: function (val, row) {
if (val) {
@@ -88,7 +100,7 @@ var bootstrap = function ($, learun) {
$('#AAIName').val(data.aname);
$('#AAIStorage').lrselectSet(data.aiistorageid);
$('#AAIIsInStorage').lrselectSet(data.aiisinstorage);
- $('#AAILocation').val(data.aiistorageposition);
+ $('#AAILocation').lrselectSet(data.aiistorageposition);
$('#AAIUnit').lrselectSet(data.aunit);
$('#AAIEName').val(data.aename);
$('#AAIModel').val(data.amodel);
@@ -99,7 +111,27 @@ var bootstrap = function ($, learun) {
},
isMultiple: false
});
- $('#AAIStorage').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ //$('#AAIStorage').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+ $('#AAIStorage').lrselect({
+ type: 'tree',
+ allowSearch: true,
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+ param: {},
+ select: function (val) {
+ var storageId = "";
+ if (val) {
+ storageId = val.value;
+ }
+ $('#AAILocation').lrselectRefresh({
+ url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+ text: "RCode",
+ value: "RId"
+ });
+ }
+ });
+ //房间
+ $('#AAILocation').lrselect({ value: 'RId', text: 'RCode' });
+
$('#AAIIsInStorage').lrDataItemSelect({ code: 'YesOrNoBit' });
$('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs
index 18f764fb3..d696cb98d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs
@@ -170,6 +170,11 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
{
return View();
}
+ [HttpGet]
+ public ActionResult ContractFilingMonitor()
+ {
+ return View();
+ }
/// 编号*
+
标准编码*
+
+ 排序*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js
index 6570ff19d..70a467854 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js
@@ -74,6 +74,9 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetClassifyList',
headData: [
+ {
+ label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left'
+ },
{ label: '名称', name: 'F_ItemName', width: 200, align: 'left' },
{ label: '编号', name: 'F_ItemCode', width: 200, align: 'left' },
{ label: '排序', name: 'F_SortCode', width: 50, align: 'center' },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml
index 7529c1dfb..28fc9461c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml
@@ -12,6 +12,10 @@
项目值*
+
标准编码*
+
+ 排序*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js
index 06a97743c..e27a4c39a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js
@@ -108,6 +108,9 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
headData: [
+ {
+ label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left'
+ },
{ label: '项目名', name: 'F_ItemName', width: 200, align: 'left' },
{ label: '项目值', name: 'F_ItemValue', width: 200, align: 'left' },
{ label: '简拼', name: 'F_SimpleSpelling', width: 150, align: 'left' },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml
index b074ad26b..0c2d00e1a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml
@@ -13,6 +13,9 @@
+
+ 在线会话监控
+
-
+
-
组织名称*
-
+
+
-
+ /// 标准编码
+ ///
+ ///
/// 名称
///
///
+ /// 标准编码
+ ///
+ ///
/// 分类名称
///
///
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ResearchGERMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ResearchGERMap.cs
index b4327bd6c..d73cecc22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ResearchGERMap.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ResearchGERMap.cs
@@ -7,7 +7,7 @@ namespace Learun.Application.Mapping
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
- /// 日 期：2021-05-08 18:17
+ /// 日 期：2021-05-11 18:17
/// 描 述：教科研组管理
///
public class ResearchGERMap : EntityTypeConfiguration
@@ -18,7 +18,7 @@ namespace Learun.Application.Mapping
//表
this.ToTable("RESEARCHGER");
//主键
- this.HasKey(t => t.MentTID);
+ this.HasKey(t => t.GerID);
#endregion
#region 配置关系
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 324aeabfa..ceb8a46a4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
@@ -70,6 +70,11 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_FunctionVisit/Perm_FunctionVisitService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_FunctionVisit/Perm_FunctionVisitService.cs
index 64ed1b0a2..1ca403760 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_FunctionVisit/Perm_FunctionVisitService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_FunctionVisit/Perm_FunctionVisitService.cs
@@ -43,6 +43,11 @@ namespace Learun.Application.TwoDevelopment.Permission
dp.Add("PUName", "%" + queryParam["PUName"].ToString() + "%", DbType.String);
strSql.Append(" AND a.PUName Like @PUName ");
}
+ if (!queryParam["F_UserId"].IsEmpty())
+ {
+ dp.Add("F_UserId", "" + queryParam["F_UserId"].ToString() + "", DbType.String);
+ strSql.Append(" AND a.PUId = @F_UserId ");
+ }
return this.BaseRepository().FindList(strSql.ToString(),dp, pagination);
}
catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERBLL.cs
index d47c3dc20..0f224358c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERBLL.cs
@@ -9,7 +9,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
- /// 日 期：2021-05-08 18:17
+ /// 日 期：2021-05-11 18:17
/// 描 述：教科研组管理
///
public class ResearchGERBLL : ResearchGERIBLL
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs
index 064fa15dd..26a54f28f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs
@@ -8,47 +8,47 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
- /// 日 期：2021-05-08 18:17
+ /// 日 期：2021-05-11 18:17
/// 描 述：教科研组管理
///
public class ResearchGEREntity
{
#region 实体成员
///
- /// MentTID
+ /// GerID
///
- [Column("MENTTID")]
- public string MentTID { get; set; }
+ [Column("GERID")]
+ public string GerID { get; set; }
///
- /// ResearchGroup
+ /// GerName
///
- [Column("RESEARCHGROUP")]
- public string ResearchGroup { get; set; }
+ [Column("GERNAME")]
+ public string GerName { get; set; }
///
- /// GroupName
+ /// GerBoss
///
- [Column("GROUPNAME")]
- public string GroupName { get; set; }
+ [Column("GERBOSS")]
+ public string GerBoss { get; set; }
///
- /// GroupTime
+ /// Gerpeople
///
- [Column("GROUPTIME")]
- public DateTime? GroupTime { get; set; }
+ [Column("GERPEOPLE")]
+ public string Gerpeople { get; set; }
///
- /// StateTex
+ /// Gertiem
///
- [Column("STATETEX")]
- public bool? StateTex { get; set; }
+ [Column("GERTIEM")]
+ public DateTime? Gertiem { get; set; }
///
- /// RemarkNote
+ /// GerState
///
- [Column("REMARKNOTE")]
- public string RemarkNote { get; set; }
+ [Column("GERSTATE")]
+ public string GerState { get; set; }
///
- /// GroupPeople
+ /// postscript
///
- [Column("GROUPPEOPLE")]
- public string GroupPeople { get; set; }
+ [Column("POSTSCRIPT")]
+ public string postscript { get; set; }
#endregion
#region 扩展操作
@@ -57,7 +57,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
///
public void Create()
{
- this.MentTID = Guid.NewGuid().ToString();
+ this.GerID = Guid.NewGuid().ToString();
}
///
/// 编辑调用
@@ -65,7 +65,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
///
public void Modify(string keyValue)
{
- this.MentTID = keyValue;
+ this.GerID = keyValue;
}
#endregion
#region 扩展字段
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERIBLL.cs
index 38559c6ba..94a29c2a8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERIBLL.cs
@@ -8,7 +8,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
- /// 日 期：2021-05-08 18:17
+ /// 日 期：2021-05-11 18:17
/// 描 述：教科研组管理
///
public interface ResearchGERIBLL
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERService.cs
index e95478243..c0228339d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERService.cs
@@ -12,7 +12,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
- /// 日 期：2021-05-08 18:17
+ /// 日 期：2021-05-11 18:17
/// 描 述：教科研组管理
///
public class ResearchGERService : RepositoryFactory
@@ -32,23 +32,23 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
- t.MentTID,
- t.ResearchGroup,
- t.GroupName,
- t.GroupTime,
- t.StateTex
+ t.GerID,
+ t.GerName,
+ t.GerBoss,
+ t.Gertiem,
+ t.GerState
");
strSql.Append(" FROM ResearchGER t ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
- if (!queryParam["ResearchGroup"].IsEmpty())
+ if (!queryParam["GerName"].IsEmpty())
{
- dp.Add("ResearchGroup", "%" + queryParam["ResearchGroup"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.ResearchGroup Like @ResearchGroup ");
+ dp.Add("GerName", "%" + queryParam["GerName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.GerName Like @GerName ");
}
- return this.BaseRepository().FindList(strSql.ToString(),dp, pagination);
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination);
}
catch (Exception ex)
{
@@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
try
{
- return this.BaseRepository().FindEntity(keyValue);
+ return this.BaseRepository("CollegeMIS").FindEntity(keyValue);
}
catch (Exception ex)
{
@@ -99,7 +99,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
try
{
- this.BaseRepository().Delete(t=>t.MentTID == keyValue);
+ this.BaseRepository("CollegeMIS").Delete(t=>t.GerID == keyValue);
}
catch (Exception ex)
{
@@ -126,12 +126,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
if (!string.IsNullOrEmpty(keyValue))
{
entity.Modify(keyValue);
- this.BaseRepository().Update(entity);
+ this.BaseRepository("CollegeMIS").Update(entity);
}
else
{
entity.Create();
- this.BaseRepository().Insert(entity);
+ this.BaseRepository("CollegeMIS").Insert(entity);
}
}
catch (Exception ex)
专业组长*
-
+
组织成员*
-
+
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.js
index 913e394a1..90ad1efd1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.js
@@ -1,7 +1,7 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
- * 日 期：2021-05-08 18:17
+ * 日 期：2021-05-11 18:17
* 描 述：教科研组管理
*/
var refreshGirdData;
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
- }, 220, 400);
+ }, 130, 200);
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -35,7 +35,7 @@ var bootstrap = function ($, learun) {
});
// 编辑
$('#lr_edit').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('MentTID');
+ var keyValue = $('#gridtable').jfGridValue('GerID');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
@@ -51,7 +51,7 @@ var bootstrap = function ($, learun) {
});
// 删除
$('#lr_delete').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('MentTID');
+ var keyValue = $('#gridtable').jfGridValue('GerID');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
@@ -72,10 +72,10 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/GetPageList',
headData: [
- { label: "组织名称", name: "ResearchGroup", width: 100, align: "left"},
- { label: "专业组长", name: "GroupName", width: 100, align: "left"},
- { label: "组织成立时间", name: "GroupTime", width: 100, align: "left"},
- { label: "状态", name: "StateTex", width: 100, align: "left",
+ { label: "组织名称", name: "GerName", width: 100, align: "left"},
+ { label: "专业组长", name: "GerBoss", width: 100, align: "left"},
+ { label: "成立时间", name: "Gertiem", width: 100, align: "left"},
+ { label: "状态", name: "GerState", width: 100, align: "left",
formatterAsync: function (callback, value, row, op,$cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -86,7 +86,7 @@ var bootstrap = function ($, learun) {
});
}},
],
- mainId:'MentTID',
+ mainId:'GerID',
isPage: true
});
page.search();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 2a742ae0c..07892e244 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -284,6 +284,7 @@
组织成立时间
-
+
+
- 成立时间
+
+
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ResearchGER/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.js
index 153e95c96..aad03a5e8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.js
@@ -1,7 +1,7 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
- * 日 期：2021-05-08 18:17
+ * 日 期：2021-05-11 18:17
* 描 述：教科研组管理
*/
var acceptClick;
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#StateTex').lrRadioCheckbox({
+ $('#GerState').lrRadioCheckbox({
type: 'radio',
code: 'EnableStatus',
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.cshtml
index ccbff1d4e..9d57d3984 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Index.cshtml
@@ -12,7 +12,7 @@
状态
-
+
备注
-
+
组织名称
-
+
数据来源
';
_html += '';
@@ -459,7 +460,7 @@
setDatasource(dfop);
},
renderTable: function (compont, $row) {//使用表单的时候渲染成table
- var $compont = $('');
+ var $compont = $('');
/*获取数据字典或者数据源数据*/
if (compont.dataSource == '0') {
learun.clientdata.getAllAsync('dataItem', {
@@ -488,7 +489,7 @@
return $compont;
},
renderQuery: function (compont, $row) {
- var $compont = $('');
+ var $compont = $('');
/*获取数据字典或者数据源数据*/
if (compont.dataSource == '0') {
learun.clientdata.getAllAsync('dataItem', {
@@ -530,17 +531,18 @@
table: '',
field: "",
proportion: '1',
+ verify: '',
dataSource: '0', // 0数据字典1数据源
dataSourceId: '',
- itemCode:'',
+ itemCode: '',
dfvalue: '' // 默认值
};
$component.html(getComponentRowHtml({ name: $component[0].dfop.title, text: "多选项" }));
},
property: function ($component) {
var dfop = $component[0].dfop;
- var $html = setComponentPropertyHtml($component);
+ var $html = setComponentPropertyHtml($component, verifyDatalist2);
var _html = '';
_html += '
数据来源
';
_html += '';
@@ -567,7 +569,7 @@
setDatasource(dfop);
},
renderTable: function (compont, $row) {//使用表单的时候渲染成table
- var $compont = $('');
+ var $compont = $('');
/*获取数据字典或者数据源数据*/
if (compont.dataSource == '0') {
learun.clientdata.getAllAsync('dataItem', {
@@ -597,7 +599,7 @@
return $compont;
},
renderQuery: function (compont, $row) {
- var $compont = $('');
+ var $compont = $('');
/*获取数据字典或者数据源数据*/
if (compont.dataSource == '0') {
learun.clientdata.getAllAsync('dataItem', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formrender.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formrender.js
index 964d76f57..b69fbaa5b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formrender.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formrender.js
@@ -106,6 +106,7 @@
$.lrValidCustmerform = function () {
var validateflag = true;
var validHelper = learun.validator;
+
$('body').find("[isvalid=yes]").each(function () {
var $this = $(this);
if ($this.parent().find('.lr-field-error-info').length > 0) {
@@ -126,7 +127,27 @@
value = $this.lrformselectGet();
}
else {
- value = $this.val();
+ if ($this.hasClass("checkbox")) {//多选框
+ var checkedList = $this.find("input[name='" + $this.attr('id') + "']:checked");
+ if (checkedList.length > 0) {
+ value = '';
+ $.each(checkedList, function (i, item) {
+ if (value != '' && value != undefined) {
+ value += ',';
+ }
+ value += $(item).val();
+ });
+ }
+ }
+ else if ($this.hasClass("radio")) {//单选框
+ var checkedList = $this.find("input[name='" + $this.attr('id') + "']:checked");
+ if (checkedList.length > 0) {
+ value = checkedList.val();
+ }
+ }
+ else {
+ value = $this.val();
+ }
}
var r = { code: true, msg: '' };
if (checkexpession == 'LenNum' || checkexpession == 'LenNumOrNull' || checkexpession == 'LenStr' || checkexpession == 'LenStrOrNull') {
@@ -236,6 +257,12 @@
if ($obj.hasClass("lr-input-wdatepicker")) {
type = "datepicker";
}
+ else if ($obj.hasClass("checkbox")) {
+ type = "checkbox";
+ }
+ else if ($obj.hasClass("radio")) {
+ type = "radio";
+ }
switch (type) {
case "lrselect":
$obj.lrselectSet(value);
@@ -243,6 +270,21 @@
case "formselect":
$obj.lrformselectSet(value);
break;
+ case "checkbox":
+ $obj.find('input[name="' + id + '"]:checked').trigger('click');
+ if (value != null && value != undefined && value != '') {
+ vs = value.split(',');
+ for (var i = 0; i < vs.length; i++) {
+ $obj.find('input[name="' + id + '"][value="' + vs[i] + '"]').trigger('click');
+ }
+ }
+ break;
+ case "radio":
+ $obj.find('input[name="' + id + '"]:checked').trigger('click');
+ if (value != null && value != undefined && value != '') {
+ $obj.find('input[name="' + id + '"][value="' + value + '"]').trigger('click');
+ }
+ break;
case "datepicker":
if ($obj.attr('dateformat') == "0") {
$obj.val(learun.formatDate(value, 'yyyy-MM-dd'));
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator.js
index 290b9ad5e..42737faf6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator.js
@@ -12,7 +12,7 @@
/*错误处理*/
$this.addClass('lr-field-error');
$this.parent().append('
');
- var validatemsg = $this.parent().find('.form-item-title').text() + ' ' + errormsg;
+ var validatemsg = $this.parent().find('.lr-form-item-title').text() + ' ' + errormsg;
learun.alert.error('表单信息输入有误,请检查！' + validatemsg);
if ($this.attr('type') == 'lrselect') {
$this.on('change', function () {
@@ -32,6 +32,16 @@
}
});
}
+ else if ($this.hasClass('checkbox')) {
+ $this.on('change', function () {
+ removeErrorMessage($(this));
+ });
+ }
+ else if ($this.hasClass('radio')) {
+ $this.on('change', function () {
+ removeErrorMessage($(this));
+ });
+ }
else {
$this.on('input propertychange', function () {
var $input = $(this);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSixWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSixWxLogin.cshtml
index 7eab133c8..3358d16f0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSixWxLogin.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSixWxLogin.cshtml
@@ -108,7 +108,7 @@
width: 200,
height: 200
});
- makeCode('@ViewBag.QRCodeUrl')
+ makeCode('@ViewBag.QRCodeUrl');
$('.loginTab li').click(function() {
var flag = $(this).hasClass('active');
if (!flag) {
@@ -116,9 +116,9 @@
$(this).addClass('active').siblings().removeClass('active');
$('.loginTabCon').css('display', 'none').eq(ind).fadeIn();
} else {
- return
+ return;
}
- })
+ });
function makeCode(urls) {
qrcode.makeCode(urls);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs
index f5c4b935b..1137551e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs
@@ -39,6 +39,12 @@ namespace Learun.Application.Base.SystemModule
[Column("F_ITEMCODE")]
public string F_ItemCode { get; set; }
///