update

src/common/components/permanceTemp/addPermanceTemp.vue

@@ -1,103 +1,66 @@
 <template>
-  <!--新增履约模板-->
-  <Drawer :title="`${isUpdate() ? '修改' : '新增'}履约模板`"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          :class="[position === 'top' ? 'top600' : 'delistingBottom']">
-    <a-spin :spinning="loading">
-      <div class="listed">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <div class="formBar">
-            <a-row :gutter="24">
-              <a-col :span="24">
-                <a-form-item label="模版名称"
-                             name="name">
-                  <a-input class="commonInput"
-                           v-model:value="formState.name"
-                           placeholder="请输入模版名称"
-                           style="width: 260px" />
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row class="tableTitle">
-              <a-col :span="7">步骤类型</a-col>
-              <a-col :span="6">步骤值（%）</a-col>
-              <a-col :span="7">距离上一步天数</a-col>
-              <a-col :span="4">操作</a-col>
-            </a-row>
-            <a-row class="tableContent"
-                   v-for="(parent, index) in formState.domains"
-                   :key="parent">
-              <a-col :span="7">
-                <a-form-item :name="['domains',index, 'steptypeid']"
-                             :rules="rules.domains.steptypeid">
-                  <a-select class="inlineFormSelect dialogTableSelect"
-                            style="width: 158px"
-                            placeholder="请选择"
-                            @change="stepTypeChange(parent)"
-                            v-model:value="parent.steptypeid">
-                    <a-select-option v-for="item in list"
-                                     :key="item.steptypeid"
-                                     :value="item.steptypeid">{{item.steptypename}}
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :name="['domains',index, 'stepvalue']"
-                             :rules="rules.domains.stepvalue">
-                  <a-input-number class="commonInput dialogTableInput"
-                                  :disabled="isSummary(parent)"
-                                  :max="100"
-                                  style="width: 135px"
-                                  type="number"
-                                  v-model:value="parent.stepvalue"></a-input-number>
-                </a-form-item>
-              </a-col>
-              <a-col :span="7">
-                <a-form-item :name="['domains',index, 'stepdays']"
-                             :rules="rules.domains.stepdays">
-                  <a-input-number class="commonInput dialogTableInput"
-                                  style="width: 157px"
-                                  type="number"
-                                  v-model:value="parent.stepdays"></a-input-number>
-                </a-form-item>
-              </a-col>
-              <a-col :span="4">
-                <svg class="icon svg-icon"
-                     @click="deleteTemp(index)"
-                     v-if="showDeleteTemp(index)"
-                     aria-hidden="true">
-                  <use xlink:href="#icon-shanchu" />
-                </svg>
-                <PlusCircleOutlined v-if="showAddTempBtn(index)"
-                                    @click="addTemp()" />
-              </a-col>
-            </a-row>
-            <div class="noticeTip">
-              <div>注意事项：</div>
-              <div>1、买方支付汇总值必须为100%；</div>
-              <div>2、卖方收款汇总值必须为100%；</div>
-              <div>3、配置卖方收款之前要有买方支付，且其值不能多于买方支付的值。</div>
+    <!--新增履约模板-->
+    <Drawer :title="`${isUpdate() ? '修改' : '新增'}履约模板`" :placement="'right'" :visible="visible" @cancel="cancel" :class="[position === 'top' ? 'top600' : 'delistingBottom']">
+        <a-spin :spinning="loading">
+            <div class="listed">
+                <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                    <div class="formBar">
+                        <a-row :gutter="24">
+                            <a-col :span="24">
+                                <a-form-item label="模版名称" name="name">
+                                    <a-input class="commonInput" v-model:value="formState.name" placeholder="请输入模版名称" style="width: 260px" />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row class="tableTitle">
+                            <a-col :span="7">步骤类型</a-col>
+                            <a-col :span="6">步骤值（%）</a-col>
+                            <a-col :span="7">距离上一步天数</a-col>
+                            <a-col :span="4">操作</a-col>
+                        </a-row>
+                        <a-row class="tableContent" v-for="(parent, index) in formState.domains" :key="parent">
+                            <a-col :span="7">
+                                <a-form-item :name="['domains', index, 'steptypeid']" :rules="rules.domains.steptypeid">
+                                    <a-select class="inlineFormSelect dialogTableSelect" style="width: 158px" placeholder="请选择" @change="stepTypeChange(parent)" v-model:value="parent.steptypeid">
+                                        <a-select-option v-for="item in list" :key="item.steptypeid" :value="item.steptypeid">{{ item.steptypename }} </a-select-option>
+                                    </a-select>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="6">
+                                <a-form-item :name="['domains', index, 'stepvalue']" :rules="rules.domains.stepvalue">
+                                    <a-input-number class="commonInput dialogTableInput" :disabled="isSummary(parent)" :max="100" style="width: 135px" type="number" v-model:value="parent.stepvalue"></a-input-number>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="7">
+                                <a-form-item :name="['domains', index, 'stepdays']" :rules="rules.domains.stepdays">
+                                    <a-input-number class="commonInput dialogTableInput" style="width: 157px" type="number" v-model:value="parent.stepdays"></a-input-number>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="4">
+                                <svg class="icon svg-icon" @click="deleteTemp(index)" v-if="showDeleteTemp(index)" aria-hidden="true">
+                                    <use xlink:href="#icon-shanchu" />
+                                </svg>
+                                <PlusCircleOutlined v-if="showAddTempBtn(index)" @click="addTemp()" />
+                            </a-col>
+                        </a-row>
+                        <div class="noticeTip">
+                            <div>注意事项：</div>
+                            <div>1、买方支付汇总值必须为100%；</div>
+                            <div>2、卖方收款汇总值必须为100%；</div>
+                            <div>3、配置卖方收款之前要有买方支付，且其值不能多于买方支付的值。</div>
+                        </div>
+                    </div>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="fixedBtns">
+                            <a-form-item class="btnCenter">
+                                <a-button class="listedBtn" @click="submit">确定</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
             </div>
-          </div>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="fixedBtns">
-              <a-form-item class="btnCenter">
-                <a-button class="listedBtn"
-                          @click="submit">确定</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </a-spin>
-  </Drawer>
+        </a-spin>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -107,7 +70,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { useQueryData } from '@/common/setup/request';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { queryWrPerformanceStepType } from '@/services/go/wrtrade';
 import { QueryPermancePlanTmpRsp, QueryWrPerformanceStepTypeRsp } from '@/services/go/wrtrade/interface';

src/common/components/permanceTemp/choosePermancePlanTmp.vue

@@ -1,44 +1,30 @@
 <template>
-  <!--选择履约模板-->
-  <Drawer :title="'选择履约模板'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          :class="[position === 'top' ? 'top486' : 'delistingBottom']">
-    <span class="add-permance"
-          @click="open">
-      <svg class="icon svg-icon"
-           aria-hidden="true">
-        <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
-      </svg>
-    </span>
-    <a-spin :spinning="loading">
-      <div class="moduleContent">
-        <div class="itemBar"
-             v-for="item in tableList"
-             :key="item.autoid"
-             @click="chooseTemp(item)">
-          <div class="itemName">{{item.templatename}}</div>
-          <div class="rulesCont">
-            <a-row>
-              <a-col :span="24"
-                     class="ruleCol">
-                <div class="line"
-                     v-for="sub in item.LstStep"
-                     :key="sub.autoid">
-                  <div class="name">{{sub.steptypename}}</div>
-                  <div class="time">{{sub.stepdate}}</div>
+    <!--选择履约模板-->
+    <Drawer :title="'选择履约模板'" :placement="'right'" :visible="visible" @cancel="cancel" :class="[position === 'top' ? 'top486' : 'delistingBottom']">
+        <span class="add-permance" @click="open">
+            <svg class="icon svg-icon" aria-hidden="true">
+                <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
+            </svg>
+        </span>
+        <a-spin :spinning="loading">
+            <div class="moduleContent">
+                <div class="itemBar" v-for="item in tableList" :key="item.autoid" @click="chooseTemp(item)">
+                    <div class="itemName">{{ item.templatename }}</div>
+                    <div class="rulesCont">
+                        <a-row>
+                            <a-col :span="24" class="ruleCol">
+                                <div class="line" v-for="sub in item.LstStep" :key="sub.autoid">
+                                    <div class="name">{{ sub.steptypename }}</div>
+                                    <div class="time">{{ sub.stepdate }}</div>
+                                </div>
+                            </a-col>
+                        </a-row>
+                    </div>
                 </div>
-              </a-col>
-            </a-row>
-          </div>
-        </div>
-      </div>
-    </a-spin>
-  </Drawer>
-  <Add v-if="show"
-       :position="position"
-       @cancel="closeAddTemp" />
+            </div>
+        </a-spin>
+    </Drawer>
+    <Add v-if="show" :position="position" @cancel="closeAddTemp" />
 </template>
 
 <script lang="ts">
@@ -48,7 +34,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import Drawer from '@/common/components/drawer/index.vue';
 import { QueryPermancePlanTmpReq, QueryPermancePlanTmpRsp } from '@/services/go/wrtrade/interface';
 import { queryQueryPermancePlanTmp } from '@/services/go/wrtrade';
-import { getUsrId } from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
 import { queryTableList } from '@/common/setup/table';
 import Add from '@/common/components/permanceTemp/addPermanceTemp.vue';
 
@@ -83,7 +69,7 @@ export default defineComponent({
         const { show, close, open } = hanldeOpenAndCloseComponent();
 
         const param: QueryPermancePlanTmpReq = {
-            userid: getUsrId(),
+            userid: getUserId(),
             tmptype: '0,2',
         };
         const { loading, tableList, queryTable } = queryTableList<QueryPermancePlanTmpRsp>();

src/common/setup/table/interface.ts

@@ -23,11 +23,11 @@ export interface BtnParam {
 
 export interface ComposeTableParam {
     queryFn: Function,  // 查询表格数据
-    menuType: EnumRouterName,  // 操作按钮列表key---------------------待优化删除
+    menuType: EnumRouterName,  // 操作按钮列表key---------------------无用，待优化删除
     tableName?: keyof TableKey, // 表头key
     tableFilterKey: string[], // 表格过滤字段
     tableFilterCB?: Function, // 表格过滤字段回调函数
-    isDetail: boolean,  // 是否需要详情-------------------------------待优化删除
+    isDetail: boolean,  // 是否需要详情-------------------------------无用，待优化删除
 }
 
 export interface ComposeTableDetailParam {

src/services/bus/account.ts

@@ -65,18 +65,6 @@ export const getAccount_longType = (): LongType | null => {
     return null;
 };
 
-/**
- *  获取用户id
- */
-export const getUserId = (): number => {
-    const loginData = getLoginData();
-    if (loginData) {
-        return loginData.UserID;
-    } else {
-        console.warn('没有获取到用户id');
-        return 0;
-    }
-};
 
 
 export function getQuoteDayInfo(): Ref<QueryQuoteDayRsp[]> {

src/services/bus/index.ts

@@ -39,7 +39,8 @@ export async function globalDataRefresh(): Promise<string> {
             } else {
                 // token校验成功 马上轮询
                 checkTokenLoop();
-                await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
+                await LoginQuery()
+                await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
                 const marketInfo = getMarketByTradeMode(TradeMode.WarehouseReceiptTrade);
                 if (marketInfo) {
                     await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })

src/services/bus/login.ts

@@ -27,7 +27,8 @@ export const login = async (logidCode: string, password: string, byteArr: Uint8A
         const loginData = await loginAction(account, password, byteArr, isEncryt);
         // localstorage 缓存登录信息，处理页面刷新
         setLoginData(loginData);
-        await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
+        await LoginQuery()
+        await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])
         const marketInfo = getMarketByTradeMode(TradeMode.WarehouseReceiptTrade);
         if (marketInfo) {
             await queryWrMarketTradeConfig({ marketid: marketInfo.marketid })

src/services/bus/user.ts

@@ -34,7 +34,7 @@ export function getCompanyName() {
  * 获取用户id
  * 登录中也写了一个 获取用户id的方法，那个方法是在登录信息里面获取用户id，这个方法是在go服务修改登录请求方法，返回用户信息，后期有时间进行优化
  */
-export function getUsrId() {
+export function getUserId() {
     return getUserInfo().userid
 }
 

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

@@ -1,5 +1,5 @@
 /** ================================= 账户管理 ================================**/
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {

src/services/go/ermcp/business-review/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 业务审核 ================================**/
-import { getUserId } from '@/services/bus/account';
-import {getAreaUserId, getUserAccountType} from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
+import { getAreaUserId, getUserAccountType } from '@/services/bus/user';
 import { commonSearch_go } from "@/services/go";
 import {
     ErmcpTradeConfigTMP,

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

@@ -1,6 +1,6 @@
 /** ================================= 客户资料 ================================**/
 
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { BaseResponse, commonSearch_go, commonUpdate_go } from '@/services/go/index';
 import {
     AddUserInfoApplyReq,

src/services/go/ermcp/exposure-report/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 报表 - 敞口报表 ================================**/
 
-import { getUsrId } from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go/index';
 import * as type from './interface';
 
@@ -10,7 +10,7 @@ import * as type from './interface';
  * @returns 敞口日报表
  */
 export async function QueryExposureDayReport(tradedate: string): Promise<type.QueryExposureDayReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp/QryReportDayExposure', { tradedate, userid }).catch(err => {
         throw new Error(`查询敞口日报表: ${err}`);
     });

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

@@ -1,4 +1,4 @@
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { getAreaUserId, getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3AreaSpot, Ermcp3AreaSpotDetail, Ermcp3AreaSpotDetailReq, Ermcp3ExposureDetail, Ermcp3ExposureReq, ErmcpExposurePostion, ErmcpExposurePostionReq, ErmcpHedgePosition, ErmcpHedgePositionDetail, ErmcpHedgePositionDetailReq, ErmcpRealExposureModel } from '@/services/go/ermcp/exposure/interface';
@@ -12,7 +12,7 @@ import { Ermcp3AreaSpot, Ermcp3AreaSpotDetail, Ermcp3AreaSpotDetailReq, Ermcp3Ex
 export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
     const userid = getUserId(); // 所属机构id
     const usertype = getUserAccountType()
-    return commonSearch_go('/Ermcp/QueryRealtimeExposure', { userid, usertype}).catch((err) => {
+    return commonSearch_go('/Ermcp/QueryRealtimeExposure', { userid, usertype }).catch((err) => {
         throw new Error(`查询敞口 -> 实时敞口: ${err}`);
     });
 }

src/services/go/ermcp/finance-report/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 报表 - 财务报表 ================================**/
 
-import { getUsrId } from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go/index';
 import * as type from './interface';
 
@@ -10,7 +10,7 @@ import * as type from './interface';
  * @returns 财务日报表数据
  */
 export async function QueryFinanceDayReport(tradedate: string): Promise<type.QueryFinanceDayReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp/QryReportDayFinance', { tradedate, userid }).catch(err => {
         throw new Error(`查询财务日报表: ${err}`);
     });
@@ -23,7 +23,7 @@ export async function QueryFinanceDayReport(tradedate: string): Promise<type.Que
  * @returns 财务发票日报表
  */
 export async function QueryFinanceInvoiceDayReport(tradedate: string): Promise<type.QueryFinanceInvoiceDayReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp3/QryReportDayFinanceFp', { tradedate, userid }).catch(err => {
         throw new Error(`查询财务日报表发票: ${err}`);
     });
@@ -36,7 +36,7 @@ export async function QueryFinanceInvoiceDayReport(tradedate: string): Promise<t
  * @returns 财务付款日报表
  */
 export async function QueryFinancePayDayReport(tradedate: string): Promise<type.QueryFinancePayDayReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp3/QryReportDayFinanceKx', { tradedate, userid }).catch(err => {
         throw new Error(`查询财务日报表款项: ${err}`);
     });
@@ -49,7 +49,7 @@ export async function QueryFinancePayDayReport(tradedate: string): Promise<type.
  * @returns 财务月报表数据
  */
 export async function QueryFinanceMonthReport(tradedate: string): Promise<type.QueryFinanceMonthReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp/QryReportMonthFinance', { cycletime: tradedate, userid }).catch(err => {
         throw new Error(`查询财务月报表: ${err}`);
     });

src/services/go/ermcp/finance-review/index.ts

@@ -1,5 +1,5 @@
 /** ================================= 管理 - 财务审核 ================================**/
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from "@/services/go";
 import {
     QryBussinessFpRsp,
@@ -7,7 +7,7 @@ import {
     QueryBusinessFpReq,
     QueryBusinessKxReq
 } from "@/services/go/ermcp/finance-review/interface";
-import {getUserAccountType} from "@/services/bus/user";
+import { getUserAccountType } from "@/services/bus/user";
 
 /**
  * 查询财务管理(款项)(对应菜单:财务管理/款项) /Ermcp/QueryBusinessKx

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

@@ -1,7 +1,7 @@
 /** ================================= 信息 - 现货商品信息 ================================**/
 
 import APP from '@/services';
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go/index';
 import { QueryQuoteDay } from '../../quote';

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

@@ -77,9 +77,9 @@ export interface DeliveryGoodsDetailReq {
  * 查询新货商品详情
  */
 export interface ErmcpDeliveryGoodsDetailEx {
-    data: ErmcpDeliveryGoods;  // 现货商品信息
+    data: ErmcpDeliveryGoods;  // 现货商品信息 （现货品种）
     gblist: Ermcp3Brand[];     // 品牌
-    gmlist: Ermcp3Wrstandard[]; // 品类列表
+    gmlist: Ermcp3Wrstandard[]; // 品类列表 (现货商品)
     mgList: Ermcp3MiddleGoodsDetail2[]; // 套保列表
 }
 

src/services/go/ermcp/inventory-review/index.ts

@@ -1,7 +1,7 @@
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3AreaStockApply, QueryAreaStockApplyReq } from '@/services/go/ermcp/inventory-review/interface';
-import {getUserAccountType} from "@/services/bus/user";
+import { getUserAccountType } from "@/services/bus/user";
 
 /** ================================= 管理 - 库存审核 ================================**/
 /**

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

@@ -1,7 +1,7 @@
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
-import {getUserAccountType} from "@/services/bus/user";
+import { getUserAccountType } from "@/services/bus/user";
 
 /** ================================= 业务 - 计划 ================================**/
 

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

@@ -1,5 +1,5 @@
-import { getUserId } from '@/services/bus/account';
-import {getAreaUserId, getUserAccountType} from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
+import { getAreaUserId, getUserAccountType } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
 

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

@@ -1,6 +1,6 @@
 /** ================================= 前海金相关接口 ================================**/
 import { getSelectedAccountId } from "@/services/bus/account";
-import { getUsrId } from "@/services/bus/user";
+import { getUserId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
     Ermcp3SpotGoodsPrice, Ermcp3SpotGoodsPriceLog,
@@ -40,7 +40,7 @@ import {
  * @constructor
  */
 export function queryTradeGoodsPickup(): Promise<QhjTradeGoodsPickup[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Qhj/QueryTradeGoodsPickup', { userid }).catch((err) => {
         throw new Error(`查询提货: ${err}`);
     });
@@ -65,7 +65,7 @@ export function queryReckonPriceLog(req: QueryReckonPriceLogReq): Promise<QhjRec
  */
 export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]> {
     // fixme 不传userid
-    // const userid = getUsrId();
+    // const userid = getUserId();
     // const param = status ? { userid, status } : { userid }
     const param = status ? { status } : {}
     return commonSearch_go('/Qhj/QueryRSTriggerLog', param).catch((err) => {
@@ -80,7 +80,7 @@ export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]
  */
 export function queryRStrategy(status?: 1 | 2 | 3): Promise<QhjRStrategy[]> {
     // fixme 不传userid
-    // const userid = getUsrId();
+    // const userid = getUserId();
     const param = status ? { status } : {}
     return commonSearch_go('/Qhj/QueryRStrategy', param).catch((err) => {
         throw new Error(`查询定投设置: ${err}`);
@@ -106,7 +106,7 @@ export function queryContractLog(param: QueryContractLogReq): Promise<QueryContr
  * @param req
  */
 export function queryParentAreaList(): Promise<QhjParentAreaList[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Qhj/QueryParentAreaList', { userid }).catch((err) => {
         throw new Error(`查询所属机构列表: ${err}`);
     });

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

@@ -1,5 +1,5 @@
 /***********************   报表相关 *********************/
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
     AreaExpourseReportReq,

src/services/go/ermcp/search-inventory/index.ts

@@ -1,4 +1,4 @@
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
     Ermcp3AreaStock,

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

@@ -1,8 +1,8 @@
 /** ================================= 销售 ================================**/
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
-import {getUserAccountType} from "@/services/bus/user";
+import { getUserAccountType } from "@/services/bus/user";
 
 /**
  * 查询销售信息(这个接口和采购是同一个接口) /Ermcp3/QuerySpotContractBS

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

@@ -1,5 +1,5 @@
 /** ================================= 现货合同 ================================**/
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go';
 import {
     Ermcp3ContractReq,
@@ -7,7 +7,7 @@ import {
     ErmcpOPLogModel,
     QueryChangeLogReq
 } from '@/services/go/ermcp/spot-contract/interface';
-import {getUserAccountType} from "@/services/bus/user";
+import { getUserAccountType } from "@/services/bus/user";
 
 /**
  * 查询现货合同 /Ermcp3/QuerySpotContract

src/services/go/ermcp/spot-report/index.ts

@@ -1,5 +1,5 @@
 /** ================================= 现货报表 ================================**/
-import { getUsrId } from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go/index';
 import * as type from './interface';
 import { QuerySpotDayReportDetailReq, QuerySpotMonthReportDetailReq, QuerySpotPLReportReq } from './interface';
@@ -21,7 +21,7 @@ export async function QuerySpotPLReport(queryInfo: QuerySpotPLReportReq): Promis
  * @returns 现货报表
  */
 export async function QuerySpotDayReport(tradedate: string): Promise<type.QuerySpotDayReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp3/QryReportDaySpot', { tradedate, userid }).catch(err => {
         throw new Error(`查询现货报表: ${err}`);
     });
@@ -45,7 +45,7 @@ export async function QuerySpotDayReportDetail(queryInfo: QuerySpotDayReportDeta
  * @returns 现货月报表数据
  */
 export async function QuerySpotMonthReport(tradedate: string): Promise<type.QuerySpotMonthReportRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp3/QryReportMonthSpot', { tradedate, userid }).catch(err => {
         throw new Error(`查询现货月报表: ${err}`);
     });

src/services/go/ermcp/warehouse-info/index.ts

@@ -1,5 +1,5 @@
 /** ================================= 仓库信息 ================================**/
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '@/services/go';
 import {
     Ermcp3AreaStock,

src/services/go/useInfo/index.ts

@@ -1,6 +1,6 @@
 import APP from '@/services';
 import { geLoginID_number } from '@/services/bus/login';
-import { getUsrId } from '@/services/bus/user';
+import { getUserId } from '@/services/bus/user';
 import { commonSearch_go } from '../index';
 import * as type from './interface';
 
@@ -69,7 +69,7 @@ export function QueryUserInfo(userID: number, isDecrypt?: boolean): Promise<type
  * /Ermcp3/QueryRootUserAccount
  */
 export function QueryRootUserAccount(): Promise<string> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/Ermcp3/QueryRootUserAccount', { userid }).then(res => {
         APP.set('RootUser', res);
         return 'ok'

src/services/go/wrtrade/index.ts

@@ -2,7 +2,7 @@
 /* 更新全部接口 20210803 */
 import APP from '@/services';
 import { getSelectedAccountId } from "@/services/bus/account";
-import { getUsrId } from "@/services/bus/user";
+import { getUserId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
     QueryFaProductDetailReq,
@@ -138,7 +138,7 @@ export function queryOrderQuoteDetail(req: QueryOrderQuoteDetailReq): Promise<Wr
  * 查询履约信息 /WrTrade2/QueryPerformancePlan
  */
 export function QueryPerformancePlan(req: QueryPerformancePlanReq): Promise<WrPerformancePlan[]> {
-    req.userid = getUsrId();
+    req.userid = getUserId();
     return commonSearch_go('/WrTrade2/QueryPerformancePlan', req).catch((err) => {
         throw new Error(`查询履约信息: ${err}`);
     });
@@ -195,7 +195,7 @@ export function queryWrMarketTradeConfig(req: QueryWrMarketTradeConfigReq): Prom
  * @param req
  */
 export function queryWrOrderDetail(req: QueryWrOrderDetailReq): Promise<WrOrderDetail[]> {
-    req.userid = getUsrId();
+    req.userid = getUserId();
     return commonSearch_go('/WrTrade2/QueryWrOrderDetail', req).catch((err) => {
         throw new Error(`查询仓单委托单(挂单): ${err}`);
     });
@@ -206,7 +206,7 @@ export function queryWrOrderDetail(req: QueryWrOrderDetailReq): Promise<WrOrderD
  * 查询现货(预售)仓单持仓 /WrTrade2/QueryWrPosition
  */
 export function queryWrPosition(req: QueryWrPositionReq): Promise<WrPosition[]> {
-    req.userid = getUsrId();
+    req.userid = getUserId();
     return commonSearch_go('/WrTrade2/QueryWrPosition', req).catch((err) => {
         throw new Error(`查询现货(预售)仓单持仓: ${err}`);
     });
@@ -217,7 +217,7 @@ export function queryWrPosition(req: QueryWrPositionReq): Promise<WrPosition[]>
  * 页面 现货仓单 | 预售仓单 -> 指定成交
  */
 export function queryWrSpecialMatchOrder(req: QueryWrSpecialMatchOrderReq): Promise<WrSpecialMatchOrder[]> {
-    req.userid = getUsrId();
+    req.userid = getUserId();
     return commonSearch_go('/WrTrade2/QueryWrSpecialMatchOrder', req).catch((err) => {
         throw new Error(`查询指定成交: ${err}`);
     });
@@ -237,7 +237,7 @@ export function queryWrStandardFactoryItem(req: QueryWrStandardFactoryItemReq):
  * 查询仓单成交明细 /WrTrade2/QueryWrTradeDetail
  */
 export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeDetail[]> {
-    req.userid = getUsrId();
+    req.userid = getUserId();
     return commonSearch_go('/WrTrade2/QueryWrTradeDetail', req).catch((err) => {
         throw new Error(`查询仓单成交明细: ${err}`);
     });
@@ -256,7 +256,7 @@ export function queryWrPerformancePlanStep(req: QueryWrPerformancePlanStepReq):
  * 查询仓单贸易融资合同  /WrTrade2/QueryWrScfContract  融资管理 - 合同
  */
 export function queryWrScfContract(scfcontractid?: number): Promise<WrScfContract[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     const param = scfcontractid ? { scfcontractid, userid } : { userid }
     return commonSearch_go('/WrTrade2/QueryWrScfContract', param).catch((err) => {
         throw new Error(`查询仓单贸易融资合同: ${err}`);
@@ -267,7 +267,7 @@ export function queryWrScfContract(scfcontractid?: number): Promise<WrScfContrac
  * 查询融资购买申请 /WrTrade2/QueryWrFinanceBuyApply 融资管理 - 申请单
  */
 export function queryWrFinanceBuyApply(): Promise<WrFinanceBuyApply[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/WrTrade2/QueryWrFinanceBuyApply', { userid }).catch((err) => {
         throw new Error(`查询融资购买申请: ${err}`);
     });
@@ -295,7 +295,7 @@ export function queryWrScfContractInterest(req: QueryWrScfContractInterestReq):
  * 查询提货申请 /WrTrade2/QueryWrOutInApply
  */
 export function queryWrOutInApply(): Promise<WrOutInApply[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/WrTrade2/QueryWrOutInApply', { userid }).catch((err) => {
         throw new Error(`查询提货申请: ${err}`);
     });
@@ -307,7 +307,7 @@ export function queryWrOutInApply(): Promise<WrOutInApply[]> {
  */
 export function queryWrDeliveryDetail(): Promise<WrDeliveryDetail[]> {
     const accountid = getSelectedAccountId()
-    const userid = getUsrId()
+    const userid = getUserId()
     return commonSearch_go('/WrTrade2/QueryWrDeliveryDetail', { userid, accountid }).catch((err) => {
         throw new Error(`查询交收: ${err}`);
     });
@@ -347,7 +347,7 @@ export function queryWrDeliveryAvalidHoldLB(param: QueryWrDeliveryAvalidHoldLBRe
  */
 export function queryQueryOrderQuoteMyq(param: QueryOrderQuoteMyqReq): Promise<QueryOrderQuoteMyqQsp[]> {
     if (!param.userid) {
-        param.userid = getUsrId()
+        param.userid = getUserId()
     }
     return commonSearch_go('/WrTrade2/QueryOrderQuoteMyq', param).catch((err) => {
         throw new Error(`查询贸易圈挂牌大厅: ${err}`);
@@ -369,7 +369,7 @@ export function queryQueryWrTradeBargainApply(param: QueryWrTradeBargainApplyReq
  * @param QueryWrFriendApply
  */
 export function queryQueryWrFriend(newuserid?: string): Promise<QueryWrFriendApplyRsp[]> {
-    const userid = getUsrId()
+    const userid = getUserId()
     const param = newuserid ? { userid, newuserid } : { userid }
     return commonSearch_go('/WrTrade2/QueryWrUserFriend', param).catch((err) => {
         throw new Error(`查询议价单: ${err}`);

src/services/proto/accountinfo/index.ts

@@ -1,4 +1,4 @@
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { geLoginID_number } from "@/services/bus/login";
 import {
     AuditWskhUserInfoReq, AuditWskhUserInfoRsp,

src/services/proto/delivery/index.ts

@@ -1,4 +1,4 @@
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { getAreaUserId } from "@/services/bus/user";
 import {

src/services/proto/hedgeplan/index.ts

@@ -1,12 +1,12 @@
 // 套保计划
 import APP from "@/services";
-import { getSelectedAccountId, getUserId } from "@/services/bus/account";
-import {ErmcpHedgePlanReq, HedgePlanOperateReq} from "@/services/proto/hedgeplan/interface";
-import {buildProtoReq50, parseProtoRsp50, protoMiddleware} from "@/services/socket/protobuf/buildReq";
+import { getUserId } from '@/services/bus/user';
+import { ErmcpHedgePlanReq, HedgePlanOperateReq } from "@/services/proto/hedgeplan/interface";
+import { buildProtoReq50, parseProtoRsp50, protoMiddleware } from "@/services/socket/protobuf/buildReq";
 import { Callback } from "@/utils/websocket";
 import moment from "moment";
 import { v4 as uuidv4 } from "uuid";
-import {GldErmcpSpotContractOperateReq} from "@/services/proto/spotcontract/interface";
+import { GldErmcpSpotContractOperateReq } from "@/services/proto/spotcontract/interface";
 
 /**
  * 套保计划操作请求

src/services/proto/spotcontract/index.ts

@@ -1,4 +1,4 @@
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { geLoginID_number } from "@/services/bus/login";
 import { GldErmcpSpotContractOperateReq, SpotContractOperateReq } from "@/services/proto/spotcontract/interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";

src/services/proto/warehouse/index.ts

@@ -1,4 +1,4 @@
-import { getUserId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { geLoginID_number } from "@/services/bus/login";
 import {
     AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq, ERMCPAreaInOutStockApplyReq,

src/services/socket/address/index.ts

@@ -1,6 +1,6 @@
 // 用户相关请求模块
 import APP from '@/services';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { buildProtoReq50, parseProtoRsp50 } from '@/services/socket/protobuf/buildReq';
 import { getUUID } from '@/utils/qt/common';
 import { Callback } from '@/utils/websocket/index';

src/services/socket/order/index.ts

@@ -1,7 +1,7 @@
 // 用户相关请求模块
 import { DelistingType, OperateType, OptionType, PriceType } from '@/common/constants/enumCommon';
 import APP from '@/services';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { OrderReq } from "@/services/socket/order/interface";
 import { buildProtoReq50, parseProtoRsp50, protoMiddleware } from '@/services/socket/protobuf/buildReq';

src/services/socket/protobuf/buildReq.ts

@@ -1,5 +1,5 @@
 import APP from '@/services';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getErrorInfoByCode } from '@/services/bus/error';
 import { funCode } from '@/services/funcode/index';
 import ProtobufCtr from '@/services/socket/protobuf/index';

src/services/socket/protobuf/protoHeader.ts

@@ -1,5 +1,6 @@
 import { TradeMode } from "@/common/constants/enumCommon";
-import { getSelectedAccountId, getUserId } from "@/services/bus/account";
+import { getSelectedAccountId } from "@/services/bus/account";
+import { getUserId } from "@/services/bus/user";
 import { getMarketByTradeMode } from "@/services/bus/market";
 import { funCode } from "@/services/funcode";
 import { v4 as uuidv4 } from 'uuid';

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

@@ -88,7 +88,7 @@ import { formatValue } from '@/common/methods';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
 import { getPayCurrencyTypeEnumList } from '@/common/constants/enumsList';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({

src/views/business/plan/list/running/index.vue

@@ -15,7 +15,7 @@
             </template>
         </a-table>
         <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
         <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
     </div>
 </template>
@@ -54,7 +54,7 @@ export default defineComponent({
         };
 
         // 权限按钮
-        const buttons = getTableButton(['detail']);
+        const buttons = getTableButton();
 
         return {
             ...handleComposeTable<Ermcp3HedgePlan>(param),

src/views/business/spotmarket/components/detail/index.vue

@@ -0,0 +1,6 @@
+<template>
+    <div></div>
+</template>
+
+<script lang="ts">
+</script>

src/views/business/spotmarket/components/filter/index.vue

@@ -0,0 +1,73 @@
+<template>
+    <!-- 过滤客户资料表格 -->
+    <div class="filterTable">
+        <FilterOption :selectList="selectList" :fixedBtnList="fixedBtnList" />
+        <slot></slot>
+    </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent } from 'vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+import { initData } from '@/common/export/table';
+import { ErmcpDeliveryGoodsDetailEx, ErmcpDeliveryGoods, Ermcp3Brand, Ermcp3Wrstandard } from '@/services/go/ermcp/goodsInfo/interface';
+import APP from '@/services';
+
+export default defineComponent({
+    name: 'spotmarket_price-filter-table',
+    components: { FilterOption },
+    setup(props, context) {
+        initData(() => {
+            const goodsList: ErmcpDeliveryGoodsDetailEx[] = APP.get('DeliveryGoodsList'),
+                category: ErmcpDeliveryGoods[] = [], // 品种
+                goods: Ermcp3Wrstandard[] = [], // 商品
+                brand: Ermcp3Brand[] = []; // 品牌
+
+            goodsList.forEach((el) => {
+                category.push(el.data);
+                goods.push(...el.gmlist);
+                brand.push(...el.gblist);
+            });
+
+            debugger;
+        });
+
+        const select: SelectList[] = [
+            {
+                value: undefined,
+                key: 'deliverygoodsid',
+                placeholder: '全部现货品种',
+                list: [
+                    { value: 1, lable: '采购' },
+                    { value: -1, lable: '销售' },
+                ],
+            },
+            {
+                value: undefined,
+                key: 'wrstandardid',
+                placeholder: '全部商品',
+                list: [
+                    { value: 1, lable: '一口价' },
+                    { value: 2, lable: '点价' },
+                    { value: 3, lable: '暂定价' },
+                ],
+            },
+            {
+                value: undefined,
+                key: 'brandid',
+                placeholder: '全部品牌',
+                list: [
+                    { value: 1, lable: '一口价' },
+                    { value: 2, lable: '点价' },
+                    { value: 3, lable: '暂定价' },
+                ],
+            },
+        ];
+        const input: InputList[] = [];
+        return {
+            ...handleFilter(select, input, context),
+        };
+    },
+});
+</script>

src/views/business/spotmarket/list/price/index.vue

@@ -1,40 +1,40 @@
 <template>
     <!-- 现货参考价 -->
     <div class="spotmarket_price" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
+        <mtp-table-filter></mtp-table-filter>
         <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
             <!-- 额外的展开行 -->
             <template #expandedRowRender="{ record }">
                 <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
             </template>
-            <template #contracttype="{ text }">
-                <a>{{ getPlanContractType(text) }}</a>
-            </template>
-            <template #hedgeplanstatus="{ text }">
-                <a>{{ getPlanStatusName(text) }}</a>
-            </template>
         </a-table>
         <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
         <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
     </div>
 </template>
 
 <script lang="ts">
 import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { Ermcp3SpotGoodsPrice } from '@/services/go/ermcp/qhj/interface';
 import { querySpotGoodsPrice } from '@/services/go/ermcp/qhj';
 import { getTableButton } from '@/common/setup/table/button';
+import { columns } from './setup';
+import MtpTableFilter from '../../components/filter/index.vue';
 
 export default defineComponent({
     name: 'spotmarket_price',
     components: {
         contextMenu,
+        MtpTableFilter,
         MtpTableButton,
-        Filter,
         detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
     },
     setup() {
+        // 权限按钮
+        const buttons = getTableButton();
+
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<Ermcp3SpotGoodsPrice>();
 
@@ -44,23 +44,19 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
-            menuType: EnumRouterName.plan_running,
+            menuType: EnumRouterName.goods_info,
             tableName: 'table_pcweb_hedging_plan',
             tableFilterKey: ['contracttype', 'hedgeplanno', 'deliverygoodsname'],
             isDetail: true,
         };
 
-        // 权限按钮
-        const buttons = getTableButton(['detail']);
-
         return {
-            ...handleComposeTable<Ermcp3HedgePlan>(param),
+            ...handleComposeTable<Ermcp3SpotGoodsPrice>(param),
             loading,
             tableList,
-            getPlanStatusName,
-            getPlanContractType,
             queryTable,
             buttons,
+            columns,
         };
     },
 });

src/views/business/spotmarket/list/price/setup.ts

@@ -0,0 +1,39 @@
+import { Ermcp3SpotGoodsPrice } from '@/services/go/ermcp/qhj/interface';
+import { ColumnType } from '@/common/methods/table';
+
+/**
+ * 表头对应字段
+ */
+export const columns: ColumnType[] = [
+    {
+        title: '现货品种',
+        dataIndex: 'deliverygoodsname',
+        key: 'deliverygoodsname',
+        align: 'center',
+        width: 120,
+    },
+    {
+        title: '商品',
+        dataIndex: 'wrstandardname',
+        key: 'wrstandardname',
+        align: 'center',
+        width: 120,
+    },
+    {
+        title: '品牌',
+        dataIndex: 'brandname',
+        key: 'brandname',
+        align: 'center',
+        width: 120,
+    },
+    {
+        title: '价格',
+        dataIndex: 'spotgoodsprice',
+        key: 'spotgoodsprice',
+        align: 'center',
+        width: 120,
+        customRender: ({ text, record }: { text: Number, record: Ermcp3SpotGoodsPrice }) => {
+            return `${text + record.currencyname}/${record.gbenumdicname}`;
+        }
+    },
+];

src/views/information/account_info/compoments/add-child-futures/index.vue

@@ -65,7 +65,7 @@ import { hedgeOutMainReq } from '@/services/proto/accountinfo';
 import { ErmcpLoginUserEx, ErmcpTaAccountEx } from '@/services/go/ermcp/account/interface';
 import { handlerManagerList } from '@/common/setup/user';
 import { geLoginID_number } from '@/services/bus/login';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import AddTrader from '../add-traders/index.vue';
 import { ErmcpTradeConfigTMP } from '@/services/go/ermcp/business-review/interface';
 import { isPingAnOem } from '@/common/config/projectName';

src/views/information/account_info/compoments/add-futures/index.vue

@@ -53,7 +53,7 @@ import { handleAddOrModifyFuturesForm } from '../setup';
 import { AddFuturesFormState } from '../interface';
 import { geLoginID_number } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({

src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -50,7 +50,7 @@ import { QueryAccMgrRoleMenu } from '@/services/go/ermcp/account';
 import { message } from 'ant-design-vue';
 import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getAoletype_string, getAreaUserId, getUserAccountType } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { isPingAnOem } from '@/common/config/projectName';

src/views/information/account_info/compoments/add-traders/index.vue

@@ -26,7 +26,7 @@ import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { validateAction } from '@/common/setup/form';
 import { handleTradeForm } from '../setup';
 import { TraderFormState } from '../interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 
 export default defineComponent({
     name: 'account_info_trade_btn_add',

src/views/information/account_info/compoments/credit-futures/index.vue

@@ -48,7 +48,7 @@ import { LoginaccountOperateReq, TaaccountTransfersxmoneyReq } from '@/services/
 import { loginAccountOperate, taAccountTransfersXMoneyReq } from '@/services/proto/accountinfo';
 import { geLoginID_number } from '@/services/bus/login';
 import { QueryAccMgrTaAccountInfo } from '@/services/go/ermcp/account';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 
 export default defineComponent({
     name: 'account_info_futures_btn_child_credit',

src/views/information/account_info/compoments/managers-permission-delete/index.vue

@@ -49,7 +49,7 @@ import { QueryAccMgrRoleMenu } from '@/services/go/ermcp/account';
 import { message } from 'ant-design-vue';
 import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getAreaUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 

src/views/information/account_info/compoments/managers-permission-detail/index.vue

@@ -48,7 +48,7 @@ import { QueryAccMgrRoleMenu } from '@/services/go/ermcp/account';
 import { message } from 'ant-design-vue';
 import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getAreaUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 

src/views/information/account_info/compoments/managers-permission-modify/index.vue

@@ -49,7 +49,7 @@ import { QueryAccMgrRoleMenu } from '@/services/go/ermcp/account';
 import { message } from 'ant-design-vue';
 import { roleOperate } from '@/services/proto/accountinfo';
 import { ManagerRoleOperateReq, MemberFuncMenu } from '@/services/proto/accountinfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getAreaUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 

src/views/information/account_info/compoments/modify-business/index.vue

@@ -1,73 +1,44 @@
 <template>
-  <!-- 修改登录账户 -->
-  <a-modal class="commonModal add-business-info"
-           title="修改账户"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           :maskClosable="false"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="账户角色"
-                       name="roleids">
-            <span v-if="isPingAnOem()"
-                  class="dialogSpan">业务员</span>
-            <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="formState.roleids"
-                              v-else>
-              <a-row>
+    <!-- 修改登录账户 -->
+    <a-modal class="commonModal add-business-info" title="修改账户" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false" width="890px">
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
                 <a-col :span="12">
-                  <a-checkbox :value="22">业务员</a-checkbox>
+                    <a-form-item label="账户角色" name="roleids">
+                        <span v-if="isPingAnOem()" class="dialogSpan">业务员</span>
+                        <a-checkbox-group class="commonCheckboxGroup" v-model:value="formState.roleids" v-else>
+                            <a-row>
+                                <a-col :span="12">
+                                    <a-checkbox :value="22">业务员</a-checkbox>
+                                </a-col>
+                                <a-col :span="12">
+                                    <a-checkbox :value="23">跟单员</a-checkbox>
+                                </a-col>
+                            </a-row>
+                        </a-checkbox-group>
+                    </a-form-item>
                 </a-col>
                 <a-col :span="12">
-                  <a-checkbox :value="23">跟单员</a-checkbox>
+                    <a-form-item label="账户名称" name="loginname">
+                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.loginname" placeholder="请输入账户名称" />
+                    </a-form-item>
                 </a-col>
-              </a-row>
-            </a-checkbox-group>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="账户名称"
-                       name="loginname">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.loginname"
-                     placeholder="请输入账户名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="登录账号"
-                       name="logincode">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     readonly
-                     v-model:value="formState.logincode"
-                     placeholder="请输入登录账号" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="手机号码"
-                       name="mobile">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.mobile"
-                     placeholder="请输入手机号码" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+                <a-col :span="12">
+                    <a-form-item label="登录账号" name="logincode">
+                        <a-input class="dialogInput" style="width: 200px" readonly v-model:value="formState.logincode" placeholder="请输入登录账号" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="手机号码" name="mobile">
+                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobile" placeholder="请输入手机号码" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -78,7 +49,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { isPingAnOem } from '@/common/config/projectName';

src/views/information/account_info/compoments/modify-futures-son/index.vue

@@ -52,7 +52,7 @@ import { validateAction } from '@/common/setup/form';
 import { FormState } from '@/views/information/account_info/compoments/add-child-futures/interface';
 import { HedgeOutMainConfigReq } from '@/services/proto/accountinfo/interface';
 import { geLoginID_number } from '@/services/bus/login';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgeOutMainReq } from '@/services/proto/accountinfo';
 import { handleBusinessForm } from '../add-child-futures/setup';

src/views/information/account_info/compoments/modify-futures/index.vue

@@ -51,7 +51,7 @@ import { validateAction } from '@/common/setup/form';
 import { AddFuturesFormState } from '../interface';
 import { hedgeOutMainReq } from '@/services/proto/accountinfo';
 import { mergeTwoObj } from '@/utils/objHandle';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { HedgeOutMainConfigReq } from '@/services/proto/accountinfo/interface';
 import { isPingAnOem } from '@/common/config/projectName';

src/views/information/account_info/compoments/modify-managers/index.vue

@@ -56,7 +56,7 @@ import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { getUID } from 'echarts/types/src/util/component';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { useTaAccount } from '../../list/setup';
 
 export default defineComponent({

src/views/information/custom/compoments/add/index.vue

@@ -1,334 +1,190 @@
 <template>
-  <!-- 平安客户资料 -->
-  <a-modal class="add-custom"
-           title="新增客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           :maskClosable="false"
-           v-if="isPingAnOem()"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(1)">完成 </a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型"
-                       name="userinfotype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.userinfotype"
-                      placeholder="请选择客户类型">
-              <a-select-option value="1"> 个人 </a-select-option>
-              <a-select-option value="2"> 企业 </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <template v-if="!isPersonal()">
-          <a-col :span="12">
-            <a-form-item label="企业名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入企业名称" />
-            </a-form-item>
-          </a-col>
+    <!-- 平安客户资料 -->
+    <a-modal class="add-custom" title="新增客户资料" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false" v-if="isPingAnOem()" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">完成 </a-button>
         </template>
-        <template v-else>
-          <a-col :span="12">
-            <a-form-item label="姓名"
-                         name="username">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.username"
-                       placeholder="请输入姓名" />
-            </a-form-item>
-          </a-col>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="客户类型" name="userinfotype">
+                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.userinfotype" placeholder="请选择客户类型">
+                            <a-select-option value="1"> 个人 </a-select-option>
+                            <a-select-option value="2"> 企业 </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <template v-if="!isPersonal()">
+                    <a-col :span="12">
+                        <a-form-item label="企业名称" name="customername">
+                            <a-input class="dialogInput" v-model:value="formState.customername" style="width: 200px" placeholder="请输入企业名称" />
+                        </a-form-item>
+                    </a-col>
+                </template>
+                <template v-else>
+                    <a-col :span="12">
+                        <a-form-item label="姓名" name="username">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.username" placeholder="请输入姓名" />
+                        </a-form-item>
+                    </a-col>
+                </template>
+                <a-col :span="12">
+                    <a-form-item label="点价联系人" name="contactname">
+                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.contactname" placeholder="请输入联系人" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="联系人手机号" name="mobilephone">
+                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入联系人手机号" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
+    <!-- 其他项目客户资料 -->
+    <a-modal class="add-custom" v-else title="新增客户资料" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交审核 </a-button>
         </template>
-        <a-col :span="12">
-          <a-form-item label="点价联系人"
-                       name="contactname">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.contactname"
-                     placeholder="请输入联系人" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="联系人手机号"
-                       name="mobilephone">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.mobilephone"
-                     placeholder="请输入联系人手机号" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
-  <!-- 其他项目客户资料 -->
-  <a-modal class="add-custom"
-           v-else
-           title="新增客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           :maskClosable="false"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(1)">保存草稿 </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(2)">提交审核 </a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型"
-                       name="userinfotype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.userinfotype"
-                      placeholder="请选择客户类型">
-              <a-select-option value="1"> 个人 </a-select-option>
-              <a-select-option value="2"> 企业 </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <template v-if="!isPersonal()">
-          <a-col :span="12">
-            <a-form-item label="企业名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入企业名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="企业简称"
-                         name="nickname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.nickname"
-                       placeholder="请输入企业简称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件类型"
-                         name="cardtype">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.cardtype"
-                        style="width: 200px"
-                        placeholder="请选择证件类型">
-                <a-select-option :value="item.enumitemname"
-                                 v-for="item in cardTypeList"
-                                 :key="item.autoid">
-                  {{ item.enumdicname }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="法定代表人"
-                         name="legalpersonname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.legalpersonname"
-                       placeholder="请输入法定代表人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入证件号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="纳税人识别号"
-                         name="taxpayernum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.taxpayernum"
-                       placeholder="请输入纳税人识别号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="营业执照">
-              <UploadImg :visible="visible"
-                         @upload="attachmentUpLoad" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人"
-                         name="contactname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.contactname"
-                       placeholder="请输入联系人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人手机号"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入联系人手机号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
-        </template>
-        <template v-else>
-          <a-col :span="12">
-            <a-form-item label="姓名"
-                         name="username">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.username"
-                       placeholder="请输入姓名" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入身份证号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="手机号码"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证正面照"
-                         name="cardbackphotourl">
-              <UploadImg :visible="visible"
-                         @upload="cardfrontphotourlUpLoad" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="邮箱"
-                         name="email">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.email"
-                       placeholder="请输入邮箱" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="身份证反面照"
-                         name="cardfrontphotourl">
-              <UploadImg :visible="visible"
-                         @upload="cardbackphotourlUpLoad" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item> &nbsp; </a-form-item>
-          </a-col>
-        </template>
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <a-select class="inlineFormSelect"
-                      style="width: 205px"
-                      v-model:value="formState.provinceid"
-                      @change="getCityList"
-                      placeholder="请选择省">
-              <a-select-option v-for="item in provinceList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      style="width: 205px"
-                      v-model:value="formState.cityid"
-                      @change="getDistrictList"
-                      placeholder="请选择市">
-              <a-select-option v-for="item in cityList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      v-model:value="formState.districtid"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option v-for="item in districtList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="&nbsp;"
-                       name="cardaddress">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.cardaddress"
-                     placeholder="请输入详细地址" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="备注"
-                       name="remark">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.remark"
-                     placeholder="请输入备注" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="客户类型" name="userinfotype">
+                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.userinfotype" placeholder="请选择客户类型">
+                            <a-select-option value="1"> 个人 </a-select-option>
+                            <a-select-option value="2"> 企业 </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <template v-if="!isPersonal()">
+                    <a-col :span="12">
+                        <a-form-item label="企业名称" name="customername">
+                            <a-input class="dialogInput" v-model:value="formState.customername" style="width: 200px" placeholder="请输入企业名称" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="企业简称" name="nickname">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.nickname" placeholder="请输入企业简称" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="证件类型" name="cardtype">
+                            <a-select class="inlineFormSelect" v-model:value="formState.cardtype" style="width: 200px" placeholder="请选择证件类型">
+                                <a-select-option :value="item.enumitemname" v-for="item in cardTypeList" :key="item.autoid">
+                                    {{ item.enumdicname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="法定代表人" name="legalpersonname">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.legalpersonname" placeholder="请输入法定代表人" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="证件号码" name="cardnum">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入证件号码" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="纳税人识别号" name="taxpayernum">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.taxpayernum" placeholder="请输入纳税人识别号" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="营业执照">
+                            <UploadImg :visible="visible" @upload="attachmentUpLoad" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系人" name="contactname">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.contactname" placeholder="请输入联系人" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系人手机号" name="mobilephone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入联系人手机号" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系电话" name="telphone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
+                        </a-form-item>
+                    </a-col>
+                </template>
+                <template v-else>
+                    <a-col :span="12">
+                        <a-form-item label="姓名" name="username">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.username" placeholder="请输入姓名" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="身份证号码" name="cardnum">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入身份证号码" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="手机号码" name="mobilephone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入手机号码" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="身份证正面照" name="cardbackphotourl">
+                            <UploadImg :visible="visible" @upload="cardfrontphotourlUpLoad" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="邮箱" name="email">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.email" placeholder="请输入邮箱" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="身份证反面照" name="cardfrontphotourl">
+                            <UploadImg :visible="visible" @upload="cardbackphotourlUpLoad" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系电话" name="telphone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item> &nbsp; </a-form-item>
+                    </a-col>
+                </template>
+                <a-col :span="24">
+                    <a-form-item label="通讯地址">
+                        <a-select class="inlineFormSelect" style="width: 205px" v-model:value="formState.provinceid" @change="getCityList" placeholder="请选择省">
+                            <a-select-option v-for="item in provinceList" :key="item.autoid" :value="item.autoid">
+                                {{ item.divisionname }}
+                            </a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect ml9" style="width: 205px" v-model:value="formState.cityid" @change="getDistrictList" placeholder="请选择市">
+                            <a-select-option v-for="item in cityList" :key="item.autoid" :value="item.autoid">
+                                {{ item.divisionname }}
+                            </a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect ml9" v-model:value="formState.districtid" style="width: 205px" placeholder="请选择县(区)">
+                            <a-select-option v-for="item in districtList" :key="item.autoid" :value="item.autoid">
+                                {{ item.divisionname }}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="&nbsp;" name="cardaddress">
+                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.cardaddress" placeholder="请输入详细地址" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="备注" name="remark">
+                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.remark" placeholder="请输入备注" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -338,7 +194,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { getUploadImg } from '@/common/setup/upload';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getAddress } from '@/services/go/adress';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { addCustomerInfoOperate } from '@/services/proto/accountinfo';

src/views/information/custom/compoments/check/index.vue

@@ -1,34 +1,19 @@
 <template>
-  <!-- 审核客户资料-->
-  <a-modal class="commonModal custom_info_btn_check"
-           title="审核客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消 </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">审核通过 </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="refuseSubmit">审核拒绝 </a-button>
-    </template>
-    <Detail :selectedRow="selectedRow" />
-  </a-modal>
+    <!-- 审核客户资料-->
+    <a-modal class="commonModal custom_info_btn_check" title="审核客户资料" v-model:visible="visible" @cancel="cancel" centered width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">审核通过 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="refuseSubmit">审核拒绝 </a-button>
+        </template>
+        <Detail :selectedRow="selectedRow" />
+    </a-modal>
 </template>
 
 <script lang="ts">
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { auditWskhUserInfo } from '@/services/proto/accountinfo';
 import { AuditWskhUserInfoReq } from '@/services/proto/accountinfo/interface';

src/views/information/custom/compoments/modify/index.vue

@@ -1,253 +1,140 @@
 <template>
-  <!-- 修改客户资料 -->
-  <a-modal class="commonModal modify-custom"
-           title="修改客户资料"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(1)">保存草稿</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(2)">提交修改</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型"
-                       name="userinfotype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.userinfotype"
-                      placeholder="请选择客户类型">
-              <a-select-option value="1">个人</a-select-option>
-              <a-select-option value="2">企业</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <template v-if="!isPersonal()">
-          <a-col :span="12">
-            <a-form-item label="企业名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入企业名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="企业简称"
-                         name="nickname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.nickname"
-                       placeholder="请输入企业简称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件类型"
-                         name="cardtype">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.cardtype"
-                        style="width: 200px"
-                        placeholder="请选择证件类型">
-                <a-select-option :value="item.enumitemname"
-                                 v-for="item in cardTypeList"
-                                 :key="item.autoid">{{ item.enumdicname }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="法定代表人"
-                         name="legalpersonname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.legalpersonname"
-                       placeholder="请输入法定代表人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入证件号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="纳税人识别号"
-                         name="taxpayernum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.taxpayernum"
-                       placeholder="请输入纳税人识别号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="营业执照">
-              <UploadImg :visible="visible"
-                         :imgList="attachmentImgList"
-                         @upload="attachmentUpload" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人"
-                         name="contactname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.contactname"
-                       placeholder="请输入联系人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人手机号"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入联系人手机号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
+    <!-- 修改客户资料 -->
+    <a-modal class="commonModal modify-custom" title="修改客户资料" v-if="visible" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿</a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交修改</a-button>
         </template>
-        <template v-else>
-          <a-col :span="12">
-            <a-form-item label="姓名"
-                         name="username">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.username"
-                       placeholder="请输入姓名" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入身份证号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="手机号码"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证正面照"
-                         name="cardbackphotourl">
-              <UploadImg :visible="visible"
-                         :imgList="cardfrontImgList"
-                         @upload="cardfrontUpload" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="邮箱"
-                         name="email">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.email"
-                       placeholder="请输入邮箱" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="身份证反面照"
-                         name="cardfrontphotourl">
-              <UploadImg :visible="visible"
-                         :imgList="cardbackImgList"
-                         @upload="cardbackUpload" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item>&nbsp;</a-form-item>
-          </a-col>
-        </template>
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <a-select class="inlineFormSelect"
-                      style="width: 205px"
-                      v-model:value="formState.provinceid"
-                      @change="getCityList"
-                      placeholder="请选择省">
-              <a-select-option v-for="item in provinceList"
-                               :key="item.autoid"
-                               :value="item.autoid">{{ item.divisionname }}</a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      style="width: 205px"
-                      v-model:value="formState.cityid"
-                      @change="getDistrictList"
-                      placeholder="请选择市">
-              <a-select-option v-for="item in cityList"
-                               :key="item.autoid"
-                               :value="item.autoid">{{ item.divisionname }}</a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      v-model:value="formState.districtid"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option v-for="item in districtList"
-                               :key="item.autoid"
-                               :value="item.autoid">{{ item.divisionname }}</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="&nbsp;"
-                       name="cardaddress">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.cardaddress"
-                     placeholder="请输入详细地址" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="备注"
-                       name="remark">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.remark"
-                     placeholder="请输入备注" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="客户类型" name="userinfotype">
+                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.userinfotype" placeholder="请选择客户类型">
+                            <a-select-option value="1">个人</a-select-option>
+                            <a-select-option value="2">企业</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <template v-if="!isPersonal()">
+                    <a-col :span="12">
+                        <a-form-item label="企业名称" name="customername">
+                            <a-input class="dialogInput" v-model:value="formState.customername" style="width: 200px" placeholder="请输入企业名称" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="企业简称" name="nickname">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.nickname" placeholder="请输入企业简称" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="证件类型" name="cardtype">
+                            <a-select class="inlineFormSelect" v-model:value="formState.cardtype" style="width: 200px" placeholder="请选择证件类型">
+                                <a-select-option :value="item.enumitemname" v-for="item in cardTypeList" :key="item.autoid">{{ item.enumdicname }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="法定代表人" name="legalpersonname">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.legalpersonname" placeholder="请输入法定代表人" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="证件号码" name="cardnum">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入证件号码" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="纳税人识别号" name="taxpayernum">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.taxpayernum" placeholder="请输入纳税人识别号" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="营业执照">
+                            <UploadImg :visible="visible" :imgList="attachmentImgList" @upload="attachmentUpload" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系人" name="contactname">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.contactname" placeholder="请输入联系人" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系人手机号" name="mobilephone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入联系人手机号" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系电话" name="telphone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
+                        </a-form-item>
+                    </a-col>
+                </template>
+                <template v-else>
+                    <a-col :span="12">
+                        <a-form-item label="姓名" name="username">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.username" placeholder="请输入姓名" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="身份证号码" name="cardnum">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入身份证号码" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="手机号码" name="mobilephone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入手机号码" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="身份证正面照" name="cardbackphotourl">
+                            <UploadImg :visible="visible" :imgList="cardfrontImgList" @upload="cardfrontUpload" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="邮箱" name="email">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.email" placeholder="请输入邮箱" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="身份证反面照" name="cardfrontphotourl">
+                            <UploadImg :visible="visible" :imgList="cardbackImgList" @upload="cardbackUpload" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系电话" name="telphone">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item>&nbsp;</a-form-item>
+                    </a-col>
+                </template>
+                <a-col :span="24">
+                    <a-form-item label="通讯地址">
+                        <a-select class="inlineFormSelect" style="width: 205px" v-model:value="formState.provinceid" @change="getCityList" placeholder="请选择省">
+                            <a-select-option v-for="item in provinceList" :key="item.autoid" :value="item.autoid">{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect ml9" style="width: 205px" v-model:value="formState.cityid" @change="getDistrictList" placeholder="请选择市">
+                            <a-select-option v-for="item in cityList" :key="item.autoid" :value="item.autoid">{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect ml9" v-model:value="formState.districtid" style="width: 205px" placeholder="请选择县(区)">
+                            <a-select-option v-for="item in districtList" :key="item.autoid" :value="item.autoid">{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="&nbsp;" name="cardaddress">
+                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.cardaddress" placeholder="请输入详细地址" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="备注" name="remark">
+                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.remark" placeholder="请输入备注" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -256,7 +143,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { getUploadImg } from '@/common/setup/upload';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getAddress } from '@/services/go/adress';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';

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

@@ -1,432 +1,248 @@
 <template>
-  <!-- 新增现货合同 -->
-  <a-modal class="commonModal add-spot-contract"
-           title="新增现货合同"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="closeAction"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(1)">保存草稿</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit(2)">提交审核</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号"
-                         name="ContractNo">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.ContractNo"
-                       placeholder="请输入合同编号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合同类型"
-                         name="ContractType">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        @change="contractChange"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        v-model:value="formState.ContractType"
-                        placeholder="请选择合同类型">
-                <a-select-option v-for="item in contractType"
-                                 :key="item.key"
-                                 :value="item.key">
-                  {{item.value}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务类型"
-                         name="BizType">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        v-model:value="formState.BizType"
-                        placeholder="请选择业务类型">
-                <a-select-option v-for="item in businessType"
-                                 :key="item.key"
-                                 :value="item.key">
-                  {{item.value}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="isSell">
-            <a-col :span="12">
-              <a-form-item label="采购方"
-                           name="BuyUserID">
-                <a-select class="inlineFormSelect"
-                          style="width: 200px"
-                          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                          v-model:value="formState.BuyUserID"
-                          placeholder="请选择客户">
-                  <!-- 客户资料列表 正常 -->
-                  <a-select-option :value="item.userid"
-                                   v-for="item in customList"
-                                   :key="item.userid">
-                    {{item.customername}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="销售方">
-                <span class="white">{{getRootUserInfo().accountname}}</span>
-              </a-form-item>
-            </a-col>
-          </template>
-          <template v-else>
-            <a-col :span="12">
-              <a-form-item label="采购方">
-                <span class="white">{{getRootUserInfo().accountname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="销售方"
-                           name="SellUserID">
-                <a-select class="inlineFormSelect"
-                          v-model:value="formState.SellUserID"
-                          style="width: 200px"
-                          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                          placeholder="请选择客户">
-                  <!-- 客户资料列表 正常 -->
-                  <a-select-option :value="item.userid"
-                                   v-for="item in customList"
-                                   :key="item.userid">
-                    {{item.customername}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :span="12">
-            <a-form-item label="合同附件"
-                         class="checkboxGroupItem"
-                         name="ContractAttachment">
-              <UploadImg :visible="visible"
-                         @upload="uploadImgAction" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>现货信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="现货品种"
-                         name="DeliveryGoodsID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        @change="deliveryGoodsChange"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        v-model:value="formState.DeliveryGoodsID"
-                        placeholder="请选择现货品种">
-                <a-select-option v-for="item in deliveryGoodsList"
-                                 :key="item.deliverygoodsid"
-                                 :value="item.deliverygoodsid">
-                  {{item.deliverygoodsname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="商品"
-                         name="WrStandardID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        @change="WrStandardChange"
-                        v-model:value="formState.WrStandardID"
-                        placeholder="请选择商品">
-                <a-select-option v-for="item in gmlist"
-                                 :key="item.wrstandardid"
-                                 :value="item.wrstandardid">
-                  {{item.wrstandardname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="品牌"
-                         name="SpotGoodsBrandID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        v-model:value="formState.SpotGoodsBrandID"
-                        placeholder="请选择品牌">
-                <a-select-option v-for="item in gblist"
-                                 :key="item.brandid"
-                                 :value="item.brandid">
-                  {{item.brandname}}
-                </a-select-option>
-              </a-select>
-            </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>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>价格信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="定价类型"
-                         name="PriceType">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        v-model:value="formState.PriceType"
-                        placeholder="请选择定价类型">
-                <a-select-option v-for="item in priceType"
-                                 :key="item.key"
-                                 :value="item.key">
-                  {{item.value}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="结算币种"
-                         name="CurrencyID">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.CurrencyID"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        placeholder="请选择结算币种">
-                <a-select-option v-for="item in payCurrency"
-                                 :key="item.enumitemname"
-                                 :value="item.enumitemname">
-                  {{item.enumdicname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="数量"
-                         name="Qty">
-              <a-input class="dialogInput suffixGrey"
-                       v-model:value="formState.Qty"
-                       style="width: 200px"
-                       @change="getAmout"
-                       placeholder="请输入数量"
-                       :suffix="numberUnit" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12"
-                 v-if="formState.PriceType === 3">
-            <a-form-item label="暂定价">
-              <a-input class="dialogInput suffixGrey"
-                       style="width: 200px"
-                       :suffix="payCurrencyUnit"
-                       placeholder="请输入暂定价" />
-            </a-form-item>
-          </a-col>
-          <!-- 以下是点价的价格信息 start -->
-          <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
-            <a-col :span="12">
-              <a-form-item label="点价合约"
-                           name="GoodsID">
-                <a-select class="inlineFormSelect"
-                          v-model:value="formState.GoodsID"
-                          style="width: 200px"
-                          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                          placeholder="请选择点价合约">
-                  <a-select-option v-for="item in goodsList"
-                                   :key="item.goodsid"
-                                   :value="item.goodsid">
-                    {{item.goodsname}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="升贴水"
-                           name="PriceMove">
-                <a-input-number class="dialogInput suffixGrey"
-                                v-model:value="formState.PriceMove"
-                                placeholder="请输入升贴水"
-                                :min="0"
-                                :suffix="`${payCurrencyUnit}/${numberUnit}`"
-                                style="width: 200px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="点价期">
-                <a-range-picker v-model:value="priceDate"
-                                class="commonPicker"
-                                :disabled-date="disabledDate"
-                                style="width: 200px"
-                                :show-time="{hideDisabledOptions: true}"
-                                format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="交收期">
-                <a-range-picker v-model:value="deliveryDate"
-                                class="commonPicker"
-                                style="width: 200px"
-                                :disabled-date="disabledDate"
-                                :show-time="{hideDisabledOptions: true}"
-                                format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-          </template>
-          <!-- 以上是点价的价格信息 end -->
-          <template v-if="formState.PriceType === 1">
-            <a-col :span="12">
-              <a-form-item label="价格"
-                           name="Price">
-                <a-input class="dialogInput suffixGrey"
-                         v-model:value="formState.Price"
-                         @change="getAmout"
-                         placeholder="请输入价格"
-                         :suffix="`${payCurrencyUnit}/${numberUnit}`"
-                         style="width: 200px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="金额"
-                           class="relative"
-                           name="Amount">
-                <a-input class="dialogInput suffixGrey"
-                         v-model:value="formState.Amount"
-                         readonly
-                         placeholder="输入数量和价格后自动算"
-                         :suffix="payCurrencyUnit"
-                         style="width: 200px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="交收期">
-                <a-range-picker v-model:value="deliveryDate"
-                                style="width: 200px"
-                                class="commonPicker"
-                                :disabled-date="disabledDate"
-                                :show-time="{hideDisabledOptions: true}"
-                                format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>其他信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="保证金"
-                         name="ContractMargin">
-              <a-input class="dialogInput suffixGrey"
-                       placeholder="请输入保证金"
-                       v-model:value="formState.ContractMargin"
-                       style="width: 200px"
-                       :suffix="payCurrencyUnit" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务员"
-                         name="SaleUserID">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.SaleUserID"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        placeholder="请选择业务员">
-                <a-select-option v-for="item in businesserList"
-                                 :key="item.userid"
-                                 :value="item.userid">
-                  {{item.accountname}}-{{item.logincode}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="跟单员"
-                         name="MerUserID">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.MerUserID"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        placeholder="请选择跟单员">
-                <a-select-option v-for="item in merchandiserList"
-                                 :key="item.userid"
-                                 :value="item.userid">
-                  {{item.accountname}}-{{item.logincode}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="交易用户"
-                         name="TradeUserID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                        v-model:value="formState.TradeUserID"
-                        placeholder="请选择交易用户">
-                <a-select-option v-for="item in traderList"
-                                 :key="item.roleid"
-                                 :value="item.roleid">
-                  {{item.rolename}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="Remark">
-              <a-input class="dialogInput"
-                       style="width: 608px"
-                       v-model:value="formState.Remark"
-                       placeholder="请输入备注" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+    <!-- 新增现货合同 -->
+    <a-modal class="commonModal add-spot-contract" title="新增现货合同" v-model:visible="visible" centered :maskClosable="false" @cancel="closeAction" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿</a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交审核</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <fieldset class="formFieldSet">
+                <legend>基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号" name="ContractNo">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入合同编号" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="合同类型" name="ContractType">
+                            <a-select class="inlineFormSelect" style="width: 200px" @change="contractChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.ContractType" placeholder="请选择合同类型">
+                                <a-select-option v-for="item in contractType" :key="item.key" :value="item.key">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="业务类型" name="BizType">
+                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BizType" placeholder="请选择业务类型">
+                                <a-select-option v-for="item in businessType" :key="item.key" :value="item.key">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="isSell">
+                        <a-col :span="12">
+                            <a-form-item label="采购方" name="BuyUserID">
+                                <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BuyUserID" placeholder="请选择客户">
+                                    <!-- 客户资料列表 正常 -->
+                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                                        {{ item.customername }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="销售方">
+                                <span class="white">{{ getRootUserInfo().accountname }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <template v-else>
+                        <a-col :span="12">
+                            <a-form-item label="采购方">
+                                <span class="white">{{ getRootUserInfo().accountname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="销售方" name="SellUserID">
+                                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择客户">
+                                    <!-- 客户资料列表 正常 -->
+                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                                        {{ item.customername }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :span="12">
+                        <a-form-item label="合同附件" class="checkboxGroupItem" name="ContractAttachment">
+                            <UploadImg :visible="visible" @upload="uploadImgAction" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>现货信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="现货品种" name="DeliveryGoodsID">
+                            <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
+                                <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
+                                    {{ item.deliverygoodsname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="商品" name="WrStandardID">
+                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
+                                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                                    {{ item.wrstandardname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="品牌" name="SpotGoodsBrandID">
+                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
+                                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                                    {{ item.brandname }}
+                                </a-select-option>
+                            </a-select>
+                        </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>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>价格信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="定价类型" name="PriceType">
+                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.PriceType" placeholder="请选择定价类型">
+                                <a-select-option v-for="item in priceType" :key="item.key" :value="item.key">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="结算币种" name="CurrencyID">
+                            <a-select class="inlineFormSelect" v-model:value="formState.CurrencyID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择结算币种">
+                                <a-select-option v-for="item in payCurrency" :key="item.enumitemname" :value="item.enumitemname">
+                                    {{ item.enumdicname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="数量" name="Qty">
+                            <a-input class="dialogInput suffixGrey" v-model:value="formState.Qty" style="width: 200px" @change="getAmout" placeholder="请输入数量" :suffix="numberUnit" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12" v-if="formState.PriceType === 3">
+                        <a-form-item label="暂定价">
+                            <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
+                        </a-form-item>
+                    </a-col>
+                    <!-- 以下是点价的价格信息 start -->
+                    <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
+                        <a-col :span="12">
+                            <a-form-item label="点价合约" name="GoodsID">
+                                <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择点价合约">
+                                    <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
+                                        {{ item.goodsname }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="升贴水" name="PriceMove">
+                                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="点价期">
+                                <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="交收期">
+                                <a-range-picker v-model:value="deliveryDate" class="commonPicker" style="width: 200px" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <!-- 以上是点价的价格信息 end -->
+                    <template v-if="formState.PriceType === 1">
+                        <a-col :span="12">
+                            <a-form-item label="价格" name="Price">
+                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Price" @change="getAmout" placeholder="请输入价格" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="金额" class="relative" name="Amount">
+                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Amount" readonly placeholder="输入数量和价格后自动算" :suffix="payCurrencyUnit" style="width: 200px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="交收期">
+                                <a-range-picker v-model:value="deliveryDate" style="width: 200px" class="commonPicker" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>其他信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="保证金" name="ContractMargin">
+                            <a-input class="dialogInput suffixGrey" placeholder="请输入保证金" v-model:value="formState.ContractMargin" style="width: 200px" :suffix="payCurrencyUnit" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="业务员" name="SaleUserID">
+                            <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择业务员">
+                                <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="跟单员" name="MerUserID">
+                            <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择跟单员">
+                                <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="交易用户" name="TradeUserID">
+                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.TradeUserID" placeholder="请选择交易用户">
+                                <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
+                                    {{ item.rolename }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="Remark">
+                            <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入备注" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { addContractReq } from './setup';
-import {getAreaUserName, getRootUserInfo, getUserName, getUsrId} from '@/services/bus/user';
+import { getAreaUserName, getRootUserInfo, getUserName, getUserId } from '@/services/bus/user';
 import { getGoodsList } from '@/services/bus/goods';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { FormState } from '../interface';
@@ -492,7 +308,7 @@ export default defineComponent({
         });
         function submit(OperateType: 1 | 2) {
             validateAction<FormState>(formRef, formState).then((param) => {
-                const id = getUsrId();
+                const id = getUserId();
                 isSell.value ? (param.SellUserID = id) : (param.BuyUserID = id);
                 const fn = (value: Moment) => {
                     return formatTime(value, 'd') + ' ' + '00:00:00';

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

@@ -1,116 +1,70 @@
 <template>
-  <!-- 现货合同审核-->
-  <a-modal class="add-custom custom-detail"
-           title="现货合同审核"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="refuse">审核拒绝</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">审核通过</a-button>
-    </template>
-    <Detail :selectedRow="selectedRow">
-      <a-form ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <fieldset class="formFieldSet formFieldSet_form">
-          <legend>其他信息</legend>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="保证金">
-                <span class="white">{{ formatValue(selectedRow.contractmargin) }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="业务员"
-                           name="SaleUserID">
-                <a-select class="inlineFormSelect"
-                          v-model:value="formState.SaleUserID"
-                          style="width: 200px"
-                          placeholder="请选择业务员">
-                  <a-select-option v-for="item in businesserList"
-                                   :key="item.userid"
-                                   :value="item.userid">
-                    {{item.accountname}}-{{item.logincode}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="跟单员"
-                           name="MerUserID">
-                <a-select class="inlineFormSelect"
-                          v-model:value="formState.MerUserID"
-                          style="width: 200px"
-                          placeholder="请选择跟单员">
-                  <a-select-option v-for="item in merchandiserList"
-                                   :key="item.userid"
-                                   :value="item.userid">
-                    {{item.accountname}}-{{item.logincode}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="交易用户"
-                           name="TradeUserID">
-                <a-select class="inlineFormSelect"
-                          style="width: 200px"
-                          v-model:value="formState.TradeUserID"
-                          placeholder="请选择交易用户">
-                  <a-select-option v-for="item in traderList"
-                                   :key="item.roleid"
-                                   :value="item.roleid">
-                    {{item.rolename}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="备注">
-                <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </fieldset>
-        <fieldset class="formFieldSet">
-          <legend>审核信息</legend>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="审核意见"
-                           name="Remark">
-                <a-input class="dialogInput"
-                         v-model:value="formState.Remark"
-                         style="width: 620px"
-                         placeholder="请输入审核意见" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </fieldset>
-      </a-form>
-    </Detail>
-    <a-modal :visible="previewVisible"
-             :footer="null"
-             @cancel="cancelImg">
-      <img alt="预览附件"
-           style="width: 100%"
-           :src="previewImage" />
+    <!-- 现货合同审核-->
+    <a-modal class="add-custom custom-detail" title="现货合同审核" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="refuse">审核拒绝</a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">审核通过</a-button>
+        </template>
+        <Detail :selectedRow="selectedRow">
+            <a-form ref="formRef" :model="formState" :rules="rules">
+                <fieldset class="formFieldSet formFieldSet_form">
+                    <legend>其他信息</legend>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="保证金">
+                                <span class="white">{{ formatValue(selectedRow.contractmargin) }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="业务员" name="SaleUserID">
+                                <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" placeholder="请选择业务员">
+                                    <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="跟单员" name="MerUserID">
+                                <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" placeholder="请选择跟单员">
+                                    <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="交易用户" name="TradeUserID">
+                                <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.TradeUserID" placeholder="请选择交易用户">
+                                    <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
+                                        {{ item.rolename }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="备注">
+                                <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </fieldset>
+                <fieldset class="formFieldSet">
+                    <legend>审核信息</legend>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="审核意见" name="Remark">
+                                <a-input class="dialogInput" v-model:value="formState.Remark" style="width: 620px" placeholder="请输入审核意见" />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </fieldset>
+            </a-form>
+        </Detail>
+        <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
+            <img alt="预览附件" style="width: 100%" :src="previewImage" />
+        </a-modal>
     </a-modal>
-  </a-modal>
 </template>
 
 <script lang="ts">
@@ -127,7 +81,7 @@ import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
 import { handlerManagerList } from '@/common/setup/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { orderContract } from '@/services/proto/spotcontract';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { handlePreviewImg } from '@/common/setup/upload';
 import Detail from '../common-detail/index.vue';
 import { _closeModal } from '@/common/setup/modal/modal';

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

@@ -1,420 +1,249 @@
 <template>
-  <!-- 重新提交现货合同-->
-  <a-modal class="commonModal modify-custom"
-           title="重新提交现货合同"
-           v-if="visible"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号"
-                         name="ContractNo">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.ContractNo"
-                       placeholder="请输入合同编号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合同类型"
-                         name="ContractType">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        @change="contractChange"
-                        v-model:value="formState.ContractType"
-                        placeholder="请选择合同类型">
-                <a-select-option v-for="item in contractType"
-                                 :key="item.key"
-                                 :value="item.key">
-                  {{item.value}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务类型"
-                         name="BizType">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        v-model:value="formState.BizType"
-                        placeholder="请选择业务类型">
-                <a-select-option v-for="item in businessType"
-                                 :key="item.key"
-                                 :value="item.key">
-                  {{item.value}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="isSell">
-            <a-col :span="12">
-              <a-form-item label="采购方"
-                           name="BuyUserID">
-                <a-select class="inlineFormSelect"
-                          style="width: 200px"
-                          v-model:value="formState.BuyUserID"
-                          placeholder="请选择客户">
-                  <!-- 客户资料列表 正常 -->
-                  <a-select-option :value="item.userid"
-                                   v-for="item in customList"
-                                   :key="item.userid">
-                    {{item.customername}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="销售方">
-                <span class="white">{{getUserName()}}</span>
-              </a-form-item>
-            </a-col>
-          </template>
-          <template v-else>
-            <a-col :span="12">
-              <a-form-item label="采购方">
-                <span class="white">{{getUserName()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="销售方"
-                           name="SellUserID">
-                <a-select class="inlineFormSelect"
-                          v-model:value="formState.SellUserID"
-                          style="width: 200px"
-                          placeholder="请选择客户">
-                  <!-- 客户资料列表 正常 -->
-                  <a-select-option :value="item.userid"
-                                   v-for="item in customList"
-                                   :key="item.userid">
-                    {{item.customername}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :span="12">
-            <a-form-item label="合同附件"
-                         name="ContractAttachment">
-              <UploadImg :visible="visible"
-                         :imgList="uploadImgList"
-                         @upload="uploadImgAction" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>现货信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="现货品种"
-                         name="DeliveryGoodsID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        @change="deliveryGoodsChange"
-                        v-model:value="formState.DeliveryGoodsID"
-                        placeholder="请选择现货品种">
-                <a-select-option v-for="item in deliveryGoodsList"
-                                 :key="item.deliverygoodsid"
-                                 :value="item.deliverygoodsid">
-                  {{item.deliverygoodsname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="商品"
-                         name="WrStandardID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        @change="WrStandardChange"
-                        v-model:value="formState.WrStandardID"
-                        placeholder="请选择商品">
-                <a-select-option v-for="item in gmlist"
-                                 :key="item.wrstandardid"
-                                 :value="item.wrstandardid">
-                  {{item.wrstandardname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="品牌"
-                         name="SpotGoodsBrandID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        v-model:value="formState.SpotGoodsBrandID"
-                        placeholder="请选择品牌">
-                <a-select-option v-for="item in gblist"
-                                 :key="item.brandid"
-                                 :value="item.brandid">
-                  {{item.brandname}}
-                </a-select-option>
-              </a-select>
-            </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>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>价格信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="定价类型"
-                         name="PriceType">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        v-model:value="formState.PriceType"
-                        placeholder="请选择定价类型">
-                <a-select-option v-for="item in priceType"
-                                 :key="item.key"
-                                 :value="item.key">
-                  {{item.value}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="结算币种"
-                         name="CurrencyID">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.CurrencyID"
-                        style="width: 200px"
-                        placeholder="请选择结算币种">
-                <a-select-option v-for="item in payCurrency"
-                                 :key="item.enumitemname"
-                                 :value="item.enumitemname">
-                  {{item.enumdicname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="数量"
-                         name="Qty">
-              <a-input class="dialogInput suffixGrey"
-                       v-model:value="formState.Qty"
-                       style="width: 200px"
-                       @change="getAmout"
-                       placeholder="请输入数量"
-                       :suffix="numberUnit" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12"
-                 v-if="formState.PriceType === 3">
-            <a-form-item label="暂定价">
-              <a-input class="dialogInput suffixGrey"
-                       style="width: 200px"
-                       :suffix="payCurrencyUnit"
-                       placeholder="请输入暂定价" />
-            </a-form-item>
-          </a-col>
-          <!-- 以下是点价的价格信息 start -->
-          <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
-            <a-col :span="12">
-              <a-form-item label="点价合约"
-                           name="GoodsID">
-                <a-select class="inlineFormSelect"
-                          v-model:value="formState.GoodsID"
-                          style="width: 200px"
-                          placeholder="请选择点价合约">
-                  <a-select-option v-for="item in goodsList"
-                                   :key="item.goodsid"
-                                   :value="item.goodsid">
-                    {{item.goodsname}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="升贴水"
-                           name="PriceMove">
-                <a-input-number class="dialogInput suffixGrey"
-                                v-model:value="formState.PriceMove"
-                                placeholder="请输入升贴水"
-                                :min="0"
-                                :suffix="`${payCurrencyUnit}/${numberUnit}`"
-                                style="width: 200px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="点价期">
-                <a-range-picker v-model:value="priceDate"
-                                class="commonPicker"
-                                :disabled-date="disabledDate"
-                                style="width: 200px"
-                                :show-time="{hideDisabledOptions: true}"
-                                format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="交收期">
-                <a-range-picker v-model:value="deliveryDate"
-                                class="commonPicker"
-                                style="width: 200px"
-                                :disabled-date="disabledDate"
-                                :show-time="{hideDisabledOptions: true}"
-                                format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-          </template>
-          <!-- 以上是点价的价格信息 end -->
-          <template v-if="formState.PriceType === 1">
-            <a-col :span="12">
-              <a-form-item label="价格"
-                           name="Price">
-                <a-input class="dialogInput suffixGrey"
-                         v-model:value="formState.Price"
-                         @change="getAmout"
-                         placeholder="请输入价格"
-                         :suffix="`${payCurrencyUnit}/${numberUnit}`"
-                         style="width: 200px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="金额"
-                           class="relative"
-                           name="Amount">
-                <a-input class="dialogInput suffixGrey"
-                         v-model:value="formState.Amount"
-                         readonly
-                         placeholder="输入数量和价格后自动算"
-                         :suffix="payCurrencyUnit"
-                         style="width: 200px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="交收期">
-                <a-range-picker v-model:value="deliveryDate"
-                                style="width: 200px"
-                                class="commonPicker"
-                                :disabled-date="disabledDate"
-                                :show-time="{hideDisabledOptions: true}"
-                                format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>其他信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="保证金"
-                         name="ContractMargin">
-              <a-input class="dialogInput suffixGrey"
-                       placeholder="请输入保证金"
-                       v-model:value="formState.ContractMargin"
-                       style="width: 200px"
-                       :suffix="payCurrencyUnit" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="业务员"
-                         name="SaleUserID">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.SaleUserID"
-                        style="width: 200px"
-                        placeholder="请选择业务员">
-                <a-select-option v-for="item in businesserList"
-                                 :key="item.userid"
-                                 :value="item.userid">
-                  {{item.accountname}}-{{item.logincode}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="跟单员"
-                         name="MerUserID">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.MerUserID"
-                        style="width: 200px"
-                        placeholder="请选择跟单员">
-                <a-select-option v-for="item in merchandiserList"
-                                 :key="item.userid"
-                                 :value="item.userid">
-                  {{item.accountname}}-{{item.logincode}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="交易用户"
-                         name="TradeUserID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        v-model:value="formState.TradeUserID"
-                        placeholder="请选择期货账户">
-                <a-select-option v-for="item in traderList"
-                                 :key="item.roleid"
-                                 :value="item.roleid">
-                  {{item.rolename}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="Remark">
-              <a-input class="dialogInput"
-                       style="width: 608px"
-                       v-model:value="formState.Remark"
-                       placeholder="请输入备注" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-    <a-modal :visible="previewVisible"
-             :footer="null"
-             @cancel="cancelImg">
-      <img alt="预览附件"
-           style="width: 100%"
-           :src="previewImage" />
+    <!-- 重新提交现货合同-->
+    <a-modal class="commonModal modify-custom" title="重新提交现货合同" v-if="visible" v-model:visible="visible" @cancel="cancel" centered width="890px">
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <fieldset class="formFieldSet">
+                <legend>基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号" name="ContractNo">
+                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入合同编号" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="合同类型" name="ContractType">
+                            <a-select class="inlineFormSelect" style="width: 200px" @change="contractChange" v-model:value="formState.ContractType" placeholder="请选择合同类型">
+                                <a-select-option v-for="item in contractType" :key="item.key" :value="item.key">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="业务类型" name="BizType">
+                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BizType" placeholder="请选择业务类型">
+                                <a-select-option v-for="item in businessType" :key="item.key" :value="item.key">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <template v-if="isSell">
+                        <a-col :span="12">
+                            <a-form-item label="采购方" name="BuyUserID">
+                                <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BuyUserID" placeholder="请选择客户">
+                                    <!-- 客户资料列表 正常 -->
+                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                                        {{ item.customername }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="销售方">
+                                <span class="white">{{ getUserName() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <template v-else>
+                        <a-col :span="12">
+                            <a-form-item label="采购方">
+                                <span class="white">{{ getUserName() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="销售方" name="SellUserID">
+                                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" placeholder="请选择客户">
+                                    <!-- 客户资料列表 正常 -->
+                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                                        {{ item.customername }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :span="12">
+                        <a-form-item label="合同附件" name="ContractAttachment">
+                            <UploadImg :visible="visible" :imgList="uploadImgList" @upload="uploadImgAction" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>现货信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="现货品种" name="DeliveryGoodsID">
+                            <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
+                                <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
+                                    {{ item.deliverygoodsname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="商品" name="WrStandardID">
+                            <a-select class="inlineFormSelect" style="width: 200px" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
+                                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                                    {{ item.wrstandardname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="品牌" name="SpotGoodsBrandID">
+                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
+                                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                                    {{ item.brandname }}
+                                </a-select-option>
+                            </a-select>
+                        </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>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>价格信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="定价类型" name="PriceType">
+                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.PriceType" placeholder="请选择定价类型">
+                                <a-select-option v-for="item in priceType" :key="item.key" :value="item.key">
+                                    {{ item.value }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="结算币种" name="CurrencyID">
+                            <a-select class="inlineFormSelect" v-model:value="formState.CurrencyID" style="width: 200px" placeholder="请选择结算币种">
+                                <a-select-option v-for="item in payCurrency" :key="item.enumitemname" :value="item.enumitemname">
+                                    {{ item.enumdicname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="数量" name="Qty">
+                            <a-input class="dialogInput suffixGrey" v-model:value="formState.Qty" style="width: 200px" @change="getAmout" placeholder="请输入数量" :suffix="numberUnit" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12" v-if="formState.PriceType === 3">
+                        <a-form-item label="暂定价">
+                            <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
+                        </a-form-item>
+                    </a-col>
+                    <!-- 以下是点价的价格信息 start -->
+                    <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
+                        <a-col :span="12">
+                            <a-form-item label="点价合约" name="GoodsID">
+                                <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" placeholder="请选择点价合约">
+                                    <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
+                                        {{ item.goodsname }}
+                                    </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="升贴水" name="PriceMove">
+                                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="点价期">
+                                <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="交收期">
+                                <a-range-picker v-model:value="deliveryDate" class="commonPicker" style="width: 200px" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <!-- 以上是点价的价格信息 end -->
+                    <template v-if="formState.PriceType === 1">
+                        <a-col :span="12">
+                            <a-form-item label="价格" name="Price">
+                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Price" @change="getAmout" placeholder="请输入价格" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="金额" class="relative" name="Amount">
+                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Amount" readonly placeholder="输入数量和价格后自动算" :suffix="payCurrencyUnit" style="width: 200px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="交收期">
+                                <a-range-picker v-model:value="deliveryDate" style="width: 200px" class="commonPicker" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>其他信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="保证金" name="ContractMargin">
+                            <a-input class="dialogInput suffixGrey" placeholder="请输入保证金" v-model:value="formState.ContractMargin" style="width: 200px" :suffix="payCurrencyUnit" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="业务员" name="SaleUserID">
+                            <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" placeholder="请选择业务员">
+                                <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="跟单员" name="MerUserID">
+                            <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" placeholder="请选择跟单员">
+                                <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="交易用户" name="TradeUserID">
+                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.TradeUserID" placeholder="请选择期货账户">
+                                <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
+                                    {{ item.rolename }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="Remark">
+                            <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入备注" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+        <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
+            <img alt="预览附件" style="width: 100%" :src="previewImage" />
+        </a-modal>
     </a-modal>
-  </a-modal>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
-import { getUserName, getUsrId } from '@/services/bus/user';
+import { getUserName, getUserId } from '@/services/bus/user';
 import { getGoodsList } from '@/services/bus/goods';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { FormState } from '../interface';
@@ -513,7 +342,7 @@ export default defineComponent({
         }
         function submit() {
             validateAction<FormState>(formRef, formState).then((param) => {
-                const id = getUsrId();
+                const id = getUserId();
                 isSell.value ? (param.SellUserID = id) : (param.BuyUserID = id);
                 const fn = (value: Moment) => {
                     return formatTime(value, 'd') + ' ' + '00:00:00';

src/views/market/spot_trade/components/buy-sell-market/components/delisting/index.vue

@@ -1,158 +1,113 @@
 <template>
-  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
-  <Drawer :title="'摘牌'"
-          :placement="'right'"
-          :visible="visible"
-          width="486px"
-          height="479px"
-          @cancel="cancel"
-          class="top">
-    <div class="delisting">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white ml8">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="基差"
-                           v-if="isFloat()">
-                <span class="yellow ml8">{{selectedRow.pricemove}}</span>
-              </a-form-item>
-              <a-form-item label="挂牌价格"
-                           v-if="!isFloat()">
-                <span class="yellow ml8">{{selectedRow.fixedprice}}</span>
-              </a-form-item>
-              <a-row :gutter="24">
-                <a-col :span="24"></a-col>
-              </a-row>
-              <a-form-item label="挂牌数量">
-                <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="isBuy() && isWR()">
-            <a-col :span="24">
-              <a-form-item label="现货仓单"
-                           name="LadingBillId">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.LadingBillId"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in wrHoldList"
-                                   :value="item.id"
-                                   :key="item.id">{{item.name}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           class="relative"
-                           name="num">
-                <a-input-number class="dialogInput yellowInput"
-                                style="width: 260px"
-                                :min="0"
-                                :max="getMaxNum()"
-                                v-model:value="formState.num" />
-                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <div class="labelTip">({{selectedRow.delistminqty}}{{selectedRow.enumdicname}}起)
+    <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+    <Drawer :title="'摘牌'" :placement="'right'" :visible="visible" width="486px" height="479px" @cancel="cancel" class="top">
+        <div class="delisting">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white ml8">{{ selectedRow.username }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="基差" v-if="isFloat()">
+                                <span class="yellow ml8">{{ selectedRow.pricemove }}</span>
+                            </a-form-item>
+                            <a-form-item label="挂牌价格" v-if="!isFloat()">
+                                <span class="yellow ml8">{{ selectedRow.fixedprice }}</span>
+                            </a-form-item>
+                            <a-row :gutter="24">
+                                <a-col :span="24"></a-col>
+                            </a-row>
+                            <a-form-item label="挂牌数量">
+                                <span class="white ml8">{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="isBuy() && isWR()">
+                        <a-col :span="24">
+                            <a-form-item label="现货仓单" name="LadingBillId">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.LadingBillId" placeholder="请选择">
+                                    <a-select-option v-for="item in wrHoldList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" class="relative" name="num">
+                                <a-input-number class="dialogInput yellowInput" style="width: 260px" :min="0" :max="getMaxNum()" v-model:value="formState.num" />
+                                <span class="input-enumdicname-absolute">{{ selectedRow.enumdicname }}</span>
+                                <div class="labelTip">({{ selectedRow.delistminqty }}{{ selectedRow.enumdicname }}起) </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider :min="0" v-model:value="formState.num" :max="selectedRow.orderqty" class="formSlider" style="width: 260px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ getMaxNum() }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-col :span="24" v-if="isFloat()">
+                        <a-form-item label="估算价" name="PriceMove">
+                            <span class="white">{{ getPrice() }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="getMargin()">
+                        <a-col :span="24">
+                            <a-form-item :label="getMargin() ? '履约保证金' : ''">
+                                <a-row>
+                                    <a-col :span="24">
+                                        <span class="white ml8">{{ getMargin() }}</span>
+                                    </a-col>
+                                </a-row>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider"
-                          style="width: 260px;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-col :span="24"
-                 v-if="isFloat()">
-            <a-form-item label="估算价"
-                         name="PriceMove">
-              <span class="white">{{getPrice()}}</span>
-            </a-form-item>
-          </a-col>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="getMargin()">
-            <a-col :span="24">
-              <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                <a-row>
-                  <a-col :span="24">
-                    <span class="white ml8">{{getMargin()}}</span>
-                  </a-col>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">{{ isBuy() ? '卖出' : '买入' }}</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
                 </a-row>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -160,7 +115,8 @@ import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
-import { getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getAccountTypeList, getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { HdWRDealOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/index.vue

@@ -1,148 +1,104 @@
 <template>
-  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
-  <Drawer :title="'摘牌'"
-          :placement="'right'"
-          :visible="visible"
-          width="486px"
-          height="580px"
-          @cancel="cancel"
-          class="top">
-    <div class="delisting">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white ml8">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="基差"
-                           v-if="isFloat()">
-                <span class="yellow ml8">{{selectedRow.pricemove}}</span>
-              </a-form-item>
-              <a-form-item label="挂牌价格"
-                           v-if="!isFloat()">
-                <span class="yellow ml8">{{selectedRow.fixedprice}}</span>
-              </a-form-item>
-              <a-row :gutter="24">
-                <a-col :span="24"></a-col>
-              </a-row>
-              <a-form-item label="挂牌数量">
-                <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-10">
-              <a-form-item label="融资方案"
-                           @click="openComponent({code: 'ChooseFinance'})"
-                           name="caseId">
-                <div class="way">
-                  <div class="left">{{formState.case ? formState.case : '请选择'}}</div>
-                  <div class="right">
-                    <svg class="icon svg-icon"
-                         aria-hidden="true">
-                      <use xlink:href="#icon-fangan" />
-                    </svg>
-                  </div>
-                </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="isBuy() && isWR()">
-            <a-col :span="24">
-              <a-form-item label="现货仓单"
-                           name="LadingBillId">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.LadingBillId"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in wrHoldList"
-                                   :value="item.id"
-                                   :key="item.id">{{item.name}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           class="relative"
-                           name="num">
-                <a-input-number class="dialogInput yellowInput"
-                                style="width: 260px"
-                                :min="0"
-                                :max="getMaxNum()"
-                                v-model:value="formState.num" />
-                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <div class="labelTip">({{selectedRow.delistminqty}}{{selectedRow.enumdicname}}起)
-                </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider"
-                          style="width: 260px;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-col :span="24"
-                 v-if="isFloat()">
-            <a-form-item label="估算价"
-                         name="PriceMove">
-              <span class="white">{{getPrice()}}</span>
-            </a-form-item>
-          </a-col>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="getMargin()">
-            <a-col :span="24">
-              <a-form-item :label="getMargin() ? '履约保证金' : ''">
-                <!-- <a-row>
+    <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+    <Drawer :title="'摘牌'" :placement="'right'" :visible="visible" width="486px" height="580px" @cancel="cancel" class="top">
+        <div class="delisting">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white ml8">{{ selectedRow.username }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="基差" v-if="isFloat()">
+                                <span class="yellow ml8">{{ selectedRow.pricemove }}</span>
+                            </a-form-item>
+                            <a-form-item label="挂牌价格" v-if="!isFloat()">
+                                <span class="yellow ml8">{{ selectedRow.fixedprice }}</span>
+                            </a-form-item>
+                            <a-row :gutter="24">
+                                <a-col :span="24"></a-col>
+                            </a-row>
+                            <a-form-item label="挂牌数量">
+                                <span class="white ml8">{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-10">
+                            <a-form-item label="融资方案" @click="openComponent({ code: 'ChooseFinance' })" name="caseId">
+                                <div class="way">
+                                    <div class="left">{{ formState.case ? formState.case : '请选择' }}</div>
+                                    <div class="right">
+                                        <svg class="icon svg-icon" aria-hidden="true">
+                                            <use xlink:href="#icon-fangan" />
+                                        </svg>
+                                    </div>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="isBuy() && isWR()">
+                        <a-col :span="24">
+                            <a-form-item label="现货仓单" name="LadingBillId">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.LadingBillId" placeholder="请选择">
+                                    <a-select-option v-for="item in wrHoldList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" class="relative" name="num">
+                                <a-input-number class="dialogInput yellowInput" style="width: 260px" :min="0" :max="getMaxNum()" v-model:value="formState.num" />
+                                <span class="input-enumdicname-absolute">{{ selectedRow.enumdicname }}</span>
+                                <div class="labelTip">({{ selectedRow.delistminqty }}{{ selectedRow.enumdicname }}起) </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider :min="0" v-model:value="formState.num" :max="selectedRow.orderqty" class="formSlider" style="width: 260px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ getMaxNum() }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-col :span="24" v-if="isFloat()">
+                        <a-form-item label="估算价" name="PriceMove">
+                            <span class="white">{{ getPrice() }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item :label="isFloat() ? '估算金额' : '摘牌金额'">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="getMargin()">
+                        <a-col :span="24">
+                            <a-form-item :label="getMargin() ? '履约保证金' : ''">
+                                <!-- <a-row>
                                 <a-col :span="8">-->
-                <span class="white ml8">{{getMargin()}}</span>
-                <!-- </a-col>
+                                <span class="white ml8">{{ getMargin() }}</span>
+                                <!-- </a-col>
                                     <a-col :span="5" class="tr">
                                         <span class="grey1">可用资金</span>
                                     </a-col>
@@ -152,46 +108,37 @@
                                         >{{getCanUseMoney(getSelectedAccount())}}</span>
                                     </a-col>
                                 </a-row>-->
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">{{ isBuy() ? '卖出' : '买入' }}</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :isFloat="isFloat()"
-             @update="choose"
-             @cancel="closeComponent"></component>
+    </Drawer>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :isFloat="isFloat()" @update="choose" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
 import { defineAsyncComponent, defineComponent, onMounted, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
-import { getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getAccountTypeList, getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { handleForm, handleSpotWarrant } from './setup';

src/views/market/spot_trade/components/post_buying/index.vue

@@ -106,7 +106,8 @@ import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { DGFactoryItems, WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
-import { getAccountTypeList, getUserId } from '@/services/bus/account';
+import { getAccountTypeList } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { v4 as uuidv4 } from 'uuid';
 import moment, { Moment } from 'moment';
 import { getMarketRunByTradeMode } from '@/services/bus/market';

src/views/market/spot_trade/spot_trade_order_transaction/components/delisting/index.vue

@@ -1,116 +1,84 @@
 <template>
-  <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
-  <Drawer :title="'摘牌'"
-          :placement="'right'"
-          :visible="visible"
-          width="486px"
-          height="479px"
-          @cancel="cancel"
-          class="top">
-    <div class="delisting">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white ml8">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌价格">
-                <span class="white ml8">{{selectedRow.orderprice.toFixed(2)}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量">
-                <span class="white ml8">{{selectedRow.orderqty}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           class="relative"
-                           name="num">
-                <a-input-number class="dialogInput yellowInput"
-                                style="width: 260px"
-                                :min="0"
-                                :max="99999"
-                                v-model:value="formState.num" />
-                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <!-- <div
+    <!-- 仓单贸易&仓单预售 买/卖 摘牌 -->
+    <Drawer :title="'摘牌'" :placement="'right'" :visible="visible" width="486px" height="479px" @cancel="cancel" class="top">
+        <div class="delisting">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white ml8">{{ selectedRow.username }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌价格">
+                                <span class="white ml8">{{ selectedRow.orderprice.toFixed(2) }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量">
+                                <span class="white ml8">{{ selectedRow.orderqty }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" class="relative" name="num">
+                                <a-input-number class="dialogInput yellowInput" style="width: 260px" :min="0" :max="99999" v-model:value="formState.num" />
+                                <span class="input-enumdicname-absolute">{{ selectedRow.enumdicname }}</span>
+                                <!-- <div
                                     class="labelTip"
                                 >({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div> -->
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider"
-                          style="width: 260px" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>99999{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider :min="0" v-model:value="formState.num" :max="selectedRow.orderqty" class="formSlider" style="width: 260px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>99999{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item label="摘牌金额">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item label="摘牌金额">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">{{ isBuy() ? '卖出' : '买入' }}</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -118,7 +86,7 @@ import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderQuote, WrOrderQuoteDetail, WrTradeOrderDetailReq, WrTradeOrderDetailRsp } from '@/services/go/wrtrade/interface';
-import { getAccount_longType, getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getAccount_longType, getAccountTypeList, getSelectedAccountId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { HdWRDealOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/components/buy/index.vue

@@ -1,35 +1,16 @@
 <template>
-  <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
-  <a-table :columns="columns"
-           :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
-           :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           :expandIcon="expandIcon"
-           :expandIconAsCell="false"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- ,  -->
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               class="btn-list-sticky"
-               @click="openComponent" />
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " "}}{{text}}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :buyOrSell="BuyOrSell.buy"
-             :enumName="enumName"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
+    <a-table :columns="columns" :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']" :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- ,  -->
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
+        </template>
+        <template #username="{ text, record }">
+            <span>{{ record.userid + ' ' }}{{ text }}</span>
+        </template>
+    </a-table>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :buyOrSell="BuyOrSell.buy" :enumName="enumName" :parantSelectedRow="parantSelectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
@@ -48,7 +29,7 @@ import moment from 'moment';
 import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { queryTjmdTradeOrderDetail } from '@/services/go/Tjmd';
 import { QueryTjmdTradeOrderDetailReq, QueryTjmdTradeOrderDetailRsp } from '@/services/go/Tjmd/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getUserAccountType } from '@/services/bus/user';
 import { useBuyOrSellBtnList } from '../setup';
 import { findItemGoods } from '../../setup';

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/components/sell/index.vue

@@ -1,33 +1,15 @@
 <template>
-  <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
-  <a-table :columns="handleColumn(columns)"
-           :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-           :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           :expandIcon="expandIcon"
-           :expandIconAsCell="false"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               @click="openComponent" />
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " " }}{{text}}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :enumName="enumName"
-             :buyOrSell="BuyOrSell.sell"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
+    <a-table :columns="handleColumn(columns)" :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']" :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+        </template>
+        <template #username="{ text, record }">
+            <span>{{ record.userid + ' ' }}{{ text }}</span>
+        </template>
+    </a-table>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :enumName="enumName" :buyOrSell="BuyOrSell.sell" :parantSelectedRow="parantSelectedRow" @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
@@ -45,7 +27,7 @@ import { Moment } from 'moment';
 import moment from 'moment';
 import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { useBuyOrSellBtnList } from '../setup';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getUserAccountType } from '@/services/bus/user';
 import { queryTjmdTradeOrderDetail } from '@/services/go/Tjmd';
 import { QueryTjmdTradeOrderDetailReq } from '@/services/go/Tjmd/interface';

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/delisting/index.vue

@@ -1,154 +1,107 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 摘牌-->
-  <Drawer :title="isBargin() ? '议价摘牌' : '摘牌'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top">
-    <div class="post_buying">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white ml8">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量">
-                <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-col :span="24"
-                 v-if="isBargin()">
-            <a-form-item label="摘牌价格"
-                         name="price">
-              <a-input-number class="commonInput"
-                              style="width: 260px"
-                              :min="0"
-                              v-model:value="formState.price" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24"
-                 v-else>
-            <a-form-item label="摘牌价格">
-              <span class="white ml8">{{selectedRow.fixedprice}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24"
-                 v-if="isBuy()">
-            <a-form-item label="现货仓单"
-                         name="LadingBillId">
-              <a-select class="inlineFormSelect"
-                        style="width: 260px"
-                        v-model:value="formState.LadingBillId"
-                        placeholder="请选择">
-                <a-select-option v-for="item in wrHoldList"
-                                 :value="item.id"
-                                 :key="item.id">{{item.name}}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
+    <!--仓单贸易 贸易圈挂牌 摘牌-->
+    <Drawer :title="isBargin() ? '议价摘牌' : '摘牌'" :placement="'right'" :visible="visible" @cancel="cancel" class="top">
+        <div class="post_buying">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white ml8">{{ selectedRow.username }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量">
+                                <span class="white ml8">{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-col :span="24" v-if="isBargin()">
+                        <a-form-item label="摘牌价格" name="price">
+                            <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.price" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-else>
+                        <a-form-item label="摘牌价格">
+                            <span class="white ml8">{{ selectedRow.fixedprice }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-if="isBuy()">
+                        <a-form-item label="现货仓单" name="LadingBillId">
+                            <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.LadingBillId" placeholder="请选择">
+                                <a-select-option v-for="item in wrHoldList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
 
-          <a-row :gutter="24"
-                 v-if="isCanpart()">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           class="relative"
-                           name="num">
-                <a-input-number class="dialogInput yellowInput"
-                                style="width: 260px"
-                                :min="0"
-                                :max="getMaxNum()"
-                                v-model:value="formState.num" />
-                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <div class="labelTip">({{selectedRow.delistminqty}}{{selectedRow.enumdicname}}起)
+                    <a-row :gutter="24" v-if="isCanpart()">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" class="relative" name="num">
+                                <a-input-number class="dialogInput yellowInput" style="width: 260px" :min="0" :max="getMaxNum()" v-model:value="formState.num" />
+                                <span class="input-enumdicname-absolute">{{ selectedRow.enumdicname }}</span>
+                                <div class="labelTip">({{ selectedRow.delistminqty }}{{ selectedRow.enumdicname }}起) </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="isCanpart()">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider :min="0" v-model:value="formState.num" :max="selectedRow.orderqty" class="formSlider" style="width: 260px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ getMaxNum() }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-col :span="24" v-if="!isCanpart()">
+                        <a-form-item label="摘牌数量">
+                            <span class="white ml8">{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item label="摘牌金额">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金">
+                                <span class="white ml8">{{ getMargin() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="isCanpart()">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider"
-                          style="width: 260px" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-col :span="24"
-                 v-if="!isCanpart()">
-            <a-form-item label="摘牌数量">
-              <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-            </a-form-item>
-          </a-col>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item label="摘牌金额">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="履约保证金">
-                <span class="white ml8">{{getMargin()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">{{ isBuy() ? '卖出' : '买入' }}</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -161,7 +114,8 @@ import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { DGFactoryItems, HdWRDealOrderReq, WrBargainApplyReq, WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
-import { getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getAccountTypeList, getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { v4 as uuidv4 } from 'uuid';
 import moment, { Moment } from 'moment';
 import { getMarketRunByTradeMode, marketIsRun } from '@/services/bus/market';

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/index.vue

@@ -1,168 +1,107 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
-  <Drawer :title="'挂牌求购'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <div class="post_buying">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌价格"
-                           name="FixedPrice"
-                           class="inputIconBox">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.FixedPrice" />
-                <MinusOutlined @click="decreasePrice" />
-                <PlusOutlined @click="increasePrice" />
-                <a-checkbox class="commonCheckbox"
-                            v-model:checked="priceCheck">可议价</a-checkbox>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty"
-                           class="inputIconBox">
-                <a-input-number class="commonInput"
-                                style="width: 260px"
-                                :min="0"
-                                v-model:value="formState.OrderQty" />
-                <MinusOutlined @click="decreaseNumber" />
-                <PlusOutlined @click="increaseNumber" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <a-checkbox v-model:checked="numCheck"
-                            class="commonCheckbox">整单</a-checkbox>
-              </a-form-item>
-            </a-col>
+    <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
+    <Drawer :title="'挂牌求购'" :placement="'right'" :visible="visible" @cancel="cancel" class="top486">
+        <div class="post_buying">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌价格" name="FixedPrice" class="inputIconBox">
+                                <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.FixedPrice" />
+                                <MinusOutlined @click="decreasePrice" />
+                                <PlusOutlined @click="increasePrice" />
+                                <a-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量" name="OrderQty" class="inputIconBox">
+                                <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.OrderQty" />
+                                <MinusOutlined @click="decreaseNumber" />
+                                <PlusOutlined @click="increaseNumber" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
+                                <a-checkbox v-model:checked="numCheck" class="commonCheckbox">整单</a-checkbox>
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24"
-                   v-if="!numCheck">
-              <a-form-item label="起摘数量"
-                           name="delistingQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.delistingQty"
-                                :min="0"
-                                style="width: 260px !important" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金"
-                           name="margin">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.margin"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">%</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="交收月"
-                           name="DeliveryMonth">
-                <a-month-picker style="width: 140px"
-                                v-model:value="formState.DeliveryMonth"
-                                :allowClear="'false'"
-                                class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌有效期"
-                           name="vidaliteTime"
-                           class="inputIconBox">
-                <a-date-picker style="width: 260px"
-                               v-model:value="formState.vidaliteTime"
-                               :allowClear="false"
-                               class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
+                        <a-col :span="24" v-if="!numCheck">
+                            <a-form-item label="起摘数量" name="delistingQty">
+                                <a-input-number class="commonInput" v-model:value="formState.delistingQty" :min="0" style="width: 260px !important" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金" name="margin">
+                                <a-input-number class="commonInput" v-model:value="formState.margin" :min="0" style="width: 260px" />
+                                <span class="input-enumdicname">%</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="交收月" name="DeliveryMonth">
+                                <a-month-picker style="width: 140px" v-model:value="formState.DeliveryMonth" :allowClear="'false'" class="commonDatePicker dialogDatePicker" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌有效期" name="vidaliteTime" class="inputIconBox">
+                                <a-date-picker style="width: 260px" v-model:value="formState.vidaliteTime" :allowClear="false" class="commonDatePicker dialogDatePicker" />
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="履约方式"
-                           class="inputIconBox">
-                <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
-                      @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
-                <svg class="icon svg-icon"
-                     aria-hidden="true"
-                     @click="openPermance">
-                  <use xlink:href="#icon-moban" />
-                </svg>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="指定朋友"
-                           class="inputIconBox">
-                <span :class="['clickBox', getFriendLength() ? 'white' : '']"
-                      @click="openFriend">{{getFriendLength() ? `已选${getFriendLength() }人` : '选择朋友'}}</span>
-                <svg class="icon svg-icon"
-                     aria-hidden="true"
-                     @click="openFriend">
-                  <use xlink:href="#icon-pengyou1" />
-                </svg>
-                <a-checkbox class="commonCheckbox"
-                            v-model:checked="friendCheck"
-                            @change="limiteFriends">不限</a-checkbox>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌金额">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金">
-                <span class="white ml8">{{getMargin()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                        <a-col :span="24">
+                            <a-form-item label="履约方式" class="inputIconBox">
+                                <span :class="['clickBox', formState.permanceTempName ? 'white' : '']" @click="openPermance">{{ formState.permanceTempName ? formState.permanceTempName : '选择履约模板' }}</span>
+                                <svg class="icon svg-icon" aria-hidden="true" @click="openPermance">
+                                    <use xlink:href="#icon-moban" />
+                                </svg>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="指定朋友" class="inputIconBox">
+                                <span :class="['clickBox', getFriendLength() ? 'white' : '']" @click="openFriend">{{ getFriendLength() ? `已选${getFriendLength()}人` : '选择朋友' }}</span>
+                                <svg class="icon svg-icon" aria-hidden="true" @click="openFriend">
+                                    <use xlink:href="#icon-pengyou1" />
+                                </svg>
+                                <a-checkbox class="commonCheckbox" v-model:checked="friendCheck" @change="limiteFriends">不限</a-checkbox>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌金额">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金">
+                                <span class="white ml8">{{ getMargin() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" @click="submit">买入</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        @click="submit">买入</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          :friends="formState.friends"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" :friends="formState.friends" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance v-if="showPermance" @cancel="choosePermance" @update="choosePermance" />
 </template>
 
 <script lang="ts">
@@ -174,7 +113,7 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { v3, v4 as uuidv4 } from 'uuid';
 import moment, { Moment } from 'moment';
 import { getMarketRunByTradeMode, marketIsRun } from '@/services/bus/market';

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/delisting/index.vue

@@ -1,154 +1,107 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 摘牌-->
-  <Drawer :title="isBargin() ? '议价摘牌' : '摘牌'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top">
-    <div class="post_buying">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户"
-                           name="accountid">
-                <a-select class="inlineFormSelect"
-                          style="width: 260px"
-                          v-model:value="formState.accountid"
-                          placeholder="请选择">
-                  <a-select-option v-for="item in accountList"
-                                   :value="item.accountid"
-                                   :key="item.accountid">{{item.accountid}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white ml8">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量">
-                <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-col :span="24"
-                 v-if="isBargin()">
-            <a-form-item label="摘牌价格"
-                         name="price">
-              <a-input-number class="commonInput"
-                              style="width: 260px"
-                              :min="0"
-                              v-model:value="formState.price" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24"
-                 v-else>
-            <a-form-item label="摘牌价格">
-              <span class="white ml8">{{selectedRow.fixedprice}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24"
-                 v-if="isBuy()">
-            <a-form-item label="现货仓单"
-                         name="LadingBillId">
-              <a-select class="inlineFormSelect"
-                        style="width: 260px"
-                        v-model:value="formState.LadingBillId"
-                        placeholder="请选择">
-                <a-select-option v-for="item in wrHoldList"
-                                 :value="item.id"
-                                 :key="item.id">{{item.name}}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
+    <!--仓单贸易 贸易圈挂牌 摘牌-->
+    <Drawer :title="isBargin() ? '议价摘牌' : '摘牌'" :placement="'right'" :visible="visible" @cancel="cancel" class="top">
+        <div class="post_buying">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户" name="accountid">
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white ml8">{{ selectedRow.username }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量">
+                                <span class="white ml8">{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-col :span="24" v-if="isBargin()">
+                        <a-form-item label="摘牌价格" name="price">
+                            <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.price" />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-else>
+                        <a-form-item label="摘牌价格">
+                            <span class="white ml8">{{ selectedRow.fixedprice }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-if="isBuy()">
+                        <a-form-item label="现货仓单" name="LadingBillId">
+                            <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.LadingBillId" placeholder="请选择">
+                                <a-select-option v-for="item in wrHoldList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
 
-          <a-row :gutter="24"
-                 v-if="isCanpart()">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           class="relative"
-                           name="num">
-                <a-input-number class="dialogInput yellowInput"
-                                style="width: 260px"
-                                :min="0"
-                                :max="getMaxNum()"
-                                v-model:value="formState.num" />
-                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <div class="labelTip">({{selectedRow.delistminqty}}{{selectedRow.enumdicname}}起)
+                    <a-row :gutter="24" v-if="isCanpart()">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" class="relative" name="num">
+                                <a-input-number class="dialogInput yellowInput" style="width: 260px" :min="0" :max="getMaxNum()" v-model:value="formState.num" />
+                                <span class="input-enumdicname-absolute">{{ selectedRow.enumdicname }}</span>
+                                <div class="labelTip">({{ selectedRow.delistminqty }}{{ selectedRow.enumdicname }}起) </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" v-if="isCanpart()">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider :min="0" v-model:value="formState.num" :max="selectedRow.orderqty" class="formSlider" style="width: 260px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ getMaxNum() }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-col :span="24" v-if="!isCanpart()">
+                        <a-form-item label="摘牌数量">
+                            <span class="white ml8">{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item label="摘牌金额">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金">
+                                <span class="white ml8">{{ getMargin() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 v-if="isCanpart()">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider"
-                          style="width: 260px" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-col :span="24"
-                 v-if="!isCanpart()">
-            <a-form-item label="摘牌数量">
-              <span class="white ml8">{{selectedRow.orderqty}}{{selectedRow.enumdicname}}</span>
-            </a-form-item>
-          </a-col>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item label="摘牌金额">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="履约保证金">
-                <span class="white ml8">{{getMargin()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">{{ isBuy() ? '卖出' : '买入' }}</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -158,7 +111,8 @@ import { BuyOrSell, TradeMode } from '@/common/constants/enumCommon';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { getAccountTypeList, getCanUseMoney, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getAccountTypeList, getCanUseMoney, getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { marketIsRun } from '@/services/bus/market';
 import { getRules } from '@/services/bus/rules';
 import { QueryOrderQuoteMyqQsp } from '@/services/go/wrtrade/interface';

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/index.vue

@@ -7,28 +7,14 @@
                     <a-row :gutter="24">
                         <a-col :span="24">
                             <a-form-item label="交易账户" name="accountid">
-                                <a-select
-                                    class="inlineFormSelect"
-                                    style="width: 260px"
-                                    v-model:value="formState.accountid"
-                                    placeholder="请选择"
-                                >
-                                    <a-select-option
-                                        v-for="item in accountList"
-                                        :value="item.accountid"
-                                        :key="item.accountid"
-                                    >{{item.accountid}}</a-select-option>
+                                <a-select class="inlineFormSelect" style="width: 260px" v-model:value="formState.accountid" placeholder="请选择">
+                                    <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
                                 </a-select>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="挂牌价格" name="FixedPrice" class="inputIconBox">
-                                <a-input-number
-                                    class="commonInput"
-                                    style="width: 260px"
-                                    :min="0"
-                                    v-model:value="formState.FixedPrice"
-                                />
+                                <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.FixedPrice" />
                                 <MinusOutlined @click="decreasePrice" />
                                 <PlusOutlined @click="increasePrice" />
                                 <a-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
@@ -36,96 +22,62 @@
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="挂牌数量" name="OrderQty" class="inputIconBox">
-                                <a-input-number
-                                    class="commonInput"
-                                    style="width: 260px"
-                                    :min="0"
-                                    v-model:value="formState.OrderQty"
-                                />
+                                <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.OrderQty" />
                                 <MinusOutlined @click="decreaseNumber" />
                                 <PlusOutlined @click="increaseNumber" />
-                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
                                 <a-checkbox v-model:checked="numCheck" class="commonCheckbox">整单</a-checkbox>
                             </a-form-item>
                         </a-col>
 
                         <a-col :span="24" v-if="!numCheck">
                             <a-form-item label="起摘数量" name="delistingQty">
-                                <a-input-number
-                                    class="commonInput"
-                                    v-model:value="formState.delistingQty"
-                                    :min="0"
-                                    style="width: 260px !important"
-                                />
-                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                                <a-input-number class="commonInput" v-model:value="formState.delistingQty" :min="0" style="width: 260px !important" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="履约保证金" name="margin">
-                                <a-input-number
-                                    class="commonInput"
-                                    v-model:value="formState.margin"
-                                    :min="0"
-                                    style="width: 260px"
-                                />
+                                <a-input-number class="commonInput" v-model:value="formState.margin" :min="0" style="width: 260px" />
                                 <span class="input-enumdicname">%</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="挂牌有效期" name="vidaliteTime" class="inputIconBox">
-                                <a-date-picker
-                                    style="width: 260px"
-                                    v-model:value="formState.vidaliteTime"
-                                    :allowClear="false"
-                                    class="commonDatePicker dialogDatePicker"
-                                />
+                                <a-date-picker style="width: 260px" v-model:value="formState.vidaliteTime" :allowClear="false" class="commonDatePicker dialogDatePicker" />
                             </a-form-item>
                         </a-col>
 
                         <a-col :span="24">
                             <a-form-item label="履约方式" class="inputIconBox">
-                                <span
-                                    :class="['clickBox', formState.permanceTempName ? 'white' : '']"
-                                    @click="openPermance"
-                                >{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
-                                <svg
-                                    class="icon svg-icon"
-                                    aria-hidden="true"
-                                    @click="openPermance"
-                                >
+                                <span :class="['clickBox', formState.permanceTempName ? 'white' : '']" @click="openPermance">{{ formState.permanceTempName ? formState.permanceTempName : '选择履约模板' }}</span>
+                                <svg class="icon svg-icon" aria-hidden="true" @click="openPermance">
                                     <use xlink:href="#icon-moban" />
                                 </svg>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="指定朋友" class="inputIconBox">
-                                <span
-                                    :class="['clickBox', getFriendLength() ? 'white' : '']"
-                                    @click="openFriend"
-                                >{{getFriendLength() ? `已选${getFriendLength() }人` : '选择朋友'}}</span>
+                                <span :class="['clickBox', getFriendLength() ? 'white' : '']" @click="openFriend">{{ getFriendLength() ? `已选${getFriendLength()}人` : '选择朋友' }}</span>
                                 <svg class="icon svg-icon" aria-hidden="true" @click="openFriend">
                                     <use xlink:href="#icon-pengyou1" />
                                 </svg>
-                                <a-checkbox
-                                    class="commonCheckbox"
-                                    v-model:checked="friendCheck"
-                                    @change="limiteFriends"
-                                >不限</a-checkbox>
+                                <a-checkbox class="commonCheckbox" v-model:checked="friendCheck" @change="limiteFriends">不限</a-checkbox>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="挂牌金额">
-                                <span class="white ml8">{{getMoney()}}</span>
+                                <span class="white ml8">{{ getMoney() }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="履约保证金">
-                                <span class="white ml8">{{getMargin()}}</span>
+                                <span class="white ml8">{{ getMargin() }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="可用资金">
-                                <span class="white ml8">{{getCanUseMoney(getSelectedAccount())}}</span>
+                                <span class="white ml8">{{ getCanUseMoney(getSelectedAccount()) }}</span>
                             </a-form-item>
                         </a-col>
                     </a-row>
@@ -142,12 +94,7 @@
         </div>
     </Drawer>
     <!-- 选择朋友 -->
-    <Friend
-        v-if="showFriend"
-        :friends="formState.friends"
-        @cancel="chooseFriend"
-        @update="chooseFriend"
-    />
+    <Friend v-if="showFriend" :friends="formState.friends" @cancel="chooseFriend" @update="chooseFriend" />
     <!-- 选择履约模板 -->
     <Permance v-if="showPermance" @cancel="choosePermance" @update="choosePermance" />
 </template>
@@ -161,7 +108,7 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { v3, v4 as uuidv4 } from 'uuid';
 import moment, { Moment } from 'moment';
 import { getMarketRunByTradeMode, marketIsRun } from '@/services/bus/market';

src/views/order/commodity_contract/components/commodity_contract_commission/components/cancel/index.vue

@@ -1,13 +1,13 @@
 <template>
-  <!-- 现货仓单 现货明细 撤单 -->
-  <div></div>
+    <!-- 现货仓单 现货明细 撤单 -->
+    <div></div>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderDetail } from '@/services/go/wrtrade/interface';
-import { getInTaAccount, getUserId } from '@/services/bus/account';
+import { getInTaAccount } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { wRListingCancelOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_deal_closed/index.vue

@@ -1,86 +1,63 @@
 <template>
-  <!-- 协议平仓-->
-  <Drawer :title="'协议平仓'"
-          :placement="'right'"
-          class="bottom486"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed c_c_s_s">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <div class="formtop">
-            <div class="firstTitle">
-              <span>合约：{{selectedRow.goodscode}}/{{selectedRow.goodsname}}</span>
-            </div>
-            <div class="secondLine">
-              <div class="left">持仓单号/方向</div>
-              <div class="middle">数量/价格/金额</div>
-              <div class="right">到期日/盈亏</div>
-            </div>
-            <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="checked"
-                              @change="checkGroupChange">
-              <div class="lineBar"
-                   v-for="item in tableList"
-                   :key="item.tradeid">
-                <div class="line1">
-                  <div class>
-                    <a-checkbox @change="checkboxChange(item)"
-                                :value="item.tradeid"></a-checkbox>
-                  </div>
-                  <div class="name">{{item.tradeid}}</div>
-                  <div class="date">{{formatTime(item.tradetime, 'd')}}</div>
+    <!-- 协议平仓-->
+    <Drawer :title="'协议平仓'" :placement="'right'" class="bottom486" :visible="visible" @cancel="cancel">
+        <div class="listed c_c_s_s">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <div class="formtop">
+                        <div class="firstTitle">
+                            <span>合约：{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
+                        </div>
+                        <div class="secondLine">
+                            <div class="left">持仓单号/方向</div>
+                            <div class="middle">数量/价格/金额</div>
+                            <div class="right">到期日/盈亏</div>
+                        </div>
+                        <a-checkbox-group class="commonCheckboxGroup" v-model:value="checked" @change="checkGroupChange">
+                            <div class="lineBar" v-for="item in tableList" :key="item.tradeid">
+                                <div class="line1">
+                                    <div class>
+                                        <a-checkbox @change="checkboxChange(item)" :value="item.tradeid"></a-checkbox>
+                                    </div>
+                                    <div class="name">{{ item.tradeid }}</div>
+                                    <div class="date">{{ formatTime(item.tradetime, 'd') }}</div>
+                                </div>
+                                <div class="line2">
+                                    <div class="left">{{ item.buyorsell === BuyOrSell.buy ? '买入' : '卖出' }}</div>
+                                    <div class="middle">
+                                        <div>{{ item.holderqty }}</div>
+                                        <div>{{ item.holderprice }}</div>
+                                        <div>{{ item.holderamount }}</div>
+                                    </div>
+                                    <div class="right red">+100</div>
+                                </div>
+                            </div>
+                        </a-checkbox-group>
+                    </div>
                 </div>
-                <div class="line2">
-                  <div class="left">{{item.buyorsell === BuyOrSell.buy ? '买入' : '卖出'}}</div>
-                  <div class="middle">
-                    <div>{{item.holderqty}}</div>
-                    <div>{{item.holderprice}}</div>
-                    <div>{{item.holderamount}}</div>
-                  </div>
-                  <div class="right red">+100</div>
+                <div class="fixedBtns">
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt12">
+                            <a-form-item label="协议价" name="price" class="inputIconBox mb10 not-copy">
+                                <a-input-number class="commonInput not-copy" v-model:value="formState.price" style="width: 200px" :min="0" />
+                                <MinusOutlined @click="decreasePrice" />
+                                <PlusOutlined @click="increasePirce" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="平仓金额" class="mb10 not-copy">
+                                <span class="white">50400.20</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-form-item class="btnCenter mt10">
+                        <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">提交</a-button>
+                        <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                    </a-form-item>
                 </div>
-              </div>
-            </a-checkbox-group>
-          </div>
+            </a-form>
         </div>
-        <div class="fixedBtns">
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt12">
-              <a-form-item label="协议价"
-                           name="price"
-                           class="inputIconBox mb10 not-copy">
-                <a-input-number class="commonInput not-copy"
-                                v-model:value="formState.price"
-                                style="width: 200px"
-                                :min="0" />
-                <MinusOutlined @click="decreasePrice" />
-                <PlusOutlined @click="increasePirce" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="平仓金额"
-                           class="mb10 not-copy ">
-                <span class="white">50400.20</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-form-item class="btnCenter mt10">
-            <a-button class="listedBtn"
-                      :loading="loading"
-                      :disabled="loading"
-                      @click="submit">提交</a-button>
-            <a-button class="ml10 cancelBtn"
-                      @click="cancel">取消</a-button>
-          </a-form-item>
-        </div>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -92,7 +69,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { queryTableList } from '@/common/setup/table';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
 import { queryTradeHolderDetail } from '@/services/go/order';

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_order_closed/index.vue

@@ -1,87 +1,63 @@
 <template>
-  <!-- 平仓-->
-  <Drawer :title="'平仓'"
-          :placement="'right'"
-          class="bottom486"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed c_c_s_s">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <div class="formtop">
-            <div class="firstTitle">
-              <span>合约：{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
-            </div>
-            <div class="secondLine">
-              <div class="left">持仓单号/方向</div>
-              <div class="middle">数量/价格/金额</div>
-              <div class="right">到期日/盈亏</div>
-            </div>
-            <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="checked"
-                              @change="checkGroupChange">
-              <div class="lineBar"
-                   v-for="item in tableList"
-                   :key="item.tradeid">
-                <div class="line1">
-                  <div class>
-                    <a-checkbox @change="checkboxChange(item)"
-                                :value="item.tradeid"></a-checkbox>
-                  </div>
-                  <div class="name">{{ item.tradeid }}</div>
-                  <div class="date">{{ formatTime(item.tradetime, 'd') }}</div>
+    <!-- 平仓-->
+    <Drawer :title="'平仓'" :placement="'right'" class="bottom486" :visible="visible" @cancel="cancel">
+        <div class="listed c_c_s_s">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <div class="formtop">
+                        <div class="firstTitle">
+                            <span>合约：{{ selectedRow.goodscode }}/{{ selectedRow.goodsname }}</span>
+                        </div>
+                        <div class="secondLine">
+                            <div class="left">持仓单号/方向</div>
+                            <div class="middle">数量/价格/金额</div>
+                            <div class="right">到期日/盈亏</div>
+                        </div>
+                        <a-checkbox-group class="commonCheckboxGroup" v-model:value="checked" @change="checkGroupChange">
+                            <div class="lineBar" v-for="item in tableList" :key="item.tradeid">
+                                <div class="line1">
+                                    <div class>
+                                        <a-checkbox @change="checkboxChange(item)" :value="item.tradeid"></a-checkbox>
+                                    </div>
+                                    <div class="name">{{ item.tradeid }}</div>
+                                    <div class="date">{{ formatTime(item.tradetime, 'd') }}</div>
+                                </div>
+                                <div class="line2">
+                                    <div class="left">{{ item.buyorsell === BuyOrSell.buy ? '买入' : '卖出' }}</div>
+                                    <div class="middle">
+                                        <div>{{ item.holderqty }}</div>
+                                        <div>{{ item.holderprice }}</div>
+                                        <div>{{ item.holderamount }}</div>
+                                    </div>
+                                    <div class="right red">+100</div>
+                                </div>
+                            </div>
+                        </a-checkbox-group>
+                    </div>
                 </div>
-                <div class="line2">
-                  <div class="left">{{ item.buyorsell === BuyOrSell.buy ? '买入' : '卖出' }}</div>
-                  <div class="middle">
-                    <div>{{ item.holderqty }}</div>
-                    <div>{{ item.holderprice }}</div>
-                    <div>{{ item.holderamount }}</div>
-                  </div>
-                  <div class="right red">+100</div>
+                <div class="fixedBtns">
+                    <a-row :gutter="24" v-if="false">
+                        <a-col :span="24" class="mt12">
+                            <a-form-item label="估算价" name="price" class="inputIconBox mb10 not-copy">
+                                <a-input-number class="commonInput not-copy" v-model:value="formState.price" style="width: 200px" :min="0" />
+                                <MinusOutlined @click="decreasePrice" />
+                                <PlusOutlined @click="increasePirce" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="估算金额" class="mb10 not-copy">
+                                <span class="white">50400.20</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-form-item class="btnCenter mt10">
+                        <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">提交</a-button>
+                        <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                    </a-form-item>
                 </div>
-              </div>
-            </a-checkbox-group>
-          </div>
+            </a-form>
         </div>
-        <div class="fixedBtns">
-          <a-row :gutter="24"
-                 v-if="false">
-            <a-col :span="24"
-                   class="mt12">
-              <a-form-item label="估算价"
-                           name="price"
-                           class="inputIconBox mb10 not-copy">
-                <a-input-number class="commonInput not-copy"
-                                v-model:value="formState.price"
-                                style="width: 200px"
-                                :min="0" />
-                <MinusOutlined @click="decreasePrice" />
-                <PlusOutlined @click="increasePirce" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="估算金额"
-                           class="mb10 not-copy">
-                <span class="white">50400.20</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-form-item class="btnCenter mt10">
-            <a-button class="listedBtn"
-                      :loading="loading"
-                      :disabled="loading"
-                      @click="submit">提交</a-button>
-            <a-button class="ml10 cancelBtn"
-                      @click="cancel">取消</a-button>
-          </a-form-item>
-        </div>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -93,7 +69,8 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { queryTableList } from '@/common/setup/table';
-import { getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { geLoginID_number } from '@/services/bus/login';
 import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
 import { queryTradeHolderDetail } from '@/services/go/order';

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_transfer/index.vue

@@ -1,86 +1,54 @@
 <template>
-  <!-- 转让-->
-  <Drawer :title="'转让'"
-          :placement="'right'"
-          :visible="visible"
-          class="delistingBottom"
-          @cancel="cancel">
-    <div class="listed">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="合约"
-                           name="goodsid">
-                <a-select class="inlineFormSelect"
-                          :default-value="selectedRow.goodsid"
-                          v-model:value="formState.goodsid"
-                          style="width: 100%">
-                  <a-select-option v-for="item in tableList"
-                                   :value="item.goodsid"
-                                   :key="item.goodsid">{{item.goodsname}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="挂牌价"
-                           name="price">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.price"
-                                style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="挂牌数量"
-                           name="num">
-                <a-input-number class="commonInput"
-                                :max="getMax()"
-                                v-model:value="formState.num"
-                                style="width: 100%" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="挂牌金额">
-                <a-input class="commonInput"
-                         :value="getMoney()"
-                         style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="getMax()"
-                          class="formSlider"
-                          style="width: 180px" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{getMax()}}{{selectedRow.enumdicname}}</span>
+    <!-- 转让-->
+    <Drawer :title="'转让'" :placement="'right'" :visible="visible" class="delistingBottom" @cancel="cancel">
+        <div class="listed">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="合约" name="goodsid">
+                                <a-select class="inlineFormSelect" :default-value="selectedRow.goodsid" v-model:value="formState.goodsid" style="width: 100%">
+                                    <a-select-option v-for="item in tableList" :value="item.goodsid" :key="item.goodsid">{{ item.goodsname }} </a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="挂牌价" name="price">
+                                <a-input-number class="commonInput" v-model:value="formState.price" style="width: 100%" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="挂牌数量" name="num">
+                                <a-input-number class="commonInput" :max="getMax()" v-model:value="formState.num" style="width: 100%" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="挂牌金额">
+                                <a-input class="commonInput" :value="getMoney()" style="width: 100%" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider :min="0" v-model:value="formState.num" :max="getMax()" class="formSlider" style="width: 180px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ getMax() }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">提交</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">提交</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -95,7 +63,7 @@ import { FormState } from './interface';
 import UploadImg from '@/common/components/uploadImg/index.vue';
 import { getUploadImg } from '@/common/setup/upload';
 import { PerformanceContractedApplyReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
-import { getSelectedAccount, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getSelectedAccount, getSelectedAccountId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { performanceContractedApply, performanceDelayApply } from '@/services/proto/performance';
 import { BuyOrSell, DelistingType, PriceType } from '@/common/constants/enumCommon';

src/views/order/performance_information/components/components/breach_contract/index.vue

@@ -7,27 +7,27 @@
                     <a-row :gutter="24">
                         <a-col :span="12">
                             <a-form-item label="品种">
-                                <span class="white">{{selectedRow.deliverygoodsname}}</span>
+                                <span class="white">{{ selectedRow.deliverygoodsname }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="12">
                             <a-form-item label="仓库">
-                                <span class="white">{{selectedRow.warehousename}}</span>
+                                <span class="white">{{ selectedRow.warehousename }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="履约商品">
-                                <span class="white">{{selectedRow.wrtypename}}</span>
+                                <span class="white">{{ selectedRow.wrtypename }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="当前步骤">
-                                <span class="white">{{selectedRow.curstepname}}</span>
+                                <span class="white">{{ selectedRow.curstepname }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="关联单号">
-                                <span class="white">{{selectedRow.relatedorderid}}</span>
+                                <span class="white">{{ selectedRow.relatedorderid }}</span>
                             </a-form-item>
                         </a-col>
                         <!--            <a-col :span="24">-->
@@ -40,11 +40,7 @@
                         <!--            </a-col>-->
                         <a-col :span="24">
                             <a-form-item label="备注" name="remark">
-                                <a-input
-                                    class="commonInput"
-                                    v-model:value="formState.remark"
-                                    style="width: 100%"
-                                />
+                                <a-input class="commonInput" v-model:value="formState.remark" style="width: 100%" />
                             </a-form-item>
                         </a-col>
                     </a-row>
@@ -52,12 +48,7 @@
                 <a-row :gutter="24">
                     <a-col :span="24" class="fixedBtns">
                         <a-form-item class="btnCenter">
-                            <a-button
-                                class="listedBtn"
-                                :loading="loading"
-                                :disabled="loading"
-                                @click="submit"
-                            >提交</a-button>
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">提交</a-button>
                         </a-form-item>
                     </a-col>
                 </a-row>
@@ -78,7 +69,8 @@ import { FormState } from './interface';
 import UploadImg from '@/common/components/uploadImg/index.vue';
 import { getUploadImg } from '@/common/setup/upload';
 import { PerformanceContractedApplyReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
-import { getSelectedAccount, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getSelectedAccount, getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { performanceContractedApply, performanceDelayApply } from '@/services/proto/performance';
 import { BuyOrSell } from '@/common/constants/enumCommon';

src/views/order/performance_information/components/components/extension/index.vue

@@ -1,59 +1,44 @@
 <template>
     <!-- 延期-->
-    <Drawer
-        :title="'延期申请'"
-        :placement="'right'"
-        class="delistingBottom"
-        :visible="visible"
-        @cancel="cancel"
-    >
+    <Drawer :title="'延期申请'" :placement="'right'" class="delistingBottom" :visible="visible" @cancel="cancel">
         <div class="listed">
             <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
                 <div class="formBar">
                     <a-row :gutter="24">
                         <a-col :span="12">
                             <a-form-item label="品种">
-                                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
+                                <span class="white ml10">{{ selectedRow.deliverygoodsname }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="12">
                             <a-form-item label="仓库">
-                                <span class="white ml10">{{selectedRow.warehousename}}</span>
+                                <span class="white ml10">{{ selectedRow.warehousename }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="履约商品">
-                                <span class="white ml10">{{selectedRow.wrtypename}}</span>
+                                <span class="white ml10">{{ selectedRow.wrtypename }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="当前步骤">
-                                <span class="white ml10">{{selectedRow.curstepname}}</span>
+                                <span class="white ml10">{{ selectedRow.curstepname }}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="关联单号">
-                                <span class="white ml10">{{selectedRow.relatedorderid}}}</span>
+                                <span class="white ml10">{{ selectedRow.relatedorderid }}}</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="申请延期天数" name="days" class="relative">
-                                <a-input-number
-                                    class="commonInput ml10"
-                                    :min="1"
-                                    v-model:value="formState.days"
-                                    style="width: 200px"
-                                />
+                                <a-input-number class="commonInput ml10" :min="1" v-model:value="formState.days" style="width: 200px" />
                                 <span class="input-enumdicname">天</span>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
                             <a-form-item label="备注" name="remark">
-                                <a-input
-                                    class="commonInput ml10"
-                                    v-model:value="formState.remark"
-                                    style="width: 420px"
-                                />
+                                <a-input class="commonInput ml10" v-model:value="formState.remark" style="width: 420px" />
                             </a-form-item>
                         </a-col>
                     </a-row>
@@ -61,12 +46,7 @@
                 <a-row :gutter="24">
                     <a-col :span="24" class="fixedBtns">
                         <a-form-item class="btnCenter">
-                            <a-button
-                                class="listedBtn"
-                                :loading="loading"
-                                :disabled="loading"
-                                @click="submit"
-                            >提交</a-button>
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">提交</a-button>
                         </a-form-item>
                     </a-col>
                 </a-row>
@@ -87,7 +67,7 @@ import { FormState } from './interface';
 import { PerformanceDelayApplyReq, PerformanceManualConfirmReq } from '@/services/proto/performance/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { performanceDelayApply, performanceManualConfirm } from '@/services/proto/performance';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
 import Long from 'long';

src/views/order/performance_information/components/components/settlement/index.vue

@@ -1,7 +1,6 @@
 <template>
-  <!-- 交收-->
-  <div>
-  </div>
+    <!-- 交收-->
+    <div> </div>
 </template>
 
 <script lang="ts">
@@ -11,13 +10,13 @@ import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { PerformanceActivateReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
-import { getAccount_longType, getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getAccount_longType, getSelectedAccountId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { performanceActivate, performanceContractedApply } from '@/services/proto/performance';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
 import { Modal } from 'ant-design-vue';
-import Long from "long";
+import Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_settlement,

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/index.vue

@@ -1,56 +1,40 @@
 <template>
-  <!-- 现货仓单 挂单 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable expandLeftTable"
-             :scroll="{ x: '100%', y: '190px' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             :expandIcon="expandIcon"
-             :expandIconAsCell="false"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #buyorsell="{ text }">
-        <span>{{ text ? '买' : '卖' }}</span>
-      </template>
-      <!--  委托状态-->
-      <!-- <template #wrtradeorderstatus="{ record }">
+    <!-- 现货仓单 挂单 -->
+    <section>
+        <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
+            </template>
+            <!-- 挂牌有效期 -->
+            <template #validtime="{ text }">
+                <span>{{ formatTime(text, 'd') }}</span>
+            </template>
+            <!-- 挂牌类型 -->
+            <template #buyorsell="{ text }">
+                <span>{{ text ? '买' : '卖' }}</span>
+            </template>
+            <!--  委托状态-->
+            <!-- <template #wrtradeorderstatus="{ record }">
         <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
       </template> -->
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
-      <template #applystatus="{ text }">
-        <span>{{ getBarmaginApplyStatus(text) }}</span>
-      </template>
-      <template #applytime="{ text }">
-        <span>{{ formatTime(text) }}</span>
-      </template>
-      <template #marginvalue="{ text }">
-        <span>{{ (text * 100).toFixed(2) }}%</span>
-      </template>
-      <!-- 挂牌价格 -->
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- 挂牌类型 -->
+            <template #wrtradetype="{ record }">
+                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+            </template>
+            <template #applystatus="{ text }">
+                <span>{{ getBarmaginApplyStatus(text) }}</span>
+            </template>
+            <template #applytime="{ text }">
+                <span>{{ formatTime(text) }}</span>
+            </template>
+            <template #marginvalue="{ text }">
+                <span>{{ (text * 100).toFixed(2) }}%</span>
+            </template>
+            <!-- 挂牌价格 -->
+        </a-table>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -66,7 +50,7 @@ import { BtnListType } from '@/common/components/btnList/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { getSpotWarrantBargainColumns } from './setup';
 import { formatTime } from '@/common/methods';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import Bus from '@/utils/eventBus';
 
 export default defineComponent({

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -1,298 +1,188 @@
 <template>
-  <!-- 预售仓单 现货明细 挂牌 -->
-  <Drawer :title="'挂牌'"
-          :placement="'right'"
-          class="delistingBottom650"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
+    <!-- 预售仓单 现货明细 挂牌 -->
+    <Drawer :title="'挂牌'" :placement="'right'" class="delistingBottom650" :visible="visible" @cancel="cancel">
+        <div class="listed">
+            <div class="condition">
+                <a-button class="conditionBtn">{{ selectedRow.deliverygoodsname }}</a-button>
+                <a-button class="conditionBtn">{{ selectedRow.wrtypename }}</a-button>
+                <a-button class="conditionBtn">{{ selectedRow.warehousename }}</a-button>
+            </div>
 
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="挂牌方式"
-                           name="WRPriceType">
-                <a-select class="inlineFormSelect"
-                          default-value="1"
-                          v-model:value="formState.WRPriceType"
-                          style="width: 140px">
-                  <a-select-option :value="1">一口价</a-select-option>
-                  <a-select-option :value="2">浮动价</a-select-option>
-                  <a-select-option :value="3">贸易圈</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="isFixed()">
-              <a-form-item label="挂牌价"
-                           name="FixedPrice">
-                <a-input-number class="dialogInput"
-                                :min="0"
-                                style="width: 140px"
-                                v-model:value="formState.FixedPrice"
-                                placeholder="请输入挂牌价" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="isBlocs()">
-              <a-form-item label="挂牌价格"
-                           name="FixedPrice"
-                           class="inputIconBox">
-                <a-input-number class="commonInput"
-                                style="width: 140px"
-                                :min="0"
-                                v-model:value="formState.FixedPrice" />
-                <a-checkbox class="commonCheckbox"
-                            v-model:checked="priceCheck">可议价</a-checkbox>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="isFloat()">
-              <a-form-item label="基差"
-                           name="PriceMove">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.PriceMove"
-                                style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty">
-                <a-input-number class="dialogInput"
-                                style="width: 140px !important"
-                                :min="0"
-                                v-model:value="formState.OrderQty"
-                                placeholder="请输入挂牌数量" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <a-checkbox class="commonCheckbox"
-                            v-if="isBlocs()"
-                            v-model:checked="numCheck">整单</a-checkbox>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="!numCheck">
-              <a-form-item label="起摘数量"
-                           class="relative"
-                           name="DelistMinQty">
-                <a-input-number class="commonInput"
-                                :min="0"
-                                v-model:value="formState.DelistMinQty"
-                                style="width: 140px !important" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <div class="tip">
-                  <span>最小单位：</span>
-                  <span>{{selectedRow.minivalue}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider v-model:value="formState.OrderQty"
-                          :min="0"
-                          :max="selectedRow.enableqty"
-                          class="formSlider"
-                          style="width: 140px;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="交收月"
-                           name="DeliveryMonth">
-                <a-month-picker style="width: 140px"
-                                v-model:value="formState.DeliveryMonth"
-                                :allowClear="false"
-                                class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item>&nbsp;</a-form-item>
-            </a-col>
-          </a-row>
-          <template v-if="isBlocs()">
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <a-form-item label="履约保证金"
-                             name="margin">
-                  <a-input-number class="commonInput"
-                                  v-model:value="formState.margin"
-                                  :min="0"
-                                  style="width: 140px" />
-                  <span class="input-enumdicname">%</span>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="挂牌有效期"
-                             name="vidaliteTime"
-                             class="inputIconBox">
-                  <a-date-picker style="width: 140px"
-                                 v-model:value="formState.vidaliteTime"
-                                 :allowClear="false"
-                                 class="commonDatePicker dialogDatePicker" />
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <a-form-item label="履约方式"
-                             class="inputIconBox">
-                  <span :class="['clickBox', formState.permanceTempName ? 'white' : '']"
-                        style="width: 140px"
-                        @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
-                  <svg class="icon svg-icon"
-                       aria-hidden="true"
-                       @click="openPermance">
-                    <use xlink:href="#icon-moban" />
-                  </svg>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="指定朋友"
-                             class="inputIconBox">
-                  <span :class="['clickBox', getFriendLength() ? 'white' : '']"
-                        style="width: 140px"
-                        @click="openFriend">{{getFriendLength() ? `已选${getFriendLength() }人` : '选择朋友'}}</span>
-                  <svg class="icon svg-icon"
-                       aria-hidden="true"
-                       @click="openFriend">
-                    <use xlink:href="#icon-pengyou1" />
-                  </svg>
-                  <a-checkbox class="commonCheckbox"
-                              v-model:checked="friendCheck"
-                              @change="limiteFriends">不限</a-checkbox>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </template>
-          <a-row :gutter="24"
-                 v-if="isFloat()">
-            <a-col :span="24">
-              <a-form-item label="行情商品"
-                           name="goodsid">
-                <!-- <a-select class="inlineFormSelect"
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="挂牌方式" name="WRPriceType">
+                                <a-select class="inlineFormSelect" default-value="1" v-model:value="formState.WRPriceType" style="width: 140px">
+                                    <a-select-option :value="1">一口价</a-select-option>
+                                    <a-select-option :value="2">浮动价</a-select-option>
+                                    <a-select-option :value="3">贸易圈</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="isFixed()">
+                            <a-form-item label="挂牌价" name="FixedPrice">
+                                <a-input-number class="dialogInput" :min="0" style="width: 140px" v-model:value="formState.FixedPrice" placeholder="请输入挂牌价" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="isBlocs()">
+                            <a-form-item label="挂牌价格" name="FixedPrice" class="inputIconBox">
+                                <a-input-number class="commonInput" style="width: 140px" :min="0" v-model:value="formState.FixedPrice" />
+                                <a-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="isFloat()">
+                            <a-form-item label="基差" name="PriceMove">
+                                <a-input-number class="commonInput" v-model:value="formState.PriceMove" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="挂牌数量" name="OrderQty">
+                                <a-input-number class="dialogInput" style="width: 140px !important" :min="0" v-model:value="formState.OrderQty" placeholder="请输入挂牌数量" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
+                                <a-checkbox class="commonCheckbox" v-if="isBlocs()" v-model:checked="numCheck">整单</a-checkbox>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="!numCheck">
+                            <a-form-item label="起摘数量" class="relative" name="DelistMinQty">
+                                <a-input-number class="commonInput" :min="0" v-model:value="formState.DelistMinQty" style="width: 140px !important" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
+                                <div class="tip">
+                                    <span>最小单位：</span>
+                                    <span>{{ selectedRow.minivalue }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12" class="mt-20">
+                            <a-form-item>
+                                <a-slider v-model:value="formState.OrderQty" :min="0" :max="selectedRow.enableqty" class="formSlider" style="width: 140px" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ selectedRow.enableqty }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="交收月" name="DeliveryMonth">
+                                <a-month-picker style="width: 140px" v-model:value="formState.DeliveryMonth" :allowClear="false" class="commonDatePicker dialogDatePicker" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item>&nbsp;</a-form-item>
+                        </a-col>
+                    </a-row>
+                    <template v-if="isBlocs()">
+                        <a-row :gutter="24">
+                            <a-col :span="12">
+                                <a-form-item label="履约保证金" name="margin">
+                                    <a-input-number class="commonInput" v-model:value="formState.margin" :min="0" style="width: 140px" />
+                                    <span class="input-enumdicname">%</span>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item label="挂牌有效期" name="vidaliteTime" class="inputIconBox">
+                                    <a-date-picker style="width: 140px" v-model:value="formState.vidaliteTime" :allowClear="false" class="commonDatePicker dialogDatePicker" />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row :gutter="24">
+                            <a-col :span="12">
+                                <a-form-item label="履约方式" class="inputIconBox">
+                                    <span :class="['clickBox', formState.permanceTempName ? 'white' : '']" style="width: 140px" @click="openPermance">{{ formState.permanceTempName ? formState.permanceTempName : '选择履约模板' }}</span>
+                                    <svg class="icon svg-icon" aria-hidden="true" @click="openPermance">
+                                        <use xlink:href="#icon-moban" />
+                                    </svg>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item label="指定朋友" class="inputIconBox">
+                                    <span :class="['clickBox', getFriendLength() ? 'white' : '']" style="width: 140px" @click="openFriend">{{ getFriendLength() ? `已选${getFriendLength()}人` : '选择朋友' }}</span>
+                                    <svg class="icon svg-icon" aria-hidden="true" @click="openFriend">
+                                        <use xlink:href="#icon-pengyou1" />
+                                    </svg>
+                                    <a-checkbox class="commonCheckbox" v-model:checked="friendCheck" @change="limiteFriends">不限</a-checkbox>
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-row :gutter="24" v-if="isFloat()">
+                        <a-col :span="24">
+                            <a-form-item label="行情商品" name="goodsid">
+                                <!-- <a-select class="inlineFormSelect"
                           style="width: 135px"
                           placeholder="请择交易所">
                                 </a-select>-->
-                <a-select class="inlineFormSelect ml5"
-                          @change="handleGoodsGroups"
-                          style="width: 135px"
-                          v-model:value="formState.goodsgroupid"
-                          placeholder="请选择商品">
-                  <a-select-option v-for="item in goodsGroup"
-                                   :value="item.goodsgroupid"
-                                   :key="item.goodsgroupid">{{item.goodsgroupname}}
-                  </a-select-option>
-                </a-select>
-                <a-select class="inlineFormSelect ml5"
-                          style="width: 135px"
-                          @change="handleGoodsChange"
-                          v-model:value="formState.goodsid"
-                          placeholder="请选择合约">
-                  <a-select-option v-for="item in goodsList"
-                                   :value="item.goodsid"
-                                   :key="item.goodsid">{{item.goodsname}}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   v-if="isFloat()"
-                   class="relative">
-              <a-form-item :label="'估算价'">
-                <span class="white ml8">{{getPrice()}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   v-if="isFloat()"
-                   class="relative">
-              <a-form-item :label="'估算金额'">
-                <span class="white ml8">{{getWrMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isFixed()"
-                   class="relative">
-              <a-form-item :label="'挂牌金额'">
-                <span class="white ml8">{{getWrMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isBlocs()"
-                   class="relative">
-              <a-form-item :label="'挂牌金额'">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="getWrMargin() && !isBlocs()">
-              <a-form-item :label="getWrMargin() ? '履约保证金' : ''">
-                <span class="white ml8">{{getWrMargin()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isBlocs()">
-              <a-form-item label="履约保证金">
-                <span class="white ml8">{{getMargin()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="可用资金">
-                <span class="white ml8">{{getCanUseMoney(handleSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                                <a-select class="inlineFormSelect ml5" @change="handleGoodsGroups" style="width: 135px" v-model:value="formState.goodsgroupid" placeholder="请选择商品">
+                                    <a-select-option v-for="item in goodsGroup" :value="item.goodsgroupid" :key="item.goodsgroupid">{{ item.goodsgroupname }} </a-select-option>
+                                </a-select>
+                                <a-select class="inlineFormSelect ml5" style="width: 135px" @change="handleGoodsChange" v-model:value="formState.goodsid" placeholder="请选择合约">
+                                    <a-select-option v-for="item in goodsList" :value="item.goodsid" :key="item.goodsid">{{ item.goodsname }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" v-if="isFloat()" class="relative">
+                            <a-form-item :label="'估算价'">
+                                <span class="white ml8">{{ getPrice() }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" v-if="isFloat()" class="relative">
+                            <a-form-item :label="'估算金额'">
+                                <span class="white ml8">{{ getWrMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isFixed()" class="relative">
+                            <a-form-item :label="'挂牌金额'">
+                                <span class="white ml8">{{ getWrMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isBlocs()" class="relative">
+                            <a-form-item :label="'挂牌金额'">
+                                <span class="white ml8">{{ getMoney() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="getWrMargin() && !isBlocs()">
+                            <a-form-item :label="getWrMargin() ? '履约保证金' : ''">
+                                <span class="white ml8">{{ getWrMargin() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isBlocs()">
+                            <a-form-item label="履约保证金">
+                                <span class="white ml8">{{ getMargin() }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="可用资金">
+                                <span class="white ml8">{{ getCanUseMoney(handleSelectedAccount()) }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">卖出</a-button>
+                            <a-button class="ml10 cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">卖出</a-button>
-              <a-button class="ml10 cancelBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          :friends="formState.friends"
-          :position="'bottom'"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            :position="'bottom'"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" :friends="formState.friends" :position="'bottom'" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance v-if="showPermance" :position="'bottom'" @cancel="choosePermance" @update="choosePermance" />
 </template>
 
 <script lang="ts">
@@ -305,7 +195,8 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { useBlocksAccount, useBlocksFriends, useBlocksMoney, useBlocksNumber, useBlocksPermaceTemp, useBlocksPrice } from '@/common/setup/warehouse_receipt_trade/listing';
-import { getAccountTypeList, getCanUseMoney, getInTaAccount, getSelectedAccount, getUserId } from '@/services/bus/account';
+import { getAccountTypeList, getCanUseMoney, getInTaAccount, getSelectedAccount } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
 import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { WrPosition } from '@/services/go/wrtrade/interface';
@@ -352,7 +243,7 @@ export default defineComponent({
             formRef.value.validate();
         }
         const uuid = v4();
-                const goodsCode = ref<string>('');
+        const goodsCode = ref<string>('');
         // 切换商品
         function handleGoodsChange(id: number) {
             //行情订阅

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/components/cancle/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <!-- 预售仓单 现货明细 撤单 -->
-  <div></div>
+    <!-- 预售仓单 现货明细 撤单 -->
+    <div></div>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderDetail } from '@/services/go/wrtrade/interface';
-import { getInTaAccount, getUserId } from '@/services/bus/account';
+import { getInTaAccount } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { wRListingCancelOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/order/spot_warran/components/spot_warrant_bargain/index.vue

@@ -1,56 +1,40 @@
 <template>
-  <!-- 现货仓单 议价 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable expandLeftTable"
-             :scroll="{ x: '100%', y: '190px' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             :expandIcon="expandIcon"
-             :expandIconAsCell="false"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <!-- 挂牌有效期 -->
-      <template #validtime="{ text }">
-        <span>{{ formatTime(text, 'd') }}</span>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #buyorsell="{ text }">
-        <span>{{ text ? '买' : '卖' }}</span>
-      </template>
-      <template #marginvalue="{ text }">
-        <span>{{ (text * 100).toFixed(2) }}%</span>
-      </template>
-      <!--  委托状态-->
-      <!-- <template #wrtradeorderstatus="{ record }">
+    <!-- 现货仓单 议价 -->
+    <section>
+        <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList" :record="record" class="btn-list-sticky" @click="openComponent" />
+            </template>
+            <!-- 挂牌有效期 -->
+            <template #validtime="{ text }">
+                <span>{{ formatTime(text, 'd') }}</span>
+            </template>
+            <!-- 挂牌类型 -->
+            <template #buyorsell="{ text }">
+                <span>{{ text ? '买' : '卖' }}</span>
+            </template>
+            <template #marginvalue="{ text }">
+                <span>{{ (text * 100).toFixed(2) }}%</span>
+            </template>
+            <!--  委托状态-->
+            <!-- <template #wrtradeorderstatus="{ record }">
         <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
       </template> -->
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
-      <template #applystatus="{ text }">
-        <span>{{ getBarmaginApplyStatus(text) }}</span>
-      </template>
-      <template #applytime="{ text }">
-        <span>{{ formatTime(text) }}</span>
-      </template>
-      <!-- 挂牌价格 -->
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- 挂牌类型 -->
+            <template #wrtradetype="{ record }">
+                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+            </template>
+            <template #applystatus="{ text }">
+                <span>{{ getBarmaginApplyStatus(text) }}</span>
+            </template>
+            <template #applytime="{ text }">
+                <span>{{ formatTime(text) }}</span>
+            </template>
+            <!-- 挂牌价格 -->
+        </a-table>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -66,7 +50,7 @@ import { BtnListType } from '@/common/components/btnList/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { getSpotWarrantBargainColumns } from './setup';
 import { formatTime } from '@/common/methods';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import Bus from '@/utils/eventBus';
 
 export default defineComponent({

src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/components/cancel/index.vue

@@ -1,7 +1,6 @@
 <template>
-  <!-- 撤销-->
-  <div>
-  </div>
+    <!-- 撤销-->
+    <div> </div>
 </template>
 
 <script lang="ts">
@@ -14,7 +13,7 @@ import { Modal } from 'ant-design-vue';
 import { WROutCancel } from '@/services/proto/warehousetrade';
 import { WROutCancelReq } from '@/services/proto/warehousetrade/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { v4 as uuidv4 } from 'uuid';
 import Long from 'long';
 

src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/components/pick_up/index.vue

@@ -1,7 +1,6 @@
 <template>
-  <!-- 确认提货-->
-  <div>
-  </div>
+    <!-- 确认提货-->
+    <div> </div>
 </template>
 
 <script lang="ts">
@@ -13,7 +12,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { WROutConfirmReq, WRTradeFinanceBuyCancelReq } from '@/services/proto/warehousetrade/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { v4 as uuidv4 } from 'uuid';
 import Long from 'long';
 import { WROutConfirm } from '@/services/proto/warehousetrade';

src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing/index.vue

@@ -13,11 +13,7 @@
                     <a-row :gutter="24">
                         <a-col :span="12">
                             <a-form-item label="挂牌方式">
-                                <a-select
-                                    class="inlineFormSelect"
-                                    default-value="1"
-                                    style="width: 140px"
-                                >
+                                <a-select class="inlineFormSelect" default-value="1" style="width: 140px">
                                     <a-select-option value="1">一口价</a-select-option>
                                     <a-select-option value="2">一口价2</a-select-option>
                                 </a-select>
@@ -37,11 +33,7 @@
                         </a-col>
                         <a-col :span="12">
                             <a-form-item label="起摘数量" class="relative">
-                                <a-input
-                                    class="commonInput"
-                                    suffix="吨"
-                                    style="width: 140px !important"
-                                />
+                                <a-input class="commonInput" suffix="吨" style="width: 140px !important" />
                                 <div class="tip">最小单位：1吨</div>
                             </a-form-item>
                         </a-col>
@@ -61,24 +53,12 @@
                     <a-row :gutter="24">
                         <a-col :span="24">
                             <a-form-item label="行情商品">
-                                <a-select
-                                    class="inlineFormSelect"
-                                    style="width: 135px"
-                                    placeholder="请选择交易所"
-                                >
+                                <a-select class="inlineFormSelect" style="width: 135px" placeholder="请选择交易所">
                                     <!-- <a-select-option value="1">一口价</a-select-option>
                                     <a-select-option value="2">一口价2</a-select-option>-->
                                 </a-select>
-                                <a-select
-                                    class="inlineFormSelect ml5"
-                                    style="width: 135px"
-                                    placeholder="请选择商品"
-                                ></a-select>
-                                <a-select
-                                    class="inlineFormSelect ml5"
-                                    style="width: 135px"
-                                    placeholder="请选择合约"
-                                ></a-select>
+                                <a-select class="inlineFormSelect ml5" style="width: 135px" placeholder="请选择商品"></a-select>
+                                <a-select class="inlineFormSelect ml5" style="width: 135px" placeholder="请选择合约"></a-select>
                             </a-form-item>
                         </a-col>
                     </a-row>
@@ -101,7 +81,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
 import { QueryWrPositionReq, WrHoldLB, WrPosition } from '@/services/go/wrtrade/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/order/spot_warran/components/spot_warrant_pending_order/components/cancle/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <!-- 现货仓单 现货明细 撤单 -->
-  <div></div>
+    <!-- 现货仓单 现货明细 撤单 -->
+    <div></div>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderDetail } from '@/services/go/wrtrade/interface';
-import { getInTaAccount, getUserId } from '@/services/bus/account';
+import { getInTaAccount } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { wRListingCancelOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -185,7 +185,8 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { useBlocksAccount, useBlocksFriends, useBlocksMoney, useBlocksNumber, useBlocksPermaceTemp, useBlocksPrice } from '@/common/setup/warehouse_receipt_trade/listing';
-import { getCanUseMoney, getInTaAccount, getUserId } from '@/services/bus/account';
+import { getCanUseMoney, getInTaAccount } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
 import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { WrHoldLB } from '@/services/go/wrtrade/interface';

src/views/order/spot_warran/components/spot_warrant_spot_details/components/pick_up/index.vue

@@ -1,115 +1,81 @@
 <template>
-  <!-- 现货仓单 现货明细 提货 true -->
-  <Drawer :title="'提货'"
-          :placement="'right'"
-          class="bottom"
-          :visible="visible"
-          @cancel="cancel">
-    <!-- 挂牌 -->
-    <div class="listed">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="提货数量"
-                           name="OutQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.OutQty"
-                                :min="0"
-                                :max="selectedRow.enableqty"
-                                style="width: 140px" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="提货人"
-                           name="ContactName">
-                <a-input class="commonInput"
-                         v-model:value="formState.ContactName"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12"
-                   class="mt-20">
-              <a-form-item>
-                <!-- <a-progress class="formProgress" :percent="30" /> -->
-                <a-slider v-model:value="formState.OutQty"
-                          :min="0"
-                          :max="selectedRow.enableqty"
-                          class="formSlider"
-                          style="width: 140px !important;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
+    <!-- 现货仓单 现货明细 提货 true -->
+    <Drawer :title="'提货'" :placement="'right'" class="bottom" :visible="visible" @cancel="cancel">
+        <!-- 挂牌 -->
+        <div class="listed">
+            <div class="condition">
+                <a-button class="conditionBtn">{{ selectedRow.deliverygoodsname }}</a-button>
+                <a-button class="conditionBtn">{{ selectedRow.wrtypename }}</a-button>
+                <a-button class="conditionBtn">{{ selectedRow.warehousename }}</a-button>
+            </div>
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="提货数量" name="OutQty">
+                                <a-input-number class="commonInput" v-model:value="formState.OutQty" :min="0" :max="selectedRow.enableqty" style="width: 140px" />
+                                <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="提货人" name="ContactName">
+                                <a-input class="commonInput" v-model:value="formState.ContactName" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12" class="mt-20">
+                            <a-form-item>
+                                <!-- <a-progress class="formProgress" :percent="30" /> -->
+                                <a-slider v-model:value="formState.OutQty" :min="0" :max="selectedRow.enableqty" class="formSlider" style="width: 140px !important" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{ selectedRow.enableqty }}{{ selectedRow.enumdicname }}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="联系方式" name="ContactNum">
+                                <a-input class="commonInput" v-model:value="formState.ContactNum" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="预约日期" name="AppointmentDate">
+                                <a-date-picker class="commonDatePicker dialogDatePicker" allowClear="false" v-model:value="formState.AppointmentDate" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="备注" name="AppointmentRemark">
+                                <a-input class="commonInput" v-model:value="formState.AppointmentRemark" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="联系方式"
-                           name="ContactNum">
-                <a-input class="commonInput"
-                         v-model:value="formState.ContactNum"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="预约日期"
-                           name="AppointmentDate">
-                <a-date-picker class="commonDatePicker dialogDatePicker"
-                               allowClear="false"
-                               v-model:value="formState.AppointmentDate"
-                               style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="备注"
-                           name="AppointmentRemark">
-                <a-input class="commonInput"
-                         v-model:value="formState.AppointmentRemark"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button class="listedBtn" :loading="loading" :disabled="loading" @click="submit">提货</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="submit">提货</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrHoldLB } from '@/services/go/wrtrade/interface';
-import { getSelectedAccountId, getUserId } from '@/services/bus/account';
+import { getSelectedAccountId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { wROutApply } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/order/spot_warran/components/spot_warrant_spot_summary/components/index.vue

@@ -17,7 +17,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
 import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';

src/views/platinum/platinum_agreement/compoments/add/index.vue

@@ -1,79 +1,43 @@
 <template>
-  <!-- 新增协议-->
-  <a-modal class="add-custom"
-           title="新增协议"
-           v-model:visible="visible"
-           @cancel="colseAction"
-           centered
-           :maskClosable="false"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit()">新增
-      </a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="协议编号"
-                       name="agreementno">
-            <a-input class="dialogInput"
-                     v-model:value="formState.agreementno"
-                     style="width: 200px"
-                     placeholder="请输入协议编号" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="协议名称"
-                       name="agreementname">
-            <a-input class="dialogInput"
-                     v-model:value="formState.agreementname"
-                     style="width: 200px"
-                     placeholder="请输入协议名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="协议类型"
-                       name="agreementtype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.agreementtype"
-                      placeholder="请选择协议类型">
-              <a-select-option v-for="item in agreementTypeList"
-                               :value="item.value"
-                               :key="item.value">
-                {{item.lable}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="签署频率">
-            <a-input class="dialogInput"
-                     :value="getRate()"
-                     readonly
-                     style="width: 200px"
-                     placeholder="" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="协议内容"
-                       name="agreementcontent">
-            <a-textarea class="dialogInput"
-                        v-model:value="formState.agreementcontent"
-                        style="width: 635px"
-                        placeholder="请输入协议内容"
-                        :autosize="{ minRows: 8, maxRows: 24 }" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+    <!-- 新增协议-->
+    <a-modal class="add-custom" title="新增协议" v-model:visible="visible" @cancel="colseAction" centered :maskClosable="false" width="890px">
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit()">新增 </a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="协议编号" name="agreementno">
+                        <a-input class="dialogInput" v-model:value="formState.agreementno" style="width: 200px" placeholder="请输入协议编号" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="协议名称" name="agreementname">
+                        <a-input class="dialogInput" v-model:value="formState.agreementname" style="width: 200px" placeholder="请输入协议名称" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="协议类型" name="agreementtype">
+                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.agreementtype" placeholder="请选择协议类型">
+                            <a-select-option v-for="item in agreementTypeList" :value="item.value" :key="item.value">
+                                {{ item.lable }}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="签署频率">
+                        <a-input class="dialogInput" :value="getRate()" readonly style="width: 200px" placeholder="" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="协议内容" name="agreementcontent">
+                        <a-textarea class="dialogInput" v-model:value="formState.agreementcontent" style="width: 635px" placeholder="请输入协议内容" :autosize="{ minRows: 8, maxRows: 24 }" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -85,7 +49,7 @@ import { validateAction } from '@/common/setup/form';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { agreementConfigOperate } from '@/services/proto/manager';
 import { QHJAgreementConfigOperateReq } from '@/services/proto/manager/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { handleArgreementType } from '@/views/platinum/platinum_agreement/setup';
 import { _closeModal } from '@/common/setup/modal/modal';
 

src/views/platinum/platinum_agreement/compoments/modify/index.vue

@@ -1,15 +1,6 @@
 <template>
     <!-- 修改协议 -->
-    <a-modal
-        class="commonModal modify-custom"
-        title="修改协议"
-        v-if="visible"
-        v-model:visible="visible"
-        centered
-        :maskClosable="false"
-        @cancel="cancel"
-        width="890px"
-    >
+    <a-modal class="commonModal modify-custom" title="修改协议" v-if="visible" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
         <template #footer>
             <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">修改</a-button>
         </template>
@@ -17,38 +8,27 @@
             <a-row :gutter="24">
                 <a-col :span="12">
                     <a-form-item label="协议编号">
-                        <span class="white">{{formState.agreementno}}</span>
+                        <span class="white">{{ formState.agreementno }}</span>
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="协议名称" name="agreementname">
-                        <a-input
-                            class="dialogInput"
-                            v-model:value="formState.agreementname"
-                            style="width: 200px"
-                            placeholder="请输入协议名称"
-                        />
+                        <a-input class="dialogInput" v-model:value="formState.agreementname" style="width: 200px" placeholder="请输入协议名称" />
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="协议类型">
-                        <span class="white">{{getAgreementTypeName(formState.agreementtype)}}</span>
+                        <span class="white">{{ getAgreementTypeName(formState.agreementtype) }}</span>
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="签署频率" name="agreementname">
-                        <span class="white">{{getRate()}}</span>
+                        <span class="white">{{ getRate() }}</span>
                     </a-form-item>
                 </a-col>
                 <a-col :span="24">
                     <a-form-item label="协议内容" name="agreementcontent">
-                        <a-textarea
-                            class="dialogInput"
-                            v-model:value="formState.agreementcontent"
-                            style="width: 635px"
-                            placeholder="请输入协议内容"
-                            :autosize="{ minRows: 8, maxRows: 24 }"
-                        />
+                        <a-textarea class="dialogInput" v-model:value="formState.agreementcontent" style="width: 635px" placeholder="请输入协议内容" :autosize="{ minRows: 8, maxRows: 24 }" />
                     </a-form-item>
                 </a-col>
             </a-row>
@@ -65,7 +45,7 @@ import { validateAction } from '@/common/setup/form';
 import { QhjAgreementConfig } from '@/services/go/ermcp/qhj/interface';
 import { handleArgreementType } from '../../setup';
 import { QHJAgreementConfigOperateReq } from '@/services/proto/manager/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { agreementConfigOperate } from '@/services/proto/manager';
 import { getAgreementTypeName } from '@/common/constants/enumsName';

src/views/platinum/platinum_customer_info/compoments/add/index.vue

@@ -176,7 +176,7 @@ import { AllEnums } from '@/services/go/commonService/interface';
 import { FormState } from './interface';
 import { getAddress } from '@/services/go/adress';
 import { AddUserInfoApplyReq } from '@/services/go/ermcp/customInfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { addCustomerInfoOperate } from '@/services/proto/accountinfo';
 import { validateAction } from '@/common/setup/form';

src/views/platinum/platinum_customer_info/compoments/check/index.vue

@@ -15,7 +15,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { AuditWskhUserInfoReq, UserInfoCheckMangeReq } from '@/services/proto/accountinfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { auditWskhUserInfo, userInfoCheck } from '@/services/proto/accountinfo';

src/views/platinum/platinum_customer_info/compoments/modify/index.vue

@@ -172,7 +172,7 @@ import { AllEnums } from '@/services/go/commonService/interface';
 import { FormState } from '../add/interface';
 import { getAddress } from '@/services/go/adress';
 import { ModifyUserInfoApplyReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { addCustomerInfoOperate } from '@/services/proto/accountinfo';
 import { mergeTwoObj } from '@/utils/objHandle';

src/views/platinum/platinum_customer_info/list/normal-use/index.vue

@@ -1,43 +1,33 @@
 <template>
-  <!-- 客户信息: 正常 -->
-  <div class="custom-normal"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === 2 ? '企业' : '个人' }}</a>
-        </template>
-        <!-- 这个状态比较特殊 判断查询类型querytype  如果是wskh表 则使用网上开户的枚举  如果是正式表 则使用正式表的枚举 -->
-        <template #status="{ record }">
-          <a>{{record.statusdesc }}</a>
-        </template>
-        <template #cardtype="{ text }">
-          <a>{{ text === 0 ? "" : getCardTypeEnumItemName(text) }}</a>
-        </template>
-        <!-- 客户名称 -->
-        <template #customername="{ record }">
-          <a>{{  record.username }}</a>
-        </template>
-
-      </a-table>
-    </contextMenu>
-    <Middle :selectedRow="selectedRow"
-            @refresh="update" />
-  </div>
+    <!-- 客户信息: 正常 -->
+    <div class="custom-normal" :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn" />
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{}">
+                    <BtnList :btnList="forDataBtn" />
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === 2 ? '企业' : '个人' }}</a>
+                </template>
+                <!-- 这个状态比较特殊 判断查询类型querytype  如果是wskh表 则使用网上开户的枚举  如果是正式表 则使用正式表的枚举 -->
+                <template #status="{ record }">
+                    <a>{{ record.statusdesc }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ text === 0 ? '' : getCardTypeEnumItemName(text) }}</a>
+                </template>
+                <!-- 客户名称 -->
+                <template #customername="{ record }">
+                    <a>{{ record.username }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <Middle :selectedRow="selectedRow" @refresh="update" />
+    </div>
 </template>
 
 <script lang="ts">
@@ -48,7 +38,7 @@ import { getStatusName, getWSKHStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { queryCustomerInfo } from '@/services/go/ermcp/qhj';
 export default defineComponent({
     name: 'custom-normal',

src/views/platinum/platinum_customer_info/list/setup.ts

@@ -1,4 +1,4 @@
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { queryCustomerInfo } from '@/services/go/ermcp/qhj';
 import { QueryCustomerInfoReq } from "@/services/go/ermcp/qhj/interface";
 

src/views/platinum/platinum_customer_info/list/stop-use/index.vue

@@ -1,42 +1,33 @@
 <template>
-  <!-- 客户信息: 停用 -->
-  <div class="custom-normal"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               :pagination="false"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === 2 ? '企业' : '个人' }}</a>
-        </template>
-        <!-- 这个状态比较特殊 判断查询类型querytype  如果是wskh表 则使用网上开户的枚举  如果是正式表 则使用正式表的枚举 -->
-        <template #status="{ record }">
-          <a>{{record.statusdesc }}</a>
-        </template>
-        <template #cardtype="{ text }">
-          <a>{{ text === 0 ? "" : getCardTypeEnumItemName(text) }}</a>
-        </template>
-        <!-- 客户名称 -->
-        <template #customername="{ record }">
-          <a>{{ record.username }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <Middle :selectedRow="selectedRow"
-            @refresh="update" />
-  </div>
+    <!-- 客户信息: 停用 -->
+    <div class="custom-normal" :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn" />
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :pagination="false" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{}">
+                    <BtnList :btnList="forDataBtn" />
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === 2 ? '企业' : '个人' }}</a>
+                </template>
+                <!-- 这个状态比较特殊 判断查询类型querytype  如果是wskh表 则使用网上开户的枚举  如果是正式表 则使用正式表的枚举 -->
+                <template #status="{ record }">
+                    <a>{{ record.statusdesc }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ text === 0 ? '' : getCardTypeEnumItemName(text) }}</a>
+                </template>
+                <!-- 客户名称 -->
+                <template #customername="{ record }">
+                    <a>{{ record.username }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <Middle :selectedRow="selectedRow" @refresh="update" />
+    </div>
 </template>
 
 <script lang="ts">
@@ -46,7 +37,7 @@ import { getStatusName, getWSKHStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { handleSearch } from '../setup';
 import { queryCustomerInfo } from '@/services/go/ermcp/qhj';
 

src/views/platinum/platinum_customer_info/list/unsubmit/index.vue

@@ -1,41 +1,32 @@
 <template>
-  <!-- 客户信息: 正常 -->
-  <div class="custom_info_unsubmit"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="firstBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="secondeBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="secondeBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === 2 ? '企业' : '个人' }}</a>
-        </template>
-        <template #customername="{ record }">
-          <a>{{ record.username }}</a>
-        </template>
-        <!-- 这个状态比较特殊 判断查询类型querytype  如果是wskh表 则使用网上开户的枚举  如果是正式表 则使用正式表的枚举 -->
-        <template #status="{ record }">
-          <a>{{record.statusdesc }}</a>
-        </template>
-        <template #cardtype="{ text }">
-          <a>{{ text === 0 ? "" : getCardTypeEnumItemName(text) }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <Middle :selectedRow="selectedRow"
-            @refresh="update" />
-  </div>
+    <!-- 客户信息: 正常 -->
+    <div class="custom_info_unsubmit" :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="firstBtn" />
+        </filterCustomTable>
+        <contextMenu :contextMenuList="secondeBtn">
+            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{}">
+                    <BtnList :btnList="secondeBtn" />
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === 2 ? '企业' : '个人' }}</a>
+                </template>
+                <template #customername="{ record }">
+                    <a>{{ record.username }}</a>
+                </template>
+                <!-- 这个状态比较特殊 判断查询类型querytype  如果是wskh表 则使用网上开户的枚举  如果是正式表 则使用正式表的枚举 -->
+                <template #status="{ record }">
+                    <a>{{ record.statusdesc }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ text === 0 ? '' : getCardTypeEnumItemName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <Middle :selectedRow="selectedRow" @refresh="update" />
+    </div>
 </template>
 
 <script lang="ts">
@@ -46,7 +37,7 @@ import { getStatusName, getWSKHStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { handleSearch } from '../setup';
 import { queryCustomerInfo } from '@/services/go/ermcp/qhj';
 export default defineComponent({

src/views/platinum/platinum_document_query/list/order/index.vue

@@ -1,35 +1,25 @@
 <template>
-  <!-- 单据查询 委托单-->
-  <div class="platinum_document_query_order">
-    <Filter @search="search" />
-    <contextMenu :contextMenuList="firstBtn">
-      <a-table :columns="columns"
-               class="topOrderTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-          <BtnList :btnList="firstBtn"
-                   class="btn-list-sticky"
-                   @onClick="btnClick(record)" />
-        </template>
-        <!-- 账户类型 -->
-        <template #userinfotype="{ record }">
-          <a>{{ record.userinfotype === 1 ? "个人" : "企业" }}</a>
-        </template>
-        <!-- 委托状态 -->
-        <template #orderstatus="{ record }">
-          <a>{{ getOrderStatusName(record.orderstatus) }}</a>
-        </template>
-
-      </a-table>
-    </contextMenu>
-    <!-- <ControlModal :selectedRow="selectedRow" /> -->
-  </div>
+    <!-- 单据查询 委托单-->
+    <div class="platinum_document_query_order">
+        <Filter @search="search" />
+        <contextMenu :contextMenuList="firstBtn">
+            <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="firstBtn" class="btn-list-sticky" @onClick="btnClick(record)" />
+                </template>
+                <!-- 账户类型 -->
+                <template #userinfotype="{ record }">
+                    <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
+                </template>
+                <!-- 委托状态 -->
+                <template #orderstatus="{ record }">
+                    <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- <ControlModal :selectedRow="selectedRow" /> -->
+    </div>
 </template>
 
 <script lang="ts">
@@ -38,7 +28,7 @@ import { queryTradeOrderDetail } from '@/services/go/ermcp/qhj';
 import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import Filter from '../../compoments/filter/index.vue';
 import { QueryTradeOrderDetailReq } from '@/services/go/ermcp/qhj/interface';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 import { getOrderStatusName } from '@/common/constants/enumsName';
 
 export default defineComponent({

src/views/platinum/platinum_document_query/list/position/index.vue

@@ -1,31 +1,21 @@
 <template>
-  <!-- 单据查询 持仓-->
-  <div class="platinum_document_query_position">
-    <Filter @search="search" />
-    <contextMenu :contextMenuList="firstBtn">
-      <a-table :columns="columns"
-               class="topOrderTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-          <BtnList :btnList="firstBtn"
-                   class="btn-list-sticky"
-                   @onClick="btnClick(record)" />
-        </template>
-        <!-- 账户类型 -->
-        <template #userinfotype="{ record }">
-          <a>{{ record.userinfotype === 1 ? "个人" : "企业" }}</a>
-        </template>
-
-      </a-table>
-    </contextMenu>
-    <!-- <ControlModal :selectedRow="selectedRow" /> -->
-  </div>
+    <!-- 单据查询 持仓-->
+    <div class="platinum_document_query_position">
+        <Filter @search="search" />
+        <contextMenu :contextMenuList="firstBtn">
+            <a-table :columns="columns" class="topOrderTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="firstBtn" class="btn-list-sticky" @onClick="btnClick(record)" />
+                </template>
+                <!-- 账户类型 -->
+                <template #userinfotype="{ record }">
+                    <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- <ControlModal :selectedRow="selectedRow" /> -->
+    </div>
 </template>
 
 <script lang="ts">
@@ -34,7 +24,7 @@ import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
 import { QueryTradePositionReq } from 'src/services/go/ermcp/qhj/interface';
 import Filter from './compoments/filter/index.vue';
 import { queryTradePosition } from '@/services/go/ermcp/qhj';
-import { getUserId } from '@/services/bus/account';
+import { getUserId } from '@/services/bus/user';
 
 export default defineComponent({
     name: 'platinum_document_query_position',