Merge branch 'master' of http://192.168.10.111:8383/SIG

Contabilidad/RepGastosCC.aspx

@@ -80,6 +80,56 @@
             border: none;
             outline: 0;
         }
+
+
+        /*Begin ScrollADS V2*/
+
+.divContainerads {
+    width: 100%;
+    max-height: calc(100vh - 260px);
+    overflow-y: auto;
+}
+table.adssigscroll {
+    min-width: 100%;
+    background-color: #fff;
+}
+    table.adssigscroll tbody, table.adssigscroll thead {
+        background-color: #fff;
+    }
+
+    table.adssigscroll tr {
+        background-color: inherit;
+    }
+
+        table.adssigscroll tr.stickyRow {
+            position: sticky;
+            top: 0; /* Se mantiene pegado en la parte superior */
+            background-color: inherit; /* Para que no se superponga con otros elementos */
+            z-index: 4; /* Asegura que esté sobre otros elementos */
+        }
+.tr_order tr > th::after {
+    content: "\f0dc";
+    font:normal normal normal 14px / 1 FontAwesome;
+    display: inline-block;
+    margin-left: 5px;
+    color: #32A1CF;
+}
+.tr_order tr > th.asce::after { 
+    content: "\f0de";
+}
+
+.tr_order tr > th.desc::after {
+    content: "\f0dd";
+}
+        /*END ScrollADS V2*/
+        
+    table.GvDatos{ 
+
+    }
+    table.GvDatos tr td:nth-child(1){
+        min-width:300px;
+        /*white-space:nowrap;*/
+    }
     </style>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server">
@@ -166,8 +216,7 @@
     <asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
         <ContentTemplate>
             <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="True" EmptyDataText=""   
-                CssClass="table table-striped table-advance table-hover Widthall ScrollAD"
+                CssClass="table table-striped table-advance table-hover Widthall GvDatos adssigscrollJS tr_order" data-cols="1" data-rows="2"  GridLines="None">
-                data-sort="true"  GridLines="None">
                 
                 <HeaderStyle CssClass="Titulos" />
                 <RowStyle CssClass="Texto" />

Nomina/Nomina.aspx.cs

@@ -7666,14 +7666,14 @@ public partial class Nomina_Nomina2 : ClsPaginas
     }
     protected void DdlTipo_SelectedIndexChanged(object sender, EventArgs e)
     {
-        //CargaConcepto();
+        CargaConcepto();
         UpMovtosPermanentesModal.Update();
     }
 
     protected void LnkAddMovtoPermanente_Click(object sender, EventArgs e)
     {
         DdlTipo.SelectedValue = "D";
-        //CargaConcepto();
+        CargaConcepto();
         DdlTipoDescto_SelectedIndexChanged(null, null);
         pnlAddupMovto.Visible = true;
         LnkAddMovto.Visible = true;