Handy_Cao 1 년 전
부모
커밋
1d0393ae87
3개의 변경된 파일153개의 추가작업 그리고 111개의 파일을 삭제
  1. 109 109
      public/config/columns.json
  2. 22 1
      public/locales/en-US.json
  3. 22 1
      public/locales/zh-CN.json

+ 109 - 109
public/config/columns.json

@@ -41,55 +41,55 @@
         "columns": [
             {
                 "field": "goodscode",
-                "label": "商品代码/名称"
+                "label": "position.transfer.goodsname"
             },
             {
                 "field": "buycurholderamount",
-                "label": "持仓金额"
+                "label": "position.transfer.buycurholderamount"
             },
             {
                 "field": "buycurpositionqty",
-                "label": "持仓数量"
+                "label": "position.transfer.buycurpositionqty"
             },
             {
                 "field": "buyfrozenqty",
-                "label": "冻结数量"
+                "label": "position.transfer.buyfrozenqty"
             },
             {
                 "field": "enableqty",
-                "label": "可用数量"
+                "label": "position.transfer.enableqty"
             },
             {
                 "field": "presaleprice",
-                "label": "订货价"
+                "label": "position.transfer.presaleprice"
             },
             {
                 "field": "totalamount",
-                "label": "总货款"
+                "label": "position.transfer.tradeamount"
             },
             {
                 "field": "transferdepositratio",
-                "label": "转让定金比例"
+                "label": "position.transfer.transferdepositratio"
             },
             {
                 "field": "transferdeposit",
-                "label": "转让定金"
+                "label": "position.transfer.transferdeposit"
             },
             {
                 "field": "depositremain",
-                "label": "未付定金"
+                "label": "position.transfer.depositremain"
             },
             {
                 "field": "sellname",
-                "label": "发售方"
+                "label": "position.transfer.sellname"
             },
             {
                 "field": "paystatus",
-                "label": "支付状态"
+                "label": "position.transfer.paystatus"
             },
             {
                 "field": "lasttradedate",
-                "label": "最后交易日"
+                "label": "position.transfer.lasttradedate"
             }
         ]
     },
@@ -98,35 +98,35 @@
         "columns": [
             {
                 "field": "deliverygoodsname",
-                "label": "品种"
+                "label": "position.spot.deliverygoodsname"
             },
             {
                 "field": "wrstandardname",
-                "label": "商品名称"
+                "label": "position.spot.wrstandardname"
             },
             {
                 "field": "qty",
-                "label": "库存数量"
+                "label": "position.spot.qty"
             },
             {
                 "field": "freezerqty",
-                "label": "冻结数量"
+                "label": "position.spot.freezerqty"
             },
             {
                 "field": "pledgeqty",
-                "label": "质押数量"
+                "label": "position.spot.pledgeqty"
             },
             {
                 "field": "warehousename",
-                "label": "仓库"
+                "label": "position.spot.warehousename"
             },
             {
                 "field": "createtime",
-                "label": "过户时间"
+                "label": "position.spot.createtime"
             },
             {
                 "field": "wrholdeno",
-                "label": "仓单编号"
+                "label": "position.spot.wrholdeno"
             }
         ]
     },
@@ -135,43 +135,43 @@
         "columns": [
             {
                 "field": "wrtradetype",
-                "label": "挂牌类型"
+                "label": "order.listingorder.wrtradetype"
             },
             {
                 "field": "deliverygoodsname",
-                "label": "品种"
+                "label": "order.listingorder.deliverygoodsname"
             },
             {
                 "field": "wrstandardname",
-                "label": "商品名称"
+                "label": "order.listingorder.wrstandardname"
             },
             {
                 "field": "wrpricetype",
-                "label": "挂牌方式"
+                "label": "order.listingorder.wrpricetype"
             },
             {
                 "field": "fixedprice",
-                "label": "价格"
+                "label": "order.listingorder.fixedprice"
             },
             {
                 "field": "orderqty",
-                "label": "挂牌数量"
+                "label": "order.listingorder.orderqty"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.listingorder.tradeqty"
             },
             {
                 "field": "warehousename",
-                "label": "仓库"
+                "label": "order.listingorder.warehousename"
             },
             {
                 "field": "ordertime",
-                "label": "挂牌时间"
+                "label": "order.listingorder.ordertime"
             },
             {
                 "field": "wrtradeorderid",
-                "label": "挂牌单号"
+                "label": "order.listingorder.wrtradeorderid"
             }
         ]
     },
@@ -180,43 +180,43 @@
         "columns": [
             {
                 "field": "wrtradetype",
-                "label": "挂牌类型"
+                "label": "order.listingtrade.wrtradetype"
             },
             {
                 "field": "deliverygoodsname",
-                "label": "品种"
+                "label": "order.listingtrade.deliverygoodsname"
             },
             {
                 "field": "wrstandardname",
-                "label": "商品名称"
+                "label": "order.listingtrade.wrstandardname"
             },
             {
                 "field": "tradeprice",
-                "label": "成交价格"
+                "label": "order.listingtrade.tradeprice"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.listingtrade.tradeqty"
             },
             {
                 "field": "tradeamount",
-                "label": "成交金额"
+                "label": "order.listingtrade.tradeamount"
             },
             {
                 "field": "chargevalue",
-                "label": "手续费"
+                "label": "order.listingtrade.chargevalue"
             },
             {
                 "field": "matchusername",
-                "label": "对手方"
+                "label": "order.listingtrade.matchusername"
             },
             {
                 "field": "tradetime",
-                "label": "成交时间"
+                "label": "order.listingtrade.tradetime"
             },
             {
                 "field": "wrtradedetailid",
-                "label": "成交单号"
+                "label": "order.listingtrade.wrtradedetailid"
             }
         ]
     },
@@ -225,35 +225,35 @@
         "columns": [
             {
                 "field": "goodsname",
-                "label": "商品代码/名称"
+                "label": "order.pricingorder.goodsname"
             },
             {
                 "field": "buyorsell",
-                "label": "方向"
+                "label": "order.pricingorder.buyorsell"
             },
             {
                 "field": "orderqty",
-                "label": "委托数量"
+                "label": "order.pricingorder.orderqty"
             },
             {
                 "field": "orderprice",
-                "label": "委托价格"
+                "label": "order.pricingorder.orderprice"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.pricingorder.tradeqty"
             },
             {
                 "field": "orderstatus",
-                "label": "委托状态"
+                "label": "order.pricingorder.orderstatus"
             },
             {
                 "field": "ordertime",
-                "label": "委托时间"
+                "label": "order.pricingorder.ordertime"
             },
             {
                 "field": "orderid",
-                "label": "委托单号"
+                "label": "order.pricingorder.orderid"
             }
         ]
     },
@@ -262,43 +262,43 @@
         "columns": [
             {
                 "field": "goodsname",
-                "label": "商品代码/名称"
+                "label": "order.pricingtrade.goodsname"
             },
             {
                 "field": "buildtype",
-                "label": "类型"
+                "label": "order.pricingtrade.buildtype"
             },
             {
                 "field": "buyorsell",
-                "label": "方向"
+                "label": "order.pricingtrade.buyorsell"
             },
             {
                 "field": "tradeprice",
-                "label": "成交价格"
+                "label": "order.pricingtrade.tradeprice"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.pricingtrade.tradeqty"
             },
             {
                 "field": "tradeamount",
-                "label": "成交金额"
+                "label": "order.pricingtrade.tradeamount"
             },
             {
                 "field": "closepl",
-                "label": "平仓损益"
+                "label": "order.pricingtrade.closepl"
             },
             {
                 "field": "charge",
-                "label": "手续费"
+                "label": "order.pricingtrade.charge"
             },
             {
                 "field": "tradetime",
-                "label": "成交时间"
+                "label": "order.pricingtrade.tradetime"
             },
             {
                 "field": "tradeid",
-                "label": "成交单号"
+                "label": "order.pricingtrade.tradeid"
             }
         ]
     },
@@ -307,35 +307,35 @@
         "columns": [
             {
                 "field": "goodsname",
-                "label": "商品代码/名称"
+                "label": "order.swaporder.goodsname"
             },
             {
                 "field": "buyorsell",
-                "label": "方向"
+                "label": "order.swaporder.buyorsell"
             },
             {
                 "field": "orderqty",
-                "label": "委托数量"
+                "label": "order.swaporder.orderqty"
             },
             {
                 "field": "orderprice",
-                "label": "委托价格"
+                "label": "order.swaporder.orderprice"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.swaporder.tradeqty"
             },
             {
                 "field": "orderstatus",
-                "label": "委托状态"
+                "label": "order.swaporder.orderstatus"
             },
             {
                 "field": "ordertime",
-                "label": "委托时间"
+                "label": "order.swaporder.ordertime"
             },
             {
                 "field": "orderid",
-                "label": "委托单号"
+                "label": "order.swaporder.orderid"
             }
         ]
     },
@@ -344,43 +344,43 @@
         "columns": [
             {
                 "field": "goodsname",
-                "label": "商品代码/名称"
+                "label": "order.swaptrade.goodsname"
             },
             {
                 "field": "buildtype",
-                "label": "类型"
+                "label": "order.swaptrade.buildtype"
             },
             {
                 "field": "buyorsell",
-                "label": "方向"
+                "label": "order.swaptrade.buyorsell"
             },
             {
                 "field": "tradeprice",
-                "label": "成交价格"
+                "label": "order.swaptrade.tradeprice"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.swaptrade.tradeqty"
             },
             {
                 "field": "tradeamount",
-                "label": "成交金额"
+                "label": "order.swaptrade.tradeamount"
             },
             {
                 "field": "closepl",
-                "label": "交收盈亏"
+                "label": "order.swaptrade.closepl"
             },
             {
                 "field": "charge",
-                "label": "手续费"
+                "label": "order.swaptrade.charge"
             },
             {
                 "field": "tradetime",
-                "label": "成交时间"
+                "label": "order.swaptrade.tradetime"
             },
             {
                 "field": "tradeid",
-                "label": "成交单号"
+                "label": "order.swaptrade.tradeid"
             }
         ]
     },
@@ -389,47 +389,47 @@
         "columns": [
             {
                 "field": "amount",
-                "label": "金额"
+                "label": "banksign.wallet.inoutapply.amount"
             },
             {
                 "field": "executetype",
-                "label": "申请类型"
+                "label": "banksign.wallet.inoutapply.executetype"
             },
             {
                 "field": "accountname",
-                "label": "姓名"
+                "label": "banksign.wallet.inoutapply.accountname"
             },
             {
                 "field": "accountcode",
-                "label": "资金账号"
+                "label": "banksign.wallet.inoutapply.accountcode"
             },
             {
                 "field": "bankname",
-                "label": "开户行"
+                "label": "banksign.wallet.inoutapply.bankname"
             },
             {
                 "field": "bankaccountno",
-                "label": "卡号"
+                "label": "banksign.wallet.inoutapply.bankaccountno"
             },
             {
                 "field": "charge",
-                "label": "手续费"
+                "label": "banksign.wallet.inoutapply.charge"
             },
             {
                 "field": "applystatus",
-                "label": "状态"
+                "label": "banksign.wallet.inoutapply.applystatus"
             },
             {
                 "field": "updatetime",
-                "label": "申请时间"
+                "label": "banksign.wallet.inoutapply.updatetime"
             },
             {
                 "field": "extoperateid",
-                "label": "流水号"
+                "label": "banksign.wallet.inoutapply.extoperateid"
             },
             {
                 "field": "remark2",
-                "label": "备注"
+                "label": "banksign.wallet.inoutapply.remark2"
             }
         ]
     },
@@ -438,51 +438,51 @@
         "columns": [
             {
                 "field": "wrtradetype",
-                "label": "挂牌类型"
+                "label": "order.listingorder.wrtradetype"
             },
             {
                 "field": "deliverygoodsname",
-                "label": "品种"
+                "label": "order.listingorder.deliverygoodsname"
             },
             {
                 "field": "wrstandardname",
-                "label": "商品名称"
+                "label": "order.listingorder.wrstandardname"
             },
             {
                 "field": "wrpricetype",
-                "label": "挂牌方式"
+                "label": "order.listingorder.wrpricetype"
             },
             {
                 "field": "wrtypename",
-                "label": "期货合约"
+                "label": "order.listingorder.wrtypename"
             },
             {
                 "field": "fixedprice",
-                "label": "价格/基差"
+                "label": "order.listingorder.fixedprice1"
             },
             {
                 "field": "orderqty",
-                "label": "挂牌数量"
+                "label": "order.listingorder.orderqty"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.listingorder.tradeqty"
             },
             {
                 "field": "warehousename",
-                "label": "仓库"
+                "label": "order.listingorder.warehousename"
             },
             {
                 "field": "ordertime",
-                "label": "挂牌时间"
+                "label": "order.listingorder.ordertime"
             },
             {
                 "field": "wrtradeorderid",
-                "label": "挂牌单号"
+                "label": "order.listingorder.wrtradeorderid"
             },
             {
                 "field": "wrtradeorderstatus",
-                "label": "状态"
+                "label": "order.listingorder.wrtradeorderstatus"
             }
         ]
     },
@@ -491,39 +491,39 @@
         "columns": [
             {
                 "field": "buyorsell",
-                "label": "挂牌类型"
+                "label": "order.listingtrade.buyorsell"
             },
             {
                 "field": "deliverygoodsname",
-                "label": "品种"
+                "label": "order.listingtrade.deliverygoodsname"
             },
             {
                 "field": "wrstandardname",
-                "label": "商品名称"
+                "label": "order.listingtrade.wrstandardname"
             },
             {
                 "field": "tradeprice",
-                "label": "成交价格"
+                "label": "order.listingtrade.tradeprice"
             },
             {
                 "field": "tradeqty",
-                "label": "成交数量"
+                "label": "order.listingtrade.tradeqty"
             },
             {
                 "field": "matchusername",
-                "label": "对手方"
+                "label": "order.listingtrade.matchusername"
             },
             {
                 "field": "warehousename",
-                "label": "仓库"
+                "label": "order.listingtrade.warehousename"
             },
             {
                 "field": "tradetime",
-                "label": "成交时间"
+                "label": "order.listingtrade.tradetime"
             },
             {
                 "field": "wrtradedetailid",
-                "label": "成交单号"
+                "label": "order.listingtrade.wrtradedetailid"
             }
         ]
     }

+ 22 - 1
public/locales/en-US.json

@@ -371,9 +371,14 @@
             "subtitle": "Listing Order Information",
             "goodsname": "Name/Code",
             "warehousename": "Warehouse",
+            "wrpricetype": "WrPriceType",
+            "deliverygoodsname": "DeliveryGoodsName",
+            "wrstandardname": "WrstandardName",
             "wrtradetype": "WrTradeType",
             "buyorsell": "BuyOrSell",
             "fixedprice": "FixedPrice",
+            "fixedprice1": "Price/MarketMaxSub",
+            "wrtypename": "WrTypeName",
             "orderqty": "OrderQty",
             "tradeqty": "TradeQty",
             "cancelqty": "CancelQty",
@@ -390,6 +395,9 @@
             "title2": "History Listing Trade",
             "subtitle": "Listing Trade Information",
             "goodsname": "Name/Code",
+            "deliverygoodsname": "DeliveryGoodsName",
+            "wrstandardname": "WrstandardName",
+            "chargevalue": "Charge",
             "warehousename": "Warehouse",
             "wrtradetype": "WrTradeType",
             "buyorsell": "BuyOrSell",
@@ -514,6 +522,7 @@
             "matchaccountid": "Counterparties",
             "buildtype": "BuildType",
             "tradeprice": "TradePrice",
+            "tradeamount": "TradeAmount",
             "charge": "Charge",
             "tradeqty": "TradeQty",
             "tradeid": "TradeID",
@@ -591,6 +600,11 @@
             "district": "District",
             "address": "Address",
             "remark": "InvoiceInfo",
+            "createtime": "CreateTime",
+            "pledgeqty": "PledgeQty",
+            "wrstandardname": "WrstandardName",
+            "deliverygoodsname": "DeliveryGoodsName",
+            "wrholdeno": "WRHoldeNo",
             "tips1": "Please select the performance template",
             "tips2": "Please enter the price",
             "tips3": "Please input quantity",
@@ -1065,7 +1079,14 @@
                 "charge": "Charge",
                 "executetype": "ExecuteType",
                 "extoperateid": "ExtoperateID",
-                "updatetime": "Time"
+                "updatetime": "Time",
+                "remark2": "Remark",
+                "applystatus": "ApplyStatus",
+                "bankaccountno": "BankAccountNo",
+                "bankname": "BankName",
+                "accountcode": "accountcode",
+                "accountname": "AccountName",
+                "amount": "Amount"
             }
         }
     },

+ 22 - 1
public/locales/zh-CN.json

@@ -372,10 +372,15 @@
             "title2": "历史挂牌委托",
             "subtitle": "挂牌委托信息",
             "goodsname": "商品代码/名称",
+            "wrpricetype": "挂牌方式",
+            "deliverygoodsname": "品种",
+            "wrstandardname": "商品名称",
             "warehousename": "仓库",
             "wrtradetype": "类型",
             "buyorsell": "方向",
             "fixedprice": "挂牌价格",
+            "fixedprice1": "价格/基差",
+            "wrtypename": "期货合约",
             "orderqty": "委托量",
             "tradeqty": "成交量",
             "cancelqty": "撤销量",
@@ -392,6 +397,9 @@
             "title2": "历史挂牌成交",
             "subtitle": "挂牌成交信息",
             "goodsname": "商品代码/名称",
+            "deliverygoodsname": "品种",
+            "wrstandardname": "商品名称",
+            "chargevalue": "手续费",
             "warehousename": "仓库",
             "wrtradetype": "类型",
             "buyorsell": "方向",
@@ -516,6 +524,7 @@
             "matchaccountid": "对手方",
             "buildtype": "类型",
             "tradeprice": "成交价格",
+            "tradeamount": "成交金额",
             "charge": "手续费",
             "tradeqty": "成交量",
             "tradeid": "成交单号",
@@ -593,6 +602,11 @@
             "district": "收货地区",
             "address": "收货地址",
             "remark": "发票信息",
+            "createtime": "过户时间",
+            "pledgeqty": "质押数量",
+            "wrstandardname": "商品名称",
+            "deliverygoodsname": "品种",
+            "wrholdeno": "仓单编号",
             "tips1": "请选择履约模板",
             "tips2": "请输入价格",
             "tips3": "请输入数量",
@@ -1068,7 +1082,14 @@
                 "charge": "手续费",
                 "executetype": "类型",
                 "extoperateid": "流水号",
-                "updatetime": "时间"
+                "updatetime": "时间",
+                "remark2": "备注",
+                "applystatus": "状态",
+                "bankaccountno": "卡号",
+                "bankname": "开户行",
+                "accountcode": "资金账号",
+                "accountname": "姓名",
+                "amount": "金额"
             }
         }
     },