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

src/assets/styles/mixin.less

@@ -1851,6 +1851,11 @@ input:-internal-autofill-selected {
             background: @m-black2;
         }
     }
+    .ant-table-row-expand-icon {
+        border-color: @m-grey17;
+        background-color: transparent;
+        color:  @m-grey17;
+    }
 }
 
 .sellHallTable {
@@ -1914,4 +1919,26 @@ input:-internal-autofill-selected {
             color: @m-white0-hover;
         }
     }
+}
+
+.ant-slider.formSlider {
+    width: 140px;
+    margin-left: 70px;
+    .ant-slider-rail {
+        margin-right: 0;
+        padding-right: 0;
+        height: 3px !important;
+        border-radius: 2px !important;
+        background-color: @m-blue14;
+    }
+    .ant-slider-track {
+        height: 3px;
+        background-color: @m-blue0;
+    }
+    .ant-slider-step {
+        height: 3px;
+    }
+    .ant-progress-text {
+        display: none;
+    }
 }

src/common/components/capitalInfo/index.vue

@@ -1,54 +1,59 @@
 <template>
-  <div class="capital-info">
-    <!-- 资金信息 -->
-    <a-select style="width: 135px"
-              @change="accountChange"
-              v-model:value="selectedAccountId">
-      <a-select-option v-for="item in getAllTaAccount()"
-                       :value="item.accountid"
-                       :key="item.accountid">
-        {{item.accountid}}
-      </a-select-option>
-    </a-select>
-    <!-- <a-collapse class="capitalCollapse"
+    <div class="capital-info">
+        <!-- 资金信息 -->
+        <a-select
+            class="capitalSelect"
+            style="width: 180px"
+            @change="accountChange"
+            v-model:value="selectedAccountId"
+        >
+            <a-select-option
+                v-for="item in getAllTaAccount()"
+                :value="item.accountid"
+                :key="item.accountid"
+            >{{item.accountid}}</a-select-option>
+        </a-select>
+        <!-- <a-collapse class="capitalCollapse"
                 default-active-key="1"
                 :bordered="false"
                 expand-icon-position="right">
       <a-collapse-panel key="1"
-                        header="南山铜加工厂（074345345345345345）"> -->
-    <div class="capitalItem">
-      <div class="firstLine">
-        <div>净值</div>
-        <div>
-          <i class="iconfont icon-zhengyan"></i>
+        header="南山铜加工厂（074345345345345345）">-->
+        <div class="numBlocks">
+            <div class="capitalItem">
+                <div class="firstLine">
+                    <div>净值</div>
+                    <div>
+                        <i class="iconfont icon-zhengyan"></i>
+                    </div>
+                </div>
+                <div class="numBar">128,000.00</div>
+            </div>
+            <div class="capitalItem">
+                <div class="firstLine">
+                    <div>占用</div>
+                </div>
+                <div class="numBar green">128,000.00</div>
+            </div>
+            <div class="capitalItem">
+                <div class="firstLine">
+                    <div>冻结</div>
+                </div>
+                <div class="numBar red">128,000.00</div>
+            </div>
+            <div class="capitalItem">
+                <div class="firstLine">
+                    <div>可用</div>
+                </div>
+                <div class="numBar blue">128,000.00</div>
+            </div>
         </div>
-      </div>
-      <div class="numBar">128,000.00</div>
-    </div>
-    <div class="capitalItem">
-      <div class="firstLine">
-        <div>占用</div>
-      </div>
-      <div class="numBar green">128,000.00</div>
-    </div>
-    <div class="capitalItem">
-      <div class="firstLine">
-        <div>冻结</div>
-      </div>
-      <div class="numBar red">128,000.00</div>
-    </div>
-    <div class="capitalItem">
-      <div class="firstLine">
-        <div>可用</div>
-      </div>
-      <div class="numBar blue">128,000.00</div>
-    </div>
-    <!-- <a-icon slot="extra"
+        <!-- <a-icon slot="extra"
                 type="setting"
                 @click="handleClick" />
       </a-collapse-panel>
-    </a-collapse> -->
-  </div>
+        </a-collapse>-->
+    </div>
 </template>
 
 <script lang="ts">
@@ -109,6 +114,59 @@ export default defineComponent({
     width: 100%;
     height: 100%;
     background: @m-grey6;
+    .ant-select.capitalSelect {
+        .ant-select-selector {
+            width: 180px;
+            height: 40px;
+            line-height: 40px;
+            background: @m-grey6;
+            border: 1px solid @m-blue0;
+            .ant-select-selection-item {
+                font-size: 14px;
+                color: @m-white0;
+                line-height: 40px;
+            }
+        }
+    }
+    .numBlocks {
+        padding: 10px 12px 18px 12px;
+    }
+    .capitalItem {
+        width: 100%;
+        padding-top: 10px;
+        font-size: 14px;
+        color: @m-grey1;
+        .firstLine {
+            width: 100%;
+            .inlineflex;
+            justify-content: space-between;
+            height: 18px;
+            line-height: 18px;
+            .iconfont {
+                font-size: 18px;
+                color: @m-black3;
+            }
+        }
+        .numBar {
+            width: 100%;
+            margin-top: 12px;
+            height: 16px;
+            line-height: 16px;
+            font-size: 16px;
+            text-align: left;
+            color: @m-white0;
+            margin-bottom: 8px;
+        }
+        .green {
+            color: @m-green0;
+        }
+        .red {
+            color: @m-red1;
+        }
+        .blue {
+            color: @m-blue0;
+        }
+    }
     .capitalCollapse {
         height: 100%;
         background: transparent;
@@ -137,42 +195,6 @@ export default defineComponent({
                     padding: 10px 12px;
                     .flex();
                     flex-direction: column;
-                    .capitalItem {
-                        width: 100%;
-                        padding-top: 10px;
-                        font-size: 14px;
-                        color: @m-grey1;
-                        .firstLine {
-                            width: 100%;
-                            .inlineflex;
-                            justify-content: space-between;
-                            height: 18px;
-                            line-height: 18px;
-                            .iconfont {
-                                font-size: 18px;
-                                color: @m-black3;
-                            }
-                        }
-                        .numBar {
-                            width: 100%;
-                            margin-top: 8px;
-                            height: 16px;
-                            line-height: 16px;
-                            font-size: 16px;
-                            text-align: left;
-                            color: @m-white0;
-                            margin-bottom: 5px;
-                        }
-                        .green {
-                            color: @m-green0;
-                        }
-                        .red {
-                            color: @m-red1;
-                        }
-                        .blue {
-                            color: @m-blue0;
-                        }
-                    }
                 }
             }
         }

src/common/constants/enumsName.ts

@@ -549,4 +549,187 @@ export function getChangeLogType(changelogtype: number) {
             break
     }
     return result
+}
+
+//仓单委托状态
+// 委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
+export function getWrTradeOrderStatusName(type: number){
+    let result = '--'
+    switch (type) {
+        case 1:
+            result = '委托请求'
+            break
+        case 2:
+            result = '待冻结'
+            break
+        case 3:
+            result = '委托成功'
+            break
+        case 4:
+            result = '委托失败'
+            break
+        case 5:
+            result = '配对成功'
+            break
+        case 6:
+            result = '已撤'
+            break
+        case 7:
+            result = '已成'
+            break
+        case 8:
+            result = '成交失败'
+            break
+        case 9:
+            result = '委托拒绝'
+            break
+        case 10:
+            result = '挂牌部分成交'
+            break
+        case 11:
+            result = '仓单生成失败'
+            break
+        case 12:
+            result = '首付扣款失败'
+            break
+        case 13:
+            result = '履约失败'
+            break
+        case 14:
+            result = '撤单解冻贷款失败'
+            break
+        case 15:
+            result = '部成部撤'
+            break
+    }
+    return result
+}
+
+/**
+ * 挂牌类型  卖入 买入 卖出
+ * @param buyOrSell 买卖 - 0:买 1:卖(挂牌类型 买为采购 卖为销售)
+ * @param wrTradeType 1:挂牌 2:摘牌
+ */
+export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number){
+    let result = '--'
+    if(buyOrSell === 0 && wrTradeType === 1){
+        result = "买入"
+    }else if(buyOrSell === 1 && wrTradeType === 1){
+        result = "卖出"
+    }else if(buyOrSell === 0 && wrTradeType === 2){
+        result = "买出"
+    }else if(buyOrSell === 1 && wrTradeType === 2){
+        result = "卖入"
+    }
+    return result
+}
+
+/**
+ * 履约类型 - 0:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 10:法币C2C 11:报价系统 12:挂牌系统
+ * @param type
+ */
+export function getPerformanceTypeName(type: number) {
+    let result = '--'
+    switch (type) {
+        case 0:
+            result = '通用'
+            break
+        case 1:
+            result = '交割'
+            break
+        case 2:
+            result = '仓单贸易'
+            break
+        case 3:
+            result = '预售集采'
+            break
+        case 4:
+            result = '竞拍-降价式'
+            break
+        case 5:
+            result = '挂牌期权'
+            break
+        case 6:
+            result = '竞拍-降价式'
+            break
+        case 7:
+            result = '竞拍-竞价式'
+            break
+        case 8:
+            result = '竞拍-大宗式'
+            break
+        case 9:
+            result = '荷兰式'
+            break
+        case 10:
+            result = '法币C2C'
+            break
+        case 11:
+            result = '报价系统'
+            break
+        case 12:
+            result = '挂牌系统'
+            break
+    }
+    return result
+}
+
+/**
+ * 履约状态 1:初始化 2:正常 3:处理错误 4:违约待处理 5:违约处理中 6:完成 7.违约已完成 8:释放冻结失败 9:超时待处理 10:超时关闭
+ * @param type
+ */
+export function getPerformanceStatusName(type: number) {
+    let result = '--'
+    switch (type) {
+        case 0:
+            result = '初始化'
+            break
+        case 1:
+            result = '正常'
+            break
+        case 2:
+            result = '处理错误'
+            break
+        case 3:
+            result = '处理错误'
+            break
+        case 4:
+            result = '违约待处理'
+            break
+        case 5:
+            result = '违约处理中'
+            break
+        case 6:
+            result = '完成'
+            break
+        case 7:
+            result = '违约已完成'
+            break
+        case 8:
+            result = '释放冻结失败'
+            break
+        case 9:
+            result = '超时待处理'
+            break
+        case 10:
+            result = '超时关闭'
+            break
+    }
+    return result
+}
+
+/**
+ * 付款方式 - 1:冻结 2:扣款
+ */
+export function getPaymentTypeName(type: number){
+    let result = '--'
+    switch (type) {
+        case 1:
+            result = '冻结'
+            break
+        case 2:
+            result = '扣款'
+            break
+    }
+    return result
 }

src/services/proto/warehousetrade/index.ts

@@ -31,7 +31,7 @@ export const HdWRDealOrder = (param: HdWRDealOrderReq): Promise<any> => {
  * @param param
  */
 export const wROutApply = (param: WROutApplyReq): Promise<any> => {
-    return protoMiddleware<WROutApplyReq>(param, 'WROutApplyReq', 'WROutApplyRsp', 2)
+    return protoMiddleware<WROutApplyReq>(param, 'WROutApplyReq', 'WROutApplyRsp', HeadEnum.tradeMode17)
 }
 
 /**

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

@@ -1,27 +1,29 @@
 <template>
-  <!-- 买大厅 -->
-  <a-table :columns="columns"
-           class="buyHallTable"
-           :scroll="{ x: '100%', y: 'calc(100% - 61px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               @click="openComponent" />
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :buyOrSell="BuyOrSell.buy"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!-- 买大厅 -->
+    <a-table
+        :columns="columns"
+        class="buyHallTable"
+        :scroll="{ x: '100%', y: 'calc(100vh- 510px)' }"
+        :pagination="false"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :customRow="Rowclick"
+        rowKey="key"
+        :data-source="tableList"
+    >
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :buyOrSell="BuyOrSell.buy"
+        :parantSelectedRow="parantSelectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">

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

@@ -1,104 +1,121 @@
 <template>
-  <!-- 仓单贸易  一口价    摘牌 -->
-  <Drawer :title="'摘牌'"
-          :placement="'top'"
-          :visible="visible"
-          width="486px"
-          height="479px"
-          @cancel="cancel"
-          class="top">
-    <div class="delisting">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <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-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌方">
-                <span class="white">{{selectedRow.username}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="挂牌价格">
-                <span class="yellow">{{selectedRow.fixedprice}}</span>
-              </a-form-item>
-              <a-row :gutter="24">
-                <a-col :span="24"></a-col>
-              </a-row>
-              <a-form-item label="挂牌数量">
-                <span class="white">{{selectedRow.orderqty}}吨</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="摘牌数量"
-                           name="num">
-                <a-input-number class="dialogInput"
-                                style="width: 260px"
-                                v-model:value="formState.num"
-                                suffix="吨" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12"
-                   class="mt-20">
-              <a-form-item>
-                <a-slider :min="0"
-                          v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
-                          class="formSlider" />
-                <div class="unit">
-                  <span>1</span>
-                  <span>{{selectedRow.orderqty}}</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24"
-                   class="mt-20">
-              <a-form-item label="挂牌金额">
-                <span class="white">50400.00</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <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>
-    </div>
-  </Drawer>
+    <!-- 仓单贸易  一口价    摘牌 -->
+    <Drawer
+        :title="'摘牌'"
+        :placement="'top'"
+        :visible="visible"
+        width="486px"
+        height="479px"
+        @cancel="cancel"
+        class="top"
+    >
+        <div class="delisting">
+            <div class="formBar">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <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-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌方">
+                                <span class="white">{{selectedRow.username}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="挂牌价格">
+                                <span class="yellow">{{selectedRow.fixedprice}}</span>
+                            </a-form-item>
+                            <a-row :gutter="24">
+                                <a-col :span="24"></a-col>
+                            </a-row>
+                            <a-form-item label="挂牌数量">
+                                <span class="white">{{selectedRow.orderqty}}吨</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="现货仓单" name>
+                                <a-select
+                                    class="inlineFormSelect"
+                                    style="width: 260px"
+                                    placeholder="请选择"
+                                >
+                                    <a-select-option value="8271930000-01(120吨)">8271930000-01(120吨)</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="摘牌数量" name="num">
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 260px"
+                                    v-model:value="formState.num"
+                                    suffix="吨"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item>
+                                <a-slider
+                                    :min="0"
+                                    v-model:value="formState.num"
+                                    :max="selectedRow.orderqty"
+                                    class="formSlider"
+                                />
+                                <div class="unit">
+                                    <span>1</span>
+                                    <span>{{selectedRow.orderqty}}</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="mt-20">
+                            <a-form-item label="挂牌金额">
+                                <span class="white">50400.00</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item class="tc">
+                                <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>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -118,7 +135,7 @@ import { message } from 'ant-design-vue';
 import { handleForm } from './setup';
 import { validateAction } from '@/common/setup/form';
 import { ListingForm } from './interface';
-import Long from "long";
+import Long from 'long';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_delisting,
@@ -148,7 +165,6 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         function submit() {
             validateAction<ListingForm>(formRef, formState).then((res) => {
-
                 // 首先确定  这是仓单贸易的有仓单挂摘牌 HasWr = 1
                 // 其次判断  摘牌 1。摘买 （需要通过自己的仓单进行摘买）  2。摘卖 （不需要通过仓单）
                 const param: HdWRDealOrderReq = {
@@ -170,14 +186,14 @@ export default defineComponent({
                     TradeDate: moment().format('YYYYMMDD'), // string 交易日
                     DeliveryMonth: '', // string 交收月
                     HasWr: 1, // uint32 是否有仓单-0:没有仓单 1:有仓单
-                }
+                };
 
                 // 摘买方向
-                if(props.buyOrSell === BuyOrSell.buy){
-                    param.BuyOrSell = 1
-                    param.LadingBillId = Long.fromString("2081627550296000001")
-                }else{
-                    param.BuyOrSell = 0
+                if (props.buyOrSell === BuyOrSell.buy) {
+                    param.BuyOrSell = 1;
+                    param.LadingBillId = Long.fromString('2081627550296000001');
+                } else {
+                    param.BuyOrSell = 0;
                 }
 
                 requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
@@ -238,32 +254,13 @@ export default defineComponent({
         padding: 28px 16px 7px;
     }
 }
+::v-deep.ant-slider.formSlider {
+    width: 260px;
+}
 ::v-deep.ant-input-suffix {
     position: absolute;
     right: -25px;
 }
-::v-deep.formProgress {
-    width: 260px;
-    // height: 3px;
-    // .rounded-corners(2px);
-    margin-left: 70px;
-    .ant-progress-outer {
-        margin-right: 0;
-        padding-right: 0;
-        .ant-progress-inner {
-            background: @m-grey14;
-            .rounded-corners(2px);
-            .ant-progress-bg {
-                height: 3px !important;
-                border-radius: 2px !important;
-                background-color: @m-blue0;
-            }
-        }
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
 .unit {
     margin-left: 70px;
     width: 260px;

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

@@ -1,28 +1,30 @@
 <template>
-  <!-- 卖大厅 -->
+    <!-- 卖大厅 -->
 
-  <a-table :columns="columns"
-           class="sellHallTable"
-           :scroll="{ x: '100%', y: 'calc(100% - 61px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               @click="openComponent" />
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :buyOrSell="BuyOrSell.sell"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <a-table
+        :columns="columns"
+        class="sellHallTable"
+        :scroll="{ x: '100%', y: 'calc(100vh - 510px)' }"
+        :pagination="false"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :customRow="Rowclick"
+        rowKey="key"
+        :data-source="tableList"
+    >
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :buyOrSell="BuyOrSell.sell"
+        :parantSelectedRow="parantSelectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">

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

@@ -1,108 +1,97 @@
 <template>
-  <!-- 发布求购 -->
-  <Drawer :title="'发布求购'"
-          :placement="'top'"
-          :visible="visible"
-          @cancel="cancel"
-          width="486px"
-          height="420px">
-    <div class="post_buying">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                :form="form">
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="交易账户">
-                <a-select class="inlineFormSelect"
-                          default-value="1"
-                          style="width: 260px">
-                  <a-select-option value="1">2647247233 周星星</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="基   差">
-                <a-input class="commonInput stepper"
-                         style="width: 260px" />
-                <div class="minusBtn">
-                  <MinusOutlined />
-                </div>
-                <div class="plusBtn">
-                  <PlusOutlined />
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量">
-                <a-input class="commonInput stepper"
-                         suffix="吨"
-                         style="width: 260px" />
-                <div class="minusBtn">
-                  <MinusOutlined />
-                </div>
-                <div class="plusBtn">
-                  <PlusOutlined />
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24"
-                   class="mt-10">
-              <a-form-item>
-                <a-progress class="formProgress"
+    <!-- 发布求购 -->
+    <Drawer :title="'发布求购'" :placement="'top'" :visible="visible" @cancel="cancel" class="top">
+        <div class="post_buying">
+            <div class="formBar">
+                <a-form class="inlineForm dialogForm" :form="form">
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="交易账户">
+                                <a-select
+                                    class="inlineFormSelect"
+                                    default-value="1"
+                                    style="width: 260px"
+                                >
+                                    <a-select-option value="1">2647247233 周星星</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="基   差">
+                                <a-input class="commonInput stepper" style="width: 260px" />
+                                <div class="minusBtn">
+                                    <MinusOutlined />
+                                </div>
+                                <div class="plusBtn">
+                                    <PlusOutlined />
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量">
+                                <a-input
+                                    class="commonInput stepper"
+                                    suffix="吨"
+                                    style="width: 260px"
+                                />
+                                <div class="minusBtn">
+                                    <MinusOutlined />
+                                </div>
+                                <div class="plusBtn">
+                                    <PlusOutlined />
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24" class="mt-10">
+                            <a-form-item>
+                                <!-- <a-progress class="formProgress"
                             :percent="30"
-                            style="width: 260px;" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>80吨</span>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="起摘数量"
-                           class="relative">
-                <a-input class="commonInput"
-                         suffix="吨"
-                         style="width: 260px" />
-                <div class="tip">最小单位：1吨</div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24"
-                   class="mt20">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          @click="submit">买入</a-button>
-                <a-button class="listedBtn ml10">融资买入</a-button>
-                <a-button class="ml10 cancelBtn"
-                          @click="cancel">取消</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+                                style="width: 260px;" />-->
+                                <a-slider :min="0" :max="300" class="formSlider" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>80吨</span>
+                                </div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="起摘数量" class="relative">
+                                <a-input class="commonInput" suffix="吨" style="width: 260px" />
+                                <div class="tip">最小单位：1吨</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24" type="flex" justify="center">
+                        <a-col :span="24" class="mt20">
+                            <a-form-item class="tc">
+                                <a-button class="listedBtn" @click="submit">买入</a-button>
+                                <a-button class="listedBtn ml10">融资买入</a-button>
+                                <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </div>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
-    import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { Des } from '@/common/components/commonDes';
 import { QhjAgreementConfig } from '@/services/go/ermcp/qhj/interface';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import Drawer from '@/common/components/drawer/index.vue';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-    import {hdWROrder, wRListingCancelOrder} from "@/services/proto/warehousetrade";
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-    import {HdWROrderReq} from "@/services/proto/warehousetrade/interface";
-    import {getInTaAccount, getUserId} from "@/services/bus/account";
-    import {v4 as uuidv4} from "uuid";
-    import moment from "moment";
-    import {getMarketRunByTradeMode} from "@/services/bus/market";
-    import {WrOrderQuote} from "@/services/go/wrtrade/interface";
+import { hdWROrder, wRListingCancelOrder } from '@/services/proto/warehousetrade';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { HdWROrderReq } from '@/services/proto/warehousetrade/interface';
+import { getInTaAccount, getUserId } from '@/services/bus/account';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import { getMarketRunByTradeMode } from '@/services/bus/market';
+import { WrOrderQuote } from '@/services/go/wrtrade/interface';
 
 export default defineComponent({
     emits: ['cancel'],
@@ -158,12 +147,12 @@ export default defineComponent({
                     WRTradeGoods: [],
                     CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
                     WRStandardID: props.selectedRow.wrstandardid,
-                    HasWr: 1,  // 无仓单挂牌  是否有无仓单
-                }
-                debugger
+                    HasWr: 1, // 无仓单挂牌  是否有无仓单
+                };
+                debugger;
                 requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-                    cancel()
-                })
+                    cancel();
+                });
             }
         }
         return {
@@ -215,23 +204,22 @@ export default defineComponent({
     }
 }
 
-::v-deep.formProgress {
+::v-deep.ant-slider.formSlider {
     width: 260px;
-    // height: 3px;
-    // .rounded-corners(2px);
     margin-left: 70px;
-    .ant-progress-outer {
+    .ant-slider-rail {
         margin-right: 0;
         padding-right: 0;
-        .ant-progress-inner {
-            background: @m-grey14;
-            .rounded-corners(2px);
-            .ant-progress-bg {
-                height: 3px !important;
-                border-radius: 2px !important;
-                background-color: @m-blue0;
-            }
-        }
+        height: 3px !important;
+        border-radius: 2px !important;
+        background-color: @m-blue14;
+    }
+    .ant-slider-track {
+        height: 3px;
+        background-color: @m-blue0;
+    }
+    .ant-slider-step {
+        height: 3px;
     }
     .ant-progress-text {
         display: none;

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

@@ -16,6 +16,25 @@
                  :record="record"
                  @click="openComponent" />
       </template>
+        <!-- 履约类型 -->
+        <template #performancetype="{ record }">
+            <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        </template>
+
+        <!-- 付款方式 -->
+        <template #paymenttype="{ record }">
+            <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+        </template>
+
+        <!-- 履约状态 -->
+        <template #performancestatus="{ record }">
+            <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+        </template>
+
+        <!-- 当前步骤 -->
+        <template #curstepname="{ record }">
+            <a>{{ record.curstepname }}</a>
+        </template>
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -32,6 +51,7 @@ import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrad
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import {getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName} from "@/common/constants/enumsName";
 export default defineComponent({
     name: enumOrderComponents.performance_information_buy_performance,
     components: {
@@ -61,6 +81,9 @@ export default defineComponent({
             ...handleComposeOrderTable<WrPerformancePlan>(param),
             loading,
             tableList,
+            getPerformanceTypeName,
+            getPerformanceStatusName,
+            getPaymentTypeName,
         };
     },
 });

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

@@ -16,6 +16,25 @@
                  :record="record"
                  @click="openComponent" />
       </template>
+        <!-- 履约类型 -->
+        <template #performancetype="{ record }">
+            <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        </template>
+
+        <!-- 付款方式 -->
+        <template #paymenttype="{ record }">
+            <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+        </template>
+
+        <!-- 履约状态 -->
+        <template #performancestatus="{ record }">
+            <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+        </template>
+
+        <!-- 当前步骤 -->
+        <template #curstepname="{ record }">
+            <a>{{ record.curstepname }}</a>
+        </template>
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -32,6 +51,7 @@ import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrad
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import {getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName} from "@/common/constants/enumsName";
 export default defineComponent({
     name: enumOrderComponents.performance_information_sell_performance,
     components: {
@@ -61,6 +81,9 @@ export default defineComponent({
             ...handleComposeOrderTable<WrPerformancePlan>(param),
             loading,
             tableList,
+            getPerformanceTypeName,
+            getPaymentTypeName,
+            getPerformanceStatusName,
         };
     },
 });

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

@@ -1,136 +1,155 @@
 <template>
-  <!-- 预售仓单 现货明细 挂牌 -->
-  <Drawer :title="'挂牌'"
-          :placement="'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>
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <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>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="formState.WRPriceType === 1">
-              <a-form-item label="挂牌价"
-                           name="FixedPrice">
-                <a-input-number class="dialogInput"
-                                style="width: 140px"
-                                v-model:value="formState.FixedPrice"
-                                placeholder="请输入挂牌价" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="formState.WRPriceType === 2">
-              <a-form-item label="基差"
-                           name="PriceMove">
-                <a-input 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"
-                                :suffix="selectedRow.enumdicname"
-                                v-model:value="formState.OrderQty"
-                                placeholder="请输入挂牌数量" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="起摘数量"
-                           class="relative">
-                <a-input class="commonInput"
-                         :suffix="selectedRow.enumdicname"
-                         style="width: 140px" />
-                <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" />
-                <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"
-                 v-if="formState.WRPriceType === 2">
-            <a-col :span="24">
-              <a-form-item label="行情商品"
-                           name="goodsid">
-                <!-- <a-select class="inlineFormSelect"
+    <!-- 预售仓单 现货明细 挂牌 -->
+    <Drawer :title="'挂牌'" :placement="'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>
+            <div class="formBar">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <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>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="formState.WRPriceType === 1">
+                            <a-form-item label="挂牌价" name="FixedPrice">
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 140px"
+                                    v-model:value="formState.FixedPrice"
+                                    placeholder="请输入挂牌价"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="formState.WRPriceType === 2">
+                            <a-form-item label="基差" name="PriceMove">
+                                <a-input
+                                    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"
+                                    :suffix="selectedRow.enumdicname"
+                                    v-model:value="formState.OrderQty"
+                                    placeholder="请输入挂牌数量"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="起摘数量" class="relative">
+                                <a-input
+                                    class="commonInput"
+                                    :suffix="selectedRow.enumdicname"
+                                    style="width: 140px"
+                                />
+                                <div class="tip">最小单位：1{{selectedRow.enumdicname}}</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="交收月" name="time">
+                                <a-month-picker
+                                    style="width: 140px"
+                                    v-model:value="time"
+                                    :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>
+                    <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"
+                                />
+                                <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" v-if="formState.WRPriceType === 2">
+                        <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="groupsChange"
-                          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"
-                          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"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <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>
-    </div>
-  </Drawer>
+                                <a-select
+                                    class="inlineFormSelect ml5"
+                                    @change="groupsChange"
+                                    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"
+                                    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" type="flex" justify="center">
+                        <a-col :span="24">
+                            <a-form-item class="tc">
+                                <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>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -151,8 +170,8 @@ import { ListingForm } from './interface';
 import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { message } from 'ant-design-vue';
 import { getGoodsGroupsByTradeMode } from '@/services/bus/goods';
-import {BuyOrSell, TradeMode} from '@/common/constants/enumCommon';
-import {HdWROrderReq, WRGoodsInfo} from '@/services/proto/warehousetrade/interface';
+import { BuyOrSell, TradeMode } from '@/common/constants/enumCommon';
+import { HdWROrderReq, WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
@@ -188,7 +207,7 @@ export default defineComponent({
                     // SubNum: '0', // 提单子单号
                     SubNum: 0,
                     // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
-                    WRFactorTypeId:  props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+                    WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
                     IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
                     // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
                     OrderQty: 1, // 委托数量(可挂部分数据量) ======
@@ -216,10 +235,9 @@ export default defineComponent({
                     wrstandardid: props.selectedRow.wrstandardid,
                     HasWr: 0, // 0 无仓单  1： 有仓单
                 };
-                debugger
+                debugger;
                 console.log(param);
-                requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-                });
+                requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {});
             }
         }
 
@@ -349,4 +367,10 @@ export default defineComponent({
 .ml5 {
     margin-left: 5px;
 }
+
+::v-deep.dialogDatePicker.ant-calendar-picker .ant-input {
+    background: @m-grey21;
+    border: 1px solid @m-grey14;
+    .rounded-corners(3px);
+}
 </style>;

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue

@@ -1,65 +1,78 @@
 <template>
-  <!-- 挂单 -->
-  <section>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 仓单预售 挂单 -->
+    <section>
+        <a-table :columns="columns"
+                 class="srcollYTable"
+                 :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+                 :pagination="false"
+                 :loading="loading"
+                 :expandedRowKeys="expandedRowKeys"
+                 :customRow="Rowclick"
+                 rowKey="key"
+                 :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList"
+                         :record="record"
+                         @click="openComponent"
+                />
+            </template>
+            <!--  委托状态-->
+            <template #wrtradeorderstatus="{ record }">
+                <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+            </template>
+            <!-- 挂牌类型 -->
+            <template #wrtradetype="{ record }">
+                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+            </template>
+        </a-table>
+        <component :is="componentId"
+                   v-if="componentId"
+                   :selectedRow="selectedRow"
+                   @cancel="closeComponent"></component>
+    </section>
 </template>
 
 <script lang="ts">
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
-import { queryWrOrderDetail } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
-import { getRecordItemTab } from '@/common/setup/order/orderData';
-import { handleComposeOrderTable } from '@/common/setup/table/compose';
-import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-export default defineComponent({
-    name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
-    components: {
-        BtnList,
-    },
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            const param: QueryWrOrderDetailReq = {
-                haswr: 0,
+    import {enumOrderComponents} from '@/common/constants/enumOrderComponents';
+    import {queryTableList, BtnList, defineAsyncComponent, defineComponent} from '@/common/export/commonTable';
+    import {queryWrOrderDetail} from '@/services/go/wrtrade';
+    import {QueryWrOrderDetailReq, WrOrderDetail} from '@/services/go/wrtrade/interface';
+    import {getRecordItemTab} from '@/common/setup/order/orderData';
+    import {handleComposeOrderTable} from '@/common/setup/table/compose';
+    import {ComposeOrderTableParam} from '@/common/setup/table/interface';
+    import {getWrOrderTypeName, getWrTradeOrderStatusName} from "@/common/constants/enumsName";
+
+    export default defineComponent({
+        name: enumOrderComponents.pre_sale_warehouse_receipt_pending_order,
+        components: {
+            BtnList,
+        },
+        setup() {
+            // 表格列表数据
+            const {loading, tableList, queryTable} = queryTableList<WrOrderDetail>();
+            // 获取列表数据
+            const queryTableAction = () => {
+                const param: QueryWrOrderDetailReq = {
+                    haswr: 0,
+                };
+                queryTable(queryWrOrderDetail, param);
+            };
+            // 表格通用逻辑
+            const param: ComposeOrderTableParam = {
+                queryFn: queryTableAction,
+                tableName: 'table_pcweb_spot_trade_bottom_pre_sale_pending_order',
+                recordList: getRecordItemTab(),
+            };
+            return {
+                ...handleComposeOrderTable<WrOrderDetail>(param),
+                loading,
+                tableList,
+                getWrTradeOrderStatusName,
+                getWrOrderTypeName,
             };
-            queryTable(queryWrOrderDetail, param);
-        };
-        // 表格通用逻辑
-        const param: ComposeOrderTableParam = {
-            queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_pre_sale_pending_order',
-            recordList: getRecordItemTab(),
-        };
-        return {
-            ...handleComposeOrderTable<WrOrderDetail>(param),
-            loading,
-            tableList,
-        };
-    },
-});
+        },
+    });
 </script>
 
 <style lang="less">

src/views/order/spot_warran/components/spot_warrant_pending_order/components/cancle/index.vue

@@ -27,6 +27,7 @@ import { getGoodsGroupsByTradeMode } from '@/services/bus/goods';
 import { TradeMode } from '@/common/constants/enumCommon';
 import {WRGoodsInfo, WRListingCancelOrderReq} from '@/services/proto/warehousetrade/interface';
 import * as Long from "long";
+import {getLongTypeLoginID} from "@/services/bus/login";
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
@@ -52,7 +53,7 @@ export default defineComponent({
                 ClientSerialNo: uuidv4(), // string 客户端流水号
                 ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
                 ClientType: 4, // uint32 终端类型
-                OperatorID:  getUserId(), // uint64 操作员账号ID
+                OperatorID: Number(getLongTypeLoginID()), // uint64 操作员账号ID
                 BuyOrSell: props.selectedRow.buyorsell, // uint32 买卖方向
                 WRID: props.selectedRow.wrfactortypeid, // uint64 仓单ID,卖的时候填写
             }

src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 挂单 -->
+  <!-- 现货仓单 挂单 -->
   <section>
     <a-table :columns="columns"
              class="srcollYTable"
@@ -16,6 +16,14 @@
                  :record="record"
                  @click="openComponent" />
       </template>
+        <!--  委托状态-->
+        <template #wrtradeorderstatus="{ record }">
+            <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+        </template>
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ record }">
+            <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+        </template>
     </a-table>
     <component :is="componentId"
                v-if="componentId"
@@ -32,6 +40,7 @@ import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/inte
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import {getWrOrderTypeName, getWrTradeOrderStatusName} from "@/common/constants/enumsName";
 export default defineComponent({
     name: enumOrderComponents.spot_warrant_pending_order,
     components: {
@@ -58,6 +67,8 @@ export default defineComponent({
             ...handleComposeOrderTable<WrOrderDetail>(param),
             loading,
             tableList,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
         };
     },
 });

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

@@ -1,136 +1,140 @@
 <template>
-  <!-- 现货仓单 现货明细 挂牌 -->
-  <Drawer :title="'挂牌'"
-          :placement="'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>
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <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>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="formState.WRPriceType === 1">
-              <a-form-item label="挂牌价"
-                           name="FixedPrice">
-                <a-input-number class="dialogInput"
-                                style="width: 140px"
-                                v-model:value="formState.FixedPrice"
-                                placeholder="请输入挂牌价" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   v-if="formState.WRPriceType === 2">
-              <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"
-                                :suffix="selectedRow.enumdicname"
-                                v-model:value="formState.OrderQty"
-                                placeholder="请输入挂牌数量" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="起摘数量"
-                           class="relative">
-                <a-input class="commonInput"
-                         :suffix="selectedRow.enumdicname"
-                         style="width: 140px" />
-                <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" />
-                <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"
-                 v-if="formState.WRPriceType === 2">
-            <a-col :span="24">
-              <a-form-item label="行情商品"
-                           name="goodsid">
-                <!-- <a-select class="inlineFormSelect"
+    <!-- 现货仓单 现货明细 挂牌 -->
+    <Drawer :title="'挂牌'" :placement="'bottom'" :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>
+            <div class="formBar">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <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>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="formState.WRPriceType === 1">
+                            <a-form-item label="挂牌价" name="FixedPrice">
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 140px"
+                                    v-model:value="formState.FixedPrice"
+                                    placeholder="请输入挂牌价"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="formState.WRPriceType === 2">
+                            <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"
+                                    :suffix="selectedRow.enumdicname"
+                                    v-model:value="formState.OrderQty"
+                                    placeholder="请输入挂牌数量"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="起摘数量" class="relative">
+                                <a-input
+                                    class="commonInput"
+                                    :suffix="selectedRow.enumdicname"
+                                    style="width: 140px"
+                                />
+                                <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"
+                                />
+                                <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" v-if="formState.WRPriceType === 2">
+                        <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="groupsChange"
-                          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"
-                          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"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <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>
-    </div>
-  </Drawer>
+                                <a-select
+                                    class="inlineFormSelect ml5"
+                                    @change="groupsChange"
+                                    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"
+                                    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" type="flex" justify="center">
+                        <a-col :span="24">
+                            <a-form-item class="tc">
+                                <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>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -255,7 +259,7 @@ export default defineComponent({
 </script>
 
 <style lang="less" scoped>
-.listed {
+.listing {
     width: 100%;
     height: 100%;
     .flex;
@@ -297,36 +301,6 @@ export default defineComponent({
 .mt-20 {
     margin-top: -20px;
 }
-::v-deep.ant-slider.formSlider {
-    width: 140px;
-    // height: 3px;
-    // .rounded-corners(2px);
-    margin-left: 70px;
-    .ant-slider-rail {
-        margin-right: 0;
-        padding-right: 0;
-        height: 3px !important;
-        border-radius: 2px !important;
-        background-color: @m-blue14;
-        // .ant-slider-track {
-        //     background: @m-grey14;
-        //     .rounded-corners(2px);
-        //     .ant-progress-bg {
-
-        //     }
-        // }
-    }
-    .ant-slider-track {
-        height: 3px;
-        background-color: @m-blue0;
-    }
-    .ant-slider-step {
-        height: 3px;
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
 .unit {
     margin-left: 70px;
     width: 140px;

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

@@ -1,101 +1,92 @@
 <template>
-  <!-- 现货仓单 现货明细 提货 true -->
-  <Drawer :title="'提货'"
-          :placement="'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>
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                :form="form"
-                @submit="handleSearch">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="提货数量">
-                <a-input class="commonInput"
-                         suffix="吨"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="提货人">
-                <a-input class="commonInput"
-                         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" />
-                <div class="unit">
-                  <span>0</span>
-                  <span>300吨</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="联系方式">
-                <a-input class="commonInput"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="预约日期">
-                <a-date-picker class="commonDatePicker"
-                               style="width: 140px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="备注">
-                <a-input class="commonInput"
-                         style="width: 140px" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">&nbsp;</a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn">提货</a-button>
-                <a-button class="ml10 cancelBtn"
-                          @click="cancel">取消</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+    <!-- 现货仓单 现货明细 提货 true -->
+    <Drawer :title="'提货'" :placement="'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>
+            <div class="formBar">
+                <a-form class="inlineForm dialogForm" :form="form" @submit="handleSearch">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="提货数量">
+                                <a-input class="commonInput" suffix="吨" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="提货人">
+                                <a-input class="commonInput" 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" />
+                                <div class="unit">
+                                    <span>0</span>
+                                    <span>300吨</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="联系方式">
+                                <a-input class="commonInput" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="预约日期">
+                                <a-date-picker
+                                    class="commonDatePicker dialogDatePicker"
+                                    style="width: 140px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="备注">
+                                <a-input class="commonInput" style="width: 140px" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">&nbsp;</a-col>
+                    </a-row>
+                    <a-row :gutter="24" type="flex" justify="center">
+                        <a-col :span="24">
+                            <a-form-item class="tc">
+                                <a-button class="listedBtn">提货</a-button>
+                                <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </div>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
-import { QueryWrPositionReq, WrPosition } from '@/services/go/wrtrade/interface';
-import { getUserId } from '@/services/bus/account';
+import {QueryWrPositionReq, WrHoldLB, WrPosition, WrTradeDetail} from '@/services/go/wrtrade/interface';
+import {getSelectedAccountId, getUserId} from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { hdWROrder } from '@/services/proto/warehousetrade';
+import {hdWROrder, wROutApply} from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
+import {WROutInDetail} from "@/services/proto/warehousetrade/interface";
+import {getUUID} from "@/utils/qt/common";
+import {getLongTypeLoginID} from "@/services/bus/login";
+import * as Long from "long";
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_pick_up,
@@ -103,7 +94,7 @@ export default defineComponent({
     emits: ['cancel'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPosition>,
+            type: Object as PropType<WrHoldLB>,
             default: {},
         },
     },
@@ -112,9 +103,30 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const { visible, cancel } = _closeModal(context);
         // console.log(param);
-        // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-        //     // cancel(true);
-        // });
+
+       const param = {
+            ClientSerialID: getUUID(),  // uint64 客户端唯一ID
+            WRStandardID: props.selectedRow.wrstandardid, // uint64 仓单标准ID
+            WarehouseID: props.selectedRow.warehouseid, // uint64 仓库ID
+            UserID: getUserId(), // uint64 申请人ID
+            AccountID: getSelectedAccountId()?.toString(), // uint64 申请人账户ID
+            AppointmentDate: "20200730", // string 预约出库时间（格式：20200101）
+            AppointmentModel: 3, // uint32 预约方式:1-物流,2-自送，3-自提
+            ContactName: "111", // string 收货人提货人
+            ContactNum: "131", // string 收货人提货人手机
+            AppointmentRemark: "", // string 预约备注
+            CreatorID: Number(getLongTypeLoginID()), // uint64 创建人ID
+            WROutInDetails: {
+                LadingBillID: props.selectedRow.ladingbillid, // string 提单ID
+                SubNum: props.selectedRow.subnum, // uint64 提单子单号
+                Qty: 1, // uint64 子提单总数量
+                OutQty: 1, // uint64 预约数量
+            } as WROutInDetail// WROutInDetail 仓单出库提单明细数据
+        }
+
+        requestResultLoadingAndInfo(wROutApply, param, loading, ['提货成功', '提货失败:']).then(() => {
+            // cancel(true);
+        });
         return {
             visible,
             cancel,
@@ -222,4 +234,9 @@ export default defineComponent({
 .ml10 {
     margin-left: 10px;
 }
+::v-deep.dialogDatePicker.ant-calendar-picker .ant-input {
+    background: @m-grey21;
+    border: 1px solid @m-grey14;
+    .rounded-corners(3px);
+}
 </style>;