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

src/services/proto/contract/index.ts

@@ -3,6 +3,7 @@ import { ContractOperateApplyReq, ErmcpContractOperateApplyReq } from "@/service
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 import { getUUID } from "@/utils/qt/common";
 import { getTimeValue } from "@/utils/time";
+import {getUserId} from "@/services/bus/account";
 
 /**
  * 合同
@@ -14,7 +15,7 @@ export const operationContractReq = (param: ErmcpContractOperateApplyReq): Promi
         OperatorID: Number(getLongTypeLoginID()),
         ClientTicket: getUUID(),
         OperateApplyID: getTimeValue(),
-        UserID: Number(getLongTypeLoginID())
+        UserID: Number(getUserId())
     }
     Object.assign(param, obj)
     return protoMiddleware<ErmcpContractOperateApplyReq>(param, 'ErmcpContractOperateApplyReq', 'ErmcpContractOperateApplyRsp', 2)

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

@@ -361,8 +361,8 @@
                         :getPopupContainer="(triggerNode) => triggerNode.parentNode"
                         placeholder="请选择业务员">
                 <a-select-option v-for="item in businesserList"
-                                 :key="item.loginid"
-                                 :value="item.loginid">
+                                 :key="item.userid"
+                                 :value="item.userid">
                   {{item.accountname}}-{{item.logincode}}
                 </a-select-option>
               </a-select>
@@ -379,8 +379,8 @@
                         :getPopupContainer="(triggerNode) => triggerNode.parentNode"
                         placeholder="请选择跟单员">
                 <a-select-option v-for="item in merchandiserList"
-                                 :key="item.loginid"
-                                 :value="item.loginid">
+                                 :key="item.userid"
+                                 :value="item.userid">
                   {{item.accountname}}-{{item.logincode}}
                 </a-select-option>
               </a-select>