diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Form.js index dc7c89a95..9efa089f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Form.js @@ -19,8 +19,8 @@ var bootstrap = function ($, learun) { $('#Acceptor').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' }); $('#UsePeople').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' }); $('#Registrant').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' }); - $('#Status').lrDataItemSelect({ code: 'NewAssState' }); - $('#Types').lrDataItemSelect({ code: 'NewAssType' }); + $('#Status').lrDataItemSelect({ code: 'AssState' }); + $('#Types').lrDataItemSelect({ code: 'AssType' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Index.js index 13147ee14..32728a812 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Index.js @@ -19,8 +19,8 @@ var bootstrap = function ($, learun) { $('#Acceptor').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#UsePeople').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#Registrant').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); - $('#Status').lrDataItemSelect({ code: 'NewAssState' }); - $('#Types').lrDataItemSelect({ code: 'NewAssType' }); + $('#Status').lrDataItemSelect({ code: 'AssState' }); + $('#Types').lrDataItemSelect({ code: 'AssType' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -101,7 +101,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'NewAssType', + code: 'AssType', callback: function (_data) { callback(_data.text); } @@ -173,7 +173,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'NewAssState', + code: 'AssState', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.cshtml index 16acda061..9f656a8c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.cshtml @@ -9,7 +9,7 @@
-
固定资产                                            +
固定资产 扫码查验
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.js index 330e696d2..b91ca67b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.js @@ -52,8 +52,8 @@ var bootstrap = function ($, learun) { }, initData: function () { if (!!keyValue) { - //var currentUrl1 = "http://api.cyzjzx.com"; - var currentUrl1 = "http://192.168.10.58:8012"; + var currentUrl1 = "http://api.cyzjzx.com"; + //var currentUrl1 = "http://192.168.10.58:8012"; //扫码签到 makeCode(currentUrl1 + '/arrangelesson/getqrcode?keyValue=' + keyValue + '&Types=1'); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml index 718ea76fe..e48e641f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml @@ -39,14 +39,18 @@
参数
-
+
单位*
-
+
数量*
+
+
使用状态
+
+
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js index f7d92ac33..bc1eaa031 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js @@ -23,7 +23,8 @@ var bootstrap = function ($, learun) { param: {}, }); $('#Unit').lrDataItemSelect({ code: 'sldw', allowSearch: true }); - $('#Types').lrDataItemSelect({ code: 'NewAssType' }); + $('#Types').lrDataItemSelect({ code: 'AssType' }); + $('#Status').lrDataItemSelect({ code: 'AssState' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js index 50fb60301..60a48ecff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js @@ -18,7 +18,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#Name').lrDataSourceSelect({ code: 'TeacherInfo',value: 'f_encode',text: 'f_realname' }); $('#Department').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' }); - $('#Types').lrDataItemSelect({ code: 'NewAssType' }); + $('#Types').lrDataItemSelect({ code: 'AssType' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -103,7 +103,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'NewAssType', + code: 'AssType', callback: function (_data) { callback(_data.text); } @@ -153,6 +153,18 @@ var bootstrap = function ($, learun) { } }, { label: "数量", name: "Nuantity", width: 100, align: "left" }, + { + label: "使用状态", name: "Status", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AssState', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "备注", name: "Remark", width: 100, align: "left"}, ], mainId:'Id', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js index 000d3ab18..5ac4eed5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js @@ -18,7 +18,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_encode', text: 'f_realname' }); $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); - $('#Types').lrDataItemSelect({ code: 'NewAssType' }); + $('#Types').lrDataItemSelect({ code: 'AssType' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -103,7 +103,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'NewAssType', + code: 'AssType', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js index e6fe70cfe..3f35a6e87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js @@ -52,8 +52,8 @@ var bootstrap = function ($, learun) { }, initData: function () { if (!!keyValue) { - //var currentUrl1 = "http://api.cyzjzx.com"; - var currentUrl1 = "http://192.168.10.58:8012"; + var currentUrl1 = "http://api.cyzjzx.com"; + //var currentUrl1 = "http://192.168.10.58:8012"; //扫码签到 makeCode(currentUrl1 + '/arrangelesson/getqrcode?keyValue=' + keyValue + '&Types=0'); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs index c0b4c1d28..e371fc635 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs @@ -99,6 +99,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("NUANTITY")] public decimal? Nuantity { get; set; } + /// + /// 状态 + /// + [Column("STATUS")] + public string Status { get; set; } #endregion