From ef81a1a01fd74f8eee9ab0ce1723cc4e572c1720 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 14 Sep 2021 10:21:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=B0=83=E6=8B=A8=E3=80=81?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E6=89=93=E5=8D=B0=E6=98=8E=E7=BB=86=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=94=B9=E4=B8=BA=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetManagementSystem/Views/Ass_Acceptance/Form.js | 4 +++- .../AssetManagementSystem/Views/Ass_Acceptance/FormView.js | 5 +++-- .../AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml | 6 +++++- .../Views/Ass_AssetsOutApply/AssetsFormView.js | 4 +++- .../AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js | 4 +++- .../Views/Ass_AssetsOutApply/FormView.js | 4 +++- .../Views/Ass_AssetsOutApply/Print.cshtml | 4 +++- 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js index 3f3afc285..7fd1c0903 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js @@ -266,10 +266,12 @@ var bootstrap = function ($, learun) { //打印 $('#detailprint').on('click', function () { + var createTime = $('#CreateTime').val(); + createTime = learun.formatDate(createTime, 'yyyy-MM-dd'); learun.layerForm({ id: 'print', title: '北京金隅科技学校固定资产验收单', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print', + url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print?createTime=' + createTime, width: 1100, height: 800, btn: null diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js index 11f0c47bf..8963e3b2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js @@ -256,11 +256,12 @@ var bootstrap = function ($, learun) { //打印 $('#detailprint').on('click', function () { - console.log(ProcessId); + var createTime = $('#CreateTime').val(); + createTime = learun.formatDate(createTime, 'yyyy-MM-dd'); learun.layerForm({ id: 'print', title: '北京金隅科技学校固定资产验收单', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print?keyValue=' + keyValue + '&ProcessId=' + ProcessId, + url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print?keyValue=' + keyValue + '&ProcessId=' + ProcessId + '&createTime=' + createTime, width: 1100, height: 800, btn: null diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml index 69b446a77..d03deb6f6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml @@ -14,7 +14,7 @@
北京金隅科技学校固定资产验收单
项目名称： - 日期：@ViewBag.Date + 日期：
@@ -85,6 +85,10 @@ } } + + var createTime = getQueryString('createTime'); + $('#time').text(createTime); + var ProcessId = getQueryString('ProcessId'); if (ProcessId) { TaskLogData = top.learun.httpGet( diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js index 01a442d59..25e41f948 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js @@ -116,10 +116,12 @@ var bootstrap = function ($, learun) { //打印 $('#detailprint').on('click', function () { + var createTime = $('#AOCreateTime').val(); + createTime = learun.formatDate(createTime, 'yyyy-MM-dd'); learun.layerForm({ id: 'print', title: '固定资产调拨单', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print?keyValue=' + keyValue + '&AOProcessId=' + AOProcessId, + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print?keyValue=' + keyValue + '&AOProcessId=' + AOProcessId + '&createTime=' + createTime, width: 1100, height: 800, btn: null 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 40fc8fc95..a72dcf858 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 @@ -263,10 +263,12 @@ var bootstrap = function ($, learun) { //打印 $('#detailprint').on('click', function () { + var createTime = $('#AOCreateTime').val(); + createTime = learun.formatDate(createTime, 'yyyy-MM-dd'); learun.layerForm({ id: 'print', title: '固定资产调拨单', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print', + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print?createTime=' + createTime, width: 1100, height: 800, btn: null diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js index 0a299a5f4..7a5582c5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js @@ -45,10 +45,12 @@ var bootstrap = function ($, learun) { //打印 $('#detailprint').on('click', function () { + var createTime = $('#AOCreateTime').val(); + createTime = learun.formatDate(createTime, 'yyyy-MM-dd'); learun.layerForm({ id: 'print', title: '固定资产调拨单', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print?keyValue=' + keyValue + '&AOProcessId=' + AOProcessId, + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print?keyValue=' + keyValue + '&AOProcessId=' + AOProcessId + '&createTime=' + createTime, width: 1100, height: 800, btn: null diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml index 9542e085f..282be57eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml @@ -14,7 +14,7 @@
固定资产调拨单
@*项目名称：*@ - 日期：@ViewBag.Date + 日期：
@@ -82,6 +82,8 @@ } var AOProcessId = getQueryString('AOProcessId'); + var createTime = getQueryString('createTime'); + $('#time').text(createTime); if (AOProcessId) { TaskLogData = top.learun.httpGet( top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/GetNWFTaskLogData?processId=' + AOProcessId, '');