li.shaoyi 3 years ago
parent
commit
7bf56c9299

+ 3 - 5
src/@next/components/base/tab-component/index.vue

@@ -35,11 +35,9 @@ export default defineComponent({
             const result = data.filter((e) => !props.filters.includes(e.code));
 
             if (result.length) {
-                currentTabComponent.value = toRaw(data[0]);
-                tabIndex.value = 0;
-            } else {
-                currentTabComponent.value = undefined;
-                tabIndex.value = -1;
+                const index = result.length > tabIndex.value ? tabIndex.value : 0;
+                currentTabComponent.value = toRaw(result[index]);
+                tabIndex.value = index;
             }
 
             return result;

+ 2 - 0
src/views/hedgeditem/exposure/components/futures/index.vue

@@ -49,6 +49,8 @@ export default defineComponent({
                     middlegoodsid
                 }
                 queryTable(queryPatradeLinkDetail, param);
+            } else {
+                tableList.value = []
             }
         }
 

+ 2 - 0
src/views/hedgeditem/exposure/components/plan/index.vue

@@ -44,6 +44,8 @@ export default defineComponent({
                     middlegoodsid
                 }
                 queryTable(queryErmcp2HedgedItemsDetail, param);
+            } else {
+                tableList.value = []
             }
         }
 

+ 2 - 0
src/views/hedgeditem/exposure/components/position/index.vue

@@ -40,6 +40,8 @@ export default defineComponent({
             const { middlegoodsid } = props.selectedRow;
             if (middlegoodsid) {
                 queryTable(QueryAutualExposurePosition, { middleGoodsId: middlegoodsid });
+            } else {
+                tableList.value = []
             }
         }
 

+ 2 - 0
src/views/hedgeditem/exposure/components/spot/index.vue

@@ -44,6 +44,8 @@ export default defineComponent({
                     middlegoodsid
                 }
                 queryTable(queryErmcp2StockSpotChangeLog, param);
+            } else {
+                tableList.value = []
             }
         }
 

+ 8 - 6
src/views/hedgeditem/exposure/list/index.vue

@@ -70,13 +70,15 @@ export default defineComponent({
                 userid: getUserId()
             }
             queryTable(queryErmcp2AreaExposure, param).then((res) => {
-                const selectedRow = composeTable.selectedRow.value;
-                composeTable.selectedRow.value = undefined;
-
                 window.setTimeout(() => {
-                    composeTable.selectedRow.value = selectedRow;
-                    if (!selectedRow && res.length) {
-                        composeTable.selectedRow.value = tableList.value[0];
+                    const selectedRow = composeTable.selectedRow.value;
+                    const index = tableList.value.findIndex((e) => e.middlegoodsid === selectedRow?.middlegoodsid && e.areauserid === selectedRow.areauserid);
+
+                    if (res.length) {
+                        const i = index > -1 ? index : 0;
+                        composeTable.selectedRow.value = tableList.value[i];
+                    } else {
+                        composeTable.selectedRow.value = undefined;
                     }
                 }, 0)
             })

+ 2 - 0
src/views/hedgeditem/trade/components/futures/index.vue

@@ -44,6 +44,8 @@ export default defineComponent({
             const { hedgeditemid } = props.selectedRow;
             if (hedgeditemid) {
                 queryTable(queryERMCPPatradeLinkDetail, { hedgeditemid });
+            } else {
+                tableList.value = []
             }
         }
 

+ 2 - 0
src/views/hedgeditem/trade/components/plan/index.vue

@@ -39,6 +39,8 @@ export default defineComponent({
             const { hedgeditemid } = props.selectedRow;
             if (hedgeditemid) {
                 queryTable(queryERMCP2HedgedItemspot, { hedgeditemid });
+            } else {
+                tableList.value = []
             }
         }
 

+ 2 - 0
src/views/hedgeditem/trade/components/position/index.vue

@@ -39,6 +39,8 @@ export default defineComponent({
             const { hedgeditemid } = props.selectedRow;
             if (hedgeditemid) {
                 queryTable(queryERMCPJRLinkPos, { hedgeditemid });
+            } else {
+                tableList.value = []
             }
         }
 

+ 2 - 0
src/views/hedgeditem/trade/components/spot/index.vue

@@ -39,6 +39,8 @@ export default defineComponent({
             const { hedgeditemid } = props.selectedRow;
             if (hedgeditemid) {
                 queryTable(queryERMCP2HedgedItemSpotDetail, { hedgeditemid });
+            } else {
+                tableList.value = []
             }
         }
 

+ 8 - 6
src/views/hedgeditem/trade/running/index.vue

@@ -116,13 +116,15 @@ export default defineComponent({
                 userid: getUserId(),
             }
             queryTable(queryErmcp8RunningHedgeditem, param).then((res) => {
-                const selectedRow = composeTable.selectedRow.value;
-                composeTable.selectedRow.value = undefined;
-
                 window.setTimeout(() => {
-                    composeTable.selectedRow.value = selectedRow;
-                    if (!selectedRow && res.length) {
-                        composeTable.selectedRow.value = dataList.value[0];
+                    const selectedRow = composeTable.selectedRow.value;
+                    const index = dataList.value.findIndex((e) => e.hedgeditemid === selectedRow?.hedgeditemid);
+
+                    if (res.length) {
+                        const i = index > -1 ? index : 0;
+                        composeTable.selectedRow.value = dataList.value[i];
+                    } else {
+                        composeTable.selectedRow.value = undefined;
                     }
                 }, 0)
             })

+ 2 - 1
src/views/order/futures_information/components/futures_information_success/columns.tsx

@@ -8,8 +8,9 @@ export function getColumns() {
         {
             title: '合约',
             key: 'goodscode',
+            width: 160,
             customRender: ({ record }: { record: QueryErmcpTradeDetailsRsp }) => {
-                return record.goodscode
+                return `${record.goodsname}/${record.goodscode}`
             }
         },
         {