Ver a proveniência

Merge branch 'master' into 大厂分支

大厂分支
liangkun há 4 anos
ascendente
cometimento
73f3d57fbd
100 ficheiros alterados com 41 adições e 198 eliminações
  1. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AppManager/Views/FunctionManager/Form.js
  2. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssAddReport.js
  3. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssStatusReport.js
  4. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssTypeReport.js
  5. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
  6. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js
  7. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js
  8. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
  9. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.js
  10. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
  11. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
  12. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Form.js
  13. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js
  14. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_InventoryItemApply/Form.js
  15. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js
  16. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.js
  17. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTerm/ExamIndexOfTeacher.js
  18. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
  19. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
  20. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
  21. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
  22. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js
  23. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
  24. +0
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js
  25. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js
  26. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CardPrint.cshtml
  27. +0
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js
  28. +1
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js
  29. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js
  30. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js
  31. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js
  32. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js
  33. +0
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js
  34. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
  35. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
  36. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js
  37. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js
  38. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js
  39. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js
  40. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js
  41. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
  42. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js
  43. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNoForm.js
  44. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml
  45. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
  46. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
  47. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllScoreQueryIndex.cshtml
  48. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml
  49. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml
  50. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml
  51. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryIndex.cshtml
  52. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreStatisticAnalysis.js
  53. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.js
  54. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
  55. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js
  56. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormDocument.js
  57. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormParty.js
  58. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js
  59. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/DataAuthorize/CustomerFormIndex.js
  60. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CRMModule/Views/CrmOrder/Index.js
  61. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeDemo/Views/ImgShow/Demo3.js
  62. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/CodeSchema/Index.js
  63. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/PluginDemo/index.js
  64. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/FastCodeIndex.js
  65. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/GridEditCodeIndex.js
  66. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/ReportCodeIndex.js
  67. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTChart/Form.js
  68. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTList/Form.js
  69. +4
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/AddTaskForm.js
  70. +2
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/AuditorFieldForm.js
  71. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Email/ConfigForm.js
  72. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/BcIndex.js
  73. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/ImportForm.js
  74. +2
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Files/Index.js
  75. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_TaskScheduling/Views/TaskDesign/AddDetailedForm.js
  76. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/ReleaseFlowForm.js
  77. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfSystemDemo/DemoLeaveIndex.js
  78. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml
  79. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
  80. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_CleanManagement/Form.js
  81. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js
  82. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js
  83. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
  84. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml
  85. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
  86. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
  87. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
  88. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml
  89. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml
  90. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
  91. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
  92. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/AttendanceDetail.js
  93. +2
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jquery-ui/jquery-ui-1.11.4.js
  94. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Content/static/js/app.js
  95. +3
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js
  96. +1
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation.cshtml
  97. +1
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation1.cshtml
  98. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation2.cshtml
  99. +1
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation3.cshtml
  100. +3
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation4.cshtml

+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AppManager/Views/FunctionManager/Form.js Ver ficheiro

@@ -162,7 +162,6 @@ var bootstrap = function ($, learun) {
return false;
}
var formData = $('#form').lrGetFormData(keyValue);
console.log(JSON.stringify(formData));
formData.F_IsSystem = $('[name="F_IsSystem"]:checked').val();
var entity = {
F_Name: formData.F_Name,


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssAddReport.js Ver ficheiro

@@ -39,7 +39,6 @@
//var myChart2 = echarts.init(document.getElementById('main1'));
var queryJson = { year: year };
learun.httpAsyncPost(top.$.rootUrl + "/AssetManagementSystem/AssReport/AssAddReportData", { queryJson: JSON.stringify(queryJson) }, function (res) {
console.log(res);
if (res.code == 200) {
var option = {
xAxis: {


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssStatusReport.js Ver ficheiro

@@ -40,7 +40,6 @@
//var myChart2 = echarts.init(document.getElementById('main1'));
var queryJson = { year: year };
learun.httpAsyncPost(top.$.rootUrl + "/AssetManagementSystem/AssReport/AssStatusData", { queryJson: JSON.stringify(queryJson) }, function (res) {
console.log(res);
if (res.code == 200) {
var option = {
title: {


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssTypeReport.js Ver ficheiro

@@ -40,7 +40,6 @@
//var myChart2 = echarts.init(document.getElementById('main1'));
var queryJson = { year: year };
learun.httpAsyncPost(top.$.rootUrl + "/AssetManagementSystem/AssReport/AssTypeData", { queryJson: JSON.stringify(queryJson) }, function (res) {
console.log(res);
if (res.code == 200) {
var option = {
title: {


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js Ver ficheiro

@@ -86,10 +86,8 @@ var bootstrap = function ($, learun) {
],
select: function (values, texts) {
if (values && values.length > 0) {
console.log(values);
//绑定
$.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetDatas?keyValue=' + values, function (data) {
console.log(data);
if (data) {

$.each(data, function (i, item) {


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js Ver ficheiro

@@ -18,7 +18,6 @@ var bootstrap = function ($, learun) {
$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
$('#AIIsInStorage').lrDataItemSelect({
code: 'YesOrNoBit', select: function (val) {
console.log(val);
if (val) {
if (val.text == "是") {
$('#AIIStoragePosition').parent('div').show();
@@ -59,7 +58,6 @@ var bootstrap = function ($, learun) {
$.lrSetForm(
top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetFormData?keyValue=' + keyValue,
function (data) {
console.log(data);
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id).jfGridSet('refreshdata', data[id]);


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js Ver ficheiro

@@ -33,7 +33,6 @@ var bootstrap = function ($, learun) {
initData: function () {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetFormData?keyValue=' + keyValue, function (data) {
console.log(data);
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id).jfGridSet('refreshdata', data[id]);


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js Ver ficheiro

@@ -200,7 +200,6 @@ var bootstrap = function ($, learun) {
{
label: "使用人员", name: "AIUsePeople", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
console.log(value);
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.js Ver ficheiro

@@ -82,7 +82,6 @@ var bootstrap = function ($, learun) {
$("#AAICode").removeAttr("readonly");
$("#AAIUnit").removeAttr("readonly");
$('#AAITId').lrselectSet(selectedRow.AAITId);
console.log('clear');
$('#AAICode').val("");
$('#AAIName').val(selectedRow.AAIName);
$('#AAIEName').val(selectedRow.AAIEName);


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js Ver ficheiro

@@ -44,7 +44,6 @@ var bootstrap = function ($, learun) {
Ass_AssetsOutItemApply
var keyValue = $('#Ass_AssetsOutItemApply').jfGridValue('AOIId');
selectedRow = $('#Ass_AssetsOutItemApply').jfGridGet('rowdata');
console.log(selectedRow);
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'formitem',


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js Ver ficheiro

@@ -123,7 +123,6 @@ var bootstrap = function ($, learun) {
initData: function () {
if (!!keyValue) {
if (!!selectedRow) {
console.log(selectedRow);
//库存查询
learun.httpAsync("post", top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormDataByCode', { code: selectedRow.AOICode },
function (res) {


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Form.js Ver ficheiro

@@ -165,7 +165,6 @@ var bootstrap = function ($, learun) {

refreshGirdData = function (temprow) {
var ifnewrow = true;
console.log(temprow);
var list = [];
$.each(temprow,
function(i, item) {
@@ -253,7 +252,6 @@ var bootstrap = function ($, learun) {

postData.strEntity = JSON.stringify(formData);
postData.strAss_InventoryItemList = JSON.stringify($('#Ass_InventoryItem').jfGridGet('rowdatas'));
console.log(postData.strAss_InventoryItemList);
$.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Inventory/SaveForm?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js Ver ficheiro

@@ -134,7 +134,6 @@ var bootstrap = function ($, learun) {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Inventory/GetFormData?keyValue=' + keyValue,
function (data) {
console.log(data);
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id).jfGridSet('refreshdata', data[id]);
@@ -153,7 +152,6 @@ var bootstrap = function ($, learun) {

refreshGirdData = function (temprow) {
var ifnewrow = true;
console.log(temprow);
$.each(tempdatra, function (key, val) {
if (tempdatra[key].AAIId === temprow.AAIId) {
tempdatra[key] = temprow;


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_InventoryItemApply/Form.js Ver ficheiro

@@ -10,7 +10,6 @@ var selectedRow;
var bootstrap = function ($, learun) {
"use strict";
selectedRow = top["layer_formAss_InventoryItemApply"].selectedRow;
console.log(selectedRow);
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
@@ -83,7 +82,6 @@ var bootstrap = function ($, learun) {
//绑定
$.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetData?keyValue=' + values[0], function (data) {
data = data[0];
console.log(data);
$('#AAITId').lrselectSet(data.atid);
$('#AAICode').val(data.aicode);
$('#AAIAId').val(data.aid);
@@ -115,7 +113,6 @@ var bootstrap = function ($, learun) {
$("#AAIStock").attr("checkexpession", "PositiveInteger");
});
$('#form').lrSetFormData(selectedRow);
console.log(selectedRow);
}
}
}


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js Ver ficheiro

@@ -76,7 +76,6 @@ var bootstrap = function ($, learun) {
var keyValue = $('#gridtable').jfGridValue('RID');
if (learun.checkrow(keyValue)) {
var PStatus = $('#gridtable').jfGridValue('PStatus');
console.log(PStatus);
if (PStatus != 0) {
learun.alert.warning("当前项目已提交不能编辑!");
return;


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_ScrapItem/Form.js Ver ficheiro

@@ -10,7 +10,6 @@ var selectedRow;
var bootstrap = function ($, learun) {
"use strict";
selectedRow = top["layer_formAss_ScrapItemApply"].selectedRow;
console.log(selectedRow);
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
@@ -83,7 +82,6 @@ var bootstrap = function ($, learun) {
//绑定
$.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetData?keyValue=' + values[0], function (data) {
data = data[0];
console.log(data);
$('#AAITId').lrselectSet(data.atid);
$('#AAICode').val(data.aicode);
$('#AAIAId').val(data.aid);
@@ -115,7 +113,6 @@ var bootstrap = function ($, learun) {
$("#AAIStock").attr("checkexpession", "PositiveInteger");
});
$('#form').lrSetFormData(selectedRow);
console.log(selectedRow);
}
}
}


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTerm/ExamIndexOfTeacher.js Ver ficheiro

@@ -17,7 +17,6 @@ var bootstrap = function ($, learun) {
$.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/ArrangeExamTerm/GetData', param,
function (data) {
// 数据处理
console.log(data.weekList);
var html = '';
var weekLists = data.weekList;
for (var i = 1; i <= data.sectionNum; i++) {


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js Ver ficheiro

@@ -9,8 +9,7 @@ var keyValue = request('keyValue');
if (!!keyValue) {
NewEmpId = keyValue;
}
//console.log("keyValue:" + keyValue + " NewEmpId:" + NewEmpId);
var isTeacher = request('isTeacher');
var isTeacher = request('isTeacher');
var bootstrap = function ($, learun) {
"use strict";
var ue;


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml Ver ficheiro

@@ -184,7 +184,6 @@
var form = layui.form;
//登录按钮点击
form.on('submit(*)', function (data) {
console.log(data);

$.ajax({
@@ -195,7 +194,6 @@
async: true,
cache: false,
success: function (data) {
console.log(data);
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
},
@@ -228,7 +226,6 @@
});
},
done: function (res) {
console.log(res);
//如果上传失败
if (res.code != 200) {
return layer.msg('上传失败');


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml Ver ficheiro

@@ -107,7 +107,6 @@
$.get('/UserCenter/GetTeacherInfoById?id='+keyValue, function (ref) {
this.teacherInfo = ref.data.userInfo;
this.baseInfo = ref.data.basecInfo;
console.log(ref);

}.bind(this), "json");
},


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js Ver ficheiro

@@ -272,7 +272,6 @@ var bootstrap = function ($, learun) {
});
$("#lr_switch").on("click", function () {
$.get("/EducationalAdministration/TeachSwitch/GetFirstEntity", function (data) {
console.log(data);
if (data.code == "200") {
if (data.data.ID) {
learun.layerForm({


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js Ver ficheiro

@@ -272,7 +272,6 @@ var bootstrap = function ($, learun) {
});
$("#lr_switch").on("click", function () {
$.get("/EducationalAdministration/TeachSwitch/GetFirstEntity", function (data) {
console.log(data);
if (data.code == "200") {
if (data.data.ID) {
learun.layerForm({


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml Ver ficheiro

@@ -228,7 +228,6 @@
});
},
done: function (res) {
console.log(res);
//如果上传失败
if (res.code != 200) {
return layer.msg('上传失败');


+ 0
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js Ver ficheiro

@@ -32,7 +32,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -40,7 +39,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -66,7 +64,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNoAll').lrselectRefresh({
allowSearch: true,
@@ -74,7 +71,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNoAll').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js Ver ficheiro

@@ -30,7 +30,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -38,7 +37,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CardPrint.cshtml Ver ficheiro

@@ -64,8 +64,7 @@
data.info = '系统异常,请联系管理员!';
}

//console.log(data);
//绑定数据
// //绑定数据

$("#StuName").html(data.data.stuName);
$("#ClassName").html(data.data.className);


+ 0
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js Ver ficheiro

@@ -31,7 +31,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -39,7 +38,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -214,7 +212,6 @@ var bootstrap = function ($, learun) {
},
{
label: "是否上传资料", name: "CheckInUrl", width: 100, align: "left", formatter: function (value) {
console.log(value);
if (value) {
return '<span class=\"label label-success\">已上传</span>';
} else {
@@ -332,7 +329,6 @@ var bootstrap = function ($, learun) {
ClassNo: classNo
},
function (res) {
console.log(res);
$("#allAmount").html(res.data.aa);
$("#isAmount").html(res.data.bb);
}, "json");


+ 1
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js Ver ficheiro

@@ -30,7 +30,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -38,7 +37,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -103,7 +101,6 @@ var bootstrap = function ($, learun) {
$("#HomeAddress").val(cardobj.resultContent.certAddress);
} else {
learun.alert.error('读取错误!未检测到身份证或设备连接错误,请调整身份证位置并重新读取,多次未读取到身份证信息则可能是身份证芯片已损坏!');
console.log(cardobj.errorMsg);
}
});
},
@@ -118,8 +115,7 @@ var bootstrap = function ($, learun) {
$('[data-table="' + id + '"]').lrSetFormData(data[id]);
}
}
//console.log(data[MajorNo]+data[ClassNo])
$('#MajorNo').lrselectSet(data.StuEnroll.MajorNo);
$('#MajorNo').lrselectSet(data.StuEnroll.MajorNo);
$('#ClassNo').lrselectSet(data.StuEnroll.ClassNo);
});
}


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js Ver ficheiro

@@ -49,14 +49,12 @@ var bootstrap = function ($, learun) {
$("#HomeAddress").val(cardobj.resultContent.certAddress);
} else {
learun.alert.error('读取错误!未检测到身份证或设备连接错误,请调整身份证位置并重新读取,多次未读取到身份证信息则可能是身份证芯片已损坏!');
console.log(cardobj.errorMsg);
}
});
},
initData: function () {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetFormData?keyValue=' + keyValue, function (data) {
console.log(data.StuEnroll.PhotoUrl);
$(".headImg").attr("src", data.StuEnroll.PhotoUrl);
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js Ver ficheiro

@@ -29,7 +29,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -37,7 +36,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js Ver ficheiro

@@ -29,7 +29,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -37,7 +36,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js Ver ficheiro

@@ -29,7 +29,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -37,7 +36,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 0
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js Ver ficheiro

@@ -24,7 +24,6 @@ var bootstrap = function ($, learun) {
$("#IDCard").val(cardobj.resultContent.certNumber);
} else {
learun.alert.error('读取错误!未检测到身份证或设备连接错误,请调整身份证位置并重新读取,多次未读取到身份证信息则可能是身份证芯片已损坏!');
console.log(cardobj.errorMsg);
}
});

@@ -34,7 +33,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -42,7 +40,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -99,7 +96,6 @@ var bootstrap = function ($, learun) {
$.each(data, function (i, item) {
str += item.StuId + ',';
});
console.log(str);
learun.layerForm({
id: 'form',
title: '修改招生类别',


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js Ver ficheiro

@@ -31,7 +31,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -39,7 +38,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -362,7 +360,6 @@ var bootstrap = function ($, learun) {
ClassNo: classNo
},
function (res) {
console.log(res);
$("#allAmount").html(res.data.aa);
$("#isAmount").html(res.data.bb);
}, "json");


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml Ver ficheiro

@@ -177,7 +177,6 @@

top.learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetStuInfo?stuId=' + keyValue, function(res) {
console.log(res);
data.name = $("#gridtable").jfGridValue('StuName');
data.id = $("#gridtable").jfGridValue('IDCard');
data.major = res.data.majorName;


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js Ver ficheiro

@@ -30,7 +30,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -38,7 +37,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -340,7 +338,6 @@ var bootstrap = function ($, learun) {
$.post(
top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPaymentInfo',
function (res) {
console.log(res);
$("#allAmount").html(res.data.a);
$("#isAmount").html(res.data.b);
}, "json");


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js Ver ficheiro

@@ -30,7 +30,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -38,7 +37,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js Ver ficheiro

@@ -31,7 +31,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -39,7 +38,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -340,7 +338,6 @@ var bootstrap = function ($, learun) {
ClassNo: classNo
},
function (res) {
console.log(res);
$("#allAmount").html(res.data.aa);
$("#isAmount").html(res.data.bb);
}, "json");


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js Ver ficheiro

@@ -104,7 +104,6 @@ var bootstrap = function ($, learun) {
if (selectedItem.Name) {

var data = $('#gridtable').jfGridGet('rowdata');
console.log(data);
if (data.length > 0) {
learun.layerConfirm('是否确认分配到班级 [' + selectedItem.Name + ']',
function (res) {


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js Ver ficheiro

@@ -31,7 +31,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -39,7 +38,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -416,7 +414,6 @@ var bootstrap = function ($, learun) {
ClassNo: classNo
},
function (res) {
console.log(res);
$("#allAmount").html(res.data.aa);
$("#isAmount").html(res.data.bb);
}, "json");


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js Ver ficheiro

@@ -288,7 +288,6 @@ var bootstrap = function ($, learun) {
},
{
label: "床位", name: "StuId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
console.log(value);
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PlanBedInfo',
key: value,


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js Ver ficheiro

@@ -24,7 +24,6 @@ var bootstrap = function ($, learun) {
$("#IDCard").val(cardobj.resultContent.certNumber);
} else {
learun.alert.error('读取错误!未检测到身份证或设备连接错误,请调整身份证位置并重新读取,多次未读取到身份证信息则可能是身份证芯片已损坏!');
console.log(cardobj.errorMsg);
}
});

@@ -34,7 +33,6 @@ var bootstrap = function ($, learun) {
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
console.log(item);
if (item) {
$('#MajorNo').lrselectRefresh({
allowSearch: true,
@@ -42,7 +40,6 @@ var bootstrap = function ($, learun) {
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
console.log('全部');
$('#MajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNoForm.js Ver ficheiro

@@ -58,7 +58,6 @@ acceptClick = function (callBack) {
majorList += $(item).attr('value') + ',';
})
param.MajorList = majorList.substring(0, majorList.length - 1); ;
console.log(param);
$.post(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/CreateGraduateNoByMajor', param, function (res) {
//保存成功后才回调
if (!!callBack) {


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml Ver ficheiro

@@ -114,7 +114,6 @@
this.studentInfo = ref.data.userInfo;
this.baseInfo = ref.data.basicInfo;
this.headUrl = ref.data.userInfo.Photo;
console.log(this.headUrl);

}.bind(this), "json");
},


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js Ver ficheiro

@@ -145,7 +145,6 @@ var bootstrap = function ($, learun) {
}
var postData = {};
postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
console.log($('[data-table="StuInfoFresh"]').lrGetFormData());
postData.strstuInfoFreshEmergePeopleList = JSON.stringify($('#StuInfoFreshEmergePeople').jfGridGet('rowdatas'));
postData.strstuInfoFreshFamilyList = JSON.stringify($('#StuInfoFreshFamily').jfGridGet('rowdatas'));
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveForm?keyValue=' + keyValue, postData, function (res) {


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js Ver ficheiro

@@ -54,7 +54,6 @@ var bootstrap = function ($, learun) {
}

$.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + StuId, function (data) {
console.log(data);
$('#userPhoto').attr('src', data.Url);
takeImg();
});


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllScoreQueryIndex.cshtml Ver ficheiro

@@ -139,7 +139,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
// console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml Ver ficheiro

@@ -142,7 +142,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
// console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml Ver ficheiro

@@ -141,7 +141,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
// console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml Ver ficheiro

@@ -135,7 +135,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
// console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryIndex.cshtml Ver ficheiro

@@ -139,7 +139,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
// console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '<tr><td colspan="3" style="text-align:center"><b>' + k + '</b></td></tr>'


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreStatisticAnalysis.js Ver ficheiro

@@ -66,7 +66,6 @@
p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
p.Semester = $('#Semester').lrselectGet();
p.ClassNo = item.value;
console.log(item)
if (p.AcademicYearNo == null || p.AcademicYearNo == "") {
learun.alert.warning("请选择学年!");
return;
@@ -108,7 +107,6 @@
p.LessonNo = $('#LessonNo').lrselectGet();
learun.httpAsyncPost(top.$.rootUrl + "/EducationalAdministration/StuScore/GetScoreCharts", p, function (res) {
if (res.code == 200) {
console.log(res);
var option1 = {
title: {
text: p.AcademicYearNo + '学年成绩分析图',


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.js Ver ficheiro

@@ -39,7 +39,6 @@ var bootstrap = function ($, learun) {
initData: function () {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/GetFormData?keyValue=' + keyValue, function (data) {
console.log(data);
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id).jfGridSet('refreshdata', data[id]);


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js Ver ficheiro

@@ -149,7 +149,6 @@ var bootstrap = function ($, learun) {
{
label: "状态", name: "RSendFlag", width: 100, align: "left",
formatter: function (cellvalue, row) {
console.log(cellvalue);
if (cellvalue == 1) {
return '<span class=\"label label-warning\">审批中</span>';
} else if (cellvalue == 2) {


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js Ver ficheiro

@@ -33,7 +33,6 @@ var bootstrap = function ($, learun) {
$('#SendType').lrDataItemSelect({
code: 'FileSendType', select: function (item) {
if (item != null && item != undefined) {
console.log(item.id);
if (item.id === 1 || item.id === "1") {
$("#CompanyIddiv").show();
$("#CompanyId").attr("isvalid", "yes");
@@ -253,7 +252,6 @@ var bootstrap = function ($, learun) {
// 保存数据
save = function (processId, callBack, i) {
var formData = $('body').lrGetFormData();
console.log(formData);
var sendtype = $('#SendType').lrselectGet();
if (sendtype == "1") {
formData.ReceiverId = $("#CompanyId").lrselectGet();


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormDocument.js Ver ficheiro

@@ -158,7 +158,6 @@ var bootstrap = function ($, learun) {
};
// 保存数据
acceptClick = function (callBack) {
console.log($('#Url').lrUploaderGet());
if (!$('#form').lrValidform()) {
return false;
}


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormParty.js Ver ficheiro

@@ -33,7 +33,6 @@ var bootstrap = function ($, learun) {
$('#SendType').lrDataItemSelect({
code: 'FileSendType', select: function (item) {
if (item != null && item != undefined) {
console.log(item.id);
if (item.id === 1 || item.id === "1") {
$("#CompanyIddiv").show();
$("#CompanyId").attr("isvalid", "yes");
@@ -253,7 +252,6 @@ var bootstrap = function ($, learun) {
// 保存数据
save = function (processId, callBack, i) {
var formData = $('body').lrGetFormData();
console.log(formData);
var sendtype = $('#SendType').lrselectGet();
if (sendtype == "1") {
formData.ReceiverId = $("#CompanyId").lrselectGet();


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js Ver ficheiro

@@ -72,7 +72,6 @@ var bootstrap = function ($, learun) {
{
label: "开关名称", name: "type", width: 100, align: "left",
formatter: function (val) {
console.log(val);
if (val == 'js') {
return '教师注册开关';
} else if (val == 'fx') {


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/DataAuthorize/CustomerFormIndex.js Ver ficheiro

@@ -104,7 +104,6 @@ var bootstrap = function ($, learun) {
interfaceId = item.id;
formId = item.value;

console.log(interfaceId, formId);

$('#titleinfo').text(item.text);
page.search();


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CRMModule/Views/CrmOrder/Index.js Ver ficheiro

@@ -42,7 +42,6 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
// 调用后台查询
// queryJson 查询条件
console.log(queryJson);
page.search({ queryJson: JSON.stringify(queryJson)});

},220);


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeDemo/Views/ImgShow/Demo3.js Ver ficheiro

@@ -10,7 +10,6 @@
loaddata: function () {
learun.httpAsyncGet(top.$.rootUrl + '/LR_CodeDemo/WorkOrder/GetList',function (data) {
if (!!data) {
console.log('data', data.data[0]['01']);
$("#line1-1").html('未完成:' + data.data[0]['1-1']);
$("#line1-2").html('已完成:' + data.data[0]['1-2']);
$("#line2-1").html('未完成:' + data.data[0]['2-1']);


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/CodeSchema/Index.js Ver ficheiro

@@ -21,7 +21,6 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailTree',
param: { itemCode: 'CodeSchemaType' },
nodeClick: function (item) {
console.log(item);

ftype = item.value;
$('#titleinfo').text(item.text);


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/PluginDemo/index.js Ver ficheiro

@@ -318,7 +318,6 @@ function () {
headData: [{ label: "商品编号", name: "F_ItemValue", width: 100, align: "left" },
{ label: "商品名称", name: "F_ItemName", width: 450, align: "left" }],
select: function (item) {
//console.log(item);
}

});
@@ -407,12 +406,10 @@ function () {
{ label: "备注", name: "f_description", width: 200, align: "left" }
],
select: function (values, texts) {
//console.log(values, texts);
}

});
//$('#select6').lrlayerselectSet('79e2b36d-73e6-42ff-aca2-e6b6bd885662,ed650fb0-5649-43b3-957d-73ceae26c313');
//console.log($('#select6').lrlayerselectGet(),'获取数据');
$('#select7').lrlayerselect({
treeCode: 'dataitemc',
treeParentId: 'f_parentid',


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/FastCodeIndex.js Ver ficheiro

@@ -34,7 +34,6 @@ var bootstrap = function ($, learun) {
return false;
}
var formData = $('#step-2').lrGetFormData();
console.log(formData);
postData = {
databaseLinkId: databaseLinkId,
tableName: $('#dbtablegird').jfGridValue('name'),


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/GridEditCodeIndex.js Ver ficheiro

@@ -71,7 +71,6 @@ var bootstrap = function ($, learun) {
if (v.step == 1) {
dbTable = $("#dbtablegird").jfGridValue("name");
dbTablePk = $("#dbtablegird").jfGridValue("pk");
console.log(dbTable, dbTablePk);
if (dbTable == "") {
learun.alert.error("请选择数据表");
return false;


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/ReportCodeIndex.js Ver ficheiro

@@ -100,7 +100,6 @@ var bootstrap = function (a, c) {
if (t.code == 200) {
a.each(t.data,
function (u, v) {
console.log("#" + u);
a("#" + u).html('<textarea name="SyntaxHighlighter" class="brush: c-sharp;">' + v + "</textarea>")
});
SyntaxHighlighter.highlight()


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTChart/Form.js Ver ficheiro

@@ -129,7 +129,6 @@ var bootstrap = function ($, learun) {
$("#Background").lrDataSourceSelect({
code: 'DesktopTheme', placeholder: '默认', codeTwo: 'font', codeOne: 'name', value: 'background', text: 'name', select: function (a) {
if (a) {
console.log(a);
$("#Background").css('background', a.background);
$("#Background .lr-select-placeholder").css('color', a.font);
}


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTList/Form.js Ver ficheiro

@@ -79,7 +79,6 @@ var bootstrap = function (a, b) {
},
initData: function () {
if (!!d) {
console.log(d);
keyValue = d.F_Id;
d.F_DataSourceId = d.F_DataSourceId.trim();
//a("#F_DataSourceId").lrselectSet(d.F_DataSourceId.trim());


+ 4
- 8
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/AddTaskForm.js Ver ficheiro

@@ -3,8 +3,7 @@ var acceptClick;

var bootstrap = function ($, learun) {
"use strict";
console.log('test')

var schemeObj;
var history;
var currentIds;
@@ -45,10 +44,8 @@ var bootstrap = function ($, learun) {
});

learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetProcessDetails', { processId: processId }, function (data) {
console.log(data)
if (data) {
console.log(data)

if (data) {
var info = data.info;
page.taskInfo = data.task;

@@ -228,8 +225,7 @@ var bootstrap = function ($, learun) {
// 保存成功后才回调
callBack && callBack();
});
console.log(formData)

};
page.init();
}

+ 2
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/AuditorFieldForm.js Ver ficheiro

@@ -78,8 +78,7 @@ var bootstrap = function ($, learun) {
placeholder: '请选择数据库',
allowSearch: true,
select: function (item) {
console.log(item);
if (item && !item.hasChildren) {
if (item && !item.hasChildren) {
dbId = item.id;
$('#ReFormId').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetList',
@@ -110,8 +109,7 @@ var bootstrap = function ($, learun) {
res.auditorName = "【" + formName + "】" + fieldName;
res.type = '5';//审核者类型1.岗位2.角色3.用户4.上下级5.表单指定字段6.某一个节点执行人
callBack(res);
console.log(formData, res);
return true;
return true;
};
page.init();
}

+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Email/ConfigForm.js Ver ficheiro

@@ -23,8 +23,7 @@ var bootstrap = function ($, learun) {
initData: function () {
var loginInfo = learun.clientdata.get(['userinfo']); //登陆者信息
$.lrSetForm(top.$.rootUrl + '/LR_OAModule/Email/GetConfigEntity?keyValue=' + loginInfo.userId, function (data) {//
console.log(data);
Id = data.F_Id;
Id = data.F_Id;
$('#form').lrSetFormData(data);
});
}


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/BcIndex.js Ver ficheiro

@@ -33,8 +33,7 @@ var bootstrap = function ($, learun) {
$(".crumb-path span").click(function () {
var value = $(this).attr('data-folderId');
var folderId = $(".crumb-path span:last").attr('data-folderId');
console.log(value);
if (value == "back") {
if (value == "back") {
if (folderId == 0) {
$(".crumb-path .back").hide();
}


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/ImportForm.js Ver ficheiro

@@ -99,8 +99,7 @@ var bootstrap = function ($, learun) {
// 触发合并文件碎片
var mergeFileChunks = function (file) {

//console.log(file, fileInfo);

var param = {};
param['__RequestVerificationToken'] = $.lrToken;
param['fileId'] = fileInfo[file.id].fileGuid;


+ 2
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Files/Index.js Ver ficheiro

@@ -115,8 +115,7 @@ var bootstrap = function ($, learun) {
$('#' + v).addClass('active');
tabType = v;
page.search[v] && page.search[v]();
//console.log(tabType)
//lr-uploadify
//lr-uploadify

});
},
@@ -464,8 +463,7 @@ var bootstrap = function ($, learun) {
$div.append($hbtn);
}

//console.log();

return $div;
}
}


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_TaskScheduling/Views/TaskDesign/AddDetailedForm.js Ver ficheiro

@@ -108,8 +108,7 @@ var bootstrap = function ($, learun) {
return false;
}
var postData = $('#form').lrGetFormData();
console.log('postData', postData);
if (!!callBack) {
if (!!callBack) {
if (postData.F_SelectMinute == "每日") {
callBack("每" + $('#F_CarryMounth').text() + "" + postData.F_SelectMinute + $('#F_Hour').val() + "时" + $('#F_Minute').val() + "分执行", postData, rowid);
} else {


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/ReleaseFlowForm.js Ver ficheiro

@@ -14,8 +14,7 @@ var bootstrap = function ($, learun) {
var taskId = learun.frameTab.currentIframe().taskId;
var formData = learun.frameTab.currentIframe().allFormDatas;

//console.log(type, shcemeCode, processId, taskId);

var page = {
init: function () {
if (type == 2) {


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfSystemDemo/DemoLeaveIndex.js Ver ficheiro

@@ -124,8 +124,7 @@ var bootstrap = function ($, learun) {
}
});

console.log(res, processId);
page.search();
page.search();
}



+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml Ver ficheiro

@@ -21,6 +21,14 @@
<div class="lr-form-item-title">部门</div>
<div id="Department"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">打卡地点</div>
<div id="ADR_Device"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">打卡结果</div>
<div id="ADStatus"></div>
</div>
</div>
</div>
</div>


+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js Ver ficheiro

@@ -46,6 +46,8 @@ var bootstrap = function ($, learun) {
page.search(queryJson);
}, 220, 400);
$('#Department').lrDepartmentSelect();
$('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' });
$('#ADStatus').lrDataItemSelect({ code: 'ADStatus'});
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -114,7 +116,6 @@ var bootstrap = function ($, learun) {
{
label: "部门", name: "Department", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
console.log(value);
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_CleanManagement/Form.js Ver ficheiro

@@ -68,7 +68,6 @@ var bootstrap = function ($, learun) {
value: 'id',
select: function (item) {
if (item) {
console.log(item.id);
$('#RId').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js Ver ficheiro

@@ -42,7 +42,6 @@ var bootstrap = function ($, learun) {
value: 'id',
select: function (item) {
if (item) {
console.log(item.id);
$('#RId').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js Ver ficheiro

@@ -57,7 +57,6 @@ var bootstrap = function ($, learun) {
value: 'id',
select: function (item) {
if (item) {
console.log(item.id);
$('#RId').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js Ver ficheiro

@@ -56,7 +56,6 @@ var bootstrap = function ($, learun) {
value: 'id',
select: function (item) {
if (item) {
console.log(item.id);
$('#RId').lrselectRefresh({
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml Ver ficheiro

@@ -273,7 +273,6 @@
this.unitName = ref.data.unitName;
this.unitID = ref.data.unitID;
}
console.log(this.floors);

}.bind(this), "json");

@@ -376,7 +375,6 @@
if (res) {
this.floors.splice($.inArray(floor, this.floors), 1);
top.learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/DeleteForm', { keyValue: floor.dormitory.ID }, function () {
console.log("删除成功");
});
}
}.bind(this));


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml Ver ficheiro

@@ -292,7 +292,6 @@
this.floorName = ref.data.floorName;
this.floorID = ref.data.floorID;
}
console.log(this.floors);

}.bind(this), "json");

@@ -411,7 +410,6 @@
if (res) {
this.floors.splice($.inArray(floor, this.floors), 1);
top.learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/DeleteForm', { keyValue: floor.dormitory.ID }, function () {
console.log("删除成功");
});
}
}.bind(this));


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml Ver ficheiro

@@ -121,7 +121,6 @@
getData: function () {
$.get('/LogisticsManagement/Accommodation/GetDormitoryList', function (ref) {
this.floors = ref.data;
//console.log(this.floors);

}.bind(this), "json");



+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js Ver ficheiro

@@ -82,10 +82,8 @@ var bootstrap = function ($, learun) {
//批量添加宿舍
$("#lr_dormitoryAdd").on("click", function () {
var keyvalue1 = $("#gridtable").jfGridValue("ID");
console.log(keyvalue1);
if (selectedParent.ChildType == "2") {
var keyValue = selectedParent.ID;
console.log(keyValue);
learun.layerForm({
id: 'form',
title: '批量添加宿舍',
@@ -135,7 +133,6 @@ var bootstrap = function ($, learun) {
$('#dataTree').lrtree({
url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetTree',
nodeClick: function (item) {
console.log(item);
selectedParent.ID = item.value;
selectedParent.Name = item.text;



+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml Ver ficheiro

@@ -211,7 +211,6 @@
this.roomName = ref.data.roomName;
this.roomID = ref.data.roomID;
}
console.log(ref);

}.bind(this), "json");

@@ -439,7 +438,6 @@
if (res) {
this.floors.splice($.inArray(floor, this.floors), 1);
top.learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/DeleteForm', { keyValue: floor.dormitory.ID }, function () {
console.log("删除成功");
});
}
}.bind(this));


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml Ver ficheiro

@@ -265,8 +265,6 @@
this.dormitoryName = ref.data.DormitoryName;
this.dormitoryID = ref.data.DormitoryID;
}
console.log(this.floors);
console.log(request("bbc"));

}.bind(this), "json");

@@ -371,7 +369,6 @@
if (res) {
this.floors.splice($.inArray(floor, this.floors), 1);
top.learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/DeleteForm', { keyValue: floor.dormitory.ID }, function () {
console.log("删除成功");
});
}
}.bind(this));


+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js Ver ficheiro

@@ -18,11 +18,9 @@ var bootstrap = function ($, learun) {
$('#dataTree').lrtree({
url: top.$.rootUrl + '/LogisticsManagement/Sanitation/GetTree',
nodeClick: function (item) {
console.log(item);
selectedParent.ID = item.value;
selectedParent.hasChildren = item.hasChildren;
selectedParent.textName = item.text;
console.log(selectedParent.textName.indexOf("室"));
page.search({ RoomID: item.value });
}
});


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js Ver ficheiro

@@ -80,7 +80,7 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
headData: [
{ label: "上班时间", name: "WorkTime", width: 100, align: "left" },
{ label: "签到开始u时间", name: "SignInStartTime", width: 100, align: "left" },
{ label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
{ label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
{ label: "下班时间", name: "CloseTime", width: 100, align: "left" },
{ label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/AttendanceDetail.js Ver ficheiro

@@ -54,8 +54,7 @@ var bootstrap = function ($, learun) {
{
label: '是否出勤', name: 'AttendOrNo', width: 130, align: 'left',
formatter: function (cellvalue) {
console.log(cellvalue);
if (cellvalue == "是") {
if (cellvalue == "是") {
return "<span class=\"label label-success\">是</span>";
} else {
return "<span class=\"label label-danger\">否</span>";


+ 2
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jquery-ui/jquery-ui-1.11.4.js Ver ficheiro

@@ -6408,8 +6408,7 @@ $.widget("ui.draggable", $.ui.mouse, {
pageY = event.pageY;


//console.log(pageX,pageY);


// Cache the scroll
if ( !scrollIsRootNode || !this.offset.scroll ) {
@@ -6652,8 +6651,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
return innermostIntersecting;
});
}
//console.log(innermostIntersecting, sortable.containerCache);
if ( innermostIntersecting ) {
if ( innermostIntersecting ) {
// If it intersects, we use a little isOver variable and set it once,
// so that the move-in stuff gets fired only once.
event.pageY -= _iframeY;//cbbex


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Content/static/js/app.js Ver ficheiro

@@ -62,8 +62,7 @@ $.getJSON('static/map/china.json', function(data){

//地图点击事件
chart.on('click', function (params) {
console.log( params );
if( params.name in provinces ){
if( params.name in provinces ){
//如果点击的是34个省、市、自治区,绘制选中地区的二级地图
$.getJSON('static/map/province/'+ provinces[params.name] +'.json', function(data){
echarts.registerMap( params.name, data);


+ 3
- 6
Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js Ver ficheiro

@@ -7238,8 +7238,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
}
me.fireEvent('beforegetcontent');
var root = UE.htmlparser(me.body.innerHTML, ignoreBlank);
//console.log(me.body.innerHTML, root, 'learun');
me.filterOutputRule(root);
me.filterOutputRule(root);
me.fireEvent('aftergetcontent', cmd,root);
return root.toHtml(formatter);
},
@@ -9470,8 +9469,7 @@ var htmlparser = UE.htmlparser = function (htmlstr,ignoreBlank) {
while (match = re_attr.exec(htmlattr)) {
attrs[match[1].toLowerCase()] = notTransAttrs[match[1].toLowerCase()] ? (match[2] || match[3] || match[4]) : utils.unhtml(match[2] || match[3] || match[4])
}
//console.log('learun', htmlattr, attrs);
elm.attrs = attrs;
elm.attrs = attrs;
}

console.log(elm.attrs, 'learun', 'elm.attrs');
@@ -9545,8 +9543,7 @@ var htmlparser = UE.htmlparser = function (htmlstr,ignoreBlank) {
}catch(e){}

nextIndex = re_tag.lastIndex;
//console.log(currentParent, 'learun', 'currentParent');
}
}
//如果结束是文本,就有可能丢掉,所以这里手动判断一下
//例如 <li>sdfsdfsdf<li>sdfsdfsdfsdf
if (nextIndex < htmlstr.length) {


+ 1
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation.cshtml Ver ficheiro

@@ -143,13 +143,11 @@
var modulesTree = top.learun.clientdata.get(['modulesTree']);
var parentId = '0';
var modules = modulesTree[parentId] || [];
//console.log(modulesTree)
$('.nav').on('click', '.navMoreBox .navMore', function () {//查看更多
var id = $(this).parents('.navBox').attr('id');
$('.navCon').css('display', 'none').removeClass('active');
$('.navCon[parentid="' + id + '"]').addClass('active').fadeIn();
//console.log($('.navRow[parentid="'+ id +'"]'))
}).on('click', '.navTitle .fa-angle-left', function () {//返回上一页
// }).on('click', '.navTitle .fa-angle-left', function () {//返回上一页
var id = $(this).parents('.navCon').attr('parentid');
$('.navCon').css('display', 'none').removeClass('active');
$('#' + id).parents('.navCon').addClass('active').fadeIn();
@@ -197,7 +195,6 @@
var $threeMenux = $('<div class="navCon navCons" num="3" parentid="' + secondItem.F_ModuleId + '"><div class="navTitle" style="background: ' + color + ';color:#fff"><i class="fa fa-angle-left"></i><i class="' + secondItem.F_Icon + '"></i>' + secondItem.F_FullName + '</div></div>');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
//console.log(threeModules.length)
if (threeModules.length != 0) {
secondClassName = 'navMoreBox', secondMore = '展开更多 <i class="fa fa-caret-right"></i>';
}


+ 1
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation1.cshtml Ver ficheiro

@@ -134,13 +134,11 @@ Layout = "~/Views/Shared/_Index.cshtml";
var modulesTree = top.learun.clientdata.get(['modulesTree']);
var parentId = '0';
var modules = modulesTree[parentId] || [];
//console.log(modulesTree)
$('.nav').on('click', '.navMoreBox .navMore', function(){//查看更多
var id = $(this).parents('.navBox').attr('id');
$('.navCon').css('display', 'none').removeClass('active');
$('.navCon[parentid="'+ id +'"]').addClass('active').fadeIn();
//console.log($('.navRow[parentid="'+ id +'"]'))
}).on('click', '.navTitle .fa-angle-left', function(){//返回上一页
// }).on('click', '.navTitle .fa-angle-left', function(){//返回上一页
var id = $(this).parents('.navCon').attr('parentid');
$('.navCon').css('display', 'none').removeClass('active');
$('#' + id).parents('.navCon').addClass('active').fadeIn();
@@ -188,7 +186,6 @@ Layout = "~/Views/Shared/_Index.cshtml";
var $threeMenux = $('<div class="navCon navCons" num="3" parentid="'+ secondItem.F_ModuleId +'"><div class="navTitle" style="background: '+ color +';color:#fff"><i class="fa fa-angle-left"></i><i class="'+ secondItem.F_Icon +'"></i>'+ secondItem.F_FullName +'</div></div>');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
//console.log(threeModules.length)
if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 <i class="fa fa-caret-right"></i>';
}


+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation2.cshtml Ver ficheiro

@@ -134,12 +134,10 @@ Layout = "~/Views/Shared/_Index.cshtml";
var modulesTree = top.learun.clientdata.get(['modulesTree']);
var parentId = '0';
var modules = modulesTree[parentId] || [];
//console.log(modulesTree)
$('.nav').on('click', '.navMoreBox .navMore', function(){//查看更多
var id = $(this).parents('.navBox').attr('id');
$('.navCon').css('display', 'none').removeClass('active');
$('.navCon[parentid="'+ id +'"]').addClass('active').fadeIn();
//console.log($('.navRow[parentid="'+ id +'"]'))
}).on('click', '.navTitle .fa-angle-left', function(){//返回上一页
var id = $(this).parents('.navCon').attr('parentid');
$('.navCon').css('display', 'none').removeClass('active');
@@ -188,7 +186,6 @@ Layout = "~/Views/Shared/_Index.cshtml";
var $threeMenux = $('<div class="navCon navCons" num="3" parentid="'+ secondItem.F_ModuleId +'"><div class="navTitle" style="background: '+ color +';color:#fff"><i class="fa fa-angle-left"></i><i class="'+ secondItem.F_Icon +'"></i>'+ secondItem.F_FullName +'</div></div>');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
//console.log(threeModules.length)
if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 <i class="fa fa-caret-right"></i>';
}


+ 1
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation3.cshtml Ver ficheiro

@@ -134,12 +134,10 @@ Layout = "~/Views/Shared/_Index.cshtml";
var modulesTree = top.learun.clientdata.get(['modulesTree']);
var parentId = '0';
var modules = modulesTree[parentId] || [];
//console.log(modulesTree)
$('.nav').on('click', '.navMoreBox .navMore', function(){//查看更多
var id = $(this).parents('.navBox').attr('id');
$('.navCon').css('display', 'none').removeClass('active');
$('.navCon[parentid="'+ id +'"]').addClass('active').fadeIn();
//console.log($('.navRow[parentid="'+ id +'"]'))
}).on('click', '.navTitle .fa-angle-left', function(){//返回上一页
var id = $(this).parents('.navCon').attr('parentid');
$('.navCon').css('display', 'none').removeClass('active');
@@ -188,8 +186,7 @@ Layout = "~/Views/Shared/_Index.cshtml";
var $threeMenux = $('<div class="navCon navCons" num="3" parentid="'+ secondItem.F_ModuleId +'"><div class="navTitle" style="background: '+ color +';color:#fff"><i class="fa fa-angle-left"></i><i class="'+ secondItem.F_Icon +'"></i>'+ secondItem.F_FullName +'</div></div>');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
//console.log(threeModules.length)
if(threeModules.length != 0){
if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 <i class="fa fa-caret-right"></i>';
}


+ 3
- 6
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation4.cshtml Ver ficheiro

@@ -135,13 +135,11 @@ Layout = "~/Views/Shared/_Index.cshtml";
var modulesTree = top.learun.clientdata.get(['modulesTree']);
var parentId = '0';
var modules = modulesTree[parentId] || [];
//console.log(modulesTree)
$('.nav').on('click', '.navMoreBox .navMore', function(){//查看更多
$('.nav').on('click', '.navMoreBox .navMore', function(){//查看更多
var id = $(this).parents('.navBox').attr('id');
$('.navCon').css('display', 'none').removeClass('active');
$('.navCon[parentid="'+ id +'"]').addClass('active').fadeIn();
//console.log($('.navRow[parentid="'+ id +'"]'))
}).on('click', '.navTitle .fa-angle-left', function(){//返回上一页
}).on('click', '.navTitle .fa-angle-left', function(){//返回上一页
var id = $(this).parents('.navCon').attr('parentid');
$('.navCon').css('display', 'none').removeClass('active');
$('#' + id).parents('.navCon').addClass('active').fadeIn();
@@ -189,8 +187,7 @@ Layout = "~/Views/Shared/_Index.cshtml";
var $threeMenux = $('<div class="navCon navCons" num="3" parentid="'+ secondItem.F_ModuleId +'"><div class="navTitle" style="background: '+ color +';color:#fff"><i class="fa fa-angle-left"></i><i class="'+ secondItem.F_Icon +'"></i>'+ secondItem.F_FullName +'</div></div>');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
//console.log(threeModules.length)
if(threeModules.length != 0){
if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 <i class="fa fa-caret-right"></i>';
}


Alguns ficheiros não foram mostrados porque foram alterados demasiados ficheiros neste diff

Carregando…
Cancelar
Guardar