diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs index 91b6d9511..9d034b8d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs @@ -57,6 +57,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [HttpGet] public ActionResult AssetsForm() { + ViewBag.AOCode = "CKSQ_" + CommonHelper.CreateNo(); return View(); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js index 39126875e..8a08dd6aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js @@ -28,17 +28,19 @@ var bootstrap = function ($, learun) { init: function () { $('.lr-form-wrap').lrscroll(); $("#detailadd").on('click', function () { - learun.layerForm({ + selectedRow = null; + learun.layerFormForPercent({ id: 'formitem', title: '新增明细', url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/IndexTwo', - width: 860, - height: 600, + width: "60%", + height: "70%", callBack: function (id) { return top[id].acceptClick(refreshGirdData); } }); }); + $("#detaildel").on('click', function () { var keyValue = $('#Ass_AssetsOutItemApply').jfGridValue('AOICode'); if (learun.checkrow(keyValue)) { @@ -109,7 +111,7 @@ var bootstrap = function ($, learun) { param: {} }); $('#AOStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' }); - console.log($('#Ass_AssetsOutItemApply').val()) + $('#Ass_AssetsOutItemApply').jfGrid({ headData: [ { @@ -183,7 +185,7 @@ var bootstrap = function ($, learun) { $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - //$('#' + id).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); tempdatra = data[id]; } else { @@ -239,7 +241,7 @@ var bootstrap = function ($, learun) { $('#Ass_AssetsOutItemApply').jfGridSet('refreshdata', tempdatra.sort(sortNumber)); }; function sortNumber(a, b) { - return 1;//a.AAIOrder - b.AAIOrder; + return a.AAIOrder - b.AAIOrder; } // 设置表单数据 setFormData = function (processId) {