Merge branch '长阳分支推送专用' of 123.57.209.16:bjquanjiang/DigitalScholl into 长阳分支推送专用

# Conflicts:
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue

.gitignore

@@ -79,3 +79,6 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z
 /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z
+/Learun.Framework.Ultimate V7/LearunApp-2.2.0/.hbuilderx/launch.json
+/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles
+/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/QRCode

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx

@@ -0,0 +1,69 @@
+
+
+数字化智慧校园
+
+
+
+
+
+统一身份认证补充接口
+
+
+
+
+
+
+V1.0
+
+
+
+
+
+
+概述
+  根据特定需求开发补充接口
+登录接口
+	采用标准Http GET 请求发送用户名、密码到认证接口，接口实现用户名密码判定后返回标准json；
+
+请求地址：http://10.30.0.10:8000/Login/CheckLoginForSSOBC
+请求方式：发送标准Http GET请求到认证地址
+
+接口请求参数
+                                    参数
+                                    说明
+u
+用户名
+p
+密码
+
+认证接口返回参数
+                                    参数
+                                    说明
+code
+状态码 返回200成功、其他失败
+info
+状态消息 返回login success表示登录成功、其他失败
+data
+保留 暂时无用
+
+登录成功后，认证服务器将在用户浏览器cookies中写入数字化智慧校园系统数据，第三方系统可直接跳转到http://10.30.0.10:8000/Home/Index 进入数字化智慧校园系统。
+
+退出登录接口
+  第三方系统退出时，需要主动调用退出登录接口以同步数字化智慧校园系统退出状态。
+  采用标准Http POST 请求，返回标准json；
+
+请求地址：http://10.30.0.10:8000/Login/OutLoginForSSOBC
+请求方式：发送标准Http POST请求到认证地址
+
+接口请求参数：无
+
+认证接口返回参数
+                                    参数
+                                    说明
+code
+状态码 返回200成功、其他失败
+info
+状态消息 返回logout success表示退出成功、其他失败
+data
+保留 暂时无用
+

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -6,15 +6,9 @@
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 //};
-//var config = {
-//    webapi: 'http://localhost:31173/',
-//    web: "http://localhost:20472/"//web地址，用于配置logo
-//}; 
-
-
 var config = {
-    webapi: 'http://localhost:8081/',
-    web: "http://localhost:8087/"//web地址，用于配置logo
+   webapi: 'http://localhost:8088/',
+   web: "http://localhost:8087/"//web地址，用于配置logo
 }; 
 // var config = {
 //    webapi: 'http://123.57.209.16:31173/',
@@ -30,4 +24,4 @@ var config = {
 // var config = {
 //    webapi: 'http://123.57.209.16:31174/',
 //    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
-// }; 
+// };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.js

@@ -14,7 +14,7 @@
             var account = learun.storage.get('logininfo').account;
             $.ajax({
                 type: 'POST',
-                url: config.webapi + '/Statistics/getEmpInfo',
+                url: config.webapi + '/Statistics/getEmpInfo2',
                 data: { 'account': account },
                 async: false,
                 success: function (msg) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/DutySchedule/DutySchedule.js

@@ -74,8 +74,13 @@
         },
         rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 
             _$item.addClass('lr-list-item lr-list-item-multi');
-            _$item.append($('<p class="lr-ellipsis"><span>时间：</span></p>').dataFormatter({
-                value: _item.Date,
+            _$item.append($('<p class="lr-ellipsis"><span>开始时间：</span></p>').dataFormatter({
+                value: _item.StartTime,
+                type: 'datetime',
+                dateformat: 'yyyy-MM-dd'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>结束时间：</span></p>').dataFormatter({
+                value: _item.EndTime,
                 type: 'datetime',
                 dateformat: 'yyyy-MM-dd'
             }));

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/contacts/contacts.js

@@ -1,4 +1,4 @@
-/*页面js模板,必须有init方法*/
+/*页面js模板,必须有init方法*/
 (function () {
     var companyMap;
     var departmentMap;
@@ -104,112 +104,110 @@
             }
 
 
-            // 注册点击事件
-            $('#lr_contact_companylist').on('tap', function (e) {
-                e = e || window.event;
-                console.log(1213);
-                var et = e.target || e.srcElement;
-                var $et = $(et);
-                if (et.tagName === 'IMG' || et.tagName === 'SPAN') {
-                    $et = $et.parent();
-                }
-
-                var $list = $('<div class="lr-user-list" ></div>');
-                var flag = false;
-                var id = $et.attr('data-value');
-                console.log(id);
-                if ($et.hasClass('company')) {
-                    if ($et.hasClass('bottom')) {
-                        $et.removeClass('bottom');
-                        $et.parent().find('.lr-user-list').remove();
-                    }
-                    else {
-                        $list.css({ 'padding-left': '10px' });
-                        // 加载人员
-                        $.each(userMap[id] || [], function (_index, _item) {
-                            var _html = '\
-                            <div class="lr-list-item user"  data-value="'+ _item.id + '"  >\
-                                <img src="'+ getHeadImg(_item) + '"  >\
-                                <span >' + _item.name + '</span>\
-                            </div>';
-
-                            $list.append(_html);
-                            flag = true;
-                        });
-                        // 加载部门
-                        $.each(departmentMap[id] || [], function (_index, _item) {
-                            var _html = '\
-                            <div class="lr-list-item" >\
-                                <a class="lr-nav-left department" data-value="'+ _item.id + '" >' + _item.name + '</a>\
-                            </div>';
-
-                            $list.append(_html);
-                            flag = true;
-                        });
-                        // 加载公司
-                        $.each(companyMap[id] || [], function (_index, _item) {
-                            var _html = '\
-                            <div class="lr-list-item" >\
-                                <a class="lr-nav-left company" data-value="'+ _item.id + '" >' + _item.name + '</a>\
-                            </div>';
-
-                            $list.append(_html);
-                            flag = true;
-                        });
-
-                        if (flag) {
-                            $et.parent().append($list);
-                        }
-                        $et.addClass('bottom');
-                    }
-                    $list = null;
-                    return false;
-                }
-                else if ($et.hasClass('department')) {
-                    if ($et.hasClass('bottom')) {
-                        $et.removeClass('bottom');
-                        $et.parent().find('.lr-user-list').remove();
-                    }
-                    else {
-                        $list.css({ 'padding-left': '10px' });
-                        // 加载人员
-                        $.each(userMap[id] || [], function (_index, _item) {
-                            var _html = '\
-                            <div class="lr-list-item user"  data-value="'+ _item.id + '"  >\
-                                <img src="'+ getHeadImg(_item) + '"  >\
-                                <span >' + _item.name + '</span>\
-                            </div>';
-
-                            $list.append(_html);
-                            flag = true;
-                        });
-                        // 加载部门
-                        $.each(departmentMap[id] || [], function (_index, _item) {
-                            var _html = '\
-                            <div class="lr-list-item" >\
-                                <a class="lr-nav-left department" data-value="'+ _item.id + '" >' + _item.name + '</a>\
-                            </div>';
-
-                            $list.append(_html);
-                            flag = true;
-                        });
-
-                        if (flag) {
-                            $et.parent().append($list);
-                        }
-                        $et.addClass('bottom');
-                    }
-                    $list = null;
-                    return false;
-                }
-                else if ($et.hasClass('user')) {
-                    var userName = $et.find('span').text();
-                    learun.nav.go({ path: 'chat', title: userName, isBack: true, isHead: true, param: { hasHistory: true, userId: id }, type: 'right' });
-                    $list = null;
-                    return false;
-                }
-
-            });
+             // 注册点击事件
+             $('#lr_contact_companylist').on('tap', function (e) {
+                 e = e || window.event;
+                 var et = e.target || e.srcElement;
+                 var $et = $(et);
+                 if (et.tagName === 'IMG' || et.tagName === 'SPAN') {
+                     $et = $et.parent();
+                 }
+
+                 var $list = $('<div class="lr-user-list" ></div>');
+                 var flag = false;
+                 var id = $et.attr('data-value');
+                 if ($et.hasClass('company')) {
+                     if ($et.hasClass('bottom')) {
+                         $et.removeClass('bottom');
+                         $et.parent().find('.lr-user-list').remove();
+                     }
+                     else {
+                         $list.css({ 'padding-left': '10px' });
+                         // 加载人员
+                         $.each(userMap[id] || [], function (_index, _item) {
+                             var _html = '\
+                             <div class="lr-list-item user"  data-value="'+ _item.id + '"  >\
+                                 <img src="'+ getHeadImg(_item) + '"  >\
+                                 <span >' + _item.name + '('+_item.mobile+')</span>\
+                             </div>';
+
+                             $list.append(_html);
+                             flag = true;
+                         });
+                         // 加载部门
+                         $.each(departmentMap[id] || [], function (_index, _item) {
+                             var _html = '\
+                             <div class="lr-list-item" >\
+                                 <a class="lr-nav-left department" data-value="'+ _item.id + '" >' + _item.name + '</a>\
+                             </div>';
+
+                             $list.append(_html);
+                             flag = true;
+                         });
+                         // 加载公司
+                         $.each(companyMap[id] || [], function (_index, _item) {
+                             var _html = '\
+                             <div class="lr-list-item" >\
+                                 <a class="lr-nav-left company" data-value="'+ _item.id + '" >' + _item.name + '</a>\
+                             </div>';
+
+                             $list.append(_html);
+                             flag = true;
+                         });
+
+                         if (flag) {
+                             $et.parent().append($list);
+                         }
+                         $et.addClass('bottom');
+                     }
+                     $list = null;
+                     return false;
+                 }
+                 else if ($et.hasClass('department')) {
+                     if ($et.hasClass('bottom')) {
+                         $et.removeClass('bottom');
+                         $et.parent().find('.lr-user-list').remove();
+                     }
+                     else {
+                         $list.css({ 'padding-left': '10px' });
+                         // 加载人员
+                         $.each(userMap[id] || [], function (_index, _item) {
+                             var _html = '\
+                             <div class="lr-list-item user"  data-value="'+ _item.id + '"  >\
+                                 <img src="'+ getHeadImg(_item) + '"  >\
+                                 <span >' + _item.name + '('+_item.mobile+')</span>\
+                             </div>';
+
+                             $list.append(_html);
+                             flag = true;
+                         });
+                         // 加载部门
+                         $.each(departmentMap[id] || [], function (_index, _item) {
+                             var _html = '\
+                             <div class="lr-list-item" >\
+                                 <a class="lr-nav-left department" data-value="'+ _item.id + '" >' + _item.name + '</a>\
+                             </div>';
+
+                             $list.append(_html);
+                             flag = true;
+                         });
+
+                         if (flag) {
+                             $et.parent().append($list);
+                         }
+                         $et.addClass('bottom');
+                     }
+                     $list = null;
+                     return false;
+                 }
+                 // else if ($et.hasClass('user')) {
+                 //     var userName = $et.find('span').text();
+                 //     learun.nav.go({ path: 'chat', title: userName, isBack: true, isHead: true, param: { hasHistory: true, userId: id }, type: 'right' });
+                 //     $list = null;
+                 //     return false;
+                 // }
+
+             });
 
             // 点击搜索框
             $page.find('.searchBox').on('tap', function () {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.html

@@ -1,23 +1,23 @@
-<div class="lr-login-page">
-    <div class="login-content">
-        <img src="" />
-        <div class="line">
-            <i class="iconfont icon-friend_light"></i>
-            <input id="account" type="text" placeholder="学号/教工号">
-        </div>
-        <div class="line">
-            <i class="iconfont icon-lock"></i>
-            <input id="password" type="password" placeholder="密码">
-        </div>
-        <button id="loginBtn" type="button" class="lr-btn-primary lr-btn-block">
-            登录
-        </button>
-        <button id="bindweixinBtn" type="button" class="lr-btn-primary lr-btn-block">
-            微信登录
-        </button>
-        <button id="RegisterBtn" type="button" style="display:none;" class="lr-btn-primary lr-btn-block">
-            注册
-        </button>
-    </div>
-    <div class="version"></div>
-</div>
+<div class="lr-login-page">
+	<div class="login-content">
+		<img src="" />
+		<div class="line">
+			<i class="iconfont icon-friend_light"></i>
+			<input id="account" type="text" placeholder="账号/身份证号">
+		</div>
+		<div class="line">
+			<i class="iconfont icon-lock"></i>
+			<input id="password" type="password" placeholder="密码/手机号">
+		</div>
+		<button id="loginBtn" type="button" class="lr-btn-primary lr-btn-block">
+			登录
+		</button>
+		<button id="bindweixinBtn" type="button" class="lr-btn-primary lr-btn-block">
+			微信登录
+		</button>
+<!-- 		<button id="RegisterBtn" type="button" style="display:none;" class="lr-btn-primary lr-btn-block">
+			注册
+		</button> -->
+	</div>
+	<div class="version"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/userInfo/userInfo.css

@@ -1,4 +1,4 @@
-.lr-userInfo-list .lr-list-item {
+.lr-userInfo-list .lr-list-item {
     text-align:right;
 }
 .lr-userInfo-list .lr-list-item>div {
@@ -6,6 +6,21 @@
     top:0;
     left:14px;
 }
+.role{
+	margin-top: 0px;
+	    position: relative;
+	    /* height: 100px; */
+	    left: 0;
+	    top: 17px;
+	    z-index: 999;
+	    /* text-align: center; */
+	    /* width: 100%; */
+	    /* display: block; */
+	    float: right;
+	    line-height: 2;
+	    padding: 19px 0 20px 0;
+	    text-align: left;
+}
 .lr-userInfo-list .lr-list-item-img {
     height: 64px;
     line-height:64px;

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/userInfo/userInfo.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var page = {
         isScroll: true,
         init: function ($page) {
@@ -9,7 +9,7 @@
             $page.find('img').attr('src', config.webapi + 'learun/adms/user/img?data=' + baseinfo.userId);
 
 
-            $page.find('.account').text(baseinfo.account);
+            $page.find('.account').text(baseinfo.IdentityCardNo);
             $page.find('.enCode').text(baseinfo.enCode);
             $page.find('.realName').text(baseinfo.realName);
             $page.find('.gender').text(baseinfo.gender == 1 ? '男' : '女');

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/audit.html

@@ -1 +1 @@
-<div class="lr-naudit-page"></div>
+<div class="lr-naudit-page" id="auditcontainer"></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/audit.js

@@ -18,6 +18,7 @@
     var nodeMap = {};
 
     var getFormData = function ($page) {
+        console.log('开始获取表单数据');
         formDataes = $page.find('#auditcontainer').custmerformGet();
         if (formDataes == null) {
             return false;
@@ -25,10 +26,10 @@
         formreq = [];
         formAllData = {};
         for (var id in formDataes) {
-            if (!fieldMap[id]) {
-                learun.layer.warning('未设置流程表单关联字段！', function () { }, '数字化智慧校园', '关闭');
-                return false;
-            }
+            // if (!fieldMap[id]) {
+            //     learun.layer.warning('未设置流程表单关联字段！', function () { }, '数字化智慧校园', '关闭');
+            //     return false;
+            // }
             $.extend(formAllData, formDataes[id]);
             if (!formMap[id]) {
                 formDataes[id][fieldMap[id]] = processId;
@@ -43,6 +44,9 @@
                 point.keyValue = processId;
             }
             formreq.push(point);
+            console.log('显示表单信息');
+            console.log(point);
+
         }
 
         return true;
@@ -84,7 +88,7 @@
                                 if (!getFormData($page)) {
                                     return false;
                                 }
-                                learun.nav.go({ path: 'nworkflow/audit/verify', title: headText + '【' + _item.name + '】', type: 'right', param: { processId: processId, taskId: taskId, verify: _item.code, name: _item.name, node: currentNode } });
+                                learun.nav.go({ path: 'nworkflow/audit/verify', title: headText + '【' + _item.name + '】', type: 'right', param: {btn:_item,schemeCode:info.SchemeCode, processId: processId, taskId: taskId, verify: _item.code, name: _item.name, node: currentNode } });
                             }
                         }
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/verify/verify.js

@@ -41,13 +41,18 @@
             });
 
             //加载下一节点审核者
-            if (param.node.isNext == '1') {
+            var isNext=param.node.isNext;
+            if(param.btn.next=='2'){
+                isNext='1';
+            }
+            if (isNext == '1') {
                 var nodeMap = {};
                 // 节点信息
-                $.each(param.nodelist, function (_index, _item) {
-                    nodeMap[_item.id] = _item;
-                });
+                // $.each(param.nodelist, function (_index, _item) {
+                //     nodeMap[_item.id] = _item;
+                // });
                 var req = {
+                    code:param.schemeCode,
                     taskId: param.taskId,
                     processId: param.processId,
                     nodeId: param.node.id,
@@ -55,12 +60,15 @@
                 };
                 learun.httpget(config.webapi + "learun/adms/newwf/auditer", req, function (data) {
                     if (data) {
+                        console.log(data);
                         var $des = $page.find('.lr-form-row-multi');
                         var $item = $page.find('#F_Level').parent();
                         $.each(data, function (_id, _list) {
                             if (_list.length > 1) {
-                                $des.before('<div class="lr-form-row"><label>' + nodeMap[_id].name + '</label><div id="' + _id + '"  class="nodeId" ></div></div>');
+                                $des.before('<div class="lr-form-row"><label></label><div id="' + _id + '"  class="nodeId" ></div></div>');
                                 $page.find('#' + _id).lrpicker({ data: _list, itext: 'Name', ivalue: 'Id' });
+                                // $des.before('<div class="lr-form-row"><label>' + nodeMap[_id].name + '</label><div id="' + _id + '"  class="nodeId" ></div></div>');
+                                // $page.find('#' + _id).lrpicker({ data: _list, itext: 'Name', ivalue: 'Id' });
                             }
                         });
                     }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/listdetaile/listdetaile.js

@@ -1,24 +1,31 @@
-(function () {
-    var page = {
-        isScroll: true,
-        init: function ($page, param) {
-            var content = '';
-            var title = '';
-            if (param.f_content) {
-                content = param.f_content.replace(/\/ueditor\/upload/g, config.web + "\/ueditor\/upload");
-                title = param.f_title;
-            } else {
-                content = param.F_NewsContent.replace(/\/ueditor\/upload/g, config.web + "\/ueditor\/upload")
-                title = param.F_FullHead;
-            }
+(function() {
+	var page = {
+		isScroll: true,
+		init: function($page, param) {
+			var content = '';
+			var title = '';
+			//         if (param.f_content) {
+			//             content = param.f_content.replace(/\/ueditor\/upload/g, config.web + "\/ueditor\/upload");
+			// title = param.f_title;
+			//         } else {
+			//             content = param.F_NewsContent.replace(/\/ueditor\/upload/g, config.web + "\/ueditor\/upload")
+			//             title = param.F_FullHead;
+			//         }
+			if (param.f_content) {
+				content = param.f_content.replace(/\/ueditor\/upload/g, "\/ueditor\/upload");
+				title = param.f_title;
+			} else {
+				content = param.F_NewsContent.replace(/\/ueditor\/upload/g, "\/ueditor\/upload")
+				title = param.F_FullHead;
+			}
 
-            $page.find('.lr-listdetaile-page-title').html(title);
-            $page.find('.lr-listdetaile-page-content').html($('<div></div>').html(content).text());
-            //下载附件修改的地方，可能会引起其他问题
-            $(document).unbind("mousedown");
-            $("body").unbind("tap");
-        }
-        
-    };
-    return page;
-})();
+			$page.find('.lr-listdetaile-page-title').html(title);
+			$page.find('.lr-listdetaile-page-content').html($('<div></div>').html(content).text());
+			//下载附件修改的地方，可能会引起其他问题
+			$(document).unbind("mousedown");
+			$("body").unbind("tap");
+		}
+
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/index.js

@@ -1,4 +1,4 @@
-// 有关“空白”模板的简介，请参阅以下文档:
+// 有关“空白”模板的简介，请参阅以下文档:
 // http://go.microsoft.com/fwlink/?LinkID=397704
 // 若要在 cordova-simulate 或 Android 设备/仿真器上在页面加载时调试代码: 启动应用，设置断点，
 // 然后在 JavaScript 控制台中运行 "window.location.reload()"。
@@ -12,12 +12,12 @@
             img: 'images/tab10.png',
             fillimg: 'images/tab11.png'
         },
-        {
-            page: 'message',
-            text: '消息',
-            img: 'images/tab20.png',
-            fillimg: 'images/tab21.png'
-        },
+        // {
+        //     page: 'message',
+        //     text: '消息',
+        //     img: 'images/tab20.png',
+        //     fillimg: 'images/tab21.png'
+        // },
         {
             page: 'contacts',
             text: '通讯录',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js

@@ -803,11 +803,10 @@
                         code: op.code,
                         callback: function (data) {
                             if (op.placeHolders != '') {
-                                console.log(data);
                                 var obj={};
                                 obj[op.ivalue] = op.placeHolders;
                                 obj[op.itext] = op.placeHolders;
-                                data.splice(0, 0, obj);
+                                //data.splice(0, 0, obj);
                             }
                             $this.lrpickerSetData(data);
                         }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyBLL.cs

@@ -16,7 +16,7 @@ namespace Learun.Application.Organization
     public class CompanyBLL : CompanyIBLL
     {
         #region  属性
-        private CompanyService companyService = new CompanyService();        
+        private CompanyService companyService = new CompanyService();
         #endregion
 
         #region  缓存定义
@@ -120,11 +120,13 @@ namespace Learun.Application.Organization
         /// 获取公司映射数据
         /// </summary>
         /// <returns></returns>
-        public Dictionary<string,CompanyModel> GetModelMap() {
+        public Dictionary<string, CompanyModel> GetModelMap()
+        {
             try
             {
                 Dictionary<string, CompanyModel> dic = cache.Read<Dictionary<string, CompanyModel>>(cacheKey + "dic", CacheId.company);
-                if (dic == null) {
+                if (dic == null)
+                {
                     dic = new Dictionary<string, CompanyModel>();
                     List<CompanyEntity> list = GetList();
                     foreach (var item in list)
@@ -163,7 +165,8 @@ namespace Learun.Application.Organization
             try
             {
                 List<CompanyEntity> list = GetList();
-                if (!string.IsNullOrEmpty(keyWord)) {
+                if (!string.IsNullOrEmpty(keyWord))
+                {
                     list = list.FindAll(t => t.F_FullName.Contains(keyWord) || t.F_EnCode.Contains(keyWord) || t.F_ShortName.Contains(keyWord));
                 }
                 return list;
@@ -206,6 +209,30 @@ namespace Learun.Application.Organization
             }
         }
 
+        /// <summary>
+        /// 获取公司信息
+        /// </summary>
+        /// <returns></returns>
+        public CompanyEntity GetDetail()
+        {
+            try
+            {
+                List<CompanyEntity> list = GetList();
+                CompanyEntity entity = list.Find(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1);
+                return entity;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 获取公司信息实体
@@ -235,12 +262,14 @@ namespace Learun.Application.Organization
         /// </summary>
         /// <param name="parentId">父级id</param>
         /// <returns></returns>
-        public List<TreeModel> GetTree(string parentId) {
+        public List<TreeModel> GetTree(string parentId)
+        {
             try
             {
                 List<CompanyEntity> list = GetList();
                 List<TreeModel> treeList = new List<TreeModel>();
-                foreach (var item in list) {
+                foreach (var item in list)
+                {
                     TreeModel node = new TreeModel
                     {
                         id = item.F_CompanyId,
@@ -276,7 +305,8 @@ namespace Learun.Application.Organization
         {
             try
             {
-                if (string.IsNullOrEmpty(parentId)) {
+                if (string.IsNullOrEmpty(parentId))
+                {
                     return new List<string>();
                 }
                 List<string> res = new List<string>();
@@ -302,10 +332,13 @@ namespace Learun.Application.Organization
         /// </summary>
         /// <param name="list">树形数据列表</param>
         /// <param name="ourList">输出数据列表</param>
-        private void GetSubNodes(List<TreeModel> list, List<string> ourList) {
-            foreach (var item in list) {
+        private void GetSubNodes(List<TreeModel> list, List<string> ourList)
+        {
+            foreach (var item in list)
+            {
                 ourList.Add(item.id);
-                if (item.hasChildren) {
+                if (item.hasChildren)
+                {
                     GetSubNodes(item.ChildNodes, ourList);
                 }
             }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyEntity.cs

@@ -214,6 +214,11 @@ namespace Learun.Application.Organization
         /// </summary>
         [Column("F_EnrollmentInformation")]
         public string F_EnrollmentInformation { get; set; }
+        /// <summary>
+        /// 统一社会信用代码
+        /// </summary>
+        [Column("F_USCREDITCODE")]
+        public string F_USCreditCode { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyIBLL.cs

@@ -42,7 +42,12 @@ namespace Learun.Application.Organization
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         CompanyEntity GetEntity(string keyValue);
-
+        /// <summary>
+        /// 获取公司信息
+        /// </summary>
+        /// <returns></returns>
+        CompanyEntity GetDetail();
+        
         bool GetAny();
         /// <summary>
         /// 获取树形数据

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs

@@ -435,7 +435,7 @@ namespace Learun.Application.Organization
                 if (dic == null)
                 {
                     dic = new Dictionary<string, DepartmentModel>();
-                    var list = departmentService.GetAllList();
+                    var list = departmentService.GetAllListForMap();
                     foreach (var item in list)
                     {
                         DepartmentModel model = new DepartmentModel()

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs

@@ -172,6 +172,9 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         [Column("F_ORDER")]
         public int? F_Order { get; set; }
+
+        [Column("F_ISVIRTUALIZATION")]
+        public bool? F_IsVirtualization { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentService.cs

@@ -78,6 +78,35 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+
+        /// <summary>
+        /// 获取部门列表信息 部门映射
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<DepartmentEntity> GetAllListForMap()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(" F_CompanyId,F_ParentId,F_FullName,F_DepartmentId ");
+                strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 ");
+                return this.BaseRepository().FindList<DepartmentEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取部门数据实体
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs

@@ -3,6 +3,8 @@ using Learun.Cache.Factory;
 using Learun.Util;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+
 namespace Learun.Application.Organization
 {
     /// <summary>
@@ -515,6 +517,24 @@ namespace Learun.Application.Organization
             return res;
         }
 
+        public List<PostEntity> GetAllList()
+        {
+            try
+            {
+                return postService.GetAllList().ToList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs

@@ -94,5 +94,8 @@ namespace Learun.Application.Organization
         /// <param name="level">级数</param>
         /// <returns></returns>
         List<string> GetDownIdList(string strPostIds, int level);
+
+        List<PostEntity> GetAllList();
+
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs

@@ -235,5 +235,33 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+
+        /// <summary>
+        /// 获取部门列表信息(根据公司Id)
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<PostEntity> GetAllList()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM LR_BASE_POST t WHERE t.F_DeleteMark = 0 ");
+                return this.BaseRepository().FindList<PostEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs

@@ -125,6 +125,27 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// 获取分页数据
+        /// <returns></returns>
+        public List<RoleEntity> GetListForSelect()
+        {
+            try
+            {
+                return (List<RoleEntity>)roleService.GetListForSelect();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         /// <summary>
         /// 根据角色名获取角色
         /// </summary>
@@ -233,5 +254,47 @@ namespace Learun.Application.Organization
 
         }
         #endregion
+
+        #region 扩展数据
+        /// <summary>
+        /// 获取树形数据
+        /// </summary>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        public List<TreeModel> GetTree(string parentId)
+        {
+            try
+            {
+                List<RoleEntity> list = GetList();
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (var item in list)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item.F_RoleId,
+                        text = item.F_FullName,
+                        value = item.F_RoleId,
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = item.F_RoleId
+                    };
+                    treeList.Add(node);
+                }
+                return treeList;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion 
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs

@@ -23,6 +23,7 @@ namespace Learun.Application.Organization
         /// <param name="keyword">关键字</param>
         /// <returns></returns>
         List<RoleEntity> GetList(string keyword);
+        List<RoleEntity> GetListForSelect();
         /// <summary>
         /// 获取分页数据
         /// </summary>
@@ -58,6 +59,16 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         void SaveEntity(string keyValue, RoleEntity roleEntity);
         string GetIdByRoleName(string v);
+        #endregion
+        #region 扩展数据
+        /// <summary>
+        /// 角色树
+        /// </summary>
+        /// <param name="parentId">父级id</param>
+        /// <returns></returns>
+        List<TreeModel> GetTree(string parentId);
+
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs

@@ -65,6 +65,32 @@ namespace Learun.Application.Organization
                 }
             }
         }
+        /// <summary>
+        /// 获取角色数据列表
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<RoleEntity> GetListForSelect()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.F_RoleId,t.F_FullName,t.F_EnCode");
+                strSql.Append(" FROM LR_Base_Role t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 ORDER BY t.F_EnCode ");
+                return this.BaseRepository().FindList<RoleEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         public IEnumerable<RoleEntity> GetPageList(Pagination pagination, string keyword)
         {
             try

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -433,6 +433,31 @@ namespace Learun.Application.Organization
             }
         }
 
+        /// <summary>
+        /// 获取实体,通过手机号
+        /// </summary>
+        /// <param name="mobile">手机号</param>
+        /// <returns></returns>
+        public UserEntity GetEntityByMobile(string mobile)
+        {
+            try
+            {
+                return userService.GetEntityByMobile(mobile);
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         public void UpdateIp(string ip, string id)
         {
             try
@@ -660,7 +685,8 @@ namespace Learun.Application.Organization
                 if (dic == null)
                 {
                     dic = new Dictionary<string, UserModel>();
-                    var list = userService.GetAllList();
+                    var list = userService.GetAllListForMap();
+                    string fileHeadImg = Config.GetValue("fileHeadImg");
                     foreach (var item in list)
                     {
                         UserModel model = new UserModel()
@@ -668,11 +694,11 @@ namespace Learun.Application.Organization
                             companyId = item.F_CompanyId,
                             departmentId = item.F_DepartmentId,
                             name = item.F_RealName,
+                            mobile = item.F_Mobile ?? ""
                         };
                         string img = "";
                         if (!string.IsNullOrEmpty(item.F_HeadIcon))
                         {
-                            string fileHeadImg = Config.GetValue("fileHeadImg");
                             string fileImg = string.Format("{0}/{1}{2}", fileHeadImg, item.F_UserId, item.F_HeadIcon);
                             if (DirFileHelper.IsExistFile(fileImg))
                             {
@@ -1059,7 +1085,12 @@ namespace Learun.Application.Organization
             //OpenUserGetResult userinfo = openuser.OpenSend();
             try
             {
-                UserEntity userEntity = GetEntityByAccount(account);
+                UserEntity userEntity = userService.GetEntityByIdCard(account);
+                if (userEntity == null)
+                {
+                    userEntity = userService.GetEntityByAccount(account);
+                }
+
                 if (userEntity == null)
                 {
                     userEntity = new UserEntity()
@@ -1080,10 +1111,15 @@ namespace Learun.Application.Organization
                     else
                     {
                         string dbPassword = Md5Helper.Encrypt(DESEncrypt.Encrypt(password.ToLower(), userEntity.F_Secretkey).ToLower(), 32).ToLower();
+                        //string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower();
                         if (dbPassword == userEntity.F_Password)
                         {
                             userEntity.LoginOk = true;
                         }
+                        //else if (phone == password)
+                        //{
+                        //    userEntity.LoginOk = true;
+                        //}
                         else
                         {
                             userEntity.LoginMsg = "密码和账户名不匹配!";
@@ -1263,6 +1299,33 @@ namespace Learun.Application.Organization
         //    }
         //    FileDownHelper.DownLoadnew(img);
         //}
+
+
+        /// <summary>
+        /// 获取实体,账号身份证
+        /// </summary>
+        /// <param name="account">账号身份证</param>
+        /// <returns></returns>
+        public UserEntity GetEntityByIdCard(string account)
+        {
+            try
+            {
+                UserEntity userEntity;
+                userEntity = userService.GetEntityByIdCard(account);
+                return userEntity;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs

@@ -76,6 +76,12 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         UserEntity GetEntityByAccount(string account);
         /// <summary>
+        /// 获取实体,通过用户账号
+        /// </summary>
+        /// <param name="account">用户账号</param>
+        /// <returns></returns>
+        UserEntity GetEntityByIdCard(string account);
+        /// <summary>
         /// 获取实体,通过用户名
         /// </summary>
         /// <param name="account">用户账号</param>
@@ -88,6 +94,12 @@ namespace Learun.Application.Organization
         /// <returns></returns>
         UserEntity GetEntityByUserId(string userId);
         /// <summary>
+        /// 获取用户数据根据手机号
+        /// </summary>
+        /// <param name="mobile"></param>
+        /// <returns></returns>
+        UserEntity GetEntityByMobile(string mobile);
+        /// <summary>
         /// 获取用户列表数据
         /// </summary>
         /// <param name="userIds">用户主键串</param>

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserModel.cs

@@ -26,5 +26,6 @@
         /// </summary>
         public string img { get; set; }
         public string id { get; set; }
+        public string mobile { get; set; }
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs

@@ -54,6 +54,35 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        /// <summary>
+        /// 获取实体,通过身份证
+        /// </summary>
+        /// <param name="account">账号身份证</param>
+        /// <returns></returns>
+        public UserEntity GetEntityByIdCard(string account)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM LR_Base_User t ");
+                strSql.Append(" WHERE t.F_IdentityCardNo = @account AND t.F_DeleteMark = 0  ");
+                return this.BaseRepository().FindEntity<UserEntity>(strSql.ToString(), new { account = account });
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取实体,通过用户账号
         /// </summary>
@@ -78,6 +107,32 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        /// <summary>
+        /// 获取实体,通过用户手机号
+        /// </summary>
+        /// <param name="account">用户账号</param>
+        /// <returns></returns>
+        public UserEntity GetEntityByMobile(string mobile)
+        {
+            try
+            {
+                return this.BaseRepository()
+                    .FindEntity<UserEntity>(a => a.F_Mobile.Equals(mobile) && a.F_DeleteMark == 0);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 用户列表(根据公司主键)
         /// </summary>
@@ -128,7 +183,7 @@ namespace Learun.Application.Organization
         {
             try
             {
-                return this.BaseRepository().FindList<UserEntity>(a =>a.F_Description == "教师"&&a.F_DeleteMark==1&&a.F_EnabledMark==1).ToList().Count() > 0 ? true : false;
+                return this.BaseRepository().FindList<UserEntity>(a => a.F_Description == "教师" && a.F_DeleteMark == 1 && a.F_EnabledMark == 1).ToList().Count() > 0 ? true : false;
             }
             catch (Exception ex)
             {
@@ -226,6 +281,36 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        /// <summary>
+        /// 用户列表,全部
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<UserEntity> GetAllListForMap()
+        {
+            try
+            {
+                var fieldStr = @"t.F_CompanyId,t.F_DepartmentId,t.F_RealName,t.F_Mobile,t.F_HeadIcon,
+                             t.F_UserId,t.F_Gender ";
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldStr.Replace("t.F_Password,", "").Replace("t.F_Secretkey,", ""));
+                strSql.Append(" FROM LR_Base_User t WHERE t.F_DeleteMark = 0  ORDER BY t.F_CompanyId,t.F_DepartmentId,t.F_RealName ");
+                return this.BaseRepository().FindList<UserEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 用户列表（导出Excel）
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js

@@ -121,12 +121,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -134,12 +133,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js

@@ -117,12 +117,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -130,12 +129,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#SexId").lrDataItemSelect({ code: 'usersex' });
-            $('#Nation').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+            $("#Nation").lrDataItemSelect({ code: 'National' });
             $('#PhotoUrl').lrUploader();
             $('#Province').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
             $('#Country').lrselect({
                 value: 'ACODE', text: 'ANAME'
             });
-            $('#PoliticsFace').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PoliticsFace").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#OriginId").lrDataItemSelect({ code: 'ResidenceNo' });
             $("#DataSource").lrDataItemSelect({ code: 'AdmissionsDataSource' });
             $("#ExamineTypeId").lrDataItemSelect({ code: 'ExamineType' });
@@ -148,13 +148,11 @@ var bootstrap = function ($, learun) {
                         label: '政治面貌', name: 'PoliticalId', width: 100, align: 'left'
                         , edit: {
                             type: 'select',
-                            datatype: 'dataSource',
-                            code: 'BCdPartyFace',
-                            op: {
-                                value: 'partyfaceno',
-                                text: 'partyface',
-                                title: 'partyface'
-                            }
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'BCdPartyFace'
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js

@@ -189,12 +189,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -202,12 +201,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js

@@ -119,12 +119,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -132,12 +131,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_TypeController.cs

@@ -27,7 +27,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -85,8 +85,9 @@ namespace Learun.Application.Web.Areas.Ask.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ask_TypeData = ask_TypeIBLL.GetAsk_TypeEntity( keyValue );
-            var jsonData = new {
+            var Ask_TypeData = ask_TypeIBLL.GetAsk_TypeEntity(keyValue);
+            var jsonData = new
+            {
                 Ask_Type = Ask_TypeData,
             };
             return Success(jsonData);
@@ -104,6 +105,11 @@ namespace Learun.Application.Web.Areas.Ask.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
+            var SonList = ask_TypeIBLL.GetAsk_TypeEntity(keyValue);
+            if (SonList != null)
+            {
+                return Fail("删除失败,请先删除子项！");
+            }
             ask_TypeIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
@@ -118,7 +124,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Ask_TypeEntity entity = strEntity.ToObject<Ask_TypeEntity>();
-            ask_TypeIBLL.SaveEntity(keyValue,entity);
+            ask_TypeIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Form.js

@@ -33,7 +33,11 @@ var bootstrap = function ($, learun) {
             if (!!pATId) {
                 $('#ATId').lrselectSet(pATId);
             }
-            $("#Semester").lrDataItemSelect({ code: 'Semester' });
+            $('#Semester').lrselect({
+                data: [{ text: "1", value: "1" }, { text: "2", value: "2" }],
+                text: "text",
+                value: "value"
+            })
             $('#DeptNos').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname', type: 'multiple' });
             $('#MajorNos').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname', type: 'multiple' });
             $('#LessonNos').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', type: 'multiple' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_QuestionItems/Form.cshtml

@@ -8,9 +8,9 @@
         <input id="ITitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="QID" type="hidden"/>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ask_QuestionItems" >
-        <div class="lr-form-item-title">是否附加文本</div>
-        <div id="QShowText"   isvalid="yes" checkexpession="NotNull"></div>
+    <div class="col-xs-6 lr-form-item" data-table="Ask_QuestionItems">
+        <div class="lr-form-item-title">是否附加文本<font face="宋体">*</font></div>
+        <div id="QShowText" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="Ask_QuestionItems" >
         <div class="lr-form-item-title">得分<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/AssStorageRoomController.cs

@@ -0,0 +1,142 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.AssetManagementSystem;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-11 14:32
+    /// 描 述：库房的房间号
+    /// </summary>
+    public class AssStorageRoomController : MvcControllerBase
+    {
+        private AssStorageRoomIBLL assStorageRoomIBLL = new AssStorageRoomBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = assStorageRoomIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Ass_Storage_RoomData = assStorageRoomIBLL.GetAss_Storage_RoomEntity( keyValue );
+            var jsonData = new {
+                Ass_Storage_Room = Ass_Storage_RoomData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary> 
+        /// 获取左侧树形数据 
+        /// <summary> 
+        /// <returns></returns> 
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTree()
+        {
+            var data = assStorageRoomIBLL.GetTree();
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 获取房间
+        /// </summary>
+        /// <param name="storageId">库房Id</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetListForStorageId(string storageId)
+        {
+            var data = assStorageRoomIBLL.GetListForStorageId(storageId);
+            return JsonResult(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            assStorageRoomIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            Ass_Storage_RoomEntity entity = strEntity.ToObject<Ass_Storage_RoomEntity>();
+            assStorageRoomIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AcceptanceController.cs

@@ -5,6 +5,7 @@ using System.Web.Mvc;
 using Learun.Application.TwoDevelopment.LR_CodeDemo;
 using System.Collections.Generic;
 using Learun.Application.Base.SystemModule;
+using System;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -18,6 +19,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     public class Ass_AcceptanceController : MvcControllerBase
     {
         private Ass_AcceptanceIBLL ass_AcceptanceIBLL = new Ass_AcceptanceBLL();
+        private Ass_AcceptanceMainIBLL ass_AcceptanceMainIBLL = new Ass_AcceptanceMainBLL();
         private CodeRuleIBLL codeRuleIBLL = new CodeRuleBLL();
 
         #region 视图功能
@@ -29,7 +31,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -38,7 +40,18 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            ViewBag.Code = "RKSQ_" + CommonHelper.CreateNo();
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormItem()
+        {
+            ViewBag.AAICode = CommonHelper.CreateNo();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -47,8 +60,28 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult ViewForm()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Print()
+        {
+            ViewBag.Date = DateTime.Now.ToString("yyyy年MM月dd日");
+            return View();
         }
+
         #endregion
 
         #region 获取数据
@@ -64,7 +97,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = ass_AcceptanceIBLL.GetPageList(paginationobj, queryJson);
+            var data = ass_AcceptanceMainIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -83,9 +116,12 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_AcceptanceData = ass_AcceptanceIBLL.GetAss_AcceptanceEntity( keyValue );
-            var jsonData = new {
-                Ass_Acceptance = Ass_AcceptanceData,
+            var Ass_AcceptanceMainData = ass_AcceptanceMainIBLL.GetAss_AcceptanceMainEntity(keyValue);
+            var Ass_AcceptanceData = ass_AcceptanceIBLL.GetAss_AcceptanceListByMainId(Ass_AcceptanceMainData.Id);
+            var jsonData = new
+            {
+                Ass_AcceptanceMain = Ass_AcceptanceMainData,
+                Ass_Acceptance = Ass_AcceptanceData
             };
             return Success(jsonData);
         }
@@ -98,9 +134,12 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormDataByProcessId(string processId)
         {
-            var Ass_AcceptanceData = ass_AcceptanceIBLL.GetEntityByProcessId( processId );
-            var jsonData = new {
-                Ass_Acceptance = Ass_AcceptanceData,
+            var Ass_AcceptanceMainData = ass_AcceptanceMainIBLL.GetEntityByProcessId(processId);
+            var Ass_AcceptanceData = ass_AcceptanceIBLL.GetAss_AcceptanceListByMainId(Ass_AcceptanceMainData.Id);
+            var jsonData = new
+            {
+                Ass_AcceptanceMain = Ass_AcceptanceMainData,
+                Ass_Acceptance = Ass_AcceptanceData
             };
             return Success(jsonData);
         }
@@ -132,27 +171,50 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            ass_AcceptanceIBLL.DeleteEntity(keyValue);
+            ass_AcceptanceMainIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
+
         /// <summary>
         /// 保存实体数据（新增、修改）
-        /// </summary>
         /// <param name="keyValue">主键</param>
-        /// <param name="strEntity">实体</param>
+        /// <summary>
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, string strEntity)
+        public ActionResult SaveForm(string keyValue, string strEntity, string strass_Ass_AcceptanceList)
         {
-            Ass_AcceptanceEntity entity = strEntity.ToObject<Ass_AcceptanceEntity>();
-            ass_AcceptanceIBLL.SaveEntity(keyValue,entity);
+            Ass_AcceptanceMainEntity entity = strEntity.ToObject<Ass_AcceptanceMainEntity>();
             if (string.IsNullOrEmpty(keyValue))
             {
+                entity.Status = 0;
             }
+
+            List<Ass_AcceptanceEntity> ass_AcceptanceList = strass_Ass_AcceptanceList.ToObject<List<Ass_AcceptanceEntity>>();
+            ass_AcceptanceMainIBLL.SaveEntity(keyValue, entity, ass_AcceptanceList);
             return Success("保存成功！");
         }
+
+
+        ///// <summary>
+        ///// 保存实体数据（新增、修改）
+        ///// </summary>
+        ///// <param name="keyValue">主键</param>
+        ///// <param name="strEntity">实体</param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[ValidateAntiForgeryToken]
+        //[AjaxOnly]
+        //public ActionResult SaveForm(string keyValue, string strEntity)
+        //{
+        //    Ass_AcceptanceEntity entity = strEntity.ToObject<Ass_AcceptanceEntity>();
+        //    ass_AcceptanceIBLL.SaveEntity(keyValue, entity);
+        //    if (string.IsNullOrEmpty(keyValue))
+        //    {
+        //    }
+        //    return Success("保存成功！");
+        //}
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoApplyController.cs

@@ -53,6 +53,12 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+        [HttpGet]
+        public ActionResult FormViewJYHC()
+        {
+            return View();
+        }
+        
         /// <summary>
         /// 表单页
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs

@@ -27,7 +27,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -36,8 +36,30 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormJYHC()
+        {
+            ViewBag.AAICode = CommonHelper.CreateNo();
+            return View();
         }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormJY()
+        {
+            ViewBag.AAICode = CommonHelper.CreateNo();
+            return View();
+        }
+        
         /// <summary>
         /// 采购表单页
         /// <summary>
@@ -45,7 +67,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult FormPurchase()
         {
-            ViewBag.AssCode= DateTime.Now.ToString("yyyyMMddHHmmssffff");
+            ViewBag.AssCode = DateTime.Now.ToString("yyyyMMddHHmmssffff");
             return View();
         }
         #endregion
@@ -80,8 +102,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_AssetsInfoItemApplyData = ass_AssetsInfoItemApplyIBLL.GetAss_AssetsInfoItemApplyEntity( keyValue );
-            var jsonData = new {
+            var Ass_AssetsInfoItemApplyData = ass_AssetsInfoItemApplyIBLL.GetAss_AssetsInfoItemApplyEntity(keyValue);
+            var jsonData = new
+            {
                 Ass_AssetsInfoItemApply = Ass_AssetsInfoItemApplyData,
             };
             return Success(jsonData);
@@ -113,7 +136,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Ass_AssetsInfoItemApplyEntity entity = strEntity.ToObject<Ass_AssetsInfoItemApplyEntity>();
-            ass_AssetsInfoItemApplyIBLL.SaveEntity(keyValue,entity);
+            ass_AssetsInfoItemApplyIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs

@@ -1,8 +1,12 @@
-using Learun.Util;
+using System;
+using Learun.Util;
 using System.Data;
 using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.Organization;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -16,6 +20,11 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     public class Ass_AssetsInfoItemController : MvcControllerBase
     {
         private Ass_AssetsInfoItemIBLL ass_AssetsInfoItemIBLL = new Ass_AssetsInfoItemBLL();
+        private DataItemIBLL dataItemIBLL = new DataItemBLL();
+        private DataSourceIBLL dataSourceIBLL = new DataSourceBLL();
+        private DepartmentIBLL departmentIBLL = new DepartmentBLL();
+        private UserIBLL userIBLL = new UserBLL();
+        private Ass_AssetsTypeIBLL ass_AssetsTypeIBLL = new Ass_AssetsTypeBLL();
 
         #region  视图功能
 
@@ -92,6 +101,118 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 导出
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpPost, ValidateInput(false)]
+        public ActionResult ExportList(string queryJson)
+        {
+            var exportTable = ass_AssetsInfoItemIBLL.GetExportList(queryJson);
+            //exportTable.Columns.Add("REnabledName", typeof(string));
+            //exportTable.Columns.Add("AIASSStateName", typeof(string));
+
+            var dataItem_REnabled = dataItemIBLL.GetDetailList("RoomState");
+            var dataItem_sldw = dataItemIBLL.GetDetailList("sldw");
+            var dataItem_AssState = dataItemIBLL.GetDetailList("AssState");
+            var departmentList = departmentIBLL.GetAllList();
+            var userList = userIBLL.GetAllList();
+            var ass_AssetsTypeList = ass_AssetsTypeIBLL.GetAllList();
+            var dataSourceEntity = dataSourceIBLL.GetEntityByCode("BaseUser");
+            for (int i = 0; i < exportTable.Rows.Count; i++)
+            {
+                var REnabled = exportTable.Rows[i]["REnabled"];
+                if (REnabled != null && !string.IsNullOrEmpty(REnabled.ToString()))
+                {
+                    exportTable.Rows[i]["renabledname"] = dataItem_REnabled.Where(x => x.F_ItemValue == REnabled.ToString()).FirstOrDefault()?.F_ItemName;
+                }
+
+                var AIUnits = exportTable.Rows[i]["AIUnits"];
+                if (AIUnits != null && !string.IsNullOrEmpty(AIUnits.ToString()))
+                {
+                    exportTable.Rows[i]["AIUnits"] = dataItem_sldw.FirstOrDefault(x => x.F_ItemValue == AIUnits.ToString())?.F_ItemName;
+                }
+
+
+                var AIASSState = exportTable.Rows[i]["AIASSState"];
+                if (AIASSState != null && !string.IsNullOrEmpty(AIASSState.ToString()))
+                {
+                    exportTable.Rows[i]["AIASSStateName"] = dataItem_AssState.FirstOrDefault(x => x.F_ItemValue == AIASSState.ToString())?.F_ItemName;
+                }
+
+                var AIDepartment = exportTable.Rows[i]["AIDepartment"];
+                if (AIDepartment != null && !string.IsNullOrEmpty(AIDepartment.ToString()))
+                {
+                    exportTable.Rows[i]["AIDepartment"] =
+                        departmentList.FirstOrDefault(x => x.F_DepartmentId == AIDepartment.ToString())?.F_FullName;
+                }
+
+                var AIUsePeople = exportTable.Rows[i]["AIUsePeople"];
+                if (AIUsePeople != null && !string.IsNullOrEmpty(AIUsePeople.ToString()))
+                {
+                    exportTable.Rows[i]["AIUsePeople"] = userList.Where(x=>x.F_UserId== AIUsePeople.ToString()).FirstOrDefault()?.F_RealName;
+                }
+                var AIASSClass = exportTable.Rows[i]["AIASSClass"];
+                if (AIASSClass != null && !string.IsNullOrEmpty(AIASSClass.ToString()))
+                {
+                    exportTable.Rows[i]["AIASSClass"] = ass_AssetsTypeList.Where(x => x.ATId == AIASSClass.ToString()).FirstOrDefault()?.AName;
+                }
+                
+            }
+            departmentList = null;
+
+            //设置导出格式
+            ExcelConfig excelconfig = new ExcelConfig();
+            //excelconfig.Title = " 资产数据";
+            excelconfig.TitleFont = "微软雅黑";
+            excelconfig.TitlePoint = 20;
+            excelconfig.FileName = "在册登记资产数据导出.xls";
+            excelconfig.IsAllSizeColumn = true;
+            excelconfig.ColumnEntity = new List<ColumnModel>();
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aicodenumjy", ExcelColumn = "资产编号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiistoragename", ExcelColumn = "楼宇名称" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "rcode", ExcelColumn = "房间号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "rfunction", ExcelColumn = "房间功能" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "rarea", ExcelColumn = "房间面积" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "renabledname", ExcelColumn = "房间状态" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiassname", ExcelColumn = "资产名称" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiassclass", ExcelColumn = "资产分类" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aispecification", ExcelColumn = "资产品牌" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aispecificationtype", ExcelColumn = "规格型号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiunits", ExcelColumn = "计量单位" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiassstatename", ExcelColumn = "资产状态" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aidepartment", ExcelColumn = "管理部门" });
+
+
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiusepeople", ExcelColumn = "使用人" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiplace", ExcelColumn = "存放地点" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiassvalue", ExcelColumn = "资产原价值" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiaddtime", ExcelColumn = "入账日期" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "airemark", ExcelColumn = "备注" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationmethod", ExcelColumn = "折旧方法" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationstatus", ExcelColumn = "折旧状态" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "usefullife", ExcelColumn = "折旧年限" });
+
+
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "monthlydepreciation", ExcelColumn = "月折旧额" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "monthsofdepreciation", ExcelColumn = "已提折旧月数" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "monthlydepreciationrate", ExcelColumn = "月折旧率" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "accumulateddepreciation", ExcelColumn = "累计折旧" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "networth", ExcelColumn = "净值" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "vehiclelicenseuser", ExcelColumn = "车辆行驶证所有人" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aivehiclenumber", ExcelColumn = "车辆识别号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiplatenumber", ExcelColumn = "车牌号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aibuiltarea", ExcelColumn = "面积" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiownership", ExcelColumn = "权属证号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "landusetype", ExcelColumn = "土地使用权类型" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "landuseuser", ExcelColumn = "土地使用权人/房屋所有权人" });
+            //调用导出方法
+            ExcelHelper.ExcelDownload(exportTable, excelconfig);
+            return Success("导出成功");
+        }
+
         /// <summary> 
         /// 获取左侧树形数据 
         /// <summary> 
@@ -134,12 +255,24 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_AssetsInfoItemData = ass_AssetsInfoItemIBLL.GetAss_AssetsInfoItemEntity(keyValue);
-            var jsonData = new
+            if (!keyValue.Contains(","))
             {
-                Ass_AssetsInfoItem = Ass_AssetsInfoItemData,
-            };
-            return Success(jsonData);
+                var Ass_AssetsInfoItemData = ass_AssetsInfoItemIBLL.GetAss_AssetsInfoItemEntity(keyValue);
+                var jsonData = new
+                {
+                    Ass_AssetsInfoItem = Ass_AssetsInfoItemData,
+                };
+                return Success(jsonData);
+            }
+            else
+            {
+                var Ass_AssetsInfoItemData = ass_AssetsInfoItemIBLL.GetDatas(keyValue);
+                var jsonData = new
+                {
+                    Ass_AssetsInfoItem = Ass_AssetsInfoItemData,
+                };
+                return Success(jsonData);
+            }
         }
 
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsOutApplyController.cs

@@ -4,6 +4,8 @@ using Learun.Application.TwoDevelopment.AssetManagementSystem;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
+using Learun.Application.WorkFlow;
 
 namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
 {
@@ -17,6 +19,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
     public class Ass_AssetsOutApplyController : MvcControllerBase
     {
         private Ass_AssetsOutApplyIBLL ass_AssetsOutApplyIBLL = new Ass_AssetsOutApplyBLL();
+        private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL();
 
         #region  视图功能
 
@@ -27,7 +30,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单查看页
@@ -38,6 +41,48 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 资产调拨多选页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AssetsIndex()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 资产调拨多选页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AssetsForm()
+        {
+            ViewBag.AOCode = "CKSQ_" + CommonHelper.CreateNo();
+            return View();
+        }
+        /// <summary>
+        /// 资产调拨多选页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AssetsFormView()
+        {
+            ViewBag.AOCode = "CKSQ_" + CommonHelper.CreateNo();
+            return View();
+        }
+
+        /// <summary>
+        /// 资产调拨多选页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexTwo()
+        {
+            return View();
+        }
+
         /// <summary>
         /// 表单页
         /// <summary>
@@ -48,6 +93,17 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
             ViewBag.AOCode = "CKSQ_" + CommonHelper.CreateNo();
             return View();
         }
+
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Print()
+        {
+            ViewBag.Date = DateTime.Now.ToString("yyyy年MM月dd日");
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -80,9 +136,14 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity( keyValue );
-            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList( Ass_AssetsOutApplyData.AOId );
-            var jsonData = new {
+            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutApplyEntity(keyValue);
+            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(Ass_AssetsOutApplyData.AOId);
+            Ass_AssetsOutApplyData.AOINewDepartment = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewDepartment;
+            Ass_AssetsOutApplyData.AOINewUsePeople = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewUsePeople;
+            Ass_AssetsOutApplyData.AOINewStorageId = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewStorageId;
+            Ass_AssetsOutApplyData.AOINewRoomId = Ass_AssetsOutItemApplyData.FirstOrDefault().AOINewRoomId;
+            var jsonData = new
+            {
                 Ass_AssetsOutApply = Ass_AssetsOutApplyData,
                 Ass_AssetsOutItemApply = Ass_AssetsOutItemApplyData,
             };
@@ -96,14 +157,27 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         [AjaxOnly]
         public ActionResult GetFormDataByProcessId(string processId)
         {
-            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetEntityByProcessId( processId );
-            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList( Ass_AssetsOutApplyData.AOId );
-            var jsonData = new {
+            var Ass_AssetsOutApplyData = ass_AssetsOutApplyIBLL.GetEntityByProcessId(processId);
+            var Ass_AssetsOutItemApplyData = ass_AssetsOutApplyIBLL.GetAss_AssetsOutItemApplyList(Ass_AssetsOutApplyData.AOId);
+            var jsonData = new
+            {
                 Ass_AssetsOutApply = Ass_AssetsOutApplyData,
                 Ass_AssetsOutItemApply = Ass_AssetsOutItemApplyData,
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="processId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetNWFTaskLogData(string processId)
+        {
+            var TaskLogList = (List<NWFTaskLogEntity>)nWFTaskIBLL.GetLogList(processId);
+            return Success(TaskLogList);
+        }
         #endregion
 
         #region  提交数据
@@ -124,18 +198,35 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>
         /// <summary>
+        /// ispl:是否批量调拨
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, string strEntity, string strass_AssetsOutItemApplyList)
+        public ActionResult SaveForm(string keyValue, string strEntity, string strass_AssetsOutItemApplyList, bool ispl = false)
         {
             Ass_AssetsOutApplyEntity entity = strEntity.ToObject<Ass_AssetsOutApplyEntity>();
-            entity.AOStatus = 0;
-            entity.AOOutStatus = 0;
-            entity.AOCreateTime = DateTime.Now;
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.AOStatus = 0;
+                entity.AOOutStatus = 0;
+                if (entity.AOCreateTime == null)
+                {
+                    entity.AOCreateTime = DateTime.Now;
+                }
+            }
             List<Ass_AssetsOutItemApplyEntity> ass_AssetsOutItemApplyList = strass_AssetsOutItemApplyList.ToObject<List<Ass_AssetsOutItemApplyEntity>>();
-            ass_AssetsOutApplyIBLL.SaveEntity(keyValue,entity,ass_AssetsOutItemApplyList);
+            if (ispl)
+            {
+                foreach (var item in ass_AssetsOutItemApplyList)
+                {
+                    item.AOINewUsePeople = entity.AOINewUsePeople;
+                    item.AOINewRoomId = entity.AOINewRoomId;
+                    item.AOINewDepartment = entity.AOINewDepartment;
+                    item.AOINewStorageId = entity.AOINewStorageId;
+                }
+            }
+            ass_AssetsOutApplyIBLL.SaveEntity(keyValue, entity, ass_AssetsOutItemApplyList);
             return Success("保存成功！");
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.cshtml

@@ -21,7 +21,7 @@
 
         <div id="detailaddbutton" style="display:none;"></div>
         <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
-        <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+        @*<input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />*@
         <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
     </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js

@@ -29,114 +29,28 @@ var bootstrap = function ($, learun) {
             $('.lr-form-wrap').lrscroll();
 
 
-
             $("#detailadd").on('click', function () {
-                $('#detailaddbutton').trigger('click');
-            });
-            $("#detailaddbutton").lrlayerselect({
-                treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree',
-                treeParentId: 'atptid',
-                treeValueId: 'atid',
-                treeTextId: 'aname',
-                dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetList',
-                dataTreeId: 'ATId',
-                dataValueId: 'aiid',
-                dataTextId: 'aname',
-
-                grid: [
-                    { label: '资产编号', name: 'aicodenumjy', width: 150, align: 'left' },
-                    { label: '资产名称', name: 'aname', width: 150, align: 'left' },
-                    { label: "英文名称", name: "aename", width: 100, align: "left" },
-                    {
-                        label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
-                                key: value,
-                                keyId: 'sid',
-                                callback: function (_data) {
-                                    callback(_data['sname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: '所在库位', name: 'aiistorageposition', width: 150, align: 'left' },
-                    {
-                        label: '是否在库', name: 'aiisinstorage', width: 150, align: 'left', formatter: function (val, row) {
-                            if (val) {
-                                return '在库';
-                            } else {
-                                return '否';
-                            }
-                        }
-                    },
-                    { label: "资产型号", name: "amodel", width: 150, align: "left" },
-                    { label: "生产厂家", name: "amanufacturer", width: 150, align: "left" },
-                    {
-                        label: "供应商", name: "asupplierid", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
-                                key: value,
-                                keyId: 'sid',
-                                callback: function (_data) {
-                                    callback(_data['sname']);
-                                }
-                            });
-                        }
+                selectedRow = null;
+                learun.layerFormForPercent({
+                    id: 'formitem',
+                    title: '新增明细',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/IndexTwo',
+                    width: "90%",
+                    height: "90%",
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
                     }
-                ],
-                select: function (values, texts) {
-                    if (values && values.length > 0) {
-                        //绑定
-                        $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetDatas?keyValue=' + values, function (data) {
-                            if (data) {
-
-                                $.each(data, function (i, item) {
-
-                                    var ifnewrow = true;
-                                    $.each(tempdatra, function (key, val) {
-                                        if (tempdatra[key].AAIAId === item.AAIAId) {
-                                            ifnewrow = false;
-                                        }
-                                    });
-                                    if (ifnewrow) {
-                                        tempdatra.push(item);
-                                    }
-                                })
-                                $('#Ass_ScrapItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
-                            }
-
-                        });
-
-
-                    }
-                },
-                isMultiple: true
-            });
-            $("#detailedit").on('click', function () {
-                Ass_ScrapItem
-                var keyValue = $('#Ass_ScrapItem').jfGridValue('AAIId');
-                selectedRow = $('#Ass_ScrapItem').jfGridGet('rowdata');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'formitem',
-                        title: '编辑明细',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_ScrapItem/Form?keyValue=' + keyValue,
-                        width: 860,
-                        height: 600,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
+                });
             });
+            
             $("#detaildel").on('click', function () {
                 var keyValue = $('#Ass_ScrapItem').jfGridValue('AAIId');
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res, index) {
                         if (res) {
                             $.each(tempdatra, function (key, val) {
-                                if (tempdatra[key].AAIId === keyValue) {
-                                    pricecount -= tempdatra[key].AAIPrice * tempdatra[key].AAIStock;
+                                if (tempdatra[key] && tempdatra[key].AAIId == keyValue) {
+                                    //pricecount -= tempdatra[key].AAIPrice * tempdatra[key].AAIStock;
                                     tempdatra.splice(key, 1);
                                 }
                             });
@@ -174,7 +88,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '所在库房', name: 'AAIStorage', width: 150, align: 'left',
+                        label: '楼宇名称', name: 'AAIStorage', width: 150, align: 'left',
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData',
                                 {
@@ -188,8 +102,21 @@ var bootstrap = function ($, learun) {
 
                         }
                     },
+                    //{
+                    //    label: '所在库位', name: 'AAILocation', width: 150, align: 'left'
+                    //},
                     {
-                        label: '所在库位', name: 'AAILocation', width: 150, align: 'left'
+                        label: "房间号", name: "AAILocation", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
                     },
                     {
                         label: '是否在库', name: 'AAIIsInStorage', width: 150, align: 'left', formatter: function (val) {
@@ -228,19 +155,54 @@ var bootstrap = function ($, learun) {
 
     refreshGirdData = function (temprow) {
         var ifnewrow = true;
-        $.each(tempdatra, function (key, val) {
-            if (tempdatra[key].AAIId === temprow.AAIId) {
-                tempdatra[key] = temprow;
-                ifnewrow = false;
-            }
-        });
-        if (ifnewrow) {
-            tempdatra.push(temprow);
-        }
+        var list = [];
+        $.each(temprow,
+            function (i, item) {
+                var entity = {
+                    //AAICode: item.AICode,
+                    AAICode: item.AICodeNumJY,
+                    AAIName: item.AIASSName,
+                    AAITId: item.AIASSClass,
+                    AAIPrice: item.AIAssValue,
+                    AAIUnit: item.AIUnits,
+                    AAIEName: '',
+                    AAIModel: item.AISpecificationtype,
+                    AAIManufacturer: item.AIManufacturer,
+                    AAIStorage: item.AIIStorageId,
+                    AAILocation: item.AIIStoragePosition,
+                    AAIId: learun.newGuid()
+                }
+                list.push(entity);
+
+            });
+
+        $.each(list,
+            function (j, item2) {
+                $.each(tempdatra,
+                    function (key, val) {
+                        if (tempdatra[key].AAICode === item2.AAICode) {
+                            tempdatra[key] = item2;
+                            ifnewrow = false;
+                        }
+                    });
+                if (ifnewrow) {
+                    tempdatra.push(item2);
+                }
+            });
+        //var ifnewrow = true;
+        //$.each(tempdatra, function (key, val) {
+        //    if (tempdatra[key].AAIId === temprow.AAIId) {
+        //        tempdatra[key] = temprow;
+        //        ifnewrow = false;
+        //    }
+        //});
+        //if (ifnewrow) {
+        //    tempdatra.push(temprow);
+        //}
         $('#Ass_ScrapItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
     };
     function sortNumber(a, b) {
-        return a.AAIOrder - b.AAIOrder;
+        return 1; //a.AAIOrder - b.AAIOrder;
     }
     // 设置表单数据
     setFormData = function (processId) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/FormView.js

@@ -105,7 +105,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '所在库房', name: 'AAIStorage', width: 150, align: 'left',
+                        label: '楼宇名称', name: 'AAIStorage', width: 150, align: 'left',
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData',
                                 {
@@ -118,8 +118,21 @@ var bootstrap = function ($, learun) {
                                 });
                         }
                     },
+                    //{
+                    //    label: '所在库位', name: 'AAILocation', width: 150, align: 'left'
+                    //},
                     {
-                        label: '所在库位', name: 'AAILocation', width: 150, align: 'left'
+                        label: "房间号", name: "AAILocation", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
                     },
                     {
                         label: '是否在库', name: 'AAIIsInStorage', width: 150, align: 'left', formatter: function (val) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.cshtml

@@ -10,13 +10,17 @@
                     <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>
+                                    <input id="SPNo" type="text" class="form-control" />
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报废方式</div>
                                     <div id="SPType"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">说明</div>
-                                    <input id="SPRemark" type="text" class="form-control" />
+                                    <input id="SPRemark" type="text" class="form-control"/>
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js

@@ -5,6 +5,7 @@
  * 描  述：资产报废
  */
 var refreshGirdData;
+var refreshGirdData1;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
@@ -29,7 +30,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/AssScrap/Form',
                     width: 1000,
-                    height: 600,
+                    height: 700,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -88,7 +89,7 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/AssScrap/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                refreshGirdData1();
                             });
                         }
                     });
@@ -184,7 +185,7 @@ var bootstrap = function ($, learun) {
         }
     };
     refreshGirdData = function (res, postData) {
-        if (res.code == 200) {
+        if (res && res.code == 200) {
             // 发起流程
             var postData = {
                 schemeCode: 'Ass_Scrap',// 填写流程对应模板编号 
@@ -198,5 +199,8 @@ var bootstrap = function ($, learun) {
             page.search();
         }
     };
+    refreshGirdData1 = function () {
+        page.search();
+    };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Form.cshtml

@@ -0,0 +1,32 @@
+@{
+    ViewBag.Title = "库房的房间号";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_Storage_Room">
+        <div class="lr-form-item-title">所在楼宇<font face="宋体">*</font></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
+        <div class="lr-form-item-title">房间名称<font face="宋体">*</font></div>
+        <input id="RName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <input id="RCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_Storage_Room">
+        <div class="lr-form-item-title">房间功能</div>
+        <input id="RFunction" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_Storage_Room">
+        <div class="lr-form-item-title">房间面积</div>
+        <input id="RArea" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
+        <div class="lr-form-item-title">房间状态<font face="宋体">*</font></div>
+        <div id="REnabled"></div>
+        @*<div id="REnabled" isvalid="yes" checkexpession="NotNull"></div>*@
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/AssStorageRoom/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Form.js

@@ -0,0 +1,53 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-11 14:32
+ * 描  述：库房的房间号
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //$('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#REnabled').lrDataItemSelect({ code: 'RoomState' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData',value: 'sid',text: 'sname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.cshtml

@@ -0,0 +1,67 @@
+@{
+    ViewBag.Title = "房间号";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlg ">楼宇名称</div>
+            <div id="dataTree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap  ">
+            <div class="lr-layout-title">
+                <span id="titleinfo" class="lrlg">列表信息</span>
+            </div>
+            <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-12 lr-form-item">
+                                    <div class="lr-form-item-title">名称</div>
+                                    <input id="RName" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+            <div class="lr-form-item-title">楼宇名称</div>
+            <div id="StorageId"></div>
+        </div>*@
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间号</div>
+                                    <input id="RCode" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">房间功能</div>
+                    <input id="RFunction" type="text" class="form-control" />
+                </div>
+                <div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">房间面积</div>
+                    <input id="RArea" type="text" class="form-control" />
+                </div>
+                <div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">状态</div>
+                    <div id="REnabled"></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>
+                </div>
+            </div>
+        </div>
+        <div class="lr-layout-body" id="gridtable"></div>
+    </div>
+</div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js

@@ -0,0 +1,149 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-11 14:32
+ * 描  述：库房的房间号
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            //$('#StorageId').lrselect({
+            //    type: 'tree',
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+            //    param: {},
+            //    select: function (val) {
+            //        console.log(val);
+            //        var storageId = "";
+            //        if (val) {
+            //            storageId = val.value;
+            //        }
+            //        $('#RCode').lrselectRefresh({
+            //            url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+            //            text: "RCode",
+            //            value: "RId"
+            //        });
+            //    }
+            //});
+            ////房间
+            //$('#RCode').lrselect({ value: 'RId', text: 'RCode' });
+            $('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
+            // 初始化左侧树形数据
+            $('#dataTree').lrtree({
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                nodeClick: function (item) {
+                    page.search({ StorageId: item.value });
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('RId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetPageList',
+                headData: [
+                    //{ label: "名称", name: "RName", width: 100, align: "left"},
+                    { label: "房间号", name: "RCode", width: 100, align: "left"},
+                    { label: "房间功能", name: "RFunction", width: 100, align: "left"},
+                    { label: "房间面积", name: "RArea", width: 100, align: "left" },
+                    {
+                        label: "房间状态", name: "REnabled", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RoomState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "楼宇名称", name: "StorageId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                 key: value,
+                                 keyId: 'sid',
+                                 callback: function (_data) {
+                                     callback(_data['sname']);
+                                 }
+                             });
+                        }
+                    },
+                    
+                ],
+                mainId:'RId',
+                isPage: true,
+                sidx: 'RCode',
+                sord: 'ASC'
+            });
+            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/AssetManagementSystem/Views/Ass_Acceptance/Form.cshtml

@@ -1,55 +1,41 @@
 @{
-    ViewBag.Title = "资产验收";
+    ViewBag.Title = "采购申请";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-<div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">选择已登记资产</div>
-        <div id="AAOldCode"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">设备名称</div>
-        <input id="Name" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">品牌</div>
-        <input id="Manufacturer" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">规格型号</div>
-        <input id="Model" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">单位</div>
-        <input id="Unit" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">数量</div>
-        <input id="Stock" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">单价</div>
-        <input id="Price" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
+<script>
+    var NewCode = "@ViewBag.Code";
+</script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请单号</div>
+        <input id="Code" type="text" class="form-control" readonly="readonly" />
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请名称</div>
+        <input id="Name" type="text" class="form-control" />
+    </div>*@
+    
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AcceptanceMain">
         <div class="lr-form-item-title">总价</div>
-        <input id="TotalPrice" type="text" class="form-control"  />
+        <input id="TotalPrice" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">使用部门</div>
-        <div id="DepartmentId"  ></div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">使用人</div>
-        <div id="UserID"  ></div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请人</div>
+        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">放置地点</div>
-        <input id="Place" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">明细操作</div>
+        <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
+        <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+        <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
+        <input id="detailprint" type="button" class="btn btn-success" value="打印明细" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_Acceptance" >
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="Ass_Acceptance"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js

@@ -1,8 +1,8 @@
-/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
- * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
- * 日  期：2020-11-18 10:46
- * 描  述：资产验收
+ * 日  期：2019-03-25 12:00
+ * 描  述：入库申请
  */
 var acceptClick;
 var keyValue = request('keyValue');
@@ -14,6 +14,11 @@ var setFormData;
 var validForm;
 // 保存数据
 var save;
+var refreshGirdData;
+var selectedRow;
+var tempdatra = new Array();
+//总价计算
+var pricecount = 0;
 var bootstrap = function ($, learun) {
     "use strict";
     // 设置权限
@@ -38,143 +43,345 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
+            //$("#detailadd").on('click', function () {
+            //    selectedRow = null;
+            //    learun.layerForm({
+            //        id: 'formitem',
+            //        title: '新增明细',
+            //        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/FormItem',
+            //        width: 860,
+            //        height: 600,
+            //        callBack: function (id) {
+            //            return top[id].acceptClick(refreshGirdData);
+            //        }
+            //    });
+            //});
+            $("#detailedit").on('click', function () {
+                var keyValue = $('#Ass_Acceptance').jfGridValue('AAIId');
+                var AAICode = $('#Ass_Acceptance').jfGridValue('AAICode');
+                selectedRow = $('#Ass_Acceptance').jfGridGet('rowdata');
+
+                if (learun.checkrow(AAICode)) {
+                    learun.layerForm({
+                        id: 'formitem',
+                        title: '编辑明细',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/FormItem?keyValue=' + keyValue,
+                        width: 860,
+                        height: 500,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            $("#detailadd").on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'formitem',
+                    title: '新增明细',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/FormItem',
+                    width: 860,
+                    height: 500,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            $("#detaildel").on('click', function () {
+                var keyValue = $('#Ass_Acceptance').jfGridValue('AAICode');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res, index) {
+                        if (res) {
+                            $.each(tempdatra, function (key, val) {
+                                if (val && val.AAICode === keyValue) {
+                                    pricecount -= (val.AAIPrice * val.AAIStock);
+                                    tempdatra.splice(key, 1);
+                                }
+                            });
+                            $("#TotalPrice").val(pricecount);
+                            $('#Ass_Acceptance').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
+                            top.layer.close(index);
+                        }
+                    });
+                }
+            });
+
             page.bind();
             page.initData();
         },
         bind: function () {
-            $('#DepartmentId').lrselect({
-                type: 'tree',
-                allowSearch: true,
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
-                param: {},
-                select: function (val) {
-                    console.log(val.value);
-                    $('#UserID').lrselectRefresh({ url: '/LR_OrganizationModule/User/GetListByDepartmentId?departmentId=' + val.value });
-                }
-            });
-            $('#UserID').lrselect({ text: 'F_RealName', value: 'F_UserId' });
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
 
-
-            $("#AAOldCode").lrlayerselect({
-                treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree',
-                treeParentId: 'atptid',
-                treeValueId: 'atid',
-                treeTextId: 'aname',
-                dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetList',
-                dataTreeId: 'ATId',
-                dataValueId: 'AId',
-                dataTextId: 'AName',
-
-                grid: [
-                    { label: '资产编号', name: 'ACode', width: 200, align: 'left' },
-                    { label: '资产名称', name: 'AName', width: 200, align: 'left' },
-                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
-                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
-                    { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
+            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#Ass_Acceptance').jfGrid({
+                headData: [
+                    //{
+                    //    label: '资产编号', name: 'AAICode', width: 150, align: 'left'
+                    //},
+                    {
+                        label: '设备名称', name: 'AAIName', width: 150, align: 'left'
+                    },
                     {
-                        label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
+                    },
+                    {
+                        label: '单位', name: 'AAIUnit', width: 80, 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: 'AAIStock', width: 80, align: 'left'
+                    },
+                    {
+                        label: '单价（元）', name: 'AAIPrice', width: 100, align: 'left'
+                    },
+                    {
+                        label: '总价（元）', name: 'AAITId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            callback(row.AAIPrice * row.AAIStock);
+                        }
+                    }, {
+                        label: '使用部门', name: 'AAIUseDeptId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
-                                keyId: 'sid',
+                                keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data['sname']);
+                                    callback(_data['name']);
                                 }
                             });
                         }
-                    }
-                ],
-                select: function (values, texts) {
-                    if (values && values.length > 0) {
-                        //绑定
-                        $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) {
-                            data = data.Ass_AssetsInfo;
-                            $('#Name').val(data.AName);//设备名称
-                            $('#AAIUnit').lrselectSet(data.AUnit);//单位
-                            $('#Model').val(data.AModel);//规格型号
-                            $('#AAIManufacturer').val(data.AManufacturer);//品牌
-                            $('#Price').val(data.APrice)//单价
-                        });
-                    }
-                },
-                unknowselect: function () {
-                    $("#AAOldCode").find('span').text("");
-                    $('#Name').val("");//设备名称
-                    $('#Model').val("");//规格型号
-                    $('#AAIManufacturer').val("");//品牌
-                },
-                isMultiple: false
-            });
-
-            $('#Stock').bind('change', function () {
-                var stock = $(this).val();
-                var price = $('#Price').val();
-                $('#TotalPrice').val(stock * price);
+                    }, {
+                        label: '放置地点', name: 'AAIStorageId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                            var content = '';
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    if (_data['sname'] && _data['sname'] != 'undefined') {
+                                        content += _data['sname'];
+                                    }
+                                }
+                            });
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: row.AAIStoragePosition,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    if (_data['rcode'] && _data['rcode'] != 'undefined') {
+                                        content += _data['rcode'];
+                                    }
+                                }
+                            });
 
-            })
-            $('#Price').bind('change', function () {
-                var stock = $('#Stock').val();
-                var price = $(this).val();
-                $('#TotalPrice').val(stock * price);
+                            callback(content);
+                        }
+                    },
+                    {
+                        label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    }, {
+                        label: '备注', name: 'ARemark', width: 180, align: 'left'
+                    },
+                    //{
+                    //    label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
 
-            })
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
 
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                    //            key: value,
+                    //            keyId: 'sid',
+                    //            callback: function (_data) {
+                    //                callback(_data['sname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
+                ],
+                height: 400,
+                mainId: 'AAIId',
+                reloadSelected: false
+            });
 
+            //打印
+            $('#detailprint').on('click', function () {
+                var createTime = $('#CreateTime').val();
+                createTime = learun.formatDate(createTime, 'yyyy-MM-dd');
+                learun.layerForm({
+                    id: 'print',
+                    title: '北京金隅科技学校固定资产验收单',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print?createTime=' + createTime,
+                    width: 1100,
+                    height: 800,
+                    btn: null
+                });
+            });
         },
         initData: function () {
             if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormData?keyValue=' + keyValue, function (data) {
-                    for (var id in data) {
-                        if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id).jfGridSet('refreshdata', data[id]);
-                        }
-                        else {
-                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                $.lrSetForm(
+                    top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormData?keyValue=' + keyValue,
+                    function (data) {
+                        for (var id in data) {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                                tempdatra = data[id];
+                            } else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                                if (data[id].TotalPrice) {
+                                    pricecount = data[id].TotalPrice;
+                                }
+                            }
                         }
-                    }
-                });
+                    });
+            } else {
+                $("#Code").val(NewCode);
             }
         }
     };
-    // 设置表单数据
-    setFormData = function (processId, param, callback) {
-        if (!!processId) {
-            $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormDataByProcessId?processId=' + processId, function (data) {
-                for (var id in data) {
-                    if (!!data[id] && data[id].length > 0) {
-                        $('#' + id).jfGridSet('refreshdata', data[id]);
-                    }
-                    else {
-                        if (id == 'Ass_Acceptance' && data[id]) {
-                            keyValue = data[id].ID;
-                        }
-                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
-                    }
-                }
-            });
+    refreshGirdData = function (temprow) {
+        var ifnewrow = true;
+        var list = [];
+        //总价计算
+        pricecount = 0;
+        //$.each(temprow,
+        //    function (i, item) {
+        //        var entity = {
+        //            //AAICode: item.AICode,
+        //            AAICode: item.AICodeNumJY,
+        //            AAIName: item.AIASSName,
+        //            AAITId: item.AIASSClass,
+        //            AAIPrice: item.AIAssValue,
+        //            AAIUnit: item.AIUnits,
+        //            AAIEName: '',
+        //            AAIModel: item.AISpecificationtype,
+        //            AAIManufacturer: item.AIManufacturer,
+        //            AAIId: learun.newGuid()
+        //        }
+        //        list.push(entity);
+
+        //    });
+        //$.each(list,
+        //    function (j, item2) {
+        //        $.each(tempdatra,
+        //            function (key, val) {
+
+        //                if (tempdatra[key].AAICode === item2.AAICode) {
+        //                    tempdatra[key] = item2;
+        //                    ifnewrow = false;
+        //                }
+        //            });
+        //        if (ifnewrow) {
+        //            tempdatra.push(item2);
+        //        }
+        //    });
+
+        //var ifnewrow = true;
+
+        $.each(tempdatra, function (key, val) {
+            if (tempdatra[key].AAICode === temprow.AAICode) {
+                tempdatra[key] = temprow;
+                ifnewrow = false;
+            }
+        });
+        if (ifnewrow) {
+            tempdatra.push(temprow);
+        }
+        for (var i = 0; i < tempdatra.length; i++) {
+            pricecount = parseFloat(pricecount) + parseFloat(tempdatra[i].AAIPrice * tempdatra[i].AAIStock);
         }
-        callback && callback();
-    }
+        $("#TotalPrice").val(pricecount);
+        $('#Ass_Acceptance').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
+    };
+    function sortNumber(a, b) {
+        return a.AAIOrder - b.AAIOrder;
+    };
     // 验证数据是否填写完整
     validForm = function () {
-        if (!$('body').lrValidform()) {
+        if (!$('.lr-form-wrap').lrValidform()) {
+            return false;
+        }
+        var datas = $('#Ass_Acceptance').jfGridGet('rowdatas');
+        if (datas == null || datas.length == 0) {
+            learun.alert.warning("申请未包含明细！请先新增明细！");
             return false;
         }
         return true;
     };
     // 保存数据
     save = function (processId, callBack, i) {
-        var formData = $('body').lrGetFormData();
+        var postData = {};
+        var formData = $('[data-table="Ass_AcceptanceMain"]').lrGetFormData();
         if (!!processId) {
             formData.ProcessId = processId;
         }
-        var postData = {
-            strEntity: JSON.stringify(formData)
-        };
+        postData.strEntity = JSON.stringify(formData);
+        postData.strass_Ass_AcceptanceList = JSON.stringify($('#Ass_Acceptance').jfGridGet('rowdatas'));
         $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
-                callBack(res, i);
+                callBack(res, formData, i);
             }
         });
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml

@@ -0,0 +1,83 @@
+@{
+    ViewBag.Title = "资产验收";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance" style="display: none;">
+        <div class="lr-form-item-title">资产编号</div>
+        <input id="AAICode" type="text" class="form-control" value="@ViewBag.AAICode" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
+        <input id="AAIName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">资产类别</div>
+        <div id="AAITId"></div>
+    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">资产来源</div>
+        <div id="AAISource"></div>
+    </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">单位</div>
+        <div id="AAIUnit"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">数量</div>
+        <input id="AAIStock" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">单价</div>
+        <input id="AAIPrice" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance" style="display: none;">
+        <div class="lr-form-item-title">生成资产明细</div>
+        <div id="AAIHasDetail"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
+        <div id="AAIStorageId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <div id="AAIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+        <div class="lr-form-item-title">使用部门<font face="宋体">*</font></div>
+        <div id="AAIUseDeptId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+        <div class="lr-form-item-title">使用人<font face="宋体">*</font></div>
+        <div id="AAIUseUserId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">资产品牌</div>
+        <input id="AAISpecification" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">规格型号</div>
+        <input id="AAIModel" type="text" class="form-control" />
+    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">英文名称</div>
+        <input id="AAIEName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">生产厂家</div>
+        <input id="AAIManufacturer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">用途</div>
+        <input id="AAIUse" type="text" class="form-control" />
+    </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">供应商</div>
+        <div id="AAISupplierId"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_Acceptance">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="ARemark" class="form-control" rows="3"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.js

@@ -0,0 +1,157 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-11-18 10:46
+ * 描  述：资产验收
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.iframe('layer_formAss_Acceptance', top.frames).selectedRow; //learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //资产类别
+            $('#AAITId').lrDataSourceSelect({ code: 'Ass_AssetsType', value: 'atid', text: 'aname' });
+            $('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
+            $('#AAISource').lrDataItemSelect({ code: 'zcly' });
+            $('#AAIHasDetail').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#AAIHasDetail').lrselectSet('true');
+            $('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
+
+            $('#AAIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AAIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId",
+                        allowSearch: true
+                    });
+                }
+            });
+            //库位
+            $('#AAIStoragePosition').lrselect({
+                value: 'RId', text: 'RCode', allowSearch: true
+            });
+            //$('#Stock').bind('change', function () {
+            //    var stock = $(this).val();
+            //    var price = $('#Price').val();
+            //    $('#TotalPrice').val(stock * price);
+
+            //})
+            //$('#Price').bind('change', function () {
+            //    var stock = $('#Stock').val();
+            //    var price = $(this).val();
+            //    $('#TotalPrice').val(stock * price);
+
+            //})
+            $('#AAIUseUserId').lrselect({
+                value: 'F_UserId',
+                text: 'F_RealName',
+                title: 'F_RealName',
+                // 展开最大高度
+                maxHeight: 110,
+                // 是否允许搜索
+                allowSearch: true,
+
+            });
+            $('#AAIUseDeptId').lrDepartmentSelect({
+                maxHeight: 150
+            }).on('change', function () {
+                var value = $(this).lrselectGet();
+                $('#AAIUseUserId').lrselectRefresh({
+                    url: top.$.rootUrl + '/LR_OrganizationModule/User/GetList',
+                    param: { departmentId: value }
+                });
+            });
+
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+            //if (!!keyValue) {
+            //    $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormData?keyValue=' + keyValue, function (data) {
+            //        for (var id in data) {
+            //            if (!!data[id].length && data[id].length > 0) {
+            //                $('#' + id).jfGridSet('refreshdata', data[id]);
+            //            }
+            //            else {
+            //                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+            //            }
+            //        }
+            //    });
+            //}
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        //if (!!processId) {
+        //    $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormDataByProcessId?processId=' + processId, function (data) {
+        //        for (var id in data) {
+        //            if (!!data[id] && data[id].length > 0) {
+        //                $('#' + id).jfGridSet('refreshdata', data[id]);
+        //            }
+        //            else {
+        //                if (id == 'Ass_Acceptance' && data[id]) {
+        //                    keyValue = data[id].ID;
+        //                }
+        //                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+        //            }
+        //        }
+        //    });
+        //}
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = $('body').lrGetFormData();
+        if (!!keyValue) {
+            if (!!selectedRow) {
+                postData.MainId = selectedRow.MainId;
+            }
+        } else {
+            postData.MainId = learun.newGuid();
+        }
+        if (postData.AAIId) {
+            postData.AAIId = learun.newGuid();
+        }
+        if (!!callBack) {
+            callBack(postData);
+            return true;
+        }
+    };
+
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.cshtml

@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "采购申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script>
+    var NewCode = "@ViewBag.Code";
+</script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请单号</div>
+        <input id="Code" type="text" class="form-control" readonly="readonly" />
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Ass_AcceptanceMain">
+            <div class="lr-form-item-title">申请名称</div>
+            <input id="Name" type="text" class="form-control" readonly/>
+        </div>*@
+
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">总价</div>
+        <input id="TotalPrice" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AcceptanceMain">
+        <div class="lr-form-item-title">申请人</div>
+        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">明细操作</div>
+        <input id="detailprint" type="button" class="btn btn-success" value="打印明细" />
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="Ass_Acceptance"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js

@@ -0,0 +1,374 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-03-25 12:00
+ * 描  述：入库申请
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var ProcessId = request('ProcessId');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var refreshGirdData;
+var selectedRow;
+var tempdatra = new Array();
+//总价计算
+var pricecount = 0;
+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();
+            $("#detailadd").on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'formitem',
+                    title: '新增明细',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/FormItem',
+                    width: 860,
+                    height: 600,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            $("#detailedit").on('click', function () {
+                var keyValue = $('#Ass_Acceptance').jfGridValue('Id');
+                selectedRow = $('#Ass_Acceptance').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formitem',
+                        title: '编辑明细',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/FormItem?keyValue=' + keyValue,
+                        width: 860,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            $("#detaildel").on('click', function () {
+                var keyValue = $('#Ass_Acceptance').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res, index) {
+                        if (res) {
+                            $.each(tempdatra, function (key, val) {
+                                if (tempdatra[key].MainId === keyValue) {
+                                    pricecount -= tempdatra[key].TotalPrice;
+                                    tempdatra.splice(key, 1);
+                                }
+                            });
+                            $("#Price").val(pricecount);
+                            $('#Ass_Acceptance').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
+                            top.layer.close(index);
+                        }
+                    });
+                }
+            });
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+
+            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+
+            $('#Ass_Acceptance').jfGrid({
+                headData: [
+                    //{
+                    //    label: '资产编号', name: 'AAICode', width: 150, align: 'left'
+                    //},
+                    {
+                        label: '设备名称', name: 'AAIName', width: 150, align: 'left'
+                    },
+                    //{
+                    //    label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                    //},
+                    {
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
+                    },
+                    {
+                        label: '单位', name: 'AAIUnit', width: 80, 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: 'AAIStock', width: 80, align: 'left'
+                    },
+                    {
+                        label: '单价（元）', name: 'AAIPrice', width: 100, align: 'left'
+                    },
+                    {
+                        label: '总价（元）', name: 'AAITId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            callback(row.AAIPrice * row.AAIStock);
+                        }
+                    }, {
+                        label: '使用部门', name: 'AAIUseDeptId', 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: 'AAIStorageId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                            var content = '';
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    if (_data['sname'] && _data['sname'] != 'undefined') {
+                                        content += _data['sname'];
+                                    }
+                                }
+                            });
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: row.AAIStoragePosition,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    if (_data['rcode'] && _data['rcode'] != 'undefined') {
+                                        content += _data['rcode'];
+                                    }
+                                }
+                            });
+
+                            callback(content);
+                        }
+                    },
+                    {
+                        label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    }, {
+                        label: '备注', name: 'ARemark', width: 180, align: 'left'
+                    },
+                    //{
+                    //    label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
+
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                    //            key: value,
+                    //            keyId: 'sid',
+                    //            callback: function (_data) {
+                    //                callback(_data['sname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
+                ],
+                height: 400,
+                mainId: 'AAIId',
+                reloadSelected: false
+            });
+
+
+            //打印
+            $('#detailprint').on('click', function () {
+                var createTime = $('#CreateTime').val();
+                createTime = learun.formatDate(createTime, 'yyyy-MM-dd');
+                learun.layerForm({
+                    id: 'print',
+                    title: '北京金隅科技学校固定资产验收单',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print?keyValue=' + keyValue + '&ProcessId=' + ProcessId + '&createTime=' + createTime,
+                    width: 1100,
+                    height: 800,
+                    btn: null
+                });
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(
+                    top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormData?keyValue=' + keyValue,
+                    function (data) {
+                        for (var id in data) {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                                tempdatra = data[id];
+
+                            } else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                                if (data[id].TotalPrice) {
+                                    pricecount = data[id].TotalPrice;
+                                }
+                            }
+
+                        }
+                    });
+            } else {
+                $("#Code").val(NewCode);
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(
+                top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormDataByProcessId?processId=' + processId,
+                function (data) {
+                    for (var id in data) {
+                        if (!!data[id] && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        } else {
+                            if (id == 'Ass_AcceptanceMain' && data[id]) {
+                                keyValue = data[id].Id;
+                                ProcessId = data[id].ProcessId;
+                            }
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+        }
+        callback && callback();
+    };
+    refreshGirdData = function (temprow) {
+        var ifnewrow = true;
+        $.each(tempdatra, function (key, val) {
+            if (tempdatra[key].MainId === temprow.Id) {
+                tempdatra[key] = temprow;
+                ifnewrow = false;
+            }
+        });
+        if (ifnewrow) {
+            tempdatra.push(temprow);
+        }
+        //总价计算
+        pricecount = 0;
+        for (var i = 0; i < tempdatra.length; i++) {
+            pricecount = parseFloat(pricecount) + parseFloat(tempdatra[i].TotalPrice);
+        }
+        $("#TotalPrice").val(pricecount);
+        $('#Ass_Acceptance').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
+    };
+    function sortNumber(a, b) {
+        return 1;//a.AAIOrder - b.AAIOrder;
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('.lr-form-wrap').lrValidform()) {
+            return false;
+        }
+        var datas = $('#Ass_Acceptance').jfGridGet('rowdatas');
+        if (datas == null || datas.length == 0) {
+            learun.alert.warning("申请未包含明细！请先新增明细！");
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var res = {
+            code: 200
+        };
+        if (!!callBack) {
+            callBack(res, i);
+        }
+        //var postData = {};
+        //var formData = $('[data-table="Ass_AcceptanceMain"]').lrGetFormData();
+        //if (!!processId) {
+        //    formData.ProcessId = processId;
+        //}
+
+        //postData.strEntity = JSON.stringify(formData);
+        //postData.strass_Ass_AcceptanceList = JSON.stringify($('#Ass_Acceptance').jfGridGet('rowdatas'));
+        //$.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        //    // 保存成功后才回调
+        //    if (!!callBack) {
+        //        callBack(res, i);
+        //    }
+        //});
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.cshtml

@@ -11,20 +11,12 @@
                         <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>
-                                    <input id="Name" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">使用部门</div>
-                                    <div id="DepartmentId"></div>
+                                    <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 id="User"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">放置地点</div>
-                                    <input id="Place" type="text" class="form-control" />
+                                    <div id="CreateUserId"></div>
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.js

@@ -5,6 +5,7 @@
  * 描  述：资产验收
  */
 var refreshGirdData;
+var refreshGirdData2;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
@@ -17,8 +18,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#DepartmentId').lrDepartmentSelect();
-            $('#User').lrDataItemSelect({ code: '' });
+            $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -26,18 +26,18 @@ var bootstrap = function ($, learun) {
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
-                    id: 'form',
+                    id: 'formAss_Acceptance',
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Form',
-                    width: 600,
-                    height: 400,
+                    width: 1000,
+                    height: 700,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
                         res = top[id].validForm();
                         // 保存数据
                         if (res) {
-                            res = top[id].save('', function() {
+                            res = top[id].save('', function () {
                                 page.search();
                             });
                         }
@@ -47,19 +47,19 @@ var bootstrap = function ($, learun) {
             });
             // 编辑
             $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
+                var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var SendFlag = $('#gridtable').jfGridValue('Status');
-                    if (SendFlag) {
+                    if (SendFlag != 0) {
                         learun.alert.warning("当前项目已提交不能编辑！");
                         return;
                     }
                     learun.layerForm({
-                        id: 'form',
+                        id: 'formAss_Acceptance',
                         title: '编辑',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 1000,
+                        height: 700,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -78,32 +78,33 @@ var bootstrap = function ($, learun) {
 
             // 查看
             $('#lr_view').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                var ProcessId = $('#gridtable').jfGridValue('ProcessId');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'form',
+                        id: 'formAss_Acceptance',
                         title: '查看',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/ViewForm?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
-                        btn:null
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/FormView?keyValue=' + keyValue + '&ProcessId=' + ProcessId,
+                        width: 1000,
+                        height: 700,
+                        btn: null
                     });
                 }
             });
 
             // 删除
             $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
+                var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var SendFlag = $('#gridtable').jfGridValue('Status');
-                    if (SendFlag) {
+                    if (SendFlag != 0) {
                         learun.alert.warning("当前项目已提交不能不能删除！");
                         return;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/DeleteForm', { keyValue: keyValue}, function () {
-                                refreshGirdData();
+                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData2();
                             });
                         }
                     });
@@ -116,10 +117,10 @@ var bootstrap = function ($, learun) {
 
             //  提交
             $('#lr_submit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
+                var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var SendFlag = $('#gridtable').jfGridValue('Status');
-                    if (SendFlag) {
+                    if (SendFlag != 0) {
                         learun.alert.warning("当前项目已提交，请耐心等待审批！");
                         return;
                     }
@@ -136,76 +137,119 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetPageList',
                 headData: [
-                    { label: "设备名称", name: "Name", width: 100, align: "left"},
-                    { label: "品牌", name: "Manufacturer", width: 100, align: "left"},
-                    { label: "规格型号", name: "Model", width: 100, align: "left"},
-                    { label: "单位", name: "Unit", width: 100, align: "left"},
-                    { label: "数量", name: "Stock", width: 100, align: "left"},
-                    { label: "单价", name: "Price", width: 100, align: "left"},
-                    { label: "总价", name: "TotalPrice", width: 100, align: "left"},
-                    { label: "使用部门", name: "DepartmentId", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('department', {
-                                 key: value,
-                                 callback: function (_data) {
-                                     callback(_data.name);
-                                 }
-                             });
-                        }},
-                    { label: "使用人", name: "UserID", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                            learun.clientdata.getAsyncReal('user', {
+                    { label: "申请单号", name: "Code", width: 200, align: "left" },
+                    //{ label: "申请名称", name: "Name", width: 200, align: "left" },
+                    { label: "总价", name: "TotalPrice", width: 100, align: "left" },
+                    { label: "申请时间", name: "CreateTime", width: 150, align: "left" },
+                    {
+                        label: "申请人", name: "CreateUserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['f_realname']);
                                 }
-                            }); 
-                        }},
-                    { label: "放置地点", name: "Place", width: 100, align: "left" },
+                            });
+                        }
+                    },
                     {
-                        label: "状态", name: "Status", width: 100, align: "left",
+                        label: "审批状态", name: "Status", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
-                            if (cellvalue === '1') {
+                            if (cellvalue === 1) {
                                 return '<span class=\"label label-warning\">审批中</span>';
-                            } else if (cellvalue === '2') {
-                                return '<span class=\"label label-success\">已审核</span>';
+                            } else if (cellvalue === 2) {
+                                return '<span class=\"label label-success\">审批通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
                         }
-                    },
-                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                    }
                 ],
-                mainId:'ID',
-                isPage: true
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime',
+                sord: 'DASC'
             });
+            //$('#gridtable').lrAuthorizeJfGrid({
+            //    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetPageList',
+            //    headData: [
+            //        { label: "设备名称", name: "Name", width: 100, align: "left" },
+            //        { label: "品牌", name: "Manufacturer", width: 100, align: "left" },
+            //        { label: "规格型号", name: "Model", width: 100, align: "left" },
+            //        { label: "单位", name: "Unit", width: 100, align: "left" },
+            //        { label: "数量", name: "Stock", width: 100, align: "left" },
+            //        { label: "单价", name: "Price", width: 100, align: "left" },
+            //        { label: "总价", name: "TotalPrice", width: 100, align: "left" },
+            //        {
+            //            label: "使用部门", name: "DepartmentId", width: 100, align: "left",
+            //            formatterAsync: function (callback, value, row, op, $cell) {
+            //                learun.clientdata.getAsync('department', {
+            //                    key: value,
+            //                    callback: function (_data) {
+            //                        callback(_data.name);
+            //                    }
+            //                });
+            //            }
+            //        },
+            //        {
+            //            label: "使用人", name: "UserID", width: 100, align: "left",
+            //            formatterAsync: function (callback, value, row, op, $cell) {
+            //                learun.clientdata.getAsyncReal('user', {
+            //                    key: value,
+            //                    callback: function (_data) {
+            //                        callback(_data.name);
+            //                    }
+            //                });
+            //            }
+            //        },
+            //        { label: "放置地点", name: "Place", width: 100, align: "left" },
+            //        {
+            //            label: "状态", name: "Status", width: 100, align: "left",
+            //            formatter: function (cellvalue, row) {
+            //                if (cellvalue === '1') {
+            //                    return '<span class=\"label label-warning\">审批中</span>';
+            //                } else if (cellvalue === '2') {
+            //                    return '<span class=\"label label-success\">已审核</span>';
+            //                } else {
+            //                    return '<span class=\"label label-default\" >草稿</span>';
+            //                }
+            //            }
+            //        },
+            //        { label: "备注", name: "Remark", width: 100, align: "left" },
+            //    ],
+            //    mainId: 'ID',
+            //    isPage: true
+            //});
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function (res, postData) {
-        if (!!res)
-        {
-          if (res.code == 200)
-          {
-             // 发起流程
-             var postData = {
-                 schemeCode:'ASS_zcys',// 填写流程对应模板编号
-                  processId:processId,
-                  level:'1',
-             };
-             learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function(data) {
-                 learun.loading(false);
-             });
+        if (!!res) {
+            if (res.code == 200) {
+                // 发起流程
+                var postData = {
+                    schemeCode: 'ASS_zcys',// 填写流程对应模板编号
+                    processId: processId,
+                    level: '1',
+                };
+                learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                    learun.loading(false);
+                });
+            }
+            page.search();
         }
-       page.search();
-       }
+    };
+    refreshGirdData2 = function () {
+        page.search();
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml

@@ -0,0 +1,308 @@
+
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>教职工基本信息登记表</title>
+    @Html.AppendCssFile("/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.css")
+</head>
+<body>
+    <div id="table">
+        <div class="tableBox">
+            <div class="tableT">北京金隅科技学校固定资产验收单</div>
+            <div>
+                <span>项目名称：<span id="name"></span></span>
+                <span style="margin-right: 20px;float: right;">日期：<span id="time"></span></span>
+            </div>
+            <table class="table">
+                <tr>
+                    <td>序号</td>
+                    <td>设备名称</td>
+                    <td>规格型号</td>
+                    <td>单位</td>
+                    <td>数量</td>
+                    <td>单价（元）</td>
+                    <td>总价（元）</td>
+                    <td>使用部门</td>
+                    <td>放置地点</td>
+                    <td>使用人</td>
+                    <td>备注</td>
+                </tr>
+                <tbody id="t_tbody"></tbody>
+            </table>
+            <p></p>
+            <table class="t_option" style="border: none">
+                <tr>
+                    <td> 部门资产管理员(签字)：</td>
+                    <td><span id="bmgl"></span></td>
+                    <td>  部门负责人(签字)：</td>
+                    <td><span id="bmuser"></span></td>
+                    @*<td>  财务负责人(签字)：</td>
+                    <td><span id="cwuser"></span></td>*@
+                </tr>
+                <tr><td></td> </tr>
+                <tr>
+                    <td>  设备管理员(签字)：</td>
+                    <td><span id="sbgl"></span></td>
+                    <td>  设备管理负责人(签字)：</td>
+                    <td><span id="sbgluser"></span></td>
+                    
+                </tr>
+                <tr>
+                    <td>  校领导审核(签字)：</td>
+                    <td><span id="xld"></span></td>
+                    <td>  财务处审核(签字)：</td>
+                    <td><span id="cwc"></span></td>
+                </tr>
+            </table>
+        </div>
+
+    </div>
+    <div class="btn">打印</div>
+    <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
+    <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
+    <script>
+        $('.btn').click(function () {
+            $('.tableBox').jqprint();
+        })
+
+        $(function () {
+            var tempdatra = '';
+            var TaskLogData = {};
+
+            if (top["layer_formAss_Acceptance"]) {
+                tempdatra = top["layer_formAss_Acceptance"].tempdatra;
+            }
+            else {
+                var keyValue = getQueryString('keyValue');
+
+                if (keyValue) {
+                    var data = top.learun.httpGet(
+                        top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormData?keyValue=' + keyValue, '');
+                    tempdatra = data.data.Ass_Acceptance;
+
+                }
+            }
+
+            var createTime = getQueryString('createTime');
+            $('#time').text(createTime);
+
+            var ProcessId = getQueryString('ProcessId');
+            if (ProcessId) {
+                TaskLogData = top.learun.httpGet(
+                    top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/GetNWFTaskLogData?processId=' + ProcessId, '');
+
+            }
+
+            if (tempdatra) {
+                var html = '';
+                var num = 0, price = 0, pricenum = 0;
+                for (var i = 0; i < tempdatra.length; i++) {
+                    //单位
+                    var AAIUnit = '';
+                    top.learun.clientdata.getAsync('dataItem', {
+                        key: tempdatra[i].AAIUnit,
+                        code: 'sldw',
+                        callback: function (_data) {
+                            if (_data.text && _data.text != 'undefined') {
+                                AAIUnit = _data.text;
+                            }
+                        }
+                    });
+                    //使用部门
+                    var AAIUseDeptName = '';
+                    top.learun.clientdata.getAsync('custmerData', {
+                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                        key: tempdatra[i].AAIUseDeptId,
+                        keyId: 'id',
+                        callback: function (_data) {
+                            if (_data['name'] && _data['name'] != 'undefined') {
+                                AAIUseDeptName = _data['name'];
+                            }
+                        }
+                    });
+                    //放置地点
+                    var AAIStorage = '';
+                    top.learun.clientdata.getAsync('custmerData', {
+                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                        key: tempdatra[i].AAIStorageId,
+                        keyId: 'sid',
+                        callback: function (_data) {
+                            if (_data['sname'] && _data['sname'] != 'undefined') {
+                                AAIStorage += _data['sname'];
+                            }
+                        }
+                    });
+                    top.learun.clientdata.getAsync('custmerData', {
+                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                        key: tempdatra[i].AAIStoragePosition,
+                        keyId: 'rid',
+                        callback: function (_data) {
+                            if (_data['rcode'] && _data['rcode'] != 'undefined') {
+                                AAIStorage += _data['rcode'];
+                            }
+                        }
+                    });
+                    //使用人
+                    var AAIUseUser = '';
+                    if (tempdatra[i].AAIUseUserId && tempdatra[i].AAIUseUserId != 'undefined') {
+                        top.learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                            key: tempdatra[i].AAIUseUserId,
+                            keyId: 'f_userid',
+                            callback: function (_data) {
+                                AAIUseUser = _data['f_realname'];
+                            }
+                        });
+                    }
+                    var AAIStock = '';
+                    if (tempdatra[i].AAIStock && tempdatra[i].AAIStock != 'undefined') {
+                        AAIStock = tempdatra[i].AAIStock;
+                    }
+
+                    var AAIPrice = '';
+                    if (tempdatra[i].AAIPrice && tempdatra[i].AAIPrice != 'undefined') {
+                        AAIPrice = tempdatra[i].AAIPrice;
+                    }
+                    if (AAIStock && AAIStock != 'undefined') {
+                        num += parseFloat(AAIStock);
+                    }
+                    if (AAIPrice && AAIPrice != 'undefined') {
+                        price += parseFloat(AAIPrice);
+                    }
+
+                    if (AAIStock && AAIStock != 'undefined' && AAIPrice && AAIPrice != 'undefined') {
+                        pricenum += AAIPrice * AAIStock;
+                    }
+
+                    html += '<tr>';
+                    html += '<td>' + (i + 1) + '</td>';
+                    html += '<td>' + tempdatra[i].AAIName + '</td>';
+                    html += '<td>' + tempdatra[i].AAISpecification + '</td>';
+                    html += '<td>' + AAIUnit + '</td>';
+                    html += '<td>' + AAIStock + '</td>';
+                    html += '<td>' + AAIPrice + '</td>';
+                    html += '<td>' + AAIPrice * AAIStock + '</td>';
+                    html += '<td>' + AAIUseDeptName + '</td>';
+                    html += '<td>' + AAIStorage + '</td>';
+                    html += '<td>' + AAIUseUser + '</td>';
+                    var ARemark = '';
+                    if (tempdatra[i].ARemark && tempdatra[i].ARemark != 'null') {
+                        ARemark = tempdatra[i].ARemark;
+                    }
+                    html += '<td>' + ARemark + '</td>';
+
+                    html += '</tr>';
+                }
+
+                html += '<tr>';
+                html += '<td></td>';
+                html += '<td>合计</td>';
+                html += '<td></td>';
+                html += '<td></td>';
+                html += '<td>' + num + '</td>';
+                html += '<td>' + price + '</td>';
+                html += '<td>' + pricenum + '</td>';
+                html += '<td></td>';
+                html += '<td></td>';
+                html += '<td></td>';
+                html += '<td></td>';
+                html += '</tr>';
+
+                //$('.table tbody').empty().append(html);
+                $('#t_tbody').html(html);
+
+                if (TaskLogData && TaskLogData.data) {
+                    var bmgl = "", bmuser = '', cwuser = '', sbgl = '', sbgluser = '', xld = '', cwc='';
+                    for (var i = 0; i < TaskLogData.data.length; i++) {
+                        var item = TaskLogData.data[i];
+                        if (item && item.F_NodeId) {
+                            //部门资产管理员
+                            if (item.F_NodeId == '7d6318b6-b5aa-a6c0-0d1d-ee47fd9aaf18') {
+                                bmgl = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            }
+                            //部门负责人1
+                            if (item.F_NodeId == '400c0918-cd01-45b7-7d1b-94211516c3cd') {
+                                bmuser = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            }
+                            ////财务负责人
+                            //if (item.F_NodeId == '1627782c-9244-f5ff-0da8-c36d348f032a') {
+                            //    cwuser = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            //}
+                            //设备管理员2
+                            if (item.F_NodeId == 'a2b32308-ce97-219d-01e8-3088946faf74') {
+                                sbgl = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            }
+                            //设备管理负责人3
+                            if (item.F_NodeId == '35e03210-12b3-10a5-de59-0daeeaedd7d0') {
+                                sbgluser = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            }
+                            //校领导审核4
+                            if (item.F_NodeId == '199c2bd4-46d7-2142-2429-a9bb429181bf') {
+                                xld = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            }
+                            //财务处审核
+                            if (item.F_NodeId == '391378d7-439a-0a63-89d5-8444b717f784') {
+                                cwc = getUser(item.F_CreateUserId, item.F_CreateUserName);
+                            }
+                        }
+                    }
+
+                    $('#bmgl').html(bmgl);
+                    $('#bmuser').html(bmuser);
+                    $('#cwuser').html(cwuser);
+                    $('#sbgl').html(sbgl);
+                    $('#sbgluser').html(sbgluser);
+                    $('#xld').html(xld);
+                    $('#cwc').html(cwc);
+                }
+
+            }
+        });
+
+        function getUser(uid, name) {
+            var deptid = '';
+            var deptname = '';
+
+            var result = '';
+            top.learun.clientdata.getAsync('custmerData',
+                {
+                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                    key: uid,
+                    keyId: 'f_userid',
+                    callback: function (_data) {
+                        deptid = _data['f_departmentid'];
+                    }
+                });
+            top.learun.clientdata.getAsync('custmerData',
+                {
+                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                    key: deptid,
+                    keyId: 'id',
+                    callback: function (_data) {
+                        if (_data['name'] && _data['name'] != 'undefined') {
+                            deptname = _data['name'];
+                        }
+                    }
+                });
+            if (deptname && deptname != 'undefined') {
+                return '【' + deptname + '】' + name;
+            } else {
+                return name;
+            }
+        }
+
+        function getQueryString(name) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", 'i'); // 匹配目标参数
+            var result = window.location.search.substr(1).match(reg); // 对querystring匹配目标参数
+            if (result != null) {
+                return decodeURIComponent(result[2]);
+            } else {
+                return null;
+            }
+        }
+    </script>
+</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.css

@@ -0,0 +1,87 @@
+table,
+tr,
+td {
+    padding: 0;
+    margin: 0;
+    border-collapse: collapse;
+}
+
+table {
+    table-layout: fixed;
+    font-size: 14px;
+}
+
+.tableT {
+    text-align: center;
+    font-size: 20px;
+    margin-bottom: 15px;
+}
+
+.table {
+    width: 100%;
+    text-align: center;
+    border-top: 1px solid #000;
+    border-right: 1px solid #000;
+}
+
+    .table tr {
+        border-bottom: 1px solid #000;
+    }
+
+    .table td {
+        border-left: 1px solid #000;
+        line-height: 20px;
+        padding: 8px 5px;
+    }
+
+.tableImg {
+    height: 0;
+    overflow: hidden;
+    padding-bottom: 140%;
+}
+
+.table img {
+    width: 100%;
+}
+
+.tableTxt {
+    text-align: left;
+}
+
+.table .table {
+    border: 0;
+}
+
+    .table .table tr:last-child {
+        border-bottom: 0;
+    }
+
+    .table .table td:first-child {
+        border-left: 0;
+    }
+
+.btn {
+    width: 100px;
+    height: 34px;
+    line-height: 34px;
+    text-align: center;
+    margin: 30px auto;
+    border: 1px solid #ccc;
+    cursor: pointer;
+    border-radius: 4px;
+}
+
+.tableBox {
+    width: 90%;
+    margin: 30px auto;
+}
+
+
+.t_option td {
+    width: 18%;
+    line-height: 45px;
+}
+
+#table {
+    /* display: none; */
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AllocationItem/Form.cshtml

@@ -21,18 +21,18 @@
         <div class="lr-form-item-title">资产类别</div>
         <div id="AOITId" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
         <div class="lr-form-item-title">英文名称</div>
         <input id="AOIEName" type="text" class="form-control" readonly="readonly" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="AOIModel" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
         <div class="lr-form-item-title">生产厂家</div>
         <input id="AOIManufacturer" type="text" class="form-control" readonly="readonly" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
         <div class="lr-form-item-title">单价</div>
         <input id="AOIPrice" type="text" class="form-control" readonly="readonly" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AllocationItem/Form.js

@@ -52,8 +52,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
-                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
+                    //{ label: "英文名称", name: "AEName", width: 200, align: "left" },
+                    { label: "规格型号", name: "AModel", width: 200, align: "left" },
                     { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
                     {
                         label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AllocationItem/Index.js

@@ -82,8 +82,8 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "英文名称", name: "AOIEName", width: 100, align: "left"},
-                    { label: "资产型号", name: "AOIModel", width: 100, align: "left"},
+                    //{ label: "英文名称", name: "AOIEName", width: 100, align: "left"},
+                    { label: "规格型号", name: "AOIModel", width: 100, align: "left"},
                     { label: "生产厂家", name: "AOIManufacturer", width: 100, align: "left"},
                     { label: "单价", name: "AOIPrice", width: 100, align: "left"},
                     { label: "数量", name: "AOIStock", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsChangeItem/Form.cshtml

@@ -40,12 +40,12 @@
         <div id="ACReasonType"  ></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="Ass_AssetsChangeItem" >
-        <div class="lr-form-item-title">所在库房</div>
+        <div class="lr-form-item-title">楼宇名称</div>
         <div id="ACCStorageId"  ></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="Ass_AssetsChangeItem" >
-        <div class="lr-form-item-title">所在库位</div>
-        <input id="ACCStoragePosition" type="text" class="form-control"  />
+        <div class="lr-form-item-title">房间号</div>
+        <div id="ACCStoragePosition"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsChangeItem/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsChangeItem/Form.js

@@ -19,7 +19,27 @@ var bootstrap = function ($, learun) {
             $('#ACUserId').val(learun.clientdata.get(['userinfo']).realName);
             $('#ACInOrOut').lrDataItemSelect({ code: 'InOrOut' });
             $('#ACReasonType').lrDataItemSelect({ code: 'ReasonType' });
-            $('#ACCStorageId').lrDataSourceSelect({ code: 'Ass_StorageData',value: 'sid',text: 'sname' });
+            //$('#ACCStorageId').lrDataSourceSelect({ code: 'Ass_StorageData',value: 'sid',text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId",
+                        allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsChangeItem/Index.js

@@ -48,7 +48,26 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#ACInOrOut').lrDataItemSelect({ code: 'InOrOut' });
             $('#ACReasonType').lrDataItemSelect({ code: 'ReasonType' });
-            $('#ACCStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#ACCStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -143,7 +162,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所在库房", name: "ACCStorageId", width: 150, align: "left",
+                        label: "楼宇名称", name: "ACCStorageId", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -155,7 +174,20 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "所在库位", name: "ACCStoragePosition", width: 150, align: "left" }
+                    //{ label: "房间号", name: "ACCStoragePosition", width: 150, align: "left" }
+                    {
+                        label: "房间号", name: "AIIStoragePosition", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'ACIId',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml

@@ -3,14 +3,6 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产分类<font face="宋体">*</font></div>
-        <div id="ATId" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
-        <div id="AAssType" ></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
         <div class="lr-form-item-title">资产编号<font face="宋体">*</font></div>
         <input id="ACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -20,68 +12,78 @@
         <input id="AName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">英文名称</div>
-        <input id="AEName" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产型号</div>
-        <input id="AModel" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AManufacturer" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AUse" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">规格</div>
-        <input id="ASpecification" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产分类<font face="宋体">*</font></div>
+        <div id="ATId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产来源</div>
-        <div id="ASource"></div>
-    </div> 
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">供应商</div>
-        <div id="ASupplierId"></div>
+        <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
+        <div id="AAssType"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">英文名称</div>
+            <input id="AEName" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">参考单价<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">单价<font face="宋体">*</font></div>
         <input id="APrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">库存<font face="宋体">*</font></div>
         <input id="AStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
         <div class="lr-form-item-title">数量单位</div>
         <div id="AUnit"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
-        <input id="AOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
+        <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>
+        <div id="HasDetail" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
-        <div id="AIIStorageId" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">规格型号</div>
+        <input id="AModel" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">生产厂家</div>
+            <input id="AManufacturer" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">资产来源</div>
+            <div id="ASource"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">所在库位</div>
-        <input id="AIIStoragePosition" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>
-        <div id="HasDetail" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">供应商</div>
+        <div id="ASupplierId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产照片</div>
-        <div id="APhoto"></div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+        <div class="lr-form-item-title">资产排序<font face="宋体">*</font></div>
+        <input id="AOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产描述</div>
-        <textarea id="AContent" class="form-control" style="height: 150px;"></textarea>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+        <div class="lr-form-item-title">规格</div>
+        <input id="ASpecification" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">用途</div>
+            <input id="AUse" type="text" class="form-control" />
+        </div>*@
+
+
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
+            <div id="AIIStorageId" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">房间号</div>
+            <div id="AIIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">资产照片</div>
+            <div id="APhoto"></div>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">资产描述</div>
+            <textarea id="AContent" class="form-control" style="height: 150px;"></textarea>
+        </div>*@
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.js

@@ -27,7 +27,27 @@ var bootstrap = function ($, learun) {
             $('#ASource').lrDataItemSelect({ code: 'zcly' });
             $('#AUnit').lrDataItemSelect({ code: 'sldw' });
             $('#HasDetail').lrDataItemSelect({ code: 'YesOrNoBit' });
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //库房
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#ASupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
             $('#AAssType').lrDataItemSelect({ code: 'AssType' });
             $('#APhoto').lrUploader();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js

@@ -70,7 +70,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '资产明细',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/Index?AId=' + keyValue,
-                        width: 1000,
+                        width: 1100,
                         height: 700,
                         btn: null,
                         end: function () {
@@ -81,14 +81,16 @@ var bootstrap = function ($, learun) {
             });
 
             //整理资产数据
-            $("#lr_arrangement").on('click', function () {
+            $("#lr_arrangement").on('click',
+                function() {
 
-                learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/ArrangementAss',
-                    {}, function (res) {
-                    refreshGirdData();
-                });
+                    learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/ArrangementAss',
+                        {},
+                        function(res) {
+                            refreshGirdData();
+                        });
 
-            })
+                });
 
             // 删除
             $('#lr_delete').on('click', function () {
@@ -157,7 +159,7 @@ var bootstrap = function ($, learun) {
                             return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
-                    { label: "资产型号", name: "AModel", width: 150, align: "left" },
+                    { label: "规格型号", name: "AModel", width: 150, align: "left" },
                     { label: "生产厂家", name: "AManufacturer", width: 150, align: "left" },
                     {
                         label: "资产来源", name: "ASource", width: 100, align: "left",
@@ -184,7 +186,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产排序", name: "AOrder", width: 100, align: "left" },
-                    { label: "资产规格", name: "ASpecification", width: 100, align: "left" },
+                    { label: "资产品牌", name: "ASpecification", width: 100, align: "left" },
                     { label: "用途", name: "AUse", width: 100, align: "left" },
                 ],
                 mainId: 'AId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Form.js

@@ -102,17 +102,17 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                        //label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                           // learun.clientdata.getAsync('dataItem', {
+                             //   key: value,
+                             //   code: 'zcly',
+                              //  callback: function (_data) {
+                               //     callback(_data.text);
+                                //}
+                            //});
+                       // }
+                    //},
                     {
                         label: '单价', name: 'AAIPrice', width: 100, align: 'left'
                     },
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -148,23 +148,27 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                }
+                            });
+                        }
                     },
+                    //{label: '英文名称', name: 'AAIEName', width: 100, align: 'left'},
                     {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{label: '用途', name: 'AAIUse', width: 100, align: 'left'},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js

@@ -32,7 +32,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'formitem',
                     title: '新增明细',
-                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/FormJY',
                     width: 860,
                     height: 600,
                     callBack: function (id) {
@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formitem',
                         title: '编辑明细',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/FormJY?keyValue=' + keyValue,
                         width: 860,
                         height: 600,
                         callBack: function (id) {
@@ -91,11 +91,12 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree'
             });
+            $('#AACreateDeptId').lrselectSet(learun.clientdata.get(['userinfo']).departmentId);
             $('#Ass_AssetsInfoItemApply').jfGrid({
                 headData: [
-                    {
-                        label: '资产编号', name: 'AAICode', width: 150, align: 'left'
-                    },
+                    //{
+                    //    label: '采购临时编号', name: 'AAICode', width: 150, align: 'left'
+                    //},
                     {
                         label: '资产名称', name: 'AAIName', width: 150, align: 'left'
                     },
@@ -111,17 +112,17 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: '单价', name: 'AAIPrice', width: 100, align: 'left'
                     },
@@ -139,13 +140,13 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
-                    {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -157,23 +158,59 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']+"("+_data['rname']+")");
+                                }
+                            });
+                        }
                     },
                     {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                        label: '使用部门', name: 'AAIUseDeptId', 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: 'AAIManufacturer', width: 100, align: 'left'
+                        label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
                     },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.cshtml

@@ -14,7 +14,7 @@
         <div class="lr-form-item-title">采购总价</div>
         <input id="AAPrice" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply" style="display: none">
         <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
         <div id="AAAssType"  isvalid="yes" checkexpession="NotNull"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js

@@ -32,7 +32,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'formitem',
                     title: '新增明细',
-                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/FormJYHC',
                     width: 860,
                     height: 600,
                     callBack: function (id) {
@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formitem',
                         title: '编辑明细',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/FormJYHC?keyValue=' + keyValue,
                         width: 860,
                         height: 600,
                         callBack: function (id) {
@@ -91,37 +91,38 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree'
             });
+            $('#AACreateDeptId').lrselectSet(learun.clientdata.get(['userinfo']).departmentId);
             $('#Ass_AssetsInfoItemApply').jfGrid({
                 headData: [
+                    //{
+                    //    label: '耗材编号', name: 'AAICode', width: 150, align: 'left'
+                    //},
                     {
-                        label: '资产编号', name: 'AAICode', width: 150, align: 'left'
-                    },
-                    {
-                        label: '资产名称', name: 'AAIName', width: 150, align: 'left'
-                    },
-                    {
-                        label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
-                                key: value,
-                                keyId: 'atid',
-                                callback: function (_data) {
-                                    callback(_data['aname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
+                        label: '耗材名称', name: 'AAIName', width: 150, align: 'left'
                     },
+                    //{
+                    //    label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: '单价', name: 'AAIPrice', width: 100, align: 'left'
                     },
@@ -139,13 +140,13 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
-                    {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -157,35 +158,70 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
-                    },
-                    {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 150, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']+"("+_data['rname']+")");
+                                }
+                            });
+                        }
+                    }, {
+                        label: '使用部门', name: 'AAIUseDeptId', 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: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'sid',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data['sname']);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
-                    }
+                    },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '耗材品牌', name: 'AAIModel', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
+                    {
+                        label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
+                    },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                    //            key: value,
+                    //            keyId: 'sid',
+                    //            callback: function (_data) {
+                    //                callback(_data['sname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
                 ],
                 height: 400,
                 mainId: 'AAIId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormPurchase.js

@@ -105,7 +105,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -117,23 +117,33 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                }
+                            });
+                        }
                     },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormPurchaseJY.js

@@ -71,17 +71,17 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: '单价', name: 'AAIPrice', width: 100, align: 'left'
                     },
@@ -99,13 +99,13 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
-                    {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -117,23 +117,33 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                }
+                            });
+                        }
                     },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormView.js

@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -148,23 +148,33 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                }
+                            });
+                        }
                     },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.cshtml

@@ -26,6 +26,10 @@
         <div class="lr-form-item-title">申请人</div>
         <input id="AACreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">申请部门</div>
+        <div id="AACreateDeptId"></div>
+    </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="Ass_AssetsInfoItemApply"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js

@@ -82,11 +82,20 @@ var bootstrap = function ($, learun) {
             $('#AACreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#AAAssType').lrDataItemSelect({ code: 'AssType' });
             $('#AACreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#AACreateDeptId').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree'
+            });
             $('#Ass_AssetsInfoItemApply').jfGrid({
                 headData: [
-                    {
-                        label: '资产编号', name: 'AAICode', width: 150, align: 'left'
-                    },
+                    //{
+                    //    label: '采购临时编号', name: 'AAICode', width: 150, align: 'left'
+                    //},
                     {
                         label: '资产名称', name: 'AAIName', width: 150, align: 'left'
                     },
@@ -102,17 +111,17 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: '单价', name: 'AAIPrice', width: 100, align: 'left'
                     },
@@ -130,13 +139,13 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
-                    {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -148,23 +157,59 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
-                    },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']+"("+_data['rname']+")");
+                                }
+                            });
+                        }
                     },
                     {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                        label: '使用部门', name: 'AAIUseDeptId', 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: 'AAIManufacturer', width: 100, align: 'left'
+                        label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
                     },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.cshtml

@@ -0,0 +1,33 @@
+@{
+    ViewBag.Title = "采购申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script>
+    var NewAACode = "@ViewBag.AACode";
+</script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">采购申请单号</div>
+        <input id="AACode" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">采购总价</div>
+        <input id="AAPrice" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">资产属性</div>
+        <div id="AAAssType" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="AACreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">申请人</div>
+        <input id="AACreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="Ass_AssetsInfoItemApply"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js

@@ -0,0 +1,302 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-03-25 12:00
+ * 描  述：入库申请
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var refreshGirdData;
+var selectedRow;
+var tempdatra = new Array();
+//总价计算
+var pricecount = 0;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            $("#detailadd").on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'formitem',
+                    title: '新增明细',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form',
+                    width: 860,
+                    height: 600,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            $("#detailedit").on('click', function () {
+                var keyValue = $('#Ass_AssetsInfoItemApply').jfGridValue('AAIId');
+                selectedRow = $('#Ass_AssetsInfoItemApply').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formitem',
+                        title: '编辑明细',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItemApply/Form?keyValue=' + keyValue,
+                        width: 860,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            $("#detaildel").on('click', function () {
+                var keyValue = $('#Ass_AssetsInfoItemApply').jfGridValue('AAIId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res, index) {
+                        if (res) {
+                            $.each(tempdatra, function (key, val) {
+                                if (tempdatra[key].AAIId === keyValue) {
+                                    pricecount -= tempdatra[key].AAIPrice * tempdatra[key].AAIStock;
+                                    tempdatra.splice(key, 1);
+                                }
+                            });
+                            $("#AAPrice").val(pricecount);
+                            $('#Ass_AssetsInfoItemApply').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
+                            top.layer.close(index);
+                        }
+                    });
+                }
+            });
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#AACreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#AACreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#AAAssType').lrDataItemSelect({ code: 'AssType' });
+            $('#AACreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#Ass_AssetsInfoItemApply').jfGrid({
+                headData: [
+                    //{
+                    //    label: '耗材编号', name: 'AAICode', width: 150, align: 'left'
+                    //},
+                    {
+                        label: '耗材名称', name: 'AAIName', width: 150, align: 'left'
+                    },
+                    //{
+                    //    label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    {
+                        label: '单价', name: 'AAIPrice', width: 100, align: 'left'
+                    },
+                    {
+                        label: '数量', name: 'AAIStock', width: 80, align: 'left'
+                    },
+                    {
+                        label: '单位', name: 'AAIUnit', width: 80, 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: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
+                    {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']+"("+_data['rname']+")");
+                                }
+                            });
+                        }
+                    }, {
+                        label: '使用部门', name: 'AAIUseDeptId', 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: 'AAIUseUserId', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '耗材品牌', name: 'AAIModel', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
+                    {
+                        label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
+                    },
+                    //{
+                    //    label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                    //},
+                    //{
+                    //    label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                    //            key: value,
+                    //            keyId: 'sid',
+                    //            callback: function (_data) {
+                    //                callback(_data['sname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
+                ],
+                height: 400,
+                mainId: 'AAIId',
+                reloadSelected: false,
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(
+                    top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/GetFormData?keyValue=' + keyValue,
+                    function (data) {
+                        for (var id in data) {
+                            if (!!data[id].length && data[id].length > 0) {
+                                $('#' + id).jfGridSet('refreshdata', data[id]);
+                                tempdatra = data[id];
+                            } else {
+                                $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                                if (data[id].AAPrice) {
+                                    pricecount = data[id].AAPrice;
+                                }
+                            }
+                        }
+                    });
+            } else {
+                $("#AACode").val(NewAACode);
+            }
+        }
+    };
+    refreshGirdData = function (temprow) {
+        var ifnewrow = true;
+        $.each(tempdatra, function (key, val) {
+            if (tempdatra[key].AAIId === temprow.AAIId) {
+                tempdatra[key] = temprow;
+                ifnewrow = false;
+            }
+        });
+        if (ifnewrow) {
+            tempdatra.push(temprow);
+        }
+        //总价计算
+        pricecount = 0;
+        for (var i = 0; i < tempdatra.length; i++) {
+            pricecount += tempdatra[i].AAIPrice * tempdatra[i].AAIStock;
+        }
+        $("#AAPrice").val(pricecount);
+        $('#Ass_AssetsInfoItemApply').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
+    };
+    function sortNumber(a, b) {
+        return a.AAIOrder - b.AAIOrder;
+    }
+    // 设置表单数据
+    setFormData = function (processId,param,callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Ass_AssetsInfoApply') {
+                            keyValue = data[id].AAId;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = {};
+        var res = {};
+        res.code = 200;
+        if (!!processId) {
+            formData.AAProcessId = processId;
+        }
+        callBack(res, i);
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js

@@ -58,7 +58,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJY',
                     width: 1000,
-                    height: 700,
+                    height: 800,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
                             title: '采购编辑',
                             url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJY?keyValue=' + keyValue,
                             width: 1000,
-                            height: 700,
+                            height: 800,
                             callBack: function (id) {
                                 var res = false;
                                 // 验证数据
@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
                             title: '编辑',
                             url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJY?keyValue=' + keyValue,
                             width: 1000,
-                            height: 700,
+                            height: 800,
                             callBack: function (id) {
                                 var res = false;
                                 // 验证数据
@@ -138,7 +138,7 @@ var bootstrap = function ($, learun) {
                         title: '查看采购申请',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormViewJY?keyValue=' + keyValue,
                         width: 1000,
-                        height: 600,
+                        height: 700,
                         btn: null
                     });
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js

@@ -58,7 +58,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJYHC',
                     width: 1000,
-                    height: 700,
+                    height: 750,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
                             title: '采购编辑',
                             url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJYHC?keyValue=' + keyValue,
                             width: 1000,
-                            height: 700,
+                            height: 750,
                             callBack: function (id) {
                                 var res = false;
                                 // 验证数据
@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
                             title: '编辑',
                             url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJYHC?keyValue=' + keyValue,
                             width: 1000,
-                            height: 700,
+                            height: 750,
                             callBack: function (id) {
                                 var res = false;
                                 // 验证数据
@@ -136,9 +136,9 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formAss_AssetsInfoApply',
                         title: '查看采购申请',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormViewJY?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormViewJYHC?keyValue=' + keyValue,
                         width: 1000,
-                        height: 600,
+                        height: 750,
                         btn: null
                     });
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml

@@ -4,257 +4,297 @@
 }
 <script> var newCode='@ViewBag.NewCode'</script>
 <div class="lr-form-wrap">
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">明细编号<font face="宋体">*</font></div>
-        <input id="AICode" hidden="hidden" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem" style="display: none">
+        <div class="lr-form-item-title">明细编号</div>
+        <input id="AICode" hidden="hidden" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">序号</div>
+            <input id="AICodeNum" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
-        <input id="AICodeNum" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <div class="lr-form-item-title">资产编号</div>
+        <input id="AICodeNumJY" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
         <div id="AIIStorageId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">是否在库<font face="宋体">*</font></div>
-        <div id="AIIsInStorage" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
-        <div id="AIAssType"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">所在库位</div>
-        <input id="AIIStoragePosition" type="text" class="form-control" />
-    </div>
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">报废时间<font face="宋体">*</font></div>
-            <input id="AScrapTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AScrapTime').trigger('change'); } })" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">报废提示时间<font face="宋体">*</font></div>
-            <div id="ScrapRemindTime"> </div>
-        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">金隅编号</div>
-        <input id="AICodeNumJY" type="text" class="form-control" />
+        <div class="lr-form-item-title">房间号</div>
+        <div id="AIIStoragePosition"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产名称</div>
         <input id="AIASSName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">部门</div>
-        <div id="AIDepartment"></div>
+        <div class="lr-form-item-title">资产分类</div>
+        <div id="AIASSClass"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用人员</div>
-        <div id="AIUsePeople"></div>
+        <div class="lr-form-item-title">资产品牌</div>
+        <input id="AISpecification" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="AISpecificationtype" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">计量单位</div>
         <div id="AIUnits" class="form-control"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产原值</div>
-        <input id="AIAssValue" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">购置日期</div>
-        <input id="AIAddTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAddTime').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产分类</div>
-        <div id="AIASSClass"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产状态</div>
         <div id="AIASSState"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">管理部门</div>
+            <input id="AdministrativeDepartment" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">增加方式</div>
-        <div id="AIAddType"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">入账日期</div>
-        <input id="AIAccountEntryTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAccountEntryTime').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">行驶发证日期</div>
-        <input id="AIVehicleTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIVehicleTime').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">品牌</div>
-        <input id="AIBrand" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AIManufacturer" type="text" class="form-control" />
-    </div>
-
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">产权形式</div>
-        <input id="AIPropertyRight" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">建筑结构</div>
-        <input id="AIBuildingStructure" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属证号</div>
-        <input id="AIOwnership" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车辆用途</div>
-        <input id="AIVehicleUse" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车牌号</div>
-        <input id="AIPlateNumber" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车架号</div>
-        <input id="AIFrameNumber" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用性质</div>
-        <input id="AINatureOfUse" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">发动机号</div>
-        <input id="EngineNumber" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">会计凭证号</div>
-        <input id="AIAccountCertificate" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">排气量</div>
-        <input id="DischargeVolume" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">建筑面积</div>
-        <input id="AIBuiltArea" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产规格</div>
-        <input id="AISpecification" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AIUse" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">采购组织形式</div>
-        <input id="ProcurementOrganizationForm" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">预算项目编号</div>
-        <input id="BudgetItemNo" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">取得方式</div>
-        <input id="MethodOfAcquisition" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">取得日期</div>
-        <input id="TimeOfAcquisition"type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TimeOfAcquisition').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">产品序列号</div>
-        <input id="ProjectID" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">销售商</div>
-        <input id="Seller" type="text" class="form-control" />
+        <div class="lr-form-item-title">部门</div>
+        <div id="AIDepartment"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">合同编号</div>
-        <input id="ContractNo" type="text" class="form-control" />
+        <div class="lr-form-item-title">使用人</div>
+        <div id="AIUsePeople"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">发票号</div>
-        <input id="InvoiceNumber" type="text" class="form-control" />
+        <div class="lr-form-item-title">存放地点</div>
+        <input id="AIPlace" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">配置标准分类名称</div>
-        <input id="ConfigurationName" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产原价值</div>
+        <input id="AIAssValue" type="number" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">保修截止日期</div>
-        <input id="GuaranteeEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GuaranteeEndTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">入账日期</div>
+        <input id="AIAddTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAddTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">入账形式</div>
-        <input id="EntryForm" type="text" class="form-control" />
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="AIRemark" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">价值类型</div>
-        <input id="ValueType" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧方法</div>
+        <input id="DepreciationMethod" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">财政拨款</div>
-        <input id="FinancialAllocation" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧状态</div>
+        <input id="DepreciationStatus" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">非财政拨款</div>
-        <input id="NonFinancialAppropriation" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧年限</div>
+        <input id="UsefulLife" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用状况</div>
-        <input id="Usage" type="text" class="form-control" />
+        <div class="lr-form-item-title">月折旧额</div>
+        <input id="MonthlyDepreciation" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">投入使用日期</div>
-        <input id="DateOfCommissioning" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#DateOfCommissioning').trigger('change'); } })" />
+        <div class="lr-form-item-title">已提折旧月数</div>
+        <input id="MonthsOfDepreciation" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">管理部门</div>
-        <input id="AdministrativeDepartment" type="text" class="form-control" />
+        <div class="lr-form-item-title">月折旧率</div>
+        <input id="MonthlyDepreciationRate" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧状态</div>
-        <input id="DepreciationStatus" type="text" class="form-control" />
+        <div class="lr-form-item-title">累计折旧</div>
+        <input id="AccumulatedDepreciation" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧方法</div>
-        <input id="DepreciationMethod" type="text" class="form-control" />
+        <div class="lr-form-item-title">净值</div>
+        <input id="NetWorth" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">已提折旧月数</div>
-        <input id="MonthsOfDepreciation" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆行驶证所有人</div>
+        <input id="VehicleLicenseUser" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">累计折旧</div>
-        <input id="AccumulatedDepreciation" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆识别号</div>
+        <input id="AIVehicleNumber" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧年限</div>
-        <input id="UsefulLife" type="text" class="form-control" />
+        <div class="lr-form-item-title">车牌号</div>
+        <input id="AIPlateNumber" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">月折旧额</div>
-        <input id="MonthlyDepreciation" type="text" class="form-control" />
+        <div class="lr-form-item-title">面积</div>
+        <input id="AIBuiltArea" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">残值率</div>
-        <input id="ResidualValueRate" type="text" class="form-control" />
+        <div class="lr-form-item-title">权属证号</div>
+        <input id="AIOwnership" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属说明</div>
-        <textarea id="AIOwnerRemark" class="form-control" style="height:100px;"></textarea>
+        <div class="lr-form-item-title">土地使用权类型</div>
+        <input id="LandUseType" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="AIRemark" class="form-control" style="height:100px;"></textarea>
+        <div class="lr-form-item-title">土地使用权人</div>
+        <input id="LandUseUser" type="text" class="form-control" />
     </div>
 
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">是否在库<font face="宋体">*</font></div>
+                <div id="AIIsInStorage" checkexpession="NotNull"></div>
+            </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
+            <div id="AIAssType"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">报废时间<font face="宋体">*</font></div>
+                <input id="AScrapTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AScrapTime').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">报废提示时间<font face="宋体">*</font></div>
+                <div id="ScrapRemindTime"> </div>
+            </div>
+
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">增加方式</div>
+            <div id="AIAddType"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">生产厂家</div>
+            <input id="AIManufacturer" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">用途</div>
+            <input id="AIUse" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">采购组织形式</div>
+            <input id="ProcurementOrganizationForm" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">预算项目编号</div>
+            <input id="BudgetItemNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">取得方式</div>
+            <input id="MethodOfAcquisition" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">取得日期</div>
+            <input id="TimeOfAcquisition" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TimeOfAcquisition').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">产品序列号</div>
+            <input id="ProjectID" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">销售商</div>
+            <input id="Seller" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">合同编号</div>
+            <input id="ContractNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">发票号</div>
+            <input id="InvoiceNumber" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">配置标准分类名称</div>
+            <input id="ConfigurationName" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">保修截止日期</div>
+            <input id="GuaranteeEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GuaranteeEndTime').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">入账形式</div>
+            <input id="EntryForm" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">价值类型</div>
+            <input id="ValueType" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">财政拨款</div>
+            <input id="FinancialAllocation" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">非财政拨款</div>
+            <input id="NonFinancialAppropriation" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">使用状况</div>
+            <input id="Usage" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">投入使用日期</div>
+            <input id="DateOfCommissioning" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#DateOfCommissioning').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">权属说明</div>
+            <textarea id="AIOwnerRemark" class="form-control" style="height:100px;"></textarea>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">入账日期</div>
+                <input id="AIAccountEntryTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAccountEntryTime').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">行驶发证日期</div>
+                <input id="AIVehicleTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIVehicleTime').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">品牌</div>
+                <input id="AIBrand" type="text" class="form-control" />
+            </div>
+
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">产权形式</div>
+                <input id="AIPropertyRight" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">建筑结构</div>
+                <input id="AIBuildingStructure" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">权属证号</div>
+                <input id="AIOwnership" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">车辆用途</div>
+                <input id="AIVehicleUse" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">车牌号</div>
+                <input id="AIPlateNumber" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">车架号</div>
+                <input id="AIFrameNumber" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">使用性质</div>
+                <input id="AINatureOfUse" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">发动机号</div>
+                <input id="EngineNumber" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">会计凭证号</div>
+                <input id="AIAccountCertificate" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">排气量</div>
+                <input id="DischargeVolume" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">建筑面积</div>
+                <input id="AIBuiltArea" type="text" class="form-control" />
+            </div>*@
+
 
 
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js

@@ -15,7 +15,29 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId",
+                        allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({
+                value: 'RId', text: 'RCode', allowSearch: true
+            });
+
             $('#AIIsInStorage').lrDataItemSelect({
                 code: 'YesOrNoBit', select: function (val) {
                     if (val) {
@@ -65,6 +87,9 @@ var bootstrap = function ($, learun) {
                                 $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                             }
                         }
+                        if (!data["Ass_AssetsInfoItem"].AICode) {
+                            $('#AICode').val(newCode);
+                        }
                     });
             } else {
                 $('#AICode').val(newCode);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml

@@ -12,173 +12,148 @@
     }
 </style>
 <div class="lr-form-wrap">
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem" style="display: none">
         <div class="lr-form-item-title">明细编号<font face="宋体">*</font></div>
         <input id="AICode" hidden="hidden" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+    </div>*@
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
+            <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        </div>*@
+
     <img id="photo" />
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">编号<font face="宋体">*</font></div>
-            <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />*@
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title" readonly="readonly">金隅资产编号</div>
+        <div class="lr-form-item-title" readonly="readonly">资产编号</div>
         <input id="AICodeNumJY" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
-            <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>*@
     </div>
+
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产名称</div>
-        <input id="AIASSName" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
+        <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">所在库位<font face="宋体">*</font></div>
-            <input id="AIIStoragePosition" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">单位组织</div>
-        <div id="AIDepartment" readonly="readonly"></div>
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <div id="AIIStoragePosition" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">是否在库<font face="宋体">*</font></div>
-            <div id="AIIsInStorage" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>*@
     </div>
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">报废时间<font face="宋体">*</font></div>
-            <input id="AScrapTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AScrapTime').trigger('change'); } })" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title" readonly="readonly">报废提示时间<font face="宋体">*</font></div>
-            <div id="ScrapRemindTime"> </div>
-        </div>*@
-
-
-
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
-        <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <div class="lr-form-item-title">资产名称</div>
+        <input id="AIASSName" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
-        <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">所在库位<font face="宋体">*</font></div>
-        <input id="AIIStoragePosition" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">资产分类</div>
+        <div id="AIASSClass"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用人员</div>
-        <div id="AIUsePeople" readonly="readonly"></div>
+        <div class="lr-form-item-title">资产品牌</div>
+        <input id="AISpecification" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="AISpecificationtype" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">计量单位</div>
-        <div id="AIUnits" readonly="readonly"  class="form-control" ></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产原值</div>
-        <input id="AIAssValue" readonly="readonly" type="text" class="form-control" />
+        <div id="AIUnits" readonly="readonly" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">购置日期</div>
-        <input id="AIAddTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAddTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">资产状态</div>
+        <div id="AIASSState" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产分类</div>
-        <div id="AIASSClass" readonly="readonly"></div>
+        <div class="lr-form-item-title">管理部门</div>
+        <div id="AIDepartment" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产状态</div>
-        <div id="AIASSState" readonly="readonly"></div>
+        <div class="lr-form-item-title">使用人</div>
+        <div id="AIUsePeople" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">增加方式</div>
-        <div id="AIAddType" readonly="readonly"></div>
+        <div class="lr-form-item-title">存放地点</div>
+        <input id="AIPlace" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title" readonly="readonly">入账日期</div>
-        <input id="AIAccountEntryTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAccountEntryTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">资产原价值</div>
+        <input id="AIAssValue" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">行驶发证日期</div>
-        <input id="AIVehicleTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIVehicleTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">入账日期</div>
+        <input id="AIAddTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">品牌</div>
-        <input id="AIBrand" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="AIRemark" readonly="readonly" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AIManufacturer" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧方法</div>
+        <input id="DepreciationMethod" readonly="readonly" type="text" class="form-control" />
     </div>
-
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">产权形式</div>
-        <input id="AIPropertyRight" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧状态</div>
+        <input id="DepreciationStatus" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">建筑结构</div>
-        <input id="AIBuildingStructure" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧年限</div>
+        <input id="UsefulLife" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属证号</div>
-        <input id="AIOwnership" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">月折旧额</div>
+        <input id="MonthlyDepreciation" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车辆用途</div>
-        <input id="AIVehicleUse" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">已提折旧月数</div>
+        <input id="MonthsOfDepreciation" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车牌号</div>
-        <input id="AIPlateNumber" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">月折旧率</div>
+        <input id="MonthlyDepreciationRate" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车架号</div>
-        <input id="AIFrameNumber" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">累计折旧</div>
+        <input id="AccumulatedDepreciation" readonly="readonly" type="text" class="form-control" />
     </div>
+
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用性质</div>
-        <input id="AINatureOfUse" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">净值</div>
+        <input id="NetWorth" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">发动机号</div>
-        <input id="EngineNumber" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆行驶证所有人</div>
+        <input id="VehicleLicenseUser" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">会计凭证号</div>
-        <input id="AIAccountCertificate" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆识别号</div>
+        <input id="AIVehicleNumber" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">排气量</div>
-        <input id="DischargeVolume" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">车牌号</div>
+        <input id="AIPlateNumber" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">建筑面积</div>
+        <div class="lr-form-item-title">面积</div>
         <input id="AIBuiltArea" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产规格</div>
-        <input id="AISpecification" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AIUse" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">权属证号</div>
+        <input id="AIOwnership" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属说明</div>
-        <textarea id="AIOwnerRemark" readonly="readonly" class="form-control" style="height:100px;"></textarea>
+        <div class="lr-form-item-title">土地使用权类型</div>
+        <input id="LandUseType" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="AIRemark" readonly="readonly" class="form-control" style="height:100px;"></textarea>
+        <div class="lr-form-item-title">土地使用权人</div>
+        <input id="LandUseUser" readonly="readonly" type="text" class="form-control" />
     </div>
 
-
-
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js

@@ -15,7 +15,26 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
             $('#AIIsInStorage').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#ScrapRemindTime').lrDataItemSelect({ code: 'ScrapRemindTime' });
             $('#AIDepartment').lrselect({
@@ -29,6 +48,7 @@ var bootstrap = function ($, learun) {
             $('#AIASSClass').lrDataSourceSelect({ code: 'Ass_AssetsType', value: 'atid', text: 'aname' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIAddType').lrDataItemSelect({ code: 'AssAddType' });
+            $('#AIAssType').lrDataItemSelect({ code: 'AssType' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml

@@ -15,7 +15,7 @@
 <div class="lr-layout lr-layout-left-center ">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
-            <div class="lr-layout-title lrlt ">资产属性</div>
+            <div class="lr-layout-title lrlt ">资产分类</div>
             <div id="dataTree" class="lr-layout-body"></div>
         </div>
     </div>
@@ -34,24 +34,40 @@
                                 <input id="AICode" type="text" class="form-control" />
                             </div>*@
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">金隅编号</div>
+                                    <div class="lr-form-item-title">资产编号</div>
                                     <input id="AICodeNumJY" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="AIDepartment"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">使用人员</div>
+                                    <div id="AIUsePeople"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产名称</div>
                                     <input id="AIASSName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房</div>
+                                    <div class="lr-form-item-title">楼宇名称</div>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">房间号</div>
+                                    <div id="AIIStoragePosition"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间功能</div>
+                                    <input id="RFunction" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间面积</div>
+                                    <input id="RArea" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间状态</div>
+                                    <div id="REnabled"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产状态</div>
@@ -79,6 +95,7 @@
                         <a id="lr_scrap" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;报废</a>
                         <a id="lr_detail" class="btn btn-default"><i class="fa fa-bars"></i>&nbsp;查看出入记录</a>
                         <a id="lr_usedetail" class="btn btn-default"><i class="fa fa-bars"></i>&nbsp;查看使用人员记录</a>
+                        <a id="lr_exportexcel" class="btn btn-default"><i class="fa fa-sign-out"></i>&nbsp;导出</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js

@@ -6,8 +6,10 @@
  */
 var refreshGirdData;
 var AId = request("AId");
+var TreeAIASSClass = '';
 var currentUser = request("currentUser");//我的资产需要用到
 var IsDelete = request("IsDelete");//报废资产需要使用
+var exportWhere = '';
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -29,18 +31,48 @@ var bootstrap = function ($, learun) {
             //        page.search({ AIAssType: item.value });
             //    }
             //});
+
             $('#dataTree').lrtree({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetTree',
                 nodeClick: function (item) {
+                    if (item && item.value) {
+                        TreeAIASSClass = item.value;
+                    }
                     page.search({ AIASSClass: item.value });
                 }
-            }); 
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                exportWhere = queryJson;
                 page.search(queryJson);
-            }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            }, 500, 400);
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
-            $('#AIDepartment').lrDepartmentSelect();
+            $('#AIDepartment').lrDepartmentSelect({
+                select: function (val) {
+                    $('#AIUsePeople').lrselectRefresh({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentId?departmentId=' + val.value, text: 'F_RealName', value: 'F_UserId' })
+                }
+            });
+            $('#AIUsePeople').lrselect({ allowSearch: true, text: 'F_RealName', value: 'F_UserId' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -65,6 +97,7 @@ var bootstrap = function ($, learun) {
                 height: 80
             });
             $("#lr_printBar").on('click', function () {
+                var AIId = $('#gridtable').jfGridValue('AIId');
                 var keyValue = $('#gridtable').jfGridValue('AICode');
                 var AName = $('#gridtable').jfGridValue('AIASSName');
                 if (learun.checkrow(keyValue)) {
@@ -86,11 +119,12 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formcardprint',
                         title: '打印二维码',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/QRPrint?keyValue=' + keyValue+'&aName='+escape(AName),
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/QRPrint?keyValue=' + keyValue + '&aName=' + escape(AName) + '&AIId=' + AIId,
                         width: 700,
                         height: 300,
                         btn: null,
-                        end: function () { refreshGirdData(); }
+                        end: function () { //refreshGirdData();
+                        }
                     });
                 }
 
@@ -184,53 +218,151 @@ var bootstrap = function ($, learun) {
                 }
             });
 
+
+            $('#lr_exportexcel').on('click', function () {
+                page.exportExcel();
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetPageList',
                 headData: [
-                    { label: "明细编号", name: "AICode", width: 200, align: "left" },
+                    //{ label: "明细编号", name: "AICode", width: 200, align: "left" },
+                    //{ label: "序号", name: "AICodeNum", width: 100, align: "left" },
                     { label: "资产编号", name: "AICodeNumJY", width: 200, align: "left" },
-                    { label: "名称", name: "AIASSName", width: 200, align: "left" },
                     {
-                        label: "部门", name: "AIDepartment", width: 100, align: "left",
+                        label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('department', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "使用人员", name: "AIUsePeople", width: 100, align: "left",
+                        label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
                                 key: value,
-                                keyId: 'f_userid',
+                                keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['f_realname']);
+                                    callback(_data['rcode']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
+                        label: "房间功能", name: "RFunction", width: 150, align: "left"
+                    },
+                    {
+                        label: "房间面积", name: "RArea", width: 100, align: "left"
+                    },
+                    {
+                        label: "房间状态", name: "REnabled", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RoomState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "资产名称", name: "AIASSName", width: 200, align: "left" },
+                    {
+                        label: '资产分类', name: 'AIASSClass', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
                                 key: value,
-                                keyId: 'sid',
+                                keyId: 'atid',
                                 callback: function (_data) {
-                                    callback(_data['sname']);
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    //{ label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
+                    {
+                        label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
+                    },
+                    //***************数量
+                    {
+                        label: "计量单位", name: "AIUnits", 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: "AIASSState", 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: "AIIStoragePosition", width: 100, align: "left" },
+                    //{ label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
+                    {
+                        label: "管理部门", name: "AIDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('department', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用人", name: "AIUsePeople", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "存放地点", name: "AIPlace", width: 100, align: "left" },
+                    { label: "资产原价值", name: "AIAssValue", width: 100, align: "left" },
+                    { label: "入账日期", name: "AIAddTime", width: 100, align: "left" },
+                    { label: "备注", name: "AIRemark", width: 100, align: "left" },
+                    { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" },
+                    { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" },
+                    { label: "折旧年限", name: "UsefulLife", width: 100, align: "left" },
+                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
+                    { label: "已提折旧月数", name: "MonthsOfDepreciation", width: 100, align: "left" },
+                    { label: "月折旧率", name: "MonthlyDepreciationRate", width: 100, align: "left" },
+                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
+                    { label: "净值", name: "NetWorth", width: 100, align: "left" },
+                    { label: "车辆行驶证所有人", name: "VehicleLicenseUser", width: 100, align: "left" },
+                    { label: "车辆识别号", name: "AIVehicleNumber", width: 100, align: "left" },
+                    { label: "车牌号", name: "AIPlateNumber", width: 100, align: "left" },
+                    { label: "面积", name: "AIBuiltArea", width: 100, align: "left" },
+                    { label: "权属证号", name: "AIOwnership", width: 100, align: "left" },
+                    { label: "土地使用权类型", name: "LandUseType", width: 100, align: "left" },
+                    { label: "土地使用权人/房屋所有权人", name: "LandUseUser", width: 200, align: "left" }
+
                     //{
                     //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 
@@ -279,117 +411,102 @@ var bootstrap = function ($, learun) {
 
                     //    }
                     //},
-                    {
-                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
-                    },
-                    {
-                        label: "资产属性", name: "AIAssType", 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: "AIUnits", 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: "AIAssValue", width: 100, align: "left" },
-                    { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
-                    {
-                        label: "资产分类", name: "AIASSClass", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
-                                key: value,
-                                keyId: 'atid',
-                                callback: function (_data) {
-                                    callback(_data['aname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "资产状态", name: "AIASSState", 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: "AIAddType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
-                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
-                    { label: "用途", name: "AIUse", width: 100, align: "left" },
-                    { label: "采购组织形式", name: "ProcurementOrganizationForm", width: 100, align: "left" },
-                    { label: "预算项目编号", name: "BudgetItemNo", width: 100, align: "left" },
-                    { label: "取得方式", name: "MethodOfAcquisition", width: 100, align: "left" },
-                    { label: "取得日期", name: "TimeOfAcquisition", width: 100, align: "left" },
-                    { label: "产品序列号", name: "ProjectID", width: 100, align: "left" },
-                    { label: "销售商", name: "Seller", width: 100, align: "left" },
-                    { label: "合同编号", name: "ContractNo", width: 100, align: "left" },
-                    { label: "发票号", name: "InvoiceNumber", width: 100, align: "left" },
-                    { label: "配置标准分类名称", name: "ConfigurationName", width: 100, align: "left" },
-                    { label: "保修截止日期", name: "GuaranteeEndTime", width: 100, align: "left" },
-                    { label: "入账形式", name: "EntryForm", width: 100, align: "left" },
-                    { label: "价值类型", name: "ValueType", width: 100, align: "left" },
-                    { label: "财政拨款", name: "FinancialAllocation", width: 100, align: "left" },
-                    { label: "非财政拨款", name: "NonFinancialAppropriation", width: 100, align: "left" },
-                    { label: "使用状况", name: "Usage", width: 100, align: "left" },
-                    { label: "投入使用日期", name: "DateOfCommissioning", width: 100, align: "left" },
-                    { label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
-                    { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" },
-                    { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" },
-                    { label: "已提折旧月数", name: "MonthsOfDepreciation", width: 100, align: "left" },
-                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
-                    { label: "折旧年限（月）", name: "UsefulLife", width: 100, align: "left" },
-                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
-                    { label: "残值率", name: "ResidualValueRate", width: 100, align: "left" },
+
+                    //{
+                    //    label: "资产属性", name: "AIAssType", 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: "AIASSClass", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "增加方式", name: "AIAddType", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
+                    //{ label: "用途", name: "AIUse", width: 100, align: "left" },
+                    //{ label: "采购组织形式", name: "ProcurementOrganizationForm", width: 100, align: "left" },
+                    //{ label: "预算项目编号", name: "BudgetItemNo", width: 100, align: "left" },
+                    //{ label: "取得方式", name: "MethodOfAcquisition", width: 100, align: "left" },
+                    //{ label: "取得日期", name: "TimeOfAcquisition", width: 100, align: "left" },
+                    //{ label: "产品序列号", name: "ProjectID", width: 100, align: "left" },
+                    //{ label: "销售商", name: "Seller", width: 100, align: "left" },
+                    //{ label: "合同编号", name: "ContractNo", width: 100, align: "left" },
+                    //{ label: "发票号", name: "InvoiceNumber", width: 100, align: "left" },
+                    //{ label: "配置标准分类名称", name: "ConfigurationName", width: 100, align: "left" },
+                    //{ label: "保修截止日期", name: "GuaranteeEndTime", width: 100, align: "left" },
+                    //{ label: "入账形式", name: "EntryForm", width: 100, align: "left" },
+                    //{ label: "价值类型", name: "ValueType", width: 100, align: "left" },
+                    //{ label: "财政拨款", name: "FinancialAllocation", width: 100, align: "left" },
+                    //{ label: "非财政拨款", name: "NonFinancialAppropriation", width: 100, align: "left" },
+                    //{ label: "使用状况", name: "Usage", width: 100, align: "left" },
+                    //{ label: "投入使用日期", name: "DateOfCommissioning", width: 100, align: "left" },
+                    //{ label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
+                    //{ label: "残值率", name: "ResidualValueRate", width: 100, align: "left" },
                 ],
                 mainId: 'AIId',
                 isMultiselect: true,
                 isPage: true,
-                sidx: 'AICodeNum'
+                sidx: 'AICodeNum',
+                rows: 20
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
             param.AId = AId;
+            param.AIASSClass = TreeAIASSClass;
             if (currentUser) {
                 var userInfo = top.learun.clientdata.get(['userinfo']);
                 param.userId = userInfo.userId;
             }
             param.AIIsScrap = false;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        exportExcel: function () {
+
+            var param = exportWhere || {};
+            param.AId = AId;
+            param.AIASSClass = TreeAIASSClass;
+            if (currentUser) {
+                var userInfo = top.learun.clientdata.get(['userinfo']);
+                param.userId = userInfo.userId;
+            }
+            param.AIIsScrap = false;
+            learun.download({
+                method: "POST",
+                url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/ExportList',
+                param: {
+                    queryJson: JSON.stringify(param)
+                }
+            });
+            //$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml

@@ -46,12 +46,12 @@
                                     <input id="AIASSName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房</div>
+                                    <div class="lr-form-item-title">楼宇名称</div>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">房间号</div>
+                                    <div id="AIIStoragePosition"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js

@@ -32,7 +32,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIDepartment').lrDepartmentSelect();
             // 刷新
@@ -212,7 +231,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
+                        label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -224,7 +243,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
+                    {
+                        label: "房间号", name: "AIIStoragePosition", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                }
+                            });
+                        }
+                    },
                     //{
                     //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 
@@ -274,7 +305,7 @@ var bootstrap = function ($, learun) {
                     //    }
                     //},
                     {
-                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+                        label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
                     },
                     {
                         label: "资产属性", name: "AIAssType", width: 100, align: "left",
@@ -302,7 +333,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
-                    { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
+                    { label: "入账日期", name: "AIAddTime", width: 100, align: "left" },
                     {
                         label: "资产分类", name: "AIASSClass", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -341,7 +372,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
-                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
+                    { label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
                     { label: "用途", name: "AIUse", width: 100, align: "left" },
                 ],
                 mainId: 'AIId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml

@@ -46,12 +46,12 @@
                                     <input id="AIASSName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房</div>
+                                    <div class="lr-form-item-title">楼宇名称</div>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">房间号</div>
+                                    <div id="AIIStoragePosition"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js

@@ -25,7 +25,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIDepartment').lrDepartmentSelect();
             // 刷新
@@ -177,7 +196,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
+                        label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -189,7 +208,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
+                    {
+                        label: "房间号", name: "AIIStoragePosition", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode'] + '(' + _data['rname'] + ')');
+                                }
+                            });
+                        }
+                    },
                     //{
                     //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 
@@ -239,7 +270,7 @@ var bootstrap = function ($, learun) {
                     //    }
                     //},
                     {
-                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+                        label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
                     },
                     {
                         label: "资产属性", name: "AIAssType", width: 100, align: "left",
@@ -267,7 +298,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
-                    { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
+                    { label: "入账日期", name: "AIAddTime", width: 100, align: "left" },
                     {
                         label: "资产分类", name: "AIASSClass", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -306,7 +337,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
-                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
+                    { label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
                     { label: "用途", name: "AIUse", width: 100, align: "left" },
                 ],
                 mainId: 'AIId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml

@@ -30,7 +30,7 @@
                         <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="lr-form-item-title">资产编号</div>
                                     <input id="AICodeNumJY" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
@@ -42,12 +42,12 @@
                                     <input id="AIASSName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房</div>
+                                    <div class="lr-form-item-title">楼宇名称</div>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">房间号</div>
+                                    <div id="AIIStoragePosition"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js

@@ -33,7 +33,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId", allowSearch: true
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode', allowSearch: true });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIAssType').lrDataItemSelect({ code: 'AssType' });
             $('#AIDepartment').lrDepartmentSelect();
@@ -49,62 +68,58 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetPageList',
                 headData: [
-                    { label: "明细编号", name: "AICode", width: 200, align: "left" },
-                    { label: "金隅编号", name: "AICodeNumJY", width: 200, align: "left" },
-                    { label: "名称", name: "AIASSName", width: 200, align: "left" },
+                    //{ label: "明细编号", name: "AICode", width: 200, align: "left" },
+                    //{ label: "序号", name: "AICodeNum", width: 100, align: "left" },
+                    { label: "资产编号", name: "AICodeNumJY", width: 200, align: "left" },
                     {
-                        label: "部门", name: "AIDepartment", width: 100, align: "left",
+                        label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('department', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "使用人员", name: "AIUsePeople", width: 100, align: "left",
+                        label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
                                 key: value,
-                                keyId: 'f_userid',
+                                keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['f_realname']);
+                                    callback(_data['rcode']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "所在库房", name: "AIIStorageId", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
-                                key: value,
-                                keyId: 'sid',
-                                callback: function (_data) {
-                                    callback(_data['sname']);
-                                }
-                            });
-                        }
+                        label: "房间功能", name: "RFunction", width: 150, align: "left"
                     },
-                    { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
                     {
-                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+                        label: "房间面积", name: "RArea", width: 100, align: "left"
                     },
                     {
-                        label: "资产属性", name: "AIAssType", width: 100, align: "left",
+                        label: "房间状态", name: "REnabled", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'AssType',
+                                code: 'RoomState',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "资产名称", name: "AIASSName", width: 200, align: "left" },
+                    { label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
+                    {
+                        label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
+                    },
                     {
                         label: "计量单位", name: "AIUnits", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -115,51 +130,66 @@ var bootstrap = function ($, learun) {
                                     callback: function (_data) {
                                         callback(_data.text);
                                     }
-                                })
+                                });
                         }
                     },
-                    { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
-                    { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
                     {
-                        label: "资产分类", name: "AIASSClass", width: 100, align: "left",
+                        label: "资产状态", name: "AIASSState", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'atid',
+                                code: 'AssState',
                                 callback: function (_data) {
-                                    callback(_data['aname']);
+                                    callback(_data.text);
                                 }
                             });
                         }
                     },
+                    //{ label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
                     {
-                        label: "资产状态", name: "AIASSState", width: 100, align: "left",
+                        label: "管理部门", name: "AIDepartment", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('department', {
                                 key: value,
-                                code: 'AssState',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data.name);
                                 }
                             });
                         }
                     },
                     {
-                        label: "增加方式", name: "AIAddType", width: 100, align: "left",
+                        label: "使用人", name: "AIUsePeople", 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=' + 'BaseUser',
                                 key: value,
-                                code: 'zcly',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
-                    { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
-                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
-                    { label: "用途", name: "AIUse", width: 100, align: "left" },
+                    { label: "存放地点", name: "AIPlace", width: 100, align: "left" },
+                    { label: "资产原价值", name: "AIAssValue", width: 100, align: "left" },
+                    { label: "入账日期", name: "AIAddTime", width: 100, align: "left" },
+                    { label: "备注", name: "AIRemark", width: 100, align: "left" },
+                    { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" },
+                    { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" },
+                    { label: "折旧年限", name: "UsefulLife", width: 100, align: "left" },
+                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
+                    { label: "已提折旧月数", name: "MonthsOfDepreciation", width: 100, align: "left" },
+                    { label: "月折旧率", name: "MonthlyDepreciationRate", width: 100, align: "left" },
+                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
+                    { label: "净值", name: "NetWorth", width: 100, align: "left" },
+                    { label: "车辆行驶证所有人", name: "VehicleLicenseUser", width: 100, align: "left" },
+                    { label: "车辆识别号", name: "AIVehicleNumber", width: 100, align: "left" },
+                    { label: "车牌号", name: "AIPlateNumber", width: 100, align: "left" },
+                    { label: "面积", name: "AIBuiltArea", width: 100, align: "left" },
+                    { label: "权属证号", name: "AIOwnership", width: 100, align: "left" },
+                    { label: "土地使用权类型", name: "LandUseType", width: 100, align: "left" },
+                    { label: "土地使用权人/房屋所有权人", name: "LandUseUser", width: 200, align: "left" }
+
                 ],
                 mainId: 'AIId',
                 isMultiselect: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml

@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-
-
 <html>
 
 <head>
     <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>CardPrint</title>
-    @Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js")
-    <script src="/Content/js/qrcode.min.js"></script>
+    @Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js", "/Content/js/qrcode.min.js")
     <link href="~/Content/cardprint/CardPrint.css" rel="stylesheet" />
     <script>
         function request(d) {
@@ -15,46 +13,193 @@
                 var b = c[a].split("=");
                 if (b[0] == d)
                     if ("undefined" == unescape(b[1])) break;
-                    else return unescape(b[1])
+                    else return unescape(b[1]);
             }
-            return ""
+            return "";
         };
     </script>
+    <style>
+        body {
+            border: 0;
+            padding: 0 0 0px 0;
+            margin: 0;
+            /* font-family: Arial, Helvetica, sans-serif!important; */
+            /* font-weight: bold; */
+        }
+
+        #qrcodeBox {
+            width: 390px;
+            margin: 0 auto;
+        }
+
+        .qrcodeBox {
+            padding: 18px 5px 0;
+            /* margin-top:20px; */
+        }
+
+            .qrcodeBox > div {
+                margin: 0 auto 5px;
+            }
+
+        .qrcodes {
+            float: left;
+            font-size: 12px;
+        }
+
+        #roghtDiv {
+            margin-top: -2px;
+            margin-left: 70px;
+            text-align: left;
+        }
+
+            #roghtDiv div {
+                height: 20px;
+                line-height: 20px;
+                font-size: 13px;
+            }
+
+        #top {
+            overflow: hidden;
+        }
+
+        #bottom {
+            line-height: 24px;
+            font-size: 14x;
+            padding-top: 10px;
+        }
+
+            #bottom div {
+                height: 24px;
+                overflow: hidden;
+            }
+    </style>
 </head>
 
 <body style="">
-<div id="qrcodeBox" style="text-align:center;margin-top:20px;">
-    <div class="qrcodeBox" style="display:inline-block">
-        <div id="qrcode" style="margin:0 auto 5px;"></div>
-        <div class="qrcodeTxt" style="font-size:12px;"></div>
+    <div id="qrcodeBox">
+        
     </div>
-</div>
-<div id="btnprint" type="button" class="btns" value="打印">打印</div>
-<script>
-    //标签打印
-    var qrcode = new QRCode(document.getElementById("qrcode"), {
-        width: 80,
-        height: 80
-    });
-    var keyValue = request('keyValue');//二维码
-    var aName = request('aName');
-    $('.qrcodeTxt').html(unescape( aName));
-    $(function () {
-        qrcode.makeCode(keyValue);
-        $("#btnprint").on("click", function () {
-            AddPrintContent3()
-        });
+    <div id="btnprint" type="button" class="btns" value="打印">打印</div>
+    <script>
+        var keyValue = request('keyValue');
+        var aName = request('aName');
+        var AIId = request('AIId');
+        $(function () {
+            
+            $.ajax({
+                url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetFormData?keyValue=' + AIId,
+                type: "GET",
+                dataType: "json",
+                async: true,
+                success: function (res) {
+                    var data = res.data.Ass_AssetsInfoItem;
+					var arr = [];
+					if(!Array.isArray(data)){
+						arr.push(data)
+					}else{
+						arr = data
+					}
+					var html = '';
+
+					$.each(arr, function(i, n){
+						var AIDepartment = "部门：";
+						top.learun.clientdata.getAsync('department', {
+						    key: n.AIDepartment,
+						    callback: function (_data) {
+						        AIDepartment += _data.name;
+						    }
+						});
+                        var AIUsePeople = "姓名：";
+                        if (n.AIUsePeople) {
+					        top.learun.clientdata.getAsync('custmerData',
+					            {
+					                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+					                key: n.AIUsePeople,
+					                keyId: 'f_userid',
+					                callback: function(_data) {
+					                    AIUsePeople += _data['f_realname'];
+					                }
+					            });
+					    } else
+					        AIUsePeople += "暂无";
+						var AIIStorage = "位置：";
+						top.learun.clientdata.getAsync('custmerData',
+						    {
+						        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+						        key: n.AIIStorageId,
+						        keyId: 'sid',
+						        callback: function (_data) {
+						            AIIStorage += _data['sname'];
+						        }
+						    });
+						var AIIStoragePosition = "";
+						top.learun.clientdata.getAsync('custmerData',
+						    {
+						        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+						        key: n.AIIStoragePosition,
+						        keyId: 'rid',
+						        callback: function (_data) {
+						            AIIStoragePosition = _data['rcode'];
+						        }
+						    });
+						var AIIStorageStr = ''
+						if (AIIStoragePosition) {
+						    AIIStorageStr = AIIStorage + "-" + AIIStoragePosition;
+						} else {
+						    AIIStorageStr = AIIStorage;
+						}
+						html += '<div class="qrcodeBox" style="page-break-before: auto;page-break-after: always;"><div style="">'+
+									'<div id="top">'+
+										'<div id="qrcode'+ i +'" class="qrcodes" val="'+ n.AICodeNumJY +'"></div>'+
+										'<div id="roghtDiv" style="">'+
+											'<div id="AIDepartment">'+ AIDepartment +'</div>'+
+											'<div id="AIUsePeople">'+ AIUsePeople +'</div>'+
+											'<div id="AIIStorageAndRoom">'+ AIIStorageStr +'</div>'+
+										'</div>'+
+									'</div>'+
+									'<div id="bottom">'+
+										'<div id="AICodeNumJY">编号：'+ n.AICodeNumJY +'</div>'+
+										'<div id="AIASSName">名称：'+ n.AIASSName +'</div>'+
+									'</div>'+
+								'</div></div>';
+						// $('#AIDepartment').html(AIDepartment);
+						// $('#AIUsePeople').html(AIUsePeople);
+						// if (AIIStoragePosition) {
+						//     $('#AIIStorageAndRoom').html(AIIStorage + "-" + AIIStoragePosition);
+						// } else {
+						//     $('#AIIStorageAndRoom').html(AIIStorage);
+						// }
+						// $('#AICodeNumJY').html("编号："+data.AICodeNumJY);
+						// $('#AIASSName').html("名称："+data.AIASSName);
+					})
+                    
+                    $('#qrcodeBox').html(html);
+					$('.qrcodes').each(function(i, n){
+						var id = $(n).attr('id');
+						var val = $(n).attr('val')
+						var qrcode = new QRCode(document.getElementById(id), {
+						    width: 60,
+						    height: 60
+						});
+						qrcode.makeCode(val);
+					})
+                }
+            });
 
+            $("#btnprint").on("click", function () {
+                $('#qrcodeBox').jqprint();
+            });
 
-    });
-    // 打印表单
 
-    function AddPrintContent3() {
-        $('#btnprint').css('display', 'none')
-        window.print();
-        $('#btnprint').css('display', 'block')
-    }
-</script>
+        });
+
+        function AddPrintContent3() {
+            // $('#btnprint').css('display', 'none');
+            // window.print();
+            // $('#btnprint').css('display', 'block');
+            $('.tableBox').jqprint();
+        }
+    </script>
 </body>
 
 </html>