no message

src/components/vehicle/list/ListTable.vue

@@ -104,7 +104,7 @@
         </q-table>
       </div>
 
-      <div class="q-mt-md" v-if="x.OfferState == 2||x.OfferState == 3" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }">
+      <div class="q-mt-md" v-if="x.OfferState != 3" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }">
         <div class="pay row text-grey rounded-borders" :class="{ 'bg-grey-2 q-mt-md': $q.platform.is.mobile, col: $q.platform.is.desktop }">
         </div>
         <div class="col desktop-only"></div>
@@ -116,7 +116,7 @@
               <span class="din text-subtitle1">{{ moneyFormat(x.totalMoney) }}</span>
               <span class="f12">
                 <!-- {{ $t('unit.jp') }} -->
-                {{x.CurrencyName}}
+                {{x.CurrencyCode}}
               </span>
             </div>
           </div>
@@ -126,12 +126,12 @@
         </div>
         <div class="rounded-borders q-pa-sm justify-between" :class="{ column: $q.platform.is.desktop, 'row items-center': $q.platform.is.mobile, 'bg-green-1': x.OfferState != 1, 'bg-grey-2': x.OfferState == 1 }">
           <q-list dense v-if="x.OfferState != 3" :class="{ 'row items-center justify-between full-width': $q.platform.is.mobile }">
-            <q-item v-if="x.OfferState == 2" class="text-negative" clickable v-close-popup @click="cancel(x.Id)">
+            <q-item v-if="x.OfferState == 1" class="text-negative" clickable v-close-popup @click="cancel(x.Id)">
               <q-item-section>
                 <q-item-label>{{ $t('hotelorder.opera.cancel') }}</q-item-label>
               </q-item-section>
             </q-item>
-            <q-item v-if="x.OfferState == 2" class="text-primary" clickable v-close-popup @click="mask(x.Id)">
+            <q-item v-if="x.OfferState == 1" class="text-primary" clickable v-close-popup @click="mask(x.Id)">
               <q-item-section>
                 <q-item-label>{{ $t('hotelorder.opera.edit') }}</q-item-label>
               </q-item-section>
@@ -149,7 +149,7 @@
               {{ x.totalMoney.toFixed(2) }}
               <span class="text-green-4 f12">
                 <!-- {{ $t('unit.jp') }} -->
-                {{x.CurrencyName}}
+                {{x.CurrencyCode}}
               </span>
             </div>
           </div>

src/i18n/zh-TW/index.ts

@@ -913,11 +913,9 @@ export default {
       close: "取消",
       travelvehicle: '行程用車',
       strokestatus:{
-        d1: '未報價',
-        d2: '待確認',
-        d3: '已確認',
-        d4: '確認報價',
-        d5: '已取消',
+        d1: '待確認',
+        d2: '已確認',
+        d3: '已取消',
       },
       tatle: {
         th1: '日期',

src/pages/vehicle/vehicleOrder.vue

@@ -39,7 +39,12 @@ export default defineComponent({
         if(currentRouter.currentRoute){
             if(currentRouter.currentRoute.value.params.OrderId){
                 data.OrderId = currentRouter.currentRoute.value.params.OrderId
-                data.tab = currentRouter.currentRoute.value.params.Type
+                if(currentRouter.currentRoute.value.params.Type<4){
+                    data.tab = currentRouter.currentRoute.value.params.Type
+                }else{
+                    data.tab = 0
+                }
+                
             }else{
                 if(currentRouter.currentRoute.value.params.pages){
                     data.tab = currentRouter.currentRoute.value.params.pages 

src/utils/tools.ts

@@ -195,7 +195,7 @@ export function getHotelOrderStatus():Array<StandardStatus>{
 
 export function getStrokeStatus():Array<StandardStatus>{
   let status=[] as Array<StandardStatus>
-  let text = [t('v102.vehicle.strokestatus.d1'),t('v102.vehicle.strokestatus.d2'),t('v102.vehicle.strokestatus.d3'),t('v102.vehicle.strokestatus.d4'),t('v102.vehicle.strokestatus.d5')]
+  let text = [t('v102.vehicle.strokestatus.d1'),t('v102.vehicle.strokestatus.d2'),t('v102.vehicle.strokestatus.d3')]
   let color = ['','positive','dark','orange','negative']
   let icons = ['','update','done','offline_bolt','cached']
   text.forEach((x,i:number)=>{