Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

public/locales/en-US.json

@@ -207,6 +207,7 @@
         "expandall": "Expand All",
         "start": "Start",
         "end": "End",
+        "require": "Require",
         "startdate": "StartDate",
         "enddate": "EndDate",
         "tips1": "Submission is successful",
@@ -950,7 +951,7 @@
                     "title": "Details:",
                     "subtitle1": "Personal Information",
                     "subtitle2": "企业资料",
-                    "subtitle3": "银行卡信息",
+                    "subtitle3": "Bank Card Information",
                     "subtitle4": "管理员及账户信息",
                     "userId": "UserID:",
                     "accountName": "AccountName:",
@@ -1093,10 +1094,7 @@
                 "username": "ModifierName",
                 "createtime": "CreateTime",
                 "edit": {
-                    "title": "Edit"
-                },
-                "delete": {
-                    "tips": "确认删除该配置？",
+                    "title": "Edit",
                     "feeName": "分润费用类型",
                     "marketName": "Market",
                     "subareagroupid": "Group",
@@ -1107,6 +1105,9 @@
                     "tips2": "请选择分润算法",
                     "tips3": "请选择分润方式",
                     "tips4": "请输入分润值"
+                },
+                "delete": {
+                    "tips": "确认删除该配置？"
                 }
             },
             "group": {
@@ -1459,7 +1460,202 @@
             },
             "tradesumm": {}
         },
-        "order": {},
+        "order": {
+            "close": {
+                "date": "Date",
+                "startdate": "StartDate",
+                "enddate": "EndDate",
+                "isHis": "isHis",
+                "goodsid": "Goods",
+                "buyorsell": "BuyOrSell",
+                "tradeid": "TradeID",
+                "areauserid": "AreaUserID",
+                "tradetype": "TradeType",
+                "account": "客户",
+                "opentradeid": "订单号",
+                "loginid": "登录账号",
+                "currentname": "用户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "订单方向",
+                "opennum": "订单数量",
+                "openprice": "订单价格",
+                "closenum": "终止数量",
+                "closeprice": "终止价格",
+                "closepl": "终止盈亏",
+                "repayeddeposit": "释放占用资金",
+                "tradetypedisplay": "终止类型",
+                "tradetime": "TradeTime",
+                "closetime": "CloseTime",
+                "closeid": "CloseID"
+            },
+            "delivery": {
+                "deliveryorderid": "交收单号",
+                "username": "申请人",
+                "goodsdisplay": "交收商品",
+                "buyorselldisplay": "方向",
+                "deliveryqty": "申请交收数量",
+                "sucdeliveryqty": "实际交收数量",
+                "deliveryprice": "交收价格",
+                "deliveryamount": "交收货款",
+                "matchname": "对手方",
+                "reqtime": "申请时间",
+                "orderstatusdisplay": "交收状态",
+                "deliveryorderstatus": "单据状态",
+                "deliverygoodsname": "交收商品",
+                "accountname": "账户",
+                "startdate": "申请日期",
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "confirm": "交收失败",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "auditremark": "备注：",
+                    "tips1": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "confirm": "确认交收",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态："
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorselldisplay": "方向：",
+                    "deliveryqty": "申请交收数量：",
+                    "sucdeliveryqty": "实际交收数量：",
+                    "cancledeliveryqty": "撤销交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "remark": "Remark：",
+                    "deliverycharge": "交收手续费：",
+                    "closetime": "完成时间："
+                },
+                "pay": {
+                    "title": "提示",
+                    "tips1": "确认交收服务商向卖方支付货款？"
+                }
+            },
+            "list": {
+                "tradeid": "订单号",
+                "accountname": "客户",
+                "membername": "所属机构",
+                "goodscode": "商品/代码",
+                "buyorsell": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "depositratedisplay": "风险率",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradetimestr": "订单时间",
+                "goodsid'": "商品",
+                "parantareaid": "所属机构 ",
+                "validholderqty": "有效持仓 ",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入机构ID"
+            },
+            "monitor": {
+                "tips1": "% (默认>50%;下次刷新:",
+                "start": "开始监控",
+                "stop": "停止监控",
+                "buyBackCount": "买总数量",
+                "sellCount": "卖总数量：",
+                "netcurpositionqty": "净总数量：",
+                "avgholderprice": "订单均价：",
+                "totalfloatpl": "总浮动结余：",
+                "userfullname": "客户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "tradetimestr": "订单时间",
+                "holderprice": "订单价格",
+                "lastprice": "现价",
+                "depositratedisplay": "风险率",
+                "floatpl": "浮动盈亏",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradeid": "订单号",
+                "risk": "监控当前风险率",
+                "goodsfullname1": "商品",
+                "buyorsell": "方向",
+                "parentusername": "所属机构"
+            },
+            "report": {
+                "startDate": "开始日期",
+                "enddate": "结束日期",
+                "reckondate": "日期",
+                "tradeid": "订单号",
+                "userfullname": "客户",
+                "areafullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "tradeamount": "原始金额",
+                "holdernum": "订单数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "freezenum": "冻结数量",
+                "deliverynum": "交收数量",
+                "closepl": "终止盈亏",
+                "floatpl": "浮动盈亏",
+                "depositratedisplay": "风险率",
+                "operatorcode": "操作人",
+                "date": "日期",
+                "goodsid": "商品",
+                "currentUserId": "交易商",
+                "areauserid": "所属会员"
+            },
+            "terminate": {
+                "date": "日期",
+                "startDate": "开始日期",
+                "endDate": "结束日期",
+                "opentradeid": "订单号",
+                "userfullname": "客户",
+                "memberfullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "holderbuyorsell": "订单方向",
+                "openprice": "订单价格",
+                "opennum": "订单数量",
+                "opentime": "订单时间",
+                "closeprice": "终止价格",
+                "closenum": "终止数量",
+                "closepl": "终止盈亏",
+                "depositrate": "风险率",
+                "closetime": "终止时间",
+                "ishis": "查询类型",
+                "goodsid": "商品",
+                "accountname": "用户"
+            }
+        },
         "other": {
             "bank_inout": {
                 "date": "TradeDate",

public/locales/th-TH.json

@@ -207,6 +207,7 @@
         "expandall": "全部展开",
         "start": "开始",
         "end": "结束",
+        "require": "必填",
         "startdate": "开始日期",
         "enddate": "结束日期",
         "tips1": "提交成功",
@@ -1093,10 +1094,7 @@
                 "username": "创建人",
                 "createtime": "创建时间",
                 "edit": {
-                    "title": "编辑"
-                },
-                "delete": {
-                    "tips": "确认删除该配置？",
+                    "title": "编辑",
                     "feeName": "分润费用类型",
                     "marketName": "市场",
                     "subareagroupid": "分组",
@@ -1107,6 +1105,9 @@
                     "tips2": "请选择分润算法",
                     "tips3": "请选择分润方式",
                     "tips4": "请输入分润值"
+                },
+                "delete": {
+                    "tips": "确认删除该配置？"
                 }
             },
             "group": {
@@ -1459,7 +1460,202 @@
             },
             "tradesumm": {}
         },
-        "order": {},
+        "order": {
+            "close": {
+                "date": "日期",
+                "startdate": "开始日期",
+                "enddate": "结束日期",
+                "isHis": "查询类型",
+                "goodsid": "商品",
+                "buyorsell": "方向",
+                "tradeid": "订单号",
+                "areauserid": "所属机构",
+                "tradetype": "终止类型",
+                "account": "客户",
+                "opentradeid": "订单号",
+                "loginid": "登录账号",
+                "currentname": "用户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "订单方向",
+                "opennum": "订单数量",
+                "openprice": "订单价格",
+                "closenum": "终止数量",
+                "closeprice": "终止价格",
+                "closepl": "终止盈亏",
+                "repayeddeposit": "释放占用资金",
+                "tradetypedisplay": "终止类型",
+                "tradetime": "订单时间",
+                "closetime": "终止时间",
+                "closeid": "终止单号"
+            },
+            "delivery": {
+                "deliveryorderid": "交收单号",
+                "username": "申请人",
+                "goodsdisplay": "交收商品",
+                "buyorselldisplay": "方向",
+                "deliveryqty": "申请交收数量",
+                "sucdeliveryqty": "实际交收数量",
+                "deliveryprice": "交收价格",
+                "deliveryamount": "交收货款",
+                "matchname": "对手方",
+                "reqtime": "申请时间",
+                "orderstatusdisplay": "交收状态",
+                "deliveryorderstatus": "单据状态",
+                "deliverygoodsname": "交收商品",
+                "accountname": "账户",
+                "startdate": "申请日期",
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "confirm": "交收失败",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "auditremark": "备注：",
+                    "tips1": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "confirm": "确认交收",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态："
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorselldisplay": "方向：",
+                    "deliveryqty": "申请交收数量：",
+                    "sucdeliveryqty": "实际交收数量：",
+                    "cancledeliveryqty": "撤销交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "remark": "备注：",
+                    "deliverycharge": "交收手续费：",
+                    "closetime": "完成时间："
+                },
+                "pay": {
+                    "title": "提示",
+                    "tips1": "确认交收服务商向卖方支付货款？"
+                }
+            },
+            "list": {
+                "tradeid": "订单号",
+                "accountname": "客户",
+                "membername": "所属机构",
+                "goodscode": "商品/代码",
+                "buyorsell": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "depositratedisplay": "风险率",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradetimestr": "订单时间",
+                "goodsid'": "商品",
+                "parantareaid": "所属机构 ",
+                "validholderqty": "有效持仓 ",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入机构ID"
+            },
+            "monitor": {
+                "tips1": "% (默认>50%;下次刷新:",
+                "start": "开始监控",
+                "stop": "停止监控",
+                "buyBackCount": "买总数量",
+                "sellCount": "卖总数量：",
+                "netcurpositionqty": "净总数量：",
+                "avgholderprice": "订单均价：",
+                "totalfloatpl": "总浮动结余：",
+                "userfullname": "客户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "tradetimestr": "订单时间",
+                "holderprice": "订单价格",
+                "lastprice": "现价",
+                "depositratedisplay": "风险率",
+                "floatpl": "浮动盈亏",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradeid": "订单号",
+                "risk": "监控当前风险率",
+                "goodsfullname1": "商品",
+                "buyorsell": "方向",
+                "parentusername": "所属机构"
+            },
+            "report": {
+                "startDate": "开始日期",
+                "enddate": "结束日期",
+                "reckondate": "日期",
+                "tradeid": "订单号",
+                "userfullname": "客户",
+                "areafullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "tradeamount": "原始金额",
+                "holdernum": "订单数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "freezenum": "冻结数量",
+                "deliverynum": "交收数量",
+                "closepl": "终止盈亏",
+                "floatpl": "浮动盈亏",
+                "depositratedisplay": "风险率",
+                "operatorcode": "操作人",
+                "date": "日期",
+                "goodsid": "商品",
+                "currentUserId": "交易商",
+                "areauserid": "所属会员"
+            },
+            "terminate": {
+                "date": "日期",
+                "startDate": "开始日期",
+                "endDate": "结束日期",
+                "opentradeid": "订单号",
+                "userfullname": "客户",
+                "memberfullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "holderbuyorsell": "订单方向",
+                "openprice": "订单价格",
+                "opennum": "订单数量",
+                "opentime": "订单时间",
+                "closeprice": "终止价格",
+                "closenum": "终止数量",
+                "closepl": "终止盈亏",
+                "depositrate": "风险率",
+                "closetime": "终止时间",
+                "ishis": "查询类型",
+                "goodsid": "商品",
+                "accountname": "用户"
+            }
+        },
         "other": {
             "bank_inout": {
                 "date": "交易日",

public/locales/zh-CN.json

@@ -207,6 +207,7 @@
         "expandall": "全部展开",
         "start": "开始",
         "end": "结束",
+        "require": "必填",
         "startdate": "开始日期",
         "enddate": "结束日期",
         "tips1": "提交成功",
@@ -1093,10 +1094,7 @@
                 "username": "创建人",
                 "createtime": "创建时间",
                 "edit": {
-                    "title": "编辑"
-                },
-                "delete": {
-                    "tips": "确认删除该配置？",
+                    "title": "编辑",
                     "feeName": "分润费用类型",
                     "marketName": "市场",
                     "subareagroupid": "分组",
@@ -1107,6 +1105,9 @@
                     "tips2": "请选择分润算法",
                     "tips3": "请选择分润方式",
                     "tips4": "请输入分润值"
+                },
+                "delete": {
+                    "tips": "确认删除该配置？"
                 }
             },
             "group": {
@@ -1459,7 +1460,202 @@
             },
             "tradesumm": {}
         },
-        "order": {},
+        "order": {
+            "close": {
+                "date": "日期",
+                "startdate": "开始日期",
+                "enddate": "结束日期",
+                "isHis": "查询类型",
+                "goodsid": "商品",
+                "buyorsell": "方向",
+                "tradeid": "订单号",
+                "areauserid": "所属机构",
+                "tradetype": "终止类型",
+                "account": "客户",
+                "opentradeid": "订单号",
+                "loginid": "登录账号",
+                "currentname": "用户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "订单方向",
+                "opennum": "订单数量",
+                "openprice": "订单价格",
+                "closenum": "终止数量",
+                "closeprice": "终止价格",
+                "closepl": "终止盈亏",
+                "repayeddeposit": "释放占用资金",
+                "tradetypedisplay": "终止类型",
+                "tradetime": "订单时间",
+                "closetime": "终止时间",
+                "closeid": "终止单号"
+            },
+            "delivery": {
+                "deliveryorderid": "交收单号",
+                "username": "申请人",
+                "goodsdisplay": "交收商品",
+                "buyorselldisplay": "方向",
+                "deliveryqty": "申请交收数量",
+                "sucdeliveryqty": "实际交收数量",
+                "deliveryprice": "交收价格",
+                "deliveryamount": "交收货款",
+                "matchname": "对手方",
+                "reqtime": "申请时间",
+                "orderstatusdisplay": "交收状态",
+                "deliveryorderstatus": "单据状态",
+                "deliverygoodsname": "交收商品",
+                "accountname": "账户",
+                "startdate": "申请日期",
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "confirm": "交收失败",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "auditremark": "备注：",
+                    "tips1": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "confirm": "确认交收",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态："
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorselldisplay": "方向：",
+                    "deliveryqty": "申请交收数量：",
+                    "sucdeliveryqty": "实际交收数量：",
+                    "cancledeliveryqty": "撤销交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "remark": "备注：",
+                    "deliverycharge": "交收手续费：",
+                    "closetime": "完成时间："
+                },
+                "pay": {
+                    "title": "提示",
+                    "tips1": "确认交收服务商向卖方支付货款？"
+                }
+            },
+            "list": {
+                "tradeid": "订单号",
+                "accountname": "客户",
+                "membername": "所属机构",
+                "goodscode": "商品/代码",
+                "buyorsell": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "depositratedisplay": "风险率",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradetimestr": "订单时间",
+                "goodsid'": "商品",
+                "parantareaid": "所属机构 ",
+                "validholderqty": "有效持仓 ",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入机构ID"
+            },
+            "monitor": {
+                "tips1": "% (默认>50%;下次刷新:",
+                "start": "开始监控",
+                "stop": "停止监控",
+                "buyBackCount": "买总数量",
+                "sellCount": "卖总数量：",
+                "netcurpositionqty": "净总数量：",
+                "avgholderprice": "订单均价：",
+                "totalfloatpl": "总浮动结余：",
+                "userfullname": "客户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "tradetimestr": "订单时间",
+                "holderprice": "订单价格",
+                "lastprice": "现价",
+                "depositratedisplay": "风险率",
+                "floatpl": "浮动盈亏",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradeid": "订单号",
+                "risk": "监控当前风险率",
+                "goodsfullname1": "商品",
+                "buyorsell": "方向",
+                "parentusername": "所属机构"
+            },
+            "report": {
+                "startDate": "开始日期",
+                "enddate": "结束日期",
+                "reckondate": "日期",
+                "tradeid": "订单号",
+                "userfullname": "客户",
+                "areafullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "tradeamount": "原始金额",
+                "holdernum": "订单数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "freezenum": "冻结数量",
+                "deliverynum": "交收数量",
+                "closepl": "终止盈亏",
+                "floatpl": "浮动盈亏",
+                "depositratedisplay": "风险率",
+                "operatorcode": "操作人",
+                "date": "日期",
+                "goodsid": "商品",
+                "currentUserId": "交易商",
+                "areauserid": "所属会员"
+            },
+            "terminate": {
+                "date": "日期",
+                "startDate": "开始日期",
+                "endDate": "结束日期",
+                "opentradeid": "订单号",
+                "userfullname": "客户",
+                "memberfullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "holderbuyorsell": "订单方向",
+                "openprice": "订单价格",
+                "opennum": "订单数量",
+                "opentime": "订单时间",
+                "closeprice": "终止价格",
+                "closenum": "终止数量",
+                "closepl": "终止盈亏",
+                "depositrate": "风险率",
+                "closetime": "终止时间",
+                "ishis": "查询类型",
+                "goodsid": "商品",
+                "accountname": "用户"
+            }
+        },
         "other": {
             "bank_inout": {
                 "date": "交易日",

public/locales/zh-TW.json

@@ -207,6 +207,7 @@
         "expandall": "全部展開",
         "start": "開始",
         "end": "結束",
+        "require": "必填",
         "startdate": "開始日期",
         "enddate": "結束日期",
         "tips1": "提交成功",
@@ -1093,10 +1094,7 @@
                 "username": "創建人",
                 "createtime": "創建時間",
                 "edit": {
-                    "title": "編輯"
-                },
-                "delete": {
-                    "tips": "確認刪除該配置？",
+                    "title": "編輯",
                     "feeName": "分潤費用類型",
                     "marketName": "市場",
                     "subareagroupid": "分組",
@@ -1107,6 +1105,9 @@
                     "tips2": "請選擇分潤算法",
                     "tips3": "請選擇分潤方式",
                     "tips4": "請輸入分潤值"
+                },
+                "delete": {
+                    "tips": "確認刪除該配置？"
                 }
             },
             "group": {
@@ -1459,7 +1460,202 @@
             },
             "tradesumm": {}
         },
-        "orer": {},
+        "order": {
+            "close": {
+                "date": "日期",
+                "startdate": "开始日期",
+                "enddate": "结束日期",
+                "isHis": "查询类型",
+                "goodsid": "商品",
+                "buyorsell": "方向",
+                "tradeid": "订单号",
+                "areauserid": "所属机构",
+                "tradetype": "终止类型",
+                "account": "客户",
+                "opentradeid": "订单号",
+                "loginid": "登录账号",
+                "currentname": "用户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "订单方向",
+                "opennum": "订单数量",
+                "openprice": "订单价格",
+                "closenum": "终止数量",
+                "closeprice": "终止价格",
+                "closepl": "终止盈亏",
+                "repayeddeposit": "释放占用资金",
+                "tradetypedisplay": "终止类型",
+                "tradetime": "订单时间",
+                "closetime": "终止时间",
+                "closeid": "终止单号"
+            },
+            "delivery": {
+                "deliveryorderid": "交收单号",
+                "username": "申请人",
+                "goodsdisplay": "交收商品",
+                "buyorselldisplay": "方向",
+                "deliveryqty": "申请交收数量",
+                "sucdeliveryqty": "实际交收数量",
+                "deliveryprice": "交收价格",
+                "deliveryamount": "交收货款",
+                "matchname": "对手方",
+                "reqtime": "申请时间",
+                "orderstatusdisplay": "交收状态",
+                "deliveryorderstatus": "单据状态",
+                "deliverygoodsname": "交收商品",
+                "accountname": "账户",
+                "startdate": "申请日期",
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "confirm": "交收失败",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "auditremark": "备注：",
+                    "tips1": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "confirm": "确认交收",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorsell": "方向：",
+                    "deliveryqty": "交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态："
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号：",
+                    "username": "申请人：",
+                    "goodsdisplay": "交收商品：",
+                    "buyorselldisplay": "方向：",
+                    "deliveryqty": "申请交收数量：",
+                    "sucdeliveryqty": "实际交收数量：",
+                    "cancledeliveryqty": "撤销交收数量：",
+                    "deliveryprice": "交收价格：",
+                    "deliveryamount": "交收货款：",
+                    "matchname": "对手方：",
+                    "deliveryinfo": "交收信息：",
+                    "reqtime": "申请时间：",
+                    "orderstatusdisplay": "交收状态：",
+                    "remark": "备注：",
+                    "deliverycharge": "交收手续费：",
+                    "closetime": "完成时间："
+                },
+                "pay": {
+                    "title": "提示",
+                    "tips1": "确认交收服务商向卖方支付货款？"
+                }
+            },
+            "list": {
+                "tradeid": "订单号",
+                "accountname": "客户",
+                "membername": "所属机构",
+                "goodscode": "商品/代码",
+                "buyorsell": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "depositratedisplay": "风险率",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradetimestr": "订单时间",
+                "goodsid'": "商品",
+                "parantareaid": "所属机构 ",
+                "validholderqty": "有效持仓 ",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入机构ID"
+            },
+            "monitor": {
+                "tips1": "% (默认>50%;下次刷新:",
+                "start": "开始监控",
+                "stop": "停止监控",
+                "buyBackCount": "买总数量",
+                "sellCount": "卖总数量：",
+                "netcurpositionqty": "净总数量：",
+                "avgholderprice": "订单均价：",
+                "totalfloatpl": "总浮动结余：",
+                "userfullname": "客户",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "tradetimestr": "订单时间",
+                "holderprice": "订单价格",
+                "lastprice": "现价",
+                "depositratedisplay": "风险率",
+                "floatpl": "浮动盈亏",
+                "holdernum": "订单数量",
+                "freezenum": "冻结数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "tradeid": "订单号",
+                "risk": "监控当前风险率",
+                "goodsfullname1": "商品",
+                "buyorsell": "方向",
+                "parentusername": "所属机构"
+            },
+            "report": {
+                "startDate": "开始日期",
+                "enddate": "结束日期",
+                "reckondate": "日期",
+                "tradeid": "订单号",
+                "userfullname": "客户",
+                "areafullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "buyorselldisplay": "方向",
+                "holderprice": "订单价格",
+                "opennum": "原始数量",
+                "tradeamount": "原始金额",
+                "holdernum": "订单数量",
+                "holderamount": "订单金额",
+                "payeddeposit": "占用资金",
+                "freezenum": "冻结数量",
+                "deliverynum": "交收数量",
+                "closepl": "终止盈亏",
+                "floatpl": "浮动盈亏",
+                "depositratedisplay": "风险率",
+                "operatorcode": "操作人",
+                "date": "日期",
+                "goodsid": "商品",
+                "currentUserId": "交易商",
+                "areauserid": "所属会员"
+            },
+            "terminate": {
+                "date": "日期",
+                "startDate": "开始日期",
+                "endDate": "结束日期",
+                "opentradeid": "订单号",
+                "userfullname": "客户",
+                "memberfullname": "所属会员",
+                "goodsfullname": "商品/代码",
+                "holderbuyorsell": "订单方向",
+                "openprice": "订单价格",
+                "opennum": "订单数量",
+                "opentime": "订单时间",
+                "closeprice": "终止价格",
+                "closenum": "终止数量",
+                "closepl": "终止盈亏",
+                "depositrate": "风险率",
+                "closetime": "终止时间",
+                "ishis": "查询类型",
+                "goodsid": "商品",
+                "accountname": "用户"
+            }
+        },
         "other": {
             "bank_inout": {
                 "date": "交易日",

src/packages/pc/views/profitshare/institution/config/index.vue

@@ -100,12 +100,12 @@ const { run } = useRequest(initProfitShare, {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'subareagroupname', label: '分组' },
-    { field: 'dividetype', label: '分润算法', formatValue: (val) => premiumAutoModeEnum.getEnumTypeName(val) },
-    { field: 'dividemode', label: '分润方式', formatValue: (val) => areadividemodeEnum.getEnumTypeName(val) },
-    { field: 'dividevalue', label: '分润值', formatValue: (val) => parsePercent(val) },
-    { field: 'username', label: '创建人' },
-    { field: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
+    { field: 'subareagroupname', label: 'profitshare.institution.config.subareagroupname' },
+    { field: 'dividetype', label: 'profitshare.institution.config.dividetype', formatValue: (val) => premiumAutoModeEnum.getEnumTypeName(val) },
+    { field: 'dividemode', label: 'profitshare.institution.config.dividemode', formatValue: (val) => areadividemodeEnum.getEnumTypeName(val) },
+    { field: 'dividevalue', label: 'profitshare.institution.config.dividevalue', formatValue: (val) => parsePercent(val) },
+    { field: 'username', label: 'profitshare.institution.config.username' },
+    { field: 'createtime', label: 'profitshare.institution.config.createtime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 

src/packages/pc/views/query/internal/deliveryorder/index.vue

@@ -78,7 +78,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'deliveryqty', label: '现货数量' },
     { field: 'deliveryorderstatus', label: '状态', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
     { field: 'ordertime', label: '申报时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 表单验证规则

src/packages/pc/views/query/internal/deliverytrade/index.vue

@@ -82,7 +82,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'deliverypricemove', label: '升贴水总金额' },
     { field: 'deliverycharge', label: '交收服务费' },
     { field: 'deliveryorderid', label: '委托单号' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 表单验证规则

src/packages/pc/views/query/internal/liquidation/index.vue

@@ -67,7 +67,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'orderQty', label: '斩仓数量' },
     { field: 'orderAccount', label: '斩仓金额' },
     { field: 'orderTime', label: '斩仓时间' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.CommissionSheetReq>({

src/packages/pc/views/query/internal/offlinedelivery/index.vue

@@ -72,7 +72,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'matchname', label: '对手方' },
     { field: 'reqtime', label: '申请时间' },
     { field: 'orderstatusdisplay', label: '交收状态' },
-    { field: 'operate', label: '操作', width: 180, fixed: 'right' }
+    { field: 'operate', label: 'common.operate', width: 180, fixed: 'right' }
 ])
 
 const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OfflineReq>({

src/packages/pc/views/query/order/close/index.vue

@@ -10,9 +10,9 @@
                                 :value="option.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="日期" prop="date" v-if="item.value === 1">
+                    <el-form-item :label="t('query.order.close.date')" prop="date" v-if="item.value === 1">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('query.order.close.startdate')" :end-placeholder="t('query.order.close.enddate')" />
                     </el-form-item>
                 </template>
                 <template #goodsid="{ item }">
@@ -61,8 +61,10 @@ import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppSelectGoods from '@pc/components/modules/select-goods/index.vue'
 import AppSelectMember from '@pc/components/modules/select-member/index.vue'
+import { i18n } from '@/stores'
 
 const dateValue = shallowRef<string[] | null>([])
+const { global: { t } } = i18n
 
 const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.TerOrderRsp>({
     onClose: () => onSearch()
@@ -80,21 +82,21 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryT
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'opentradeid', label: '订单号' },
-    { field: 'loginid', label: '登录账号' },
-    { field: 'currentname', label: '用户' },
-    { field: 'goodsfullname', label: '商品/代码' },
-    { field: 'buyorselldisplay', label: '订单方向' },
-    { field: 'opennum', label: '订单数量' },
-    { field: 'openprice', label: '订单价格' },
-    { field: 'closenum', label: '终止数量' },
-    { field: 'closeprice', label: '终止价格' },
-    { field: 'closepl', label: '终止盈亏' },
-    { field: 'repayeddeposit', label: '释放占用资金' },
-    { field: 'tradetypedisplay', label: '终止类型' },
-    { field: 'tradetime', label: '订单时间' },
-    { field: 'closetime', label: '终止时间' },
-    { field: 'closeid', label: '终止单号' }
+    { field: 'opentradeid', label: 'query.order.close.opentradeid' },
+    { field: 'loginid', label: 'query.order.close.loginid' },
+    { field: 'currentname', label: 'query.order.close.currentname' },
+    { field: 'goodsfullname', label: 'query.order.close.goodsfullname' },
+    { field: 'buyorselldisplay', label: 'query.order.close.buyorselldisplay' },
+    { field: 'opennum', label: 'query.order.close.opennum' },
+    { field: 'openprice', label: 'query.order.close.openprice' },
+    { field: 'closenum', label: 'query.order.close.closenum' },
+    { field: 'closeprice', label: 'query.order.close.closeprice' },
+    { field: 'closepl', label: 'query.order.close.closepl' },
+    { field: 'repayeddeposit', label: 'query.order.close.repayeddeposit' },
+    { field: 'tradetypedisplay', label: 'query.order.close.tradetypedisplay' },
+    { field: 'tradetime', label: 'query.order.close.tradetime' },
+    { field: 'closetime', label: 'query.order.close.closetime' },
+    { field: 'closeid', label: 'query.order.close.closeid' }
 ])
 
 // 表单验证规则
@@ -111,42 +113,42 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'account',
-            label: '客户',
+            label: t('query.order.close.account'),
         },
         {
             field: 'goodsid',
-            label: '商品'
+            label: t('query.order.close.goodsid'),
         },
         {
             field: 'buyorsell',
-            label: '方向',
+            label: t('query.order.close.buyorsell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'tradeid',
-            label: '订单号',
+            label: t('query.order.close.tradeid'),
         },
         {
             field: 'areauserid',
-            label: '所属机构',
+            label: t('query.order.close.areauserid'),
         },
         {
             field: 'tradetype',
-            label: '终止类型',
+            label: t('query.order.close.tradetype'),
         },
         {
             field: 'ishis',
-            label: '查询类型',
+            label: t('query.order.close.isHis'),
             value: 0,
             options: () => [
-                { label: '当前', value: 0 },
-                { label: '历史', value: 1 }
+                { label: t('common.current'), value: 0 },
+                { label: t('common.history'), value: 1 }
             ]
         },
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
     ]
 })
 

src/packages/pc/views/query/order/delivery/components/cancel/index.vue

@@ -1,14 +1,14 @@
 <!-- 查询管理-订单管理-交收单管理-失败 -->
 <template>
-    <app-drawer title="详细" width="960" v-model:show="show">
+    <app-drawer :title="t('query.order.delivery.cancel.title')" width="960" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2">
             <template #auditremark>
-                <el-input ref="inputRef" type="textarea" :rows="3" placeholder="必填" v-model="formData.auditremark" />
+                <el-input ref="inputRef" type="textarea" :rows="3" :placeholder="t('common.require')" v-model="formData.auditremark" />
             </template>
         </app-table-details>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit">交收失败</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('query.order.delivery.cancel.confirm') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -54,18 +54,18 @@ const { data } = useRequest(queryOfflineDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'deliveryorderid', label: '交收单号：' },
-    { prop: 'username', label: '申请人：' },
-    { prop: 'goodsdisplay', label: '交收商品：' },
-    { prop: 'buyorsell', label: '方向：', formatValue: (val) => getBuyOrSellName(val) },
-    { prop: 'deliveryqty', label: '交收数量：' },
-    { prop: 'deliveryprice', label: '交收价格：' },
-    { prop: 'deliveryamount', label: '交收货款：' },
-    { prop: 'matchname', label: '对手方：' },
-    { prop: 'deliveryinfo', label: '交收信息：' },
-    { prop: 'reqtime', label: '申请时间：', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: '交收状态：' },
-    { prop: 'auditremark', label: '备注：', required: true }
+    { prop: 'deliveryorderid', label: 'query.order.delivery.cancel.deliveryorderid' },
+    { prop: 'username', label: 'query.order.delivery.cancel.username' },
+    { prop: 'goodsdisplay', label: 'query.order.delivery.cancel.goodsdisplay' },
+    { prop: 'buyorsell', label: 'query.order.delivery.cancel.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: 'query.order.delivery.cancel.deliveryqty' },
+    { prop: 'deliveryprice', label: 'query.order.delivery.cancel.deliveryprice' },
+    { prop: 'deliveryamount', label: 'query.order.delivery.cancel.deliveryamount' },
+    { prop: 'matchname', label: 'query.order.delivery.cancel.matchname' },
+    { prop: 'deliveryinfo', label: 'query.order.delivery.cancel.deliveryinfo' },
+    { prop: 'reqtime', label: 'query.order.delivery.cancel.reqtime', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: 'query.order.delivery.cancel.orderstatusdisplay' },
+    { prop: 'auditremark', label: 'query.order.delivery.cancel.auditremark', required: true }
 ]
 
 const onCancel = (isRefresh = false) => {
@@ -79,17 +79,17 @@ const onSubmit = () => {
         offlineFail({
             data: formData
         }).then(() => {
-            ElMessage.success('提交成功')
+            ElMessage.success(t('common.tips1'))
             onCancel(true)
         }).catch((err) => {
-            ElMessage.error('提交失败：' + err)
+            ElMessage.error(t('common.tips2') + err)
             onCancel()
         }).finally(() => {
             loading.value = false
         })
     } else {
         inputRef.value?.focus()
-        ElMessage.warning('请输入备注')
+        ElMessage.warning(t('query.order.delivery.cancel.tips1'))
     }
 }
 </script>

src/packages/pc/views/query/order/delivery/components/confirm/index.vue

@@ -1,10 +1,10 @@
 <!-- 查询管理-订单管理-交收单管理-确认 -->
 <template>
-    <app-drawer title="详细" width="960" v-model:show="show">
+    <app-drawer :title="t('query.order.delivery.confirm.title')" width="960" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit">确认交收</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('query.order.delivery.confirm.confirm') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -43,17 +43,17 @@ const { data } = useRequest(queryOfflineDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'deliveryorderid', label: '交收单号：' },
-    { prop: 'username', label: '申请人：' },
-    { prop: 'goodsdisplay', label: '交收商品：' },
-    { prop: 'buyorsell', label: '方向：', formatValue: (val) => getBuyOrSellName(val) },
-    { prop: 'deliveryqty', label: '交收数量：' },
-    { prop: 'deliveryprice', label: '交收价格：' },
-    { prop: 'deliveryamount', label: '交收货款：' },
-    { prop: 'matchname', label: '对手方：' },
-    { prop: 'deliveryinfo', label: '交收信息：' },
-    { prop: 'reqtime', label: '申请时间：', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: '交收状态：' }
+    { prop: 'deliveryorderid', label: 'query.order.delivery.confirm.deliveryorderid' },
+    { prop: 'username', label: 'query.order.delivery.confirm.username' },
+    { prop: 'goodsdisplay', label: 'query.order.delivery.confirm.goodsdisplay' },
+    { prop: 'buyorsell', label: 'query.order.delivery.confirm.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: 'query.order.delivery.confirm.deliveryqty' },
+    { prop: 'deliveryprice', label: 'query.order.delivery.confirm.deliveryprice' },
+    { prop: 'deliveryamount', label: 'query.order.delivery.confirm.deliveryamount' },
+    { prop: 'matchname', label: 'query.order.delivery.confirm.matchname' },
+    { prop: 'deliveryinfo', label: 'query.order.delivery.confirm.deliveryinfo' },
+    { prop: 'reqtime', label: 'query.order.delivery.confirm.reqtime', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: 'query.order.delivery.confirm.orderstatusdisplay' }
 ]
 
 const onCancel = (isRefresh = false) => {
@@ -69,10 +69,10 @@ const onSubmit = () => {
             marketid: props.record.marketid
         }
     }).then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.tips1'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败：' + err)
+        ElMessage.error(t('common.tips2') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/query/order/delivery/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 查询管理-订单管理-交收单管理-详情 -->
 <template>
-    <app-drawer title="详细" width="960" v-model:show="show">
+    <app-drawer :title="t('query.order.delivery.details.title')" width="960" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2" />
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.close') }}</el-button>
@@ -39,22 +39,22 @@ const { data } = useRequest(queryDeliveryOrderListDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'deliveryorderid', label: '交收单号：' },
-    { prop: 'username', label: '申请人：' },
-    { prop: 'goodsdisplay', label: '交收商品：' },
-    { prop: 'buyorselldisplay', label: '方向：' },
-    { prop: 'deliveryqty', label: '申请交收数量：' },
-    { prop: 'sucdeliveryqty', label: '实际交收数量：' },
-    { prop: 'cancledeliveryqty', label: '撤销交收数量：' },
-    { prop: 'deliveryprice', label: '交收价格：' },
-    { prop: 'deliveryamount', label: '交收货款：' },
-    { prop: 'matchname', label: '对手方：' },
-    { prop: 'deliveryinfo', label: '交收信息：' },
-    { prop: 'reqtime', label: '申请时间：', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: '交收状态：' },
-    { prop: 'remark', label: '备注：' },
-    { prop: 'deliverycharge', label: '交收手续费：' },
-    { prop: 'closetime', label: '完成时间：', formatValue: (val) => formatDate(val) },
+    { prop: 'deliveryorderid', label: 'query.order.delivery.details.deliveryorderid' },
+    { prop: 'username', label: 'query.order.delivery.details.username' },
+    { prop: 'goodsdisplay', label: 'query.order.delivery.details.goodsdisplay' },
+    { prop: 'buyorselldisplay', label: 'query.order.delivery.details.buyorselldisplay' },
+    { prop: 'deliveryqty', label: 'query.order.delivery.details.deliveryqty' },
+    { prop: 'sucdeliveryqty', label: 'query.order.delivery.details.sucdeliveryqty' },
+    { prop: 'cancledeliveryqty', label: 'query.order.delivery.details.cancledeliveryqty' },
+    { prop: 'deliveryprice', label: 'query.order.delivery.details.deliveryprice' },
+    { prop: 'deliveryamount', label: 'query.order.delivery.details.deliveryamount' },
+    { prop: 'matchname', label: 'query.order.delivery.details.matchname' },
+    { prop: 'deliveryinfo', label: 'query.order.delivery.details.deliveryinfo' },
+    { prop: 'reqtime', label: 'query.order.delivery.details.reqtime', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: 'query.order.delivery.details.orderstatusdisplay' },
+    { prop: 'remark', label: 'query.order.delivery.details.remark' },
+    { prop: 'deliverycharge', label: 'query.order.delivery.details.deliverycharge' },
+    { prop: 'closetime', label: 'query.order.delivery.details.closetime', formatValue: (val) => formatDate(val) },
 ]
 
 const onCancel = () => {

src/packages/pc/views/query/order/delivery/components/pay/index.vue

@@ -1,10 +1,10 @@
 <!-- 查询管理-订单管理-交收单管理-支付 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认交收服务商向卖方支付货款？</div>
+    <app-drawer :title="t('query.order.delivery.pay.title')" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">{{ t('query.order.delivery.pay.tips1') }}</div>
         <template #footer>
-            <el-button @click="onCancel(false)">取消</el-button>
-            <el-button type="primary" @click="onSubmit">确认</el-button>
+            <el-button @click="onCancel(false)">{{ t('operation.cancel' )}}</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -14,6 +14,7 @@ import { shallowRef, PropType } from 'vue'
 import { ElMessage } from 'element-plus'
 import { sellGoods } from '@/services/api/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -22,6 +23,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 const loading = shallowRef(false)
@@ -39,10 +41,10 @@ const onSubmit = () => {
             marketid: props.record.marketid
         }
     }).then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.tips1'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败：' + err)
+        ElMessage.error(t('common.tips2') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/query/order/delivery/index.vue

@@ -42,6 +42,9 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import { i18n } from '@/stores'
+
+const { global: { t } } = i18n
 
 const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.DeliveryOrderListRsp>({
     onClose: () => onSearch()
@@ -58,48 +61,48 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryD
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliveryorderid', label: '交收单号' },
-    { field: 'username', label: '申请人' },
-    { field: 'goodsdisplay', label: '交收商品' },
-    { field: 'buyorselldisplay', label: '方向' },
-    { field: 'deliveryqty', label: '申请交收数量' },
-    { field: 'sucdeliveryqty', label: '实际交收数量' },
-    { field: 'deliveryprice', label: '交收价格' },
-    { field: 'deliveryamount', label: '交收货款' },
-    { field: 'matchname', label: '对手方' },
-    { field: 'reqtime', label: '申请时间' },
-    { field: 'orderstatusdisplay', label: '交收状态' },
-    { field: 'operate', label: '操作', width: 180, fixed: 'right' }
+    { field: 'deliveryorderid', label: 'query.order.delivery.deliveryorderid' },
+    { field: 'username', label: 'query.order.delivery.username' },
+    { field: 'goodsdisplay', label: 'query.order.delivery.goodsdisplay' },
+    { field: 'buyorselldisplay', label: 'query.order.delivery.buyorselldisplay' },
+    { field: 'deliveryqty', label: 'query.order.delivery.deliveryqty' },
+    { field: 'sucdeliveryqty', label: 'query.order.delivery.sucdeliveryqty' },
+    { field: 'deliveryprice', label: 'query.order.delivery.deliveryprice' },
+    { field: 'deliveryamount', label: 'query.order.delivery.deliveryamount' },
+    { field: 'matchname', label: 'query.order.delivery.matchname' },
+    { field: 'reqtime', label: 'query.order.delivery.reqtime' },
+    { field: 'orderstatusdisplay', label: 'query.order.delivery.orderstatusdisplay' },
+    { field: 'operate', label: 'common.operate', width: 180, fixed: 'right' }
 ])
 
 const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.DeliveryOrderListReq>({
     filters: [
         {
             field: 'deliveryorderstatus',
-            label: '单据状态',
+            label: t('query.order.delivery.deliveryorderstatus'),
             options: () => []
         },
         {
             field: 'deliverygoodsname',
-            label: '交收商品'
+            label: t('query.order.delivery.deliverygoodsname'),
         },
         {
             field: 'accountname',
-            label: '账户'
+            label: t('query.order.delivery.accountname'),
         },
         {
             field: 'startdate',
-            label: '申请日期'
+            label: t('query.order.delivery.startdate'),
         },
         {
             field: 'buyorsell',
-            label: '方向',
+            label: t('query.order.delivery.buyorsell'),
             options: () => getBuyOrSellList()
         },
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
     ]
 })
 

src/packages/pc/views/query/order/list/index.vue

@@ -49,6 +49,9 @@ import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppSelectInvestor from '@pc/components/modules/select-investor/index.vue'
+import { i18n } from '@/stores'
+
+const { global: { t } } = i18n
 
 const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrderRsp>({
     onClose: () => onSearch()
@@ -65,56 +68,56 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'tradeid', label: '订单号' },
-    { field: 'accountname', label: '客户' },
-    { field: 'membername', label: '所属机构' },
-    { field: 'goodscode', label: '商品/代码' },
-    { field: 'buyorsell', label: '方向', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'holderprice', label: '订单价格' },
-    { field: 'opennum', label: '原始数量' },
-    { field: 'holdernum', label: '订单数量' },
-    { field: 'freezenum', label: '冻结数量' },
-    { field: 'depositratedisplay', label: '风险率' },
-    { field: 'holderamount', label: '订单金额' },
-    { field: 'payeddeposit', label: '占用资金' },
-    { field: 'tradetimestr', label: '订单时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'tradeid', label: 'query.order.list.tradeid' },
+    { field: 'accountname', label: 'query.order.list.accountname' },
+    { field: 'membername', label: 'query.order.list.membername' },
+    { field: 'goodscode', label: 'query.order.list.goodscode' },
+    { field: 'buyorsell', label: 'query.order.list.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'holderprice', label: 'query.order.list.holderprice' },
+    { field: 'opennum', label: 'query.order.list.opennum' },
+    { field: 'holdernum', label: 'query.order.list.holdernum' },
+    { field: 'freezenum', label: 'query.order.list.freezenum' },
+    { field: 'depositratedisplay', label: 'query.order.list.depositratedisplay' },
+    { field: 'holderamount', label: 'query.order.list.holderamount' },
+    { field: 'payeddeposit', label: 'query.order.list.payeddeposit' },
+    { field: 'tradetimestr', label: 'query.order.list.tradetimestr', formatValue: (val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrderReq>({
     filters: [
         {
             field: 'accountname',
-            label: '客户'
+            label: t('query.order.list.accountname')
         },
         {
             field: 'goodsid',
-            label: '商品',
-            placeholder: '请输入商品ID'
+            label: t('query.order.list.goodsid'),
+            placeholder: t('query.order.list.tips1')
         },
         {
             field: 'buyorsell',
-            label: '方向',
+            label: t('query.order.list.buyorsell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'tradeid',
-            label: '订单号'
+            label: t('query.order.list.tradeid')
         },
         {
             field: 'parantareaid',
-            label: '所属机构',
-            placeholder: '请输入机构ID'
+            label: t('query.order.list.parantareaid'),
+            placeholder: t('query.order.list.tips2')
         },
         {
             field: 'validholderqty',
-            label: '有效持仓',
+            label: t('query.order.list.validholderqty'),
             value: 1
         },
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
     ]
 })
 

src/packages/pc/views/query/order/monitor/index.vue

@@ -5,12 +5,12 @@
             <app-filter :option="filterOption">
                 <template #risk="{ item }">
                     <el-form-item :label="item.label" prop="risk">
-                        ><el-input-number v-model="item.value" placeholder="请输入" />% (默认>50%;下次刷新: {{ countDown.time }})
+                        ><el-input-number v-model="item.value" :laceholder="t('common.pleaseenter')" />{{ t('query.orer.monitor.tips1') }} {{ countDown.time }})
                     </el-form-item>
                 </template>
                 <el-form-item>
-                    <el-button type="primary" @click="countDown.stop" v-if="countDown.status.value">停止监控</el-button>
-                    <el-button type="primary" @click="startCountDown" v-else>开始监控</el-button>
+                    <el-button type="primary" @click="countDown.stop" v-if="countDown.status.value">{{ t('query.orer.monitor.start') }}</el-button>
+                    <el-button type="primary" @click="startCountDown" v-else>{{ t('query.orer.monitor.stop') }}</el-button>
                 </el-form-item>
             </app-filter>
         </template>
@@ -18,23 +18,23 @@
             <template #headerLeft>
                 <ul style="display: flex;gap: 20px;" v-if="data">
                     <li>
-                        <span>买总数量：</span>
+                        <span>{{ t('query.orer.monitor.buyBackCount') }}</span>
                         <span>{{ data.buyBackCount }}</span>
                     </li>
                     <li>
-                        <span>卖总数量：</span>
+                        <span>{{ t('query.orer.monitor.sellCount') }}</span>
                         <span>{{ data.sellCount }}</span>
                     </li>
                     <li>
-                        <span>净总数量：</span>
+                        <span>{{ t('query.orer.monitor.netcurpositionqty') }}</span>
                         <span>{{ data.netcurpositionqty }}</span>
                     </li>
                     <li>
-                        <span>订单均价：</span>
+                        <span>{{ t('query.orer.monitor.avgholderprice') }}</span>
                         <span>{{ data.avgholderprice }}</span>
                     </li>
                     <li>
-                        <span>总浮动结余：</span>
+                        <span>{{ t('query.orer.monitor.totalfloatpl') }}</span>
                         <span>{{ data.floatpl }}</span>
                     </li>
                 </ul>
@@ -58,48 +58,50 @@ import { monitorddjk, monitorddjkCount } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import { i18n } from '@/stores'
 
 const countDown = useCountDown(10)
+const { global: { t } } = i18n
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userfullname', label: '客户' },
-    { field: 'goodsfullname', label: '商品/代码' },
-    { field: 'buyorselldisplay', label: '方向' },
-    { field: 'tradetimestr', label: '订单时间' },
-    { field: 'holderprice', label: '订单价格' },
-    { field: 'lastprice', label: '现价' },
-    { field: 'depositratedisplay', label: '风险率' },
-    { field: 'floatpl', label: '浮动盈亏' },
-    { field: 'holdernum', label: '订单数量' },
-    { field: 'freezenum', label: '冻结数量' },
-    { field: 'holderamount', label: '订单金额' },
-    { field: 'payeddeposit', label: '占用资金' },
-    { field: 'tradeid', label: '订单号' }
+    { field: 'userfullname', label: 'query.orer.monitor.userfullname' },
+    { field: 'goodsfullname', label: 'query.orer.monitor.goodsfullname' },
+    { field: 'buyorselldisplay', label: 'query.orer.monitor.buyorselldisplay' },
+    { field: 'tradetimestr', label: 'query.orer.monitor.tradetimestr' },
+    { field: 'holderprice', label: 'query.orer.monitor.holderprice' },
+    { field: 'lastprice', label: 'query.orer.monitor.lastprice' },
+    { field: 'depositratedisplay', label: 'query.orer.monitor.depositratedisplay' },
+    { field: 'floatpl', label: 'query.orer.monitor.floatpl' },
+    { field: 'holdernum', label: 'query.orer.monitor.holdernum' },
+    { field: 'freezenum', label: 'query.orer.monitor.freezenum' },
+    { field: 'holderamount', label: 'query.orer.monitor.holderamount' },
+    { field: 'payeddeposit', label: 'query.orer.monitor.payeddeposit' },
+    { field: 'tradeid', label: 'query.orer.monitor.tradeid' }
 ])
 
 const { queryParams, filterOption, getQueryParams } = useDataFilter<Model.MonitorddjkReq>({
     filters: [
         {
             field: 'risk',
-            label: '监控当前风险率',
+            label: t('query.orer.monitor.risk'),
             value: 50
         },
         {
             field: 'goodsfullname',
-            label: '商品'
+            label: t('query.orer.monitor.goodsfullname1')
         },
         {
             field: 'buyorsell',
-            label: '方向',
+            label: t('query.orer.monitor.buyorsell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'userfullname',
-            label: '客户'
+            label: t('query.orer.monitor.userfullname')
         },
         {
             field: 'parentusername',
-            label: '所属机构'
+            label: t('query.orer.monitor.parentusername')
         }
     ]
 })

src/packages/pc/views/query/order/report/index.vue

@@ -6,7 +6,7 @@
                 <template #startDate="{ item }">
                     <el-form-item :label="item.label" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('query.order.report.startDate')" :end-placeholder="t('query.order.report.enddate')" />
                     </el-form-item>
                 </template>
                 <template #goodsid="{ item }">
@@ -55,8 +55,10 @@ import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppSelectGoods from '@pc/components/modules/select-goods/index.vue'
 import AppSelectInvestor from '@pc/components/modules/select-investor/index.vue'
 import AppSelectMember from '@pc/components/modules/select-member/index.vue'
+import { i18n } from '@/stores'
 
 const dateValue = shallowRef<string[] | null>([])
+const { global: { t } } = i18n
 
 const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrderDateRsp>({
     onClose: () => onSearch()
@@ -74,24 +76,24 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'reckondate', label: '日期' },
-    { field: 'tradeid', label: '订单号' },
-    { field: 'userfullname', label: '客户' },
-    { field: 'areafullname', label: '所属会员' },
-    { field: 'goodsfullname', label: '商品/代码' },
-    { field: 'buyorselldisplay', label: '方向' },
-    { field: 'holderprice', label: '订单价格' },
-    { field: 'opennum', label: '原始数量' },
-    { field: 'tradeamount', label: '原始金额' },
-    { field: 'holdernum', label: '订单数量' },
-    { field: 'holderamount', label: '订单金额' },
-    { field: 'payeddeposit', label: '占用资金' },
-    { field: 'freezenum', label: '冻结数量' },
-    { field: 'deliverynum', label: '交收数量' },
-    { field: 'closepl', label: '终止盈亏' },
-    { field: 'floatpl', label: '浮动盈亏' },
-    { field: 'depositratedisplay', label: '风险率' },
-    { field: 'operatorcode', label: '操作人' }
+    { field: 'reckondate', label: 'query.order.report.reckondate' },
+    { field: 'tradeid', label: 'query.order.report.tradeid' },
+    { field: 'userfullname', label: 'query.order.report.userfullname' },
+    { field: 'areafullname', label: 'query.order.report.areafullname' },
+    { field: 'goodsfullname', label: 'query.order.report.goodsfullname' },
+    { field: 'buyorselldisplay', label: 'query.order.report.buyorselldisplay' },
+    { field: 'holderprice', label: 'query.order.report.holderprice' },
+    { field: 'opennum', label: 'query.order.report.opennum' },
+    { field: 'tradeamount', label: 'query.order.report.tradeamount' },
+    { field: 'holdernum', label: 'query.order.report.holdernum' },
+    { field: 'holderamount', label: 'query.order.report.holderamount' },
+    { field: 'payeddeposit', label: 'query.order.report.payeddeposit' },
+    { field: 'freezenum', label: 'query.order.report.freezenum' },
+    { field: 'deliverynum', label: 'query.order.report.deliverynum' },
+    { field: 'closepl', label: 'query.order.report.closepl' },
+    { field: 'floatpl', label: 'query.order.report.floatpl' },
+    { field: 'depositratedisplay', label: 'query.order.report.depositratedisplay' },
+    { field: 'operatorcode', label: 'query.order.report.operatorcode' }
 ])
 
 // 表单验证规则
@@ -108,29 +110,29 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'startDate',
-            label: '日期',
+            label: t('query.order.report.date'),
             required: true
         },
         {
             field: 'goodsid',
-            label: '商品'
+            label:  t('query.order.report.goodsid'),
         },
         {
             field: 'tradeid',
-            label: '订单号'
+            label: t('query.order.report.tradeid'),
         },
         {
             field: 'currentUserId',
-            label: '交易商'
+            label: t('query.order.report.currentUserId'),
         },
         {
             field: 'areauserid',
-            label: '所属会员'
+            label: t('query.order.report.areauserid'),
         },
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
     ]
 })
 

src/packages/pc/views/query/order/terminate/index.vue

@@ -10,9 +10,9 @@
                                 :value="option.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="日期" prop="date" v-if="item.value === 1">
+                    <el-form-item :label="t('query.order.terminate.date')" prop="date" v-if="item.value === 1">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('query.order.terminate.startDate')" :end-placeholder="t('query.order.terminate.endDate')" />
                     </el-form-item>
                 </template>
                 <template #goodsid="{ item }">
@@ -55,8 +55,10 @@ import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppSelectGoods from '@pc/components/modules/select-goods/index.vue'
+import { i18n } from '@/stores'
 
 const dateValue = shallowRef<string[] | null>([])
+const { global: { t } } = i18n
 
 const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.ForcedOrderRsp>({
     onClose: () => onSearch()
@@ -74,20 +76,20 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryF
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'opentradeid', label: '订单号' },
-    { field: 'userfullname', label: '客户' },
-    { field: 'memberfullname', label: '所属会员' },
-    { field: 'goodsfullname', label: '商品/代码' },
-    { field: 'holderbuyorsell', label: '订单方向' },
-    { field: 'openprice', label: '订单价格' },
-    { field: 'opennum', label: '订单数量' },
-    { field: 'opentime', label: '订单时间' },
-    { field: 'closeprice', label: '终止价格' },
-    { field: 'closenum', label: '终止数量' },
-    { field: 'closepl', label: '终止盈亏' },
-    { field: 'depositrate', label: '风险率' },
-    { field: 'closetime', label: '终止时间' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'opentradeid', label: 'query.order.terminate.opentradeid' },
+    { field: 'userfullname', label: 'query.order.terminate.userfullname' },
+    { field: 'memberfullname', label: 'query.order.terminate.memberfullname' },
+    { field: 'goodsfullname', label: 'query.order.terminate.goodsfullname' },
+    { field: 'holderbuyorsell', label: 'query.order.terminate.holderbuyorsell' },
+    { field: 'openprice', label: 'query.order.terminate.openprice' },
+    { field: 'opennum', label: 'query.order.terminate.opennum' },
+    { field: 'opentime', label: 'query.order.terminate.opentime' },
+    { field: 'closeprice', label: 'query.order.terminate.closeprice' },
+    { field: 'closenum', label: 'query.order.terminate.closenum' },
+    { field: 'closepl', label: 'query.order.terminate.closepl' },
+    { field: 'depositrate', label: 'query.order.terminate.depositrate' },
+    { field: 'closetime', label: 'query.order.terminate.closetime' },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 表单验证规则
@@ -104,34 +106,34 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'goodsid',
-            label: '商品',
+            label: t('query.order.terminate.goodsid'),
         },
         {
             field: 'holderbuyorsell',
-            label: '方向',
+            label: t('query.order.terminate.holderbuyorsell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'opentradeid',
-            label: '订单号'
+            label: t('query.order.terminate.opentradeid')
         },
         {
             field: 'accountname',
-            label: '用户'
+            label: t('query.order.terminate.accountname')
         },
         {
             field: 'ishis',
-            label: '查询类型',
+            label: t('query.order.terminate.ishis'),
             value: 0,
             options: () => [
-                { label: '当前', value: 0 },
-                { label: '历史', value: 1 }
+                { label: t('common.current'), value: 0 },
+                { label: t('common.history'), value: 1 }
             ]
         },
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
     ]
 })
 

src/packages/pc/views/system/menu/index.vue

@@ -45,7 +45,7 @@ const columns = shallowRef([
     { field: 'resourceCode', label: '代码', },
     { field: 'url', label: '路径', },
     { field: 'icon', label: '图标', },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const showComponent = (componentName: string, row?: Model.MenusRsp) => {