xxxxx

public/locales/en-US.json

@@ -306,7 +306,7 @@
             "pleaseenterorderqty": "Please enter the quantity",
             "tips1": "Are you sure you want to submit?",
             "tips2": "*If there are matching opposite orders at the same price, the system will automatically cancel them.",
-            "tips3": "*Submission successful.",
+            "tips3": "Submission successful.",
             "tips4": "Please enter the delisting amount",
             "delistingqty": "Delisting amount",
             "delistingbuyorsell": "Delisting direction",

public/locales/th-TH.json

@@ -306,7 +306,7 @@
             "pleaseenterorderqty": "กรุณาใส่จำนวน",
             "tips1": "ยืนยันว่าจะส่งหรือไม่?",
             "tips2": "*หากมีคำสั่งซื้อที่ตรงกับราคาจากคำสั่งในทิศทางตรงกันข้าม ระบบจะทำการยกเลิกโดยอัตโนมัติ",
-            "tips3": "*ส่งสำเร็จแล้ว",
+            "tips3": "ส่งสำเร็จแล้ว",
             "tips4": "กรุณาใส่ปริมาณการเพิกถอนรายการ",
             "delistingqty": "ปริมาณการเพิกถอนรายการ",
             "delistingbuyorsell": "ทิศทางการเพิกถอนรายการ",

public/locales/zh-CN.json

@@ -306,7 +306,7 @@
             "pleaseenterorderqty": "请输入数量",
             "tips1": "确认要提交吗？",
             "tips2": "*若存在价格匹配的反方向委托订单，系统将会自动撤销",
-            "tips3": "*提交成功。",
+            "tips3": "提交成功。",
             "tips4": "请输入摘牌量",
             "delistingqty": "摘牌量",
             "delistingbuyorsell": "摘牌方向",

public/locales/zh-TW.json

@@ -306,7 +306,7 @@
             "pleaseenterorderqty": "請輸入數量",
             "tips1": "確認要提交嗎？",
             "tips2": "*若存在價格匹配的反方向委託訂單，系統將會自動撤銷",
-            "tips3": "*提交成功。",
+            "tips3": "提交成功。",
             "tips4": "請輸入摘牌量",
             "delistingqty": "摘牌量",
             "delistingbuyorsell": "摘牌方向",

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

@@ -2,10 +2,6 @@
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey"
         :expand-row-keys="expandKeys" @row-click="rowClick">
-        <!-- 交收数量 -->
-        <template #deliveryqty="{ row }">
-            {{ row.deliveryqty + row.goodsunit }}
-        </template>
         <!-- 申请时间 -->
         <template #reqtime="{ value }">
             {{ formatDate(value) }}
@@ -50,7 +46,7 @@ const { global: { t } } = i18n
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'goodsnamedisplay', label: 'delivery.offline.goodsnamedisplay' },
     { field: 'buyorselldisplay', label: 'delivery.offline.buyorselldisplay' },
-    { field: 'deliveryqty', label: 'delivery.offline.deliveryqty' },
+    { field: 'deliverylot', label: 'delivery.offline.deliveryqty' },
     { field: 'deliveryprice', label: 'delivery.offline.deliveryprice' },
     { field: 'deliveryamount', label: 'delivery.offline.deliveryamount' },
     { field: 'deliveryinfo', label: 'delivery.offline.deliveryinfo' },

src/packages/pc/views/footer/pricing/detail2/components/delivery/index.vue

@@ -148,7 +148,7 @@ const onSubmit = () => {
             formData.TradeID = handleRequestBigNumber(tradeID)
 
             formSubmit().then(() => {
-                ElMessage.success(t('common.submitsuccess'))
+                ElMessage.success(t('position.goods.tips6'))
                 onCancel(true)
             }).catch((err) => {
                 ElMessage.error(t('common.submitfailure') + err)

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

@@ -195,7 +195,7 @@ const onCloseSumit = () => {
 
             formSubmit().then(() => {
                 if (settingStore.getSettingValue('showOrderSuccessMessage')) {
-                    ElMessage.success(t('position.transfer.tips2'))
+                    ElMessage.success(t('position.goods.tips4'))
                 }
                 onCancel(true)
             }).catch((err) => {

src/packages/pc/views/footer/pricing/detail2/index.vue

@@ -44,8 +44,8 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 // 可用重量
 const enableqty = (item: Model.SBYJMyOrderRsp) => {
-    const { tHDetailEx, agreeUnit } = item
-    return (tHDetailEx.holderQty - tHDetailEx.freezeQty) * agreeUnit
+    const { tHDetailEx } = item
+    return tHDetailEx.holderQty - tHDetailEx.freezeQty
 }
 
 const showComponent = (componentName: string, row: Model.SBYJMyOrderRsp) => {
@@ -67,17 +67,17 @@ const tableColumns = shallowRef<Partial<Column>[]>([
     {
         key: 'holderQty',
         title: t('position.goods.holddetail.holderqty'),
-        cellRenderer: ({ rowData }) => <span>{rowData.tHDetailEx.holderQty * rowData.agreeUnit + getGoodsUnitName(rowData.goodsUnitID)}</span>
+        cellRenderer: ({ rowData }) => <span>{rowData.tHDetailEx.holderQty}</span>
     },
     {
         key: 'freezeQty',
         title: t('position.goods.holddetail.freezeqty'),
-        cellRenderer: ({ rowData }) => <span>{rowData.tHDetailEx.freezeQty * rowData.agreeUnit + getGoodsUnitName(rowData.goodsUnitID)}</span>
+        cellRenderer: ({ rowData }) => <span>{rowData.tHDetailEx.freezeQty}</span>
     },
     {
         key: 'enableQty',
         title: t('position.goods.holddetail.enableqty'),
-        cellRenderer: ({ rowData }) => <span>{enableqty(rowData) + getGoodsUnitName(rowData.goodsUnitID)}</span>
+        cellRenderer: ({ rowData }) => <span>{enableqty(rowData)}</span>
     },
     {
         key: 'holderPrice',