xxxxx

public/locales/en-US.json

@@ -391,6 +391,9 @@
     },
     "order": {
         "title": "My Orders",
+        "plTotal": "PL Total",
+        "feeTotal": "Fee Total：",
+        "qtyTotal": "Qty Total：",
         "goodsorder": {
             "title": "Goods Order",
             "title2": "History Goods Order",
@@ -410,7 +413,8 @@
             "orderid": "OrderID",
             "freezemargin": "FreezeMargin",
             "tips1": "Is the confirmation to be revoked?",
-            "tips2": "Revocation is successful"
+            "tips2": "Revocation is successful",
+            "tips3": "Is the confirmation to be revoked?"
         },
         "goodstrade": {
             "title": "Goods Trade",
@@ -605,6 +609,8 @@
             "goodsname": "Name/Code",
             "buyorsell": "Direction",
             "curholderamount": "CurHolderAmount",
+            "holderamount": "HolderAmount",
+            "holderqty": "HolderQty",
             "curpositionqty": "CurPositionQty",
             "averageprice": "AveragePrice",
             "frozenqty": "FrozenQty",
@@ -719,10 +725,14 @@
             "goodsdisplay": "Name/Code",
             "buycurholderamount": "BuyCurHolderAmount",
             "buycurpositionqty": "BuyCurPositionQty",
+            "curpositionqty": "CurPositionQty",
             "buyfrozenqty": "BuyFrozenQty",
+            "frozenqty": "FrozenQty",
             "enableqty": "EnableQty",
             "sellname": "SellName",
             "presaleprice": "OrderPrice",
+            "closepl": "ClosePl",
+            "averageprice": "AveragePrice",
             "tradeamount": "TradeAmount",
             "transferdepositratio": "TransferDepositRatio",
             "transferdeposit": "TransferDeposit",
@@ -1184,7 +1194,7 @@
                 "applystatus": "ApplyStatus",
                 "bankaccountno": "BankAccountNo",
                 "bankname": "BankName",
-                "accountcode": "accountcode",
+                "accountcode": "Accountcode",
                 "accountname": "AccountName",
                 "amount": "Amount"
             }

public/locales/zh-CN.json

@@ -393,6 +393,9 @@
     },
     "order": {
         "title": "我的订单",
+        "plTotal": "盈亏：",
+        "feeTotal": "手续费：",
+        "qtyTotal": "数量：",
         "goodsorder": {
             "title": "订单委托单",
             "title2": "历史订单委托",
@@ -412,7 +415,8 @@
             "orderid": "委托单号",
             "freezemargin": "冻结金额",
             "tips1": "是否撤销该委托单？",
-            "tips2": "撤销成功"
+            "tips2": "撤销成功",
+            "tips3": "是否撤销该交收单？"
         },
         "goodstrade": {
             "title": "订单成交单",
@@ -608,7 +612,9 @@
             "goodsname": "商品代码/名称",
             "buyorsell": "持仓方向",
             "curholderamount": "持仓金额",
+            "holderamount": "持仓金额",
             "curpositionqty": "持仓量",
+            "holderqty": "持仓量",
             "averageprice": "持仓均价",
             "frozenqty": "冻结量",
             "enableqty": "可用量",
@@ -722,10 +728,14 @@
             "goodsdisplay": "商品",
             "buycurholderamount": "持仓金额",
             "buycurpositionqty": "持仓量",
+            "curpositionqty": "持仓量",
             "buyfrozenqty": "冻结量",
+            "frozenqty": "冻结量",
             "enableqty": "可用量",
             "sellname": "发售方",
             "presaleprice": "订货价",
+            "closepl": "参考损益",
+            "averageprice": "持仓均价",
             "tradeamount": "总货款",
             "transferdepositratio": "转让订金比例",
             "transferdeposit": "转让订金",

src/packages/pc/views/account/holddeposit/index.vue

@@ -47,7 +47,7 @@ const filterDate = shallowRef<string[]>([])
 const { t } = i18n.global
 
 filterOptons.buttonList = [
-    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) },
+    { lable: t('operation.reset'), className: 'el-button--info', onClick: () => onSearch(true) },
     { lable: t('operation.search'), className: 'el-button--info', onClick: () => onSearch() },
     { lable: '入金代扣申请', className: 'el-button--primary', onClick: () => showComponent() }
 ]

src/packages/pc/views/account/sign/index.vue

@@ -152,7 +152,7 @@ const beforeShowComponent = (row: Model.BankAccountSignRsp) => {
 }
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountcode', label: '资金账号' },
+    { field: 'accountcode', label: t('banksign.wallet.inoutapply.accountcode') },
     { field: 'accountname', label: '名称' },
     { field: 'cardtype', label: '证件类型' },
     { field: 'cardno', label: '证件号码' },

src/packages/pc/views/footer/goods/delivery/cancel/index.vue

@@ -1,7 +1,7 @@
 <!-- 商品订单-线下交收-撤销 -->
 <template>
     <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">是否撤销该交收单？</div>
+        <div class="g-text-message">{{ t('order.goodsorder.tips3') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onCancelSumit()">{{ t('operation.submit') }}</el-button>
@@ -43,10 +43,10 @@ const onCancelSumit = () => {
     formData.DeliveryOrderID = handleRequestBigNumber(deliveryorderid)
     /// 提交
     cancelSubmit().then(() => {
-        ElMessage.success('撤销成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('撤销失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

src/packages/pc/views/footer/goods/detail/components/transfer/index.vue

@@ -1,38 +1,38 @@
 <!-- 商品订单-持仓明细-转让 -->
 <template>
-    <app-drawer title="转让" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--horizontal" label-width="120px" :model="formData" :rules="formRules">
-            <el-form-item label="商品代码/名称">
+    <app-drawer :title="t('operation.transfer')" :width="840" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules">
+            <el-form-item :label="t('position.goods.goodsname')">
                 <span>{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
             </el-form-item>
-            <el-form-item label="持仓方向">
+            <el-form-item :label="t('position.goods.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.buyorsell) }}</span>
             </el-form-item>
-            <el-form-item label="持仓金额">
+            <el-form-item :label="t('position.goods.holderamount')">
                 <span>{{ formatDecimal(selectedRow.holderamount) }}</span>
             </el-form-item>
-            <el-form-item label="持仓量">
+            <el-form-item :label="t('position.goods.holderqty')">
                 <span>{{ selectedRow.holderqty }}</span>
             </el-form-item>
-            <el-form-item label="持仓价">
+            <el-form-item :label="t('position.goods.holderprice')">
                 <span>{{ formatDecimal(selectedRow.holderprice, selectedRow.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.goods.freezeqty')">
                 <span>{{ selectedRow.freezeqty }}</span>
             </el-form-item>
-            <el-form-item label="参考损益">
+            <el-form-item :label="t('position.goods.closepl')">
                 <span :class="handlePriceColor(closepl)">{{ formatDecimal(closepl, selectedRow.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.goods.enableqty')">
                 <span>{{ maxQty }}</span>
             </el-form-item>
-            <el-form-item prop="OrderPrice" label="转让价格">
-                <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :step="quote?.decimalvalue"
+            <el-form-item prop="OrderPrice" :label="t('position.goods.transferprice')">
+                <el-input-number :placeholder="t('position.goods.tips1')" v-model="formData.OrderPrice" :step="quote?.decimalvalue"
                     :precision="quote?.decimalplace" />
             </el-form-item>
-            <el-form-item prop="OrderQty" label="转让量">
+            <el-form-item prop="OrderQty" :label="t('position.goods.qty')">
                 <div class="g-qty-group">
-                    <el-input-number placeholder="请输入数量" v-model="formData.OrderQty" :precision="0" :max="maxQty"
+                    <el-input-number :placeholder="t('position.goods.tips2')" v-model="formData.OrderQty" :precision="0" :max="maxQty"
                         :min="0" />
                 </div>
             </el-form-item>
@@ -91,13 +91,13 @@ const formRef = ref<FormInstance>()
 
 const formRules: FormRules = {
     OrderPrice: [{
-        message: '请输入转让价格',
+        message: t('position.goods.tips1'),
         validator: () => {
             return !!formData.OrderPrice
         }
     }],
     OrderQty: [{
-        message: '请输入转让量',
+        message: t('position.goods.tips2'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -127,10 +127,10 @@ const onCloseSumit = () => {
             formData.RelatedID = handleRequestBigNumber(tradeid)
 
             formSubmit().then(() => {
-                ElMessage.success('挂牌成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('挂牌失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

src/packages/pc/views/footer/goods/position/components/delivery50/index.vue

@@ -1,50 +1,50 @@
 <!-- 商品订单-合约汇总-交收 -->
 <template>
-    <app-drawer title="交收" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--horizontal" label-width="120px" :model="formData" :rules="formRules">
-            <el-form-item label="商品代码/名称">
+    <app-drawer :title="t('operation.delivery')" :width="840" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules">
+            <el-form-item :label="t('position.goods.goodsname')">
                 <span>{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
             </el-form-item>
-            <el-form-item label="持仓方向">
+            <el-form-item :label="t('position.goods.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.buyorsell) }}</span>
             </el-form-item>
-            <el-form-item label="持仓金额">
+            <el-form-item :label="t('position.goods.curholderamount')">
                 <span>{{ formatDecimal(selectedRow.curholderamount) }}</span>
             </el-form-item>
-            <el-form-item label="持仓量">
+            <el-form-item :label="t('position.goods.curpositionqty')">
                 <span>{{ selectedRow.curpositionqty }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.goods.frozenqty')">
                 <span>{{ selectedRow.frozenqty }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.goods.enableqty')">
                 <span>{{ selectedRow.enableqty }}</span>
             </el-form-item>
-            <el-form-item label="最小交收量">
+            <el-form-item :label="t('position.goods.mindeliverylot')">
                 <span>{{ selectedRow.mindeliverylot }}</span>
             </el-form-item>
-            <el-form-item label="持仓均价">
+            <el-form-item :label="t('position.goods.averageprice')">
                 <span>{{ formatDecimal(selectedRow.averageprice, selectedRow.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="对手方">
+            <el-form-item :label="t('position.goods.matchname')">
                 <span>{{ selectedRow.matchname }}</span>
             </el-form-item>
-            <el-form-item label="参考损益">
+            <el-form-item :label="t('position.goods.closepl')">
                 <span :class="selectedRow.closeplColor">
                     {{ formatDecimal(selectedRow.closepl, selectedRow.decimalplace) }}
                 </span>
             </el-form-item>
-            <el-form-item prop="DeliveryLot" label="交收量">
+            <el-form-item prop="DeliveryLot" :label="t('position.goods.deliverylot')">
                 <el-input-number :placeholder="t('common.pleaseenter')" v-model="formData.DeliveryLot" :precision="0"
                     :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
-            <el-form-item label="交收数量">
+            <el-form-item :label="t('position.goods.deliveryqty')">
                 <span>{{ (formData.DeliveryLot ?? 0) * selectedRow.agreeunit }}{{ selectedRow.goodunit }}</span>
             </el-form-item>
             <el-form-item class="el-form-item--row" prop="DeliveryInfo"
-                :label="selectedRow.buyorsell === BuyOrSell.Buy ? '收货地址' : '交收信息'">
+                :label="selectedRow.buyorsell === BuyOrSell.Buy ? t('position.goods.address') : t('position.goods.deliveryinfo')">
                 <div class="el-form-item--col">
-                    <el-input type="textarea" :placeholder="selectedRow.buyorsell === BuyOrSell.Buy ? '请输入收货地址' : '请输入交收信息'"
+                    <el-input type="textarea" :placeholder="selectedRow.buyorsell === BuyOrSell.Buy ? t('position.goods.tips9') : t('position.goods.tips10')"
                         :rows="3" v-model="formData.DeliveryInfo" />
                     <el-icon :size="20" style="cursor: pointer;" @click="showAddress = true"
                         v-if="selectedRow.buyorsell === BuyOrSell.Buy">
@@ -93,18 +93,18 @@ const formRef = ref<FormInstance>()
 const formRules: FormRules = {
     DeliveryLot: [{
         required: true,
-        message: '请输入交收量',
+        message: t('position.goods.tips7'),
         validator: (rule, value, callback) => {
             if (value >= props.selectedRow.mindeliverylot) {
                 callback()
             } else {
-                callback(new Error('不能小于最小交收量' + `${props.selectedRow.mindeliverylot}`))
+                callback(new Error(t('position.goods.tips8') + `${props.selectedRow.mindeliverylot}`))
             }
         }
     }],
     DeliveryInfo: [{
         required: true,
-        message: props.selectedRow.buyorsell === BuyOrSell.Buy ? '请输入收货地址' : '请输入交收信息',
+        message: props.selectedRow.buyorsell === BuyOrSell.Buy ? t('position.goods.tips9') : t('position.goods.tips10'),
         validator: () => {
             return !!formData.DeliveryInfo
         }
@@ -133,10 +133,10 @@ const onSubmit = () => {
             formData.GoodsID = goodsid
             formData.BuyOrSell = buyorsell
             formSubmit().then(() => {
-                ElMessage.success('交收成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('交收失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

src/packages/pc/views/footer/goods/position/components/transfer/index.vue

@@ -1,36 +1,36 @@
 <!-- 商品订单-合约汇总-转让 -->
 <template>
-    <app-drawer title="转让" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--horizontal" label-width="120px" :model="formData" :rules="formRules">
-            <el-form-item label="商品代码/名称">
+    <app-drawer :title="t('operation.transfer')" :width="840" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules">
+            <el-form-item :label="t('position.goods.goodsname')">
                 <span>{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
             </el-form-item>
-            <el-form-item label="持仓方向">
+            <el-form-item :label="t('position.goods.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.buyorsell) }}</span>
             </el-form-item>
-            <el-form-item label="持仓金额">
+            <el-form-item :label="t('position.goods.curholderamount')">
                 <span>{{ formatDecimal(selectedRow.curholderamount) }}</span>
             </el-form-item>
-            <el-form-item label="持仓量">
+            <el-form-item :label="t('position.goods.curpositionqty')">
                 <span>{{ selectedRow.curpositionqty }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.goods.frozenqty')">
                 <span>{{ selectedRow.frozenqty }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.goods.enableqty')">
                 <span>{{ selectedRow.enableqty }}</span>
             </el-form-item>
-            <el-form-item label="持仓均价">
+            <el-form-item :label="t('position.goods.averageprice')">
                 <span>{{ formatDecimal(selectedRow.averageprice, selectedRow.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="参考损益">
+            <el-form-item :label="t('position.goods.closepl')">
                 <span :class="selectedRow.closeplColor">
                     {{ formatDecimal(selectedRow.closepl, selectedRow.decimalplace) }}
                 </span>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="转让量">
+            <el-form-item prop="OrderQty" :label="t('position.goods.qty')">
                 <div class="g-qty-group">
-                    <el-input-number placeholder="请输入数量" v-model="formData.OrderQty" :precision="0"
+                    <el-input-number :placeholder="t('position.goods.tips2')" v-model="formData.OrderQty" :precision="0"
                         :max="selectedRow.enableqty" :min="0" />
                     <el-radio-group size="small" v-model="qtyStep" @change="onRadioChange">
                         <el-radio v-for="(value, index) in qtyStepList" :key="index" :label="value" border
@@ -40,8 +40,8 @@
                     </el-radio-group>
                 </div>
             </el-form-item>
-            <el-form-item prop="OrderPrice" label="转让价格">
-                <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :step="quote?.decimalvalue"
+            <el-form-item prop="OrderPrice" :label="t('position.goods.transferprice')">
+                <el-input-number :placeholder="t('position.goods.tips1')" v-model="formData.OrderPrice" :step="quote?.decimalvalue"
                     :precision="quote?.decimalplace" />
             </el-form-item>
         </el-form>
@@ -84,13 +84,13 @@ const qtyStep = ref(1) // 数量步长
 
 const formRules: FormRules = {
     OrderPrice: [{
-        message: '请输入转让价格',
+        message: t('position.goods.tips1'),
         validator: () => {
             return !!formData.OrderPrice
         }
     }],
     OrderQty: [{
-        message: '请输入转让量',
+        message: t('position.goods.tips2'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -119,10 +119,10 @@ const onCloseSumit = () => {
             formData.OperateType = EOrderOperateType.ORDEROPERATETYPE_NORMAL
 
             formSubmit().then(() => {
-                ElMessage.success('挂牌成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('挂牌失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

src/packages/pc/views/footer/goods/trade/index.vue

@@ -4,15 +4,15 @@
         <template #headerRight>
             <ul class="goods-trade-total">
                 <li>
-                    <span>数量：</span>
+                    <span>{{ t('order.qtyTotal') }}</span>
                     <span>{{ qtyTotal }}</span>
                 </li>
                 <li>
-                    <span>手续费：</span>
+                    <span>{{ t('order.feeTotal') }}</span>
                     <span>{{ feeTotal.toFixed(2) }}</span>
                 </li>
                 <li>
-                    <span>盈亏：</span>
+                    <span>{{ t('order.plTotal') }}</span>
                     <span>{{ plTotal.toFixed(2) }}</span>
                 </li>
             </ul>