.
This commit is contained in:
		| @@ -444,6 +444,17 @@ | ||||
|         var rentalChanged = false;//编辑机器时是否有修改,只用于Attributes和Rental | ||||
|         var jobsiteinputChanged = false;//编辑机器时是否有修改,只用于JobSite | ||||
|  | ||||
|         function showConfirm1(msg, title, fok, fcancel) { | ||||
|             _dialog.showConfirm(msg, title, function (e) { | ||||
|                 if (typeof fok === 'function') { | ||||
|                     fok(e); | ||||
|                 } | ||||
|             }, function () { | ||||
|                 if (fcancel) | ||||
|                     fcancel(); | ||||
|             }); | ||||
|         } | ||||
|  | ||||
|         function devicerequest(method, param, callback, error) { | ||||
|             _network.request("MachineDeviceManagement/ManageMachines.aspx", -1, method, param, callback, error || function (e) { | ||||
|                 showmaskbg(false, true); | ||||
| @@ -1554,7 +1565,7 @@ | ||||
|             if (!IsSupperAdmin) { | ||||
|                 $('#dialog_preloaded').hide(); | ||||
|                 $('#dialog_preloaded_text').hide(); | ||||
|                  | ||||
|  | ||||
|             } | ||||
|  | ||||
|             window.onresize = resizeContent; | ||||
| @@ -1615,6 +1626,34 @@ | ||||
|                 $("#dialogmask").hide(); | ||||
|         } | ||||
|  | ||||
|         function showsubloading(id, flag, noanimation) { | ||||
|             var mask = $("#" + id); | ||||
|             mask.children().show(); | ||||
|             if (noanimation) { | ||||
|                 mask.css('display', flag ? '' : 'none'); | ||||
|             } else { | ||||
|                 if (flag) { | ||||
|                     mask.fadeIn(100); | ||||
|                 } else { | ||||
|                     mask.fadeOut(100); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         function showsubmask(id, flag, noanimation) { | ||||
|             var mask = $("#" + id); | ||||
|             mask.children().hide(); | ||||
|             if (noanimation) { | ||||
|                 mask.css('display', flag ? '' : 'none'); | ||||
|             } else { | ||||
|                 if (flag) { | ||||
|                     mask.fadeIn(100); | ||||
|                 } else { | ||||
|                     mask.fadeOut(100); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         function OnNext() { | ||||
|             OnSave(0, 0, gotoNext); | ||||
|         } | ||||
| @@ -1642,9 +1681,6 @@ | ||||
| </asp:Content> | ||||
| <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server"> | ||||
|     <div id="div_content" style="min-width: 1024px;"> | ||||
|         <div id="dialogmask" class="maskbg" style="display: none; z-index: 500;"> | ||||
|             <div class="loading_icon icon c-spin"></div> | ||||
|         </div> | ||||
|         <div class="function_title"> | ||||
|             <span class="sbutton iconsave" onclick="OnSave(0,0);" data-lgid="P_MA_SAVE">Save</span> | ||||
|             <span class="sbutton iconsave" onclick="OnSave(1,0);" data-lgid="P_MA_SAVE1">Save and Exit</span> | ||||
| @@ -1723,7 +1759,7 @@ | ||||
|                     <tr> | ||||
|                         <td class="label" data-lgid="P_MA_DESCRIPTION_COLON">Description:</td> | ||||
|                         <td> | ||||
|                             <textarea id="dialog_description" class="inputbox" style="height: 60px;" maxlength="1000" tabindex="15"></textarea> | ||||
|                             <textarea id="dialog_description" style="height: 60px;" maxlength="1000" tabindex="15"></textarea> | ||||
|                         </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
| @@ -1983,7 +2019,7 @@ | ||||
|                             <tr> | ||||
|                                 <td class="label" data-lgid="P_MA_COMMENTS_COLON">Comments:</td> | ||||
|                                 <td colspan="3"> | ||||
|                                     <textarea id="dialog_comments" class="inputbox" maxlength="1000" tabindex="68" style="width: 454px; margin-top: 2px;"></textarea> | ||||
|                                     <textarea id="dialog_comments" maxlength="1000" tabindex="68" style="width: 454px; margin-top: 2px;"></textarea> | ||||
|                                 </td> | ||||
|                             </tr> | ||||
|                             <tr> | ||||
| @@ -2158,13 +2194,16 @@ | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|  | ||||
|         <div id="dialogmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading_icon icon c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div id="mask_bg" style="display: none;"> | ||||
|         <div class="loading c-spin"></div> | ||||
|     </div> | ||||
|     <div class="dialog" id="dialog_adjustodometer" style="display: none; width: 960px;"> | ||||
|         <div id="adjustodomask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADJUSTODOMETER">Adjust Odometer</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content adjust-content"> | ||||
|             <table style="line-height: 25px; width: 100%;"> | ||||
| @@ -2210,7 +2249,7 @@ | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
|                         <div id="odometermostrecent" style="height: 90px; width:920px;"></div> | ||||
|                         <div id="odometermostrecent" style="height: 90px; width: 920px;"></div> | ||||
|                     </td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
| @@ -2218,7 +2257,7 @@ | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
|                         <div id="odometerhislist" style="height: 300px; width:920px;"></div> | ||||
|                         <div id="odometerhislist" style="height: 300px; width: 920px;"></div> | ||||
|                     </td> | ||||
|                 </tr> | ||||
|             </table> | ||||
| @@ -2229,10 +2268,10 @@ | ||||
|             <input type="button" onclick="OnPreviewOdometer();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="108" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="adjustodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_adjustenginehours" style="display: none; width: 940px;"> | ||||
|         <div id="adjustenginehoursmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADJUSTENGINEHOURS">Adjust EngineHours</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content adjust-content"> | ||||
|             <table style="line-height: 25px; width: 100%;"> | ||||
| @@ -2270,7 +2309,7 @@ | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
|                         <div id="enginehoursmostrecent" style="height: 90px;width:920px;"></div> | ||||
|                         <div id="enginehoursmostrecent" style="height: 90px; width: 920px;"></div> | ||||
|                     </td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
| @@ -2278,7 +2317,7 @@ | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
|                         <div id="enginehourshislist" style="height: 300px;width:920px;"></div> | ||||
|                         <div id="enginehourshislist" style="height: 300px; width: 920px;"></div> | ||||
|                     </td> | ||||
|                 </tr> | ||||
|             </table> | ||||
| @@ -2289,6 +2328,7 @@ | ||||
|             <input type="button" onclick="OnPreviewEngineHours();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="127" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="adjustenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
| @@ -2312,7 +2352,6 @@ | ||||
|  | ||||
|  | ||||
|     <div class="dialog" id="dialog_addodometer" style="display: none; width: 600px;"> | ||||
|         <div id="addodomask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDODOMETER">Add Odometer</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content adjust-content"> | ||||
|             <table style="line-height: 25px; width: 100%;"> | ||||
| @@ -2360,11 +2399,11 @@ | ||||
|             <input type="button" onclick="OnAddOdometer();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="158" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
|     <div class="dialog" id="dialog_addenginehours" style="display: none; width: 600px;"> | ||||
|         <div id="addenginehoursmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDOENGINEHOURS">Add Engine Hours</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content adjust-content"> | ||||
|             <table style="line-height: 28px; width: 100%;"> | ||||
| @@ -2404,6 +2443,7 @@ | ||||
|             <input type="button" onclick="OnAddEngineHours();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="177" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
| @@ -2419,7 +2459,6 @@ | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_addmake" style="display: none; width: 360px;"> | ||||
|         <div id="addmakemask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDMAKE">Add Make</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content assetcontent"> | ||||
|             <table> | ||||
| @@ -2435,10 +2474,10 @@ | ||||
|             <input type="button" onclick="OnSaveMake();" value="OK" data-lgid="P_MA_OK" tabindex="301" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addmakemask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_addmodel" style="display: none; width: 360px;"> | ||||
|         <div id="addmodelmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDMODEL">Add Model</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content assetcontent"> | ||||
|             <table> | ||||
| @@ -2467,10 +2506,10 @@ | ||||
|             <input type="button" onclick="OnSaveModel();" value="OK" data-lgid="P_MA_OK" tabindex="404" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addmodelmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_assetduplicates" style="display: none; min-width: 540px;"> | ||||
|         <div id="assetdupmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"> | ||||
|             <span class="title" style="float: left;" data-lgid="P_MA_POSSIBLEDUPLICATES_COLON">Possible Duplicates: <span id="spnumberinfo"></span></span> | ||||
|             <div class="function_title" id="divDupFun" style="float: left; margin-left: 230px; display: none; line-height: 28px;"> | ||||
| @@ -2658,10 +2697,10 @@ | ||||
|             <input type="button" value="Ignore and Create Asset" data-lgid="P_MA_IGNOREANDCREATEASSET" onclick="OnIgnoreDuplicate();" style="width: 150px;" tabindex="500" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="assetdupmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_mergeasset" style="display: none; min-width: 540px;"> | ||||
|         <div id="mergeassetmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"> | ||||
|             <span class="title" style="float: left;" data-lgid="P_MA_XXX">Merge Asset</span> | ||||
|             <em class="dialog-close"></em> | ||||
| @@ -2857,11 +2896,11 @@ | ||||
|             <input type="button" value="Cancel" data-lgid="P_MA_CANCEL" class="dialog-close" tabindex="501" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="mergeassetmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
|     <div class="dialog" id="dialog_adddocument" style="display: none; width: 500px;"> | ||||
|         <div id="adddocumentmask" class="maskbg" style="display: none; z-index: 1;"></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_ADDITIONALDOCUMENTATION">Additional Documentation</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content adjust-content"> | ||||
|             <table style="line-height: 30px; width: 100%;"> | ||||
| @@ -2923,5 +2962,6 @@ | ||||
|             <input type="button" onclick="OnSaveDocument();" value="Save" data-lgid="P_MA_SAVE" tabindex="400" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="adddocumentmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|     </div> | ||||
| </asp:Content> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user