fix: ticket menu order and i18n
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
5d58676288
commit
be86b69079
|
@ -197,6 +197,12 @@ globals:
|
||||||
autonomous: Autonomous
|
autonomous: Autonomous
|
||||||
suppliers: Suppliers
|
suppliers: Suppliers
|
||||||
supplier: Supplier
|
supplier: Supplier
|
||||||
|
expedition: Expedition
|
||||||
|
services: Service
|
||||||
|
components: Components
|
||||||
|
pictures: Pictures
|
||||||
|
packages: Packages
|
||||||
|
tracking: Tracking
|
||||||
labeler: Labeler
|
labeler: Labeler
|
||||||
supplierCreate: New supplier
|
supplierCreate: New supplier
|
||||||
accounts: Accounts
|
accounts: Accounts
|
||||||
|
@ -553,15 +559,8 @@ ticket:
|
||||||
observation: Notes
|
observation: Notes
|
||||||
ticketAdvance: Advance tickets
|
ticketAdvance: Advance tickets
|
||||||
futureTickets: Future tickets
|
futureTickets: Future tickets
|
||||||
expedition: Expedition
|
|
||||||
purchaseRequest: Purchase request
|
purchaseRequest: Purchase request
|
||||||
weeklyTickets: Weekly tickets
|
weeklyTickets: Weekly tickets
|
||||||
saleTracking: Sale tracking
|
|
||||||
services: Service
|
|
||||||
tracking: Tracking
|
|
||||||
components: Components
|
|
||||||
pictures: Pictures
|
|
||||||
packages: Packages
|
|
||||||
list:
|
list:
|
||||||
nickname: Nickname
|
nickname: Nickname
|
||||||
state: State
|
state: State
|
||||||
|
|
|
@ -111,7 +111,7 @@ const columns = computed(() => [
|
||||||
|
|
||||||
const getBase = computed(() => {
|
const getBase = computed(() => {
|
||||||
let sum = 0;
|
let sum = 0;
|
||||||
for (let sale of ticketComponents.value) {
|
for (let sale of components.value) {
|
||||||
for (let saleComponent of sale.components) {
|
for (let saleComponent of sale.components) {
|
||||||
if (saleComponent.component.componentType.isBase) {
|
if (saleComponent.component.componentType.isBase) {
|
||||||
sum += sale.quantity * saleComponent.value;
|
sum += sale.quantity * saleComponent.value;
|
||||||
|
@ -123,7 +123,7 @@ const getBase = computed(() => {
|
||||||
|
|
||||||
const getTotal = computed(() => {
|
const getTotal = computed(() => {
|
||||||
let total = 0;
|
let total = 0;
|
||||||
for (let sale of ticketComponents.value) {
|
for (let sale of components.value) {
|
||||||
for (let saleComponent of sale.components) {
|
for (let saleComponent of sale.components) {
|
||||||
total += sale.quantity * saleComponent.value;
|
total += sale.quantity * saleComponent.value;
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,10 @@ export default {
|
||||||
'TicketPurchaseRequest',
|
'TicketPurchaseRequest',
|
||||||
'TicketTracking',
|
'TicketTracking',
|
||||||
'TicketNotes',
|
'TicketNotes',
|
||||||
|
'TicketPicture',
|
||||||
'TicketVolume',
|
'TicketVolume',
|
||||||
|
'TicketComponents',
|
||||||
|
'TicketPackage',
|
||||||
'TicketService',
|
'TicketService',
|
||||||
'TicketSaleTracking',
|
'TicketSaleTracking',
|
||||||
'TicketBoxing',
|
'TicketBoxing',
|
||||||
|
@ -146,13 +149,40 @@ export default {
|
||||||
component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
|
component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'boxing',
|
path: 'observation',
|
||||||
name: 'TicketBoxing',
|
name: 'TicketNotes',
|
||||||
meta: {
|
meta: {
|
||||||
title: 'boxing',
|
title: 'notes',
|
||||||
|
icon: 'vn:notes',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'picture',
|
||||||
|
name: 'TicketPicture',
|
||||||
|
meta: {
|
||||||
|
title: 'pictures',
|
||||||
|
icon: 'vn:photo',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'volume',
|
||||||
|
name: 'TicketVolume',
|
||||||
|
meta: {
|
||||||
|
title: 'volume',
|
||||||
|
icon: 'vn:volume',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'expedition',
|
||||||
|
name: 'TicketExpedition',
|
||||||
|
meta: {
|
||||||
|
title: 'expedition',
|
||||||
icon: 'vn:package',
|
icon: 'vn:package',
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
|
component: () => import('src/pages/Ticket/Card/TicketExpedition.vue'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'service',
|
path: 'service',
|
||||||
|
@ -164,23 +194,33 @@ export default {
|
||||||
component: () => import('src/pages/Ticket/Card/TicketService.vue'),
|
component: () => import('src/pages/Ticket/Card/TicketService.vue'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'volume',
|
path: 'package',
|
||||||
name: 'TicketVolume',
|
name: 'TicketPackage',
|
||||||
meta: {
|
meta: {
|
||||||
title: 'volume',
|
title: 'packages',
|
||||||
icon: 'vn:volume',
|
icon: 'vn:bin',
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
|
component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'components',
|
||||||
|
name: 'TicketComponents',
|
||||||
|
meta: {
|
||||||
|
title: 'components',
|
||||||
|
icon: 'vn:components',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
path: 'observation',
|
path: 'sale-tracking',
|
||||||
name: 'TicketNotes',
|
name: 'TicketSaleTracking',
|
||||||
meta: {
|
meta: {
|
||||||
title: 'notes',
|
title: 'saleTracking',
|
||||||
icon: 'vn:notes',
|
icon: 'assignment',
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
|
component: () =>
|
||||||
|
import('src/pages/Ticket/Card/TicketSaleTracking.vue'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'dms',
|
path: 'dms',
|
||||||
|
@ -192,14 +232,13 @@ export default {
|
||||||
component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
|
component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'sale-tracking',
|
path: 'boxing',
|
||||||
name: 'TicketSaleTracking',
|
name: 'TicketBoxing',
|
||||||
meta: {
|
meta: {
|
||||||
title: 'saleTracking',
|
title: 'boxing',
|
||||||
icon: 'vn:buyrequest',
|
icon: 'science',
|
||||||
},
|
},
|
||||||
component: () =>
|
component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
|
||||||
import('src/pages/Ticket/Card/TicketSaleTracking.vue'),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'sms',
|
path: 'sms',
|
||||||
|
|
Loading…
Reference in New Issue