Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

public/locales/en-US.json

@@ -735,6 +735,7 @@
             "title1": "Transfer Position Detail",
             "subtitle": "Transfer Position Information",
             "goodsname": "Name/Code",
+            "buyorsell": "BuyOrSell",
             "goodsdisplay": "Name/Code",
             "buycurholderamount": "BuyCurHolderAmount",
             "buycurpositionqty": "BuyCurPositionQty",
@@ -746,6 +747,8 @@
             "presaleprice": "OrderPrice",
             "closepl": "ClosePl",
             "averageprice": "AveragePrice",
+            "holderqty": "HolderQty",
+            "holderprice": "HolderPrice",
             "tradeamount": "TradeAmount",
             "transferdepositratio": "TransferDepositRatio",
             "transferdeposit": "TransferDeposit",
@@ -799,6 +802,9 @@
             "title2": "History Online Order",
             "subtitle": "Online Order Information",
             "wrtypename": "WrTypeName",
+            "wrtypename1": "UserName/WrstandardName/WarehouseName",
+            "pricemove": "PriceMove",
+            "qty": "Qty",
             "deliveryqty": "DeliveryQty",
             "xdeliveryprice": "XDeliveryPrice",
             "deliverypricemove": "DeliveryPriceMove",
@@ -1111,6 +1117,7 @@
             "showOrderDialog": "ShowOrderDialog",
             "showOrderCancelDialog": "ShowOrderCancelDialog",
             "showOrderFailMessage": "ShowOrderFailMessage",
+            "showOrderSuccessMessage": "ShowOrderSuccessMessage",
             "price": "Price",
             "qty": "Qty",
             "last": "Last",
@@ -1333,6 +1340,12 @@
             "pleaseselectthecardtype": "Please select the card type",
             "openfailure": "Account opening failed, your age does not meet the account opening requirements",
             "opensuccess": "The real-name authentication submission request was successful"
+        },
+        "avater": {
+            "title": "Avater",
+            "cardbackphotourl": "User Avater",
+            "tips": "Please select the correct image type",
+            "tips1": "Please upload your profile picture"
         }
     },
     "report": {
@@ -1457,7 +1470,7 @@
             "query_order_goods": "Goods",
             "query_order_goods_list": "Currents",
             "query_order_goods_history": "Historys",
-            "query_order_presell": "Presell Transfer",
+            "query_order_presell": "Presell & Transfer",
             "query_order_presell__list": "Currents Subscribe",
             "query_order_presell_history": "Historys Subscribe",
             "query_order_presell_transferlist": "Currents Transfer",
@@ -1475,7 +1488,7 @@
             "query_trade_goods": "Goods",
             "query_trade_goods_list": "Currents",
             "query_trade_goods_history": "Historys",
-            "query_trade_presell": "Presell Transfer",
+            "query_trade_presell": "Presell & Transfer",
             "query_trade_presell_list": "Currents",
             "query_trade_presell_history": "Historys",
             "query_trade_spot": "Spots",

public/locales/zh-CN.json

@@ -738,6 +738,7 @@
             "title1": "转让持仓详情",
             "subtitle": "转让持仓信息",
             "goodsname": "商品代码/名称",
+            "buyorsell": "持仓方向",
             "goodsdisplay": "商品",
             "buycurholderamount": "持仓金额",
             "buycurpositionqty": "持仓量",
@@ -749,6 +750,8 @@
             "presaleprice": "订货价",
             "closepl": "参考损益",
             "averageprice": "持仓均价",
+            "holderqty": "持仓量",
+            "holderprice": "持仓价",
             "tradeamount": "总货款",
             "transferdepositratio": "转让订金比例",
             "transferdeposit": "转让订金",
@@ -803,6 +806,9 @@
             "title2": "历史点选交收单",
             "subtitle": "点选交收单信息",
             "wrtypename": "商品名称",
+            "wrtypename1": "持有人/商品/仓库",
+            "pricemove": "升贴水",
+            "qty": "数量",
             "deliveryqty": "交收数量",
             "xdeliveryprice": "订货价",
             "deliverypricemove": "升贴水",
@@ -1115,6 +1121,7 @@
             "showOrderDialog": "下单确认提示框",
             "showOrderCancelDialog": "撤单确认提示框",
             "showOrderFailMessage": "下单失败消息",
+            "showOrderSuccessMessage": "下单成功消息",
             "price": "价格",
             "qty": "数量",
             "last": "现价",
@@ -1338,6 +1345,12 @@
             "pleaseselectthecardtype": "请选择证件类型",
             "openfailure": "开户失败，您的年龄不符合开户要求",
             "opensuccess": "实名认证提交请求成功"
+        },
+        "avater": {
+            "title": "头像",
+            "cardbackphotourl": "用户头像",
+            "tips": "请选择正确的图片类型",
+            "tips1": "请上传头像"
         }
     },
     "report": {

src/packages/mobile/views/account/certification/Index.vue

@@ -52,10 +52,10 @@ import { useNavigation } from '@mobile/router/navigation'
 import { getIdCardAge } from '@/filters'
 import { validateRules } from '@/constants/regex'
 import { useRequest } from '@/hooks/request'
-import AppUploader from '@mobile/components/base/uploader/index.vue'
-import AppSelect from '@mobile/components/base/select/index.vue'
 import { getWskhOpenAccountConfigs } from '@/services/api/account'
 import { i18n } from '@/stores'
+import AppUploader from '@mobile/components/base/uploader/index.vue'
+import AppSelect from '@mobile/components/base/select/index.vue'
 
 const formRef = shallowRef<FormInstance>()
 const { formData, formSubmit, modifyremark } = addAuthReq()

src/packages/pc/components/layouts/header/components/avater/index.vue

@@ -1,9 +1,9 @@
 <!-- 系统公告 -->
 <template>
-    <app-drawer title="头像" :width="400" v-model:show="show" :refresh="refresh">
+    <app-drawer :title="t('user.avater.title')" :width="400" v-model:show="show" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="80px" :model="formData" :rules="formRules">
-            <el-form-item prop="cardbackphotourl" label="用户头像">
-                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="f_afterRead"
+            <el-form-item prop="cardbackphotourl" :label="t('user.avater.cardbackphotourl')">
+                <app-upload :file-types="['image']" :type-message="t('user.avater.tips')" @change="f_afterRead"
                     :rules="formRules.cardbackphotourl" />
             </el-form-item>
         </el-form>
@@ -37,7 +37,7 @@ const formData = reactive<Model.UserHeadUrlReq>({
 
 const formRules: FormRules = {
     headurl: [{
-        message: '请上传头像',
+        message: t('user.avater.tips1'),
         validator: () => {
             return !!formData.headurl
         }

src/packages/pc/components/modules/delivery/index.vue

@@ -1,6 +1,6 @@
 <!-- 交收操作 -->
 <template>
-    <app-drawer class="app-delivery" title="交收" :width="680" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer class="app-delivery" :title="t('operation.delivery')" :width="680" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="app-delivery__header">
             <slot name="header" :qtyStep="qtyStep" :goodunit="deliveryRelation?.enumdicname ?? ''"></slot>
         </div>
@@ -8,10 +8,10 @@
             <table cellspacing="0" cellpadding="0">
                 <thead>
                     <tr>
-                        <th>持有人/商品/仓库</th>
-                        <th>升贴水</th>
-                        <th>数量</th>
-                        <th>交收数量</th>
+                        <th>{{ t('delivery.online.wrtypename1') }}</th>
+                        <th>{{ t('delivery.online.pricemove') }}</th>
+                        <th>{{ t('delivery.online.qty') }}</th>
+                        <th>{{ t('delivery.online.deliveryqty') }}</th>
                         <th></th>
                     </tr>
                 </thead>

src/packages/pc/views/auth/forget/index.vue

@@ -21,8 +21,8 @@
                 :rules="formRules.confirmpassword" />
         </el-form-item>
         <el-form-item>
-            <el-button type="primary" @click="formSubmit">{{ t('operation.back')}}</el-button>
-            <el-button @click="onClose" style="margin-left: auto;">{{ t('user.forget.resetpwd') }}</el-button>
+            <el-button @click="onClose">{{ t('operation.back') }}</el-button>
+            <el-button type="primary" style="margin-left: auto;" @click="formSubmit">{{ t('user.forget.resetpwd')}}</el-button>
         </el-form-item>
     </el-form>
 </template>

src/packages/pc/views/footer/presell/transferorder/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.tips1') }}</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.OperateType = EOperateType.OPERATETYPE_ORDERCANCEL
     /// 提交
     cancelSubmit().then(() => {
-        ElMessage.success('撤销成功')
+        ElMessage.success(t('order.goodsorder.tips2'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('撤销失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

src/packages/pc/views/footer/presell/transferposition/listing/index.vue

@@ -1,26 +1,26 @@
 <!-- 预售转让-转让持仓-转让 -->
 <template>
-    <app-drawer title="转让" v-model:show="show" :loading="loading" :refresh="refresh" :width="800">
+    <app-drawer :title="t('operation.transfer')" v-model:show="show" :loading="loading" :refresh="refresh" :width="800">
         <el-form ref="formRef" class="el-form--horizontal" label-width="120px" :model="formData" :rules="formRules">
-            <el-form-item label="商品代码/名称">
+            <el-form-item :label="t('position.transfer.goodsname')">
                 <span>{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
             </el-form-item>
-            <el-form-item label="预售价">
+            <el-form-item :label="t('quote.transfer.presaleprice2')">
                 <span>{{ selectedRow.presaleprice }}</span>
             </el-form-item>
-            <el-form-item label="涨停价">
+            <el-form-item :label="t('quote.transfer.limitup')">
                 <span>{{ handleNumberValue(quote?.limitup) }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.transfer.enableqty')">
                 <span>{{ enableqty }}</span>
             </el-form-item>
-            <el-form-item label="跌停价">
+            <el-form-item :label="t('quote.transfer.limitdown')">
                 <span>{{ handleNumberValue(quote?.limitdown) }}</span>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="转让量">
-                <el-input-number placeholder="转让量" v-model="formData.OrderQty" :max="enableqty" :min="0" />
+            <el-form-item prop="OrderQty" :label="t('position.transfer.transferqty')">
+                <el-input-number :placeholder="t('position.goods.tips2')" v-model="formData.OrderQty" :max="enableqty" :min="0" />
             </el-form-item>
-            <el-form-item prop="OrderPrice" label="转让价">
+            <el-form-item prop="OrderPrice" :label="t('position.transfer.transferprice')">
                 <el-input-number :placeholder="t('position.goods.tips1')" :max="quote?.limitup" :min="quote?.limitdown"
                     :step="quote?.decimalvalue" :precision="quote?.decimalplace"
                     v-model="formData.OrderPrice" />
@@ -64,13 +64,13 @@ const formRef = ref<FormInstance>()
 
 const formRules: FormRules = {
     OrderPrice: [{
-        message: '请输入价格',
+        message: t('position.transfer.tips3'),
         validator: () => {
             return !!formData.OrderPrice
         }
     }],
     OrderQty: [{
-        message: '请输入数量',
+        message: t('position.transfer.tips4'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -95,10 +95,10 @@ const onSubmit = () => {
             formData.BuildType = EBuildType.BUILDTYPE_CLOSE
 
             formSubmit().then(() => {
-                ElMessage.success('挂牌提交成功')
+                ElMessage.success(t('position.transfer.tips1'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('挂牌提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

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

@@ -1,38 +1,38 @@
 <!-- 挂牌点价-持仓明细-转让 -->
 <template>
-    <app-drawer title="转让" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('operation.transfer')" :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="商品代码/名称">
+            <el-form-item :label="t('position.transfer.goodsname')">
                 <span>{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
             </el-form-item>
-            <el-form-item label="持仓方向">
+            <el-form-item :label="t('position.transfer.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.buyorsell) }}</span>
             </el-form-item>
-            <el-form-item label="持仓金额">
+            <el-form-item :label="t('position.transfer.buycurholderamount')">
                 <span>{{ formatDecimal(selectedRow.holderamount) }}</span>
             </el-form-item>
-            <el-form-item label="持仓量">
+            <el-form-item :label="t('position.transfer.holderqty')">
                 <span>{{ selectedRow.holderqty }}</span>
             </el-form-item>
-            <el-form-item label="持仓价">
+            <el-form-item :label="t('position.transfer.holderprice')">
                 <span>{{ formatDecimal(selectedRow.holderprice, selectedRow.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.transfer.freezeqty')">
                 <span>{{ selectedRow.freezeqty }}</span>
             </el-form-item>
-            <el-form-item label="参考损益">
+            <el-form-item :label="t('position.transfer.closepl')">
                 <span :class="handlePriceColor(closepl)">{{ formatDecimal(closepl, selectedRow.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.transfer.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.transfer.transferprice')">
+                <el-input-number :placeholder="t('position.transfer.tips3')" 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.transfer.transferqty')">
                 <div class="g-qty-group">
-                    <el-input-number placeholder="请输入数量" v-model="formData.OrderQty" :precision="0" :max="maxQty"
+                    <el-input-number :placeholder="t('position.transfer.tips4')" 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.transfer.tips3'),
         validator: () => {
             return !!formData.OrderPrice
         }
     }],
     OrderQty: [{
-        message: '请输入转让量',
+        message: t('position.transfer.tips4'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -127,10 +127,10 @@ const onCloseSumit = () => {
             formData.RelatedID = handleRequestBigNumber(tradeid)
 
             formSubmit().then(() => {
-                ElMessage.success('挂牌成功')
+                ElMessage.success(t('position.transfer.tips2'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('挂牌失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

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

@@ -1,36 +1,36 @@
 <!-- 挂牌点价-合约汇总-转让 -->
 <template>
-    <app-drawer title="转让" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('operation.transfer')" :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="商品代码/名称">
+            <el-form-item :label="t('position.transfer.goodsname')">
                 <span>{{ position.goodscode }}/{{ position.goodsname }}</span>
             </el-form-item>
-            <el-form-item label="持仓方向">
+            <el-form-item :label="t('position.transfer.buyorsell')">
                 <span>{{ getBuyOrSellName(position.buyorsell) }}</span>
             </el-form-item>
-            <el-form-item label="持仓金额">
+            <el-form-item :label="t('position.transfer.buycurholderamount')">
                 <span>{{ formatDecimal(position.curholderamount) }}</span>
             </el-form-item>
-            <el-form-item label="持仓量">
+            <el-form-item :label="t('position.transfer.curpositionqty')">
                 <span>{{ position.curpositionqty }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.transfer.frozenqty')">
                 <span>{{ position.frozenqty }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.transfer.enableqty')">
                 <span>{{ position.enableqty }}</span>
             </el-form-item>
-            <el-form-item label="持仓均价">
+            <el-form-item :label="t('position.transfer.averageprice')">
                 <span>{{ formatDecimal(position.averageprice, position.decimalplace) }}</span>
             </el-form-item>
-            <el-form-item label="参考损益">
+            <el-form-item :label="t('position.transfer.closepl')">
                 <span :class="position.closeplColor">
                     {{ formatDecimal(position.closepl, position.decimalplace) }}
                 </span>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="转让量">
+            <el-form-item prop="OrderQty" :label="t('position.transfer.transferqty')">
                 <div class="g-qty-group">
-                    <el-input-number placeholder="请输入数量" v-model="formData.OrderQty" :precision="0"
+                    <el-input-number :placeholder="t('position.transfer.tips4')" v-model="formData.OrderQty" :precision="0"
                         :max="position.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="decimalvalue"
+            <el-form-item prop="OrderPrice" :label="t('position.transfer.transferprice')">
+                <el-input-number :placeholder="t('position.transfer.tips3')" v-model="formData.OrderPrice" :step="decimalvalue"
                     :precision="decimalplace" />
             </el-form-item>
         </el-form> 
@@ -87,13 +87,13 @@ const qtyStep = ref(1) // 数量步长
 
 const formRules: FormRules = {
     OrderPrice: [{
-        message: '请输入转让价格',
+        message: t('position.transfer.tips3'),
         validator: () => {
             return !!formData.OrderPrice
         }
     }],
     OrderQty: [{
-        message: '请输入转让量',
+        message: t('position.transfer.tips4'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -122,10 +122,10 @@ const onCloseSumit = () => {
             formData.OperateType = EOrderOperateType.ORDEROPERATETYPE_NORMAL
 
             formSubmit().then(() => {
-                ElMessage.success('挂牌成功')
+                ElMessage.success(t('position.transfer.tips2'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('挂牌失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })