update

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.175:8080/cfg?key=test_175"
+    "apiUrl": "http://192.168.31.203:8080/cfg?key=test_203"
 }

public/proto/mtp.proto

@@ -892,6 +892,8 @@ message GldSpotContractInfo {
 	optional uint64 AccountID = 34; // uint64 期货账户ID
 	optional uint32 BizType = 35; // uint32 业务类型 - 1:套保 2:套利
 	optional uint32 CurrencyID = 36; // uint32 结算币种ID
+	optional uint64 SubjectID = 37; // uint64 交易主体ID
+        optional uint64 BizSubjectID = 38; // uint64 归属业务部门ID - SubjectID
 }
 // 合同操作请求 0 29 170
 message ErmcpContractOperateApplyReq {

src/services/go/ermcp/spot-contract/interface.ts

@@ -72,6 +72,7 @@ export interface Ermcp3ContractRsp {
     wrstandardid: number;//品类ID
     wrstandardname: string;//品类名称
     subjectname: string;//交易主体名称
+    subjectid: number;// 交易主体ID
 }
 
 /**

src/services/proto/spotcontract/interface.ts

@@ -62,6 +62,8 @@ export interface GldSpotContractInfo {
     AccountID?: number // uint64 期货账户ID
     BizType?: number // uint32 业务类型 - 1:套保 2:套利
     CurrencyID?: number // 结算币种ID
+    SubjectID?: number // 交易主体ID
+    BizSubjectID?: number // 归属业务部门ID
 }
 
 //现货合同操作请求  (一部分操作用这个借口)

src/views/information/spot-contract/components/add/setup.ts

@@ -56,6 +56,7 @@ export function addContractReq() {
             MerUserID: form.MerUserID || 0, //             跟单员ID
             TradeUserID: form.TradeUserID || 0, //           交易员ID
             SaleUserID: form.SaleUserID || 0,//             业务员id
+            SubjectID: form.SubjectID // 交易主体
         }
         // 合同附件
         info.ContractAttachment = form.ContractAttachment ? objectToUint8Array(form.ContractAttachment) : new Uint8Array()

src/views/information/spot-contract/components/interface.ts

@@ -35,5 +35,6 @@ export interface FormState {
     AccountID: number | undefined // uint64 期货账户ID
     BizType: number // uint32 业务类型 - 1:套保 2:套利
     CurrencyID: number | undefined // 结算币种ID
-    SpotContractID: string;//现货合同ID(6number;
+    SpotContractID: string;//现货合同ID
+    SubjectID: number // 交易主体ID
 }

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

@@ -71,10 +71,10 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="交易主体" name="BuyUserID">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BuyUserID" placeholder="请选择主体">
+                        <a-form-item label="交易主体" name="SubjectID">
+                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SubjectID" placeholder="请选择主体">
                                 <a-select-option :value="item.subjectid" v-for="item in subjectList" :key="item.subjectid">
-                                    {{ item.subjectname }}
+                                    {{ item.subjectid }}
                                 </a-select-option>
                             </a-select>
                         </a-form-item>

src/views/information/spot-contract/components/setup.ts

@@ -100,6 +100,7 @@ export function handleFromState() {
             EndDate: '', //                           点价结束时间
             TradeUserID: undefined, //           交易员ID
             SpotContractID: '0',//现货合同ID
+            SubjectID: 0,// 交易主体ID
         }
     }
     const formState: UnwrapRef<FormState> = reactive(initFormData())