Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -29,14 +29,14 @@
         <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="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>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产编号</div>
         <input id="AICodeNumJY" type="text" class="form-control" />

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

@@ -265,54 +265,54 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
-                    //{
-                    //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
-
-                    //        if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) {
-                    //            var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/"));
-                    //            var nowDate = new Date();
-                    //            var timerange = datedifference(nowDate, validDate2);
-                    //            console.log(timerange);
-                    //            if (validDate2 > nowDate && timerange > 0) {
-                    //                switch (row.ScrapRemindTime) {
-                    //                    case 0:
-                    //                        if (timerange < 30) {
-                    //                            return '<span class=\"label label-warning\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
-                    //                        }
-                    //                    case 1:
-                    //                        if (timerange >= 30 && timerange < 90) {
-                    //                            return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
-                    //                        }
-                    //                    case 2:
-                    //                        if (timerange >= 90 && timerange < 180) {
-                    //                            return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
-                    //                        }
-                    //                    case 3:
-                    //                        if (timerange >= 180 && timerange < 360) {
-                    //                            return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
-                    //                        }
-
-                    //                    default:
-                    //                }
-
-                    //            } else {
-                    //                return '<span class=\"label label-danger\">已报废</span>';
-
-                    //            }
-                    //        } else {
-                    //            return '<span class=\"label label-info\">未设置</span>';
-                    //        }
-
-                    //    }
-                    //},
+                    {
+                        label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
+
+                            if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) {
+                                var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/"));
+                                var nowDate = new Date();
+                                var timerange = datedifference(nowDate, validDate2);
+                                console.log(timerange);
+                                if (validDate2 > nowDate && timerange > 0) {
+                                    switch (row.ScrapRemindTime) {
+                                        case 0:
+                                            if (timerange < 30) {
+                                                return '<span class=\"label label-warning\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
+                                            }
+                                        case 1:
+                                            if (timerange >= 30 && timerange < 90) {
+                                                return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
+                                            }
+                                        case 2:
+                                            if (timerange >= 90 && timerange < 180) {
+                                                return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
+                                            }
+                                        case 3:
+                                            if (timerange >= 180 && timerange < 360) {
+                                                return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
+                                            }
+
+                                        default:
+                                    }
+
+                                } else {
+                                    return '<span class=\"label label-danger\">已报废</span>';
+
+                                }
+                            } else {
+                                return '<span class=\"label label-info\">未设置</span>';
+                            }
+
+                        }
+                    },
                     {
                         label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
                     },

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

@@ -225,54 +225,54 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" },
-                    //{
-                    //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
+                    {
+                        label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 
-                    //        if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) {
-                    //            var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/"));
-                    //            var nowDate = new Date();
-                    //            var timerange = datedifference(nowDate, validDate2);
-                    //            console.log(timerange);
-                    //            if (validDate2 > nowDate && timerange > 0) {
-                    //                switch (row.ScrapRemindTime) {
-                    //                    case 0:
-                    //                        if (timerange < 30) {
-                    //                            return '<span class=\"label label-warning\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
-                    //                        }
-                    //                    case 1:
-                    //                        if (timerange >= 30 && timerange < 90) {
-                    //                            return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
-                    //                        }
-                    //                    case 2:
-                    //                        if (timerange >= 90 && timerange < 180) {
-                    //                            return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
-                    //                        }
-                    //                    case 3:
-                    //                        if (timerange >= 180 && timerange < 360) {
-                    //                            return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
-                    //                        } else {
-                    //                            return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
-                    //                        }
+                            if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) {
+                                var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/"));
+                                var nowDate = new Date();
+                                var timerange = datedifference(nowDate, validDate2);
+                                console.log(timerange);
+                                if (validDate2 > nowDate && timerange > 0) {
+                                    switch (row.ScrapRemindTime) {
+                                        case 0:
+                                            if (timerange < 30) {
+                                                return '<span class=\"label label-warning\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + validDate2.Format("yyyy-MM-dd") + '</span>';
+                                            }
+                                        case 1:
+                                            if (timerange >= 30 && timerange < 90) {
+                                                return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
+                                            }
+                                        case 2:
+                                            if (timerange >= 90 && timerange < 180) {
+                                                return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
+                                            }
+                                        case 3:
+                                            if (timerange >= 180 && timerange < 360) {
+                                                return '<span class=\"label label-warning\">' + row.AScrapTime + '</span>';
+                                            } else {
+                                                return '<span class=\"label label-info\">' + row.AScrapTime + '</span>';
+                                            }
 
-                    //                    default:
-                    //                }
+                                        default:
+                                    }
 
-                    //            } else {
-                    //                return '<span class=\"label label-danger\">已报废</span>';
+                                } else {
+                                    return '<span class=\"label label-danger\">已报废</span>';
 
-                    //            }
-                    //        } else {
-                    //            return '<span class=\"label label-info\">未设置</span>';
-                    //        }
+                                }
+                            } else {
+                                return '<span class=\"label label-info\">未设置</span>';
+                            }
 
-                    //    }
-                    //},
+                        }
+                    },
                     {
                         label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
                     },

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

@@ -3,21 +3,21 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
+    @*<div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
         <div class="lr-form-item-title">明细ID</div>
-        <input id="AIID" type="text" class="form-control"  />
-    </div>
+        <input id="AIID" type="text" class="form-control" readonly="readonly" />
+    </div>*@
     <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
-        <div class="lr-form-item-title">使用人员ID</div>
-        <input id="UserID" type="text" class="form-control"  />
+        <div class="lr-form-item-title">使用者</div>
+        <div id="UserID"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
         <div class="lr-form-item-title">修改时间</div>
         <input id="UCChangeTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#UCChangeTime').trigger('change'); } })"   />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
+    @*<div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
         <div class="lr-form-item-title">操作人</div>
         <div id="UCEditer"  ></div>
-    </div>
+    </div>*@
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js")

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

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#UCEditer').lrDataItemSelect({ code: '' });
+            $('#UserID').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -11,7 +11,7 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <div id="multiple_condition_query">
+                        @*<div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">明细ID</div>
@@ -26,7 +26,7 @@
                                     <div id="UCEditer"></div>
                                 </div>
                             </div>
-                        </div>
+                        </div>*@
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">
@@ -34,8 +34,8 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        @*<a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>*@
                         <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>

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

@@ -98,7 +98,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'aiid',
                                 callback: function (_data) {
-                                    callback(_data['aiassname']);
+                                    callback(_data['aicode']);
                                 }
                             });
                         }