Handy_Cao 10 mesiacov pred
rodič
commit
3d889332cc

+ 0 - 6
oem/sjgj/locales/extras/en-US.json

@@ -6,9 +6,3 @@
         }
     }
 }
-
-import { i18n } from '@/stores'
-
-const { global: { t } } = i18n
-
-t('enum.BuyOrSell.Buy')

+ 1 - 1
src/packages/sbyj/views/delivery/completed/list/index.vue

@@ -7,7 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                            {{ item.buyorsell === BuyOrSell.Buy ? '买料: ' : '卖料: ' }}
+                            {{ item.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{': '}}
                             {{ item.goodscode + '/' + item.goodsname }}
                         </h4>
                     </div>

+ 1 - 1
src/packages/sbyj/views/delivery/components/detail/order-list/index.vue

@@ -12,7 +12,7 @@
                         <div class="g-order-list__titlebar">
                             <div class="left">
                                 <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                    {{ item.buyorsell === BuyOrSell.Buy ? '买料订单: ' : '卖料订单: ' }}
+                                    {{ item.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ': ' }}
                                     {{ item.tradeid }}
                                 </h4>
                             </div>

+ 1 - 1
src/packages/sbyj/views/delivery/pending/list/index.vue

@@ -7,7 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                            {{ item.buyorsell === BuyOrSell.Buy ? '买料: ' : '卖料: ' }}
+                            {{ item.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ': ' }}
                             {{ item.goodscode + '/' + item.goodsname }}
                         </h4>
                     </div>

+ 1 - 1
src/packages/sbyj/views/delivery/processing/list/index.vue

@@ -7,7 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                            {{ item.buyorsell === BuyOrSell.Buy ? '买料: ' : '卖料: ' }}
+                            {{ item.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ':' }}
                             {{ item.goodscode + '/' + item.goodsname }}
                         </h4>
                         <span v-if="item.buyorsell === BuyOrSell.Buy && item.deliverystatus === 2"

+ 1 - 1
src/packages/sbyj/views/market/detail/index.vue

@@ -89,7 +89,7 @@
                         <div class="left">
                             <h4
                                 :class="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '买料:' : '卖料:' }}
+                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ':' }}
                                 {{ selectedRow.goodsCode + '/' + selectedRow.goodsName }}
                                 {{ formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace) }}
                             </h4>

+ 2 - 2
src/packages/sbyj/views/mine/index.vue

@@ -72,10 +72,10 @@
                     <Iconfont label-direction="bottom" icon="g-icon-order-close--line">终止订单</Iconfont>
                 </li>
                 <li @click="routerTo('delivery-list')">
-                    <Iconfont label-direction="bottom" icon="g-icon-delivery--line">卖料订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-delivery--line">{{ $t('enum.BuyOrSell.Sell') }}订单</Iconfont>
                 </li>
                 <li @click="routerTo('pickup-list')">
-                    <Iconfont label-direction="bottom" icon="g-icon-pickup--line">买料订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-pickup--line">{{ $t('enum.BuyOrSell.Buy') }}订单</Iconfont>
                 </li>
                 <li @click="routerTo('inventory-list')" v-if="oem === 'sjgj'">
                     <Iconfont label-direction="bottom" icon="g-icon-inventory">我的库存</Iconfont>

+ 1 - 1
src/packages/sbyj/views/order/close/index.vue

@@ -10,7 +10,7 @@
                     <div class="g-order-list__titlebar">
                         <div class="left">
                             <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                {{ item.buyorsell === BuyOrSell.Buy ? '买料:' : '卖料:' }}
+                                {{ item.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ':' }}
                                 {{ item.goodsfullname }}
                             </h4>
                             <span>{{ item.opentradeid }}</span>

+ 1 - 1
src/packages/sbyj/views/order/detail/index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup inset>
-                    <Cell class="nowrap" :title="detail.buyOrSell === BuyOrSell.Buy ? '买料订单' : '卖料订单'" :value="detail.tradeID" />
+                    <Cell class="nowrap" :title="(detail.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell'))+'订单'" :value="detail.tradeID" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodsCode + '/' + selectedRow.goodsName" />
                     <Cell title="订单重量"
                         :value="(detail.openQty * selectedRow.agreeUnit) + getGoodsUnitName(selectedRow.goodsUnitID)" />

+ 1 - 1
src/packages/sbyj/views/order/history/components/detail/index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup inset>
-                    <Cell class="nowrap" :title="selectedRow.buyorsell === BuyOrSell.Buy ? '买料订单' : '卖料订单'"
+                    <Cell class="nowrap" :title="(selectedRow.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell'))+'订单'"
                         :value="selectedRow.tradeid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="订单重量"

+ 1 - 1
src/packages/sbyj/views/order/history/index.vue

@@ -10,7 +10,7 @@
                     <div class="g-order-list__titlebar">
                         <div class="left">
                             <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                {{ item.buyorsell === BuyOrSell.Buy ? '买料:' : '卖料:' }}
+                                {{ item.buyorsell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ':' }}
                                 {{ item.goodscode + '/' + item.goodsname }}
                                 {{ formatDecimal(item.openprice, item.decimalplace) }}
                             </h4>

+ 1 - 1
src/packages/sbyj/views/order/list/index.vue

@@ -21,7 +21,7 @@
                     <div class="g-order-list__titlebar">
                         <div class="left">
                             <h4 :class="item.tHDetailEx.buyOrSell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                {{ item.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '买料:' : '卖料:' }}
+                                {{ item.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{':'}}
                                 {{ item.goodsCode + '/' + item.goodsName }}
                                 {{ formatDecimal(item.tHDetailEx.holderPrice, item.decimalPlace) }}
                             </h4>