信息化办公设备+固定资产

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FixedAssetsController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult qrCode()
+        {
+            return View();
         }
         #endregion
 
@@ -71,8 +80,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var FixedAssetsData = fixedAssetsIBLL.GetFixedAssetsEntity( keyValue );
-            var jsonData = new {
+            var FixedAssetsData = fixedAssetsIBLL.GetFixedAssetsEntity(keyValue);
+            var jsonData = new
+            {
                 FixedAssets = FixedAssetsData,
             };
             return Success(jsonData);
@@ -105,7 +115,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             FixedAssetsEntity entity = strEntity.ToObject<FixedAssetsEntity>();
-            fixedAssetsIBLL.SaveEntity(keyValue,entity);
+            fixedAssetsIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OfficeEquipmentController.cs

@@ -30,6 +30,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexMy()
+        {
+            return View();
+        }
+        /// <summary>
         /// 表单页
         /// <summary>
         /// <returns></returns>
@@ -87,7 +96,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 OfficeEquipment = OfficeEquipmentData,
             };
             return Success(jsonData);
-        }        
+        }
         #endregion
 
         #region 提交数据

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

@@ -3,10 +3,18 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">资产类别<font face="宋体">*</font></div>
+        <div id="Types" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
         <input id="AssetsName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">资产编号<font face="宋体">*</font></div>
+        <input id="Code" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
         <div class="lr-form-item-title">生产厂家<font face="宋体">*</font></div>
         <input id="Manufacturer" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -15,6 +23,14 @@
         <div class="lr-form-item-title">品牌</div>
         <input id="Brand" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">型号</div>
+        <input id="Model" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <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="FixedAssets">
         <div class="lr-form-item-title">单位<font face="宋体">*</font></div>
         <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Form.js

@@ -20,7 +20,8 @@ var bootstrap = function ($, learun) {
             $('#UsePeople').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
             $('#Registrant').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
             $('#Status').lrDataItemSelect({ code: 'NewAssState' });
-        }, 
+            $('#Types').lrDataItemSelect({ code: 'NewAssType' });
+        },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/FixedAssets/GetFormData?keyValue=' + keyValue, function (data) {

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

@@ -10,15 +10,23 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产类别</div>
+                                    <div id="Types"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">资产名称</div>
                                     <input id="AssetsName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产编号</div>
+                                    <input id="Code" type="text" class="form-control" />
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">生产厂家</div>
                                     <input id="Manufacturer" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">存放地址</div>
                                     <input id="Address" type="text" class="form-control" />
                                 </div>
@@ -26,6 +34,14 @@
                                     <div class="lr-form-item-title">品牌</div>
                                     <input id="Brand" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">型号</div>
+                                    <input id="Model" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">参数</div>
+                                    <input id="Argument" type="text" class="form-control" />
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">验收人</div>
                                     <div id="Acceptor"></div>
@@ -51,10 +67,11 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_qrCode" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;二维码</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FixedAssets/Index.js

@@ -15,10 +15,12 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 300, 400);
             $('#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' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -69,15 +71,49 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+            // 查看二维码
+            $('#lr_qrCode').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (keyValue.indexOf(',') != -1) {
+                    learun.alert.warning("只能选择一条记录进行编辑！");
+                    return;
+                }
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formqrCode',
+                        title: '二维码',
+                        url: top.$.rootUrl + '/EducationalAdministration/FixedAssets/qrCode?keyValue=' + keyValue,
+                        width: 600,
+                        height: 500,
+                        btn: null,
+                        end: function () { refreshGirdData(); }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/FixedAssets/GetPageList',
                 headData: [
+                    {
+                        label: "资产类别", name: "Types", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'NewAssType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "资产名称", name: "AssetsName", width: 200, align: "left" },
+                    { label: "资产编号", name: "Code", width: 200, align: "left" },
                     { label: "生产厂家", name: "Manufacturer", width: 120, align: "left" },
                     { label: "品牌", name: "Brand", width: 120, align: "left" },
+                    { label: "型号", name: "Model", width: 120, align: "left" },
+                    { label: "参数", name: "Argument", width: 120, align: "left" },
                     {
                         label: "单位", name: "Unit", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -118,7 +154,7 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                    }, 
+                    },
                     {
                         label: "登记人", name: "Registrant", width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -0,0 +1,26 @@
+@{
+    ViewBag.Title = "会议管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script src="~/Content/jquery/qrcode.min.js"></script>
+
+<div class="lr-form-wrap" id="form">
+    <div class="col lr-form-item" data-table="OfficeEquipment">
+        <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;
+        <b>扫码查验</b></div>
+
+    </div>
+    @*<div class="col lr-form-item">
+        <div style="left: 50px ;text-align: rigit;">固定资产</div>
+        <div style="left: 320px ;text-align: rigit;">扫码查验 </div>
+    </div>*@
+    @*<div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        </div>*@
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FixedAssets/qrCode.js")
+@Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js", "/Content/js/qrcode.min.js")

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

@@ -0,0 +1,82 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+//// 设置表单数据
+//var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_encode', text: 'f_realname' });
+            $('#Department').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                param: {},
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                //var currentUrl1 = "http://api.cyzjzx.com";
+                var currentUrl1 = "http://192.168.10.58:8012";
+                //扫码签到
+                makeCode(currentUrl1 + '/arrangelesson/getqrcode?keyValue=' + keyValue + '&Types=1');
+            }
+        }
+    };
+
+    // 保存数据
+    save = function (processId, callBack, i) {
+        if (!!callBack) {
+            var res = {
+                code: 200, data: {}
+            };
+            callBack(res, i);
+        }
+    };
+    page.init();
+}
+//扫码签到
+var qrcode = new QRCode(document.getElementById("qrCode"), {
+    width: 420,
+    height: 380
+});
+function makeCode(urls) {
+    console.log(urls, "urls")
+    qrcode.makeCode(urls);
+}

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

@@ -3,25 +3,49 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
-        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">使用管理人<font face="宋体">*</font></div>
         <div id="Name" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
         <div id="Department" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
-        <div class="lr-form-item-title">设备编号<font face="宋体">*</font></div>
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">资产编号<font face="宋体">*</font></div>
         <input id="Code" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
-        <div class="lr-form-item-title">设备名称<font face="宋体">*</font></div>
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
         <input id="DeviceName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
-        <div class="lr-form-item-title">配置描述<font face="宋体">*</font></div>
-        <input id="Description" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">资产类别<font face="宋体">*</font></div>
+        <div id="Types" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+            <div class="lr-form-item-title">配置描述<font face="宋体">*</font></div>
+            <input id="Description" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">品牌</div>
+        <input id="Brand" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">型号</div>
+        <input id="Model" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+        <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="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="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-12 lr-form-item" data-table="OfficeEquipment">
         <div class="lr-form-item-title">备注</div>

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

@@ -22,6 +22,8 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
                 param: {},
             });
+            $('#Unit').lrDataItemSelect({ code: 'sldw', allowSearch: true });
+            $('#Types').lrDataItemSelect({ code: 'NewAssType' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -10,22 +10,38 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">姓名</div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用管理人</div>
                                     <div id="Name"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="Department"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">设备编号</div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产编号</div>
                                     <input id="Code" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">设备名称</div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产名称</div>
                                     <input id="DeviceName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">品牌</div>
+                                    <input id="Brand" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">型号</div>
+                                    <input id="Model" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">参数</div>
+                                    <input id="Argument" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产类别</div>
+                                    <div id="Types"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js

@@ -18,6 +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' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -98,7 +99,19 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList',
                 headData: [
                     {
-                        label: "姓名", name: "Name", width: 100, align: "left",
+                        label: "资产类别", name: "Types", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'NewAssType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用管理人", name: "Name", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
                                  url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
@@ -121,9 +134,25 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "设备编号", name: "Code", width: 100, align: "left"},
-                    { label: "设备名称", name: "DeviceName", width: 100, align: "left"},
-                    { label: "配置描述", name: "Description", width: 100, align: "left"},
+                    { label: "资产编号", name: "Code", width: 100, align: "left"},
+                    { label: "资产名称", name: "DeviceName", width: 100, align: "left"},
+                    //{ label: "配置描述", name: "Description", width: 100, align: "left" },
+                    { label: "品牌", name: "Brand", width: 120, align: "left" },
+                    { label: "型号", name: "Model", width: 120, align: "left" },
+                    { label: "参数", name: "Argument", width: 120, align: "left" },
+                    {
+                        label: "单位", name: "Unit", width: 100, 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: "Nuantity", width: 100, align: "left" },
                     { label: "备注", name: "Remark", width: 100, align: "left"},
                 ],
                 mainId:'Id',

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

@@ -0,0 +1,66 @@
+@{
+    ViewBag.Title = "配置描述";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用管理人</div>
+                                    <div id="Name"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="Department"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产编号</div>
+                                    <input id="Code" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产名称</div>
+                                    <input id="DeviceName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">品牌</div>
+                                    <input id="Brand" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">型号</div>
+                                    <input id="Model" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">参数</div>
+                                    <input id="Argument" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产类别</div>
+                                    <div id="Types"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        @*<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>*@
+                        <a id="lr_qrCode" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;二维码</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js

@@ -0,0 +1,175 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-18 10:42
+ * 描  述：配置描述
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_encode', text: 'f_realname' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            $('#Types').lrDataItemSelect({ code: 'NewAssType' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (keyValue.indexOf(',') != -1) {
+                    learun.alert.warning("只能选择一条记录进行编辑！");
+                    return;
+                }
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看二维码
+            $('#lr_qrCode').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (keyValue.indexOf(',') != -1) {
+                    learun.alert.warning("只能选择一条记录进行编辑！");
+                    return;
+                }
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formqrCode',
+                        title: '二维码',
+                        url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/qrCode?keyValue=' + keyValue,
+                        width: 600,
+                        height: 500,
+                        btn: null,
+                        end: function () { refreshGirdData(); }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList',
+                headData: [
+                    {
+                        label: "资产类别", name: "Types", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'NewAssType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用管理人", name: "Name", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "部门", name: "Department", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "资产编号", name: "Code", width: 100, align: "left" },
+                    { label: "资产名称", name: "DeviceName", width: 100, align: "left" },
+                    //{ label: "配置描述", name: "Description", width: 100, align: "left" },
+                    { label: "品牌", name: "Brand", width: 120, align: "left" },
+                    { label: "型号", name: "Model", width: 120, align: "left" },
+                    { label: "参数", name: "Argument", width: 120, align: "left" },
+                    {
+                        label: "单位", name: "Unit", width: 100, 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: "Nuantity", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                isMultiselect: true,
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -6,9 +6,6 @@
 @*<div id="subprint" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
         打印
     </div>*@
-<script>
-    var qrCode = "@ViewBag.qrCode";
-</script>
 <div class="lr-form-wrap" id="form">
     @*<div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
             <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js

@@ -50,16 +50,16 @@ var bootstrap = function ($, learun) {
                 param: {},
             });
         },
-        initData: function () {            
+        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);
+                makeCode(currentUrl1 + '/arrangelesson/getqrcode?keyValue=' + keyValue + '&Types=0');
             }
         }
     };
-    
+
     // 保存数据
     save = function (processId, callBack, i) {
         if (!!callBack) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -23,7 +23,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress>
+    </Use64BitIISExpress>
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -1092,6 +1093,8 @@
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\IndexSchool.js" />
     <Content Include="Areas\EducationalAdministration\Views\CompetitionGroupManager\FormScore.js" />
     <Content Include="Areas\EducationalAdministration\Views\CompetitionManager\Ranking.js" />
+    <Content Include="Areas\EducationalAdministration\Views\FixedAssets\qrCode.js" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\IndexMy.js" />
     <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\qrCode.js" />
     <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormLeader.js" />
     <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormCheck.js" />
@@ -1389,6 +1392,8 @@
     <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormCheck.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\qrCode.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormLeader.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\FixedAssets\qrCode.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\IndexMy.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\StuInfoBasic\Printxjk.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FixedAssets/FixedAssetsEntity.cs

@@ -104,6 +104,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("MODIFYUSER")]
         public string ModifyUser { get; set; }
+
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("CODE")]
+        public string Code { get; set; }
+        /// <summary>
+        /// 型号
+        /// </summary>
+        [Column("MODEL")]
+        public string Model { get; set; }
+        /// <summary>
+        /// 参数
+        /// </summary>
+        [Column("ARGUMENT")]
+        public string Argument { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [Column("TYPES")]
+        public string Types { get; set; }
+        
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FixedAssets/FixedAssetsService.cs

@@ -56,6 +56,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Brand", "%" + queryParam["Brand"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Brand Like @Brand ");
                 }
+                if (!queryParam["Code"].IsEmpty())
+                {
+                    dp.Add("Code", "%" + queryParam["Code"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Code Like @Code ");
+                }
+                if (!queryParam["Model"].IsEmpty())
+                {
+                    dp.Add("Model", "%" + queryParam["Model"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Model Like @Model ");
+                }
+                if (!queryParam["Argument"].IsEmpty())
+                {
+                    dp.Add("Argument", "%" + queryParam["Argument"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Argument Like @Argument ");
+                }
+                if (!queryParam["Types"].IsEmpty())
+                {
+                    dp.Add("Types", queryParam["Types"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Types = @Types ");
+                }
                 if (!queryParam["Acceptor"].IsEmpty())
                 {
                     dp.Add("Acceptor",queryParam["Acceptor"].ToString(), DbType.String);
@@ -71,7 +91,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Registrant", queryParam["Registrant"].ToString(), DbType.String);
                     strSql.Append(" AND t.Registrant = @Registrant ");
                 }
-                
                 if (!queryParam["Status"].IsEmpty())
                 {
                     dp.Add("Status",queryParam["Status"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs

@@ -69,6 +69,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("MODIFYTIME")]
         public DateTime? Modifytime { get; set; }
+        /// <summary>
+        /// 型号
+        /// </summary>
+        [Column("MODEL")]
+        public string Model { get; set; }
+        /// <summary>
+        /// 参数
+        /// </summary>
+        [Column("ARGUMENT")]
+        public string Argument { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [Column("TYPES")]
+        public string Types { get; set; }
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        [Column("BRAND")]
+        public string Brand { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [Column("UNIT")]
+        public string Unit { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Column("NUANTITY")]
+        public decimal? Nuantity { get; set; }
+
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs

@@ -56,6 +56,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
                     strSql.Append(" AND t.Department = @Department ");
                 }
+                if (!queryParam["Model"].IsEmpty())
+                {
+                    dp.Add("Model", "%" + queryParam["Model"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Model Like @Model ");
+                }
+                if (!queryParam["Argument"].IsEmpty())
+                {
+                    dp.Add("Argument", "%" + queryParam["Argument"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Argument Like @Argument ");
+                }
+                if (!queryParam["Types"].IsEmpty())
+                {
+                    dp.Add("Types", queryParam["Types"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Types = @Types ");
+                }
+                if (!queryParam["Brand"].IsEmpty())
+                {
+                    dp.Add("Brand", queryParam["Brand"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Brand = @Brand ");
+                }
                 if (!LoginUserInfo.Get().isSystem)
                 {
                     if (!LoginUserInfo.Get().roleIds.Contains("5a6e22b1-2a08-4258-9964-3cb7fbb9ebee"))