marymelisa 4 vuotta sitten
vanhempi
commit
8a6114f8ef

+ 66 - 1
src/assets/styles/mixin.less

@@ -1535,7 +1535,72 @@
         text-align: right;
     }
 }
-
+.ant-collapse.futureCollapse.ant-collapse-borderless {
+    background: transparent;
+    .ant-collapse-item {
+        margin-top: 10px;
+        background: @m-black15;
+        border: 1px solid @m-blue3;
+        .rounded-corners(3px);
+        .ant-collapse-header {
+            color: @m-grey17;
+            font-size: 14px;
+            border-bottom: 0;
+            padding: 0;
+            line-height: 43px;
+            .ant-collapse-arrow {
+                fill: @m-grey17;
+                width: 16px;
+                height: 16px;
+                font-size: 16px;
+                left: 0;
+            }
+            .ant-row.contRow {
+                width: 100%;
+                // height: 40px;
+                line-height: 40px;
+                font-size: 16px;
+                color: @m-white1;
+                margin-bottom: 10px;
+                // background: @m-black15;
+                border: 0 !important;
+                // border-radius: 3px;
+                padding-left: 14px;
+                padding-right: 12px;
+                .ant-col:last-child {
+                    text-align: right;
+                }
+                .ant-col:first-child {
+                    text-align: left;
+                }
+            }
+            .contRow:first-child {
+                margin-top: 0 !important;
+            }
+            .contRow:last-child {
+                margin-bottom: 0 !important;
+            }
+        }
+        .ant-collapse-content {
+            .ant-collapse-content-box {
+                padding: 0 0 0 30px;
+                background-color: transparent;
+                .btn-list {
+                    width: calc(100% - 10px);
+                    justify-content: flex-end;
+                    padding-right: 10px;
+                    padding-bottom: 10px;
+                    .operBtn.ant-btn {
+                        margin-top: 0;
+                        margin-bottom: 0;
+                        height: 26px;
+                        line-height: 26px;
+                    }
+                }
+            }
+        }
+    }
+}
 // 输入框自动填充背景色和字体颜色
 input:-webkit-autofill,
 textarea:-webkit-autofill,

+ 83 - 80
src/views/information/account_info/list/account_info_futures/index.vue

@@ -1,94 +1,97 @@
 <template>
-  <!-- 期货账户 -->
-  <div class="account_info_futures"
-       :loading="loading">
-    <filterCustomTable @search="search"></filterCustomTable>
-    <div class="tltLeft">
-      <span class="blue">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-shuzhuangtu"></use>
-        </svg>
-        {{getUserName()}}
-      </span>
-      <BtnList :btnList="firstBtn" />
-
-    </div>
-    <a-collapse class="spotCollapse"
-                v-for="(item, i) in tableList"
-                :key="i + '11'"
-                :bordered="false">
-      <template #expandIcon="props">
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-if="props.isActive == 0">
-          <use xlink:href="#icon-shouqi1"></use>
-        </svg>
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-else>
-          <use xlink:href="#icon-shouqi2"></use>
-        </svg>
-      </template>
-      <a-collapse-panel>
-        <template #header>
-          <a-row class="headRow">
-            <a-col :span="12">{{item.mainAcc.accountname}} {{ '-' + item.mainAcc.hedgeaccountcode}}
-              ({{item.subacclist.length}}){{item.mainAcc.fcname}}</a-col>
-            <a-col :span="12">
-              <BtnList :btnList="secondBtn"
-                       @onClick="secondeClick(item)" />
-            </a-col>
-          </a-row>
-        </template>
-        <a-collapse class="busyCollapse"
-                    accordion
-                    :bordered="false">
-          <a-collapse-panel :show-arrow="false"
-                            v-for="(sub, i) in item.subacclist"
-                            :key="i + '11'">
-            <template #header>
-              <a-row class="contRow">
-                <a-col :span="12">{{sub.accountname}}-{{sub.accountid}}</a-col>
-                <a-col :span="12">{{getTaAccountStatus(sub.tradestatus)}}</a-col>
-              </a-row>
+    <!-- 期货账户 -->
+    <div class="account_info_futures" :loading="loading">
+        <filterCustomTable @search="search"></filterCustomTable>
+        <div class="tltLeft">
+            <span class="blue">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-shuzhuangtu" />
+                </svg>
+                {{getUserName()}}
+            </span>
+            <BtnList :btnList="firstBtn" />
+        </div>
+        <a-collapse
+            class="spotCollapse"
+            v-for="(item, i) in tableList"
+            :key="i + '11'"
+            :bordered="false"
+        >
+            <template #expandIcon="props">
+                <svg class="icon svg-icon" aria-hidden="true" v-if="props.isActive == 0">
+                    <use xlink:href="#icon-shouqi1" />
+                </svg>
+                <svg class="icon svg-icon" aria-hidden="true" v-else>
+                    <use xlink:href="#icon-shouqi2" />
+                </svg>
             </template>
-            <BtnList :btnList="getBtnList(sub.tradestatus)"
-                     @onClick="thirdClick(item, sub)" />
-          </a-collapse-panel>
+            <a-collapse-panel>
+                <template #header>
+                    <a-row class="headRow">
+                        <a-col :span="12">
+                            {{item.mainAcc.accountname}} {{ '-' + item.mainAcc.hedgeaccountcode}}
+                            ({{item.subacclist.length}}){{item.mainAcc.fcname}}
+                        </a-col>
+                        <a-col :span="12">
+                            <BtnList :btnList="secondBtn" @onClick="secondeClick(item)" />
+                        </a-col>
+                    </a-row>
+                </template>
+                <a-collapse class="futureCollapse" accordion :bordered="false">
+                    <a-collapse-panel
+                        :show-arrow="false"
+                        v-for="(sub, i) in item.subacclist"
+                        :key="i + '11'"
+                    >
+                        <template #header>
+                            <a-row class="contRow">
+                                <a-col :span="12">{{sub.accountname}}-{{sub.accountid}}</a-col>
+                                <a-col :span="12">{{getTaAccountStatus(sub.tradestatus)}}</a-col>
+                            </a-row>
+                        </template>
+                        <BtnList
+                            :btnList="getBtnList(sub.tradestatus)"
+                            @onClick="thirdClick(item, sub)"
+                        />
+                    </a-collapse-panel>
+                </a-collapse>
+            </a-collapse-panel>
         </a-collapse>
-      </a-collapse-panel>
-    </a-collapse>
-    <Add @refresh="queryTable" />
-    <AddChild :selectedData="firstData"
-              :userList="userList"
-              :marginList="marginList"
-              :feeList="feeList"
-              @updateTrader="queryUserList"
-              @refresh="queryTable" />
-    <Modify :selectedData="firstData"
-            @refresh="queryTable" />
-    <ModifyChild @refresh="queryTable"
-                 :userList="userList"
-                 :marginList="marginList"
-                 :feeList="feeList"
-                 :secondeData="secondeData"
-                 :selectedData="firstData" />
-    <Detail :selectedData="firstData"
+        <Add @refresh="queryTable" />
+        <AddChild
+            :selectedData="firstData"
+            :userList="userList"
+            :marginList="marginList"
+            :feeList="feeList"
+            @updateTrader="queryUserList"
+            @refresh="queryTable"
+        />
+        <Modify :selectedData="firstData" @refresh="queryTable" />
+        <ModifyChild
+            @refresh="queryTable"
+            :userList="userList"
+            :marginList="marginList"
+            :feeList="feeList"
+            :secondeData="secondeData"
+            :selectedData="firstData"
+        />
+        <Detail
+            :selectedData="firstData"
             :secondeData="secondeData"
             :userList="userList"
             :marginList="marginList"
-            :feeList="feeList" />
-    <Cancel @refresh="queryTable"
+            :feeList="feeList"
+        />
+        <Cancel
+            @refresh="queryTable"
             :userList="userList"
             :marginList="marginList"
             :feeList="feeList"
             :secondeData="secondeData"
-            :selectedData="firstData" />
-    <Credit @refresh="queryTable"
             :selectedData="firstData"
-            :secondeData="secondeData" />
-  </div>
+        />
+        <Credit @refresh="queryTable" :selectedData="firstData" :secondeData="secondeData" />
+    </div>
 </template>
 
 <script lang="ts">