diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AppManager/Views/FunctionManager/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AppManager/Views/FunctionManager/Form.js
index 95e0ecd9d..913641d7e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AppManager/Views/FunctionManager/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AppManager/Views/FunctionManager/Form.js
@@ -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,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssAddReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssAddReport.js
index af112a445..e2da71217 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssAddReport.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssAddReport.js
@@ -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: {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssStatusReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssStatusReport.js
index 7614dbb5c..ced6facb7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssStatusReport.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssStatusReport.js
@@ -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: {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssTypeReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssTypeReport.js
index 9e3a0e93a..a8b131912 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssTypeReport.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssReport/AssTypeReport.js
@@ -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: {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
index e093467c2..744d6f4fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
@@ -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) {
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 43cf473f3..f68a30b54 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
@@ -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]);
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 f81ae5951..d336f7797 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
@@ -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]);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
index 92fbd9c67..f8bcba62f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
@@ -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,
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 768df17ce..8e7674e05 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
@@ -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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
index 0fef20cf4..60e9ff137 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
@@ -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',
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 e1c7b6065..4f8b2df85 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
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Form.js
index 2c07f0395..35f13c1b7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Form.js
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js
index af4aeac46..6c6fe0fcf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/FormView.js
@@ -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;
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 3fc2d97d2..5b6023e13 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
@@ -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);
}
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js
index c217f4578..797b70fcb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js
@@ -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;
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 81c6a50d7..f19c7c03a 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
@@ -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);
}
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTerm/ExamIndexOfTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTerm/ExamIndexOfTeacher.js
index 51bc5582d..d1f660a2c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTerm/ExamIndexOfTeacher.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTerm/ExamIndexOfTeacher.js
@@ -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++) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 85457415f..2aa457b6a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
@@ -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;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
index 18f3e75c8..13c22c99e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
@@ -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('上传失败');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
index cb72dce1a..8041578a5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
@@ -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");
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
index b0203a49b..74a536d7d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
@@ -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({
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js
index 0df98761a..ba41b046b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js
@@ -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({
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
index 2aa09074e..6b9c7706e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
@@ -228,7 +228,6 @@
});
},
done: function (res) {
- console.log(res);
//如果上传失败
if (res.code != 200) {
return layer.msg('上传失败');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js
index 763ae6636..dba4d2c34 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js
index 3c46ad98c..11302c109 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CardPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CardPrint.cshtml
index 5b6a227ba..9b3e8d580 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CardPrint.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CardPrint.cshtml
@@ -64,8 +64,7 @@
data.info = '系统异常,请联系管理员!';
}
- //console.log(data);
- //绑定数据
+ // //绑定数据
$("#StuName").html(data.data.stuName);
$("#ClassName").html(data.data.className);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js
index 531c6b0f3..3e05f6b4b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js
@@ -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 '已上传';
} 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");
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js
index 7eb959921..ceaac9785 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js
@@ -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);
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js
index 16928fe90..1118636d1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js
index 122015286..fbeee4821 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js
index eaa9f20b0..8b37576d8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js
index c3edd5969..80813a07d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js
index d18963b7d..85145bfff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js
@@ -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: '修改招生类别',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
index a56f27751..05e42e22c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
@@ -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");
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
index f3c72aebc..5235b7d12 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
@@ -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;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js
index e3f56c75c..691929fc6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js
@@ -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");
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js
index f891cfab4..14a49d27d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js
index ece145fe3..99bc91916 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js
@@ -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");
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js
index 3874c9e9c..60e23969b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js
index eb1db6ecd..1fbb443b0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js
@@ -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");
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
index 4f6addb42..ec38c618d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
@@ -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,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js
index 95b6079d8..cca6f98c2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNoForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNoForm.js
index e9df58ea4..1a8dd7813 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNoForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNoForm.js
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml
index a9175a13d..700d24c55 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml
@@ -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");
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
index ebffc32ff..dafb70cee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
index 327e400fe..dfc099167 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
@@ -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();
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllScoreQueryIndex.cshtml
index d473900f5..32e2789d9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllScoreQueryIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllScoreQueryIndex.cshtml
@@ -139,7 +139,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
- // console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '
' + k + ' |
'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml
index 7f9b3fac9..4daee3770 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.cshtml
@@ -142,7 +142,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
- // console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '' + k + ' |
'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml
index 5aea37b15..28b6eccd5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml
@@ -141,7 +141,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
- // console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '' + k + ' |
'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml
index 51799daaf..54a820a3d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml
@@ -135,7 +135,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
- // console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '' + k + ' |
'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryIndex.cshtml
index c90f7ea31..0522474bd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryIndex.cshtml
@@ -139,7 +139,6 @@
if (num == 0 && i == 0) {
html += tableHtml;
}
- // console.log(n)
$.each(n, function (j, k) { // 学期数据循环
if (j == 'title') {
html += '' + k + ' |
'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreStatisticAnalysis.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreStatisticAnalysis.js
index 257cdcfeb..7fbba326c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreStatisticAnalysis.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreStatisticAnalysis.js
@@ -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 + '学年成绩分析图',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.js
index 35f29e8f6..ea694e655 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Form.js
@@ -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]);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
index 154c73f2f..dedd439d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
@@ -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 '审批中';
} else if (cellvalue == 2) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js
index e48053050..87802f8ab 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js
@@ -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();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormDocument.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormDocument.js
index b85d0f756..b66829bcd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormDocument.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormDocument.js
@@ -158,7 +158,6 @@ var bootstrap = function ($, learun) {
};
// 保存数据
acceptClick = function (callBack) {
- console.log($('#Url').lrUploaderGet());
if (!$('#form').lrValidform()) {
return false;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormParty.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormParty.js
index 9c16729e2..42cfd017d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormParty.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormParty.js
@@ -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();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js
index 53f8317fb..c9303e589 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js
@@ -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') {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/DataAuthorize/CustomerFormIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/DataAuthorize/CustomerFormIndex.js
index fac346241..5655372e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/DataAuthorize/CustomerFormIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/DataAuthorize/CustomerFormIndex.js
@@ -104,7 +104,6 @@ var bootstrap = function ($, learun) {
interfaceId = item.id;
formId = item.value;
- console.log(interfaceId, formId);
$('#titleinfo').text(item.text);
page.search();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CRMModule/Views/CrmOrder/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CRMModule/Views/CrmOrder/Index.js
index a6f743bbf..c86187558 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CRMModule/Views/CrmOrder/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CRMModule/Views/CrmOrder/Index.js
@@ -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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeDemo/Views/ImgShow/Demo3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeDemo/Views/ImgShow/Demo3.js
index cf4bee0b5..0a4e19b16 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeDemo/Views/ImgShow/Demo3.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeDemo/Views/ImgShow/Demo3.js
@@ -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']);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/CodeSchema/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/CodeSchema/Index.js
index 4bcb019ef..bc01d63a7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/CodeSchema/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/CodeSchema/Index.js
@@ -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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/PluginDemo/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/PluginDemo/index.js
index 85aa98d3f..88cb350da 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/PluginDemo/index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/PluginDemo/index.js
@@ -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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/FastCodeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/FastCodeIndex.js
index e03695f40..df9f7ce6c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/FastCodeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/FastCodeIndex.js
@@ -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'),
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/GridEditCodeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/GridEditCodeIndex.js
index 76cad6e8a..295228ca1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/GridEditCodeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/GridEditCodeIndex.js
@@ -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;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/ReportCodeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/ReportCodeIndex.js
index 0cae26f6f..bc4e1c8a8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/ReportCodeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/TemplatePC/ReportCodeIndex.js
@@ -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('")
});
SyntaxHighlighter.highlight()
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTChart/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTChart/Form.js
index e6eb3e19e..5bf8fe614 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTChart/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTChart/Form.js
@@ -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);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTList/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTList/Form.js
index fedf87f7e..1e09e5775 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTList/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/DTList/Form.js
@@ -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());
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/AddTaskForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/AddTaskForm.js
index feb210dfc..21033037b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/AddTaskForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/AddTaskForm.js
@@ -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();
}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/AuditorFieldForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/AuditorFieldForm.js
index a0c78135d..4dc25df43 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/AuditorFieldForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/AuditorFieldForm.js
@@ -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();
}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Email/ConfigForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Email/ConfigForm.js
index b5501a704..ced523bd0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Email/ConfigForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Email/ConfigForm.js
@@ -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);
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/BcIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/BcIndex.js
index 92784229d..dc3dc3cdc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/BcIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/BcIndex.js
@@ -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();
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/ImportForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/ImportForm.js
index 45f2483fa..e4f3fe399 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/ImportForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/ExcelImport/ImportForm.js
@@ -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;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Files/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Files/Index.js
index 6c6568611..ebf8b3fcc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Files/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Files/Index.js
@@ -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;
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_TaskScheduling/Views/TaskDesign/AddDetailedForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_TaskScheduling/Views/TaskDesign/AddDetailedForm.js
index 844b50a79..863c372b7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_TaskScheduling/Views/TaskDesign/AddDetailedForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_TaskScheduling/Views/TaskDesign/AddDetailedForm.js
@@ -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 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/ReleaseFlowForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/ReleaseFlowForm.js
index d7510a344..a2a5c2f4d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/ReleaseFlowForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/ReleaseFlowForm.js
@@ -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) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfSystemDemo/DemoLeaveIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfSystemDemo/DemoLeaveIndex.js
index d8fe9224d..717cf9bb0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfSystemDemo/DemoLeaveIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfSystemDemo/DemoLeaveIndex.js
@@ -124,8 +124,7 @@ var bootstrap = function ($, learun) {
}
});
- console.log(res, processId);
- page.search();
+ page.search();
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml
index 4adafbfb4..ec13ad6d5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml
@@ -21,6 +21,14 @@
部门
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
index f6091bf9e..a7528b05b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
@@ -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,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_CleanManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_CleanManagement/Form.js
index 6c53b8418..ed3829d87 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_CleanManagement/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_CleanManagement/Form.js
@@ -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" }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js
index b8f9f1c48..203a3bbd7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Form.js
@@ -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" }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js
index 9ba0bc12e..3becb1c65 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.js
@@ -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" }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
index 9e670efde..0a438ce75 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js
@@ -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" }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml
index b3b38ad3f..76b48d7ef 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml
@@ -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));
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
index b436068df..b9a5635ac 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml
@@ -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));
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
index 83ffb01d3..60987f4f5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
@@ -121,7 +121,6 @@
getData: function () {
$.get('/LogisticsManagement/Accommodation/GetDormitoryList', function (ref) {
this.floors = ref.data;
- //console.log(this.floors);
}.bind(this), "json");
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
index 6510c5d3c..c2917124b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
@@ -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;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml
index ec4c90a0f..116bc4ae9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml
@@ -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));
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml
index 3c483028c..f398e50a6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Unit.cshtml
@@ -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));
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
index 2253f8345..e11954e18 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Sanitation/Index.js
@@ -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 });
}
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
index 44bb72394..8e8953685 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
@@ -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" },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/AttendanceDetail.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/AttendanceDetail.js
index f040f94c8..107c1e5d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/AttendanceDetail.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/AttendanceDetail.js
@@ -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 "是";
} else {
return "否";
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jquery-ui/jquery-ui-1.11.4.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jquery-ui/jquery-ui-1.11.4.js
index 29d50d910..88994bf8a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jquery-ui/jquery-ui-1.11.4.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jquery-ui/jquery-ui-1.11.4.js
@@ -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
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/static/js/app.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/static/js/app.js
index 006675b6e..84c5e97b5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/static/js/app.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/static/js/app.js
@@ -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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js
index b54fb1d74..35e3e3213 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js
@@ -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');
- }
+ }
//如果结束是文本,就有可能丢掉,所以这里手动判断一下
//例如 sdfsdfsdfsdfsdfsdfsdf
if (nextIndex < htmlstr.length) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation.cshtml
index 2939db9bd..45ac83964 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation.cshtml
@@ -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 = $('' + secondItem.F_FullName + '
');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
- //console.log(threeModules.length)
if (threeModules.length != 0) {
secondClassName = 'navMoreBox', secondMore = '展开更多 ';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation1.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation1.cshtml
index 1a5be7b97..2ca1a0df0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation1.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation1.cshtml
@@ -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 = $(''+ secondItem.F_FullName +'
');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
- //console.log(threeModules.length)
if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 ';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation2.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation2.cshtml
index 8bc28dc95..790cd7a65 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation2.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation2.cshtml
@@ -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 = $(''+ secondItem.F_FullName +'
');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
- //console.log(threeModules.length)
if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 ';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation3.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation3.cshtml
index edf009516..3fecde7a6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation3.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation3.cshtml
@@ -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 = $(''+ secondItem.F_FullName +'
');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
- //console.log(threeModules.length)
- if(threeModules.length != 0){
+ if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 ';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation4.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation4.cshtml
index 96119e0cc..89431ac81 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation4.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/DesktopNavigation4.cshtml
@@ -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 = $(''+ secondItem.F_FullName +'
');
var threeMenuHad = false;
var secondClassName = '', secondMore = '';
- //console.log(threeModules.length)
- if(threeModules.length != 0){
+ if(threeModules.length != 0){
secondClassName = 'navMoreBox', secondMore = '展开更多 ';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/scroll/scroll.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/scroll/scroll.js
index cdba51945..505a4cb4b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/scroll/scroll.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/scroll/scroll.js
@@ -110,8 +110,7 @@
// 监听鼠标滚动
$this.mousewheel(function (event, delta, deltaX, deltaY) {
- //console.log(delta);
-
+
var $this = $(this);
var $select = $this.find('.lr-select-focus');
if ($select.length > 0) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflow/lr-workflow-ui.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflow/lr-workflow-ui.js
index db5dc010c..8af1957e3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflow/lr-workflow-ui.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflow/lr-workflow-ui.js
@@ -808,8 +808,7 @@
path.setAttribute("stroke", "gray");
path.setAttribute("marker-end", "url(#arrow1)");
}
- ///console.log(wftype);
-
+ /
line.appendChild(hi);
line.appendChild(path);
line.style.cursor = "crosshair";
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflownew/lr-workflow-ui.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflownew/lr-workflow-ui.js
index 5639b6368..8993ba236 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflownew/lr-workflow-ui.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/workflownew/lr-workflow-ui.js
@@ -798,8 +798,7 @@
path.setAttribute("stroke", "gray");
path.setAttribute("marker-end", "url(#arrow1)");
}
- ///console.log(wftype);
-
+ /
line.appendChild(hi);
line.appendChild(path);
line.style.cursor = "crosshair";
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-date.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-date.js
index 1367f0448..d9873a0ad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-date.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-date.js
@@ -170,18 +170,12 @@
return res;
},
////上周的开始时间
- //console.log(getTime(7));
- ////上周的结束时间
- //console.log(getTime(1));
- ////本周的开始时间
- //console.log(getTime(0));
- ////本周的结束时间
- //console.log(getTime(-6));
- ////下周的开始时间
- //console.log(getTime(-7));
- ////下周结束时间
- //console.log(getTime(-13));
- getTime: function (n) {
+ ////上周的结束时间
+ ////本周的开始时间
+ ////本周的结束时间
+ ////下周的开始时间
+ ////下周结束时间
+ getTime: function (n) {
var now = new Date();
var year = now.getFullYear();
//因为月份是从0开始的,所以获取这个月的月份数要加1才行
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.js
index 520ec786f..64e48a758 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.js
@@ -70,8 +70,7 @@ var bootstrap = function ($, learun) {
}
}.bind(this));
- //console.log("成功");
- }
+ }
};
refreshGirdData = function () {
location.reload();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
index 226e1d428..0f3678c22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
@@ -66,9 +66,16 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
dp.Add("Department",queryParam["Department"].ToString(), DbType.String);
strSql.Append(" AND emp.F_DepartmentId = @Department ");
}
-
-
-
+ if (!queryParam["ADR_Device"].IsEmpty())
+ {
+ dp.Add("ADR_Device", queryParam["ADR_Device"].ToString(), DbType.String);
+ strSql.Append(" AND t.ClockPlace = @ADR_Device ");
+ }
+ if (!queryParam["ADStatus"].IsEmpty())
+ {
+ dp.Add("ADStatus", queryParam["ADStatus"].ToString(), DbType.String);
+ strSql.Append(" AND t.ADStatus = @ADStatus ");
+ }
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination);
}
catch (Exception ex)