update

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.30.125:8080/cfg?key=test_125"
+    "apiUrl": "http://192.168.31.118:8080/cfg?key=test_118"
 }

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

@@ -72,7 +72,7 @@
       <a-col :span="12"
              v-if="buyMarket.isMarket">
         <Buy :enumName="enumName"
-             ref="buy"
+             ref="buyRef"
              :parantSelectedRow="selectedRow"
              :btnList="handleBtnList(buyMarket.btnList)" />
       </a-col>

src/views/market/spot_trade/components/buy-sell-market/setup.ts

@@ -77,6 +77,15 @@ export function getSellMarketParam(enumName: EnumRouterName) {
     return { wrpricetype, haswr, tableKey }
 }
 
+// 是否有仓单
+export function getHasWR(enumName: EnumRouterName): 0 | 1 {
+    if (enumName === EnumRouterName.warehouse_receipt_trade_price || enumName === EnumRouterName.warehouse_receipt_trade_floating_price) {
+        return 1
+    } else {
+        return 0
+    }
+}
+
 
 export function handleChildComponentMethod() {
     const childRef = ref<null | { queryTableAction: Function }>(null);

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

@@ -117,6 +117,7 @@ import { handleForm } from './setup';
 import { validateAction } from '@/common/setup/form';
 import { FormParam } from './interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { getHasWR } from '../buy-sell-market/setup';
 
 export default defineComponent({
     emits: ['cancel', 'update'],
@@ -187,13 +188,16 @@ export default defineComponent({
                         CanBargain: 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
                         Attachment1: '', // 附件1
                         Attachment2: '', // 附件2
-                        Remark: '222', // 备注
+                        Remark: '', // 备注
                         ApplyID: 0, // 申请ID
                         WRTradeGoods: isFixed() ? [] : [wrGoodsInfo],
                         CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
                         WRStandardID: props.selectedRow.wrstandardid,
-                        HasWr: 1, // 无仓单挂牌  是否有无仓单
+                        HasWr: getHasWR(props.enumName), // 无仓单挂牌  是否有无仓单
                     };
+                    // if (!isFixed()) {
+                    //     Object.assign(param, { WRTradeGoods: [wrGoodsInfo] });
+                    // }
                     requestResultLoadingAndInfo(hdWROrder, param, loading, ['求购成功', '求购失败:']).then(() => {
                         cancel(true);
                     });

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 现货仓单 现货明细 提货 true -->
   <Drawer :title="'提货'"
-          :placement="'right'"
+          :placement="'bottom'"
           :visible="visible"
           @cancel="cancel">
     <!-- 挂牌 -->