diff --git a/Jenkinsfile b/Jenkinsfile index df2421a0e..63577dad5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,7 +123,7 @@ pipeline { sh "docker-compose ${env.COMPOSE_PARAMS} up -d" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { - sh 'sh test/cypress/cypressParallel.sh 3' + sh 'sh test/cypress/cypressParallel.sh 2' } } } diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 2970cff6d..9329a183a 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -1143,9 +1143,13 @@ es: .grid-create { display: grid; - grid-template-columns: repeat(auto-fit, minmax(150px, max-content)); + grid-template-columns: 1fr 1fr; + max-width: 100%; grid-gap: 20px; margin: 0 auto; + .col-span-2 { + grid-column: span 2; + } } .flex-one { diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue index 976af1d19..4f3f544c1 100644 --- a/src/pages/Account/AccountList.vue +++ b/src/pages/Account/AccountList.vue @@ -149,14 +149,12 @@ const columns = computed(() => [ :right-search="false" > diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue index 66cb44bc2..81a643142 100644 --- a/src/pages/Customer/Card/CustomerMandates.vue +++ b/src/pages/Customer/Card/CustomerMandates.vue @@ -16,7 +16,6 @@ const filter = { { relation: 'mandateType', scope: { fields: ['id', 'code'] } }, { relation: 'company', scope: { fields: ['id', 'code'] } }, ], - where: { clientFk: route.params.id }, order: ['created DESC'], limit: 20, }; @@ -65,7 +64,8 @@ const columns = computed(() => [ {