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

src/assets/styles/mixin.less

@@ -1503,4 +1503,24 @@ input:-internal-autofill-selected {
 
   .ant-layout-sider-has-trigger {
       padding-bottom: 40px;
-  }
+  }
+
+  // 弹窗中表格内容居中
+.tableContextCenter {
+    .dialogTable {
+        .ant-table-thead {
+            tr {
+                th {
+                    text-align: center;
+                }
+            }
+        }
+        .ant-table-tbody {
+            tr {
+                td {
+                    text-align: center;
+                }
+            }
+        }
+    }
+}

src/services/go/ermcp/exposure/interface.ts

@@ -2,35 +2,51 @@
  * 实时敞口信息返回
  */
 export interface ErmcpRealExposureModel {
-    AreaUserID: number;//所属机构
-    BuyFutureQty: number;//买入期货数量
-    BuyPlanQty: number;//采购计划数量
-    BuyPricedQty: number;//采购合同已定价数量
-    MiddleGoodsCode: string;//套保品种代码
-    MiddleGoodsHedgeRatio: number;//应套保比例
-    MiddleGoodsID: number;//套保品种
-    MiddleGoodsName: string;//套保品种名称
-    NeedHedgeExposoure: number;//应套保敞口
-    NeedHedgeRatio: number;//应套保敞口比例
-    OriBuyFutureQty: number;//期初买入期货数量
-    OriBuyPlanQty: number;//期初采购计划数量
-    OriBuyPricedQty: number;//期初采购合同已定价数量
-    OriSellFutureQty: number;//期初卖出期货数量
-    OriSellPlanQty: number;//期初销售计划数量
-    OriSellPricedQty: number;//期初销售合同已定价数量
-    SellFutureQty: number;//卖出期货数量
-    SellPlanQty: number;//销售计划数量
-    SellPricedQty: number;//销售合同已定价数量
-    TotalExposure: number;//总敞口
-    TotalFutureQty: number;//期货数量
-    TotalHedgeRatio: number;//敞口比例
-    TotalNeedHedgeQty: number;//期货应套保量
-    TotalSpotQty: number;//现货数量
-    diffFutuQty: number;//今日变动量(期货) = (买入 - 买入期初) - (卖出 - 卖出期初)
-    diffSpotQty: number;//今日变动量(现货) = 现货数量 - 期初现货数量
-    enumdicname: string;//单位名称
-    oriTotalFutuQty: number;//期初期货数量=期初买入期货数量-期初卖出期货数量
-    oriTotalSpotQty: number;//期初现货数量=(期初销售计划数量-期初销售合同已定价数量)-(期初采购计划数量-期初采购合同已定价数量)
+    AreaUserID	:number;//所属机构
+    BuyFutureQty	:number;//买入期货数量
+    BuyPlanQty	:number;//采购计划数量
+    BuyPricedQty	:number;//采购合同已定价数量
+    MiddleGoodsCode	:string;//套保品种代码
+    MiddleGoodsHedgeRatio	:number;//套保比例
+    MiddleGoodsID	:number;//套保品种
+    MiddleGoodsName	:string;//套保品种名称
+    NeedHedgeExposoure	:number;//应套保敞口(套保敞口)
+    NeedHedgeRatio	:number;//应套保敞口比例
+    OriBuyFutureQty	:number;//期初买入期货数量
+    OriBuyPlanQty	:number;//期初采购计划数量
+    OriBuyPricedQty	:number;//期初采购合同已定价数量
+    OriSellFutureQty	:number;//期初卖出期货数量
+    OriSellPlanQty	:number;//期初销售计划数量
+    OriSellPricedQty	:number;//期初销售合同已定价数量
+    SellFutureQty	:number;//卖出期货数量
+    SellPlanQty	:number;//销售计划数量
+    SellPricedQty	:number;//销售合同已定价数量
+    TotalExposure	:number;//总敞口
+    TotalFutureQty	:number;//期货总量
+    TotalHedgeRatio	:number;//敞口比例
+    TotalNeedHedgeQty	:number;//应套保总量(现货应套保总量)
+    TotalSpotQty	:number;//现货总量
+    arbitrageqty	:number;//套利量
+    diffArbitrageQty	:number;//套利变动量
+    diffExposoureQty	:number;//变动量(套保敞口)
+    diffFutuQty	:number;//变动量(期货总量)
+    diffHedgeQty	:number;//套保变动量
+    diffQty	:number;//变动量(总敞口)
+    diffSpotHedgeQty	:number;//变动量(现货应套保总量)
+    diffSpotQty	:number;//变动量(现货总量) = 现货数量 - 期初现货数量
+    enumdicname	:string;//单位名称
+    hedgeqty	:number;//套保量
+    needarbitrageqty	:number;//应套利量
+    needarbitrageratio	:number;//套利比例
+    needhedgeqty	:number;//应套保量
+    oriTotalFutuQty	:number;//期初期货数量=期初买入期货数量-期初卖出期货数量
+    oriTotalSpotQty	:number;//期初现货数量=(期初销售计划数量-期初销售合同已定价数量)-(期初采购计划数量-期初采购合同已定价数量)
+    oriarbitrageqty	:number;//期初套利量
+    orihedgeqty	:number;//期初套保量
+    orineedhedgeexposoure	:number;//期初套保敞口
+    oritotalexposure	:number;//期初总敞口
+    oritotalfutureqty	:number;//期初期货总量
+    oritotalneedhedgeqty	:number;//期初现货应套保量
 }
 
 /**

src/services/go/ermcp/qhj/index.ts

@@ -2,9 +2,9 @@
 /** ================================= 前海金相关接口 ================================**/
 import {commonSearch_go} from "@/services/go";
 import {
-    QhjAccountOutInApply, QhjReckonPriceLog, QhjRStrategy, QhjRSTriggerLog,
+    QhjAccountOutInApply, QhjContract, QhjReckonPriceLog, QhjRStrategy, QhjRSTriggerLog,
     QhjTradeGoodsPickup,
-    QueryAccountInOutApplyReq, QueryReckonPriceLogReq, QueryRStrategyReq, QueryRSTriggerLogReq,
+    QueryAccountInOutApplyReq, QueryContractReq, QueryReckonPriceLogReq, QueryRStrategyReq, QueryRSTriggerLogReq,
     QueryTradeGoodsPickupReq
 } from "@/services/go/ermcp/qhj/interface";
 
@@ -63,6 +63,19 @@ export function queryRStrategy(req: QueryRStrategyReq): Promise<QhjRStrategy[]>
     });
 }
 
+/**
+ * -- 铂金宝 - 融资信息
+ * 查询融资明细(合同) /Qhj/QueryContract
+ * @param req
+ */
+export function queryContract(req: QueryContractReq): Promise<QhjContract[]> {
+    return commonSearch_go('/Qhj/QueryContract', req).catch((err) => {
+        throw new Error(`查询融资明细(合同): ${err.message}`);
+    });
+}
+
+
+
 
 
 

src/services/go/ermcp/qhj/interface.ts

@@ -238,3 +238,39 @@ export interface QhjRStrategy{
     userid	:number;//所属用户ID
     username	:string;//用户名称(userid对应的名称)
 }
+
+/**
+ * 查询融资信息
+ */
+export interface QueryContractReq {
+    userid: number  //          用户ID
+    scfcontractid?: number //   scf合同id
+}
+
+/**
+ * 查询融资信息返回
+ */
+export interface QhjContract{
+    contractconfirmtime	:string;//合同确认时间(时间)
+    enumdicname	:string;//单位名称
+    goodscode	:string;//商品代码
+    goodsid	:number;//商品ID [5:融资单]
+    goodsname	:string;//商品名称
+    goodunitid	:number;//商品单位id
+    initmargin	:number;//初始保证金(首付款)
+    lenderamount	:number;//贷款金额(总额|订单总额)
+    marginratio	:number;//保证金比率(首付比例)
+    payamount	:number;//已付(已付货款)
+    recoveredmargin	:number;//已追缴保证金
+    remainamount	:number;//合同剩余金额(融资额)
+    scfcontractid	:number;//SCF合同ID(31number;
+//+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    scfcontracttype	:number;//合同类型 - 1:仓单回购 2:仓单质押 3:合作套保 4:资金贷款 5:融资单
+    totalinterest	:number;//已计总利息(利息)
+    tradeprice	:number;//成交价格(成本价格)
+    userid	:number;//用户ID
+    username	:string;//用户名称
+    wrqty	:number;//仓单数量(数量)
+}
+

src/views/platinum/platinum_financing_information/list/tab/compoments/detail/index.vue

@@ -12,7 +12,95 @@
                 :loading="loading.loading"
                 @click="cancel">关闭</a-button>
     </template>
-    <Des :list="desList" />
+    <!-- <Des :list="desList" /> -->
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>融资信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="账号类型">
+              <span class="white">企业</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="企业名称">
+              <span class="white">深圳首饰加工厂</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="账号">
+              <span class="white">2732175</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="融资商品">
+              <span class="white">黄金</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="数量">
+              <span class="white">50g</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="成本价">
+              <span class="white">366.06</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="订单总额">
+              <span class="white">17320.00</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="首付款">
+              <span class="white">2400.00</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="已付货款">
+              <span class="white">4500.00</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="融资额">
+              <span class="white">12820.00</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="利息">
+              <span class="white">25.34</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="red">预警（需追加5000.00）</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>还款信息</legend>
+        <div class="tableDatas tableContextCenter">
+            <a-table class="dialogTable"
+                    :columns="columns"
+                    :data-source="dataSource"
+                    :pagination="false">
+
+            </a-table>
+            </div>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -36,7 +124,38 @@ export default defineComponent({
         const { visible, cancel } = closeModal('platinum_financing_information_detail');
         const loading = ref<boolean>(false);
         const { desList, getDesList } = handleDesList();
+        const dataSource =  [
+            {
+                key: '1',
+                name: 'Mike',
+                age: 32,
+                address: '10 Downing Street',
+            },
+            {
+                key: '2',
+                name: 'John',
+                age: 42,
+                address: '10 Downing Street',
+            }
+            ];
 
+            const columns = [
+            {
+                title: '追加/还款时间',
+                dataIndex: 'name',
+                key: 'name',
+            },
+            {
+                title: '金额',
+                dataIndex: 'age',
+                key: 'age',
+            },
+            {
+                title: '剩余款',
+                dataIndex: 'address',
+                key: 'address',
+            }
+            ];
         watchEffect(() => {
             // if (props.selectedRow.customername) {
             const data = props.selectedRow;
@@ -52,13 +171,15 @@ export default defineComponent({
                 { label: '备注', value: formatValue(data.remark) },
             ];
             getDesList(person);
-            // }
+            
         });
         return {
             desList,
             cancel,
             visible,
             loading,
+            dataSource,
+            columns,
         };
     },
 });
@@ -74,5 +195,8 @@ export default defineComponent({
             margin-left: 0;
         }
     }
+    .red {
+        color: @m-red1;
+    }
 }
 </style>;

src/views/report/exposure-report/list/exposure_report/index.vue

@@ -5,7 +5,7 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -5,7 +5,7 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

src/views/report/future_report/list/future_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/inventory-report/list/category/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/inventory-report/list/warehouse/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/spot-report/list/spot_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>

src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -5,12 +5,13 @@
     <Filter @update="update"></Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
       </a-table>
     </contextMenu>
   </div>