diff --git a/cypress.config.js b/cypress.config.js index 1924144f62..a9e27fcfdc 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -14,8 +14,8 @@ export default defineConfig({ downloadsFolder: 'test/cypress/downloads', video: false, specPattern: 'test/cypress/integration/**/*.spec.js', - experimentalRunAllSpecs: true, - watchForFileChanges: true, + experimentalRunAllSpecs: false, + watchForFileChanges: false, reporter: 'cypress-mochawesome-reporter', reporterOptions: { charts: true, diff --git a/quasar.config.js b/quasar.config.js index 7c669c99f4..9467c92af4 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -30,7 +30,6 @@ export default configure(function (/* ctx */) { // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'], - importStrategy: 'auto', // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css css: ['app.scss'], diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index c8187eba0f..339f90e0ef 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -334,8 +334,8 @@ function handleKeyDown(event) { } function getCaption(opt) { - if (optionCaption.value === false && typeof optionCaption.value !== 'string') return; - return '' + (opt[optionCaption.value] || opt[optionValue.value]); + if (optionCaption.value === false) return; + return opt[optionCaption.value] || opt[optionValue.value]; } diff --git a/src/css/app.scss b/src/css/app.scss index c1deaa0272..a1ca8985f2 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -273,6 +273,7 @@ input::-webkit-inner-spin-button { } td { font-size: 11pt; + border-top: 1px solid var(--vn-page-color); border-collapse: collapse; } } diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue index 07ecd048aa..506c73430c 100644 --- a/src/pages/Item/components/ItemProposal.vue +++ b/src/pages/Item/components/ItemProposal.vue @@ -105,37 +105,25 @@ const columns = computed(() => [ { align: 'left', sortable: true, - label: t('proposal.tag5'), + label: t('item.list.color'), name: 'tag5', field: 'value5', - // format: (val) => val, - style: "color: 'red'", columnClass: 'expand', }, { align: 'left', sortable: true, - label: t('proposal.tag6'), + label: t('item.list.stems'), name: 'tag6', field: 'value6', - // format: (val) => val, - attrs: ({ model }) => { - return { - style: `color: var(--vn-label-color)`, - }; - }, - style: (row) => `color: var(--vn-label-color)`, - columnClass: 'expand', }, { align: 'left', sortable: true, - label: t('proposal.tag7'), + label: t('item.list.producer'), name: 'tag7', field: 'value7', - // format: (val) => val, - style: "color: 'red'", columnClass: 'expand', }, diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml index 78ea5c9bbd..d74ef9cbc1 100644 --- a/src/pages/Item/locale/en.yml +++ b/src/pages/Item/locale/en.yml @@ -130,6 +130,7 @@ item: origin: Orig. userName: Buyer weight: Weight + color: Color weightByPiece: Weight/stem stemMultiplier: Multiplier producer: Producer diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml index 649461f00f..5ab0b1bb6c 100644 --- a/src/pages/Item/locale/es.yml +++ b/src/pages/Item/locale/es.yml @@ -135,6 +135,7 @@ item: size: Medida origin: Orig. weight: Peso + color: Color weightByPiece: Peso/tallo userName: Comprador stemMultiplier: Multiplicador diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue index 6ef32e5687..fc7be2f57e 100644 --- a/src/pages/Ticket/Card/TicketTransfer.vue +++ b/src/pages/Ticket/Card/TicketTransfer.vue @@ -34,7 +34,6 @@ const $props = defineProps({ onMounted(() => (_transfer.value = $props.transfer)); const { t } = useI18n(); -const QPopupProxyRef = ref(null); const transferFormRef = ref(null); const _transfer = ref(); const splitDate = ref(Date.vnNew()); @@ -110,71 +109,68 @@ const splitSelectedRows = async () => { > - - - {{ ticket }}- {{ transfer }} - - - - - - +
+ + + + + + + + - - - - + + + + +