From 973209abed2559247881da4a4b5547a550125e53 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 29 Jan 2025 16:15:37 +0100 Subject: [PATCH] feat: refs #6321 updates --- src/css/app.scss | 1 - src/pages/Item/components/ItemProposal.vue | 76 +++++++++++++------ src/pages/Ticket/Card/TicketTransfer.vue | 13 +++- src/pages/Ticket/Card/components/split.js | 39 ++++++++++ .../Ticket/Card/components/transferSales.js | 10 --- .../Ticket/Negative/TicketLackDetail.vue | 6 +- 6 files changed, 102 insertions(+), 43 deletions(-) create mode 100644 src/pages/Ticket/Card/components/split.js delete mode 100644 src/pages/Ticket/Card/components/transferSales.js diff --git a/src/css/app.scss b/src/css/app.scss index a1ca8985f..c1deaa027 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -273,7 +273,6 @@ 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 591d8ee2c..07ecd048a 100644 --- a/src/pages/Item/components/ItemProposal.vue +++ b/src/pages/Item/components/ItemProposal.vue @@ -32,7 +32,7 @@ const gradientStyle = (value) => { } return color; }; - +const tagColor = (match) => `color: ${!match ? 'red' : 'var(--vn-label-color)'}`; const $props = defineProps({ itemLack: { type: Object, @@ -102,6 +102,42 @@ const columns = computed(() => [ field: 'longName', columnClass: 'expand', }, + { + align: 'left', + sortable: true, + label: t('proposal.tag5'), + name: 'tag5', + field: 'value5', + // format: (val) => val, + style: "color: 'red'", + columnClass: 'expand', + }, + { + align: 'left', + sortable: true, + label: t('proposal.tag6'), + 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'), + name: 'tag7', + field: 'value7', + // format: (val) => val, + style: "color: 'red'", + columnClass: 'expand', + }, { ...defaultColumnAttrs, @@ -243,42 +279,36 @@ const isDisabled = (row) => !isSelectionAvailable(row); {{ compatibilityItem(statusConditionalValue(row)) }} -
+
- ({{ row.id }}){{ row.longName }} + {{ row.longName }}
-
- {{ tag }} - - {{ row[`value${tag}`] }} - -
-