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

src/common/components/capitalInfo/index.less

@@ -37,6 +37,7 @@
                 }
 
                 &:last-child {
+                    text-align  : right;
                     border-right: 0;
                 }
             }

src/common/components/capitalInfo/index.vue

@@ -39,7 +39,7 @@
           </tr>
           <tr>
             <td>浮盈</td>
-            <td :class="tradeAccount.positionProfitAndLoss > 0 ? 'up-quote-color' : 'down-quote-color'">{{showValue(tradeAccount.positionProfitAndLoss.toFixed(2))}}</td>
+            <td :class="{ 'up-quote-color': tradeAccount.positionProfitAndLoss > 0, 'down-quote-color': tradeAccount.positionProfitAndLoss < 0 } ">{{showValue(tradeAccount.positionProfitAndLoss.toFixed(2))}}</td>
           </tr>
           <tr>
             <td>风险率</td>

src/common/components/thirdMenu/index.vue

@@ -11,41 +11,41 @@
 import { defineComponent, ref, PropType } from 'vue';
 
 interface Key {
-    [propName: string]: string;
+  [propName: string]: string;
 }
 
 export default defineComponent({
-    name: 'third-menu',
-    emits: ['selectMenu'],
-    props: {
-        list: {
-            default: [],
-            type: Object as PropType<Key[]>,
-        },
-        value: {
-            // 需要绑定的值得 key
-            default: 'lable',
-            type: String,
-        },
-        selectedKey: {
-            default: '0',
-            type: String,
-        },
+  name: 'third-menu',
+  emits: ['selectMenu'],
+  props: {
+    list: {
+      default: [],
+      type: Object as PropType<Key[]>,
     },
-    components: {},
-    setup(props, context) {
-        const current = ref<string>(props.selectedKey.toString());
-
-        function menuClick(value: string) {
-            const index = +value;
-            const item = props.list[index];
-            context.emit('selectMenu', +value, item);
-        }
-        return {
-            current,
-            menuClick,
-        };
+    value: {
+      // 需要绑定的值得 key
+      default: 'lable',
+      type: String,
+    },
+    selectedKey: {
+      default: '0',
+      type: String,
     },
+  },
+  components: {},
+  setup(props, context) {
+    const current = ref<string>(props.selectedKey.toString());
+
+    function menuClick(value: string) {
+      const index = +value;
+      const item = props.list[index];
+      context.emit('selectMenu', +value, item);
+    }
+    return {
+      current,
+      menuClick,
+    };
+  },
 });
 </script>
 
@@ -56,7 +56,7 @@ export default defineComponent({
 .thirdMenu {
     width: 100%;
     height: 28px;
-    padding-bottom: 2px;
+    padding: 1px 0;
     background-color: @m-black5;
     z-index: 2;
     .ant-tabs {

src/hooks/account/index.ts

@@ -8,9 +8,11 @@ import { Taaccount } from "@/services/go/TaAccount/interface";
 import { geLoginID_number } from '@/services/bus/login';
 import { Systemparam } from '@/services/go/useInfo/interface';
 import { getSelectedAccountId, setSelectedAccount } from '@/services/bus/account';  // 为了兼容以前代码，待优化后期废除
+import { subcriteGoodsQuote } from '@/common/setup/table/tableQuote';
 import { TradeAccount, TradePosition } from './interface'
 import APP from '@/services';
 
+let stopSubcribe: () => void;
 // 加载状态
 const loading = ref<boolean>(false);
 // 资金账户列表
@@ -63,12 +65,18 @@ export function useTradeAccount() {
 
     // 切换资金账户
     const tradeAccountChange = (accountId: number) => {
+        // 停止上次订阅
+        stopSubcribe && stopSubcribe();
+
         const account = tradeAccountList.find((account) => account.accountid === accountId);
         if (account) {
             tradePositionList.length = 0;
             tradeAccount.value = account;
             tradePositionList.push(...account.positionList);
             setSelectedAccount(account); // 为了兼容以前代码，待优化后期废除
+
+            // 开始行情订阅
+            stopSubcribe = subcriteGoodsQuote(account.positionList.map((e) => e.goodscode));
         }
     }
 
@@ -167,7 +175,14 @@ function calcCapitalValue(account: Taaccount, positionList: TradePosition[]) {
     const positionProfitAndLoss = computed(() => positionList.reduce((res, item) => res + item.positionProfitAndLoss.value, 0));
 
     // 计算总市值
-    const marketCap = computed(() => positionList.reduce((res, item) => res + item.capitalization.value, 0));
+    const marketCap = computed(() => {
+        // 根据系统参数“087 风险净值是否加上市值 - 0:不加 1:加“
+        const flag = systemParams.find((e) => e.paramcode === '087')?.paramvalue === '1';
+        if (flag) {
+            return positionList.reduce((res, item) => res + item.capitalization.value, 0);
+        }
+        return 0;
+    });
 
     // 计算可用资金
     const availableBalance = computed(() => {
@@ -205,9 +220,9 @@ function calcCapitalValue(account: Taaccount, positionList: TradePosition[]) {
 
     // 计算冻结资金
     const freezeAmount = computed(() => {
-        const { otherfreezemargin, outamountfreeze, freezecharge } = account;
-        // 冻结资金 = 手续费冻结 + 出金冻结 + 其他冻结保证金
-        return freezecharge + outamountfreeze + otherfreezemargin;
+        const { freezemargin, otherfreezemargin, outamountfreeze, freezecharge } = account;
+        // 冻结资金 = 冻结保证金 + 手续费冻结 + 出金冻结 + 其他冻结保证金
+        return freezemargin + freezecharge + outamountfreeze + otherfreezemargin;
     })
 
     // 计算风险净值
@@ -232,13 +247,16 @@ function calcCapitalValue(account: Taaccount, positionList: TradePosition[]) {
         const flag = systemParams.find((e) => e.paramcode === '132')?.paramvalue === '1';
         const { usedmargin, mortgagecredit } = account;
 
+        let result = 0
         if (flag) {
             // 风险率 = 占用 / 风险净值
-            return usedmargin / valueAtRisk.value;
+            result = usedmargin / valueAtRisk.value;
         } else {
             // 风险率 = (占用 - 授信金额) / (风险净值 - 授信金额)
-            return (usedmargin - mortgagecredit) / (valueAtRisk.value - mortgagecredit);
+            result = (usedmargin - mortgagecredit) / (valueAtRisk.value - mortgagecredit);
         }
+
+        return isNaN(result) ? 0 : result;
     })
 
     return {

src/main.ts

@@ -8,8 +8,12 @@ import Antd, { message } from 'ant-design-vue';
 import { createApp } from 'vue';
 import App from './App.vue';
 import router from './router';
+import directive from "./views/market/futures/directive"; // 自定义指令集
+
 const app = createApp(App);
+app.use(directive);
 app.use(router);
 app.use(Antd).mount('#app');
+
 // 配置全局属性
 app.config.globalProperties.$message = message;

src/services/bus/goods.ts

@@ -153,6 +153,7 @@ export function getGoodsQuoteList(exchangeId?: number): GoodsQuote[] {
 
     return goodsList.map((el) => {
         const item: GoodsQuote = {
+            goodsgroupid: el.goodsgroupid,
             goodsid: el.goodsid,
             goodscode: el.goodscode,
             goodsname: el.goodsname,

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

@@ -326,6 +326,7 @@ export interface ErmcpMiddleGoodsChangeLog {
  * 商品行情
  */
 export interface GoodsQuote {
+    goodsgroupid: number;//所属商品组ID
     goodsid: number; // 商品ID
     goodscode: string; // 商品代码
     goodsname: string; // 商品名称

src/services/proto/futures/index.ts

@@ -1,5 +1,6 @@
 import { ChannelOrderReq, ChannelOrderRsp } from "./interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
+import { getLoginData } from '@/services/bus/login'
 
 /**
  * 期货交易委托请求
@@ -8,6 +9,7 @@ import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 export const channelOrderReq = (param: ChannelOrderReq): Promise<ChannelOrderRsp> => {
     return protoMiddleware<ChannelOrderReq>(param, 'ChannelOrderReq', 'ChannelOrderRsp', {
         AccountID: param.AccountID,
+        AccountID2: getLoginData().ClientID ?? 0,
         MarketID: param.MarketID,
         GoodsID: param.MarketID,
     })

src/services/socket/login/interface/loginQuery.ts

@@ -29,6 +29,7 @@ export interface LoginResponse extends checkTokenRes {
 
 export interface checkTokenRes {
     AccountIDs: any[];
+    ClientID: any;
     Header: Header;
     LoginID: LongType;
     LoginUserType: number;

src/services/socket/quota/index.ts

@@ -62,11 +62,12 @@ export function addSubscribeQuotation(uuid: string, subscribeInfos: SubscribeInf
 export function removeSubscribeQuotation(uuid: string) {
     if (subscribeGoodsList.has(uuid)) {
         subscribeGoodsList.delete(uuid);
+        console.log('删除订阅', uuid)
         if (subscribeGoodsList.size) {
             actionSubcribe();
         } else {
             // 没有订阅商品时候，主动断开行情链路
-            APP.closeQuote();
+            // APP.closeQuote();
         }
     }
 }

src/views/business/plan/components/setup.ts

@@ -40,6 +40,8 @@ export function handleForm() {
         ContractType: [{ required: true, validator: v_ContractType, trigger: 'change' }],
         DeliveryGoodsID: [{ required: true, validator: v_DeliveryGoodsID, trigger: 'change' }],
         Currencyid: [{ required: true, validator: v_Currencyid, trigger: 'change' }],
+        WRStandardID: [{ required: true, message: '请选择商品', trigger: 'change', type: 'number' }],
+        Tradeuserid: [{ required: true, message: '请选择交易用户', trigger: 'change', type: 'number' }],
     }
     return { formRef, formState, rules }
 }

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

@@ -1,49 +1,49 @@
 <template>
-    <!-- 现货参考价-修改-->
-    <a-modal class="add-custom custom-detail" title="修改现货参考价" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
-        <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="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品">
-                            <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="品牌">
-                            <span class="white">{{ formatValue(selectedRow.brandname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="结算币种" name="CurrencyID">
-                            <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择结算币种" v-model:value="formState.CurrencyID">
-                                <a-select-option v-for="option in currencyList" :key="option.enumitemname" :value="option.enumitemname">{{ option.enumdicname }}</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="SpotGoodsPrice">
-                            <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsPrice" :min="0" placeholder="请输入现货价格" />
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="cancel">取消</a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">提交</a-button>
-        </template>
-    </a-modal>
+  <!-- 现货参考价-修改-->
+  <a-modal class="add-custom custom-detail" title="修改现货参考价" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+    <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="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="品牌">
+              <span class="white">{{ formatValue(selectedRow.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="结算币种" name="CurrencyID">
+              <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择结算币种" v-model:value="formState.CurrencyID">
+                <a-select-option v-for="option in currencyList" :key="option.enumitemname" :value="option.enumitemname">{{ option.enumdicname }}</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="SpotGoodsPrice">
+              <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsPrice" :min="0" placeholder="请输入现货价格" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+    <template #footer>
+      <a-button key="submit" type="primary" :loading="loading" @click="cancel">取消</a-button>
+      <a-button key="submit" type="primary" :loading="loading" @click="submit">提交</a-button>
+    </template>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -56,63 +56,65 @@ import { getPayCurrencyTypeEnumList } from '@/common/constants/enumsList';
 import { validateAction } from '@/common/setup/form';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { ermcpSpotGoodsPrice } from '@/services/proto/delivery';
+import { geLoginID_number } from '@/services/bus/login';
+import moment from 'moment';
 
 export default defineComponent({
-    name: 'spotmarket_price_modify',
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3SpotGoodsPrice>,
-            default: {},
-        },
+  name: 'spotmarket_price_modify',
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3SpotGoodsPrice>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const formRef = ref();
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const formRef = ref();
 
-        // 选择币种列表
-        const currencyList = getPayCurrencyTypeEnumList();
+    // 选择币种列表
+    const currencyList = getPayCurrencyTypeEnumList();
 
-        const { deliverygoodsid, wrstandardid, spotgoodsbrandid, tradedate, currencyid, spotgoodsprice, operateid } = props.selectedRow;
-        const formState: UnwrapRef<ErmcpSpotGoodsPriceReq> = reactive({
-            DeliveryGoodsID: deliverygoodsid,
-            WRStandardID: wrstandardid,
-            SpotGoodsBrandID: spotgoodsbrandid,
-            CurrencyID: currencyid,
-            SpotGoodsPrice: spotgoodsprice,
-            TradeDate: tradedate,
-            OperateSrc: 2,
-            OperateID: operateid,
-            OperateType: 2,
-        });
+    const { deliverygoodsid, wrstandardid, spotgoodsbrandid, tradedate, currencyid, spotgoodsprice, operateid } = props.selectedRow;
+    const formState: UnwrapRef<ErmcpSpotGoodsPriceReq> = reactive({
+      DeliveryGoodsID: deliverygoodsid,
+      WRStandardID: wrstandardid,
+      SpotGoodsBrandID: spotgoodsbrandid,
+      CurrencyID: currencyid,
+      SpotGoodsPrice: spotgoodsprice,
+      TradeDate: moment(new Date()).format('YYYYMMDD'),
+      OperateSrc: 2,
+      OperateID: geLoginID_number()!,
+      OperateType: 2,
+    });
 
-        // 表单验证规则
-        const rules = {
-            CurrencyID: [{ required: true, message: '请选择结算币种', trigger: 'change', type: 'number' }],
-            SpotGoodsPrice: [{ required: true, message: '请输入现货价格', trigger: 'blur', type: 'number' }],
-        };
+    // 表单验证规则
+    const rules = {
+      CurrencyID: [{ required: true, message: '请选择结算币种', trigger: 'change', type: 'number' }],
+      SpotGoodsPrice: [{ required: true, message: '请输入现货价格', trigger: 'blur', type: 'number' }],
+    };
 
-        // 提交
-        function submit() {
-            validateAction<ErmcpSpotGoodsPriceReq>(formRef, formState).then((res) => {
-                requestResultLoadingAndInfo(ermcpSpotGoodsPrice, res, loading, ['修改现货参考价成功', '修改现货参考价失败']).then(() => {
-                    cancel(true);
-                });
-            });
-        }
+    // 提交
+    function submit() {
+      validateAction<ErmcpSpotGoodsPriceReq>(formRef, formState).then((res) => {
+        requestResultLoadingAndInfo(ermcpSpotGoodsPrice, res, loading, ['修改现货参考价成功', '修改现货参考价失败']).then(() => {
+          cancel(true);
+        });
+      });
+    }
 
-        return {
-            visible,
-            formRef,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            formState,
-            rules,
-            currencyList,
-        };
-    },
+    return {
+      visible,
+      formRef,
+      cancel,
+      submit,
+      loading,
+      formatValue,
+      formState,
+      rules,
+      currencyList,
+    };
+  },
 });
 </script>

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

@@ -245,7 +245,7 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
     const deliveryGoodsList = ref<Ermcp3DeliveryGoodsDetail[]>([]);
 
     const request = GetDeliveryGoodsDetail().then((res) => {
-        deliveryGoodsList.value = res;
+        deliveryGoodsList.value = res.filter((item) => item.isvalid);
     }).catch(err => {
         message.error(err);
     })

src/views/market/futures/compoments/futures-trade/index.vue

@@ -14,7 +14,7 @@
               </a-select>
             </a-form-item>
             <a-form-item label="合约">
-              <a-select class="inlineFormSelect" placeholder="请选择" :disabled="isHedging" :filterOption="filterOption" v-model:value="formData.GoodsID" @change="goodsChange" show-search>
+              <a-select class="inlineFormSelect" placeholder="请选择" :filterOption="filterOption" v-model:value="formData.GoodsID" @change="goodsChange" show-search>
                 <a-select-option v-for="item in goodsList" :value="item.goodsid" :key="item.goodsid">{{ item.goodsname }}</a-select-option>
               </a-select>
             </a-form-item>
@@ -101,14 +101,14 @@ export default defineComponent({
     const { visible, cancel } = _closeModal(context);
     // 是否套保交易 (根据参数 spotcontractid 来判断)
     const isHedging = Boolean(props.selectedRow.spotcontractid);
-
-    const goodsList = getGoodsQuoteList();
+    // 如果是套保交易，只显示该合约所在的商品组下的合约
+    const goodsList = getGoodsQuoteList().filter((item) => isHedging ? item.goodsgroupid === props.selectedRow.goodsgroupid : true);
     const getGoods = (id: number) => goodsList.find((item) => item.goodsid === id)!;
     // 当前选中的商品合约
     const selectedGoods = ref<GoodsQuote>(getGoods(props.selectedRow.goodsid));
 
     if (!selectedGoods.value) {
-      message.error('商品不存在，不能平仓！');
+      message.error('合约不存在，不能平仓！');
       cancel();
     }
 

src/views/market/futures/directive.ts

@@ -0,0 +1,14 @@
+
+import { App, Component } from 'vue';
+
+const install: Component = (app: App) => {
+    app.directive('resize', {
+        mounted(el, binding) {
+            debugger
+        },
+    })
+}
+
+export default {
+    install,
+}