xxxxx

public/locales/en-US.json

@@ -14,6 +14,7 @@
         "save": "Save",
         "tips": "Tips",
         "submitsuccess": "Submit Successful",
+        "submitsuccess1": "Submit Successful, please confirm the result later",
         "pleaseenter": "Please enter",
         "ikonw": "I Konw",
         "operate": "Operate",
@@ -656,7 +657,10 @@
             "title": "Spot",
             "subtitle": "Spot Position Info",
             "subtitle2": "Listing Info",
+            "subtitle3": "Listing",
+            "subtitle4": "Pick Up",
             "goodsname": "Name/Code",
+            "PerformanceTemplate": "PerformanceTemplate",
             "warehousename": "Warehouse",
             "qty": "StockQty",
             "freezerqty": "FreezerQty",
@@ -688,13 +692,13 @@
             "tips10": "Please enter your contact information",
             "tips11": "Please enter the contact person",
             "tips12": "Please enter the delivery quantity",
-            "receipttype": "InvoiceType:",
-            "username": "InvoicePayable:",
-            "taxpayerid": "TaxNumber:",
-            "receiptbank": "BankName:",
-            "receiptaccount": "BankAccount:",
-            "address1": "BbusinessAddress:",
-            "contactinfo": "BbusinessMobile:",
+            "receipttype": "InvoiceType：",
+            "username": "InvoicePayable：",
+            "taxpayerid": "TaxNumber：",
+            "receiptbank": "BankName：",
+            "receiptaccount": "BankAccount：",
+            "address1": "BbusinessAddress：",
+            "contactinfo": "BbusinessMobile：",
             "email": "Email:"
         },
         "presale": {

public/locales/zh-CN.json

@@ -14,6 +14,7 @@
         "save": "保存",
         "tips": "提示",
         "submitsuccess": "提交成功",
+        "submitsuccess1": "提交成功，请稍后确认结果",
         "pleaseenter": "请输入",
         "ikonw": "我知道了",
         "operate": "操作",
@@ -659,7 +660,10 @@
             "title": "现货持仓",
             "subtitle": "现货持仓信息",
             "subtitle2": "挂牌信息",
+            "subtitle3": "挂牌",
+            "subtitle4": "提货",
             "goodsname": "商品代码/名称",
+            "PerformanceTemplate": "履约方式",
             "warehousename": "仓库",
             "qty": "库存量",
             "freezerqty": "冻结量",

src/packages/mobile/views/bank/wallet/components/deposit/Index.vue

@@ -165,7 +165,7 @@ const formSubmit = () => {
             }
         }).catch((err) => {
             if (!isComplete) {
-                dialog('提交失败:' + err).then(() => {
+                dialog(t('common.submitfailure') + err).then(() => {
                     formData.Amount = undefined
                 })
             }

src/packages/mobile/views/bank/wallet/components/withdraw/Index.vue

@@ -148,7 +148,7 @@ const formSubmit = () => {
             }
         }).catch((err) => {
             if (!isComplete) {
-                dialog('提交失败:' + err).then(() => {
+                dialog(t('common.submitfailure') + err).then(() => {
                     formData.Amount = undefined
                 })
             }

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

@@ -81,7 +81,7 @@ const formSubmit = () => {
                         ElMessage.success('提交成功，请稍后确认结果')
                         onCancel()
                     }).catch((err) => {
-                        ElMessage.error('提交失败:' + err)
+                        ElMessage.error(t('common.submitfailure') + err)
                     })
                 } else {
                     ElMessageBox.confirm('入金不在时间范围内', '提示', { confirmButtonText: '我知道了', showCancelButton: false })

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

@@ -88,7 +88,7 @@ const signSubmit = () => {
         /// 返回上层
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 

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

@@ -265,7 +265,7 @@ const formSubmit = () => {
                             ElMessage.success(bankInfo.value?.signstatus != undefined ? '签约信息修改成功' : '签约提交成功，请耐心等待审核。')
                             onCancel(true)
                         }).catch((err) => {
-                            ElMessage.error('提交失败:' + err)
+                            ElMessage.error(t('common.submitfailure') + err)
                         })
                     } else {
                         ElMessage.error('未签约')

src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -140,7 +140,7 @@ const formSubmit = () => {
         }).catch((err) => {
             if (!isComplete) {
                 formData.Amount = undefined
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             }
         }).finally(() => {
             window.clearTimeout(t)

src/packages/pc/views/footer/presell/presellposition/deposit/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('position.presale.tips') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onMakeUpDeposit">{{ t('operation.confirm') }}</el-button>
@@ -48,7 +48,7 @@ const onMakeUpDeposit = () => {
         ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     }).finally(() => {
         loading.value = false
     })

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

@@ -1,7 +1,7 @@
 <!-- 预售转让-预售持仓-补足定金 -->
 <template>
     <app-drawer :title="t('common.tips')" v-model:show="show" :refresh="refresh">
-        <div class="g-text-message">是否追加未付转让定金？</div>
+        <div class="g-text-message">{{ t('position.transfer.tips1') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onMakeUpDeposit">{{ t('operation.confirm') }}</el-button>
@@ -42,7 +42,7 @@ const onMakeUpDeposit = () => {
         ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

src/packages/pc/views/footer/pricing/order/cancel/index.vue

@@ -43,7 +43,7 @@ const onCancelSumit = () => {
         ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

src/packages/pc/views/footer/spot/order/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.pricingorder.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>
@@ -46,7 +46,7 @@ const onCancelSumit = () => {
         ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

src/packages/pc/views/footer/spot/position/components/listing/index.vue

@@ -1,30 +1,30 @@
 <!-- 现货仓单-现货明细-挂牌 -->
 <template>
-    <app-drawer title="挂牌" v-model:show="show" :loading="loading" :refresh="refresh" :width="800">
+    <app-drawer :title="t('position.spot.subtitle3')" 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.spot.goodsname')">
                 <span>{{ selectedRow.wrstandardcode }}/{{ selectedRow.wrstandardname }}</span>
             </el-form-item>
-            <el-form-item prop="PerformanceTemplateID" label="履约方式">
+            <el-form-item prop="PerformanceTemplateID" :label="t('position.spot.PerformanceTemplate')">
                 <Performance :market-id="17201" tmptype="0,2" v-model="formData.PerformanceTemplateID" />
             </el-form-item>
-            <el-form-item label="仓库">
+            <el-form-item :label="t('position.spot.warehousename')">
                 <span>{{ selectedRow.warehousename }}</span>
             </el-form-item>
-            <el-form-item label="库存量">
+            <el-form-item :label="t('position.spot.qty')">
                 <span>{{ selectedRow.qty }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.spot.freezerqty')">
                 <span>{{ selectedRow.freezerqty }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.spot.enableqty')">
                 <span>{{ selectedRow.enableqty }}</span>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="挂牌量">
-                <el-input-number placeholder="请输入挂牌量" v-model="formData.OrderQty" :max="selectedRow.enableqty" :min="0" />
+            <el-form-item prop="OrderQty" :label="t('position.spot.orderqty')">
+                <el-input-number :placeholder="t('position.spot.tips3')" v-model="formData.OrderQty" :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
-            <el-form-item prop="FixedPrice" label="挂牌价格">
-                <el-input-number placeholder="请输入挂牌价格" :precision="2" v-model="formData.FixedPrice" />
+            <el-form-item prop="FixedPrice" :label="t('position.spot.fixedprice')">
+                <el-input-number :placeholder="t('position.spot.tips2')" :precision="2" v-model="formData.FixedPrice" />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -60,16 +60,16 @@ const formRef = ref<FormInstance>()
 const formRules: FormRules = {
     PerformanceTemplateID: [{
         required: true,
-        message: '请选择履约方式'
+        message: t('position.spot.tips1')
     }],
     FixedPrice: [{
-        message: '请输入价格',
+        message: t('position.spot.tips2'),
         validator: () => {
             return !!formData.FixedPrice
         }
     }],
     OrderQty: [{
-        message: '请输入数量',
+        message: t('position.spot.tips3'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -92,10 +92,10 @@ const formSubmit = () => {
             formData.SubNum = subnum
 
             listingSubmit().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/spot/position/components/pickup/index.vue

@@ -1,32 +1,32 @@
 <!-- 现货仓单-现货明细-提货 -->
 <template>
-    <app-drawer title="提货" v-model:show="show" :width="960" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('position.spot.subtitle4')" v-model:show="show" :width="960" :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.spot.goodsname')">
                 <span>{{ selectedRow.wrstandardcode }}/{{ selectedRow.wrstandardname }}</span>
             </el-form-item>
-            <el-form-item label="仓库">
+            <el-form-item :label="t('position.spot.warehousename')">
                 <span>{{ selectedRow.warehousename }}</span>
             </el-form-item>
-            <el-form-item label="库存量">
+            <el-form-item :label="t('position.spot.qty')">
                 <span>{{ selectedRow.qty }}</span>
             </el-form-item>
-            <el-form-item label="冻结量">
+            <el-form-item :label="t('position.spot.freezerqty')">
                 <span>{{ selectedRow.freezerqty }}</span>
             </el-form-item>
-            <el-form-item label="可用量">
+            <el-form-item :label="t('position.spot.enableqty')">
                 <span>{{ selectedRow.enableqty }}</span>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="提货数量">
-                <el-input-number placeholder="请输入提货数量" v-model="orderQty" :max="selectedRow.enableqty" :min="0" />
+            <el-form-item prop="OrderQty" :label="t('position.spot.orderqty2')">
+                <el-input-number :placeholder="t('position.spot.tips12')" v-model="orderQty" :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
-            <el-form-item prop="AppointmentModel" label="提货方式">
+            <el-form-item prop="AppointmentModel" :label="t('position.spot.appointmentmodel')">
                 <el-select effect="dark" v-model="formData.AppointmentModel" :disabled="loading">
                     <el-option :label="item.label" :value="item.value"
                         v-for="(item, index) in getAppointmentModelOutList()" :key="index" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="ContractName" label="联系人">
+            <el-form-item prop="ContractName" :label="t('position.spot.contactname')">
                 <div class="el-form-item--col">
                     <el-input type="textarea" :rows="2" v-model="formData.ContactName" />
                     <el-dropdown trigger="click" v-if="addressList.length">
@@ -44,19 +44,19 @@
                     </el-dropdown>
                 </div>
             </el-form-item>
-            <el-form-item prop="ContactNum" label="联系方式">
+            <el-form-item prop="ContactNum" :label="t('position.spot.contactnum')">
                 <el-input :placeholder="t('common.pleaseenter')" v-model="formData.ContactNum" />
             </el-form-item>
             <template v-if="formData.AppointmentModel === 1">
-                <el-form-item prop="Region" class="el-form-item--row" label="收货地区">
+                <el-form-item prop="Region" class="el-form-item--row" :label="t('position.spot.district')">
                     <app-region class="el-form-item--col" v-model:province="formData.ProvinceID"
                         v-model:city="formData.CityID" v-model:district="formData.DistrictID" />
                 </el-form-item>
-                <el-form-item class="el-form-item--row" prop="Address" label="收货地址">
+                <el-form-item class="el-form-item--row" prop="Address" :label="t('position.spot.address')">
                     <el-input :placeholder="t('common.pleaseenter')" v-model="formData.Address" />
                 </el-form-item>
             </template>
-            <el-form-item prop="AppointmentRemark" class="el-form-item--row" label="发票信息">
+            <el-form-item prop="AppointmentRemark" class="el-form-item--row" :label="t('position.spot.remark')">
                 <div class="el-form-item--col">
                     <el-input type="textarea" :rows="2" v-model="formData.AppointmentRemark" />
                     <el-dropdown trigger="click" v-if="invoiceList.length">
@@ -114,32 +114,32 @@ const { t } = i18n.global
 // 表单验证规则
 const formRules: FormRules = {
     orderQty: [{
-        message: '请输入提货数量',
+        message: t('position.spot.tips12'),
         validator: () => {
             return !!orderQty.value
         }
     }],
     ContactName: [{
         required: true,
-        message: '请输入联系人',
+        message: t('position.spot.tips11'),
     }],
     ContactNum: [{
         required: true,
-        message: '请输入联系方式',
+        message: t('position.spot.tips10'),
     }],
     Region: [{
-        message: '请选择收货地区',
+        message: t('position.spot.tips9'),
         validator: () => {
             return !!formData.ProvinceID && !!formData.CityID && !!formData.DistrictID
         }
     }],
     Address: [{
         required: true,
-        message: '请输入收货地址',
+        message: t('position.spot.tips8'),
     }],
     AppointmentRemark: [{
         required: true,
-        message: '请输入发票信息',
+        message: t('position.spot.tips7'),
     }],
 }
 
@@ -162,35 +162,35 @@ const invoiceChange = (item: Model.WrUserReceiptInfoRsp) => {
         if (value !== '') {
             switch (key) {
                 case 'receipttype': {
-                    formData.AppointmentRemark += '发票类型:' + getReceiptTypeName(Number(value)) + '\n'
+                    formData.AppointmentRemark += t('position.spot.receipttype') + getReceiptTypeName(Number(value)) + '\n'
                     break
                 }
                 case 'username': {
-                    formData.AppointmentRemark += '户名:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.username') + value + '\n'
                     break
                 }
                 case 'address': {
-                    formData.AppointmentRemark += '地址:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.address1') + value + '\n'
                     break
                 }
                 case 'contactinfo': {
-                    formData.AppointmentRemark += '联系方式:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.contactinfo') + value + '\n'
                     break
                 }
                 case 'idnum': {
-                    formData.AppointmentRemark += '身份证号码:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.idnum') + value + '\n'
                     break
                 }
                 case 'receiptaccount': {
-                    formData.AppointmentRemark += '发票帐号:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.receiptaccount') + value + '\n'
                     break
                 }
                 case 'receiptbank': {
-                    formData.AppointmentRemark += '发票开户行:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.receiptbank') + value + '\n'
                     break
                 }
                 case 'taxpayerid': {
-                    formData.AppointmentRemark += '纳税人识别号:' + value + '\n'
+                    formData.AppointmentRemark += t('position.spot.taxpayerid') + value + '\n'
                     break
                 }
             }
@@ -207,10 +207,10 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             applySubmit().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/swap/order/cancel/index.vue

@@ -44,7 +44,7 @@ const onCancelSumit = () => {
         ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>