固定资产登记,信息化办公设备

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) {

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);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/qrCode.cshtml

@@ -9,7 +9,7 @@
         <div id="qrCode" style="text-align:center"></div>
     </div>
     <div id="subprint" style="margin:0 auto;margin-bottom:10px; position:relative; width:400px;line-height:40px;border-radius:4px;color:black;text-align:center;">
-        <div><b>固定资产</b>        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <div><b>固定资产</b>        
         <b>扫码查验</b></div>
 
     </div>

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');
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml

@@ -39,14 +39,18 @@
         <div class="lr-form-item-title">参数</div>
         <input id="Argument" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+    <div class="col-xs-4 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">单位<font face="宋体">*</font></div>
         <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+    <div class="col-xs-4 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
         <input id="Nuantity" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">使用状态</div>
+        <div id="Status"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height:100px;"></textarea>

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) {

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',

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);
                                 }

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');
             }

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
         /// </summary>
         [Column("NUANTITY")]
         public decimal? Nuantity { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("STATUS")]
+        public string Status { get; set; }
 
         #endregion