update

src/assets/styles/mixin.less

@@ -1732,10 +1732,18 @@ input:-internal-autofill-selected {
             }
         }
         .titleBtn3 {
+            position: relative;
             .name {
                 .rounded-corners(0, 5px, 5px, 0);
             }
             margin-right: 20px;
+            .anticon {
+                font-size: 16px;
+                color: @m-grey1;
+                .position(absolute, auto, 16px, 0, auto);
+                line-height: 36px;
+                z-index: 2;
+            }
         }
         .numBlock {
             display: inline-flex;
@@ -2038,4 +2046,17 @@ input:-internal-autofill-selected {
             }
         }
     }
+}
+
+// 仓单预售查询条件 日期到月份
+.conditionPicker.ant-calendar-picker {
+    .ant-input {
+        width: 90px;
+        background: transparent;
+        font-size: 16px;
+        color: @m-white0;
+    }
+    .ant-calendar-picker-icon {
+        display: none;
+    }
 }

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -1,97 +1,99 @@
 <template>
-  <!-- 买卖大厅 -->
-  <div class="buy-sell-market">
-    <div class="buy-sell-market-title">
-      <a class="backIcon"
-         @click="cancel">
-        <LeftOutlined />
-      </a>
-      <div class="titleBtn">
-        <div class="name">{{selectedRow.deliverygoodsname}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn2">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">{{selectedRow.wrgoodsname}}</div>
-        <div class="arrowRightIcon"></div>
-      </div>
-      <div class="titleBtn titleBtn3">
-        <div class="arrowLeftIcon"></div>
-        <div class="name">{{selectedRow.warehousename}}</div>
-      </div>
-      <div class="titleBtn titleBtn3"
-           v-if="!getHasWR(enumName)">
-        <a-month-picker :allowClear="false"
+    <!-- 买卖大厅 -->
+    <div class="buy-sell-market">
+        <div class="buy-sell-market-title">
+            <a class="backIcon" @click="cancel">
+                <LeftOutlined />
+            </a>
+            <div class="titleBtn">
+                <div class="name">{{selectedRow.deliverygoodsname}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn2">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">{{selectedRow.wrgoodsname}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn2">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">{{selectedRow.warehousename}}</div>
+                <div class="arrowRightIcon"></div>
+            </div>
+            <div class="titleBtn titleBtn3" v-if="!getHasWR(enumName)">
+                <div class="arrowLeftIcon"></div>
+                <div class="name">
+                    <a-month-picker
+                        :allowClear="false"
                         v-model:value="time"
                         @change="timeChange"
-                        class="commonDatePicker" />
-      </div>
-      <div class="green">
-        <div class="numBlock"
-             v-if="isFloatPrice()">
-          <div class="first">卖基差</div>
-          <div class="last">{{selectedRow.sellpricemove}}</div>
+                        class="commonDatePicker conditionPicker"
+                    />
+                </div>
+                <DownOutlined />
+            </div>
+            <div class="green">
+                <div class="numBlock" v-if="isFloatPrice()">
+                    <div class="first">卖基差</div>
+                    <div class="last">{{selectedRow.sellpricemove}}</div>
+                </div>
+                <div class="numBlock" v-else>
+                    <div class="first">卖价</div>
+                    <div class="last">{{selectedRow.sellprice}}</div>
+                </div>
+                <div class="numBlock">
+                    <div class="first">卖量</div>
+                    <div class="last">{{selectedRow.sellqty}}</div>
+                </div>
+            </div>
+            <div class="red ml35">
+                <div class="numBlock" v-if="isFloatPrice()">
+                    <div class="first">买基差</div>
+                    <div class="last">{{selectedRow.buypricemove}}</div>
+                </div>
+                <div class="numBlock" v-else>
+                    <div class="first">买价</div>
+                    <div class="last">{{selectedRow.buyprice}}</div>
+                </div>
+                <div class="numBlock">
+                    <div class="first">买量</div>
+                    <div class="last">{{selectedRow.buyqty}}</div>
+                </div>
+            </div>
+            <div class="market" v-if="isFloatPrice()">
+                <div class="first">{{selectedRow.goodscode}}</div>
+                <div class="last red">{{getGoodsPrice()}}</div>
+                <LineChartOutlined />
+            </div>
+            <BtnList :btnList="firstBtn" :record="selectedRow" @click="openComponent" />
         </div>
-        <div class="numBlock"
-             v-else>
-          <div class="first">卖价</div>
-          <div class="last">{{selectedRow.sellprice}}</div>
-        </div>
-        <div class="numBlock">
-          <div class="first">卖量</div>
-          <div class="last">{{selectedRow.sellqty}}</div>
-        </div>
-      </div>
-      <div class="red ml35">
-        <div class="numBlock"
-             v-if="isFloatPrice()">
-          <div class="first">买基差</div>
-          <div class="last">{{selectedRow.buypricemove}}</div>
-        </div>
-        <div class="numBlock"
-             v-else>
-          <div class="first">买价</div>
-          <div class="last">{{selectedRow.buyprice}}</div>
-        </div>
-        <div class="numBlock">
-          <div class="first">买量</div>
-          <div class="last">{{selectedRow.buyqty}}</div>
-        </div>
-      </div>
-      <div class="market"
-           v-if="isFloatPrice()">
-        <div class="first">{{selectedRow.goodscode}}</div>
-        <div class="last red">{{getGoodsPrice()}}</div>
-        <LineChartOutlined />
-      </div>
-      <BtnList :btnList="firstBtn"
-               :record="selectedRow"
-               @click="openComponent" />
+        <a-row class="buySellHall">
+            <a-col :span="12" v-if="sellMarket.isMarket">
+                <Sell
+                    :enumName="enumName"
+                    ref="sellRef"
+                    :parantSelectedRow="selectedRow"
+                    :time="time"
+                    :btnList="handleBtnList(sellMarket.btnList)"
+                />
+            </a-col>
+            <a-col :span="12" v-if="buyMarket.isMarket">
+                <Buy
+                    :enumName="enumName"
+                    ref="buyRef"
+                    :time="time"
+                    :parantSelectedRow="selectedRow"
+                    :btnList="handleBtnList(buyMarket.btnList)"
+                />
+            </a-col>
+        </a-row>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            :enumName="enumName"
+            @cancel="closeComponent"
+        ></component>
     </div>
-    <a-row class="buySellHall">
-      <a-col :span="12"
-             v-if="sellMarket.isMarket">
-        <Sell :enumName="enumName"
-              ref="sellRef"
-              :parantSelectedRow="selectedRow"
-              :time="time"
-              :btnList="handleBtnList(sellMarket.btnList)" />
-      </a-col>
-      <a-col :span="12"
-             v-if="buyMarket.isMarket">
-        <Buy :enumName="enumName"
-             ref="buyRef"
-             :time="time"
-             :parantSelectedRow="selectedRow"
-             :btnList="handleBtnList(buyMarket.btnList)" />
-      </a-col>
-    </a-row>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               :enumName="enumName"
-               @cancel="closeComponent"></component>
-  </div>
 </template>
 
 <script lang="ts">
@@ -103,7 +105,7 @@ import { LeftOutlined } from '@ant-design/icons-vue';
 import { handleChildComponentMethod, handleFinacing, getHasWR } from './setup';
 import Buy from './components/buy/index.vue';
 import Sell from './components/sell/index.vue';
-import { LineChartOutlined } from '@ant-design/icons-vue';
+import { LineChartOutlined, DownOutlined } from '@ant-design/icons-vue';
 import { handleModalComponent } from '@/common/setup/asyncComponent';
 import { onMounted, PropType, ref } from 'vue';
 import { handleSpotBtnList } from '../../setup';
@@ -133,6 +135,7 @@ export default defineComponent({
         Sell,
         BtnList,
         LeftOutlined,
+        DownOutlined,
         LineChartOutlined,
         [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../detail/index.vue')),
         [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../post_buying/index.vue')),