Browse Source

Merge branch 'dev' into dev_g

AmandaG 3 weeks ago
parent
commit
f0a8f8efde

+ 0 - 2
.gitignore

@@ -17,8 +17,6 @@ components.d.ts
 package-lock.json
 package-lock.json
 pnpm-lock.yaml
 pnpm-lock.yaml
 auto-imports.d.ts
 auto-imports.d.ts
-*.zip
-*.rar
 
 
 stats.html
 stats.html
 
 

+ 0 - 1
src/views/DestinationDelivery/src/components/TableView/src/TableView.vue

@@ -58,7 +58,6 @@ const handleColumns = (columns: any, status?: string) => {
         formatter: ({ cellValue }: any) => {
         formatter: ({ cellValue }: any) => {
           if (!cellValue) return '--'
           if (!cellValue) return '--'
           const rangeData = cellValue.split(';')
           const rangeData = cellValue.split(';')
-          console.log('rangeData', rangeData)
           const leftDate = rangeData[0] ? formatTimezone(rangeData[0]) : '_'
           const leftDate = rangeData[0] ? formatTimezone(rangeData[0]) : '_'
           const rightDate = rangeData[1] ? formatTimezone(rangeData[1]) : '_'
           const rightDate = rangeData[1] ? formatTimezone(rangeData[1]) : '_'
           return leftDate + ' -- ' + rightDate
           return leftDate + ' -- ' + rightDate