Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -1830,7 +1830,7 @@ input:-internal-autofill-selected {
             .arrowRightIcon,.arrowLeftIcon {
                 width: 12px;
                 height: 40px;
-                background-image: url(../images/titleArrow.png);
+                background-image: @m-arrowRight;
                 background-position: 0 0;
                 background-repeat: no-repeat;
             }
@@ -2352,6 +2352,9 @@ input:-internal-autofill-selected {
     .ant-select-tree {
         color: @m-grey1;
         li {
+            .ant-select-tree-node-content-wrapper-open:hover {
+                background: @m-blue3;
+            }
             .ant-select-tree-node-content-wrapper {
                 color: @m-grey1;
             }

src/assets/styles/theme.css

@@ -121,6 +121,11 @@
     --m-red2: #271112;
     
     --m-nodata: url("../images/nodata.png");
+
+    --m-tabbg: url("../images/tabbg.png");
+    --m-tabbg-active: url("../images/tabbgActive.png");
+    --m-arrowRight: url("../images/titleArrow.png");
+    
 } 
 /* 白色主题 */
 /* :root[theme="light"] { */
@@ -144,7 +149,7 @@
     --m-grey15-hover: rgba(114, 124, 152, .8);
     --m-grey16: #727C98;
     --m-grey16-hover: rgba(114, 124, 152, .8);
-    --m-grey17: #808E97;
+    --m-grey17: #808E97; 
     --m-grey18: #FFFFFF; /* #ECF2F5 */
     --m-grey19: #F6F8FA;
     --m-grey20: #DAE5EC;
@@ -246,6 +251,10 @@
     --m-red2: #ffe2e2;
 
     --m-nodata: url("../images/nodata_white.png");
+
+    --m-tabbg: url("../images/tabbg_white.png");
+    --m-tabbg-active: url("../images/tabbg_active_white.png");
+    --m-arrowRight: url("../images/titleArrow_white.png");
 }
 
 /* 黑色主题 */
@@ -372,5 +381,9 @@
     --m-red2: #271112;
 
     --m-nodata: url("../images/nodata.png");
+
+    --m-tabbg: url("../images/tabbg.png");
+    --m-tabbg-active: url("../images/tabbgActive.png");
+    --m-arrowRight: url("../images/titleArrow.png");
 }
 

src/assets/styles/variables.less

@@ -158,6 +158,10 @@
 
 @m-nodata: var(--m-nodata);
 
+@m-tabbg: var(--m-tabbg);
+@m-tabbg-active: var(--m-tabbg-active);
+@m-arrowRight: var(--m-arrowRight);
+
 @m-yellow0: #FF9600;
 @m-yellow1: #FC9618;
 @m-yellow2: #ffae00;

src/common/components/thirdMenu/index.vue

@@ -80,12 +80,12 @@ export default defineComponent({
                                 color: @m-grey1;
                                 padding: 0 20px;
                                 margin: 0;
-                                background: url(../../../assets/images/tabbg.png) center center no-repeat;
+                                background: @m-tabbg center center no-repeat;
                                 background-size: cover;
                             }
                             .ant-tabs-tab-active.ant-tabs-tab {
                                 color: @m-white0;
-                                background: url(../../../assets/images/tabbgActive.png) center center no-repeat;
+                                background: @m-tabbg-active center center no-repeat;
                                 background-size: cover;
                                 z-index: 2;
                             }

src/services/go/wrtrade/index.ts

@@ -16,7 +16,7 @@ import {
     QueryWrOrderDetailReq, QueryWrPerformancePlanStepReq,
     QueryWrPositionReq, QueryWrScfContractInterestReq, QueryWrSpecialMatchOrderReq,
     QueryWrStandardFactoryItemReq,
-    QueryWrTradeDetailReq, WrBuybackDetail,
+    QueryWrTradeDetailReq, WrBuybackDetail, WrDeliveryDetail,
     WrFactorTypeInfo,
     WrFAProductDetail,
     WrFilterItem,
@@ -267,4 +267,15 @@ export function queryWrOutInApply(): Promise<WrOutInApply[]> {
     });
 }
 
+/**
+ * 查询交收 /WrTrade2/QueryWrDeliveryDetail
+ * 资金账号id
+ */
+export function queryWrDeliveryDetail(accountid: number): Promise<WrDeliveryDetail[]> {
+    const userid = getUsrId()
+    return commonSearch_go('/WrTrade2/QueryWrDeliveryDetail', { userid, accountid}).catch((err) => {
+        throw new Error(`查询交收: ${err}`);
+    });
+}
+
 

src/services/go/wrtrade/interface.ts

@@ -909,3 +909,35 @@ export interface WrOutInApply {
     wrtypename: string;//商品
 }
 
+export interface WrDeliveryDetail{
+    accountid	:number;//账号ID
+    buyorsell	:number;//方向 - number;
+//:买 1:卖
+    deliveryamount	:number;//货款金额(X总货款+P总货款)
+    deliveryorderid	:string;//申报单号
+    deliverypricemove	:number;//升贴水(升贴水总额)
+    deliveryqty	:number;//交收数量(点选数量)
+    deliverystatus	:number;//状态 - 1:待成交 2:已成交 3:成交失败 4:履约完成
+    deliverytime	:string;//交割时间
+    deliverytotalamount	:number;//交收金额
+    matchaccountid	:number;//对手账号ID
+    matchusername	:string;//对手方名称(仓单持有人)
+    p1goodsremainamount	:number;//点价货款 ps:当PPRICEMODE=2时, 界面需显示-
+    pdeliverycloseqty	:number;//p合约平仓数量
+    pdeliveryprice	:number;//点价价格 ps:当PPRICEMODE=2时, 界面需显示-
+    pgoodscode	:string;//商品代码
+    pgoodsid	:number;//p点选合约id
+    pgoodsname	:string;//商品名称
+    ppricemode	:number;//点价价格方式 - 1:商品价 2:固定值
+    tradedate	:string;//交易日(yyyymmdd)
+    userid	:number;//用户id
+    username	:string;//用户名称
+    wrfactortypeid	:number;//仓单要素类型ID
+    xdeliverycloseqty	:number;//合约数量
+    xgoodsamount	:number;//合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
+    xgoodscode	:string;//商品代码
+    xgoodsid	:number;//x交易合约ID
+    xgoodsname	:string;//商品名称
+}
+
+