li.shaoyi 1 vuosi sitten
vanhempi
commit
400641cdfa

+ 1 - 1
app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trading",
-  "version": "1.0.30",
+  "version": "1.0.5",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

+ 2 - 2
oem/zrwyt/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.zrwyt",
   "appName": "中融文遗通",
-  "version": "1.0.35",
-  "versionCode": "100035",
+  "version": "1.0.37",
+  "versionCode": "100037",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

+ 2 - 2
oem/zrwyt2/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "cn.muchinfo.zrst",
   "appName": "中融生态",
-  "version": "1.0.3",
-  "versionCode": "100003",
+  "version": "1.0.5",
+  "versionCode": "100005",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

+ 349 - 6
public/locales/zh-CN.json

@@ -3,22 +3,365 @@
         "name": "多元世纪"
     },
     "common": {
-        "news": "市场资讯",
-        "notice": "通知公告",
-        "more": "更多"
+        "more": "更多",
+        "details": "明细"
     },
     "tabbar": {
         "home": "首页",
         "mine": "我的"
     },
-    "menu":{
+    "routes": {
+        "news": "市场资讯",
+        "notice": "通知公告",
         "capital": "资金信息",
         "sign": "签约账户",
         "profile": "个人信息",
+        "setting": "设置",
+        "about": "关于我们"
+    },
+    "operation": {
+        "submit": "提交",
+        "confirm": "确认",
+        "cancel": "取消",
+        "cancel2": "撤销",
+        "transfer": "转让",
+        "delivery": "交收",
+        "listing": "挂牌",
+        "pickup": "提货",
+        "details": "详情",
+        "deposit": "补足定金",
+        "deposit2": "追加定金",
+        "close": "平仓"
+    },
+    "account": {
+        "account": "资金账户",
+        "balance": "余额",
+        "freezeMargin": "预扣",
+        "availableFunds": "可用",
+        "netWorth": "净值",
+        "usedMargin": "占用",
+        "riskRate": "风险率"
+    },
+    "bank": {
+        "recharge": "入金",
+        "withdrawal": "出金"
+    },
+    "quote": {
+        "goodsname": "商品/代码",
+        "averageprice": "均价",
+        "last": "最新价",
+        "rise": "涨跌",
+        "change": "幅度",
+        "opened": "开盘",
+        "presettle": "昨结",
+        "lowest": "最低",
+        "highest": "最高",
+        "amplitude": "振幅",
+        "limitup": "涨停",
+        "limitdown": "跌停",
+        "bidvolume": "买量",
+        "askvolume": "卖量",
+        "bid": "买价",
+        "ask": "卖价",
+        "totalvolume": "成交量",
+        "totalturnover": "成交额"
+    },
+    "order": {
+        "title": "我的订单",
+        "goodsorder": {
+            "title": "订单委托",
+            "title2": "历史订单委托",
+            "subtitle": "订单委托信息",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "方向",
+            "buildtype": "类型",
+            "orderqty": "委托量",
+            "orderprice": "委托价格",
+            "tradeqty": "成交量",
+            "orderstatus": "委托状态",
+            "ordertime": "委托日期",
+            "orderid": "委托单号"
+        },
+        "goodstrade": {
+            "title": "订单成交",
+            "title2": "历史订单成交",
+            "subtitle": "订单成交信息",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "方向",
+            "buildtype": "类型",
+            "tradeqty": "成交量",
+            "tradeprice": "成交价格",
+            "charge": "手续费",
+            "closepl": "平仓损益",
+            "tradetime": "成交时间",
+            "tradeid": "成交单号"
+        },
+        "listingorder": {
+            "title": "挂牌委托",
+            "title2": "历史挂牌委托",
+            "subtitle": "挂牌委托信息",
+            "goodsname": "商品代码/名称",
+            "warehousename": "仓库",
+            "wrtradetype": "类型",
+            "buyorsell": "方向",
+            "fixedprice": "委托价格",
+            "orderqty": "委托量",
+            "tradeqty": "成交量",
+            "cancelqty": "撤销量",
+            "ordertime": "委托时间",
+            "wrtradeorderstatus": "委托状态",
+            "wrtradeorderid": "委托单号"
+        },
+        "listingtrade": {
+            "title": "挂牌成交",
+            "title2": "历史挂牌成交",
+            "subtitle": "挂牌成交信息",
+            "goodsname": "商品代码/名称",
+            "warehousename": "仓库",
+            "wrtradetype": "类型",
+            "buyorsell": "方向",
+            "tradeprice": "成交价格",
+            "tradeqty": "成交量",
+            "tradeamount": "成交金额",
+            "tradetime": "成交时间",
+            "matchusername": "对手方",
+            "wrtradedetailid": "成交单号"
+        },
+        "presale": {
+            "title": "预售认购",
+            "subtitle": "预售认购信息",
+            "goodsname": "商品代码/名称",
+            "orderqty": "认购量",
+            "orderprice": "认购价",
+            "orderamount": "认购金额",
+            "presaledepositalgorithm": "定金方式",
+            "presaledepositvalue": "定金比例",
+            "freezemargin": "预售定金",
+            "sellname": "发售方",
+            "starttime": "开始日期",
+            "endtime": "结束日期",
+            "orderstatus": "委托状态",
+            "ordertime": "委托时间",
+            "tradeprice": "预售价",
+            "tradeqty": "订单量",
+            "orderid": "委托单号"
+        },
+        "transferorder": {
+            "title": "转让委托",
+            "subtitle": "转让委托信息",
+            "goodsname": "商品代码/名称",
+            "orderqty": "转让量",
+            "orderprice": "转让价",
+            "presaleprice": "订货价",
+            "tradeqty": "摘牌量",
+            "orderstatus": "委托状态",
+            "ordertime": "委托时间",
+            "orderid": "委托单号"
+        },
+        "transfertrade": {
+            "title": "转让成交",
+            "subtitle": "转让成交信息",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "方向",
+            "tradeqty": "转让量",
+            "tradeprice": "转让价",
+            "presaleprice": "订货价",
+            "closepl": "损益",
+            "accountname": "对手方",
+            "tradetime": "成交时间",
+            "orderid": "成交单号"
+        },
+        "swaporder": {
+            "title": "掉期委托",
+            "subtitle": "委托信息",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "方向",
+            "orderqty": "委托量",
+            "orderprice": "委托价格",
+            "tradeqty": "成交量",
+            "orderstatus": "委托状态",
+            "ordertime": "委托时间",
+            "orderid": "委托单号"
+        },
+        "swaptrade": {
+            "title": "掉期成交",
+            "subtitle": "成交信息",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "方向",
+            "buildtype": "类型",
+            "tradeqty": "成交量",
+            "tradeprice": "成交价格",
+            "tradeamount": "成交金额",
+            "charge": "手续费",
+            "closepl": "交收盈亏",
+            "matchaccountid": "贸易对方",
+            "tradetime": "成交时间",
+            "tradeid": "成交单号"
+        }
+    },
+    "position": {
+        "title": "我的持仓",
+        "order": {
+            "title": "订单持仓",
+            "subtitle": "持仓信息",
+            "subtitle2": "交收信息",
+            "subtitle3": "转让信息",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "持仓方向",
+            "curholderamount": "持仓金额",
+            "curpositionqty": "持仓量",
+            "averageprice": "持仓均价",
+            "frozenqty": "冻结量",
+            "enableqty": "可用量",
+            "mindeliverylot": "最小交收量",
+            "closepl": "参考损益",
+            "last": "当前价",
+            "orderqty": "转让量",
+            "matchname": "交收对手方",
+            "deliverylot": "交收量",
+            "deliveryqty": "交收数量",
+            "address": "收货地址"
+        },
+        "spot": {
+            "title": "现货持仓",
+            "subtitle": "现货持仓信息",
+            "subtitle2": "挂牌信息",
+            "goodsname": "商品代码/名称",
+            "warehousename": "仓库",
+            "qty": "库存量",
+            "freezerqty": "冻结量",
+            "enableqty": "可用量",
+            "orderqty": "挂牌量",
+            "fixedprice": "挂牌价格",
+            "performancetemplate": "履约模板",
+            "orderqty2": "提货数量",
+            "appointmentmodel": "提货方式",
+            "contactname": "联系人",
+            "contactnum": "联系方式",
+            "district": "收货地区",
+            "address": "收货地址",
+            "remark": "发票信息"
+        },
+        "presale": {
+            "title": "预售持仓",
+            "subtitle": "预售持仓信息",
+            "goodsname": "商品代码/名称",
+            "sellname": "发售方",
+            "starttime": "开始日期",
+            "endtime": "结束日期",
+            "tradeqty": "认购量",
+            "openprice": "预售价",
+            "tradeamount": "总货款",
+            "transferdepositratio": "转让定金比例",
+            "transferdeposit": "转让定金",
+            "depositremain": "未付定金",
+            "paystatus": "支付状态",
+            "tradeid": "成交单号"
+        },
+        "transfer": {
+            "title": "转让持仓",
+            "subtitle": "转让持仓信息",
+            "goodsname": "商品代码/名称",
+            "buycurholderamount": "持仓金额",
+            "buycurpositionqty": "持仓量",
+            "buyfrozenqty": "冻结量",
+            "enableqty": "可用量",
+            "sellname": "发售方",
+            "presaleprice": "订货价",
+            "tradeamount": "总货款",
+            "transferdepositratio": "转让订金比例",
+            "transferdeposit": "转让订金",
+            "depositremain": "未付订金",
+            "paystatus": "支付状态",
+            "lasttradedate": "最后交易日"
+        },
+        "swap": {
+            "title": "掉期持仓",
+            "averageprice": "订单均价",
+            "curpositionqty": "持有量",
+            "curholderamount": "订单金额",
+            "frozenqty": "冻结量",
+            "lastprice": "参考价格",
+            "enableqty": "可用量",
+            "closepl": "参考损益",
+            "expiredate": "到期日"
+        }
+    },
+    "delivery": {
+        "title": "交货提货",
+        "online": {
+            "title": "点选交收单",
+            "title2": "历史点选交收单",
+            "subtitle": "点选交收单信息",
+            "wrtypename": "商品名称",
+            "deliveryqty": "交收数量",
+            "xdeliveryprice": "订货价",
+            "deliverypricemove": "升贴水",
+            "deliveryamount": "总货款",
+            "xgoodsremainamount": "剩余货款",
+            "deliverytotalamount": "总金额",
+            "remaintotalamount": "剩余金额",
+            "warehousename": "仓库",
+            "matchusername": "发货方",
+            "deliverytime": "申请时间",
+            "xgoodscode": "交收合约",
+            "deliveryid": "交收单号"
+        },
+        "offline": {
+            "title": "线下交收单",
+            "subtitle": "线下交收单信息",
+            "goodsname": "商品代码/名称",
+            "buyorselldisplay": "交收方向",
+            "deliveryqty": "交收数量",
+            "deliveryprice": "交收价格",
+            "deliveryamount": "交收货款",
+            "matchusername": "交收对手方",
+            "deliveryinfo": "交收信息",
+            "reqtime": "申请时间",
+            "orderstatusdisplay": "单据状态",
+            "deliveryorderid": "交收单号"
+        },
+        "spot": {
+            "title": "现货提货单",
+            "subtitle": "提货信息",
+            "goodsname": "商品代码/名称",
+            "warehousename": "仓库",
+            "qty": "提货数量",
+            "appointmentmodeldisplay": "提货方式",
+            "contactname": "联系人",
+            "contactnum": "联系方式",
+            "address": "收货地址",
+            "appointmentremark": "发票信息",
+            "applytime": "申请时间",
+            "applystatus": "提货状态",
+            "applyid": "提货单号"
+        }
+    },
+    "transfer": {
+        "title": "持仓过户",
+        "in": {
+            "title": "我的转入",
+            "outusername": "转出方",
+            "qty": "转出量",
+            "transferprice": "转让价格",
+            "freezedays": "冻结天数",
+            "goodscurprice": "商品价格",
+            "incharge": "手续费"
+        },
+        "out": {
+            "title": "我的转出",
+            "inusername": "转入方",
+            "qty": "转让量",
+            "transferprice": "转让价格",
+            "freezedays": "冻结天数",
+            "goodscurprice": "商品价格",
+            "outcharge": "手续费"
+        }
+    },
+    "rules": {
         "zcxy": "用户注册协议",
         "yszc": "关于隐私",
         "fwrx": "服务热线",
-        "setting": "设置",
-        "about": "关于我们"
+        "zrxy": "转让协议"
     }
 }

+ 1 - 1
src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue

@@ -16,7 +16,7 @@
                     <ul>
                         <li>
                             <span>方向类型</span>
-                            <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype) }}</span>
+                            <span>{{ getBuyOrSellName(item.buyorsell) + getBuildTypeName(item.buildtype) }}</span>
                         </li>
                         <li>
                             <span>委托量</span>

+ 1 - 1
src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue

@@ -17,7 +17,7 @@
                         </li>
                         <li>
                             <span>类型</span>
-                            <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell) }}</span>
+                            <span>{{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
                             <span>成交价格</span>

+ 3 - 2
src/packages/mobile/views/order/list/components/swaptrade/history/Index.vue

@@ -22,8 +22,9 @@
                             <ul>
                                 <li>
                                     <span>类型</span>
-                                    <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell)
-                                        }}</span>
+                                    <span>
+                                        {{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}
+                                    </span>
                                 </li>
                                 <li>
                                     <span>成交价格</span>

+ 1 - 1
src/packages/mobile/views/order/list/components/swaptrade/list/Index.vue

@@ -13,7 +13,7 @@
                     <ul>
                         <li>
                             <span>类型</span>
-                            <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell) }}</span>
+                            <span>{{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
                             <span>成交价格</span>

+ 5 - 5
src/packages/sbyj/views/delivery/components/completed/list/index.vue

@@ -16,15 +16,15 @@
                     <ul>
                         <li>
                             <span>{{ getTagName(item.buyorsell) }}重量</span>
-                            <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                            <span>{{ item.deliveryqty + getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>实际{{ getTagName(item.buyorsell) }}重量</span>
-                            <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                            <span>{{ item.realdeliveryqty + getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>补差价</span>
-                            <span>{{ item.deliverypremium }}</span>
+                            <span>{{ item.deliverypremium }}元/{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>{{ getTagName(item.buyorsell) }}价格</span>
@@ -54,8 +54,8 @@
                 </div>
             </div>
         </div>
-        <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
-            v-if="componentId" />
+        <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
+            @closed="closeComponent" v-if="componentId" />
     </app-pull-refresh>
 </template>
 

+ 3 - 3
src/packages/sbyj/views/delivery/components/pending/list/index.vue

@@ -16,15 +16,15 @@
                     <ul>
                         <li>
                             <span>{{ getTagName(item.buyorsell) }}重量</span>
-                            <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                            <span>{{ item.deliveryqty + getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>实际{{ getTagName(item.buyorsell) }}重量</span>
-                            <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                            <span>{{ item.realdeliveryqty + getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>补差价</span>
-                            <span>{{ item.deliverypremium }}</span>
+                            <span>{{ item.deliverypremium }}元/{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>{{ getTagName(item.buyorsell) }}价格</span>

+ 1 - 1
src/packages/sbyj/views/delivery/components/processing/components/pay/index.vue

@@ -79,7 +79,7 @@ const formData = reactive<Proto.DeliveryClientOperatorReq>({
 })
 
 // 剩余货款
-const amount = computed(() => props.selectedRow.deliverytotalamount - props.selectedRow.payedamount - formData.PayAmount)
+const amount = computed(() => +formatDecimal(props.selectedRow.deliverytotalamount - props.selectedRow.payedamount - formData.PayAmount))
 
 // 标签名称
 const tagName = computed(() => props.selectedRow.buyorsell === BuyOrSell.Buy ? '提料' : '交料')

+ 3 - 3
src/packages/sbyj/views/delivery/components/processing/list/index.vue

@@ -20,15 +20,15 @@
                     <ul>
                         <li>
                             <span>{{ getTagName(item.buyorsell) }}重量</span>
-                            <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                            <span>{{ item.deliveryqty + getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>实际{{ getTagName(item.buyorsell) }}重量</span>
-                            <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                            <span>{{ item.realdeliveryqty + getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>补差价</span>
-                            <span>{{ item.deliverypremium }}</span>
+                            <span>{{ item.deliverypremium }}元/{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
                             <span>{{ getTagName(item.buyorsell) }}价格</span>

+ 2 - 1
src/packages/sbyj/views/delivery/detail/index.vue

@@ -14,7 +14,8 @@
                     <Cell :title="`实际${getTagName()}重量`"
                         :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
                     <Cell :title="getTagName() + '价格'" :value="selectedRow.deliveryprice" />
-                    <Cell title="补差价" :value="selectedRow.deliverypremium" />
+                    <Cell title="补差价"
+                        :value="`${selectedRow.deliverypremium}元/${getGoodsUnitName(selectedRow.goodunitid)}`" />
                     <Cell title="总货款" :value="selectedRow.deliverytotalamount" />
                     <Cell title="已付货款" :value="selectedRow.payedamount" />
                     <Cell title="冻结货款" :value="selectedRow.freezeamount" />

+ 1 - 1
src/packages/sbyj/views/market/list/index.vue

@@ -95,7 +95,7 @@ const touristTradeGoodsList = computed(() => {
 
 // 构建游客参考行情商品
 const touristRefGoodsList = computed(() => {
-    const list = futuresStore.getGoodsListByTradeMode(99)
+    const list = futuresStore.getGoodsListByTradeMode(99, 97)
     return list.sort((a, b) => a.goodsorder.localeCompare(b.goodsorder))
 })
 

+ 2 - 2
src/stores/modules/global.ts

@@ -16,7 +16,7 @@ export interface SystemInfo {
     forcedPasswordChange: boolean; // 首次登录是否强制修改密码
     slogan: string; // 标语
     registrationCodeRule: -1 | 0 | 1; // 注册编码规则,-1隐藏,0非必填,1必填
-    riskType: 1 | 2; // 风控类型,1按单风控,2按账户风控
+    riskType: 0 | 1 | 2; // 风控类型,1按单风控,2按账户风控
 }
 
 export const useGlobalStore = defineStore(() => {
@@ -40,7 +40,7 @@ export const useGlobalStore = defineStore(() => {
             forcedPasswordChange: false,
             slogan: '数字化交易平台\r\n现代化综合服务',
             registrationCodeRule: 1,
-            riskType: 1
+            riskType: 0
         }
     })
 

+ 2 - 6
src/stores/modules/position.ts

@@ -125,12 +125,8 @@ export const useSBYJOrderStore = defineStore(() => {
             e.tHDetailEx.depositRate = calcDepositRate(e)
             e.tHDetailEx.floatPL = calcFloatpl(e)
         })
-        return state.orderList.filter((e) => {
-            // 任务 #5753
-            const { tHDetailEx, agreeUnit } = e
-            const qty = (tHDetailEx.holderQty - tHDetailEx.freezeQty) * agreeUnit
-            return qty > 0
-        })
+        // 任务 #5753
+        return state.orderList.filter((e) => e.tHDetailEx.holderQty > 0)
     })
 
     // 计算浮动盈亏