Handy_Cao 1 سال پیش
والد
کامیت
adf6820527

+ 4 - 0
oem/tss/locales/extras/en-US.json

@@ -77,6 +77,10 @@
         "title4": "Refunds",
         "offline": {
             "deliveryqty": "OrderQty",
+            "deliveryprice": "OrderPrice",
+            "deliveryinfo": "Address",
+            "deliveryinfo1": "Address",
+            "deliveryinfo2": "Address",
             "deliveryamount": "OrderAmount"
         }
     },

+ 4 - 0
oem/tss/locales/extras/th-TH.json

@@ -77,6 +77,10 @@
         "title4": "ส่งคืนสินค้า",
         "offline": {
             "deliveryqty": "จำนวนคำสั่ง",
+            "deliveryprice": "ราคาของคำสั่ง",
+            "deliveryinfo": "ที่อยู่สำหรับการรับ",
+            "deliveryinfo1": "ข้อมูลการรับ",
+            "deliveryinfo2": "ข้อมูลการจัดส่ง",
             "deliveryamount": "สั่งซื้อสินค้า"
         }
     },

+ 4 - 0
oem/tss/locales/extras/zh-CN.json

@@ -77,6 +77,10 @@
         "title4": "退换货",
         "offline": {
             "deliveryqty": "订单数量",
+            "deliveryprice": "订单价格",
+            "deliveryinfo": "收货地址",
+            "deliveryinfo1": "提货信息",
+            "deliveryinfo2": "交货信息",
             "deliveryamount": "订单货款"
         }
     },

+ 4 - 0
oem/tss/locales/extras/zh-TW.json

@@ -77,6 +77,10 @@
         "title4": "退換貨",
         "offline": {
             "deliveryqty": "訂單數量",
+            "deliveryprice": "訂單價格",
+            "deliveryinfo": "收貨地址",
+            "deliveryinfo1": "提貨信息",
+            "deliveryinfo2": "交貨信息",
             "deliveryamount": "訂單貨款"
         }
     },

+ 2 - 2
src/packages/tss/views/order/delivery/components/offline/Index.vue

@@ -21,8 +21,8 @@
                     <div class="right">
                         <ul>
                             <li>
-                                <span>{{ $t('delivery.offline.buyorselldisplay') }}:</span>
-                                <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
+                                <span>{{ $t('position.goodscode') }}</span>
+                                <span>{{ item.goodscode }}</span>
                             </li>
                             <li>
                                 <span>{{ $t('delivery.offline.deliveryqty') }}:</span>

+ 6 - 6
src/packages/tss/views/order/delivery/components/online/Index.vue

@@ -1,4 +1,4 @@
-<!-- 交收提货-线下交收单 -->
+<!-- 交收提货-预付款提货 -->
 <template>
     <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
         :page-count="pageCount" @refresh="run">
@@ -10,7 +10,7 @@
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
-                            {{ getBuyOrSellName(item.buyorsell) }}
+                            {{ item.orderstatusdisplay }}
                         </b>
                     </div>
                 </div>
@@ -21,8 +21,8 @@
                     <div class="right">
                         <ul>
                             <li>
-                                <span>{{ $t('delivery.offline.buyorselldisplay') }}:</span>
-                                <span>{{ item.buyorselldisplay }}</span>
+                                <span>{{ $t('position.goodscode') }}:</span>
+                                <span>{{ item.goodscode }}</span>
                             </li>
                             <li>
                                 <span>{{ $t('delivery.offline.deliveryqty') }}:</span>
@@ -41,7 +41,7 @@
                                 <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
                             </li>
                             <li>
-                                <span>{{ $t('delivery.offline.deliveryinfo') }}:</span>
+                                <span>{{ $t('delivery.offline.deliveryinfo1') }}:</span>
                                 <span>{{ item.deliveryinfo }}</span>
                             </li>
                         </ul>
@@ -58,7 +58,7 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { Button, Image } from 'vant'
-import { getBuyOrSellName } from '@/constants/order'
+import { getDeliveryOrderStatusName } from '@/constants/order'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
 import { useRequest } from '@/hooks/request'

+ 3 - 3
src/packages/tss/views/order/delivery/components/spot/Index.vue

@@ -1,4 +1,4 @@
-<!-- 交收提货-线下交收单 -->
+<!-- 交收提货-预付款交货 -->
 <template>
     <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
         :page-count="pageCount" @refresh="run">
@@ -10,7 +10,7 @@
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
-                            {{ getBuyOrSellName(item.buyorsell) }}
+                            {{ item.orderstatusdisplay }}
                         </b>
                     </div>
                 </div>
@@ -41,7 +41,7 @@
                                 <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
                             </li>
                             <li>
-                                <span>{{ $t('delivery.offline.deliveryinfo') }}:</span>
+                                <span>{{ $t('delivery.offline.deliveryinfo2') }}:</span>
                                 <span>{{ item.deliveryinfo }}</span>
                             </li>
                         </ul>