diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
index 5569bbd7c..dec495114 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
@@ -197,11 +197,10 @@ var bootstrap = function ($, learun) {
console.log(res);
var bb = '';
$.each(res.data, function(i, item) {
-
bb += '' +
- item.F_FileName +
+ item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
', ';
})
callback(bb);
@@ -230,7 +229,7 @@ var bootstrap = function ($, learun) {
param = param || {};
param.WorkName = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
- }
+ },
};
refreshGirdData = function (res, postData) {
if (res.code == 200) {
@@ -249,3 +248,13 @@ var bootstrap = function ($, learun) {
};
page.init();
}
+function downLoad(fileId, fileTwo) {
+ console.log(222);
+ if (fileTwo) {
+
+ top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+ });
+ }
+ top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
index 5a4d465d5..a21ec4c02 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
@@ -202,7 +202,7 @@ var bootstrap = function ($, learun) {
bb += '' +
- item.F_FileName +
+ item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
', ';
})
callback(bb);
@@ -231,6 +231,10 @@ var bootstrap = function ($, learun) {
param = param || {};
param.WorkName = 2;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ },
+ downLoad: function (fileId) {
+ console.log(111);
+ top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
}
};
refreshGirdData = function (res, postData) {
@@ -250,3 +254,13 @@ var bootstrap = function ($, learun) {
};
page.init();
}
+function downLoad(fileId, fileTwo) {
+ console.log(222);
+ if (fileTwo) {
+
+ top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+ });
+ }
+ top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js
index 7a0703ae0..243d1da14 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js
@@ -72,7 +72,7 @@ var bootstrap = function ($, learun) {
{ label: "年", name: "DisYear", width: 100, align: "center" },
{ label: "月", name: "DisMonth", width: 100, align: "center" },
{ label: "日", name: "DisDay", width: 100, align: "center" },
- { label: "事由", name: "Reasons", width: 400, align: "center" ,,
+ { label: "事由", name: "Reasons", width: 400, align: "center" ,
formatterAsync: function (callback, value, row, op, $cell) {
$.ajax({
url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
@@ -89,7 +89,7 @@ var bootstrap = function ($, learun) {
bb += '' +
- item.F_FileName +
+ item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
', ';
})
callback(bb);
@@ -123,6 +123,10 @@ var bootstrap = function ($, learun) {
param = param || {};
param.userId = userId;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ },
+ downLoad: function (fileId) {
+ console.log(111);
+ top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
}
};
refreshGirdData = function (res, postData) {
@@ -142,3 +146,13 @@ var bootstrap = function ($, learun) {
};
page.init();
}
+function downLoad(fileId, fileTwo) {
+ console.log(222);
+ if (fileTwo) {
+
+ top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+ });
+ }
+ top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}
\ No newline at end of file