update

src/services/socket/protobuf/buildReq.ts

@@ -184,7 +184,6 @@ function parseSoleProtoRsp(rspPackage: any, funCodeName: string): ParseRsp {
     isErrer(rspPackage, funCodeName);
     const reqPackage = ProtobufCtr.generateProtoContent(funCodeName, rspPackage.content);
     const { RetCode, Status, RetDesc } = reqPackage;
-    console.warn(`解析${funCodeName}对应的报文错误：RetCode: ${RetCode}: RetDesc${RetDesc}`)
     if (RetCode !== null) {
         if (RetCode === 0) {
             return { isSuccess: true, result: reqPackage };

src/views/business/search/list/purchase/components/filter/index.vue

@@ -19,7 +19,7 @@ export default defineComponent({
                 key: 'pricetype',
                 placeholder: '全部定价类型',
                 list: [
-                    { value: 1, lable: '固定价' },
+                    { value: 1, lable: '一口价' },
                     { value: 2, lable: '点价' },
                     { value: 3, lable: '暂定价' },
                 ],

src/views/information/account_info/list/account_info_futures/index.vue

@@ -1,80 +1,55 @@
 <template>
-  <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
-  <!-- 期货账户 -->
-  <div class="account_info_futures account_info_container"
-       :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>
-      <mtp-table-button :buttons="firstBtn"
-                        @click="openComponent" />
+    <!-- 期货账户 -->
+    <div class="account_info_futures account_info_container" :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>
+            <mtp-table-button :buttons="firstBtn" @click="openComponent" />
+        </div>
+        <div class="a-collapse-container">
+            <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>
+                <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">
+                                <mtp-table-button :buttons="secondBtn" :record="item" @click="openComponent" />
+                            </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>
+                            <mtp-table-button :buttons="thirdBtn" :record="sub" @click="openSecondBtnAction" />
+                        </a-collapse-panel>
+                    </a-collapse>
+                </a-collapse-panel>
+            </a-collapse>
+        </div>
+        <component :is="componentId" v-if="componentId" :selectedData="selectedData" :firstSelectedData="firstSelectedData" :userList="userList" :marginList="marginList" :feeList="feeList" @update="queryUserList" @cancel="closeComponent"></component>
     </div>
-    <div class="a-collapse-container">
-      <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>
-        <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">
-                <mtp-table-button :buttons="secondBtn"
-                                  :record="item"
-                                  @click="openComponent" />
-              </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>
-              <mtp-table-button :buttons="thirdBtn"
-                                :record="sub"
-                                @click="openSecondBtnAction" />
-            </a-collapse-panel>
-          </a-collapse>
-        </a-collapse-panel>
-      </a-collapse>
-    </div>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedData="selectedData"
-               :firstSelectedData="firstSelectedData"
-               :userList="userList"
-               :marginList="marginList"
-               :feeList="feeList"
-               @update="queryUserList"
-               @cancel="closeComponent"></component>
-  </div>
 </template>
 
 <script lang="ts">

src/views/information/account_info/list/account_info_manager/index.vue

@@ -1,70 +1,52 @@
 <template>
-  <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
-  <!-- 管理账户 -->
-  <div class="account_info_manager account_info_container"
-       :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>
-      <mtp-table-button :buttons="firstBtn"
-                        @click="openComponent" />
-    </div>
-    <div class="a-collapse-container">
-      <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.rolename }}({{ item.userlist.length }}）</a-col>
-              <a-col :span="12">
-                <!-- <BtnList :selectedData="item" :btnList="secondBtn" @onClick="openAction" /> -->
-                <mtp-table-button :buttons="secondBtn"
-                                  :record="item"
-                                  @click="openComponent" />
-              </a-col>
-            </a-row>
-          </template>
-          <a-collapse class="busyCollapse"
-                      v-for="(sub, i) in item.userlist"
-                      :key="i + '11'"
-                      :bordered="false">
-            <a-collapse-panel :show-arrow="false">
-              <template #header>
-                <a-row class="contRow">
-                  <a-col :span="12">{{ sub.loginname }}-{{ sub.logincode }}</a-col>
-                  <a-col :span="12">{{ getLoginStatusEnumItemName(sub.loginstatus) }}</a-col>
-                </a-row>
-              </template>
-              <!-- <BtnList :btnList="sub.btnList" :selectedData="sub" @onClick="moreOptenAction" /> -->
-              <mtp-table-button :buttons="thirdBtn"
-                                :record="sub"
-                                @click="openSecondBtnAction" />
-            </a-collapse-panel>
-          </a-collapse>
-        </a-collapse-panel>
-      </a-collapse>
-    </div>
-    <!-- <Add @refresh="handleBtnAction" :selectedData="addModelData" :tableList="tableList" />
+    <!-- 管理账户 -->
+    <div class="account_info_manager account_info_container" :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>
+            <mtp-table-button :buttons="firstBtn" @click="openComponent" />
+        </div>
+        <div class="a-collapse-container">
+            <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.rolename }}({{ item.userlist.length }}）</a-col>
+                            <a-col :span="12">
+                                <!-- <BtnList :selectedData="item" :btnList="secondBtn" @onClick="openAction" /> -->
+                                <mtp-table-button :buttons="secondBtn" :record="item" @click="openComponent" />
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-collapse class="busyCollapse" v-for="(sub, i) in item.userlist" :key="i + '11'" :bordered="false">
+                        <a-collapse-panel :show-arrow="false">
+                            <template #header>
+                                <a-row class="contRow">
+                                    <a-col :span="12">{{ sub.loginname }}-{{ sub.logincode }}</a-col>
+                                    <a-col :span="12">{{ getLoginStatusEnumItemName(sub.loginstatus) }}</a-col>
+                                </a-row>
+                            </template>
+                            <!-- <BtnList :btnList="sub.btnList" :selectedData="sub" @onClick="moreOptenAction" /> -->
+                            <mtp-table-button :buttons="thirdBtn" :record="sub" @click="openSecondBtnAction" />
+                        </a-collapse-panel>
+                    </a-collapse>
+                </a-collapse-panel>
+            </a-collapse>
+        </div>
+        <!-- <Add @refresh="handleBtnAction" :selectedData="addModelData" :tableList="tableList" />
         <Modify :tableList="tableList" @refresh="handleBtnAction" :selectedData="moreModelData" />
         <Cancel @refresh="handleBtnAction" :selectedData="moreModelData" />
         <Locked @refresh="handleBtnAction" :selectedData="moreModelData" />
@@ -73,12 +55,8 @@
         <Detail :selectedData="moreModelData" />
         <AddPermission @refresh="handleBtnAction" />
         <Permission /> -->
-    <component :is="componentId"
-               v-if="componentId"
-               :tableList="tableList"
-               :selectedData="selectedData"
-               @cancel="closeComponent"></component>
-  </div>
+        <component :is="componentId" v-if="componentId" :tableList="tableList" :selectedData="selectedData" @cancel="closeComponent"></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/report/sum_pl_report/list/sum_pl_report/setup.ts

@@ -50,9 +50,6 @@ export const columns: ColumnType[] = [
         "title": "现货总量",
         "align": "center",
         "width": 120,
-        customRender: ({ text }: { text: number }) => {
-            return text.toFixed(2);
-        }
     },
     {
         "key": "5th",
@@ -60,9 +57,6 @@ export const columns: ColumnType[] = [
         "title": "计划套保量",
         "align": "center",
         "width": 120,
-        customRender: ({ text }: { text: number }) => {
-            return text.toFixed(2);
-        }
     },
     {
         "key": "6th",