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 @@