Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -798,6 +798,7 @@
             color: @m-grey41;
             width: 100%;
             top: calc(100% + 5px);
+            white-space: nowrap;
             // div:nth-child(2){
             //     margin-top: -10px;
             // }

src/assets/styles/theme.css

@@ -121,6 +121,7 @@
     --m-black43: #091a32;
     --m-black44: #1B2F41;
     --m-black45: #10202F;
+    --m-black46: rgba(0, 0, 0, 0.45);
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -333,6 +334,7 @@
     --m-black43: #091a32;
     --m-black44: #1B2F41;
     --m-black45: #10202F;
+    --m-black46: rgba(0, 0, 0, 0.45);
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -541,6 +543,7 @@
     --m-black43: #DEE8ED;
     --m-black44: #ebf1f5;
     --m-black45: #D6E0F0;
+    --m-black46: rgba(0, 0, 0, 0.45);
 
     --m-blue0: #5179E2;
     --m-blue0-hover: rgba(81, 121, 226, .8);

src/assets/styles/variables.less

@@ -129,6 +129,7 @@
 @m-black43: var(--m-black43);
 @m-black44: var(--m-black44);
 @m-black45: var(--m-black45);
+@m-black46: var(--m-black46);
 
 @m-blue0: var(--m-blue0);
 @m-blue0-hover: var(--m-blue0-hover);

src/common/components/drawer/index.vue

@@ -1,6 +1,6 @@
 <template>
     <a-drawer
-        :placement="placement"
+        placement="right"
         :closable="false"
         :visible="visible"
         :destroyOnClose="true"
@@ -74,22 +74,34 @@ export default defineComponent({
 <style lang="less">
 .bottom {
     .position(fixed, auto, 0, -2px, auto);
-    width: 586px;
-    height: 450px;
-    background: transparent;
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 586px !important;
+        height: 450px;
+        bottom: 0;
+        right: 0;
     }
 }
 .bottom486 {
     .position(fixed, auto, 0, -2px, auto);
-    width: 486px;
-    height: 450px;
-    background: transparent;
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 486px !important;
+        height: 450px;
+        bottom: 0;
+        right: 0;
         .ant-drawer-body {
             .collapseCont {
                 .highContent {
@@ -101,92 +113,178 @@ export default defineComponent({
 }
 .delistingBottom {
     .position(fixed, auto, 0, -2px, auto);
-    width: 586px;
-    height: 450px;
-    background: transparent;
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 586px !important;
+        height: 450px;
+        bottom: 0;
+        right: 0;
+    }
+}
+.ant-drawer.ant-drawer-bottom.ant-drawer-open.bottomListed {
+    .position(fixed, auto, 0, 0, auto);
+    width: 100%;
+    height: 100%;
+    z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
+    .ant-drawer-content-wrapper {
+        width: 566px !important;
+        height: 405px;
+        bottom: 0;
+        right: 0;
+    }
+}
+.bottomListed.delistingBottom {
+    .position(fixed, auto, 0, -2px, auto);
+    width: 100%;
+    height: 100%;
+    z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
+    .ant-drawer-content-wrapper {
+        width: 486px !important;
+        height: 450px;
+        bottom: 0;
+        right: 0;
     }
 }
 .delistingBottom650 {
     .position(fixed, auto, 0, -2px, auto);
-    width: 650px;
-    height: 450px;
-    background: transparent;
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 650px !important;
+        height: 450px;
+        bottom: 0;
+        right: 0;
     }
 }
 .top {
-    .position(fixed, 101px, 0, auto, auto);
-    width: 430px;
-    height: 450px;
-    background: transparent;
+    .position(fixed, 0, 0, auto, auto);
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 430px !important;
+        height: 450px;
+        right: 0;
+        top: 101px;
     }
 }
 .top486 {
-    .position(fixed, 101px, 0, auto, auto);
-    width: 486px;
-    height: 450px;
-    background: transparent;
+    .position(fixed, 0, 0, auto, auto);
+    width: 100%;
+    height: 100%;
     z-index: 11;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 486px !important;
+        height: 450px;
+        right: 0;
+        top: 101px;
     }
 }
 .top600 {
-    .position(fixed, 101px, 0, auto, auto);
-    width: 600px;
-    height: 450px;
-    background: transparent;
+    .position(fixed, 0, 0, auto, auto);
+    width: 100%;
+    height: 100%;
     z-index: 11;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 600px !important;
+        height: 450px;
+        right: 0;
+        top: 101px;
     }
 }
 .top500 {
-    .position(fixed, 101px, 0, auto, auto);
-    width: 500px;
-    height: 450px;
-    background: transparent;
+    .position(fixed, 0, 0, auto, auto);
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 500px !important;
+        height: 450px;
+        right: 0;
+        top: 101px;
     }
 }
 .topHigh {
-    .position(fixed, 101px, 0, auto, auto);
-    width: 580px;
-    height: 450px;
-    background: transparent;
+    .position(fixed, 0, 0, auto, auto);
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 580px !important;
+        height: 450px;
+        right: 0;
+        top: 101px;
     }
 }
 .bottomWidth {
     .position(fixed, auto, 0, 0, auto);
-    width: 765px;
-    height: 396px;
-    background: transparent;
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 765px !important;
+        height: 396px;
+        right: 0;
+        bottom: 0;
     }
 }
 .tradeDialog {
-    .position(fixed, 116px, 0, auto, auto);
-    width: 467px;
-    height: 310px;
-    background: transparent;
+    .position(fixed, 0, 0, auto, auto);
+    width: 100%;
+    height: 100%;
     z-index: 10;
+    .ant-drawer-mask {
+        height: 100%;
+        background: @m-black46 !important;
+    }
     .ant-drawer-content-wrapper {
         width: 467px !important;
+        height: 310px;
+        right: 0;
+        top: 116px;
     }
 }
 .collapse {
@@ -204,7 +302,7 @@ export default defineComponent({
 }
 .ant-drawer.ant-drawer-open {
     .ant-drawer-mask {
-        background: transparent;
+        background: @m-black46;
     }
     .ant-drawer-content-wrapper {
         box-shadow: none;
@@ -258,14 +356,4 @@ export default defineComponent({
 .ant-form.inlineForm .ant-row.ant-form-item .ant-form-item-label label {
     width: 90px;
 }
-.ant-drawer.ant-drawer-bottom.ant-drawer-open.bottomListed {
-    .position(fixed, auto, 0, 0, auto);
-    width: 566px;
-    height: 405px !important;
-    background: transparent;
-    z-index: 10;
-    .ant-drawer-content-wrapper {
-        width: 566px !important;
-    }
-}
 </style>

src/common/components/filter/index.vue

@@ -64,47 +64,22 @@ export default defineComponent({
 <style lang="less">
 .filter-custom-table {
     display: inline-flex;
-    padding-top: 2.5px;
-    height: 35px;
+    padding-top: 4px;
+    height: 34px;
     .conditionSelect:first-child {
         margin-right: 10px;
     }
-    // /deep/.ant-select {
-    //     // margin-right: 10px;
-    //     // border: 1px solid @m-grey37;
-    //     height: 28px;
-    //     // .rounded-corners(3px);
-    //     .ant-select-selector {
-    //         height: 26px;
-    //         .ant-select-selection-search {
-    //             height: 26px;
-    //             .ant-select-selection-search-input {
-    //                 height: 26px;
-    //             }
-    //         }
-    //         // padding: 0 8px;
-    //         // background: @m-grey9;
-    //         // border: none;
-    //         // .rounded-corners(3px);
-    //         // color: @m-grey10;
-    //         // .ant-select-arrow {
-    //         //     right: 8px;
-    //         //     color: @m-grey1;
-    //         // }
-    //     }
-    //     // .ant-select-arrow {
-    //     //     color: @m-grey1;
-    //     // }
-    //     // .ant-select-selection-item {
-    //     //     color: @m-white1;
-    //     // }
-    // }
+    .btnDeafault.ant-btn,
+    .operBtn.ant-btn {
+        height: 26px !important;
+        line-height: 26px !important;
+    }
     .ant-select-single:not(.ant-select-customize-input) {
         margin-right: 10px;
-        height: 28px;
-        line-height: 29px !important;
+        height: 26px;
+        line-height: 26px !important;
         .ant-select-selector {
-            height: 28px;
+            height: 26px;
             border-color: @m-grey46 !important;
             background: @m-grey47;
             .rounded-corners(3px);
@@ -124,11 +99,11 @@ export default defineComponent({
         }
     }
     .allDatePicker.ant-calendar-picker {
-        height: 28px !important;
+        height: 26px !important;
         border: 1px solid @m-grey46 !important;
         .ant-calendar-picker-input.ant-input {
-            height: 28px;
-            line-height: 28px;
+            height: 26px;
+            line-height: 26px;
             &::placeholder {
                 color: @m-grey10 !important;
             }

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

@@ -150,6 +150,9 @@ export default defineComponent({
                 .ant-col:first-child {
                     color: @m-yellow1;
                     line-height: 40px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
                 }
                 .ant-col:last-child {
                     text-align: right;

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

@@ -383,6 +383,7 @@ export default defineComponent({
         font-size: 12px;
         z-index: 10;
         color: @m-red1;
+        white-space: nowrap;
     }
     .way {
         display: inline-flex;

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

@@ -88,7 +88,7 @@
                                     class="commonInput"
                                     :suffix="selectedRow.enumdicname"
                                     :min="selectedRow.minivalue"
-                                    style="width: 260px"
+                                    style="width: 260px !important"
                                 />
                                 <div
                                     class="tip"

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/index.vue

@@ -1,167 +1,160 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
-  <Drawer :title="'挂牌求购'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <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="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-checkbox class="commonCheckbox"
-                            v-model:checked="priceCheck">可议价</a-checkbox>
-              </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"
-                                v-model:value="formState.OrderQty" />
-                <MinusOutlined @click="decreaseNumber" />
-                <PlusOutlined @click="increaseNumber" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <a-checkbox v-model:checked="numCheck"
-                            class="commonCheckbox">整单</a-checkbox>
-              </a-form-item>
-            </a-col>
+    <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
+    <Drawer :title="'挂牌求购'" :placement="'right'" :visible="visible" @cancel="cancel" class="top486">
+        <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="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-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
+                            </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"
+                                    v-model:value="formState.OrderQty"
+                                />
+                                <MinusOutlined @click="decreaseNumber" />
+                                <PlusOutlined @click="increaseNumber" />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                                <a-checkbox v-model:checked="numCheck" class="commonCheckbox">整单</a-checkbox>
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24"
-                   v-if="!numCheck">
-              <a-form-item label="起摘数量"
-                           name="delistingQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.delistingQty"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金"
-                           name="margin">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.margin"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">%</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="交收月"
-                           name="DeliveryMonth">
-                <a-month-picker style="width: 140px"
-                                v-model:value="formState.DeliveryMonth"
-                                :allowClear="'false'"
-                                class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌有效期"
-                           name="vidaliteTime"
-                           class="inputIconBox">
-                <a-date-picker style="width: 260px"
-                               v-model:value="formState.vidaliteTime"
-                               :allowClear="false"
-                               class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
+                        <a-col :span="24" v-if="!numCheck">
+                            <a-form-item label="起摘数量" name="delistingQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.delistingQty"
+                                    :min="0"
+                                    style="width: 260px !important"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金" name="margin">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.margin"
+                                    :min="0"
+                                    style="width: 260px"
+                                />
+                                <span class="input-enumdicname">%</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="交收月" name="DeliveryMonth">
+                                <a-month-picker
+                                    style="width: 140px"
+                                    v-model:value="formState.DeliveryMonth"
+                                    :allowClear="'false'"
+                                    class="commonDatePicker dialogDatePicker"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌有效期" name="vidaliteTime" class="inputIconBox">
+                                <a-date-picker
+                                    style="width: 260px"
+                                    v-model:value="formState.vidaliteTime"
+                                    :allowClear="false"
+                                    class="commonDatePicker dialogDatePicker"
+                                />
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="履约方式"
-                           class="inputIconBox">
-                <span class="clickBox"
-                      @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName  : '选择履约模板'}}</span>
-                <svg class="icon svg-icon"
-                     aria-hidden="true"
-                     @click="openPermance">
-                  <use xlink:href="#icon-moban" />
-                </svg>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="指定朋友"
-                           class="inputIconBox">
-                <span class="clickBox"
-                      @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-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌金额">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <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">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                        <a-col :span="24">
+                            <a-form-item label="履约方式" class="inputIconBox">
+                                <span
+                                    class="clickBox"
+                                    @click="openPermance"
+                                >{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
+                                <svg
+                                    class="icon svg-icon"
+                                    aria-hidden="true"
+                                    @click="openPermance"
+                                >
+                                    <use xlink:href="#icon-moban" />
+                                </svg>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="指定朋友" class="inputIconBox">
+                                <span
+                                    class="clickBox"
+                                    @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-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌金额">
+                                <span class="white ml8">{{getMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <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">{{getCanUseMoney(getSelectedAccount())}}</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" @click="submit">买入</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        @click="submit">买入</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance v-if="showPermance" @cancel="choosePermance" @update="choosePermance" />
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/index.vue

@@ -1,158 +1,150 @@
 <template>
-  <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
-  <Drawer :title="'挂牌求购'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <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="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-checkbox class="commonCheckbox"
-                            v-model:checked="priceCheck">可议价</a-checkbox>
-              </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"
-                                v-model:value="formState.OrderQty" />
-                <MinusOutlined @click="decreaseNumber" />
-                <PlusOutlined @click="increaseNumber" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <a-checkbox v-model:checked="numCheck"
-                            class="commonCheckbox">整单</a-checkbox>
-              </a-form-item>
-            </a-col>
+    <!--仓单贸易 贸易圈挂牌 挂牌求购 -->
+    <Drawer :title="'挂牌求购'" :placement="'right'" :visible="visible" @cancel="cancel" class="top486">
+        <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="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-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
+                            </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"
+                                    v-model:value="formState.OrderQty"
+                                />
+                                <MinusOutlined @click="decreaseNumber" />
+                                <PlusOutlined @click="increaseNumber" />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                                <a-checkbox v-model:checked="numCheck" class="commonCheckbox">整单</a-checkbox>
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24"
-                   v-if="!numCheck">
-              <a-form-item label="起摘数量"
-                           name="delistingQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.delistingQty"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约保证金"
-                           name="margin">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.margin"
-                                :min="0"
-                                style="width: 260px" />
-                <span class="input-enumdicname">%</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌有效期"
-                           name="vidaliteTime"
-                           class="inputIconBox">
-                <a-date-picker style="width: 260px"
-                               v-model:value="formState.vidaliteTime"
-                               :allowClear="false"
-                               class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
+                        <a-col :span="24" v-if="!numCheck">
+                            <a-form-item label="起摘数量" name="delistingQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.delistingQty"
+                                    :min="0"
+                                    style="width: 260px !important"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约保证金" name="margin">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.margin"
+                                    :min="0"
+                                    style="width: 260px"
+                                />
+                                <span class="input-enumdicname">%</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌有效期" name="vidaliteTime" class="inputIconBox">
+                                <a-date-picker
+                                    style="width: 260px"
+                                    v-model:value="formState.vidaliteTime"
+                                    :allowClear="false"
+                                    class="commonDatePicker dialogDatePicker"
+                                />
+                            </a-form-item>
+                        </a-col>
 
-            <a-col :span="24">
-              <a-form-item label="履约方式"
-                           class="inputIconBox">
-                <span class="clickBox"
-                      @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName  : '选择履约模板'}}</span>
-                <svg class="icon svg-icon"
-                     aria-hidden="true"
-                     @click="openPermance">
-                  <use xlink:href="#icon-moban" />
-                </svg>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="指定朋友"
-                           class="inputIconBox">
-                <span class="clickBox"
-                      @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-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌金额">
-                <span class="white ml8">{{getMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <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">{{getCanUseMoney(getSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                        <a-col :span="24">
+                            <a-form-item label="履约方式" class="inputIconBox">
+                                <span
+                                    class="clickBox"
+                                    @click="openPermance"
+                                >{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
+                                <svg
+                                    class="icon svg-icon"
+                                    aria-hidden="true"
+                                    @click="openPermance"
+                                >
+                                    <use xlink:href="#icon-moban" />
+                                </svg>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="指定朋友" class="inputIconBox">
+                                <span
+                                    class="clickBox"
+                                    @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-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌金额">
+                                <span class="white ml8">{{getMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <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">{{getCanUseMoney(getSelectedAccount())}}</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" @click="submit">买入</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
-        <a-row :gutter="24">
-          <a-col :span="24"
-                 class="fixedBtns">
-            <a-form-item class="btnCenter">
-              <a-button class="listedBtn"
-                        @click="submit">买入</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance v-if="showPermance" @cancel="choosePermance" @update="choosePermance" />
 </template>
 
 <script lang="ts">

src/views/market/warehouseTrade/components/delisting/index.vue

@@ -36,7 +36,11 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="起摘数量" class="relative">
-                            <a-input class="commonInput" suffix="吨" style="width: 140px" />
+                            <a-input
+                                class="commonInput"
+                                suffix="吨"
+                                style="width: 140px !important"
+                            />
                             <div class="tip">最小单位：1吨</div>
                         </a-form-item>
                     </a-col>

src/views/market/warehouseTrade/components/listed/index.vue

@@ -36,7 +36,11 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="起摘数量" class="relative">
-                            <a-input class="commonInput" suffix="吨" style="width: 140px" />
+                            <a-input
+                                class="commonInput"
+                                suffix="吨"
+                                style="width: 140px !important"
+                            />
                             <div class="tip">最小单位：1吨</div>
                         </a-form-item>
                     </a-col>

src/views/order/performance_information/components/components/breach_contract/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 违约-->
-    <Drawer :title="'违约'" :placement="'bottom'" :visible="visible" @cancel="cancel">
+    <Drawer :title="'违约'" :placement="'right'" class="bottom" :visible="visible" @cancel="cancel">
         <div class="listed">
             <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
                 <div class="formBar">

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -1,274 +1,285 @@
 <template>
-  <!-- 预售仓单 现货明细 挂牌 -->
-  <Drawer :title="'挂牌'"
-          :placement="'right'"
-          class="delistingBottom650"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
+    <!-- 预售仓单 现货明细 挂牌 -->
+    <Drawer
+        :title="'挂牌'"
+        :placement="'right'"
+        class="delistingBottom650"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <div class="condition">
+                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+            </div>
 
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="挂牌方式"
-                           name="WRPriceType">
-                <a-select class="inlineFormSelect"
-                          default-value="1"
-                          v-model:value="formState.WRPriceType"
-                          style="width: 140px">
-                  <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>
-              </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-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-checkbox class="commonCheckbox"
-                            v-model:checked="priceCheck">可议价</a-checkbox>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="isFloat()">
-              <a-form-item label="基差"
-                           name="PriceMove">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.PriceMove"
-                                style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty">
-                <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="起摘数量"
-                           class="relative"
-                           name="DelistMinQty">
-                <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">最小单位：1{{selectedRow.enumdicname}}</div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <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;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="交收月"
-                           name="DeliveryMonth">
-                <a-month-picker style="width: 140px"
-                                v-model:value="formState.DeliveryMonth"
-                                :allowClear="false"
-                                class="commonDatePicker dialogDatePicker" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item>&nbsp;</a-form-item>
-            </a-col>
-          </a-row>
-          <template v-if="isBlocs()">
-            <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" />
-                  <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-form-item>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <a-form-item label="履约方式"
-                             class="inputIconBox">
-                  <span class="clickBox"
-                        style="width: 140px"
-                        @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
-                  <svg class="icon svg-icon"
-                       aria-hidden="true"
-                       @click="openPermance">
-                    <use xlink:href="#icon-moban" />
-                  </svg>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="指定朋友"
-                             class="inputIconBox">
-                  <span class="clickBox"
-                        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-form-item>
-              </a-col>
-            </a-row>
-          </template>
-          <a-row :gutter="24"
-                 v-if="isFloat()">
-            <a-col :span="24">
-              <a-form-item label="行情商品"
-                           name="goodsid">
-                <!-- <a-select class="inlineFormSelect"
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="挂牌方式" name="WRPriceType">
+                                <a-select
+                                    class="inlineFormSelect"
+                                    default-value="1"
+                                    v-model:value="formState.WRPriceType"
+                                    style="width: 140px"
+                                >
+                                    <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>
+                            </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-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-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="isFloat()">
+                            <a-form-item label="基差" name="PriceMove">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.PriceMove"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="挂牌数量" name="OrderQty">
+                                <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-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="起摘数量" class="relative" name="DelistMinQty">
+                                <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">最小单位：1{{selectedRow.enumdicname}}</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <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;"
+                                />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="交收月" name="DeliveryMonth">
+                                <a-month-picker
+                                    style="width: 140px"
+                                    v-model:value="formState.DeliveryMonth"
+                                    :allowClear="false"
+                                    class="commonDatePicker dialogDatePicker"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item>&nbsp;</a-form-item>
+                        </a-col>
+                    </a-row>
+                    <template v-if="isBlocs()">
+                        <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"
+                                    />
+                                    <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-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row :gutter="24">
+                            <a-col :span="12">
+                                <a-form-item label="履约方式" class="inputIconBox">
+                                    <span
+                                        class="clickBox"
+                                        style="width: 140px"
+                                        @click="openPermance"
+                                    >{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
+                                    <svg
+                                        class="icon svg-icon"
+                                        aria-hidden="true"
+                                        @click="openPermance"
+                                    >
+                                        <use xlink:href="#icon-moban" />
+                                    </svg>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item label="指定朋友" class="inputIconBox">
+                                    <span
+                                        class="clickBox"
+                                        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-form-item>
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-row :gutter="24" v-if="isFloat()">
+                        <a-col :span="24">
+                            <a-form-item label="行情商品" name="goodsid">
+                                <!-- <a-select class="inlineFormSelect"
                           style="width: 135px"
                           placeholder="请择交易所">
                                 </a-select>-->
-                <a-select class="inlineFormSelect ml5"
-                          @change="handleGoodsGroups"
-                          style="width: 135px"
-                          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: 135px"
-                          @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>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   v-if="isFloat()"
-                   class="relative">
-              <a-form-item :label="'估算金额'">
-                <span class="white ml8">{{getWrMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isFixed()"
-                   class="relative">
-              <a-form-item :label="'挂牌金额'">
-                <span class="white ml8">{{getWrMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="getWrMargin() && !isBlocs()">
-              <a-form-item :label="getWrMargin() ? '履约保证金' : ''">
-                <span class="white ml8">{{getWrMargin()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isBlocs()">
-              <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">{{getCanUseMoney(handleSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                                <a-select
+                                    class="inlineFormSelect ml5"
+                                    @change="handleGoodsGroups"
+                                    style="width: 135px"
+                                    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: 135px"
+                                    @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>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" v-if="isFloat()" class="relative">
+                            <a-form-item :label="'估算金额'">
+                                <span class="white ml8">{{getWrMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isFixed()" class="relative">
+                            <a-form-item :label="'挂牌金额'">
+                                <span class="white ml8">{{getWrMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="getWrMargin() && !isBlocs()">
+                            <a-form-item :label="getWrMargin() ? '履约保证金' : ''">
+                                <span class="white ml8">{{getWrMargin()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isBlocs()">
+                            <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">{{getCanUseMoney(handleSelectedAccount())}}</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"
+                            >卖出</a-button>
+                            <a-button
+                                class="ml10 cancelBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="cancel"
+                            >取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </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">卖出</a-button>
-              <a-button class="ml10 cancelBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          :position="'bottom'"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            :position="'bottom'"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" :position="'bottom'" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance
+        v-if="showPermance"
+        :position="'bottom'"
+        @cancel="choosePermance"
+        @update="choosePermance"
+    />
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing.vue

@@ -37,7 +37,11 @@
                         </a-col>
                         <a-col :span="12">
                             <a-form-item label="起摘数量" class="relative">
-                                <a-input class="commonInput" suffix="吨" style="width: 140px" />
+                                <a-input
+                                    class="commonInput"
+                                    suffix="吨"
+                                    style="width: 140px !important"
+                                />
                                 <div class="tip">最小单位：1吨</div>
                             </a-form-item>
                         </a-col>

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

@@ -37,7 +37,11 @@
                         </a-col>
                         <a-col :span="12">
                             <a-form-item label="起摘数量" class="relative">
-                                <a-input class="commonInput" suffix="吨" style="width: 140px" />
+                                <a-input
+                                    class="commonInput"
+                                    suffix="吨"
+                                    style="width: 140px !important"
+                                />
                                 <div class="tip">最小单位：1吨</div>
                             </a-form-item>
                         </a-col>

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

@@ -1,260 +1,272 @@
 <template>
-  <!-- 现货仓单 现货明细 挂牌 -->
-  <Drawer :title="'挂牌'"
-          :placement="'right'"
-          class="delistingBottom650"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listing">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
+    <!-- 现货仓单 现货明细 挂牌 -->
+    <Drawer
+        :title="'挂牌'"
+        :placement="'right'"
+        class="delistingBottom650"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listing">
+            <div class="condition">
+                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+            </div>
 
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="挂牌方式"
-                           name="WRPriceType">
-                <a-select class="inlineFormSelect"
-                          default-value="1"
-                          v-model:value="formState.WRPriceType"
-                          style="width: 140px">
-                  <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>
-              </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-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-checkbox class="commonCheckbox"
-                            v-model:checked="priceCheck">可议价</a-checkbox>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="isFloat()">
-              <a-form-item label="基差"
-                           name="PriceMove">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.PriceMove"
-                                style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="挂牌数量"
-                           name="OrderQty">
-                <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="起摘数量"
-                           class="relative"
-                           name="DelistMinQty">
-                <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">最小单位：{{selectedRow.minivalue}}{{selectedRow.enumdicname}}</div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <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;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <template v-if="isBlocs()">
-            <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" />
-                  <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-form-item>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :span="12">
-                <a-form-item label="履约方式"
-                             class="inputIconBox">
-                  <span class="clickBox"
-                        style="width: 140px"
-                        @click="openPermance">{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
-                  <svg class="icon svg-icon"
-                       aria-hidden="true"
-                       @click="openPermance">
-                    <use xlink:href="#icon-moban" />
-                  </svg>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="指定朋友"
-                             class="inputIconBox">
-                  <span class="clickBox"
-                        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-form-item>
-              </a-col>
-            </a-row>
-          </template>
-          <a-row :gutter="24"
-                 v-if="isFloat()">
-            <a-col :span="24">
-              <a-form-item label="行情商品"
-                           name="goodsid">
-                <!-- <a-select class="inlineFormSelect"
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="挂牌方式" name="WRPriceType">
+                                <a-select
+                                    class="inlineFormSelect"
+                                    default-value="1"
+                                    v-model:value="formState.WRPriceType"
+                                    style="width: 140px"
+                                >
+                                    <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>
+                            </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-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-checkbox class="commonCheckbox" v-model:checked="priceCheck">可议价</a-checkbox>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="isFloat()">
+                            <a-form-item label="基差" name="PriceMove">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.PriceMove"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="挂牌数量" name="OrderQty">
+                                <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-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="起摘数量" class="relative" name="DelistMinQty">
+                                <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"
+                                >最小单位：{{selectedRow.minivalue}}{{selectedRow.enumdicname}}</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <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;"
+                                />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <template v-if="isBlocs()">
+                        <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"
+                                    />
+                                    <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-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row :gutter="24">
+                            <a-col :span="12">
+                                <a-form-item label="履约方式" class="inputIconBox">
+                                    <span
+                                        class="clickBox"
+                                        style="width: 140px"
+                                        @click="openPermance"
+                                    >{{formState.permanceTempName ? formState.permanceTempName : '选择履约模板'}}</span>
+                                    <svg
+                                        class="icon svg-icon"
+                                        aria-hidden="true"
+                                        @click="openPermance"
+                                    >
+                                        <use xlink:href="#icon-moban" />
+                                    </svg>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="12">
+                                <a-form-item label="指定朋友" class="inputIconBox">
+                                    <span
+                                        class="clickBox"
+                                        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-form-item>
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-row :gutter="24" v-if="isFloat()">
+                        <a-col :span="24">
+                            <a-form-item label="行情商品" name="goodsid">
+                                <!-- <a-select class="inlineFormSelect"
                           style="width: 135px"
                           placeholder="请择交易所">
                                 </a-select>-->
-                <a-select class="inlineFormSelect ml5"
-                          @change="handleGoodsGroups"
-                          style="width: 135px"
-                          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: 135px"
-                          @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>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   v-if="isFloat()"
-                   class="relative">
-              <a-form-item :label="'估算金额'">
-                <span class="white ml8">{{getWrMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isFixed()"
-                   class="relative">
-              <a-form-item :label="'挂牌金额'">
-                <span class="white ml8">{{getWrMoney()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="getWrMargin() && !isBlocs()">
-              <a-form-item :label="getWrMargin() ? '履约保证金' : ''">
-                <span class="white ml8">{{getWrMargin()}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   v-if="isBlocs()">
-              <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">{{getCanUseMoney(handleSelectedAccount())}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
+                                <a-select
+                                    class="inlineFormSelect ml5"
+                                    @change="handleGoodsGroups"
+                                    style="width: 135px"
+                                    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: 135px"
+                                    @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>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" v-if="isFloat()" class="relative">
+                            <a-form-item :label="'估算金额'">
+                                <span class="white ml8">{{getWrMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isFixed()" class="relative">
+                            <a-form-item :label="'挂牌金额'">
+                                <span class="white ml8">{{getWrMoney()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="getWrMargin() && !isBlocs()">
+                            <a-form-item :label="getWrMargin() ? '履约保证金' : ''">
+                                <span class="white ml8">{{getWrMargin()}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" v-if="isBlocs()">
+                            <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">{{getCanUseMoney(handleSelectedAccount())}}</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"
+                            >卖出</a-button>
+                            <a-button
+                                class="ml10 cancelBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="cancel"
+                            >取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </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">卖出</a-button>
-              <a-button class="ml10 cancelBtn"
-                        :loading="loading"
-                        :disabled="loading"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
-  <!-- 选择朋友 -->
-  <Friend v-if="showFriend"
-          :position="'bottom'"
-          @cancel="chooseFriend"
-          @update="chooseFriend" />
-  <!-- 选择履约模板 -->
-  <Permance v-if="showPermance"
-            :position="'bottom'"
-            @cancel="choosePermance"
-            @update="choosePermance" />
+    </Drawer>
+    <!-- 选择朋友 -->
+    <Friend v-if="showFriend" :position="'bottom'" @cancel="chooseFriend" @update="chooseFriend" />
+    <!-- 选择履约模板 -->
+    <Permance
+        v-if="showPermance"
+        :position="'bottom'"
+        @cancel="choosePermance"
+        @update="choosePermance"
+    />
 </template>
 
 <script lang="ts">

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

@@ -1,108 +1,107 @@
 <template>
-  <!-- 现货仓单 现货明细 提货 true -->
-  <Drawer :title="'提货'"
-          :placement="'right'"
-          class="bottom"
-          :visible="visible"
-          @cancel="cancel">
-    <!-- 挂牌 -->
-    <div class="listed">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
-      <a-form class="inlineForm dialogForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <div class="formBar">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="提货数量"
-                           name="OutQty">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.OutQty"
-                                :min="0"
-                                :max="selectedRow.enableqty"
-                                style="width: 140px" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="提货人"
-                           name="ContactName">
-                <a-input class="commonInput"
-                         v-model:value="formState.ContactName"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12"
-                   class="mt-20">
-              <a-form-item>
-                <!-- <a-progress class="formProgress" :percent="30" /> -->
-                <a-slider v-model:value="formState.OutQty"
-                          ::min="0"
-                          :max="selectedRow.enableqty"
-                          class="formSlider"
-                          style="width: 140px;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
+    <!-- 现货仓单 现货明细 提货 true -->
+    <Drawer :title="'提货'" :placement="'right'" class="bottom" :visible="visible" @cancel="cancel">
+        <!-- 挂牌 -->
+        <div class="listed">
+            <div class="condition">
+                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+            </div>
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="提货数量" name="OutQty">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.OutQty"
+                                    :min="0"
+                                    :max="selectedRow.enableqty"
+                                    style="width: 140px"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="提货人" name="ContactName">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.ContactName"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12" class="mt-20">
+                            <a-form-item>
+                                <!-- <a-progress class="formProgress" :percent="30" /> -->
+                                <a-slider
+                                    v-model:value="formState.OutQty"
+                                    ::min="0"
+                                    :max="selectedRow.enableqty"
+                                    class="formSlider"
+                                    style="width: 140px !important;"
+                                />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="联系方式" name="ContactNum">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.ContactNum"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="预约日期" name="AppointmentDate">
+                                <a-date-picker
+                                    class="commonDatePicker dialogDatePicker"
+                                    allowClear="false"
+                                    v-model:value="formState.AppointmentDate"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="备注" name="AppointmentRemark">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.AppointmentRemark"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
                 </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="联系方式"
-                           name="ContactNum">
-                <a-input class="commonInput"
-                         v-model:value="formState.ContactNum"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="预约日期"
-                           name="AppointmentDate">
-                <a-date-picker class="commonDatePicker dialogDatePicker"
-                               allowClear="false"
-                               v-model:value="formState.AppointmentDate"
-                               style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="备注"
-                           name="AppointmentRemark">
-                <a-input class="commonInput"
-                         v-model:value="formState.AppointmentRemark"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
+                <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"
+                            >提货</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </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">提货</a-button>
-              <a-button class="ml10 cancelBtn"
-                        @click="cancel">取消</a-button>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">

src/views/ping_an/spot_price_management/spot_price_management_pending/index.vue

@@ -1,35 +1,48 @@
 <template>
-  <!-- 现货点价管理 待点价 -->
-  <div class="iframe-container">
-    <iframe :src="url"
-            style="border: 0;"></iframe>
-  </div>
+    <!-- 现货点价管理 待点价 -->
+    <div class="iframe-container">
+        <iframe :src="url"
+                style="border: 0;"></iframe>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { IfameRouteParam } from '@/common/setup/iframe/interface';
-import { handleIfameRouter } from '@/common/setup/iframe';
+    import { defineComponent, onMounted } from 'vue';
+    import { IfameRouteParam } from '@/common/setup/iframe/interface';
+    import { handleIfameRouter } from '@/common/setup/iframe';
 
-export default defineComponent({
-    name: 'spot_price_management_pending',
-    components: {},
-    setup() {
-        const param: IfameRouteParam = {
-            code: 'spot_price_management_pending',
-            btnCodeList: [
-                //  权限按钮 info（详情）:add（新增）:edit（修改）:del（停用启用）
-                { btnCode: 'spot_price_management_pending_someprice', urlCode: 'pointprice' },
-                { btnCode: 'spot_price_management_pending_hedging', urlCode: 'heding' },
-                { btnCode: 'info', urlCode: 'info' },
-            ],
-            tabIndex: 1,
-        };
-        return { ...handleIfameRouter(param) };
-    },
-});
+    // 自定义window属性
+    declare const window: Window & {
+        chrome: any,
+        aaa: (str: string) => void,
+    }
+
+    export default defineComponent({
+        name: 'spot_price_management_pending',
+        components: {},
+        setup() {
+            onMounted(() => {
+                const bridge = window.chrome.webview.hostObjects.bridge;
+                window.aaa = (str: string) => {
+                    console.log(str)
+                    bridge.Func(str);
+                }
+            });
+
+            const param: IfameRouteParam = {
+                code: 'spot_price_management_pending',
+                btnCodeList: [
+                    //  权限按钮 info（详情）:add（新增）:edit（修改）:del（停用启用）
+                    { btnCode: 'spot_price_management_pending_someprice', urlCode: 'pointprice' },
+                    { btnCode: 'spot_price_management_pending_hedging', urlCode: 'heding' },
+                    { btnCode: 'info', urlCode: 'info' },
+                ],
+                tabIndex: 1,
+            };
+            return { ...handleIfameRouter(param) };
+        },
+    });
 </script>
 
 <style lang="less">
-</style
->;
+</style>