diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs index d24464c39..78d71de36 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs @@ -48,6 +48,16 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers { return View(); } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormJY() + { + return View(); + } + /// /// 采购表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js index 52e878448..159a24e6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js @@ -131,7 +131,9 @@ var bootstrap = function ($, learun) { ], mainId:'RId', - isPage: true + isPage: true, + sidx: 'RCode', + sord: 'ASC' }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Form.js index 59353a542..89c6cb2e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Form.js @@ -148,7 +148,17 @@ var bootstrap = function ($, learun) { } }, { - label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left' + label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room', + key: value, + keyId: 'rid', + callback: function (_data) { + callback(_data['rname']); + } + }); + } }, { label: '英文名称', name: 'AAIEName', width: 100, align: 'left' diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js index 8afbed9c4..2792c1203 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js @@ -32,7 +32,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'formitem', title: '新增明细', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form', + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/FormJY', width: 860, height: 600, callBack: function (id) { @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'formitem', title: '编辑明细', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form?keyValue=' + keyValue, + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/FormJY?keyValue=' + keyValue, width: 860, height: 600, callBack: function (id) { @@ -94,7 +94,7 @@ var bootstrap = function ($, learun) { $('#Ass_AssetsInfoItemApply').jfGrid({ headData: [ { - label: '资产编号', name: 'AAICode', width: 150, align: 'left' + label: '采购临时编号', name: 'AAICode', width: 150, align: 'left' }, { label: '资产名称', name: 'AAIName', width: 150, align: 'left' @@ -157,7 +157,17 @@ var bootstrap = function ($, learun) { } }, { - label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left' + label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room', + key: value, + keyId: 'rid', + callback: function (_data) { + callback(_data['rname']); + } + }); + } }, { label: '英文名称', name: 'AAIEName', width: 100, align: 'left' diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js index 7db342604..a58e82c9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js @@ -157,7 +157,17 @@ var bootstrap = function ($, learun) { } }, { - label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left' + label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room', + key: value, + keyId: 'rid', + callback: function (_data) { + callback(_data['rname']); + } + }); + } }, { label: '英文名称', name: 'AAIEName', width: 100, align: 'left' diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js index f65f27180..d4eff5243 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js @@ -148,7 +148,17 @@ var bootstrap = function ($, learun) { } }, { - label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left' + label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room', + key: value, + keyId: 'rid', + callback: function (_data) { + callback(_data['rname']); + } + }); + } }, { label: '英文名称', name: 'AAIEName', width: 100, align: 'left' diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js index dec2a3205..a0290834b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js @@ -58,7 +58,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJY', width: 1000, - height: 700, + height: 800, callBack: function (id) { var res = false; // 验证数据 @@ -91,7 +91,7 @@ var bootstrap = function ($, learun) { title: '采购编辑', url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJY?keyValue=' + keyValue, width: 1000, - height: 700, + height: 800, callBack: function (id) { var res = false; // 验证数据 @@ -111,7 +111,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJY?keyValue=' + keyValue, width: 1000, - height: 700, + height: 800, callBack: function (id) { var res = false; // 验证数据 @@ -138,7 +138,7 @@ var bootstrap = function ($, learun) { title: '查看采购申请', url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormViewJY?keyValue=' + keyValue, width: 1000, - height: 600, + height: 700, btn: null }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml new file mode 100644 index 000000000..15eaf9421 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml @@ -0,0 +1,89 @@ +@{ + ViewBag.Title = "入库申请明细"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +@Html.AppendCssFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.css") +@Html.AppendJsFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.js") +
+
+
选择已登记资产*
+
+
+
+
资产类别*
+
+
+
+
采购临时编号*
+ +
+
+
资产名称*
+ +
+
+
英文名称
+ +
+
+
资产型号
+ +
+
+
生产厂家
+ +
+
+
资产规格
+ +
+
+
用途
+ +
+
+
资产来源
+
+
+
+
供应商
+
+
+
+
单价*
+ +
+
+
数量*
+ +
+
+
数量单位
+
+
+
+
排序*
+ +
+
+
楼宇名称*
+
+
+
+
房间号
+
+
+
+
生成明细*
+
+
+
+
入库照片
+
+
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js new file mode 100644 index 000000000..4423a23fe --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js @@ -0,0 +1,165 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-03-26 11:41 + * 描 述：入库申请明细 + */ +var acceptClick; +var keyValue = request('keyValue'); +var selectedRow; +var bootstrap = function ($, learun) { + "use strict"; + selectedRow = top["layer_formAss_AssetsInfoApply"].selectedRow; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#AAIAssType').lrDataItemSelect({ code: 'AssType' }); + $('#AAITId').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree' + }); + $("#AAOldCode").lrlayerselect({ + treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', + treeParentId: 'atptid', + treeValueId: 'atid', + treeTextId: 'aname', + dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetList', + dataTreeId: 'ATId', + dataValueId: 'AId', + dataTextId: 'AName', + + grid: [ + //{ label: '资产编号', name: 'ACode', width: 200, align: 'left' }, + { label: '资产名称', name: 'AName', width: 200, align: 'left' }, + { label: "英文名称", name: "AEName", width: 200, align: "left" }, + { label: "资产型号", name: "AModel", width: 200, align: "left" }, + { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" }, + { + label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', + key: value, + keyId: 'sid', + callback: function (_data) { + callback(_data['sname']); + } + }); + } + } + ], + select: function (values, texts) { + if (values && values.length > 0) { + //绑定 + //$("#AAITId").attr("readonly", "readonly"); + //$("#AAICode").attr("readonly", "readonly"); + //$("#AAIName").attr("readonly", "readonly"); + //$("#AAIUnit").attr("readonly", "readonly"); + //$("#AAIHasDetail").attr("readonly", "readonly"); + $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) { + data = data.Ass_AssetsInfo; + $('#AAITId').lrselectSet(data.ATId); + $('#AAICode').val(data.ACode); + $('#AAIName').val(data.AName); + $('#AAIUnit').lrselectSet(data.AUnit); + $('#AAIHasDetail').lrselectSet(data.HasDetail); + $('#AAIEName').val(data.AEName); + $('#AAIModel').val(data.AModel); + $('#AAIManufacturer').val(data.AManufacturer); + $('#AAISpecification').val(data.ASpecification); + }); + } + }, + unknowselect: function () { + $("#AAOldCode").find('span').text(""); + //$("#AAITId").removeAttr("readonly"); + //$("#AAICode").removeAttr("readonly"); + //$("#AAIName").removeAttr("readonly"); + //$("#AAIUnit").removeAttr("readonly"); + //$("#AAIHasDetail").removeAttr("readonly"); + $('#AAITId').lrselectSet(""); + $('#AAICode').val(""); + $('#AAIName').val(""); + $('#AAIUnit').lrselectSet(""); + $('#AAIHasDetail').lrselectSet(""); + $('#AAIEName').val(""); + $('#AAIModel').val(""); + $('#AAIManufacturer').val(""); + $('#AAISpecification').val(""); + }, + isMultiple: false + }); + $('#AAISource').lrDataItemSelect({ code: 'zcly' }); + $('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' }); + $('#AAIUnit').lrDataItemSelect({ code: 'sldw' }); + //$('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' }); + $('#AAIStorageId').lrselect({ + type: 'tree', + allowSearch: true, + url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree', + param: {}, + select: function (val) { + var storageId = ""; + if (val) { + storageId = val.value; + } + $('#AAIStoragePosition').lrselectRefresh({ + url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId, + text: "RCode", + value: "RId" + }); + } + }); + //房间 + $('#AAIStoragePosition').lrselect({ value: 'RId', text: 'RCode' }); + $('#AAIHasDetail').lrDataItemSelect({ + code: 'YesOrNoBit', select: function (item) { + if (item != null && item != undefined) { + if (item.id === true || item.id === "true") { + $("#AAIStock").attr("checkexpession", "PositiveInteger"); + } else { + $("#AAIStock").attr("checkexpession", "PositiveFloatint"); + } + } + } + }); + $('#AAIPhoto').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + $("#AAOldCode").find('span').text(selectedRow.AAIName); + } + } + + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = $('body').lrGetFormData(); + if (!!keyValue) { + if (!!selectedRow) { + postData.AAIId = selectedRow.AAIId; + } + } else { + postData.AAIId = learun.newGuid(); + } + if (!!callBack) { + callBack(postData); + return true; + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.js index 9d1e1766b..4652724a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.js @@ -38,7 +38,7 @@ var bootstrap = function ($, learun) { dataTextId: 'AName', grid: [ - { label: '耗材编号', name: 'ACode', width: 200, align: 'left' }, + //{ label: '耗材编号', name: 'ACode', width: 200, align: 'left' }, { label: '耗材名称', name: 'AName', width: 200, align: 'left' }, { label: "英文名称", name: "AEName", width: 200, align: "left" }, { label: "耗材型号", name: "AModel", width: 200, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml index 7b3db2360..e4b941004 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml @@ -71,7 +71,7 @@
新楼宇名称*
-
+
原房间号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.cshtml index 3d3b4d4e0..fc6452177 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.cshtml @@ -4,16 +4,27 @@ }
+
标题
+ +
+
申请人
-
+
-
-
申请人部门
-
+
+
申请部门*
+
申请时间
- + + @**@ +
+
+
明细操作
+ + @**@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js index 73e5764cc..3809ada8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js @@ -14,117 +14,210 @@ var setFormData; var validForm; // 保存数据 var save; +var refreshGirdData; +var selectedRow; +var tempdatra = new Array(); var bootstrap = function ($, learun) { "use strict"; var page = { init: function () { $('.lr-form-wrap').lrscroll(); - + $("#detailadd").on('click', function () { + selectedRow = null; + learun.layerFormForPercent({ + id: 'formitem', + title: '新增明细', + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/IndexTwo', + width: "90%", + height: "90%", + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + $("#detaildel").on('click', function () { + var keyValue = $('#Ass_ReceiveItem').jfGridValue('RIID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res, index) { + if (res) { + $.each(tempdatra, function (key, val) { + if (val && val.RIID === keyValue) { + tempdatra.splice(key, 1); + } + }); + $('#Ass_ReceiveItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber)); + top.layer.close(index); + } + }); + } + }); page.bind(); page.initData(); }, bind: function () { - var loginInfo = top.learun.clientdata.get(['userinfo']); - $('#ReceiveUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }).lrselectSet(loginInfo.userId); - $('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }).lrselectSet(loginInfo.departmentId); + + $('#RTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); + $('#ReceiveUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + + $('#ReceiveUser').val(learun.clientdata.get(['userinfo']).realName); + $('#PDepartment').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree' + }); + $('#PDepartment').lrselectSet(learun.clientdata.get(['userinfo']).departmentId); + + $('#Ass_ReceiveItem').jfGrid({ headData: [ { - label: "资产名称", name: "AName", width: 100, align: "left", - edit: { - type: 'input', - init: function (row, $edit) { - }, - }, - + label: '资产编号', name: 'AAICode', width: 150, align: 'left' }, { - label: "库存数量", name: "ACNum", width: 100, align: "left", + label: '资产名称', name: 'AAIName', width: 150, align: 'left' }, { - label: "领取数量", name: "ANum", width: 100, align: "left", - edit: { - type: 'input', - inputType: 'number', + label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', + key: value, + keyId: 'atid', + callback: function (_data) { + callback(_data['aname']); + } + }); } }, { - label: "资产编号", name: "AID", width: 100, align: "left", - edit: { - type: 'input', + label: '单价', name: 'AAIPrice', width: 100, align: 'left' + }, + { + label: '单位', name: 'AAIUnit', width: 80, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sldw', + callback: function (_data) { + callback(_data.text); + } + }); } }, + { + label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + }, + { + label: '资产型号', name: 'AAIModel', width: 100, align: 'left' + }, + { + label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' + } ], + height: 400, mainId: 'RIID', - isEdit: true, + reloadSelected: false }); + //$('#ReceiveUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }).lrselectSet(loginInfo.userId); + //$('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }).lrselectSet(loginInfo.departmentId); - $('#Ass_ReceiveItem').on('click', function (e) { - var et = e.target || e.srcElement; - var $et = $(et); - if ($et.attr('rowindex') && $et.attr('rownum') && $et.attr('colname') == 'AName') { - var $input = $('#jfgrid_edit_Ass_ReceiveItem_AName'); - $input.removeClass('lr-layerselect').removeAttr('lrlayerselect').unbind('click')[0].dfop = null; + //$('#Ass_ReceiveItem').jfGrid({ + // headData: [ + // { + // label: "资产名称", name: "AName", width: 100, align: "left", + // edit: { + // type: 'input', + // init: function (row, $edit) { + // }, + // }, - $input.lrlayerselect({ - treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', - treeParentId: 'atptid', - treeValueId: 'atid', - treeTextId: 'aname', - dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetList', - dataTreeId: 'ATId', - dataValueId: 'AId', - dataTextId: 'AName', + // }, + // { + // label: "库存数量", name: "ACNum", width: 100, align: "left", + // }, + // { + // label: "领取数量", name: "ANum", width: 100, align: "left", + // edit: { + // type: 'input', + // inputType: 'number', + // } + // }, + // { + // label: "资产编号", name: "AID", width: 100, align: "left", + // edit: { + // type: 'input', + // } + // }, + // ], + // mainId: 'RIID', + // isEdit: true, + //}); + //$('#Ass_ReceiveItem').on('click', function (e) { + // var et = e.target || e.srcElement; + // var $et = $(et); + // if ($et.attr('rowindex') && $et.attr('rownum') && $et.attr('colname') == 'AName') { + // var $input = $('#jfgrid_edit_Ass_ReceiveItem_AName'); + // $input.removeClass('lr-layerselect').removeAttr('lrlayerselect').unbind('click')[0].dfop = null; - grid: [ - { label: '资产编号', name: 'ACode', width: 200, align: 'left' }, - { label: '资产名称', name: 'AName', width: 200, align: 'left' }, - { label: "英文名称", name: "AEName", width: 200, align: "left" }, - { label: "资产型号", name: "AModel", width: 200, align: "left" }, - { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" }, - { - label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', - key: value, - keyId: 'sid', - callback: function (_data) { - callback(_data['sname']); - } - }); - } - } - ], - select: function (values, texts) { - if (values && values.length > 0) { + // $input.lrlayerselect({ + // treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', + // treeParentId: 'atptid', + // treeValueId: 'atid', + // treeTextId: 'aname', + // dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetList', + // dataTreeId: 'ATId', + // dataValueId: 'AId', + // dataTextId: 'AName', - $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) { - data = data.Ass_AssetsInfo; - var rowIndex = $et.attr('rowindex'); - $input.val(data.AName); - //$('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AName'] = data.AName; - //$('.jfgrid-data-cell[colname="AName"][rowIndex="' + rowIndex + '"]').attr('title', data.AName).html(data.AName); - $input.trigger('propertychange'); + // grid: [ + // { label: '资产编号', name: 'ACode', width: 200, align: 'left' }, + // { label: '资产名称', name: 'AName', width: 200, align: 'left' }, + // { label: "英文名称", name: "AEName", width: 200, align: "left" }, + // { label: "资产型号", name: "AModel", width: 200, align: "left" }, + // { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" }, + // { + // label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', + // key: value, + // keyId: 'sid', + // callback: function (_data) { + // callback(_data['sname']); + // } + // }); + // } + // } + // ], + // select: function (values, texts) { + // if (values && values.length > 0) { - $('jfgrid_edit_Ass_ReceiveItem_' + 'ANum').val(0); - $('.jfgrid-data-cell[colname="ANum"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(0); - $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ANum'] = 0; + // $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) { + // data = data.Ass_AssetsInfo; + // var rowIndex = $et.attr('rowindex'); + // $input.val(data.AName); + // $input.trigger('propertychange'); - $('jfgrid_edit_Ass_ReceiveItem_' + 'AID').val(data.AId); - $('.jfgrid-data-cell[colname="AID"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(data.AId); - $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AID'] = data.AId; + // $('jfgrid_edit_Ass_ReceiveItem_' + 'ANum').val(0); + // $('.jfgrid-data-cell[colname="ANum"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(0); + // $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ANum'] = 0; - $('jfgrid_edit_Ass_ReceiveItem_' + 'ACNum').val(data.AId); - $('.jfgrid-data-cell[colname="ACNum"][rowIndex="' + rowIndex + '"]').attr('title', data.AStock).html(data.AStock); - $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ACNum'] = data.AStock; + // $('jfgrid_edit_Ass_ReceiveItem_' + 'AID').val(data.AId); + // $('.jfgrid-data-cell[colname="AID"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(data.AId); + // $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AID'] = data.AId; - }); - } - }, - isMultiple: false - }); - } - }) + // $('jfgrid_edit_Ass_ReceiveItem_' + 'ACNum').val(data.AId); + // $('.jfgrid-data-cell[colname="ACNum"][rowIndex="' + rowIndex + '"]').attr('title', data.AStock).html(data.AStock); + // $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ACNum'] = data.AStock; + + // }); + // } + // }, + // isMultiple: false + // }); + // } + //}) }, initData: function () { if (!!keyValue) { @@ -132,6 +225,7 @@ var bootstrap = function ($, learun) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { $('#' + id).jfGridSet('refreshdata', data[id]); + tempdatra = data[id]; } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); @@ -167,6 +261,47 @@ var bootstrap = function ($, learun) { } return true; }; + refreshGirdData = function (temprow) { + var ifnewrow = true; + var list = []; + $.each(temprow, + function (i, item) { + var entity = { + //AAICode: item.AICode, + AAICode: item.AICodeNumJY, + AAIName: item.AIASSName, + AAITId: item.AIASSClass, + AAIPrice: item.AIAssValue, + AAIUnit: item.AIUnits, + AAIEName: '', + AAIModel: item.AISpecificationtype, + AAIManufacturer: item.AIManufacturer, + RIID: learun.newGuid() + } + list.push(entity); + + }); + + $.each(list, + function (j, item2) { + $.each(tempdatra, + function (key, val) { + + if (tempdatra[key].AAICode === item2.AAICode) { + tempdatra[key] = item2; + ifnewrow = false; + } + }); + if (ifnewrow) { + tempdatra.push(item2); + } + }); + + $('#Ass_ReceiveItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber)); + }; + function sortNumber(a, b) { + return 1;//a.AAIOrder - b.AAIOrder; + }; // 保存数据 save = function (processId, callBack, i) { var formData = $('body').lrGetFormData(); @@ -176,21 +311,21 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('[data-table="Ass_Receive"]').lrGetFormData()), }; - var itemList = $('#Ass_ReceiveItem').jfGridGet('rowdatas'); - var num = 0; - $.each(itemList, function (i, item) { - if (item.ANum <= 0) { - learun.alert.warning("请填写<" + item.AName + ">的申请数量"); - num++; - } - if (item.ANum > item.ACNum) { - learun.alert.warning("领取数量不能大于库存数量！"); - num++; - } - }) - if (num > 0) { - return; - } + //var itemList = $('#Ass_ReceiveItem').jfGridGet('rowdatas'); + //var num = 0; + //$.each(itemList, function (i, item) { + // if (item.ANum <= 0) { + // learun.alert.warning("请填写<" + item.AName + ">的申请数量"); + // num++; + // } + // if (item.ANum > item.ACNum) { + // learun.alert.warning("领取数量不能大于库存数量！"); + // num++; + // } + //}) + //if (num > 0) { + // return; + //} postData.receItemList = JSON.stringify($('#Ass_ReceiveItem').jfGridGet('rowdatas')); $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Receive/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.cshtml index 8c65bfe64..5343abcc6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.cshtml @@ -4,16 +4,21 @@ }
+
标题
+ +
+
申请人
-
+
-
-
申请人部门
-
+
+
申请部门*
+
申请时间
- + + @**@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js index 24e22686a..df078b424 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js @@ -25,85 +25,57 @@ var bootstrap = function ($, learun) { }, bind: function () { var loginInfo = top.learun.clientdata.get(['userinfo']); - $('#ReceiveUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }).lrselectSet(loginInfo.userId); + $('#ReceiveUser').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }).lrselectSet(loginInfo.userId); $('#PDepartment').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }).lrselectSet(loginInfo.departmentId); $('#Ass_ReceiveItem').jfGrid({ headData: [ { - label: "资产名称", name: "AName", width: 100, align: "left", + label: '资产编号', name: 'AAICode', width: 150, align: 'left' }, { - label: "数量", name: "ANum", width: 100, align: "left", + label: '资产名称', name: 'AAIName', width: 150, align: 'left' }, { - label: "资产编号", name: "AID", width: 100, align: "left", + label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType', + key: value, + keyId: 'atid', + callback: function (_data) { + callback(_data['aname']); + } + }); + } + }, + { + label: '单价', name: 'AAIPrice', width: 100, align: 'left' }, + { + label: '单位', name: 'AAIUnit', width: 80, align: 'left', formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sldw', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + }, + { + label: '资产型号', name: 'AAIModel', width: 100, align: 'left' + }, + { + label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' + } ], + height: 400, mainId: 'RIID', - + reloadSelected: false }); - - $('#Ass_ReceiveItem').on('click', function (e) { - var et = e.target || e.srcElement; - var $et = $(et); - if ($et.attr('rowindex') && $et.attr('rownum') && $et.attr('colname') == 'AName') { - var $input = $('#jfgrid_edit_Ass_ReceiveItem_AName'); - $input.removeClass('lr-layerselect').removeAttr('lrlayerselect').unbind('click')[0].dfop = null; - - $input.lrlayerselect({ - treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', - treeParentId: 'atptid', - treeValueId: 'atid', - treeTextId: 'aname', - dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetList', - dataTreeId: 'ATId', - dataValueId: 'AId', - dataTextId: 'AName', - - grid: [ - { label: '资产编号', name: 'ACode', width: 200, align: 'left' }, - { label: '资产名称', name: 'AName', width: 200, align: 'left' }, - { label: "英文名称", name: "AEName", width: 200, align: "left" }, - { label: "资产型号", name: "AModel", width: 200, align: "left" }, - { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" }, - { - label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData', - key: value, - keyId: 'sid', - callback: function (_data) { - callback(_data['sname']); - } - }); - } - } - ], - select: function (values, texts) { - if (values && values.length > 0) { - - $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) { - data = data.Ass_AssetsInfo; - var rowIndex = $et.attr('rowindex'); - $input.val(data.AName); - $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AName'] = data.AName; - $('.jfgrid-data-cell[colname="AName"][rowIndex="' + rowIndex + '"]').attr('title', data.AName).html(data.AName); - - $('jfgrid_edit_Ass_ReceiveItem_' + 'ANum').val(0); - $('.jfgrid-data-cell[colname="ANum"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(0); - $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ANum'] = 0; - - $('jfgrid_edit_Ass_ReceiveItem_' + 'AID').val(data.AId); - $('.jfgrid-data-cell[colname="AID"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(data.AId); - $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AID'] = data.AId; - - }); - } - }, - isMultiple: false - }); - } - }) + }, initData: function () { if (!!keyValue) { @@ -148,12 +120,12 @@ var bootstrap = function ($, learun) { }; // 保存数据 save = function (processId, callBack, i) { - var formData = {}; + //var formData = {}; var res = {}; res.code = 200; - if (!!processId) { - formData.SProcessId = processId; - } + //if (!!processId) { + // formData.PID = processId; + //} callBack(res, i); }; page.init(); 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 797b70fcb..bd261a195 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 @@ -54,7 +54,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/AssetManagementSystem/Ass_Receive/Form', width: 1000, - height: 600, + height: 700, callBack: function (id) { var res = false; // 验证数据 @@ -84,7 +84,7 @@ var bootstrap = function ($, learun) { id: 'form', title: '编辑', url: top.$.rootUrl + '/AssetManagementSystem/Ass_Receive/Form?keyValue=' + keyValue, - width: 800, + width: 1000, height: 700, callBack: function (id) { var res = false; @@ -109,7 +109,7 @@ var bootstrap = function ($, learun) { id: 'forminfoitem', title: '查看', url: top.$.rootUrl + '/AssetManagementSystem/Ass_Receive/FormView?keyValue=' + keyValue, - width: 800, + width: 1000, height: 700, btn: '', callBack: function (id) { @@ -160,14 +160,15 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/AssetManagementSystem/Ass_Receive/GetPageList', headData: [ + { label: "标题", name: "RTitle", width: 100, align: "left" }, { label: "申请人", name: "ReceiveUser", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, keyId: 'f_userid', callback: function (_data) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs index b0b2b1079..5472caf07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs @@ -148,6 +148,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers foreach (var item in empInfo.PM_FamilySituationList) { item.Application = dataItemIBLL.GetDetailList("FamilyRelation").FirstOrDefault(x => x.F_ItemValue == item.Application)?.F_ItemName; + item.PoliticalAffiliation = dataItemIBLL.GetDetailList("PolityStatus").FirstOrDefault(x => x.F_ItemValue == item.PoliticalAffiliation)?.F_ItemName; } //培训进修 empInfo.TeacherTrainList = teacherTrainIBLL.GetListByEmpId(empInfo.EmpId).OrderByDescending(x => x.TTStartTime).ToList(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml index 57ad6fbd4..0d6556b68 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml @@ -53,7 +53,7 @@ @foreach (var item in Model.PM_ResumeList) { -
@(Model.PM_ResumeList.IndexOf(item) + 1)、@item.RTime @item.UnitName @item.DepartmentID @item.PostID
+
@(Model.PM_ResumeList.IndexOf(item) + 1)、@item.RTime 至 @item.RSTime @item.UnitName @item.DepartmentID @item.PostID
} @@ -62,7 +62,7 @@ @foreach (var item in Model.PM_EducationExperienceList) { -
@(Model.PM_EducationExperienceList.IndexOf(item) + 1)、@item.ETime @item.School @item.Major
+
@(Model.PM_EducationExperienceList.IndexOf(item) + 1)、@item.ETime 至 @item.ESTime @item.School @item.Major
} @@ -76,7 +76,7 @@ - 奖罚情况 + 奖惩情况 @foreach (var item in Model.TeacherEncourgementList) { @@ -93,7 +93,7 @@ @foreach (var item in Model.PM_FamilySituationList) { -
@(Model.PM_FamilySituationList.IndexOf(item) + 1)、@item.Application @item.Name @item.UnitAndPost
+
@(Model.PM_FamilySituationList.IndexOf(item) + 1)、@item.Application @item.Name @item.Birthday @item.PoliticalAffiliation @item.UnitAndPost
} 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 4a33e7adb..2e64ef64a 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 @@ -126,7 +126,7 @@ var bootstrap = function ($, learun) { } }); }); - //确认报到 + //签订 $("#lr_sign").on('click', function () { var data = $('#gridtable').jfGridGet('rowdata'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index e91548038..6a45e969e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -872,6 +872,7 @@ + @@ -7347,6 +7348,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveEntity.cs index 7ee36e36f..c561b56a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveEntity.cs @@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem [Column("RID")] public string RID { get; set; } /// + /// 标题 + /// + [Column("RTITLE")] + public string RTitle { get; set; } + /// /// 领取人 /// [Column("RECEIVEUSER")] @@ -55,6 +60,9 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem this.RID = Guid.NewGuid().ToString(); this.RTime = DateTime.Now; this.PStatus = "0"; + var userinfo = LoginUserInfo.Get(); + this.ReceiveUser = userinfo.userId; + this.PDepartment = userinfo.departmentId; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs index 5eab54432..84e22f39b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Receive/Ass_ReceiveService.cs @@ -34,6 +34,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem strSql.Append(@" t.RID, t.ReceiveUser, +t.RTitle, t.PDepartment, t.PStatus, t.RTime @@ -92,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem { try { - return this.BaseRepository().FindEntity(a=>a.PID==ProcessID); + return this.BaseRepository().FindEntity(a => a.PID == ProcessID); } catch (Exception ex) { @@ -211,20 +212,20 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem db.Update(receiveEntity); //根据领取单减少资产库的库存 - foreach (var item in receiveItem) - { - var num = int.Parse(item.ANum); - if (num > 0) - { - var assInfoEntity = db.FindEntity(a => a.AId == item.AID); - if (assInfoEntity.AStock >= num) - { - assInfoEntity.AStock = assInfoEntity.AStock - num; - db.Update(assInfoEntity); - } - } - - } + //foreach (var item in receiveItem) + //{ + // var num = int.Parse(item.ANum); + // if (num > 0) + // { + // var assInfoEntity = db.FindEntity(a => a.AId == item.AID); + // if (assInfoEntity.AStock >= num) + // { + // assInfoEntity.AStock = assInfoEntity.AStock - num; + // db.Update(assInfoEntity); + // } + // } + + //} } db.Commit(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemEntity.cs index ba296f96a..4ea211bf8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemEntity.cs @@ -20,25 +20,108 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem [Column("RIID")] public string RIID { get; set; } /// - /// 资产编号 + /// 申请单号 /// - [Column("AID")] - public string AID { get; set; } + [Column("RID")] + public string RID { get; set; } /// - /// 资产名称 + /// AAICode /// - [Column("ANAME")] - public string AName { get; set; } + [Column("AAICODE")] + public string AAICode { get; set; } /// - /// 数量 + /// AAIName /// - [Column("ANUM")] - public string ANum { get; set; } + [Column("AAINAME")] + public string AAIName { get; set; } /// - /// 申请单号 + /// AAITId /// - [Column("RID")] - public string RID { get; set; } + [Column("AAITID")] + public string AAITId { get; set; } + /// + /// AAIEName + /// + [Column("AAIENAME")] + public string AAIEName { get; set; } + /// + /// AAIPhoto + /// + [Column("AAIPHOTO")] + public string AAIPhoto { get; set; } + /// + /// AAIContent + /// + [Column("AAICONTENT")] + public string AAIContent { get; set; } + /// + /// AAIOrder + /// + [Column("AAIORDER")] + public int? AAIOrder { get; set; } + /// + /// AAIModel + /// + [Column("AAIMODEL")] + public string AAIModel { get; set; } + /// + /// AAIManufacturer + /// + [Column("AAIMANUFACTURER")] + public string AAIManufacturer { get; set; } + /// + /// AAISupplierId + /// + [Column("AAISUPPLIERID")] + public string AAISupplierId { get; set; } + /// + /// AAISource + /// + [Column("AAISOURCE")] + public string AAISource { get; set; } + /// + /// AAIPrice + /// + [Column("AAIPRICE")] + public decimal? AAIPrice { get; set; } + + /// + /// AAISTOCK + /// + [Column("AAISTOCK")] + public decimal? AAIStock { get; set; } + /// + /// AAIUNIT + /// + [Column("AAIUNIT")] + public string AAIUnit { get; set; } + /// + /// AAIREALNUM + /// + [Column("AAIREALNUM")] + public decimal? AAIRealNum { get; set; } + + /// + /// AAIREALNUM + /// + [Column("AISCHECK")] + public bool? AIsCheck { get; set; } + + /// + /// AResult + /// + [Column("ARESULT")] + public int? AResult { get; set; } + /// + /// ARemark + /// + [Column("AREMARK")] + public string ARemark { get; set; } + /// + /// AAddress + /// + [Column("AADDRESS")] + public string AAddress { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemService.cs index fb90f7413..7e9b7e9fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_ReceiveItem/Ass_ReceiveItemService.cs @@ -31,10 +31,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" - t.RIID, - t.AName, - t.AID, - t.ANum + t.* "); strSql.Append(" FROM Ass_ReceiveItem t "); strSql.Append(" WHERE 1=1 "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs index d34870c38..70d0fedc3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs @@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem } if (!queryParam["StorageId"].IsEmpty()) { - dp.Add("StorageId",queryParam["StorageId"].ToString(), DbType.String); + dp.Add("StorageId", queryParam["StorageId"].ToString(), DbType.String); strSql.Append(" AND t.StorageId = @StorageId "); } if (!queryParam["RFunction"].IsEmpty()) @@ -71,7 +71,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem dp.Add("RArea", "%" + queryParam["RArea"].ToString() + "%", DbType.String); strSql.Append(" AND t.RArea Like @RArea "); } - return this.BaseRepository().FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -109,7 +109,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem } } } - + /// /// 获取树形数据 /// @@ -144,6 +144,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem try { string sql = $"select RId,RCode+'('+RFunction+')' as RCode from Ass_Storage_Room where StorageId='{storageId}'"; + sql += " order by RCode"; return this.BaseRepository().FindList(sql); } catch (Exception ex) @@ -170,7 +171,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem { try { - this.BaseRepository().Delete(t=>t.RId == keyValue); + this.BaseRepository().Delete(t => t.RId == keyValue); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs index 887b71c8a..c17f985e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs @@ -1705,7 +1705,7 @@ t.SupportChangeTime,t.SupportChangeUserName foreach (var item in list) { item.IsReport = true; - item.SecurityAgreement = true; + //item.SecurityAgreement = true; item.Status = 1; this.BaseRepository("CollegeMIS").Update(item); } @@ -2798,7 +2798,7 @@ t.SupportChangeTime,t.SupportChangeUserName { item.IsReport = status; item.Status = 1; - item.SecurityAgreement = status; + //item.SecurityAgreement = status; this.BaseRepository("CollegeMis").Update(item); } resultbool = true;