AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2023-01-04 16:21:36 -07:00
parent d15f725c88 9b0756c960
commit 58f95e6f8a
37 changed files with 13571 additions and 9823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
OS/OrdenesServicios.aspx
View File

@@ -222,13 +222,19 @@
</div>
<div class="portlet-body">
<table>
<tr>
<tr runat="server" id="TREstatus" visible="true">
<td><b>Estatus:</b></td>
<td>
<asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlEstatusOS" runat="server" AutoPostBack="true" Width="100%" DataValueField="CveEstatusOrdenServicio" DataTextField="EstatusOrdenServicio">
</asp:DropDownList>
</td>
</tr>
<tr runat="server" id="TREstatus2" visible="false">
<td>
<asp:LinkButton runat="server" ID="LnkFinalizar" Text="Finalizar" CssClass="btn btn-primary" OnClick="LnkFinalizar_Click"></asp:LinkButton>
</td>
</tr>
</table>
</div>
</div>
@@ -355,7 +361,7 @@
CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
</td>
</tr>
<tr>
<tr runat="server" id="TREspecificaiones" >
<td colspan="5">
<table style="width: 100%;">
<tr style="background-color: #E0E3DA;">
@@ -1124,6 +1130,53 @@
</div>
</div>
<%-- FIN HISTORIAL --%>
<%--MODAL FINALIZAR ORDEN INICIO --%>
<div id="DVModalFinalizarOrden" class="modal ADS fade" role="dialog">
<div class="modal-dialog">
<asp:UpdatePanel ID="UpModalFinalizarOrden" class="modal-content rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="ModalLabel">Finalizar Orden</h4>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-12">
<p>Por favor especificar el producto instalado.</p>
</div>
</div>
<div class="row">
<div class="col-lg-2">
Producto:
</div>
<div class="col-lg-10">
<ADS:Dropdownlost runat="server" ID="DdlPsModalFinalizar" CssStyle="width: 100%;" CssClass="DdlPS " CssClassDdl="select2me " IncluyeTodos="false"
DataTextField="PSCodigo" DataValueField="CvePS"/>
</div>
</div>
</div>
<div class="modal-footer">
<asp:LinkButton ID="LnkModalFinalizarOrden" runat="server" CssClass="btn btn-primary" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si"
OnClick="LnkModalFinalizarOrden_Click">Finalizar</asp:LinkButton>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancelar</button>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<%--MODAL FINALIZAR ORDEN INICIO --%>
</asp:Content>
<asp:Content ID="content7" ContentPlaceHolderID="JS" runat="server">
<script src="/Scripts/DataTables.js"></script>