.
This commit is contained in:
		| @@ -13,7 +13,7 @@ $(function () { | ||||
|     dialogFUAssets.allowotherfilter = false; | ||||
|     dialogFUAssets.uid = uid; | ||||
|     dialogFUAssets.onDialogClosed = function () { | ||||
|         showbg(false);//showmaskbg被FIC里面的覆盖,使用FIC中的showbg | ||||
|         showmaskbg1(false); | ||||
|     }; | ||||
|     dialogFUAssets.onOK = function (source) { | ||||
|         var items = []; | ||||
| @@ -58,23 +58,23 @@ $(function () { | ||||
|         } | ||||
|  | ||||
|         grid_dtfilterassets.setData(grid_dtfilterassets.innerSource.concat(items)); | ||||
|         showbg(false); | ||||
|         showmaskbg1(false); | ||||
|     }; | ||||
|  | ||||
|     $('#dialog_filterassetgroup').prop('iframe', true).dialog(function () { | ||||
|         showbg(false); | ||||
|         showmaskbg1(false); | ||||
|     }); | ||||
|  | ||||
|     $('#dialog_filterjobsite').prop('iframe', true).dialog(function () { | ||||
|         showbg(false); | ||||
|         showmaskbg1(false); | ||||
|     }); | ||||
|  | ||||
|     $('#dialog_filterassettype').prop('iframe', true).dialog(function () { | ||||
|         showbg(false); | ||||
|         showmaskbg1(false); | ||||
|     }); | ||||
|  | ||||
|     $('#dialog_filtertemplate').prop('iframe', true).dialog(function () { | ||||
|         showbg(false); | ||||
|         showmaskbg1(false); | ||||
|     }); | ||||
|  | ||||
|     $("#sel_filtertemplate").change(function () { | ||||
| @@ -117,7 +117,7 @@ function InitGridFilterSelectedAssets() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -169,12 +169,11 @@ function OnFilterAssetAdd() { | ||||
|     if (!filterid) | ||||
|         return; | ||||
|  | ||||
|     showbg(true); | ||||
|     showmaskbg1(true); | ||||
|     dialogFUAssets.exceptSource = grid_dtfilterassets.innerSource.map(function (s) { | ||||
|         return s.Values.ID; | ||||
|     }); | ||||
|     dialogFUAssets.showSelector(); | ||||
|     $('#mask_bg').css('height', '100%'); | ||||
| } | ||||
|  | ||||
| function OnFilterMachineDelete() { | ||||
| @@ -223,7 +222,7 @@ function InitGridFilterSelectedAssetGroups() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -287,7 +286,7 @@ function InitGridFilterAvailableAssetGroups() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -392,14 +391,14 @@ function OnFilterAssetGroupAdd() { | ||||
|         return; | ||||
|     $('#txt_filterassetgroup_key').val(''); | ||||
|     $('#dialog_filterassetgroup .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETGROUPS", 'Select Asset Groups')); | ||||
|     $('#mask_bg').show(); | ||||
|     showmaskbg1(true); | ||||
|     $('#dialog_filterassetgroup') | ||||
|         .attr('act', 'edit') | ||||
|         .css({ | ||||
|             'top': (document.documentElement.clientHeight - $('#dialog_filterassetgroup').height()) / 3, | ||||
|             'left': (document.documentElement.clientWidth - $('#dialog_filterassetgroup').width()) / 2 | ||||
|         }) | ||||
|         .showDialog(); | ||||
|         .showDialogfixed(); | ||||
|  | ||||
|     GetFilerAssetGroupList(); | ||||
| } | ||||
| @@ -428,7 +427,7 @@ function OnSetFilterSelectAssetGroups() { | ||||
|  | ||||
|     showFilterSelectedAssetGroup(assetgroups); | ||||
|     $('#dialog_filterassetgroup').hideDialog(); | ||||
|     $('#mask_bg').hide(); | ||||
|     showmaskbg1(false); | ||||
| } | ||||
|  | ||||
| function OnFilterAssetGroupDelete() { | ||||
| @@ -476,7 +475,7 @@ function InitGridFilterSelectedJobsites() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -541,7 +540,7 @@ function InitGridFilterAvailableJobsites() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -649,14 +648,14 @@ function OnFilterJobsiteAdd() { | ||||
|  | ||||
|     $('#txt_filterjobsite_key').val(''); | ||||
|     $('#dialog_filterjobsite .dialog-title span.title').text(GetTextByKey("P_UM_SELECTJOBSITES", 'Select Jobsites')); | ||||
|     $('#mask_bg').show(); | ||||
|     showmaskbg1(true); | ||||
|     $('#dialog_filterjobsite') | ||||
|         .attr('act', 'edit') | ||||
|         .css({ | ||||
|             'top': (document.documentElement.clientHeight - $('#dialog_filterjobsite').height()) / 3, | ||||
|             'left': (document.documentElement.clientWidth - $('#dialog_filterjobsite').width()) / 2 | ||||
|         }) | ||||
|         .showDialog(); | ||||
|         .showDialogfixed(); | ||||
|  | ||||
|     GetFilterJobsiteList(); | ||||
| } | ||||
| @@ -685,7 +684,7 @@ function OnSetFilterSelectJobSites() { | ||||
|  | ||||
|     showFilterSelectedJobsite(jobsites); | ||||
|     $('#dialog_filterjobsite').hideDialog(); | ||||
|     $('#mask_bg').hide(); | ||||
|     showmaskbg1(false); | ||||
| } | ||||
|  | ||||
| function OnFilterJobsiteDelete() { | ||||
| @@ -735,7 +734,7 @@ function InitGridFilterSelectedAssetTypes() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -800,7 +799,7 @@ function InitGridFilterAvailableAssetTypes() { | ||||
|             // checkbox | ||||
|             name: 'check', | ||||
|             key: 'selected', | ||||
|             width: 30, | ||||
|             width: 45, | ||||
|             align: 'center', | ||||
|             sortable: false, | ||||
|             allcheck: true, | ||||
| @@ -909,14 +908,14 @@ function OnFilterAssetTypeAdd() { | ||||
|  | ||||
|     $('#txt_filterassettype_key').val(''); | ||||
|     $('#dialog_filterassettype .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETTYPES", 'Select Asset Types')); | ||||
|     $('#mask_bg').show(); | ||||
|     showmaskbg1(true); | ||||
|     $('#dialog_filterassettype') | ||||
|         .attr('act', 'edit') | ||||
|         .css({ | ||||
|             'top': (document.documentElement.clientHeight - $('#dialog_filterassettype').height()) / 3, | ||||
|             'left': (document.documentElement.clientWidth - $('#dialog_filterassettype').width()) / 2 | ||||
|         }) | ||||
|         .showDialog(); | ||||
|         .showDialogfixed(); | ||||
|  | ||||
|     GetFilterAssetTypeList(); | ||||
| } | ||||
| @@ -946,7 +945,7 @@ function OnSetFilterSelectAssetTypes() { | ||||
|  | ||||
|     showFilterSelectedAssetType(assettypes); | ||||
|     $('#dialog_filterassettype').hideDialog(); | ||||
|     $('#mask_bg').hide(); | ||||
|     showmaskbg1(false); | ||||
| } | ||||
|  | ||||
| function OnFilterAssetTypeDelete() { | ||||
| @@ -1058,14 +1057,14 @@ function OnAddFilterTemplate() { | ||||
|         tile = GetTextByKey('P_XXXX', 'Copy Filter Template'); | ||||
|     $('#dialog_filtertemplate .dialog-title span.title').text(tile); | ||||
|  | ||||
|     $('#mask_bg').show(); | ||||
|     showmaskbg1(true); | ||||
|     $('#dialog_filtertemplate') | ||||
|         .attr('act', 'add') | ||||
|         .css({ | ||||
|             'top': (document.documentElement.clientHeight - $('#dialog_filtertemplate').height()) / 3, | ||||
|             'left': (document.documentElement.clientWidth - $('#dialog_filtertemplate').width()) / 2 | ||||
|         }) | ||||
|         .showDialog(); | ||||
|         .showDialogfixed(); | ||||
|     $('#dialog_filtertemplatename').focus(); | ||||
| } | ||||
|  | ||||
| @@ -1073,14 +1072,14 @@ function OnEditFilterTemplate() { | ||||
|     $('#dialog_filtertemplatename').val(''); | ||||
|     $('#dialog_filtertemplate .dialog-title span.title').text(GetTextByKey('P_XXXX', 'Edit Filter Template')); | ||||
|     var tempname = $('#sel_filtertemplate').find("option:selected").text(); | ||||
|     $('#mask_bg').show(); | ||||
|     showmaskbg1(true); | ||||
|     $('#dialog_filtertemplate') | ||||
|         .attr('act', 'edit') | ||||
|         .css({ | ||||
|             'top': (document.documentElement.clientHeight - $('#dialog_filtertemplate').height()) / 3, | ||||
|             'left': (document.documentElement.clientWidth - $('#dialog_filtertemplate').width()) / 2 | ||||
|         }) | ||||
|         .showDialog(); | ||||
|         .showDialogfixed(); | ||||
|     $('#dialog_filtertemplatename').val(tempname).focus(); | ||||
|  | ||||
| } | ||||
| @@ -1118,7 +1117,7 @@ function OnSetFilterTemplate() { | ||||
|     } | ||||
|  | ||||
|     $('#dialog_filtertemplate').hideDialog(); | ||||
|     $('#mask_bg').hide(); | ||||
|     showmaskbg1(false); | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user