Merge branch '长阳分支中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -6,10 +6,11 @@
     <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>
+        <input id="No"  hidden="hidden"/>
     </div>
     <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 id="Department" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <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/Form.js

@@ -15,16 +15,42 @@ var bootstrap = function ($, learun) {
             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: {},
-            });
             $('#Unit').lrDataItemSelect({ code: 'sldw', allowSearch: true });
             $('#Types').lrDataItemSelect({ code: 'AssType' });
             $('#Status').lrDataItemSelect({ code: 'AssState' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            $('#Name').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
+                height: 500,
+                width: 400,
+                selectWord: 'f_realname',
+                value: 'f_realname',
+                text: 'f_realname',
+                headData:
+                    [
+                        { label: "编号", name: "f_encode", width: 100, align: "left" },
+                        { label: "姓名", name: "f_realname", width: 100, align: "left" },
+                        {
+                            label: "部门", name: "f_departmentid", 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']);
+                                    }
+                                });
+                            }
+                        },
+                    ],
+                select: function (item) {
+                    ////赋值
+                    $("#Name").val(item.f_realname);
+                    $("#No").val(item.f_encode);
+                    $("#Department").lrselectSet(item.f_departmentid);
+                }
+            });
         },
         initData: function () {
             if (!!keyValue) {
@@ -45,11 +71,12 @@ var bootstrap = function ($, learun) {
     acceptClick = function (callBack) {
         if (!$('body').lrValidform()) {
             return false;
-        }
-        var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
-        };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        }  
+        var postData = {};
+        var strEntity = $('body').lrGetFormData();
+        strEntity.Name = strEntity.No;
+        postData.strEntity = JSON.stringify(strEntity);
+       $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

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

@@ -35,8 +35,8 @@
                                     <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 class="lr-form-item-title">使用状态</div>
+                                    <div id="Status"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">资产类别</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' });
+            $('#Status').lrDataItemSelect({ code: 'AssState' });
             $('#Types').lrDataItemSelect({ code: 'AssType' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -99,31 +100,21 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList',
                 headData: [
                     {
-                        label: "资产类别", name: "Types", width: 100, align: "left",
+                        label: "使用管理人", name: "Name", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
                                 key: value,
-                                code: 'AssType',
+                                keyId: 'f_encode',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
                     {
-                        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) {
+                        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,
@@ -134,8 +125,20 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "资产编号", name: "Code", width: 100, align: "left"},
-                    { label: "资产名称", name: "DeviceName", width: 100, align: "left"},
+                    { label: "资产编号", name: "Code", width: 150, align: "left"},
+                    { label: "资产名称", name: "DeviceName", width: 150, align: "left" },
+                    {
+                        label: "资产类别", name: "Types", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AssType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     //{ label: "配置描述", name: "Description", width: 100, align: "left" },
                     { label: "品牌", name: "Brand", width: 120, align: "left" },
                     { label: "型号", name: "Model", width: 120, align: "left" },

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

@@ -35,8 +35,8 @@
                                     <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 class="lr-form-item-title">使用状态</div>
+                                    <div id="Status"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">资产类别</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.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' });
+            $('#Status').lrDataItemSelect({ code: 'AssState' });
             $('#Types').lrDataItemSelect({ code: 'AssType' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -98,18 +99,6 @@ var bootstrap = function ($, learun) {
             $('#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: 'AssType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "使用管理人", name: "Name", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -137,8 +126,19 @@ 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: "DeviceName", width: 150, align: "left" },
+                    {
+                        label: "资产类别", name: "Types", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AssType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "品牌", name: "Brand", width: 120, align: "left" },
                     { label: "型号", name: "Model", width: 120, align: "left" },
                     { label: "参数", name: "Argument", width: 120, align: "left" },
@@ -155,6 +155,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/PersonnelManagement/Views/TeacherCertificate/Form.cshtml

@@ -3,24 +3,29 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">教师姓名<font face="宋体">*</font></div>
-        <div id="TCNo" isvalid="yes" checkexpession="NotNull"></div>
-        <input id="TCName" hidden="hidden" />
+        <div id="TCName" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="TCNo" hidden="hidden" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">部门</div>
+        <div id="Department" readonly></div>
+        @*<div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly></div>*@
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">证书名称<font face="宋体">*</font></div>
         <input id="TCType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">证书编号<font face="宋体">*</font></div>
         <input id="TCCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">资格种类</div>
         <div id="TCTypeID"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">任教学科</div>
         <div id="TCClass"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js

@@ -16,9 +16,41 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
-            $('#TCNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#FilePath').lrUploader();
             $('#TCClass').lrDataItemSelect({ code: 'xkfl' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            $('#TCName').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
+                height: 500,
+                width: 400,
+                selectWord: 'f_realname',
+                value: 'f_realname',
+                text: 'f_realname',
+                headData:
+                    [
+                        { label: "编号", name: "f_encode", width: 100, align: "left" },
+                        { label: "姓名", name: "f_realname", width: 100, align: "left" },
+                        {
+                            label: "部门", name: "f_departmentid", 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']);
+                                    }
+                                });
+                            }
+                        },
+                    ],
+                select: function (item) {
+                    ////赋值
+                    $("#TCNo").val(item.f_encode);
+                    $("#TCName").val(item.f_realname);
+                    $("#Department").lrselectSet(item.f_departmentid);
+                }
+            });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml

@@ -18,13 +18,17 @@
                                     <div id="TCNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">证书名称</div>
-                                    <input id="TCType" type="text" class="form-control" />
+                                    <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 id="TCTypeID"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">任教学科</div>
+                                    <div id="TCClass"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js

@@ -7,8 +7,8 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
-    var startTime;
-    var endTime;
+    //var startTime;
+    //var endTime;
     var page = {
         init: function () {
             page.initGird();
@@ -19,32 +19,32 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             // 时间搜索框
-            $('#datesearch').lrdate({
-                dfdata: [
-                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
-                ],
-                // 月
-                mShow: false,
-                premShow: false,
-                // 季度
-                jShow: false,
-                prejShow: false,
-                // 年
-                ysShow: false,
-                yxShow: false,
-                preyShow: false,
-                yShow: false,
-                // 默认
-                dfvalue: '1',
-                selectfn: function (begin, end) {
-                    startTime = begin;
-                    endTime = end;
-                    page.search();
-                }
-            });
+            //$('#datesearch').lrdate({
+            //    dfdata: [
+            //        { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+            //        { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+            //        { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+            //        { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+            //    ],
+            //    // 月
+            //    mShow: false,
+            //    premShow: false,
+            //    // 季度
+            //    jShow: false,
+            //    prejShow: false,
+            //    // 年
+            //    ysShow: false,
+            //    yxShow: false,
+            //    preyShow: false,
+            //    yShow: false,
+            //    // 默认
+            //    dfvalue: '1',
+            //    selectfn: function (begin, end) {
+            //        startTime = begin;
+            //        endTime = end;
+            //        page.search();
+            //    }
+            //});
             $('#TCNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
@@ -53,6 +53,8 @@ var bootstrap = function ($, learun) {
                 text: "empname"
             });
             $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
+            $('#TCClass').lrDataItemSelect({ code: 'xkfl' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -109,8 +111,21 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/GetPageList',
                 headData: [
-                    { label: "教师编号", name: "TCNo", width: 150, align: "left" },
-                    { label: "教师姓名", name: "TCName", width: 100, align: "left" },
+                    { label: "教师编号", name: "f_encode", width: 150, align: "left" },
+                    { label: "教师姓名", name: "f_realname", width: 100, align: "left" },
+                    {
+                        label: "部门", name: "f_departmentid", 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: "TCType", width: 150, align: "left" },
                     { label: "证书编号", name: "TCCode", width: 150, align: "left" },
                     {
@@ -137,7 +152,12 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "批准时间", name: "TCTime", width: 100, align: "left" },
+                    {
+                        label: "批准时间", name: "TCTime", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "批准单位", name: "TCUnit", width: 100, align: "left" },
                     { label: "批准文号", name: "TCNum", width: 100, align: "left" },
                 ],

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
+using System.Text;
 using System.Web;
 using Learun.Application.Base.SystemModule;
 using Learun.Application.Organization;
@@ -520,7 +522,7 @@ namespace Learun.Application.WebApi.Modules
             return Success(result);
         }
 
-        public string GetQRCode(dynamic _)
+        public Response GetQRCode(dynamic _)
         {
             string keyValue = Request.Query["keyValue"];
             int Types = Request.Query["Types"];
@@ -530,16 +532,18 @@ namespace Learun.Application.WebApi.Modules
                 var Data = officeEquipmentIBLL.GetOfficeEquipmentEntity(keyValue);
                 var emp = empinfoIBLL.GetEmpInfoEntityByEmpNo(Data.Name);
                 var Unit = dataItemIBLL.GetDetailList("sldw").Where(x => x.F_ItemValue == Data.Unit).FirstOrDefault();
-                result = "资产名称:" + Data.DeviceName + ",资产编号:" + Data.Code + ",品牌:" + Data.Brand + ",型号:" + Data.Model + ",参数:" + Data.Argument + ",单位:(" + Unit.F_ItemName + "),参数:" + Data.Nuantity + ",使用管理人:" + emp.EmpName + ",备注:" + Data.Remark;
+                result = "资产名称:" + Data.DeviceName + ";<br>资产编号:" + Data.Code + ";<br>品牌:" +
+                Data.Brand + ";<br>型号:" + Data.Model + ";<br>参数:" + Data.Argument + ";<br>单位:(" + Unit.F_ItemName + ");<br>数量:" + Data.Nuantity + ";<br>使用管理人:" + emp.EmpName + ";<br>备注:" + Data.Remark;
             }
             else
             {
                 var Data = fixedAssetsIBLL.GetFixedAssetsEntity(keyValue);
                 var emp = empinfoIBLL.GetEmpInfoEntityByEmpNo(Data.UsePeople);
                 var Unit = dataItemIBLL.GetDetailList("sldw").Where(x => x.F_ItemValue == Data.Unit).FirstOrDefault();
-                result = "资产名称:" + Data.AssetsName + ",资产编号:" + Data.Code + ",品牌:" + Data.Brand + ",型号:" + Data.Model + ",参数:" + Data.Argument + ",单位:(" + Unit.F_ItemName + "),参数:" + Data.Nuantity + ",使用管理人:" + emp.EmpName + ",备注:" + Data.Remark;
+                result = "资产名称:" + Data.AssetsName + ";<br>资产编号:" + Data.Code + ";<br>品牌:" +
+                Data.Brand + ";<br>型号:" + Data.Model + ";<br>参数:" + Data.Argument + ";<br>单位:(" + Unit.F_ItemName + ");<br>数量:" + Data.Nuantity + ";<br>使用管理人:" + emp.EmpName + ";<br>备注:" + Data.Remark;
             }
-            return result;
+            return Response.AsText(result).WithContentType("text/html;charset=utf-8");
         }
     }
 }

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

@@ -114,6 +114,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUser = LoginUserInfo.Get().userId;
         }
         /// <summary>
         /// 编辑调用
@@ -122,6 +124,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Modify(string keyValue)
         {
             this.Id = keyValue;
+            this.Modifytime = DateTime.Now;
+            this.ModifyUser = LoginUserInfo.Get().userId;
         }
         #endregion
         #region 扩展字段

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

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs

@@ -30,6 +30,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("TCNAME")]
         public string TCName { get; set; }
         /// <summary>
+        /// 部门
+        /// </summary>
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
+        /// <summary>
         /// 证书名称
         /// </summary>
         [Column("TCTYPE")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs

@@ -56,7 +56,17 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("TCTypeID", queryParam["TCTypeID"].ToString(), DbType.String);
                     strSql.Append(" AND t.TCTypeID=@TCTypeID ");
                 }
-                return this.BaseRepository().FindList<TeacherCertificateEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["Department"].IsEmpty())
+                {
+                    dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Department=@Department ");
+                }
+                if (!queryParam["TCClass"].IsEmpty())
+                {
+                    dp.Add("TCClass", queryParam["TCClass"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TCClass=@TCClass ");
+                }
+                return this.BaseRepository().FindList<TeacherCertificateEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -108,7 +118,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository().Delete<TeacherCertificateEntity>(t=>t.TCID == keyValue);
+                this.BaseRepository().Delete<TeacherCertificateEntity>(t => t.TCID == keyValue);
             }
             catch (Exception ex)
             {