update

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139"
-}
+    "apiUrl": "http://192.168.31.202:8080/cfg?key=test_202"
+}

src/common/components/echart/echart-kline/setup.ts

@@ -101,6 +101,7 @@ export function handleEchart() {
                 textStyle: {
                     color: '#4d535c',
                 },
+                confine: true,
                 className: 'tooltip',
                 formatter: (params: any) => {
                     let result = '';

src/common/components/echart/echart-timeline/setup.ts

@@ -94,6 +94,7 @@ export function handleEchart() {
                 textStyle: {
                     color: '#4d535c',
                 },
+                confine: true,
                 formatter: (params: any) => {
                     let result = '';
                     params.forEach((item: any, index: number) => {

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

@@ -1,12 +1,6 @@
 <template>
   <!-- 挂牌求购 -->
-  <Drawer
-    :title="!isBuy() ? '摘牌买入' : '摘牌卖出'"
-    :placement="'right'"
-    :visible="visible"
-    @cancel="cancel"
-    class="top post-buying-container"
-  >
+  <Drawer :title="!isBuy() ? '摘牌买入' : '摘牌卖出'" :placement="'right'" :visible="visible" :width="1052" @cancel="cancel" class="post-buying-container">
     <a-row>
       <a-col :span="12">
         <div class="post_buying_chart">
@@ -15,47 +9,32 @@
             <div class="content--right">{{ parantSelectedRow.goodsname }}</div>
           </div>
           <div class="chart-tips__last">
-            <div
-              :class="['content--left', handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'last')]"
-            >{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'last') }}</div>
+            <div :class="['content--left', handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'last')]">{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'last') }}</div>
             <div class="content--right">
-              <span
-                :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'last')"
-              >{{ quoteChange_out(parantSelectedRow.refgoodscode) }}</span>
-              <span
-                :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'last')"
-              >{{ quoteAmplitude_out(parantSelectedRow.refgoodscode) }}</span>
+              <span :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'last')">{{ quoteChange_out(parantSelectedRow.refgoodscode) }}</span>
+              <span :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'last')">{{ quoteAmplitude_out(parantSelectedRow.refgoodscode) }}</span>
             </div>
           </div>
           <a-row>
             <a-col :span="4" :offset="2">最高价</a-col>
             <a-col :span="6">
-              <span
-                :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'highest')"
-              >{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'highest') }}</span>
+              <span :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'highest')">{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'highest') }}</span>
             </a-col>
             <a-col :span="4" :offset="2">开盘价</a-col>
             <a-col :span="6">
-              <span
-                :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'opened')"
-              >{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'opened') }}</span>
+              <span :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'opened')">{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'opened') }}</span>
             </a-col>
           </a-row>
           <a-row>
             <a-col :span="4" :offset="2">最低价</a-col>
             <a-col :span="6">
-              <span
-                :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'lowest')"
-              >{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'lowest') }}</span>
+              <span :class="handleQuotePriceColor_out(parantSelectedRow.refgoodscode, 'lowest')">{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'lowest') }}</span>
             </a-col>
             <a-col :span="4" :offset="2">昨结价</a-col>
             <a-col :span="6">{{ getQuoteValue_out(parantSelectedRow.refgoodscode, 'presettle') }}</a-col>
           </a-row>
           <div class="chart-content">
-            <Chart
-              :selectedRow="getQuoteDayInfoByCode(parantSelectedRow.refgoodscode)"
-              :showExchange="false"
-            />
+            <Chart :selectedRow="getQuoteDayInfoByCode(parantSelectedRow.refgoodscode)" :showExchange="false" />
           </div>
         </div>
       </a-col>
@@ -66,17 +45,8 @@
               <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>
@@ -105,12 +75,7 @@
                 </a-col>
                 <a-col :span="24" v-if="isFloat() && isLimit()">
                   <a-form-item label="摘牌价格" name="price" class="inputIconBox">
-                    <a-input-number
-                      class="commonInput"
-                      style="width: 260px"
-                      :min="0"
-                      v-model:value="formState.price"
-                    />
+                    <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.price" />
                     <MinusOutlined @click="decreasePrice" />
                     <PlusOutlined @click="increasePrice" />
                   </a-form-item>
@@ -127,13 +92,7 @@
                 </a-col>
                 <a-col :span="24" v-if="useUserType()">
                   <a-form-item label="摘牌数量" name="num" class="inputIconBox">
-                    <a-input-number
-                      class="commonInput"
-                      style="width: 260px"
-                      :min="0"
-                      :max="selectedRow.orderqty"
-                      v-model:value="formState.num"
-                    />
+                    <a-input-number class="commonInput" style="width: 260px" :min="0" :max="selectedRow.orderqty" v-model:value="formState.num" />
                     <MinusOutlined @click="decreaseNumber" />
                     <PlusOutlined @click="increaseNumber" />
                     <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
@@ -141,12 +100,7 @@
                 </a-col>
                 <a-col :span="24" v-if="useUserType()" class="mt-10">
                   <a-form-item>
-                    <a-slider
-                      :min="0"
-                      v-model:value="formState.num"
-                      :max="selectedRow.orderqty"
-                      class="formSlider"
-                    />
+                    <a-slider :min="0" v-model:value="formState.num" :max="selectedRow.orderqty" class="formSlider" />
                     <div class="unit">
                       <span>0</span>
                       <span>{{ selectedRow.orderqty }}{{ selectedRow.enumdicname }}</span>
@@ -218,11 +172,18 @@ import { RefGoodsList } from '../../interface';
 import { useUserType } from '../setup';
 import { FormParam } from './interface';
 import { handleForm, useBlocksNumber, useBlocksPrice } from './setup';
+import Chart from '@/views/market/spot_trade/components/goods-chart/chart/index.vue';
 
 export default defineComponent({
   emits: ['cancel', 'update'],
   name: ModalEnum.spot_trade_warehouse_post_buying,
-  components: { Des, Drawer, PlusOutlined, MinusOutlined },
+  components: {
+    Des,
+    Drawer,
+    PlusOutlined,
+    MinusOutlined,
+    Chart,
+  },
   props: {
     selectedRow: {
       type: Object as PropType<QueryTjmdTradeOrderDetailRsp>,
@@ -406,230 +367,235 @@ export default defineComponent({
 
 <style lang="less">
 .post-buying-container {
-  top: 101px;
-  .ant-drawer-content-wrapper {
-    height: 605px;
-  }
+    top: 101px;
+    .ant-drawer-content-wrapper {
+        height: 605px;
+    }
 }
 .chart-content {
-  height: 400px;
+    height: 400px;
+    .chart-content__header,
+    .chart-content__main {
+        width: 90% !important;
+        margin: auto !important;
+    }
+
+    .chart-slider {
+        display: none;
+    }
 }
 .formBar {
-  height: 100%;
-  max-height: 100%;
+    height: 100%;
+    max-height: 100%;
 }
 .post_buying_chart {
-  [theme="light"] & {
-    --bgcolor: #fff;
-    --tab-border-color: #dae5ec;
-    --tab-checked-color: #0866b8;
-    --tab-checked-bgcolor: #d4e0ff;
-    --slider-border-color: #b2c4dd;
-    --slider-bgcolor: #edf2f7;
-    --slider-button-color: #b2c4dd;
-    --row-border-color: #dae5ec;
-    --row-title-color: #acb8c0;
-    --row-content-color: #3c454b;
-    --tik-title-bgcolor: #ecf2f5;
-    --tik-title-color: #7a8a94;
-  }
-  color: @m-grey67;
+    [theme='light'] & {
+        --bgcolor: #fff;
+        --tab-border-color: #dae5ec;
+        --tab-checked-color: #0866b8;
+        --tab-checked-bgcolor: #d4e0ff;
+        --slider-border-color: #b2c4dd;
+        --slider-bgcolor: #edf2f7;
+        --slider-button-color: #b2c4dd;
+        --row-border-color: #dae5ec;
+        --row-title-color: #acb8c0;
+        --row-content-color: #3c454b;
+        --tik-title-bgcolor: #ecf2f5;
+        --tik-title-color: #7a8a94;
+    }
+    color: @m-grey67;
 
-  // background-color: var(--bgcolor, #0e0e0f);
+    // background-color: var(--bgcolor, #0e0e0f);
 
-  // background: @m-blue37;
-  // color: @m-grey67;
-  .buying_chart {
-    display: flex;
+    // background: @m-blue37;
+    // color: @m-grey67;
+    .buying_chart {
+        display: flex;
 
-    // background-color: @m-blue36;
-    &__nav {
-      display: flex;
-      justify-content: center;
-      align-items: center;
+        // background-color: @m-blue36;
+        &__nav {
+            display: flex;
+            justify-content: center;
+            align-items: center;
 
-      .content {
-        &:first-child:not(:last-child) {
-          margin-right: 16px;
-        }
+            .content {
+                &:first-child:not(:last-child) {
+                    margin-right: 16px;
+                }
 
-        &--left {
-          font-size: 16px;
-          color: var(--row-content-color, #acb8c0);
-          margin-right: 6px;
-        }
+                &--left {
+                    font-size: 16px;
+                    color: var(--row-content-color, #acb8c0);
+                    margin-right: 6px;
+                }
 
-        &--right {
-          font-size: 24px;
-          color: #fc9618;
+                &--right {
+                    font-size: 24px;
+                    color: #fc9618;
+                }
+            }
         }
-      }
     }
-  }
-  .chart-tips {
-    display: flex;
-    flex-direction: column;
-    width: 300px;
-    height: 100%;
+    .chart-tips {
+        display: flex;
+        flex-direction: column;
+        width: 300px;
+        height: 100%;
 
-    &__last {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding: 16px 0;
-      .content {
-        &--left {
-          font-size: 24px;
-          margin-right: 16px;
-        }
+        &__last {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding: 16px 0;
+            .content {
+                &--left {
+                    font-size: 24px;
+                    margin-right: 16px;
+                }
 
-        &--right {
-          display: flex;
-          flex-direction: column;
-          align-items: flex-start;
+                &--right {
+                    display: flex;
+                    flex-direction: column;
+                    align-items: flex-start;
+                }
+            }
         }
-      }
     }
-  }
 }
 .post_buying {
-  width: 100%;
-  height: 100%;
-  .flex;
-  flex-direction: column;
-  position: relative;
-  overflow: hidden;
-  .ant-form {
-    height: 100%;
-  }
-  .condition {
     width: 100%;
-    height: 48px;
-    margin: 0 16px;
-    padding: 10px 0;
-    border-bottom: 1px solid @m-black6;
-    .inlineflex;
-    .conditionBtn {
-      align-self: center;
-      align-items: center;
-      border: 0;
-      min-width: 80px;
-      height: 28px;
-      line-height: 28px;
-      background: @m-black7;
-      .rounded-corners(3px);
-      font-size: 14px;
-      color: @m-blue0;
-      &:hover {
-        background: @m-black7-hover;
-        color: @m-blue0-hover;
-      }
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    position: relative;
+    overflow: hidden;
+    .ant-form {
+        height: 100%;
     }
-    .conditionBtn + .conditionBtn {
-      margin-left: 10px;
+    .condition {
+        width: 100%;
+        height: 48px;
+        margin: 0 16px;
+        padding: 10px 0;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            min-width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
     }
-  }
 }
 
 .unit {
-  margin-left: 70px;
-  width: 260px;
-  .flex;
-  justify-content: space-between;
-  font-size: 14px;
-  color: @m-grey41;
-  height: 14px;
-  line-height: 14px;
+    margin-left: 70px;
+    width: 260px;
+    .flex;
+    justify-content: space-between;
+    font-size: 14px;
+    color: @m-grey41;
+    height: 14px;
+    line-height: 14px;
 }
 .listedBtn {
-  width: 120px;
-  height: 30px;
-  line-height: 30px;
-  background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-  border-radius: 3px;
-  color: @m-white0;
-  font-size: 14px;
-  text-align: center;
-  border: 0;
-  &:hover {
-    background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-    color: @m-white0-hover;
-  }
+    width: 120px;
+    height: 30px;
+    line-height: 30px;
+    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+    border-radius: 3px;
+    color: @m-white0;
+    font-size: 14px;
+    text-align: center;
+    border: 0;
+    &:hover {
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
+        color: @m-white0-hover;
+    }
 }
 .cancelBtn:extend(.listedBtn) {
-  background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%) !important;
-  &:hover {
-    background: linear-gradient(
-      0deg,
-      @m-grey12-hover 0%,
-      @m-grey13-hover 100%
-    ) !important;
-    color: @m-white0-hover;
-  }
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%) !important;
+    &:hover {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%) !important;
+        color: @m-white0-hover;
+    }
 }
 .ml10 {
-  margin-left: 10px;
+    margin-left: 10px;
 }
 .ant-form.dialogForm .ant-row.ant-form-item {
-  margin-bottom: 14px;
+    margin-bottom: 14px;
 }
 .mt20 {
-  margin-top: 20px;
+    margin-top: 20px;
 }
 .mt-10 {
-  margin-top: -10px;
+    margin-top: -10px;
 }
 .ant-input-suffix {
-  position: absolute;
-  right: -25px;
+    position: absolute;
+    right: -25px;
 }
 .minusBtn,
 .plusBtn {
-  width: 15px;
-  height: 32px;
-  line-height: 32px;
-  font-size: 15px;
-  color: @m-blue15;
-  cursor: pointer;
+    width: 15px;
+    height: 32px;
+    line-height: 32px;
+    font-size: 15px;
+    color: @m-blue15;
+    cursor: pointer;
 }
 .minusBtn {
-  position: absolute;
-  top: -6px;
-  left: 14px;
-  z-index: 1;
+    position: absolute;
+    top: -6px;
+    left: 14px;
+    z-index: 1;
 }
 .plusBtn {
-  position: absolute;
-  top: -6px;
-  right: 14px;
-  z-index: 1;
+    position: absolute;
+    top: -6px;
+    right: 14px;
+    z-index: 1;
 }
 .stepper {
-  padding-left: 30px;
-  padding-right: 30px;
-  text-align: center;
-  color: @m-yellow1;
-  font-size: 16px;
+    padding-left: 30px;
+    padding-right: 30px;
+    text-align: center;
+    color: @m-yellow1;
+    font-size: 16px;
 }
 .ant-slider.formSlider {
-  width: 260px !important;
-  margin-left: 70px;
-  .ant-slider-rail {
-    margin-right: 0;
-    padding-right: 0;
-    height: 3px !important;
-    border-radius: 2px !important;
-    background-color: @m-blue14;
-  }
-  .ant-slider-track {
-    height: 3px;
-    background-color: @m-blue0;
-  }
-  .ant-slider-step {
-    height: 3px;
-  }
-  .ant-progress-text {
-    display: none;
-  }
+    width: 260px !important;
+    margin-left: 70px;
+    .ant-slider-rail {
+        margin-right: 0;
+        padding-right: 0;
+        height: 3px !important;
+        border-radius: 2px !important;
+        background-color: @m-blue14;
+    }
+    .ant-slider-track {
+        height: 3px;
+        background-color: @m-blue0;
+    }
+    .ant-slider-step {
+        height: 3px;
+    }
+    .ant-progress-text {
+        display: none;
+    }
 }
 </style>

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

@@ -1,231 +1,153 @@
 <template>
-    <!-- 挂牌求购 -->
-    <a-drawer
-        placement="right"
-        :closable="false"
-        :visible="visible"
-        :width="1052"
-        :destroyOnClose="true"
-        class="post-buying-container"
-    >
-        <div class="collapse">
-            <div class="collapse-close" @click="cancelAction">
-                <DoubleRightOutlined />
-            </div>
-            <slot name="titleLeft"></slot>
+  <!-- 挂牌求购 -->
+  <a-drawer placement="right" :closable="false" :visible="visible" :width="1052" :destroyOnClose="true" class="post-buying-container">
+    <div class="collapse">
+      <div class="collapse-close" @click="cancelAction">
+        <DoubleRightOutlined />
+      </div>
+      <slot name="titleLeft"></slot>
+    </div>
+    <div class="collapseCont">
+      <div class="title">{{ isBuy() ? '挂牌求购' : '挂牌卖出' }}</div>
+      <div class="content highContent">
+        <div class="title_right">
+          <span class="tline"></span>
+          <svg class="icon svg-icon" aria-hidden="true">
+            <use xlink:href="#icon-B" />
+          </svg>
+          <span @click="changeDirection">{{ isBuy() ? '卖出' : '求购' }}</span>
         </div>
-        <div class="collapseCont">
-            <div class="title">{{ isBuy() ? '挂牌求购' : '挂牌卖出' }}</div>
-            <div class="content highContent">
-                <div class="title_right">
-                    <span class="tline"></span>
-                    <svg class="icon svg-icon" aria-hidden="true">
-                        <use xlink:href="#icon-B" />
-                    </svg>
-                    <span @click="changeDirection">{{ isBuy() ? '卖出' : '求购' }}</span>
+        <a-row>
+          <a-col :span="12">
+            <div class="post_buying_chart">
+              <div class="buying_chart__nav">
+                <div class="content--left">{{ selectedRow.goodscode }}</div>
+                <div class="content--right">{{ selectedRow.goodsname }}</div>
+              </div>
+              <div class="chart-tips__last">
+                <div :class="['content--left', handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')]">{{ getQuoteValue_out(selectedRow.refgoodscode, 'last') }}</div>
+                <div class="content--right">
+                  <span :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')">{{ quoteChange_out(selectedRow.refgoodscode) }}</span>
+                  <span :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')">{{ quoteAmplitude_out(selectedRow.refgoodscode) }}</span>
                 </div>
-                <a-row>
-                    <a-col :span="12">
-                        <div class="post_buying_chart">
-                            <div class="buying_chart__nav">
-                                <div class="content--left">{{ selectedRow.goodscode }}</div>
-                                <div class="content--right">{{ selectedRow.goodsname }}</div>
-                            </div>
-                            <div class="chart-tips__last">
-                                <div
-                                    :class="['content--left', handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')]"
-                                >{{ getQuoteValue_out(selectedRow.refgoodscode, 'last') }}</div>
-                                <div class="content--right">
-                                    <span
-                                        :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')"
-                                    >{{ quoteChange_out(selectedRow.refgoodscode) }}</span>
-                                    <span
-                                        :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')"
-                                    >{{ quoteAmplitude_out(selectedRow.refgoodscode) }}</span>
-                                </div>
-                            </div>
-                            <a-row>
-                                <a-col :span="4" :offset="2">最高价</a-col>
-                                <a-col :span="6">
-                                    <span
-                                        :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'highest')"
-                                    >{{ getQuoteValue_out(selectedRow.refgoodscode, 'highest') }}</span>
-                                </a-col>
-                                <a-col :span="4" :offset="2">开盘价</a-col>
-                                <a-col :span="6">
-                                    <span
-                                        :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'opened')"
-                                    >{{ getQuoteValue_out(selectedRow.refgoodscode, 'opened') }}</span>
-                                </a-col>
-                            </a-row>
-                            <a-row>
-                                <a-col :span="4" :offset="2">最低价</a-col>
-                                <a-col :span="6">
-                                    <span
-                                        :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'lowest')"
-                                    >{{ getQuoteValue_out(selectedRow.refgoodscode, 'lowest') }}</span>
-                                </a-col>
-                                <a-col :span="4" :offset="2">昨结价</a-col>
-                                <a-col
-                                    :span="6"
-                                >{{ getQuoteValue_out(selectedRow.refgoodscode, 'presettle') }}</a-col>
-                            </a-row>
-                            <div class="chart-content">
-                                <Chart
-                                    :selectedRow="getQuoteDayInfoByCode(selectedRow.refgoodscode)"
-                                    :showExchange="false"
-                                />
-                            </div>
-                        </div>
+              </div>
+              <a-row>
+                <a-col :span="4" :offset="2">最高价</a-col>
+                <a-col :span="6">
+                  <span :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'highest')">{{ getQuoteValue_out(selectedRow.refgoodscode, 'highest') }}</span>
+                </a-col>
+                <a-col :span="4" :offset="2">开盘价</a-col>
+                <a-col :span="6">
+                  <span :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'opened')">{{ getQuoteValue_out(selectedRow.refgoodscode, 'opened') }}</span>
+                </a-col>
+              </a-row>
+              <a-row>
+                <a-col :span="4" :offset="2">最低价</a-col>
+                <a-col :span="6">
+                  <span :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'lowest')">{{ getQuoteValue_out(selectedRow.refgoodscode, 'lowest') }}</span>
+                </a-col>
+                <a-col :span="4" :offset="2">昨结价</a-col>
+                <a-col :span="6">{{ getQuoteValue_out(selectedRow.refgoodscode, 'presettle') }}</a-col>
+              </a-row>
+              <div class="chart-content">
+                <Chart :selectedRow="getQuoteDayInfoByCode(selectedRow.refgoodscode)" :showExchange="false" />
+              </div>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <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>
+                        <a-radio-group class="commonRadioGroup" v-model:value="formState.priceType">
+                          <a-radio :value="2">固定价</a-radio>
+                          <!-- 掉期交易商有固定价和浮动价选择 -->
+                          <!-- 普通交易商只有固定价 -->
+                          <a-radio :value="3" v-if="!useUserType()">浮动价</a-radio>
+                        </a-radio-group>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                      <a-form-item label="参考价">
+                        <span :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')">{{ getQuoteValue_out(selectedRow.refgoodscode, 'last') }}</span>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-if="!isFloat()">
+                      <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-form-item>
+                    </a-col>
+                    <a-col :span="24" v-else>
+                      <a-form-item label="点差" name="PriceMove">
+                        <a-input-number class="commonInput" style="width: 260px" v-model:value="formState.PriceMove" />
+                      </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-if="isFloat()">
+                      <a-form-item label="估算价">
+                        <span class="white">{{ getPrice() }}</span>
+                      </a-form-item>
                     </a-col>
-                    <a-col :span="12">
-                        <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>
-                                                <a-radio-group
-                                                    class="commonRadioGroup"
-                                                    v-model:value="formState.priceType"
-                                                >
-                                                    <a-radio :value="2">固定价</a-radio>
-                                                    <!-- 掉期交易商有固定价和浮动价选择 -->
-                                                    <!-- 普通交易商只有固定价 -->
-                                                    <a-radio :value="3" v-if="!useUserType()">浮动价</a-radio>
-                                                </a-radio-group>
-                                            </a-form-item>
-                                        </a-col>
-                                        <a-col :span="24">
-                                            <a-form-item label="参考价">
-                                                <span
-                                                    :class="handleQuotePriceColor_out(selectedRow.refgoodscode, 'last')"
-                                                >{{ getQuoteValue_out(selectedRow.refgoodscode, 'last') }}</span>
-                                            </a-form-item>
-                                        </a-col>
-                                        <a-col :span="24" v-if="!isFloat()">
-                                            <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-form-item>
-                                        </a-col>
-                                        <a-col :span="24" v-else>
-                                            <a-form-item label="点差" name="PriceMove">
-                                                <a-input-number
-                                                    class="commonInput"
-                                                    style="width: 260px"
-                                                    v-model:value="formState.PriceMove"
-                                                />
-                                            </a-form-item>
-                                        </a-col>
-                                        <a-col :span="24" v-if="isFloat()">
-                                            <a-form-item label="估算价">
-                                                <span class="white">{{ getPrice() }}</span>
-                                            </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"
-                                                    :max="getMaxNum()"
-                                                    v-model:value="formState.OrderQty"
-                                                />
-                                                <MinusOutlined @click="decreaseNum" />
-                                                <PlusOutlined @click="increaseNum" />
-                                                <span
-                                                    class="input-enumdicname"
-                                                >{{ selected.enumdicname }}</span>
-                                            </a-form-item>
-                                        </a-col>
-                                        <a-col :span="24" class="mt-10">
-                                            <a-form-item>
-                                                <a-slider
-                                                    :min="0"
-                                                    v-model:value="formState.OrderQty"
-                                                    :max="getMaxNum()"
-                                                    class="formSlider"
-                                                />
-                                                <div class="unit">
-                                                    <span>{{ getMaxNum() ? selected.minivalue : 0 }}</span>
-                                                    <span>{{ getMaxNum() }}{{ selected.enumdicname }}</span>
-                                                </div>
-                                            </a-form-item>
-                                        </a-col>
-                                        <a-col :span="24" class="relative mt20">
-                                            <a-form-item :label="'挂牌金额'">
-                                                <span class="white ml8">{{ getMoney() }}</span>
-                                            </a-form-item>
-                                        </a-col>
-                                        <a-col :span="24" v-if="getMargin()">
-                                            <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">{{ canUseMoney() }}</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>
+                    <a-col :span="24">
+                      <a-form-item label="挂牌数量" name="OrderQty" class="inputIconBox">
+                        <a-input-number class="commonInput" style="width: 260px" :min="0" :max="getMaxNum()" v-model:value="formState.OrderQty" />
+                        <MinusOutlined @click="decreaseNum" />
+                        <PlusOutlined @click="increaseNum" />
+                        <span class="input-enumdicname">{{ selected.enumdicname }}</span>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :span="24" class="mt-10">
+                      <a-form-item>
+                        <a-slider :min="0" v-model:value="formState.OrderQty" :max="getMaxNum()" class="formSlider" />
+                        <div class="unit">
+                          <span>{{ getMaxNum() ? selected.minivalue : 0 }}</span>
+                          <span>{{ getMaxNum() }}{{ selected.enumdicname }}</span>
                         </div>
+                      </a-form-item>
                     </a-col>
+                    <a-col :span="24" class="relative mt20">
+                      <a-form-item :label="'挂牌金额'">
+                        <span class="white ml8">{{ getMoney() }}</span>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :span="24" v-if="getMargin()">
+                      <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">{{ canUseMoney() }}</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>
-        </div>
-    </a-drawer>
+          </a-col>
+        </a-row>
+      </div>
+    </div>
+  </a-drawer>
 </template>
 
 <script lang="ts">
@@ -265,184 +187,184 @@ import { handleQuotePriceColor_out, handleSubcriteOnDemandQuote, quoteAmplitude_
 import Chart from '@/views/market/spot_trade/components/goods-chart/chart/index.vue';
 
 export default defineComponent({
-    emits: ['cancel', 'update'],
-    name: ModalEnum.spot_trade_warehouse_post_buying,
-    components: { Des, Drawer, PlusOutlined, MinusOutlined, SwapOutlined, LineChartOutlined, DoubleRightOutlined, Chart },
-    props: {
-        selectedRow: {
-            type: Object as PropType<RefGoodsList>,
-            default: {},
-        },
+  emits: ['cancel', 'update'],
+  name: ModalEnum.spot_trade_warehouse_post_buying,
+  components: { Des, Drawer, PlusOutlined, MinusOutlined, SwapOutlined, LineChartOutlined, DoubleRightOutlined, Chart },
+  props: {
+    selectedRow: {
+      type: Object as PropType<RefGoodsList>,
+      default: {},
     },
-    setup(props, context) {
-        // 查询 我的 持仓
-        const { tableList, queryTable } = queryTableList<QueryTradePositionRsp>();
-        queryTable(queryTradePosition);
+  },
+  setup(props, context) {
+    // 查询 我的 持仓
+    const { tableList, queryTable } = queryTableList<QueryTradePositionRsp>();
+    queryTable(queryTradePosition);
 
-        // 外部参考行情数据
-        const selected = getQuoteDayInfoByCode(props.selectedRow.refgoodscode);
+    // 外部参考行情数据
+    const selected = getQuoteDayInfoByCode(props.selectedRow.refgoodscode);
 
-        const marginParam: QueryTjmdTodayAccountMarginReq = {
-            accountid: getSelectedAccountId()!.toString(),
-            goodsid: props.selectedRow.goodsid,
-            marketids: getMarketIdsByTradeMode(TradeMode.DiaoQi),
-        };
-        // 获取保证金比例
-        const { getReckonMarginTypeAndValueByTradeMode } = useTodayMargin(marginParam);
-        // 控制弹窗
-        const { visible, cancel } = _closeModal(context);
-        const cancelAction = () => cancel()
+    const marginParam: QueryTjmdTodayAccountMarginReq = {
+      accountid: getSelectedAccountId()!.toString(),
+      goodsid: props.selectedRow.goodsid,
+      marketids: getMarketIdsByTradeMode(TradeMode.DiaoQi),
+    };
+    // 获取保证金比例
+    const { getReckonMarginTypeAndValueByTradeMode } = useTodayMargin(marginParam);
+    // 控制弹窗
+    const { visible, cancel } = _closeModal(context);
+    const cancelAction = () => cancel()
 
-        // 表单
-        const { rules, formState, formRef } = handleForm();
-        const loading = ref<boolean>(false);
-        // 买卖方向
-        const { direction, changeDirection, isBuy } = useBuySellDirection();
-        // 资金账号
-        const { canUseMoney, accountList } = useTaAccount<FormParam>(formState);
-        // 金额 数量 保证金
-        const param: ListingTradeNumAndPrice<FormParam> = {
-            formState,
-            goodscode: props.selectedRow.refgoodscode,
-            isFloat,
-            canUseMoney,
-        };
-        const { getFloatPrice, getMoney } = useListingTradeNumAndPrice<FormParam>(param);
-        // 保证金
-        const getMargin = () => {
-            let result = '--';
-            const [marginType, marginValue] = getReckonMarginTypeAndValueByTradeMode(TradeMode.DiaoQi);
-            if (marginType) {
-                // 保证金方式 1:比率 2:固定
-                if (marginType === 1) {
-                    if (getMoney()) {
-                        // 履约保证金=挂牌金额*保证金比例
-                        result = (Math.round(getMoney() * marginValue * 100) / 100).toString();
-                    }
-                } else {
-                    if (formState.OrderQty) {
-                        // 履约保证金=挂牌数量*保证金固定值
-                        result = (Math.round(formState.OrderQty * marginValue * 100) / 100).toString();
-                    }
-                }
-            }
-            return result;
-        };
-        // 最大数量
-        const getMaxNum = () => {
-            let result = 0;
-            const goodscode = props.selectedRow.goodscode;
-            const [marginType, marginValue] = getReckonMarginTypeAndValueByTradeMode(TradeMode.DiaoQi);
-            // 可用资金
-            const temp = +canUseMoney();
-            const money = temp > 0 ? temp : 0;
-            const price = isFloat() ? getQuoteDayInfoByCodeFindPrice(props.selectedRow.refgoodscode) : formState.FixedPrice;
-            if (marginType && money && price && price !== '--') {
-                // 保证金方式 1:比率 2:固定
-                if (marginType === 1) {
-                    // 合约单位
-                    const agreeunit = getGoodsAgreeunitByGoodsCode(goodscode);
-                    // 最大可挂牌数量=可用/（价格*合约单位*保证金比例
-                    result = money / (+price * marginValue * agreeunit);
-                } else {
-                    // 最大可挂牌数量=可用/保证金固定值
-                    result = money / marginValue;
-                }
-            }
-            return +result.toFixed(0);
-        };
-        // 估算价
-        function getPrice() {
-            let result = '--';
-            const goodsPrice = getQuoteDayInfoByCodeFindPrice(props.selectedRow.refgoodscode);
-            if (goodsPrice && goodsPrice !== '--') {
-                // 有实时行情价格
-                result = ((goodsPrice as number) + formState.PriceMove).toFixed(2);
-            }
-            return result;
+    // 表单
+    const { rules, formState, formRef } = handleForm();
+    const loading = ref<boolean>(false);
+    // 买卖方向
+    const { direction, changeDirection, isBuy } = useBuySellDirection();
+    // 资金账号
+    const { canUseMoney, accountList } = useTaAccount<FormParam>(formState);
+    // 金额 数量 保证金
+    const param: ListingTradeNumAndPrice<FormParam> = {
+      formState,
+      goodscode: props.selectedRow.refgoodscode,
+      isFloat,
+      canUseMoney,
+    };
+    const { getFloatPrice, getMoney } = useListingTradeNumAndPrice<FormParam>(param);
+    // 保证金
+    const getMargin = () => {
+      let result = '--';
+      const [marginType, marginValue] = getReckonMarginTypeAndValueByTradeMode(TradeMode.DiaoQi);
+      if (marginType) {
+        // 保证金方式 1:比率 2:固定
+        if (marginType === 1) {
+          if (getMoney()) {
+            // 履约保证金=挂牌金额*保证金比例
+            result = (Math.round(getMoney() * marginValue * 100) / 100).toString();
+          }
+        } else {
+          if (formState.OrderQty) {
+            // 履约保证金=挂牌数量*保证金固定值
+            result = (Math.round(formState.OrderQty * marginValue * 100) / 100).toString();
+          }
         }
-
-        function submit() {
-            validateAction<FormParam>(formRef, formState).then((res) => {
-                const { goodsid } = props.selectedRow;
-                const param: OrderReq = {
-                    ClientSerialNo: uuidv4(), // 客户端流水号
-                    ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
-                    ClientType: 4, // 终端类型
-                    LoginID: geLoginID_number()!, // 登陆账号
-                    AccountID: res.accountid, // 交易账号
-                    GoodsID: goodsid, // 商品ID
-                    MarketID: getMarketByTradeMode(TradeMode.DiaoQi)?.marketid, // 市场ID
-                    ValidType: 1, // 校验类型 当日有效
-                    OperateType: 1, // 操作类型: 申请
-                    OrderSrc: 1, // 单据来源: 客户端下单
-                    RelatedID: selected!.orderid, // 操作员账号ID
-                    OperatorID: Number(geLoginID_number()),
-                    // MarketMaxSub: number // 市价允许最大偏差(做市)
-                    OrderQty: res.OrderQty, // 委托数量
-                    BuyOrSell: direction.value, // 买卖方向  0 买 1 卖
-                    BuildType: 1, // 下单类型  1 建 2 平
-                    // CurtQuotePrice: 0, // 保留，计算冻结金额使用
-                    // SpPrice: 0 ,// 止盈价格
-                    // SlPrice: 0 , // 止损价格
-                    PriceMode: res.priceType, // 取价方式
-                    TimevalidType: 1, // 时间有效类型 单日有效
-                    TriggerType: 1, // 预埋单触发类型
-                    // TriggerPrice: number // 预埋单触发价格
-                    ListingSelectType: 1, // 挂牌点选类型 1：挂牌 2：摘牌 3：先摘后挂
-                    DelistingType: 2, // 摘牌类型 2:点选成交
-                    // RelatedID: number // 关联单号
-                    OptionType: 1, // 期权类型(1:认购(看涨)2:认沽(看跌))
-                    // Premium: number // 权利金
-                    // TriggerOperator: number // 触发条件(1:大于等于2:小于等于)
-                    // ServiceTime: string // 服务端时间
-                    // CouponTypeID: number // 优惠券类型ID(买方)
-                    // UsedQty: number // 使用数量
-                    // ValidTime: string // 指定有效日期
-                    // ReceiveInfoID: number // 收货地址ID
-                };
-                if (isFloat()) {
-                    // 浮动价
-                    param.MarketMaxSub = res.PriceMove; // 基差
-                } else {
-                    // 浮动价 不传价格，固定价才传价格
-                    param.OrderPrice = res.FixedPrice;
-                }
-                requestResultLoadingAndInfo(diaoQiOrder, param, loading, ['挂牌求购成功', '挂牌求购失败:']).then(() => {
-                    cancel(true);
-                    Bus.$emit('spotTrade', true);
-                });
-            });
+      }
+      return result;
+    };
+    // 最大数量
+    const getMaxNum = () => {
+      let result = 0;
+      const goodscode = props.selectedRow.goodscode;
+      const [marginType, marginValue] = getReckonMarginTypeAndValueByTradeMode(TradeMode.DiaoQi);
+      // 可用资金
+      const temp = +canUseMoney();
+      const money = temp > 0 ? temp : 0;
+      const price = isFloat() ? getQuoteDayInfoByCodeFindPrice(props.selectedRow.refgoodscode) : formState.FixedPrice;
+      if (marginType && money && price && price !== '--') {
+        // 保证金方式 1:比率 2:固定
+        if (marginType === 1) {
+          // 合约单位
+          const agreeunit = getGoodsAgreeunitByGoodsCode(goodscode);
+          // 最大可挂牌数量=可用/（价格*合约单位*保证金比例
+          result = money / (+price * marginValue * agreeunit);
+        } else {
+          // 最大可挂牌数量=可用/保证金固定值
+          result = money / marginValue;
         }
-        return {
-            submit,
-            cancel,
-            cancelAction,
-            visible,
-            rules,
-            formState,
-            formRef,
-            isFloat,
-            getMaxNum,
-            getMoney,
-            getMargin,
-            getFloatPrice,
-            direction,
-            changeDirection,
-            isBuy,
-            useUserType,
-            canUseMoney,
-            accountList,
-            ...usePrice(),
-            ...useNum(getMaxNum),
-            ...useChart(),
-            getPrice,
-            loading,
-            selected,
-            handleQuotePriceColor, quoteChange, handleNoneValue, quoteAmplitude,
-            handleQuotePriceColor_out, handleSubcriteOnDemandQuote, quoteAmplitude_out, quoteAmplituOfVibration, quoteChange_out, getQuoteValue_out, getQuoteDayInfoByCode
+      }
+      return +result.toFixed(0);
+    };
+    // 估算价
+    function getPrice() {
+      let result = '--';
+      const goodsPrice = getQuoteDayInfoByCodeFindPrice(props.selectedRow.refgoodscode);
+      if (goodsPrice && goodsPrice !== '--') {
+        // 有实时行情价格
+        result = ((goodsPrice as number) + formState.PriceMove).toFixed(2);
+      }
+      return result;
+    }
+
+    function submit() {
+      validateAction<FormParam>(formRef, formState).then((res) => {
+        const { goodsid } = props.selectedRow;
+        const param: OrderReq = {
+          ClientSerialNo: uuidv4(), // 客户端流水号
+          ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
+          ClientType: 4, // 终端类型
+          LoginID: geLoginID_number()!, // 登陆账号
+          AccountID: res.accountid, // 交易账号
+          GoodsID: goodsid, // 商品ID
+          MarketID: getMarketByTradeMode(TradeMode.DiaoQi)?.marketid, // 市场ID
+          ValidType: 1, // 校验类型 当日有效
+          OperateType: 1, // 操作类型: 申请
+          OrderSrc: 1, // 单据来源: 客户端下单
+          RelatedID: selected!.orderid, // 操作员账号ID
+          OperatorID: Number(geLoginID_number()),
+          // MarketMaxSub: number // 市价允许最大偏差(做市)
+          OrderQty: res.OrderQty, // 委托数量
+          BuyOrSell: direction.value, // 买卖方向  0 买 1 卖
+          BuildType: 1, // 下单类型  1 建 2 平
+          // CurtQuotePrice: 0, // 保留，计算冻结金额使用
+          // SpPrice: 0 ,// 止盈价格
+          // SlPrice: 0 , // 止损价格
+          PriceMode: res.priceType, // 取价方式
+          TimevalidType: 1, // 时间有效类型 单日有效
+          TriggerType: 1, // 预埋单触发类型
+          // TriggerPrice: number // 预埋单触发价格
+          ListingSelectType: 1, // 挂牌点选类型 1：挂牌 2：摘牌 3：先摘后挂
+          DelistingType: 2, // 摘牌类型 2:点选成交
+          // RelatedID: number // 关联单号
+          OptionType: 1, // 期权类型(1:认购(看涨)2:认沽(看跌))
+          // Premium: number // 权利金
+          // TriggerOperator: number // 触发条件(1:大于等于2:小于等于)
+          // ServiceTime: string // 服务端时间
+          // CouponTypeID: number // 优惠券类型ID(买方)
+          // UsedQty: number // 使用数量
+          // ValidTime: string // 指定有效日期
+          // ReceiveInfoID: number // 收货地址ID
         };
-    },
+        if (isFloat()) {
+          // 浮动价
+          param.MarketMaxSub = res.PriceMove; // 基差
+        } else {
+          // 浮动价 不传价格，固定价才传价格
+          param.OrderPrice = res.FixedPrice;
+        }
+        requestResultLoadingAndInfo(diaoQiOrder, param, loading, ['挂牌求购成功', '挂牌求购失败:']).then(() => {
+          cancel(true);
+          Bus.$emit('spotTrade', true);
+        });
+      });
+    }
+    return {
+      submit,
+      cancel,
+      cancelAction,
+      visible,
+      rules,
+      formState,
+      formRef,
+      isFloat,
+      getMaxNum,
+      getMoney,
+      getMargin,
+      getFloatPrice,
+      direction,
+      changeDirection,
+      isBuy,
+      useUserType,
+      canUseMoney,
+      accountList,
+      ...usePrice(),
+      ...useNum(getMaxNum),
+      ...useChart(),
+      getPrice,
+      loading,
+      selected,
+      handleQuotePriceColor, quoteChange, handleNoneValue, quoteAmplitude,
+      handleQuotePriceColor_out, handleSubcriteOnDemandQuote, quoteAmplitude_out, quoteAmplituOfVibration, quoteChange_out, getQuoteValue_out, getQuoteDayInfoByCode
+    };
+  },
 });
 </script>
 
@@ -455,13 +377,23 @@ export default defineComponent({
 }
 .chart-content {
     height: 400px;
+
+    .chart-content__header,
+    .chart-content__main {
+        width: 90% !important;
+        margin: auto !important;
+    }
+
+    .chart-slider {
+        display: none;
+    }
 }
 .formBar {
     height: 100%;
     max-height: 100%;
 }
 .post_buying_chart {
-    [theme="light"] & {
+    [theme='light'] & {
         --bgcolor: #fff;
         --tab-border-color: #dae5ec;
         --tab-checked-color: #0866b8;
@@ -621,22 +553,14 @@ export default defineComponent({
     text-align: center;
     border: 0;
     &:hover {
-        background: linear-gradient(
-            0deg,
-            @m-blue0-hover 0%,
-            @m-blue2-hover 100%
-        );
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
         color: @m-white0-hover;
     }
 }
 .cancelBtn:extend(.listedBtn) {
     background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%) !important;
     &:hover {
-        background: linear-gradient(
-            0deg,
-            @m-grey12-hover 0%,
-            @m-grey13-hover 100%
-        ) !important;
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%) !important;
         color: @m-white0-hover;
     }
 }

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

@@ -3,12 +3,7 @@
   <div class="topTableHeight">
     <div class="filterTable">
       <div class="filter-custom-table">
-        <a-select
-          class="conditionSelect"
-          :style="{ width: '180px', maxHeight: '400px', overflow: 'auto' }"
-          @change="goodsChange"
-          placeholder="全部标的合约"
-        >
+        <a-select class="conditionSelect" :style="{ width: '180px', maxHeight: '400px', overflow: 'auto' }" @change="goodsChange" placeholder="全部标的合约">
           <a-select-option v-for="item in getRefGoodsList()" :value="item" :key="item">{{ item }}</a-select-option>
         </a-select>
         <!-- <a-button class="btnDeafault"
@@ -16,32 +11,17 @@
         style="width: 80px">筛选</a-button>-->
       </div>
     </div>
-    <a-table
-      :columns="columns"
-      :class="['srcollYTable', isBottom ? 'secondTabTable' : 'secondTabTableNoBottom', goodsList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
-      :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 407px)' : 'calc(100vh - 167px)' }"
-      :pagination="false"
-      :loading="loading"
-      :expandedRowKeys="expandedRowKeys"
-      :customRow="Rowclick"
-      rowKey="refgoodscode"
-      ref="tableRef"
-      :data-source="goodsList"
-    >
+    <a-table :columns="columns" :class="['srcollYTable', isBottom ? 'secondTabTable' : 'secondTabTableNoBottom', goodsList.length ? 'noPlaceHolder' : 'hasPlaceHolder']" :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 407px)' : 'calc(100vh - 167px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="refgoodscode" ref="tableRef" :data-source="goodsList">
       <!-- <template #totalturnover="{ text }">
         <span>{{changeUnit(text)}}</span>
       </template>-->
       <!-- 涨跌 -->
       <template #change="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'last')"
-        >{{ quoteChange_out(record.refgoodscode) }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'last')">{{ quoteChange_out(record.refgoodscode) }}</span>
       </template>
       <!-- 幅度 -->
       <template #amplitude="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'last')"
-        >{{ quoteAmplitude_out(record.refgoodscode) }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'last')">{{ quoteAmplitude_out(record.refgoodscode) }}</span>
       </template>
       <!-- 振幅 -->
       <template #vibration="{ record }">
@@ -62,22 +42,15 @@
       </template>-->
       <!-- 最新价 -->
       <template #last="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'last')"
-        >{{ getQuoteValue_out(record.refgoodscode, 'last') }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'last')">{{ getQuoteValue_out(record.refgoodscode, 'last') }}</span>
       </template>
       <!-- 开盘 -->
       <template #opened="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'opened')"
-        >{{ getQuoteValue_out(record.refgoodscode, 'opened') }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'opened')">{{ getQuoteValue_out(record.refgoodscode, 'opened') }}</span>
       </template>
       <!-- 结算 -->
-      \
       <template #settle="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'settle')"
-        >{{ getQuoteValue_out(record.refgoodscode, 'settle') }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'settle')">{{ getQuoteValue_out(record.refgoodscode, 'settle') }}</span>
       </template>
       <!-- 昨结算 -->
       <template #presettle="{ record }">
@@ -85,25 +58,16 @@
       </template>
       <!-- 最低价 -->
       <template #lowest="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'lowest')"
-        >{{ getQuoteValue_out(record.refgoodscode, 'lowest') }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'lowest')">{{ getQuoteValue_out(record.refgoodscode, 'lowest') }}</span>
       </template>
       <!-- 最高价 -->
       <template #highest="{ record }">
-        <span
-          :class="handleQuotePriceColor_out(record.refgoodscode, 'highest')"
-        >{{ getQuoteValue_out(record.refgoodscode, 'highest') }}</span>
+        <span :class="handleQuotePriceColor_out(record.refgoodscode, 'highest')">{{ getQuoteValue_out(record.refgoodscode, 'highest') }}</span>
       </template>
     </a-table>
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="btnList"></contextMenu>
-    <component
-      :is="componentId"
-      v-if="componentId"
-      :selectedRow="selectedRow"
-      @cancel="closeComponent"
-    ></component>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
   </div>
 </template>
 
@@ -164,63 +128,62 @@ export default defineComponent({
 </script>
 <style lang="less">
 .noData {
-  .position(absolute, 28px, 0, 0, 0);
+    .position(absolute, 28px, 0, 0, 0);
 }
 .filter-custom-table {
-  display: inline-flex;
-  padding-top: 4px;
-  height: 34px;
-  .conditionSelect:first-child {
-    margin-right: 10px;
-  }
-  .btnDeafault.ant-btn,
-  .operBtn.ant-btn {
-    height: 26px !important;
-    line-height: 26px !important;
-  }
+    display: inline-flex;
+    padding-top: 4px;
+    height: 34px;
+    .conditionSelect:first-child {
+        margin-right: 10px;
+    }
+    .btnDeafault.ant-btn,
+    .operBtn.ant-btn {
+        height: 26px !important;
+        line-height: 26px !important;
+    }
 
-  .ant-select-single:not(.ant-select-customize-input)
-    + .ant-select-single:not(.ant-select-customize-input),
-  .ant-select + .ant-space.ant-space-vertical {
-    margin-left: 10px;
-  }
-  .ant-select-single:not(.ant-select-customize-input) {
-    height: 26px;
-    line-height: 26px !important;
-    .ant-select-selector {
-      height: 26px;
-      border-color: @m-grey46 !important;
-      background: @m-grey47;
-      .rounded-corners(3px);
-      .ant-select-selection-item {
-        line-height: 26px;
-      }
-      .ant-select-selection-search {
+    .ant-select-single:not(.ant-select-customize-input) + .ant-select-single:not(.ant-select-customize-input),
+    .ant-select + .ant-space.ant-space-vertical {
+        margin-left: 10px;
+    }
+    .ant-select-single:not(.ant-select-customize-input) {
         height: 26px;
-        .ant-select-selection-search-input {
-          height: 26px;
-          line-height: 27px !important;
+        line-height: 26px !important;
+        .ant-select-selector {
+            height: 26px;
+            border-color: @m-grey46 !important;
+            background: @m-grey47;
+            .rounded-corners(3px);
+            .ant-select-selection-item {
+                line-height: 26px;
+            }
+            .ant-select-selection-search {
+                height: 26px;
+                .ant-select-selection-search-input {
+                    height: 26px;
+                    line-height: 27px !important;
+                }
+            }
+            .ant-select-selection-placeholder {
+                line-height: 26px;
+            }
         }
-      }
-      .ant-select-selection-placeholder {
-        line-height: 26px;
-      }
     }
-  }
 
-  .allDatePicker.ant-calendar-picker {
-    height: 26px !important;
-    border: 1px solid @m-grey46 !important;
-    .ant-calendar-picker-input.ant-input {
-      height: 26px;
-      line-height: 26px;
-      &::placeholder {
-        color: @m-grey10 !important;
-      }
+    .allDatePicker.ant-calendar-picker {
+        height: 26px !important;
+        border: 1px solid @m-grey46 !important;
+        .ant-calendar-picker-input.ant-input {
+            height: 26px;
+            line-height: 26px;
+            &::placeholder {
+                color: @m-grey10 !important;
+            }
+        }
+    }
+    .conditionSelect + .conditionSelect {
+        margin-left: 10px;
     }
-  }
-  .conditionSelect + .conditionSelect {
-    margin-left: 10px;
-  }
 }
 </style>

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

@@ -1,12 +1,6 @@
 <template>
   <!-- 现货仓单 现货明细 挂牌 -->
-  <Drawer
-    :title="'挂牌'"
-    :placement="'right'"
-    class="delistingBottom650"
-    :visible="visible"
-    @cancel="cancel"
-  >
+  <Drawer :title="'挂牌'" :placement="'right'" class="delistingBottom650" :visible="visible" @cancel="cancel">
     <div class="listing">
       <div class="condition">
         <a-button class="conditionBtn">{{ selectedRow.deliverygoodsname }}</a-button>
@@ -18,44 +12,23 @@
         <div class="formBar">
           <a-row :gutter="24">
             <a-col :span="12">
-              <a-form-item label="挂牌方式" name="marketid">
-                <a-select
-                  class="inlineFormSelect"
-                  v-model:value="formState.marketid"
-                  @change="handleMarket"
-                  style="width: 140px"
-                  placeholder="请选择挂牌市场"
-                >
+              <a-form-item label="交易市场" name="marketid">
+                <a-select class="inlineFormSelect" v-model:value="formState.marketid" @change="handleMarket" style="width: 140px" placeholder="请选择交易市场">
                   <!-- <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-option
-                    v-for="item in spotMarkets"
-                    :key="item.marketid"
-                    :value="item.marketid"
-                  >{{ item.marketname }}</a-select-option>
+                  <a-select-option v-for="item in spotMarkets" :key="item.marketid" :value="item.marketid">{{ item.marketname }}</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-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-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>
@@ -67,31 +40,11 @@
                           style="width: 135px"
                           placeholder="请择交易所">
                 </a-select>-->
-                <a-select
-                  class="inlineFormSelect ml5"
-                  @change="handleGoodsGroups"
-                  style="width: 180px"
-                  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 class="inlineFormSelect ml5" @change="handleGoodsGroups" style="width: 180px" 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: 180px"
-                  @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 class="inlineFormSelect ml5" style="width: 180px" @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>
@@ -99,25 +52,14 @@
           <a-row :gutter="24">
             <a-col :span="12">
               <a-form-item label="挂牌数量" class="inputIconBox" name="OrderQty">
-                <a-input-number
-                  class="dialogInput"
-                  style="width: 140px !important"
-                  :min="0"
-                  v-model:value="formState.OrderQty"
-                  placeholder="请输入挂牌数量"
-                />
+                <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"
-                />
+                <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-listing">
                   <span>最小单位：</span>
@@ -129,13 +71,7 @@
           <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"
-                />
+                <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>
@@ -148,34 +84,20 @@
           <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"
-                />
+                <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-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="handlePermance"
-                >{{ formState.permanceTempName ? formState.permanceTempName : '选择履约模板' }}</span>
+                <span :class="['clickBox', formState.permanceTempName ? 'white' : '']" style="width: 140px" @click="handlePermance">{{ formState.permanceTempName ? formState.permanceTempName : '选择履约模板' }}</span>
                 <svg class="icon svg-icon" aria-hidden="true" @click="handlePermance">
                   <use xlink:href="#icon-moban" />
                 </svg>
@@ -184,19 +106,11 @@
             <template v-if="isBlocs()">
               <a-col :span="12">
                 <a-form-item label="指定朋友" class="inputIconBox">
-                  <span
-                    :class="['clickBox', getFriendLength() ? 'white' : '']"
-                    style="width: 140px"
-                    @click="openFriend"
-                  >{{ getFriendLength() ? `已选${getFriendLength()}人` : '选择朋友' }}</span>
+                  <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-checkbox class="commonCheckbox" v-model:checked="friendCheck" @change="limiteFriends">不限</a-checkbox>
                 </a-form-item>
               </a-col>
             </template>
@@ -204,11 +118,7 @@
           <a-row :gutter="24" v-if="isFloat()">
             <a-col :span="12">
               <a-form-item label="基差" name="PriceMove">
-                <a-input-number
-                  class="commonInput"
-                  v-model:value="formState.PriceMove"
-                  style="width: 140px"
-                />
+                <a-input-number class="commonInput" v-model:value="formState.PriceMove" style="width: 140px" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -256,12 +166,7 @@
           <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-button class="ml10 cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消</a-button>
             </a-form-item>
           </a-col>
         </a-row>
@@ -269,21 +174,9 @@
     </div>
   </Drawer>
   <!-- 选择朋友 -->
-  <Friend
-    v-if="showFriend"
-    :friends="formState.friends"
-    :position="'bottom'"
-    @cancel="chooseFriend"
-    @update="chooseFriend"
-  />
+  <Friend v-if="showFriend" :friends="formState.friends" :position="'bottom'" @cancel="chooseFriend" @update="chooseFriend" />
   <!-- 选择履约模板 -->
-  <Permance
-    v-if="showPermance"
-    :position="'bottom'"
-    :marketid="formState.marketid"
-    @cancel="choosePermance"
-    @update="choosePermance"
-  />
+  <Permance v-if="showPermance" :position="'bottom'" :marketid="formState.marketid" @cancel="choosePermance" @update="choosePermance" />
 </template>
 
 <script lang="ts">
@@ -431,82 +324,82 @@ export default defineComponent({
           };
 
           // 仓单贸易挂牌  （仓单贸易 = HasWr = 1）
-                    const param = {
-                        AccountID: getInTaAccount(), // 默认内部资金账号第一个
-                        ClientSerialNo: v4(), // 客户端流水号
-                        // OperateSrc: 2,
-                        ClientType: 4,
-                        MarketID: formState.marketid,
-                        LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
-                        // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
-                        TradeDate: moment(marketInfo.tradedate).format('YYYYMMDD'), // 交易日 string
-                        // SubNum: '0', // 提单子单号
-                        SubNum: props.selectedRow.subnum,
-                        // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
-                        WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
-                        IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
-                        MatchAccIDs: [], // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
-                        OrderQty: res.OrderQty, // 委托数量(可挂部分数据量) ======
-                        DeliveryGoodsID: props.selectedRow.deliverygoodsid, // 交割商品商品ID
-                        WRPriceType: res.WRPriceType, // 价格方式 1：固定价 2：浮动价
-                        FixedPrice: res.FixedPrice, // 固定价格
-                        PriceFactor: 1, // 价格系数(浮动价时填写)
-                        PriceMove: res.PriceMove, // 升贴水(浮动价时填写)
-                        TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
-                        // ValidTime: isBlocs() ? moment(res.vidaliteTime).format('YYYY-MM-DD HH:mm:ss') : '', // 有效期限
-                        ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
-                        FirstRatio: 0, // 首付比例
-                        PerformanceTemplateID: res.permaceTempId, // 履约计划模板ID
-                        UserID: getUserId(),
-                        OperatorID: getUserId(), // 操作员账号ID
-                        BuyOrSell: BuyOrSell.sell, // 买卖方向 0买1卖
-                        PriceDisplayMode: 1, // 浮动价显示方式 1：合并显示 2：分开显示
-                        CanBargain: priceCheck.value ? 1 : 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
-                        Attachment1: '', // 附件1
-                        Attachment2: '', // 附件2
-                        Remark: '', // 备注
-                        ApplyID: 0, // 申请ID
-                        CanPart: numCheck.value ? 0 : 1, // 是否允许部份摘牌0:不允许;1:允许
-                        WRTradeGoods: [wrGoodsInfo],
-                        wrstandardid: props.selectedRow.wrstandardid,
-                        HasWr: 1,
-                        DeliveryMonth: '',
-                        MarginFlag: 0,
-                        DelistMinQty: res.DelistMinQty, // 起摘数量
-                    };
-                    if (isBlocs()) {
-                        // 贸易圈 是后加的， 处理贸易圈
-                        // if (!formState.permanceTempName) {
-                        //     message.error('请选择履约模板');
-                        //     return;
-                        // }
-                        if (!friendCheck.value) {
-                            if (formState.friends.length === 0) {
-                                message.error('请选择朋友');
-                                return;
-                            }
-                        }
-                        const obj = {
-                            IsSpecified: 1,
-                            MatchAccIDs: res.friends,
-                            WRPriceType: 1,
-                            TimevalidType: 3, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
-                            MarginFlag: 1, // 挂牌是否指定保证金 0:否 1:是
-                            MarginAlgorithm: 1, // 指定保证金方式 1:比率 2:固定
-                            ValidTime: moment(res.vidaliteTime).format('YYYY-MM-DD HH:mm:ss'), // 有效期限
-                            MarginValue: +(formState.margin / 100).toFixed(2), // 指定保证金设置值
-                            AllFriendsFlag: friendCheck.value ? 1 : 0, //是否全好友可见 0：否 1:是
-                        };
-                        Object.assign(param, obj);
-                    }
-                    requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-                        Bus.$emit('spotTrade', true);
-                        cancel(true);
-                    });
-                });
-            } else {
-                message.error('市场信息未获取到，请联系管理员！');
+          const param = {
+            AccountID: getInTaAccount(), // 默认内部资金账号第一个
+            ClientSerialNo: v4(), // 客户端流水号
+            // OperateSrc: 2,
+            ClientType: 4,
+            MarketID: formState.marketid,
+            LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+            TradeDate: moment(marketInfo.tradedate).format('YYYYMMDD'), // 交易日 string
+            // SubNum: '0', // 提单子单号
+            SubNum: props.selectedRow.subnum,
+            // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+            IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
+            MatchAccIDs: [], // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
+            OrderQty: res.OrderQty, // 委托数量(可挂部分数据量) ======
+            DeliveryGoodsID: props.selectedRow.deliverygoodsid, // 交割商品商品ID
+            WRPriceType: res.WRPriceType, // 价格方式 1：固定价 2：浮动价
+            FixedPrice: res.FixedPrice, // 固定价格
+            PriceFactor: 1, // 价格系数(浮动价时填写)
+            PriceMove: res.PriceMove, // 升贴水(浮动价时填写)
+            TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
+            // ValidTime: isBlocs() ? moment(res.vidaliteTime).format('YYYY-MM-DD HH:mm:ss') : '', // 有效期限
+            ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+            FirstRatio: 0, // 首付比例
+            PerformanceTemplateID: res.permaceTempId, // 履约计划模板ID
+            UserID: getUserId(),
+            OperatorID: getUserId(), // 操作员账号ID
+            BuyOrSell: BuyOrSell.sell, // 买卖方向 0买1卖
+            PriceDisplayMode: 1, // 浮动价显示方式 1：合并显示 2：分开显示
+            CanBargain: priceCheck.value ? 1 : 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
+            Attachment1: '', // 附件1
+            Attachment2: '', // 附件2
+            Remark: '', // 备注
+            ApplyID: 0, // 申请ID
+            CanPart: numCheck.value ? 0 : 1, // 是否允许部份摘牌0:不允许;1:允许
+            WRTradeGoods: [wrGoodsInfo],
+            wrstandardid: props.selectedRow.wrstandardid,
+            HasWr: 1,
+            DeliveryMonth: '',
+            MarginFlag: 0,
+            DelistMinQty: res.DelistMinQty, // 起摘数量
+          };
+          if (isBlocs()) {
+            // 贸易圈 是后加的， 处理贸易圈
+            // if (!formState.permanceTempName) {
+            //     message.error('请选择履约模板');
+            //     return;
+            // }
+            if (!friendCheck.value) {
+              if (formState.friends.length === 0) {
+                message.error('请选择朋友');
+                return;
+              }
             }
+            const obj = {
+              IsSpecified: 1,
+              MatchAccIDs: res.friends,
+              WRPriceType: 1,
+              TimevalidType: 3, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
+              MarginFlag: 1, // 挂牌是否指定保证金 0:否 1:是
+              MarginAlgorithm: 1, // 指定保证金方式 1:比率 2:固定
+              ValidTime: moment(res.vidaliteTime).format('YYYY-MM-DD HH:mm:ss'), // 有效期限
+              MarginValue: +(formState.margin / 100).toFixed(2), // 指定保证金设置值
+              AllFriendsFlag: friendCheck.value ? 1 : 0, //是否全好友可见 0：否 1:是
+            };
+            Object.assign(param, obj);
+          }
+          requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+            Bus.$emit('spotTrade', true);
+            cancel(true);
+          });
+        });
+      } else {
+        message.error('市场信息未获取到，请联系管理员！');
+      }
     }
 
     return {
@@ -555,113 +448,113 @@ export default defineComponent({
 
 <style lang="less" scoped>
 .inputIconBox .input-enumdicname {
-  right: 100px;
+    right: 100px;
 }
 .ant-form.inlineForm .relative.ant-form-item .tip {
-  top: -5px;
-  left: calc(100% + 5px);
-  white-space: normal;
-  span {
-    display: block;
-    line-height: 15px;
-  }
+    top: -5px;
+    left: calc(100% + 5px);
+    white-space: normal;
+    span {
+        display: block;
+        line-height: 15px;
+    }
 }
 .listing {
-  width: 100%;
-  height: 100%;
-  .flex;
-  flex-direction: column;
-  overflow: hidden;
-  .condition {
-    width: calc(100% - 32px);
-    height: 48px;
-    margin: 0 16px;
-    padding: 10px 0;
-    border-bottom: 1px solid @m-black6;
-    .inlineflex;
-    .conditionBtn {
-      align-self: center;
-      align-items: center;
-      border: 0;
-      min-width: 80px;
-      height: 28px;
-      line-height: 28px;
-      background: @m-black7;
-      .rounded-corners(3px);
-      font-size: 14px;
-      color: @m-blue0;
-      &:hover {
-        background: @m-black7-hover;
-        color: @m-blue0-hover;
-      }
-    }
-    .conditionBtn + .conditionBtn {
-      margin-left: 10px;
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    overflow: hidden;
+    .condition {
+        width: calc(100% - 32px);
+        height: 48px;
+        margin: 0 16px;
+        padding: 10px 0;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            min-width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
     }
-  }
-  /deep/.ant-form {
-    .formBar {
-      height: calc(100% - 98px);
-      .clickBox {
-        height: 30px;
-      }
-      .ant-row.inputIconBox.ant-form-item {
-        .ant-col.ant-form-item-control-wrapper {
-          .ant-form-item-control {
-            .ant-form-item-children {
-              width: 232px;
-              .ant-checkbox-wrapper.commonCheckbox {
-                left: 140px;
-                .ant-checkbox {
-                  margin-right: 0;
+    /deep/.ant-form {
+        .formBar {
+            height: calc(100% - 98px);
+            .clickBox {
+                height: 30px;
+            }
+            .ant-row.inputIconBox.ant-form-item {
+                .ant-col.ant-form-item-control-wrapper {
+                    .ant-form-item-control {
+                        .ant-form-item-children {
+                            width: 232px;
+                            .ant-checkbox-wrapper.commonCheckbox {
+                                left: 140px;
+                                .ant-checkbox {
+                                    margin-right: 0;
+                                }
+                            }
+                        }
+                    }
                 }
-              }
             }
-          }
         }
-      }
     }
-  }
 }
 .mt-20 {
-  margin-top: -20px;
+    margin-top: -20px;
 }
 .unit {
-  margin-left: 70px;
-  width: 140px;
-  .flex;
-  justify-content: space-between;
-  font-size: 14px;
-  color: @m-grey41;
-  height: 14px;
-  line-height: 14px;
+    margin-left: 70px;
+    width: 140px;
+    .flex;
+    justify-content: space-between;
+    font-size: 14px;
+    color: @m-grey41;
+    height: 14px;
+    line-height: 14px;
 }
 .listedBtn {
-  width: 120px;
-  height: 30px;
-  line-height: 30px;
-  background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-  border-radius: 3px;
-  color: @m-white0;
-  font-size: 14px;
-  text-align: center;
-  border: 0;
-  &:hover {
-    background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-    color: @m-white0-hover;
-  }
+    width: 120px;
+    height: 30px;
+    line-height: 30px;
+    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+    border-radius: 3px;
+    color: @m-white0;
+    font-size: 14px;
+    text-align: center;
+    border: 0;
+    &:hover {
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
+        color: @m-white0-hover;
+    }
 }
 .cancelBtn:extend(.listedBtn) {
-  background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-  &:hover {
-    background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
-    color: @m-white0-hover;
-  }
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
+    &:hover {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%);
+        color: @m-white0-hover;
+    }
 }
 .ml10 {
-  margin-left: 10px;
+    margin-left: 10px;
 }
 .ml5 {
-  margin-left: 5px;
+    margin-left: 5px;
 }
 </style>;

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/setup.ts

@@ -62,7 +62,7 @@ export function handleForm(data: WrHoldLB) {
         OrderQty: [{ required: true, validator: v_num, trigger: 'blur', type: 'number' }],
         PriceMove: [{ required: true, validator: v_basis, trigger: 'blur', type: 'number', }],
         goodsid: [{ required: true, validator: v_group, }],
-        marketid: [{ required: true, message: '请选择挂牌市场', }]
+        marketid: [{ required: true, message: '请选择交易市场', type: 'number', }]
     }
     Object.assign(rules, rule)
     onBeforeUnmount(() => {
@@ -148,6 +148,9 @@ export function queryMarketSection(isPre: boolean) {
             markets.findIndex(m => m.marketid === item.marketid) !== -1
         )
         spotMarkets.value = resMarkets
+        if (resMarkets.length === 1) {
+            formState.marketid = resMarkets[0].marketid;
+        }
     })
 
     return { spotMarkets };

src/views/order/spot_warran/index.vue

@@ -1,39 +1,55 @@
 <template>
   <!-- 现货仓单 -->
   <section class="spot_warran">
-    <component :is="componentId"
-               v-if="componentId">
+    <component :is="componentId" v-if="componentId">
     </component>
-    <thirdMenu :list="tabList"
-               @selectMenu="changeTab"
-               :value="'title'"></thirdMenu>
+    <thirdMenu :list="tabList" @selectMenu="changeTab" :value="'title'"></thirdMenu>
   </section>
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent, nextTick } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import thirdMenu from '@/common/components/thirdMenu/index.vue';
 import { handleOrderDetailList } from '@/common/setup/order/orderData';
+import Bus from '@/utils/eventBus/index';
 
 export default defineComponent({
-    name: enumOrderComponents.spot_warrant,
-    components: {
-        thirdMenu,
-        [enumOrderComponents.spot_warrant_deal]: defineAsyncComponent(() => import('./components/spot_warrant_deal/index.vue')),
-        [enumOrderComponents.spot_warrant_designated_deal]: defineAsyncComponent(() => import('./components/spot_warrant_designated_deal/index.vue')),
-        [enumOrderComponents.spot_warrant_in_and_out_warehouse]: defineAsyncComponent(() => import('./components/spot_warrant_in_and_out_warehouse/index.vue')),
-        [enumOrderComponents.spot_warrant_inventory_summary]: defineAsyncComponent(() => import('./components/spot_warrant_inventory_summary/index.vue')),
-        [enumOrderComponents.spot_warrant_pending_order]: defineAsyncComponent(() => import('./components/spot_warrant_pending_order/index.vue')),
-        [enumOrderComponents.spot_warrant_spot_summary]: defineAsyncComponent(() => import('./components/spot_warrant_spot_summary/index.vue')),
-        [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
-        [enumOrderComponents.spot_warrant_bargain]: defineAsyncComponent(() => import('./components/spot_warrant_bargain/index.vue')),
-    },
-    setup() {
-        return { ...handleOrderDetailList(enumOrderComponents.spot_warrant) };
-    },
-});
-</script>
+  name: enumOrderComponents.spot_warrant,
+  components: {
+    thirdMenu,
+    [enumOrderComponents.spot_warrant_deal]: defineAsyncComponent(() => import('./components/spot_warrant_deal/index.vue')),
+    [enumOrderComponents.spot_warrant_designated_deal]: defineAsyncComponent(() => import('./components/spot_warrant_designated_deal/index.vue')),
+    [enumOrderComponents.spot_warrant_in_and_out_warehouse]: defineAsyncComponent(() => import('./components/spot_warrant_in_and_out_warehouse/index.vue')),
+    [enumOrderComponents.spot_warrant_inventory_summary]: defineAsyncComponent(() => import('./components/spot_warrant_inventory_summary/index.vue')),
+    [enumOrderComponents.spot_warrant_pending_order]: defineAsyncComponent(() => import('./components/spot_warrant_pending_order/index.vue')),
+    [enumOrderComponents.spot_warrant_spot_summary]: defineAsyncComponent(() => import('./components/spot_warrant_spot_summary/index.vue')),
+    [enumOrderComponents.spot_warrant_spot_details]: defineAsyncComponent(() => import('./components/spot_warrant_spot_details/index.vue')),
+    [enumOrderComponents.spot_warrant_bargain]: defineAsyncComponent(() => import('./components/spot_warrant_bargain/index.vue')),
+  },
+  setup() {
+    const { componentId, tabList, changeTab } = handleOrderDetailList(enumOrderComponents.spot_warrant);
+
+    // 组件重新加载
+    function componentReload() {
+      const code = componentId.value;
+      componentId.value = undefined;
+      nextTick(() => {
+        componentId.value = code;
+      });
+    }
 
-<style lang="less">
-</style>;
+    // 资金变化，重新加载数据
+    Bus.$on('moneyChangedNtf_UI', () => {
+      // 重新加载组件
+      componentReload();
+    });
+
+    return {
+      componentId,
+      tabList,
+      changeTab,
+    };
+  },
+});
+</script>

src/views/search/search_document_records_commission_record_sub/components/filter/index.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="filterTable">
+    <div class="filter-custom-table">
+      <a-range-picker class="commonDatePicker" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" :placeholder="['开始时间', '结束时间']" @change="onChange" @ok="onOk" />
+      <FilterOption :selectList="selectList" :inputList="inputList" :fixedBtnList="fixedBtnList">
+      </FilterOption>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import FilterOption from '@/common/components/filter/index.vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+import { Moment } from 'moment';
+
+export default defineComponent({
+  components: {
+    FilterOption,
+  },
+  setup(props, context) {
+    const select: SelectList[] = [];
+
+    const input: InputList[] = [];
+
+    const onChange = (value: Moment[], dateString: string[]) => {
+      console.log('Selected Time: ', value);
+      console.log('Formatted Selected Time: ', dateString);
+    };
+
+    const onOk = (value: Moment[]) => {
+      console.log('onOk: ', value);
+    };
+
+    return {
+      ...handleFilter(select, input, context),
+      onChange,
+      onOk,
+    };
+  }
+})
+</script>

src/views/search/search_document_records_commission_record_sub/search_document_records_spot_warrant/search_document_records_spot_warrant_history/index.vue

@@ -1,19 +1,8 @@
 <template>
   <!-- 委托记录 - 现货仓单 - 当前记录  -->
-  <section class="topTableHeight">
-    <a-table
-      :columns="tableColumns"
-      class="srcollYTable"
-      :scroll="{ x: '100%', y: '190px' }"
-      :pagination="false"
-      :loading="loading"
-      :expandedRowKeys="expandedRowKeys"
-      :customRow="Rowclick"
-      :expandIcon="expandIcon"
-      :expandIconAsCell="false"
-      rowKey="key"
-      :data-source="tableList"
-    >
+  <section class="topTableHeight_413 topTableHeight">
+    <Filter />
+    <a-table :columns="tableColumns" class="srcollYTable" :scroll="{ x: '100%', y: '190px' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
       <!--  委托状态-->
       <template #wrtradeorderstatus="{ record }">
         <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
@@ -48,9 +37,13 @@ import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/inte
 import Bus from '@/utils/eventBus';
 import { useOrderWarrant } from '@/views/order/setup';
 import moment from 'moment';
+import Filter from '../../components/filter/index.vue';
 
 export default defineComponent({
   name: enumOrderComponents.spot_warrant_pending_order,
+  components: {
+    Filter,
+  },
   setup() {
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();

src/views/search/search_document_records_done/search_document_records_done_search_spot_warrant/search_document_records_done_search_spot_warrant_history/index.vue

@@ -1,19 +1,7 @@
 <template>
   <!-- 成交记录 - 现货仓单 - 历史记录-->
   <section class="topTableHeight">
-    <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"
-    >
+    <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 #amount="{ record }">
         <a>{{ (record.tradeqty * record.tradeprice).toFixed(2) }}</a>

src/views/search/search_performance_query/search_performance_query_buy_performance/search_performance_query_buy_performance_done/index.vue

@@ -1,19 +1,7 @@
 <template>
   <!-- 履约查询 买履约 -->
   <section class="topTableHeight">
-    <a-table
-      :columns="columns"
-      class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-      :pagination="false"
-      :loading="loading"
-      :expandedRowKeys="expandedRowKeys"
-      :customRow="Rowclick"
-      :expandIcon="expandIcon"
-      :expandIconAsCell="false"
-      rowKey="key"
-      :data-source="tableList"
-    >
+    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
         <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
@@ -57,7 +45,6 @@ export default defineComponent({
     const queryTableAction = () => {
       const param: QueryPerformancePlanReq = {
         buyorsell: 0,
-        status: '6'
       };
       queryTable(QueryPerformancePlan, param);
     };
@@ -80,8 +67,4 @@ export default defineComponent({
     };
   },
 });
-</script>
-
-<style lang="less">
-</style>;
-
+</script>

src/views/search/search_performance_query/search_performance_query_sell_performance/search_performance_query_sell_performance_done/index.vue

@@ -1,19 +1,7 @@
 <template>
   <!-- 履约查询 卖履约 -->
   <section class="topTableHeight">
-    <a-table
-      :columns="columns"
-      class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-      :pagination="false"
-      :loading="loading"
-      :expandedRowKeys="expandedRowKeys"
-      :customRow="Rowclick"
-      :expandIcon="expandIcon"
-      :expandIconAsCell="false"
-      rowKey="key"
-      :data-source="tableList"
-    >
+    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
         <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
@@ -58,7 +46,6 @@ export default defineComponent({
     const queryTableAction = () => {
       const param: QueryPerformancePlanReq = {
         buyorsell: 1,
-        status: '6'
       };
       queryTable(QueryPerformancePlan, param);
     };
@@ -80,7 +67,4 @@ export default defineComponent({
     };
   },
 });
-</script>
-
-<style lang="less">
-</style>;
+</script>