解决冲突

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

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                     { 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) {
+                        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,
@@ -59,7 +59,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '所在库位', name: 'aiistorageposition', 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']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: '是否在库', name: 'aiisinstorage', width: 150, align: 'left', formatter: function (val, row) {
                             if (val) {
@@ -174,7 +186,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 +200,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/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/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,26 @@ 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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
         },
         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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             // 刷新
             $('#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,25 +3,41 @@
     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>
+        <input id="ACode" 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">资产名称<font face="宋体">*</font></div>
+        <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">资产分类<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 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" />
+        <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>
-        <input id="AName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <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">英文名称</div>
-        <input id="AEName" type="text" class="form-control" />
+        <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-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">资产型号</div>
@@ -31,49 +47,35 @@
         <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>
     <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>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
         <div class="lr-form-item-title">供应商</div>
         <div id="ASupplierId"></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="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>
-        <input id="AStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <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-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">数量单位</div>
-        <div id="AUnit"></div>
+        <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">排序<font face="宋体">*</font></div>
-        <input id="AOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <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 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>
-        <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="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>
@@ -82,6 +84,6 @@
     <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>*@
 </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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
+            //$('#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_AssetsInfoItem/Form.cshtml

@@ -4,45 +4,20 @@
 }
 <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="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 class="lr-form-item-title">序号<font face="宋体">*</font></div>
-        <input id="AICodeNum" 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">所在库房<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 class="lr-form-item-title">序号<font face="宋体">*</font></div>
+            <input id="AICodeNum" 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">金隅编号</div>
+        <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">资产名称</div>
+        <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">
@@ -53,16 +28,42 @@
         <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">楼宇名称<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">房间号</div>
+        <div id="AIIStoragePosition" isvalid="yes" checkexpession="NotNull"></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>
+            <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">资产型号</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">资产属性<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="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>
+        <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">
@@ -81,67 +82,10 @@
         <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" />
@@ -164,7 +108,7 @@
     </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'); } })" />
+        <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>
@@ -235,17 +179,20 @@
         <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>
+        <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="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="ResidualValueRate" 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>
+<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>
@@ -257,5 +204,66 @@
 
 
 
+
+    @*<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>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.js")

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

@@ -15,7 +15,26 @@ 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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
+
             $('#AIIsInStorage').lrDataItemSelect({
                 code: 'YesOrNoBit', select: function (val) {
                     if (val) {

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

@@ -12,25 +12,23 @@
     }
 </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>
-    <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>
+    @*<img id="photo" />*@
     <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 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">资产名称</div>
+        <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">
@@ -38,7 +36,7 @@
             <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 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">
@@ -56,32 +54,42 @@
 
 
 
+    @*<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">序号<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>
+        <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">所在库房<font face="宋体">*</font></div>
-        <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
+        @*<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">楼宇名称<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>
-        <div id="AIUsePeople" readonly="readonly"></div>
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <div id="AIIStoragePosition" readonly="readonly" isvalid="yes" checkexpession="NotNull"></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>
         <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="AIAssType" readonly="readonly" checkexpession="NotNull"></div>
+    </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 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>
+        <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">
@@ -101,74 +109,116 @@
         <div id="AIAddType" readonly="readonly"></div>
     </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="AIManufacturer" 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>
     <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="ProcurementOrganizationForm" type="text" readonly="readonly" 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="AIBrand" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">预算项目编号</div>
+        <input id="BudgetItemNo" type="text" readonly="readonly" 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" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">取得方式</div>
+        <input id="MethodOfAcquisition" type="text" readonly="readonly" 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" readonly="readonly" 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="ProjectID" type="text" readonly="readonly" 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" readonly="readonly" 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="ContractNo" readonly="readonly" 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="InvoiceNumber" readonly="readonly" 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="ConfigurationName" 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="GuaranteeEndTime" 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="EntryForm" 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="ValueType" 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="FinancialAllocation" 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="NonFinancialAppropriation" 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="Usage" 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="DateOfCommissioning" 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="AdministrativeDepartment" 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="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="DischargeVolume" 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="AIBuiltArea" 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="AISpecification" 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="AIUse" type="text" readonly="readonly" 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="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="ResidualValueRate" readonly="readonly" type="text" class="form-control" />
+    </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" readonly="readonly" class="form-control" style="height:100px;"></textarea>

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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#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

@@ -34,7 +34,7 @@
                                 <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">
@@ -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.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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#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: 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']);
+                                }
+                            });
+                        }
+                    },
                     //{
                     //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 

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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#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: 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']);
+                                }
+                            });
+                        }
+                    },
                     //{
                     //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 

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

@@ -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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIAssType').lrDataItemSelect({ code: 'AssType' });
             $('#AIDepartment').lrDepartmentSelect();
@@ -77,7 +96,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',
@@ -89,7 +108,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "所在库位", name: "AIIStoragePosition", 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=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
                     },

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

@@ -66,12 +66,12 @@
         <input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
+        <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_AssetsInfoItemApply">
-        <div class="lr-form-item-title">所在库位</div>
-        <input id="AAIStoragePosition" type="text" class="form-control" />
+        <div class="lr-form-item-title">房间号</div>
+        <div id="AAIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>

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

@@ -100,7 +100,26 @@ var bootstrap = function ($, learun) {
             $('#AAISource').lrDataItemSelect({ code: 'zcly' });
             $('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
             $('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
-            $('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AAIStorageId').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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AAIHasDetail').lrDataItemSelect({
                 code: 'YesOrNoBit', select: function (item) {
                     if (item != null && item != undefined) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.cshtml

@@ -67,12 +67,12 @@
         <input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
+        <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_AssetsInfoItemApply">
-        <div class="lr-form-item-title">所在库位</div>
-        <input id="AAIStoragePosition" type="text" class="form-control" />
+        <div class="lr-form-item-title">房间号</div>
+        <div id="AAIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>

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

@@ -96,7 +96,26 @@ var bootstrap = function ($, learun) {
             $('#AAISource').lrDataItemSelect({ code: 'zcly' });
             $('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
             $('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
-            $('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AAIStorageId').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"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AAIHasDetail').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#AAIPhoto').lrUploader();
         },

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

@@ -89,7 +89,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        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,

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

@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
                     { 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) {
+                        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,
@@ -52,7 +52,20 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '所在库位', name: 'aiistorageposition', width: 150, align: 'left' },
+                    //{ label: '房间号', name: 'aiistorageposition', width: 150, 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=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: '是否在库', name: 'aiisinstorage', width: 150, align: 'left', formatter: function (val, row) {
                             if (val) {

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

@@ -18,12 +18,12 @@
         <input id="AAIName" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
-        <div class="lr-form-item-title">所在库房</div>
+        <div class="lr-form-item-title">楼宇名称</div>
         <div id="AAIStorage" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
-        <div class="lr-form-item-title">所在库位</div>
-        <input id="AAILocation" type="text" class="form-control" readonly="readonly" />
+        <div class="lr-form-item-title">房间号</div>
+        <div id="AAILocation" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
         <div class="lr-form-item-title">是否在库</div>

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

@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
                     { 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) {
+                        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,
@@ -52,7 +52,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '所在库位', name: 'aiistorageposition', 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']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: '是否在库', name: 'aiisinstorage', width: 150, align: 'left', formatter: function (val, row) {
                             if (val) {
@@ -88,7 +100,7 @@ var bootstrap = function ($, learun) {
                             $('#AAIName').val(data.aname);
                             $('#AAIStorage').lrselectSet(data.aiistorageid);
                             $('#AAIIsInStorage').lrselectSet(data.aiisinstorage);
-                            $('#AAILocation').val(data.aiistorageposition);
+                            $('#AAILocation').lrselectSet(data.aiistorageposition);
                             $('#AAIUnit').lrselectSet(data.aunit);
                             $('#AAIEName').val(data.aename);
                             $('#AAIModel').val(data.amodel);
@@ -99,7 +111,27 @@ var bootstrap = function ($, learun) {
                 },
                 isMultiple: false
             });
-            $('#AAIStorage').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AAIStorage').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AAIStorage').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AAILocation').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId"
+                    });
+                }
+            });
+            //房间
+            $('#AAILocation').lrselect({ value: 'RId', text: 'RCode' });
+
             $('#AAIIsInStorage').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -170,6 +170,11 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+        [HttpGet]
+        public ActionResult ContractFilingMonitor()
+        {
+            return View();
+        }
         /// <summary>
         /// 人事归档
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js

@@ -14,7 +14,6 @@ var bootstrap = function ($, learun) {
     var page = {
         init: function () {
             $('#lr_verify').hide();
-            page.initleft();
             page.initGrid();
             page.bind();
         },
@@ -99,74 +98,42 @@ var bootstrap = function ($, learun) {
                 $parent.find('.active').removeClass('active');
                 $this.addClass('active');
                 categoryId = $this.attr('data-value');
+                if (categoryId == 3) {
+                    categoryId = 1;
+                    F_EnabledMark = true;
+                } else {
+                    F_EnabledMark = false;
+                }
                 page.search();
             });
         },
         initGrid: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList',
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
                 headData: [
+                    { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
+                    { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" },
+                    { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" },
+                    { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" },
+                    { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
+                    { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
+                    { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
                     {
-                        label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) {
-                            if (row.F_SchemeName != row.F_Title && row.F_Title) {
-                                return row.F_SchemeName + "(" + row.F_Title + ")";
-                            }
-                            else {
-                                return row.F_SchemeName;
-                            }
+                        label: '合同开始时间', name: 'LC_htkssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
-                    //{
-                    //    label: "等级", name: "F_Level", width: 60, align: "center",
-                    //    formatter: function (cellvalue) {
-                    //        switch (cellvalue) {
-                    //            case 0:
-                    //                return '普通';
-                    //                break;
-                    //            case 1:
-                    //                return '重要';
-                    //                break;
-                    //            case 2:
-                    //                return '紧急';
-                    //                break;
-                    //            default:
-                    //                return '普通';
-                    //                break;
-                    //        }
-                    //    }
-                    //},
                     {
-                        label: "状态", name: "F_EnabledMark", width: 70, align: "center",
-                        formatter: function (cellvalue, row) {
-                            if (row.F_IsFinished == 0) {
-                                if (cellvalue == 1) {
-                                    if (row.F_IsUrge == "1" && categoryId == '2') {
-                                        return "<span class=\"label label-danger\">催办加急</span>";
-                                    }
-                                    return "<span class=\"label label-success\">运行中</span>";
-                                } else if (cellvalue == 2) {
-                                    return "<span class=\"label label-primary\">草稿</span>";
-                                } else {
-                                    return "<span class=\"label label-danger\">作废</span>";
-                                }
-                            }
-                            else {
-                                return "<span class=\"label label-warning\">结束</span>";
-                            }
-
+                        label: '合同结束时间', name: 'LC_htjssj', width: 100, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
-                    { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" },
-                    {
-                        label: "时间", name: "F_CreateDate", width: 150, align: "left",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss');
-                        }
-                    }
+                    { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" },
+                    { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }
                 ],
                 mainId: 'F_Id',
                 isPage: true,
-                sidx: 'F_CreateDate DESC',
+                sidx: 'F_ModifyDate DESC',
                 dblclick: function () {
                     page.eye();
                 }
@@ -177,21 +144,12 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
-            param.categoryId = categoryId;
-            param.F_Category = '合同类';
+            param.F_IsFinished = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         eye: function () {
-            var processId = $('#gridtable').jfGridValue('F_Id') || '';
-            var title = $('#gridtable').jfGridValue('F_Title');
-            var schemeName = $('#gridtable').jfGridValue('F_SchemeName');
-
-            if (schemeName != title && title) {
-                title = schemeName + "(" + title + ")";
-            }
-            else {
-                title = schemeName;
-            }
+            var processId = $('#gridtable').jfGridValue('LC_ID') || '';
+            var title = $('#gridtable').jfGridValue('LC_htmc');
 
             if (learun.checkrow(processId)) {
                 learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs

@@ -28,6 +28,11 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
         {
             return View();
         }
+        [HttpGet]
+        public ActionResult ApiIndex()
+        {
+            return View();
+        }
         /// <summary>
         /// 清空
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml

@@ -15,6 +15,10 @@
         <div class="lr-form-item-title">编号<font face="宋体">*</font></div>
         <input id="F_ItemCode" type="text" class="form-control" placeholder="请输入编号" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">标准编码<font face="宋体">*</font></div>
+        <input id="F_ItemCodeGB" type="text" class="form-control" placeholder="请输入编号" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
         <input id="F_SortCode" type="text" class="form-control" placeholder="请输入排序号" isvalid="yes" checkexpession="Num" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js

@@ -74,6 +74,9 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetClassifyList',
                 headData: [
+                    {
+                        label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left'
+                    },
                     { label: '名称', name: 'F_ItemName', width: 200, align: 'left' },
                     { label: '编号', name: 'F_ItemCode', width: 200, align: 'left' },
                     { label: '排序', name: 'F_SortCode', width: 50, align: 'center' },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml

@@ -12,6 +12,10 @@
         <div class="lr-form-item-title">项目值<font face="宋体">*</font></div>
         <input id="F_ItemValue" type="text" class="form-control" placeholder="请输入编号" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">标准编码<font face="宋体">*</font></div>
+        <input id="F_ItemCodeGB" type="text" class="form-control" placeholder="请输入编号" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
         <input id="F_SortCode" type="text" class="form-control" placeholder="请输入排序号" isvalid="yes" checkexpession="Num" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js

@@ -108,6 +108,9 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
                 headData: [
+                    {
+                        label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left'
+                    },
                     { label: '项目名', name: 'F_ItemName', width: 200, align: 'left' },
                     { label: '项目值', name: 'F_ItemValue', width: 200, align: 'left' },
                     { label: '简拼', name: 'F_SimpleSpelling', width: 150, align: 'left' },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.cshtml

@@ -13,6 +13,9 @@
                     <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">
+                        <a id="lr_viewlog" class="btn btn-default"><i class="fa fa-info-circle"></i>&nbsp;<span class="lrlt">在线会话监控</span></a>
+                    </div>
                 </div>
             </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/OnlineUserIndex.js

@@ -19,6 +19,18 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $('#lr_viewlog').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_OperateUserId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'online',
+                        title: '访问监控',
+                        url: top.$.rootUrl + '/Permission/Perm_FunctionVisit/IndexForCount?F_UserId='+keyValue,
+                        height: 500,
+                        width: 800
+                    });
+                }
+            });
         },
         initGrid: function () {
             $('#gridtable').jfGrid({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Controllers/Perm_FunctionVisitController.cs

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchGER/Form.cshtml

@@ -3,29 +3,29 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">组织名称<font face="宋体">*</font></div>
-        <input id="ResearchGroup" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="GerName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">专业组长<font face="宋体">*</font></div>
-        <input id="GroupName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="GerBoss" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">组织成员<font face="宋体">*</font></div>
-        <textarea id="GroupPeople" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <textarea id="Gerpeople" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchGER" >
-        <div class="lr-form-item-title">组织成立时间</div>
-        <input id="GroupTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GroupTime').trigger('change'); } })"   />
+    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
+        <div class="lr-form-item-title">成立时间</div>
+        <input id="Gertiem" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Gertiem').trigger('change'); } })"   />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">状态</div>
-        <div id="StateTex"></div>
+        <div id="GerState"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">备注</div>
-        <textarea id="RemarkNote" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="postscript" class="form-control" style="height:100px;"  ></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ResearchGER/Form.js")

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

@@ -1,7 +1,7 @@
 /* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
- * 日  期：2021-05-08 18:17
+ * 日  期：2021-05-11 18:17
  * 描  述：教科研组管理
  */
 var acceptClick;
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#StateTex').lrRadioCheckbox({
+            $('#GerState').lrRadioCheckbox({
                 type: 'radio',
                 code: 'EnableStatus',
             });

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

@@ -12,7 +12,7 @@
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">组织名称</div>
-                                    <input id="ResearchGroup" type="text" class="form-control" />
+                                    <input id="GerName" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

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

@@ -1,7 +1,7 @@
 /* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
- * 日  期：2021-05-08 18:17
+ * 日  期：2021-05-11 18:17
  * 描  述：教科研组管理
  */
 var refreshGirdData;
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 130, 200);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -35,7 +35,7 @@ var bootstrap = function ($, learun) {
             });
             // 编辑
             $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('MentTID');
+                var keyValue = $('#gridtable').jfGridValue('GerID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
@@ -51,7 +51,7 @@ var bootstrap = function ($, learun) {
             });
             // 删除
             $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('MentTID');
+                var keyValue = $('#gridtable').jfGridValue('GerID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
@@ -72,10 +72,10 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/GetPageList',
                 headData: [
-                    { label: "组织名称", name: "ResearchGroup", width: 100, align: "left"},
-                    { label: "专业组长", name: "GroupName", width: 100, align: "left"},
-                    { label: "组织成立时间", name: "GroupTime", width: 100, align: "left"},
-                    { label: "状态", name: "StateTex", width: 100, align: "left",
+                    { label: "组织名称", name: "GerName", width: 100, align: "left"},
+                    { label: "专业组长", name: "GerBoss", width: 100, align: "left"},
+                    { label: "成立时间", name: "Gertiem", width: 100, align: "left"},
+                    { label: "状态", name: "GerState", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
                                  key: value,
@@ -86,7 +86,7 @@ var bootstrap = function ($, learun) {
                              });
                         }},
                 ],
-                mainId:'MentTID',
+                mainId:'GerID',
                 isPage: true
             });
             page.search();

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

@@ -284,6 +284,7 @@
     <Compile Include="Areas\AppManager\AppManagerAreaRegistration.cs" />
     <Compile Include="Areas\AppManager\Controllers\DTImgController.cs" />
     <Compile Include="Areas\AppManager\Controllers\FunctionManagerController.cs" />
+    <Compile Include="Areas\Ask\Controllers\Ask_MainOfTeacherController.cs" />
     <Compile Include="Areas\AssetManagementSystem\AssetManagementSystemAreaRegistration.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\AllocationController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\AssReportController.cs" />
@@ -480,6 +481,7 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\OvertimeApplicationController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ResearchMentController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\StuSaverecordController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\TimeTableController.cs" />
     <Compile Include="Areas\PersonnelManagement\PersonnelManagementAreaRegistration.cs" />
@@ -799,6 +801,10 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_DefaultPwdConfigController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingSignInRecordController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingMinutesController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ResearchGERController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ReleaseMettingController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\StudyGuideController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ResourceImportController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -815,6 +821,14 @@
     <Content Include="Areas\AppManager\Views\FunctionManager\Form.css" />
     <Content Include="Areas\AppManager\Views\FunctionManager\Form.js" />
     <Content Include="Areas\AppManager\Views\FunctionManager\Index.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerIndex.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerQuery.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Form.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Index.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Paper.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperAdminView.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperView.js" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\TeacherIndex.js" />
     <Content Include="Areas\Ask\Views\Ask_Question\AnalysisIndex.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Allocation\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Allocation\Index.js" />
@@ -1003,6 +1017,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\IssueForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\PrintView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\ReadList.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\FormParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveFile\FormReadDocument.js" />
@@ -1296,6 +1311,7 @@
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexFlow.js" />
     <Content Include="Areas\LR_OAModule\Views\ResourceFile\BcIndex.js" />
     <Content Include="Areas\LR_OAModule\Views\Signet\Index.js" />
+    <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.js" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Form.css" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Form.js" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Index.js" />
@@ -1329,6 +1345,7 @@
     <Content Include="Areas\LR_PortalSite\Views\Page\SetContentForm.css" />
     <Content Include="Areas\LR_PortalSite\Views\Page\SetContentForm.js" />
     <Content Include="Areas\LR_PortalSite\Views\Page\SetNameForm.js" />
+    <Content Include="Areas\LR_ReportModule\Views\ReportTemplate\NWFSchemeReport.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\FileAuthAddFrom.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\FileAuthFrom.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\FileAuthIndex.js" />
@@ -1339,6 +1356,7 @@
     <Content Include="Areas\LR_SystemModule\Views\Files\Form.js" />
     <Content Include="Areas\LR_SystemModule\Views\Files\Index.css" />
     <Content Include="Areas\LR_SystemModule\Views\Files\Index.js" />
+    <Content Include="Areas\LR_SystemModule\Views\Log\ApiIndex.js" />
     <Content Include="Areas\LR_TaskScheduling\Views\TaskDesign\AddDetailedForm.css" />
     <Content Include="Areas\LR_TaskScheduling\Views\TaskDesign\AddDetailedForm.js" />
     <Content Include="Areas\LR_TaskScheduling\Views\TaskDesign\Form.css" />
@@ -1355,6 +1373,7 @@
     <Content Include="Areas\LR_TaskScheduling\Views\TSScheme\Index.js" />
     <Content Include="Areas\LR_TaskScheduling\Views\TSScheme\SelectExpressForm.css" />
     <Content Include="Areas\LR_TaskScheduling\Views\TSScheme\SelectExpressForm.js" />
+    <Content Include="Areas\Permission\Views\Perm_FunctionVisit\IndexForCount.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
@@ -1364,8 +1383,6 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
@@ -1397,7 +1414,16 @@
     <Content Include="Areas\StudentWork\Views\SW_Ask_Question\SelectIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Type\FormView.js" />
     <Content Include="Areas\StudentWork\Views\SW_HolidayGo\StatisticIndex.js" />
+    <Content Include="Content\css\DragSSO\blue.css" />
+    <Content Include="Content\css\DragSSO\common.css" />
+    <Content Include="Content\css\DragSSO\green.css" />
+    <Content Include="Content\css\DragSSO\index.css" />
+    <Content Include="Content\css\DragSSO\index2.css" />
+    <Content Include="Content\css\DragSSO\index3.css" />
+    <Content Include="Content\css\DragSSO\login5.css" />
+    <Content Include="Content\css\DragSSO\red.css" />
     <Content Include="Content\css\LoginModel\login8.css" />
+    <Content Include="Content\css\LoginModel\login9.css" />
     <Content Include="Content\css\OnlineRegistrate\Footer.html" />
     <Content Include="Content\css\OnlineRegistrate\Header.html" />
     <Content Include="Content\css\OnlineRegistrate\login.css" />
@@ -1719,6 +1745,154 @@
     <Content Include="Content\idcardreader\npCertReader.dll" />
     <Content Include="Content\images\calendar.png" />
     <Content Include="Content\images\chick1.png" />
+    <Content Include="Content\images\DragSSO\close.png" />
+    <Content Include="Content\images\DragSSO\close2.png" />
+    <Content Include="Content\images\DragSSO\download.png" />
+    <Content Include="Content\images\DragSSO\duigou.png" />
+    <Content Include="Content\images\DragSSO\head1.png" />
+    <Content Include="Content\images\DragSSO\head2.png" />
+    <Content Include="Content\images\DragSSO\head3.png" />
+    <Content Include="Content\images\DragSSO\head4-1.png" />
+    <Content Include="Content\images\DragSSO\head4-2.png" />
+    <Content Include="Content\images\DragSSO\head4-3.png" />
+    <Content Include="Content\images\DragSSO\head4.png" />
+    <Content Include="Content\images\DragSSO\headBg-green.jpg" />
+    <Content Include="Content\images\DragSSO\headBg-red.jpg" />
+    <Content Include="Content\images\DragSSO\headBg.jpg" />
+    <Content Include="Content\images\DragSSO\headBg2.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec2-1.png" />
+    <Content Include="Content\images\DragSSO\indexSec2-2.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-1.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-10.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-11.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-12.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-13.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-14.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-15.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-16.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-17.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-18.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-19.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-2.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-20.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-21.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-22.jpg" />
+    <Content Include="Content\images\DragSSO\indexSec3-23.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-24.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-25.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-26.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-27.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-28.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-3.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-4.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-5.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-6.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-7.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-8.png" />
+    <Content Include="Content\images\DragSSO\indexSec3-9.png" />
+    <Content Include="Content\images\DragSSO\indSec1-1.png" />
+    <Content Include="Content\images\DragSSO\indSec1-10.png" />
+    <Content Include="Content\images\DragSSO\indSec1-11.png" />
+    <Content Include="Content\images\DragSSO\indSec1-12.png" />
+    <Content Include="Content\images\DragSSO\indSec1-13.png" />
+    <Content Include="Content\images\DragSSO\indSec1-14.png" />
+    <Content Include="Content\images\DragSSO\indSec1-15.png" />
+    <Content Include="Content\images\DragSSO\indSec1-16.png" />
+    <Content Include="Content\images\DragSSO\indSec1-17.png" />
+    <Content Include="Content\images\DragSSO\indSec1-18.png" />
+    <Content Include="Content\images\DragSSO\indSec1-19.png" />
+    <Content Include="Content\images\DragSSO\indSec1-2.png" />
+    <Content Include="Content\images\DragSSO\indSec1-20.png" />
+    <Content Include="Content\images\DragSSO\indSec1-3.png" />
+    <Content Include="Content\images\DragSSO\indSec1-4.png" />
+    <Content Include="Content\images\DragSSO\indSec1-5.png" />
+    <Content Include="Content\images\DragSSO\indSec1-6.png" />
+    <Content Include="Content\images\DragSSO\indSec1-7.png" />
+    <Content Include="Content\images\DragSSO\indSec1-8.png" />
+    <Content Include="Content\images\DragSSO\indSec1-9.png" />
+    <Content Include="Content\images\DragSSO\indSec3-1.png" />
+    <Content Include="Content\images\DragSSO\indSec3-2.png" />
+    <Content Include="Content\images\DragSSO\indSec3-3.png" />
+    <Content Include="Content\images\DragSSO\indSec3-4.png" />
+    <Content Include="Content\images\DragSSO\indSec3-5.png" />
+    <Content Include="Content\images\DragSSO\indSec3-6.png" />
+    <Content Include="Content\images\DragSSO\inSec1-10.png" />
+    <Content Include="Content\images\DragSSO\inSec1-11.png" />
+    <Content Include="Content\images\DragSSO\inSec1-12.png" />
+    <Content Include="Content\images\DragSSO\inSec1-13.png" />
+    <Content Include="Content\images\DragSSO\inSec1-14.png" />
+    <Content Include="Content\images\DragSSO\inSec1-15.png" />
+    <Content Include="Content\images\DragSSO\inSec1-16.png" />
+    <Content Include="Content\images\DragSSO\inSec1-17.png" />
+    <Content Include="Content\images\DragSSO\inSec1-18.png" />
+    <Content Include="Content\images\DragSSO\inSec1-19.png" />
+    <Content Include="Content\images\DragSSO\inSec1-2.png" />
+    <Content Include="Content\images\DragSSO\inSec1-20.png" />
+    <Content Include="Content\images\DragSSO\inSec1-21.png" />
+    <Content Include="Content\images\DragSSO\inSec1-22.png" />
+    <Content Include="Content\images\DragSSO\inSec1-3.png" />
+    <Content Include="Content\images\DragSSO\inSec1-4.png" />
+    <Content Include="Content\images\DragSSO\inSec1-5.png" />
+    <Content Include="Content\images\DragSSO\inSec1-6.png" />
+    <Content Include="Content\images\DragSSO\inSec1-7.png" />
+    <Content Include="Content\images\DragSSO\inSec1-8.png" />
+    <Content Include="Content\images\DragSSO\inSec1-9.png" />
+    <Content Include="Content\images\DragSSO\inSec2-1.png" />
+    <Content Include="Content\images\DragSSO\inSec2-10.png" />
+    <Content Include="Content\images\DragSSO\inSec2-11.png" />
+    <Content Include="Content\images\DragSSO\inSec2-12.png" />
+    <Content Include="Content\images\DragSSO\inSec2-13.png" />
+    <Content Include="Content\images\DragSSO\inSec2-14.png" />
+    <Content Include="Content\images\DragSSO\inSec2-15.png" />
+    <Content Include="Content\images\DragSSO\inSec2-16.png" />
+    <Content Include="Content\images\DragSSO\inSec2-17.png" />
+    <Content Include="Content\images\DragSSO\inSec2-18.png" />
+    <Content Include="Content\images\DragSSO\inSec2-2.png" />
+    <Content Include="Content\images\DragSSO\inSec2-3.png" />
+    <Content Include="Content\images\DragSSO\inSec2-4.png" />
+    <Content Include="Content\images\DragSSO\inSec2-5.png" />
+    <Content Include="Content\images\DragSSO\inSec2-6.png" />
+    <Content Include="Content\images\DragSSO\inSec2-7.png" />
+    <Content Include="Content\images\DragSSO\inSec2-8.png" />
+    <Content Include="Content\images\DragSSO\inSec2-9.png" />
+    <Content Include="Content\images\DragSSO\inSec3-10.png" />
+    <Content Include="Content\images\DragSSO\inSec3-11.png" />
+    <Content Include="Content\images\DragSSO\inSec3-12.png" />
+    <Content Include="Content\images\DragSSO\inSec3-13.png" />
+    <Content Include="Content\images\DragSSO\inSec3-14.png" />
+    <Content Include="Content\images\DragSSO\inSec3-15.png" />
+    <Content Include="Content\images\DragSSO\inSec3-2.png" />
+    <Content Include="Content\images\DragSSO\inSec3-3.png" />
+    <Content Include="Content\images\DragSSO\inSec3-4.png" />
+    <Content Include="Content\images\DragSSO\inSec3-5.png" />
+    <Content Include="Content\images\DragSSO\inSec3-6.png" />
+    <Content Include="Content\images\DragSSO\inSec3-7.png" />
+    <Content Include="Content\images\DragSSO\inSec3-8.png" />
+    <Content Include="Content\images\DragSSO\inSec3-9.png" />
+    <Content Include="Content\images\DragSSO\inSec6-12.png" />
+    <Content Include="Content\images\DragSSO\inSec6-13.png" />
+    <Content Include="Content\images\DragSSO\inSec6-14.png" />
+    <Content Include="Content\images\DragSSO\inSec6-3.png" />
+    <Content Include="Content\images\DragSSO\inSec6-4.png" />
+    <Content Include="Content\images\DragSSO\inSec6-5.png" />
+    <Content Include="Content\images\DragSSO\inSec6-6.png" />
+    <Content Include="Content\images\DragSSO\login5-1.png" />
+    <Content Include="Content\images\DragSSO\login5-1s.png" />
+    <Content Include="Content\images\DragSSO\login5-2.png" />
+    <Content Include="Content\images\DragSSO\login5-2s.png" />
+    <Content Include="Content\images\DragSSO\login5-3.png" />
+    <Content Include="Content\images\DragSSO\login5-3s.png" />
+    <Content Include="Content\images\DragSSO\message.png" />
+    <Content Include="Content\images\DragSSO\noLogin.png" />
+    <Content Include="Content\images\DragSSO\right2.png" />
+    <Content Include="Content\images\DragSSO\search.png" />
+    <Content Include="Content\images\DragSSO\skin1.jpg" />
+    <Content Include="Content\images\DragSSO\skin2.jpg" />
+    <Content Include="Content\images\DragSSO\skin3.jpg" />
+    <Content Include="Content\images\DragSSO\tips1.png" />
+    <Content Include="Content\images\DragSSO\user.jpg" />
+    <Content Include="Content\images\DragSSO\verCode.png" />
+    <Content Include="Content\images\DragSSO\weixin.png" />
     <Content Include="Content\images\floor\inSec1-10_2.png" />
     <Content Include="Content\css\font-awesome.css" />
     <Content Include="Content\css\index.css" />
@@ -1813,6 +1987,7 @@
     <Content Include="Content\images\LoginPage\wxLogin.png" />
     <Content Include="Content\images\LoginPage\xxlogo.png" />
     <Content Include="Content\images\LoginPage\zuo.png" />
+    <Content Include="Content\images\Login\key.png" />
     <Content Include="Content\images\Login\login8-1.png" />
     <Content Include="Content\images\Login\login8-2.png" />
     <Content Include="Content\images\Login\login8-3.png" />
@@ -1822,12 +1997,16 @@
     <Content Include="Content\images\Login\login8-7.png" />
     <Content Include="Content\images\Login\login8-8.png" />
     <Content Include="Content\images\Login\loginBg8.jpg" />
+    <Content Include="Content\images\Login\loginBg9.jpg" />
     <Content Include="Content\images\Login\logo8.png" />
+    <Content Include="Content\images\Login\logo9.png" />
+    <Content Include="Content\images\Login\person.png" />
     <Content Include="Content\images\Login\user1.jpg" />
     <Content Include="Content\images\Login\user2.jpg" />
     <Content Include="Content\images\Login\user3.jpg" />
     <Content Include="Content\images\Login\user4.png" />
     <Content Include="Content\images\Login\user5.png" />
+    <Content Include="Content\images\Login\variCode.png" />
     <Content Include="Content\images\Login\verCode.png" />
     <Content Include="Content\images\OnlineRegistrate\bj1.png" />
     <Content Include="Content\images\OnlineRegistrate\error.png" />
@@ -2845,6 +3024,14 @@
     <Content Include="Content\jquery\qrcode.min.js" />
     <Content Include="Content\js\bootstrap.min.js" />
     <Content Include="Content\js\china.js" />
+    <Content Include="Content\js\DragSSO\aLeft.js" />
+    <Content Include="Content\js\DragSSO\index.js" />
+    <Content Include="Content\js\DragSSO\index2.js" />
+    <Content Include="Content\js\DragSSO\index3.js" />
+    <Content Include="Content\js\DragSSO\indexData.js" />
+    <Content Include="Content\js\DragSSO\inSecHead.js" />
+    <Content Include="Content\js\DragSSO\main.js" />
+    <Content Include="Content\js\DragSSO\sortable.js" />
     <Content Include="Content\js\easing.js" />
     <Content Include="Content\js\echarts.js" />
     <Content Include="Content\js\echarts.min.js" />
@@ -3802,6 +3989,8 @@
     <Content Include="Views\Login\PageFive\IndexWxLogin.js" />
     <Content Include="Views\Login\PageFour\IndexWxLogin.js" />
     <Content Include="Views\Login\PageOne\IndexWxLogin.js" />
+    <Content Include="Views\Login\PageSeven\Index.js" />
+    <Content Include="Views\Login\PageSeven\IndexWxLogin.js" />
     <Content Include="Views\Login\PageSix\IndexWxLogin.js" />
     <Content Include="Views\Login\PageSix\Index.js" />
     <Content Include="Views\Login\PageFive\Index.js" />
@@ -6163,6 +6352,22 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingMinutes\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ReleaseMetting\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ReleaseMetting\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ReleaseMetting\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ReleaseMetting\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\StudyGuide\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\StudyGuide\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\StudyGuide\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\StudyGuide\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />
@@ -6935,8 +7140,6 @@
     <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\ResearchGER\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.cshtml" />
@@ -6949,6 +7152,21 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticCountIndex.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeForm.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\StatisticTimeIndex.cshtml" />
+    <Content Include="Areas\LR_ReportModule\Views\ReportTemplate\NWFSchemeReport.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\PrintView.cshtml" />
+    <Content Include="Areas\LR_SystemModule\Views\Log\ApiIndex.cshtml" />
+    <Content Include="Areas\LR_SystemModule\Views\Log\ApiIndex.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFilingMonitor.cshtml" />
+    <Content Include="Areas\Permission\Views\Perm_FunctionVisit\IndexForCount.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerIndex.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\AnswerQuery.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Form.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Index.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\Paper.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperAdminView.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperView.cshtml" />
+    <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\TeacherIndex.cshtml" />
+    <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
@@ -7019,6 +7237,14 @@
     <Content Include="Views\Login\PageTwoWxLogin.cshtml" />
     <Content Include="Views\Home\SSOApplication.cshtml" />
     <Content Include="Views\Home\GoToApplication.cshtml" />
+    <Content Include="Views\SSOSystem\DragModelOne.cshtml" />
+    <Content Include="Views\SSOSystem\DragModelThree.cshtml" />
+    <Content Include="Views\SSOSystem\DragModelTwo.cshtml" />
+    <Content Include="Views\SSOSystem\DragNoLogin.cshtml" />
+    <Content Include="Views\SSOSystem\DragNoWxLogin.cshtml" />
+    <Content Include="Views\SSOSystem\_LayoutSSODrag.cshtml" />
+    <Content Include="Views\Login\PageSeven.cshtml" />
+    <Content Include="Views\Login\PageSevenWxLogin.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js

@@ -421,6 +421,7 @@
                     table: '',
                     field: "",
                     proportion: '1',
+                    verify: '',
 
                     dataSource: '0',  // 0数据字典1数据源
                     dataSourceId: '',
@@ -431,7 +432,7 @@
             },
             property: function ($component) {
                 var dfop = $component[0].dfop;
-                var $html = setComponentPropertyHtml($component);
+                var $html = setComponentPropertyHtml($component, verifyDatalist2);
                 var _html = '';
                 _html += '<div class="lr-component-title">数据来源</div>';
                 _html += '<div class="lr-component-control"><div id="lr_component_dataSource"></div></div>';
@@ -459,7 +460,7 @@
                 setDatasource(dfop);
             },
             renderTable: function (compont, $row) {//使用表单的时候渲染成table
-                var $compont = $('<div class="radio"></div>');
+                var $compont = $('<div id="' + compont.id + '" class="radio"></div>');
                 /*获取数据字典或者数据源数据*/
                 if (compont.dataSource == '0') {
                     learun.clientdata.getAllAsync('dataItem', {
@@ -488,7 +489,7 @@
                 return $compont;
             },
             renderQuery: function (compont, $row) {
-                var $compont = $('<div class="radio"></div>');
+                var $compont = $('<div id="' + compont.id + '" class="radio"></div>');
                 /*获取数据字典或者数据源数据*/
                 if (compont.dataSource == '0') {
                     learun.clientdata.getAllAsync('dataItem', {
@@ -530,17 +531,18 @@
                     table: '',
                     field: "",
                     proportion: '1',
+                    verify: '',
 
                     dataSource: '0',  // 0数据字典1数据源
                     dataSourceId: '',
-                    itemCode:'',
+                    itemCode: '',
                     dfvalue: ''       // 默认值
                 };
                 $component.html(getComponentRowHtml({ name: $component[0].dfop.title, text: "多选项" }));
             },
             property: function ($component) {
                 var dfop = $component[0].dfop;
-                var $html = setComponentPropertyHtml($component);
+                var $html = setComponentPropertyHtml($component, verifyDatalist2);
                 var _html = '';
                 _html += '<div class="lr-component-title">数据来源</div>';
                 _html += '<div class="lr-component-control"><div id="lr_component_dataSource"></div></div>';
@@ -567,7 +569,7 @@
                 setDatasource(dfop);
             },
             renderTable: function (compont, $row) {//使用表单的时候渲染成table
-                var $compont = $('<div class="checkbox"></div>');
+                var $compont = $('<div id="' + compont.id + '" class="checkbox"></div>');
                 /*获取数据字典或者数据源数据*/
                 if (compont.dataSource == '0') {
                     learun.clientdata.getAllAsync('dataItem', {
@@ -597,7 +599,7 @@
                 return $compont;
             },
             renderQuery: function (compont, $row) {
-                var $compont = $('<div class="checkbox"></div>');
+                var $compont = $('<div id="' + compont.id + '" class="checkbox"></div>');
                 /*获取数据字典或者数据源数据*/
                 if (compont.dataSource == '0') {
                     learun.clientdata.getAllAsync('dataItem', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formrender.js

@@ -106,6 +106,7 @@
     $.lrValidCustmerform = function () {
         var validateflag = true;
         var validHelper = learun.validator;
+
         $('body').find("[isvalid=yes]").each(function () {
             var $this = $(this);
             if ($this.parent().find('.lr-field-error-info').length > 0) {
@@ -126,7 +127,27 @@
                 value = $this.lrformselectGet();
             }
             else {
-                value = $this.val();
+                if ($this.hasClass("checkbox")) {//多选框
+                    var checkedList = $this.find("input[name='" + $this.attr('id') + "']:checked");
+                    if (checkedList.length > 0) {
+                        value = '';
+                        $.each(checkedList, function (i, item) {
+                            if (value != '' && value != undefined) {
+                                value += ',';
+                            }
+                            value += $(item).val();
+                        });
+                    }
+                }
+                else if ($this.hasClass("radio")) {//单选框
+                    var checkedList = $this.find("input[name='" + $this.attr('id') + "']:checked");
+                    if (checkedList.length > 0) {
+                        value = checkedList.val();
+                    }
+                }
+                else {
+                    value = $this.val();
+                }
             }
             var r = { code: true, msg: '' };
             if (checkexpession == 'LenNum' || checkexpession == 'LenNumOrNull' || checkexpession == 'LenStr' || checkexpession == 'LenStrOrNull') {
@@ -236,6 +257,12 @@
                 if ($obj.hasClass("lr-input-wdatepicker")) {
                     type = "datepicker";
                 }
+                else if ($obj.hasClass("checkbox")) {
+                    type = "checkbox";
+                }
+                else if ($obj.hasClass("radio")) {
+                    type = "radio";
+                }
                 switch (type) {
                     case "lrselect":
                         $obj.lrselectSet(value);
@@ -243,6 +270,21 @@
                     case "formselect":
                         $obj.lrformselectSet(value);
                         break;
+                    case "checkbox":
+                        $obj.find('input[name="' + id + '"]:checked').trigger('click');
+                        if (value != null && value != undefined && value != '') {
+                            vs = value.split(',');
+                            for (var i = 0; i < vs.length; i++) {
+                                $obj.find('input[name="' + id + '"][value="' + vs[i] + '"]').trigger('click');
+                            }
+                        }
+                        break;
+                    case "radio":
+                        $obj.find('input[name="' + id + '"]:checked').trigger('click');
+                        if (value != null && value != undefined && value != '') {
+                            $obj.find('input[name="' + id + '"][value="' + value + '"]').trigger('click');
+                        }
+                        break;
                     case "datepicker":
                         if ($obj.attr('dateformat') == "0") {
                             $obj.val(learun.formatDate(value, 'yyyy-MM-dd'));

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator.js

@@ -12,7 +12,7 @@
         /*错误处理*/
         $this.addClass('lr-field-error');
         $this.parent().append('<div class="lr-field-error-info" title="' + errormsg + '！"><i class="fa fa-info-circle"></i></div>');
-        var validatemsg = $this.parent().find('.form-item-title').text() + ' ' + errormsg;
+        var validatemsg = $this.parent().find('.lr-form-item-title').text() + ' ' + errormsg;
         learun.alert.error('表单信息输入有误,请检查！</br>' + validatemsg);
         if ($this.attr('type') == 'lrselect') {
             $this.on('change', function () {
@@ -32,6 +32,16 @@
                 }
             });
         }
+        else if ($this.hasClass('checkbox')) {
+            $this.on('change', function () {
+                removeErrorMessage($(this));
+            });
+        }
+        else if ($this.hasClass('radio')) {
+            $this.on('change', function () {
+                removeErrorMessage($(this));
+            });
+        }
         else {
             $this.on('input propertychange', function () {
                 var $input = $(this);

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSixWxLogin.cshtml

@@ -108,7 +108,7 @@
         width: 200,
         height: 200
     });
-    makeCode('@ViewBag.QRCodeUrl')
+    makeCode('@ViewBag.QRCodeUrl');
     $('.loginTab li').click(function() {
         var flag = $(this).hasClass('active');
         if (!flag) {
@@ -116,9 +116,9 @@
             $(this).addClass('active').siblings().removeClass('active');
             $('.loginTabCon').css('display', 'none').eq(ind).fadeIn();
         } else {
-            return
+            return;
         }
-    })
+    });
 
     function makeCode(urls) {
         qrcode.makeCode(urls);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs

@@ -39,6 +39,12 @@ namespace Learun.Application.Base.SystemModule
         [Column("F_ITEMCODE")]
         public string F_ItemCode { get; set; }
         /// <summary>
+        /// 标准编码
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_ITEMCODEGB")]
+        public string F_ItemCodeGB { get; set; }
+        /// <summary>
         /// 名称
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemEntity.cs

@@ -33,6 +33,12 @@ namespace Learun.Application.Base.SystemModule
         [Column("F_ITEMCODE")]
         public string F_ItemCode { get; set; }
         /// <summary>
+        /// 标准编码
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_ITEMCODEGB")]
+        public string F_ItemCodeGB { get; set; }
+        /// <summary>
         /// 分类名称
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs

@@ -24,6 +24,7 @@ namespace Learun.Application.Base.SystemModule
                     t.F_ItemId,
                     t.F_ParentId,
                     t.F_ItemCode,
+                    t.F_ItemCodeGB,
                     t.F_ItemName,
                     t.F_IsTree,
                     t.F_IsNav,
@@ -43,6 +44,7 @@ namespace Learun.Application.Base.SystemModule
                     t.F_ItemId,
                     t.F_ParentId,
                     t.F_ItemCode,
+                    t.F_ItemCodeGB,
                     t.F_ItemName,
                     t.F_ItemValue,
                     t.F_QuickQuery,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -61,6 +61,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Ask\Ask_MainOfTeacherMap.cs" />
+    <Compile Include="Ask\Ask_TeacherMainMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_InventoryItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_PurchaseItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItemMap.cs" />
@@ -552,8 +554,11 @@
     <Compile Include="PersonnelManagement\MeetingSignInRecordMap.cs" />
     <Compile Include="PersonnelManagement\MeetingMinutesMap.cs" />
     <Compile Include="PersonnelManagement\ResearchMentMap.cs" />
-    <Compile Include="PersonnelManagement\ResearchGERMap.cs" />
     <Compile Include="PersonnelManagement\FundExaminerMap.cs" />
+    <Compile Include="PersonnelManagement\ResearchGERMap.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMettingMap.cs" />
+    <Compile Include="PersonnelManagement\StudyGuideMap.cs" />
+    <Compile Include="PersonnelManagement\ResourceImportMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ResearchGERMap.cs

@@ -7,7 +7,7 @@ namespace  Learun.Application.Mapping
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:17
+    /// 日 期：2021-05-11 18:17
     /// 描 述：教科研组管理
     /// </summary>
     public class ResearchGERMap : EntityTypeConfiguration<ResearchGEREntity>
@@ -18,7 +18,7 @@ namespace  Learun.Application.Mapping
             //表
             this.ToTable("RESEARCHGER");
             //主键
-            this.HasKey(t => t.MentTID);
+            this.HasKey(t => t.GerID);
             #endregion
 
             #region 配置关系

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -70,6 +70,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherBLL.cs" />
+    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherEntity.cs" />
+    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherIBLL.cs" />
+    <Compile Include="Ask\Ask_MainOfTeacher\Ask_MainOfTeacherService.cs" />
+    <Compile Include="Ask\Ask_TeacherMain\Ask_TeacherMainEntity.cs" />
     <Compile Include="AssetManagementSystem\Allocation\AllocationBLL.cs" />
     <Compile Include="AssetManagementSystem\Allocation\AllocationIBLL.cs" />
     <Compile Include="AssetManagementSystem\Allocation\AllocationService.cs" />
@@ -1629,14 +1634,26 @@
     <Compile Include="PersonnelManagement\ResearchMent\ResearchMentService.cs" />
     <Compile Include="PersonnelManagement\ResearchMent\ResearchMentBLL.cs" />
     <Compile Include="PersonnelManagement\ResearchMent\ResearchMentIBLL.cs" />
-    <Compile Include="PersonnelManagement\ResearchGER\ResearchGEREntity.cs" />
-    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERService.cs" />
-    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERBLL.cs" />
-    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERIBLL.cs" />
     <Compile Include="PersonnelManagement\FundExaminer\FundExaminerEntity.cs" />
     <Compile Include="PersonnelManagement\FundExaminer\FundExaminerService.cs" />
     <Compile Include="PersonnelManagement\FundExaminer\FundExaminerBLL.cs" />
     <Compile Include="PersonnelManagement\FundExaminer\FundExaminerIBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGEREntity.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERService.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERBLL.cs" />
+    <Compile Include="PersonnelManagement\ResearchGER\ResearchGERIBLL.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingEntity.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingService.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingBLL.cs" />
+    <Compile Include="PersonnelManagement\ReleaseMetting\ReleaseMettingIBLL.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideEntity.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideService.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideBLL.cs" />
+    <Compile Include="PersonnelManagement\StudyGuide\StudyGuideIBLL.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportEntity.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportService.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportBLL.cs" />
+    <Compile Include="PersonnelManagement\ResourceImport\ResourceImportIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_FunctionVisit/Perm_FunctionVisitService.cs

@@ -43,6 +43,11 @@ namespace Learun.Application.TwoDevelopment.Permission
                     dp.Add("PUName", "%" + queryParam["PUName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND a.PUName Like @PUName ");
                 }
+                if (!queryParam["F_UserId"].IsEmpty())
+                {
+                    dp.Add("F_UserId", "" + queryParam["F_UserId"].ToString() + "", DbType.String);
+                    strSql.Append(" AND a.PUId = @F_UserId ");
+                }
                 return this.BaseRepository().FindList<Perm_FunctionVisitEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERBLL.cs

@@ -9,7 +9,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:17
+    /// 日 期：2021-05-11 18:17
     /// 描 述：教科研组管理
     /// </summary>
     public class ResearchGERBLL : ResearchGERIBLL

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs

@@ -8,47 +8,47 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:17
+    /// 日 期：2021-05-11 18:17
     /// 描 述：教科研组管理
     /// </summary>
     public class ResearchGEREntity 
     {
         #region 实体成员
         /// <summary>
-        /// MentTID
+        /// GerID
         /// </summary>
-        [Column("MENTTID")]
-        public string MentTID { get; set; }
+        [Column("GERID")]
+        public string GerID { get; set; }
         /// <summary>
-        /// ResearchGroup
+        /// GerName
         /// </summary>
-        [Column("RESEARCHGROUP")]
-        public string ResearchGroup { get; set; }
+        [Column("GERNAME")]
+        public string GerName { get; set; }
         /// <summary>
-        /// GroupName
+        /// GerBoss
         /// </summary>
-        [Column("GROUPNAME")]
-        public string GroupName { get; set; }
+        [Column("GERBOSS")]
+        public string GerBoss { get; set; }
         /// <summary>
-        /// GroupTime
+        /// Gerpeople
         /// </summary>
-        [Column("GROUPTIME")]
-        public DateTime? GroupTime { get; set; }
+        [Column("GERPEOPLE")]
+        public string Gerpeople { get; set; }
         /// <summary>
-        /// StateTex
+        /// Gertiem
         /// </summary>
-        [Column("STATETEX")]
-        public bool? StateTex { get; set; }
+        [Column("GERTIEM")]
+        public DateTime? Gertiem { get; set; }
         /// <summary>
-        /// RemarkNote
+        /// GerState
         /// </summary>
-        [Column("REMARKNOTE")]
-        public string RemarkNote { get; set; }
+        [Column("GERSTATE")]
+        public string GerState { get; set; }
         /// <summary>
-        /// GroupPeople
+        /// postscript
         /// </summary>
-        [Column("GROUPPEOPLE")]
-        public string GroupPeople { get; set; }
+        [Column("POSTSCRIPT")]
+        public string postscript { get; set; }
         #endregion
 
         #region 扩展操作
@@ -57,7 +57,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         public void Create()
         {
-            this.MentTID = Guid.NewGuid().ToString();
+            this.GerID = Guid.NewGuid().ToString();
         }
         /// <summary>
         /// 编辑调用
@@ -65,7 +65,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue"></param>
         public void Modify(string keyValue)
         {
-            this.MentTID = keyValue;
+            this.GerID = keyValue;
         }
         #endregion
         #region 扩展字段

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERIBLL.cs

@@ -8,7 +8,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:17
+    /// 日 期：2021-05-11 18:17
     /// 描 述：教科研组管理
     /// </summary>
     public interface ResearchGERIBLL

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGERService.cs

@@ -12,7 +12,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
     /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2021-05-08 18:17
+    /// 日 期：2021-05-11 18:17
     /// 描 述：教科研组管理
     /// </summary>
     public class ResearchGERService : RepositoryFactory
@@ -32,23 +32,23 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.MentTID,
-                t.ResearchGroup,
-                t.GroupName,
-                t.GroupTime,
-                t.StateTex
+                t.GerID,
+                t.GerName,
+                t.GerBoss,
+                t.Gertiem,
+                t.GerState
                 ");
                 strSql.Append("  FROM ResearchGER t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                if (!queryParam["ResearchGroup"].IsEmpty())
+                if (!queryParam["GerName"].IsEmpty())
                 {
-                    dp.Add("ResearchGroup", "%" + queryParam["ResearchGroup"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.ResearchGroup Like @ResearchGroup ");
+                    dp.Add("GerName", "%" + queryParam["GerName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.GerName Like @GerName ");
                 }
-                return this.BaseRepository().FindList<ResearchGEREntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<ResearchGEREntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
             {
@@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                return this.BaseRepository().FindEntity<ResearchGEREntity>(keyValue);
+                return this.BaseRepository("CollegeMIS").FindEntity<ResearchGEREntity>(keyValue);
             }
             catch (Exception ex)
             {
@@ -99,7 +99,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository().Delete<ResearchGEREntity>(t=>t.MentTID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<ResearchGEREntity>(t=>t.GerID == keyValue);
             }
             catch (Exception ex)
             {
@@ -126,12 +126,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
-                    this.BaseRepository().Update(entity);
+                    this.BaseRepository("CollegeMIS").Update(entity);
                 }
                 else
                 {
                     entity.Create();
-                    this.BaseRepository().Insert(entity);
+                    this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }
             catch (Exception ex)