Handy_Cao преди 1 година
родител
ревизия
b30a68f855

+ 6 - 1
oem/tss/locales/extras/en-US.json

@@ -9,6 +9,7 @@
         "order": "Unsubscribe"
     },
     "account": {
+        "closepl": "CLosePL",
         "profitLoss": "ProfitLoss",
         "freezeMargin2": "Deposit"
     },
@@ -68,6 +69,7 @@
             "transferqty":"ReservationQty"
         },
         "goods": {
+            "closepl": "CLosePL",
             "buyorsell": "BuyOrSell",
             "holderqty": "OrderQty",
             "curpositionqty": "OrderQty",
@@ -95,17 +97,20 @@
             "buyorsell": "Choice",
             "frozenqty": "FreezeQty",
             "curholderamount": "OrderTime",
+            "closepl": "CLosePL",
             "averageprice": "AveragePrice"
         }
     },
     "banksign": {
         "capital": {
-            "totalcharge": "TotalServiceCharge:"
+            "totalprofit": "TotalProfit:",
+            "totalcharge": "TotalCharge:"
         }
     },
     "report": {
         "title": "User Statement",
         "closepl": "CLosePL",
+        "reckonpl": "ReckonPl",
         "trade": {
             "buyorselldisplay": "Choice"
         },

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

@@ -9,7 +9,8 @@
         "order": "การจอง"
     },
     "account": {
-        "profitLoss": "กำไร/ขาดทุนลอยตัว",
+        "closepl": "ส่วนต่างวันนี้",
+        "profitLoss": "ส่วนต่างลอยตัว",
         "freezeMargin2": "เงินทุน"
     },
     "quote": {
@@ -60,7 +61,7 @@
         "pricingtrade": {
             "buyorsell": "เลือก",
             "charge": "ค่าธรรมเนียม",
-            "closepl": "กำไร/ขาดทุนจากการยกเลิกคำสั่งซื้อ"
+            "closepl": "ส่วนต่างจากการยกเลิกคำสั่งซื้อ"
         }
     },
     "position": {
@@ -68,6 +69,7 @@
             "transferqty":"ปริมาณการยกเลิก"
         },
         "goods": {
+            "closepl": "ส่วนต่างอ้างอิง",
             "buyorsell": "หมวดคำสั่งซื้อ",
             "holderqty": "จำนวนคำสั่งซื้อ",
             "curpositionqty": "จำนวนคำสั่งซื้อ",
@@ -86,7 +88,7 @@
             "holddetail": {
                 "holderqty": "จำนวนคำสั่งซื้อ",
                 "freezeqty": "ราคาที่ล็อกไว้",
-                "profitLoss": "กำไร/ขาดทุนลอยตัว",
+                "profitLoss": "ส่วนต่างลอยตัว",
                 "holderamount": "ราคารวมคำสั่งซื้อ",
                 "tradetime": "เวลาที่ทำการสั่งซื้อ"
             }
@@ -95,17 +97,20 @@
             "buyorsell": "เลือก",
             "frozenqty": "ราคาที่ล็อกไว้",
             "curholderamount": "ราคารวมคำสั่งซื้อ",
+            "closepl": "ส่วนต่างอ้างอิง",
             "averageprice": "ราคาเฉลี่ยคำสั่งซื้อ"
         }
     },
     "banksign": {
         "capital": {
+            "totalprofit": "รายละเอียดส่วนต่าง:",
             "totalcharge": "รายละเอียดค่าธรรมเนียม:"
         }
     },
     "report": {
         "title": "รายการหักบัญชีของผู้ใช้งาน",
-        "closepl": "กำไร/ขาดทุนจากการยกเลิกคำสั่งซื้อ",
+        "closepl": "ส่วนต่างจากการยกเลิกคำสั่งซื้อ",
+        "reckonpl": "ส่วนต่างจากการชำระบัญชี",
         "trade": {
             "buyorselldisplay": "เลือก"
         },

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

@@ -9,7 +9,8 @@
         "order": "预订"
     },
     "account": {
-        "profitLoss": "浮动损益",
+        "closepl": "今日差额",
+        "profitLoss": "浮动差额",
         "freezeMargin2": "履约准备金"
     },
     "quote": {
@@ -60,7 +61,7 @@
         "pricingtrade": {
             "buyorsell": "选择",
             "charge": "服务费",
-            "closepl": "退订损益"
+            "closepl": "退订差额"
         }
     },
     "position": {
@@ -68,6 +69,7 @@
             "transferqty":"退订量"
         },
         "goods": {
+            "closepl": "参考差额",
             "buyorsell": "订单类目",
             "holderqty": "订单数量",
             "curpositionqty": "订单数量",
@@ -86,7 +88,7 @@
             "holddetail": {
                 "holderqty": "订单数量",
                 "freezeqty": "锁定量",
-                "profitLoss": "浮动损益",
+                "profitLoss": "浮动差额",
                 "holderamount": "订单金额",
                 "tradetime": "订单时间"
             }
@@ -95,17 +97,20 @@
             "buyorsell": "选择",
             "frozenqty": "锁定量",
             "curholderamount": "订单金额",
+            "closepl": "参考差额",
             "averageprice": "订单均价"
         }
     },
     "banksign": {
         "capital": {
+            "totalprofit": "差额汇总:",
             "totalcharge": "服务费汇总:"
         }
     },
     "report": {
         "title": "用户结算单",
-        "closepl": "退订损益",
+        "closepl": "退订差额",
+        "reckonpl": "结算差额",
         "trade": {
             "buyorselldisplay": "选择"
         },

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

@@ -9,7 +9,8 @@
         "order": "預訂"
     },
     "account": {
-        "profitLoss": "浮動損益",
+        "closepl": "今日差額",
+        "profitLoss": "浮動差額",
         "freezeMargin2": "履約準備金"
     },
     "quote": {
@@ -60,7 +61,7 @@
         "pricingtrade": {
             "buyorsell": "選擇",
             "charge": "服務費",
-            "closepl": "退訂損益"
+            "closepl": "退訂差額"
         }
     },
     "position": {
@@ -68,6 +69,7 @@
             "transferqty":"退訂量"
         },
         "goods": {
+            "closepl": "參考差額",
             "buyorsell": "訂單類目",
             "holderqty": "訂單數量",
             "curpositionqty": "訂單數量",
@@ -86,7 +88,7 @@
             "holddetail": {
                 "holderqty": "訂單數量",
                 "freezeqty": "鎖定量",
-                "profitLoss": "浮動損益",
+                "profitLoss": "浮動差額",
                 "holderamount": "訂單金額",
                 "tradetime": "訂單時間"
             }
@@ -95,17 +97,20 @@
             "buyorsell": "選擇",
             "frozenqty": "鎖定量",
             "curholderamount": "訂單金額",
+            "closepl": "參考差額",
             "averageprice": "訂單均價"
         }
     },
     "banksign": {
         "capital": {
+            "totalprofit": "差額彙總:",
             "totalcharge": "服務費彙總:"
         }
     },
     "report": {
         "title": "用戶結算單",
-        "closepl": "退訂損益",
+        "closepl": "退訂差額",
+        "reckonpl": "結算差額",
         "trade": {
             "buyorselldisplay": "選擇"
         },

+ 5 - 5
src/packages/pc/views/footer/pricing/detail2/components/transfer/index.vue

@@ -8,22 +8,22 @@
             <el-form-item :label="t('position.transfer.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.tHDetailEx.buyOrSell) }}</span>
             </el-form-item>
-            <el-form-item :label="t('position.transfer.buycurholderamount')">
+            <el-form-item :label="t('position.goods.curholderamount')">
                 <span>{{ formatDecimal(selectedRow.tHDetailEx.holderAmount) }}</span>
             </el-form-item>
-            <el-form-item :label="t('position.transfer.holderqty')">
+            <el-form-item :label="t('position.goods.holderqty')">
                 <span>{{ selectedRow.tHDetailEx.holderQty }}</span>
             </el-form-item>
-            <el-form-item :label="t('position.transfer.holderprice')">
+            <el-form-item :label="t('position.goods.holderprice')">
                 <span>{{ formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace) }}</span>
             </el-form-item>
             <el-form-item :label="t('position.goods.freezeqty')">
                 <span>{{ selectedRow.tHDetailEx.freezeQty }}</span>
             </el-form-item>
-            <el-form-item :label="t('position.transfer.enableqty')">
+            <el-form-item :label="t('position.goods.enableqty')">
                 <span>{{ maxQty }}</span>
             </el-form-item>
-            <el-form-item :label="t('position.transfer.closepl')">
+            <el-form-item :label="t('position.goods.closepl')">
                 <span :class="handlePriceColor(closepl)">{{ formatDecimal(closepl, selectedRow.decimalPlace) }}</span>
             </el-form-item>
             <el-form-item prop="PriceMode" :label="t('quote.pricing.pricemode')">