pcweb菜单6期改版

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

@@ -73,10 +73,16 @@ export interface Ermcp3ExposureDetail {
     enumdicname: string;//现货商品单位名称
     logtype: number;//类型 - 1:套保计划 2:现货合同
     middlegoodsId: number;//套保商品id
+    mgunitidname:string;//套保品种单位名称
+    mgunitid:number;//套保品种单位id
     middlegoodscode: string;//套保商品代码
     middlegoodsname: string;//套保商品名称
     qty: number;//数量
     relateNo: string;//现货合同/套保计划编号
+    unitid:number;//现货商品单位id
+    wrstandardcode:string;//现货商品代码
+    wrstandardid:number;//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string;//现货商品名称
 }
 
 /**

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

@@ -6,7 +6,7 @@ import { getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go/index';
 import { QueryQuoteDay } from '../../quote';
 import {
-    Ermcp3Brand, Ermcp3GoodsGroup, Ermcp3MiddleGoodsDetailEx,
+    Ermcp3Brand, Ermcp3GoodsGroup,
     Ermcp3Wrstandard,
     ErmcpDeliveryGoodsDetailEx,
     ErmcpDeliveryGoodsReq,
@@ -14,6 +14,7 @@ import {
     Goods,
     Ermcp3MiddleGoodsDetail2
 } from './interface';
+import {Ermcp3MiddleGoodsDetail} from './interface/deliverygoodsdetail'
 
 /**
  * 查询现货商品 /Ermcp3/QueryDeliveryGoods
@@ -212,7 +213,7 @@ export function QueryMiddleGoods(status: number): Promise<ErmcpMiddleGoodsModel[
  * @param middlegoodsid 套保品种id
  * @constructor
  */
-export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3MiddleGoodsDetailEx[]> {
+export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3MiddleGoodsDetail[]> {
     const userid = getUserId(); // 用户id
     const usertype = getUserAccountType()  // 用户类型 2-机构 7-企业成员
     const param = middlegoodsid ? { userid, usertype, middlegoodsid } : { userid, usertype }

src/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail.ts

@@ -0,0 +1,82 @@
+/**
+ * 查询套保品种详情
+ */
+ export interface Ermcp3MiddleGoodsDetail {
+    areauserid:number //机构用户ID
+    enumdicname:string//单位名称
+    goodsunitid:number//套保品种单位id
+    gplst:TBGoodsGroup[]//期货品种列表
+    middlegoodscode:string//套保品种代码
+    middlegoodsid:number//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsnam:string//套保品种名称
+    needarbitrageratio:number//套利比率
+    needhedgeratio:number//套保比率
+    wdlst:TBWrstandard[]//商品信息列表(现货品类)
+    mg:ErmcpMiddleGoodsModel//套保品种
+}
+
+
+
+/**
+ * 套保品种
+ */
+ export interface ErmcpMiddleGoodsModel {
+    areauserid: number;//机构用户ID
+    createtime: string;//修改时间
+    enumdicname: string;//单位名称
+    evaluateratio: number;//估价系数
+    goodsgroupid: number;//关联期货品种ID
+    goodsunitid: number;//单位ID
+    isvalid: number;//状态 number;
+    //-无效(停用) 1-有效(正常)
+    middlegoodscode: string;//套保品种代码
+    middlegoodsid: number;//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsname: string;//套保品种名称
+    modifytime: string;//修改时间
+    needhedgeratio: number;//套保比率
+    qtydecimalplace: number;//数量小数位
+    relatedgoodsid: number;//关联交易商品ID
+    relatedgoodstype: number;//关联商品类型 - 1:期货合约 2:现货品种
+    remark: string;//备注
+}
+
+
+
+/**
+ * 商品信息列表(现货品类)
+ */
+ interface TBWrstandard{
+    convertratio:number//折算系数
+    deliverygoodsname:string//品种名称
+    enumdicname:string//单位名称
+    vatrate:number//增值税率
+    wrstandardcode:string//现货商品代码
+    wrstandardid:number//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string//现货商品名称
+}
+
+/**
+ * 期货品种列表
+ */
+ interface TBGoodsGroup{
+    convertratio:number//折算系数
+    enumdicname:string//单位名称
+    exexchangecode:string//交易所代码
+    exexchangename:string//交易所名称
+    gdlst:TBGoods[]//商品列表
+    goodsgroupid:Number//商品组ID(自增ID)
+    goodsgroupname:string//商品组名称
+    goodunitid:number//报价单位ID
+}
+
+/**
+ * 商品列表
+ */
+ interface TBGoods{
+    agreeunit:number//合约乘数
+    enumdicname:string//单位名称
+    goodscode:string//商品代码(内部)
+    goodsid:number//商品ID(自增ID SEQ_GOODS)
+    goodsname:string//商品名称
+
+}

src/views/business/exposure/list/realTime/index.vue

@@ -27,6 +27,9 @@
                 <template #middlegoodsname="{ record }" v-if="!isPingAnOem()">
                     <span>{{ record.middlegoodsname + '/' + record.middlegoodscode }}</span>
                 </template>
+                <template #goodsname="{ record }" v-if="!isPingAnOem()">
+                    <span>{{ record.goodsname + '/' + record.goodscode }}</span>
+                </template>
                 <template v-if="isPingAnOem()" #index="{ index }">
                     <span>{{ index + 1 }}</span>
                 </template>

src/views/business/plan/components/add/index.vue

@@ -78,16 +78,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="标仓系数"
-                       name="">
-            <a-input class="dialogInput"
-                     v-model:value="formState.ConvertFactor"
-                     readonly
-                     style="width: 200px"
-                     placeholder="请输入标仓系数" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="计划量"
                        class="relative"
                        name="PlanQty">

src/views/information/goods/list/hedging-variety/setup.ts

@@ -1,32 +1,42 @@
 import { QueryMiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo';
-import { Ermcp3MiddleGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';
+import { Ermcp3MiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail';
 import { mergeObj } from '@/utils/objHandle';
 import { message } from 'ant-design-vue';
 import { reactive, ref } from 'vue';
 import { getInitMenuData } from '../../setup';
 
-export function initMG(): Ermcp3MiddleGoodsDetailEx {
+
+export function initMG(): Ermcp3MiddleGoodsDetail {
     return {
-        dglist: [],  // 关联的现货品种列表
-        gplist: [],  // 关联商品组列表
-        mg: {
-            areauserid: 0,
-            evaluateratio: 0,
-            goodsgroupid: 0,
-            isvalid: 0,
-            middlegoodsid: 0,
-            needhedgeratio: 0,
-            qtydecimalplace: 0,
-            relatedgoodsid: 0,
-            relatedgoodstype: 0,
-            goodsunitid: 0,
-            createtime: '',
-            enumdicname: '',
-            middlegoodscode: '',
-            middlegoodsname: '',
-            modifytime: '',
-            remark: '',
-        }
+        areauserid:0, //机构用户ID
+        enumdicname:'',//单位名称
+        goodsunitid:0,//套保品种单位id
+        gplst:[],//期货品种列表
+        middlegoodscode:'',//套保品种代码
+        middlegoodsid:0,//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+        middlegoodsnam:'',//套保品种名称
+        needarbitrageratio:0,//套利比率
+        needhedgeratio:0,//套保比率
+        wdlst:[],//商品信息列表(现货品类)
+        mg:{
+            areauserid: 0,//机构用户ID
+            createtime: '',//修改时间
+            enumdicname: '',//单位名称
+            evaluateratio: 0,//估价系数
+            goodsgroupid: 0,//关联期货品种ID
+            goodsunitid: 0,//单位ID
+            isvalid: 0,//状态 number;
+            //-无效(停用) 1-有效(正常)
+            middlegoodscode: '',//套保品种代码
+            middlegoodsid: 0,//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+            middlegoodsname: '',//套保品种名称
+            modifytime: '',//修改时间
+            needhedgeratio: 0,//套保比率
+            qtydecimalplace: 0,//数量小数位
+            relatedgoodsid: 0,//关联交易商品ID
+            relatedgoodstype: 0,//关联商品类型 - 1:期货合约 2:现货品种
+            remark: ''//备注
+            }
     }
 }
 
@@ -38,9 +48,9 @@ export function handleMG() {
     const { menuList, menuMap } = getInitMenuData('goods_info_hedge')
     const loading = ref<boolean>(false);
     // 套保品种列表
-    const MGList = ref<Ermcp3MiddleGoodsDetailEx[]>([])
+    const MGList = ref<Ermcp3MiddleGoodsDetail[]>([])
     // 选中的具体某一天套保品种数据
-    const selctedMG = reactive<Ermcp3MiddleGoodsDetailEx>(initMG())
+    const selctedMG = reactive<Ermcp3MiddleGoodsDetail>(initMG())
     const isNormal = ref<boolean>(true) // true => 正常； false => 停用
     function getMG(param?: number) {
         loading.value = true;

src/views/information/spot-contract/components/add/index.vue

@@ -71,6 +71,11 @@
                             <UploadImg :visible="visible" @upload="uploadImgAction" />
                         </a-form-item>
                     </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="交易主体" name="subjecttype">
+                            <a-input class="subjecttype" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入交易主体" />
+                        </a-form-item>
+                    </a-col>
                 </a-row>
             </fieldset>
             <fieldset class="formFieldSet">
@@ -104,11 +109,6 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="标仓系数" name="ConvertFactor">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ConvertFactor" readonly placeholder="选择商品后自动填入" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
                         <a-form-item label="商品规格" name="SpotGoodsDesc">
                             <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
                         </a-form-item>