Browse Source

Product code/name

Handy_Cao 1 year ago
parent
commit
7619546019

+ 23 - 23
public/locales/en-US.json

@@ -487,7 +487,7 @@
             "title": "Order request form",
             "title2": "Historical order requests",
             "subtitle": "Order request information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "goodsname1": "Product name",
             "goodscode": "Order contract",
             "buyorsell": "BuyOrSell",
@@ -507,7 +507,7 @@
             "clear": {
                 "title": "Quick cancel",
                 "goodsId": "Ordered product",
-                "buyOrSell": "Order direction",
+                "buyOrSell": "Direction",
                 "price": "Cancellation price",
                 "tips1": "Please select the ordered product",
                 "tips2": "Please enter the cancellation price"
@@ -517,7 +517,7 @@
             "title": "Order transaction receipt",
             "title2": "Historical order transactions",
             "subtitle": "Order transaction information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "goodsname1": "Product name",
             "goodscode": "Order contract",
             "buyorsell": "Direction",
@@ -535,7 +535,7 @@
             "title": "Listing order",
             "title2": "Historical listing orders",
             "subtitle": "Listing order information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "warehousename": "Warehouse",
             "wrpricetype": "Listing method",
             "deliverygoodsname": "Type",
@@ -560,7 +560,7 @@
             "title": "Listing transaction receipt",
             "title2": "Historical listing transactions",
             "subtitle": "Listing transaction information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "deliverygoodsname": "Type",
             "wrstandardname": "Product name",
             "chargevalue": "Service charge",
@@ -579,7 +579,7 @@
             "title": "Pre-sale subscription",
             "subtitle": "Pre-sale subscription information",
             "subtitle1": "Historical pre-sale subscriptions",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "orderqty": "Subscription amount",
             "orderprice": "Subscription price",
             "orderamount": "Subscription amount",
@@ -600,7 +600,7 @@
             "title": "Transfer order",
             "subtitle": "Transfer order information",
             "subtitle1": "Historical transfer orders",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "Direction",
             "orderqty": "Order quantity",
             "orderprice": "Requested pric",
@@ -616,7 +616,7 @@
             "title": "Transfer transaction receipt",
             "subtitle": "Transfer transaction information",
             "subtitle1": "Historical transfer transactions",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "Direction",
             "tradeqty": "Transfer volume",
             "tradeprice": "Transfer price",
@@ -632,7 +632,7 @@
             "subtitle": "Order information",
             "subtitle1": "Historical swap order",
             "subtitle2": "Swap order details",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "Direction",
             "orderqty": "Order quantity",
             "orderprice": "Order price",
@@ -649,7 +649,7 @@
             "subtitle": "Transaction information",
             "subtitle1": "Historical transactions",
             "subtitle2": "Transaction details",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "Direction",
             "buildtype": "Type",
             "tradeqty": "Transaction volume",
@@ -666,7 +666,7 @@
             "title": "Price fixing order",
             "subtitle": "Quoted pricing order information",
             "subtitle1": "Details",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "ordertime": "Order time",
             "orderdate": "Order date",
             "buyorsell": "BuyOrSell",
@@ -682,7 +682,7 @@
             "title": "Price fixing execution",
             "subtitle": "Quoted pricing transaction information",
             "subtitle1": "Details",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "BuyOrSell",
             "tradetime": "Transaction time",
             "tradedate": "Transaction date",
@@ -713,7 +713,7 @@
             "deposit1": "Total Additional Payment",
             "fees1": "Pick-up Service Fee",
             "fees2": "Delivery Service Fee",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "Direction",
             "curholderamount": "CurHolderAmount",
             "holderamount": "HolderAmount",
@@ -772,7 +772,7 @@
             "subtitle2": "Listing information",
             "subtitle3": "Listing",
             "subtitle4": "Pickup",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "PerformanceTemplate": "Performance method",
             "warehousename": "Warehouse",
             "qty": "Inventory quantity",
@@ -818,7 +818,7 @@
             "title": "Pre-sale positions",
             "title1": "Pre-sale position details",
             "subtitle": "Pre-sale position information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "sellname": "Issuing party",
             "starttime": "StartDate",
             "endtime": "EndDate",
@@ -838,12 +838,12 @@
             "title": "Transfer positions",
             "title1": "Transfer position details",
             "subtitle": "Transfer position information",
-            "goodsname": "Product code/name",
-            "buyorsell": "Position direction",
+            "goodsname": "Code/Name",
+            "buyorsell": "Direction",
             "goodsdisplay": "Product details",
             "buycurholderamount": "Position amount",
-            "buycurpositionqty": "Position quantity",
-            "curpositionqty": "Position quantity",
+            "buycurpositionqty": "Quantity",
+            "curpositionqty": "Quantity",
             "buyfrozenqty": "Frozen quantity",
             "frozenqty": "Frozen quantity",
             "enableqty": "Available quantity",
@@ -851,7 +851,7 @@
             "presaleprice": "Order price",
             "closepl": "Reference profit and loss",
             "averageprice": "Average position price",
-            "holderqty": "Position quantity",
+            "holderqty": "Quantity",
             "holderprice": "Position price",
             "tradeamount": "Total payment",
             "transferdepositratio": "Transfer deposit ratio",
@@ -890,7 +890,7 @@
         },
         "pricing": {
             "title": "Price fixing positions",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "buyorsell": "BuyOrSell",
             "lastprice": "CurrentPrice",
             "curpositionqty": "Holding amount",
@@ -934,7 +934,7 @@
         "offline": {
             "title": "Offline settlement order",
             "subtitle": "Offline settlement order information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "goodsnamedisplay": "Order contract",
             "buyorselldisplay": "Settlement direction",
             "deliveryqty": "DeliveryQty",
@@ -951,7 +951,7 @@
         "spot": {
             "title": "Spot pickup order",
             "subtitle": "Pickup information",
-            "goodsname": "Product code/name",
+            "goodsname": "Code/Name",
             "deliverygoodsname": "Type",
             "wrstandardname": "Goods",
             "warehousename": "Warehouse",

+ 3 - 0
src/packages/pc/views/footer/pricing/detail2/components/delivery/index.vue

@@ -8,6 +8,9 @@
             <el-form-item :label="t('position.goods.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.tHDetailEx.buyOrSell) }}</span>
             </el-form-item>
+            <el-form-item :label="t('quote.spec')">
+                <span>{{ selectedRow.agreeUnit+getGoodsUnitName(selectedRow.goodsUnitID) }}</span>
+            </el-form-item>
             <el-form-item :label="t('position.goods.curholderamount')">
                 <span>{{ formatDecimal(selectedRow.tHDetailEx.holderAmount, selectedRow.decimalPlace) }}</span>
             </el-form-item>