From d6fd4990b85b1f685cd08c98f41a6f9171e37356 Mon Sep 17 00:00:00 2001 From: Luis Carlos Quijada Date: Sat, 24 May 2025 15:03:07 -0600 Subject: [PATCH] =?UTF-8?q?Correcciones=20Cancelaci=C3=B3n=20OP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/BundleConfig.vb | 4 +- General/Dashboard.aspx | 11 +- OP/OP.aspx | 254 +++++++++++++++++++-------------- OP/OP.aspx.vb | 301 ++++++++++++++++++++++++++------------- 4 files changed, 360 insertions(+), 210 deletions(-) diff --git a/App_Code/BundleConfig.vb b/App_Code/BundleConfig.vb index 540abb2ea..1ab0657f9 100644 --- a/App_Code/BundleConfig.vb +++ b/App_Code/BundleConfig.vb @@ -7,7 +7,7 @@ Public Class BundleConfig bundles.Add(New ScriptBundle("~/bundles/jquery").Include( "~/Metronic/assets/global/plugins/jquery.min.js" )) - ScriptManager.ScriptResourceMapping.AddDefinition("jquery", Nothing, New ScriptResourceDefinition with {.Path = "~/bundles/jquery"}) + ScriptManager.ScriptResourceMapping.AddDefinition("jquery", Nothing, New ScriptResourceDefinition With {.Path = "~/bundles/jquery"}) @@ -170,7 +170,7 @@ Public Class BundleConfig "~/Scripts/WebForms/TreeView.js", "~/Scripts/WebForms/WebParts.js")) - ScriptManager.ScriptResourceMapping.AddDefinition("WebFormsBundle", new ScriptResourceDefinition With {.Path = "~/bundles/WebFormsJs"}) + ScriptManager.ScriptResourceMapping.AddDefinition("WebFormsBundle", New ScriptResourceDefinition With {.Path = "~/bundles/WebFormsJs"}) ' Order is very important for these files to work, they have explicit dependencies bundles.Add(New ScriptBundle("~/bundles/MsAjaxJs").Include( diff --git a/General/Dashboard.aspx b/General/Dashboard.aspx index 7f2ab1c75..213c8a410 100644 --- a/General/Dashboard.aspx +++ b/General/Dashboard.aspx @@ -813,6 +813,16 @@ /*---------------------------------------- ANCHO DE COLUMNAS DE IMPORTES (AÑO, MES, ETC) -----------------------------------------*/ + + /* Ancho libre para primeras columnas (Sucursal, Vendedor, etc.) */ + .custom-grid td:first-child, + .custom-grid th:first-child { + width: auto !important; + min-width: auto !important; + max-width: none !important; + + } + .custom-grid td:nth-child(2), .custom-grid td:nth-child(3), .custom-grid td:nth-child(4), @@ -830,7 +840,6 @@ .custom-grid th:nth-child(4), .custom-grid th:nth-child(5) { text-align: center !important; - } /* Asegurar ancho libre para primera columna */ diff --git a/OP/OP.aspx b/OP/OP.aspx index 82f0c1184..dfdc3300f 100644 --- a/OP/OP.aspx +++ b/OP/OP.aspx @@ -309,6 +309,19 @@ background: #f8f9fa; cursor: pointer; } + /* Alinear celda y contenido a la derecha */ +.celda-derecha { + text-align: right !important; + +} + +.txt-merma { + /* Ancho reducido al 50% */ + margin-left: 30px !important; /* Mueve el TextBox a la derecha dentro de la celda */ + display: block !important; /* Permite que margin-left:auto funcione */ + /* Alinea el texto interno a la derecha */ +} + @@ -338,7 +351,7 @@
-
+
-
- -
-
-
-
-
- - - -
- -
- - - -
- -
-
-
-
-
-
- - - - -
-
-
- - - -
-
-
- - - - - -
-
+ +
-
- + + +
+ + + +
-
-
- - - - + + + + + + +
+
+
+
+ + + +
+
+
+
+
+ + + +
+ +
+ + + +
+
- - - - - -
+ + + +
+
+
+ + + +
+
+
- +
@@ -437,23 +447,17 @@
- - + +
-
- +
@@ -466,13 +470,15 @@
- +
+
+
+ + + +
+
+ + - -
- -
+ -
-
- -
-
- -
-
- -
-
+ + +
+
+ +