资产导出-

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

@@ -264,55 +264,7 @@ 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" },                    
                     {
                         label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
                     },
@@ -407,6 +359,54 @@ var bootstrap = function ($, learun) {
                     { label: "折旧年限（月）", name: "UsefulLife", width: 100, align: "left" },
                     { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
                     { label: "残值率", name: "ResidualValueRate", 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>';
+                    //        }
+
+                    //    }
+                    //},
                 ],
                 mainId: 'AIId',
                 isMultiselect: true,