zhou.xiaoning il y a 2 ans
Parent
commit
0e37bae676

+ 4 - 4
src/packages/sbyj/views/delivery/components/processing/list/index.vue

@@ -1,5 +1,5 @@
 <!-- 水贝亿爵-我的交收-待审核 -->
-<!-- <template>
+<template>
     <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
         :page-count="pageCount" @refresh="run">
         <div class="g-order-list">
@@ -48,9 +48,9 @@
         <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
             v-if="componentId" />
     </app-pull-refresh>
-</template> -->
+</template>
 
-<!-- <script lang="ts" setup>
+<script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { Button } from 'vant'
 import { formatDate } from '@/filters'
@@ -91,4 +91,4 @@ const showComponent = (componentName: string, row: Model.MineTradeGoodsDeliveryO
     selectedRow.value = row
     openComponent(componentName)
 }
-</script> -->
+</script>

+ 2 - 0
src/packages/sbyj/views/order/list/components/close-holder/index.vue

@@ -49,6 +49,7 @@ import { useOrder } from '@/business/trade'
 import quoteSocket from '@/services/websocket/quote'
 import { useFuturesStore } from '@/stores'
 import { EPriceMode, EValidType, EOrderOperateType, EBuildType } from '@/constants/client'
+import { BuyOrSell } from '@/constants/order'
 
 const props = defineProps({
     selectedRow: {
@@ -112,6 +113,7 @@ const onSubmit = () => {
         formData.BuildType = EBuildType.BUILDTYPE_CLOSE
         formData.OrderQty = orderQty.value / agreeunit.value // 数量÷合约乘数
         formData.RelatedID = tHDetailEx.tradeID // 关联单号
+        formData.BuyOrSell = tHDetailEx.buyOrSell === BuyOrSell.Buy ? BuyOrSell.Sell : BuyOrSell.Buy // 持仓反方向
 
         fullloading((hideLoading) => {
             formSubmit().then(() => {

+ 1 - 1
src/packages/sbyj/views/order/list/components/supplement-deposit/index.vue

@@ -46,7 +46,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, PropType, onMounted, reactive } from 'vue'
-import { CellGroup, Cell, Button, Stepper, Field, Form, FormInstance, FieldRule } from 'vant'
+import { CellGroup, Cell, Button, Stepper, Field, Form, FormInstance, FieldRule, RadioGroup, Radio } from 'vant'
 import { fullloading } from '@/utils/vant'
 import AppModal from '@/components/base/modal/index.vue'
 import { formatDate, formatDecimal, parsePercent } from '@/filters'