update

src/packages/mobile/views/order/list/components/swaporder/list/Index.vue

@@ -24,7 +24,7 @@
                         </li>
                         <li>
                             <span>委托数量：</span>
-                            <span>{{ formatDecimal(item.orderqty) }}</span>
+                            <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
                             <span>委托价格：</span>
@@ -32,7 +32,7 @@
                         </li>
                         <li>
                             <span>成交数量：</span>
-                            <span>{{ formatDecimal(item.tradeqty) }}</span>
+                            <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
                             <span>委托状态：</span>

src/packages/mobile/views/order/performance/Index.vue

@@ -1,15 +1,17 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="履约信息" />
+            <app-navbar title="履约信息">
+                <template #footer>
+                    <Tabs v-model:active="buyorsell" @click="onTabChange">
+                        <Tab title="买履约" />
+                        <Tab title="卖履约" />
+                    </Tabs>
+                </template>
+            </app-navbar>
         </template>
-        
         <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
-        :page-count="pageCount" @refresh="onChange">
-            <Tabs class="van-tabs--list" v-model:active="buyorsell" :swipe-threshold="4" @click="onChange">
-                <Tab title="买履约" />
-                <Tab title="卖履约" />
-            </Tabs>
+            :page-count="pageCount" @refresh="onRefresh">
             <div class="g-order-list">
                 <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                     <div class="g-order-list__titlebar">
@@ -23,22 +25,14 @@
                     <div class="g-order-list__content">
                         <ul>
                             <li>
-                                <span>履约单号</span>
-                                <span>{{ item.performanceplanid }}</span>
-                            </li>
-                            <li>
                                 <span>时间</span>
-                                <span>{{ item.createtime }}</span>
+                                <span>{{ formatDate(item.createtime, 'YYYY-MM-DD') }}</span>
                             </li>
                             <li>
                                 <span>类型</span>
                                 <span>{{ getPerformanceTypeName(item.performancetype) }}</span>
                             </li>
                             <li>
-                                <span>关联单号</span>
-                                <span>{{ item.relatedorderid }}</span>
-                            </li>
-                            <li>
                                 <span>履约数量</span>
                                 <span>{{ item.qty }}</span>
                             </li>
@@ -60,7 +54,7 @@
                             </li>
                             <li>
                                 <span>步骤到期日期</span>
-                                <span>{{ formatDate( item.curstepdeadline) }}</span>
+                                <span>{{ formatDate(item.curstepdeadline, 'YYYY-MM-DD') }}</span>
                             </li>
                         </ul>
                     </div>
@@ -71,8 +65,8 @@
                     </div>
                 </div>
             </div>
-            <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
-                v-if="componentId" />
+            <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
+                @closed="closeComponent" v-if="componentId" />
         </app-pull-refresh>
     </app-view>
 </template>
@@ -104,12 +98,6 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
     pullRefreshRef.value?.refresh()
 })
 
-const onChange = () => {
-    run({
-        buyorsell: buyorsell.value
-    })
-}
-
 const { loading, pageIndex, pageCount, run } = useRequest(queryPerformancePlan, {
     params: {
         buyorsell: buyorsell.value
@@ -130,4 +118,14 @@ const showComponent = (componentName: string, row: Model.PerformancePlanRsp) =>
     openComponent(componentName)
 }
 
+const onRefresh = () => {
+    run({
+        buyorsell: buyorsell.value,
+    })
+}
+
+const onTabChange = () => {
+    pageIndex.value = 1
+    onRefresh()
+}
 </script>

src/packages/mobile/views/order/performance/components/breach/Index.vue

@@ -27,7 +27,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, PropType } from 'vue'
-import { CellGroup, Cell, Button,  Form, FormInstance, FieldRule } from 'vant'
+import { CellGroup, Cell, Button, Field, Form, FormInstance, FieldRule } from 'vant'
 import { dialog, fullloading } from '@/utils/vant'
 import { usePerformanceContractedApply } from '@/business/performance'
 
@@ -45,7 +45,7 @@ const props = defineProps({
     }
 })
 
-const { formData, formSubmit} = usePerformanceContractedApply(props.selectedRow.buyaccountid)
+const { formData, formSubmit } = usePerformanceContractedApply(props.selectedRow.buyaccountid)
 const formRef = shallowRef<FormInstance>()
 
 const onUploadSuccess = (filePath: string) => {
@@ -60,7 +60,7 @@ const formRules: { [key in keyof Proto.PerformanceContractedApplyReq]?: FieldRul
             return !!formData.value.ApplyRemark
         }
     }],
-    Attachment:[{
+    Attachment: [{
         message: '请上传附件',
         validator: () => {
             return !!formData.value.Attachment

src/packages/mobile/views/order/performance/components/modify/Index.vue

@@ -7,15 +7,18 @@
             </template>
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup title="履约信息">
-                    <Field name="ContactInfo" v-model="formData.ContactInfo" autosize label="联络信息" type="textarea" placeholder="请输入联络信息"/>
-                    <Field name="ReceiveInfo" v-model="formData.ContactInfo" autosize label="联络信息" type="textarea" placeholder="请输入收货地址">
+                    <Field name="ContactInfo" v-model="formData.ContactInfo" autosize label="联络信息" type="textarea"
+                        placeholder="请输入联络信息" />
+                    <Field name="ReceiveInfo" v-model="formData.ContactInfo" autosize label="联络信息" type="textarea"
+                        placeholder="请输入收货地址">
                         <template #button>
                             <Button icon="plus" size="small" type="primary" />
                         </template>
                     </Field>
-                    <Field name="ReceiptInfo" v-model="formData.ContactInfo" autosize label="发票信息" type="textarea" placeholder="请输入发票信息">
+                    <Field name="ReceiptInfo" v-model="formData.ContactInfo" autosize label="发票信息" type="textarea"
+                        placeholder="请输入发票信息">
                         <template #button>
-                            <Button icon="plus" size="small" type="primary"/>
+                            <Button icon="plus" size="small" type="primary" />
                         </template>
                     </Field>
                 </CellGroup>
@@ -29,7 +32,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, PropType } from 'vue'
-import { CellGroup, Button,  Form, FormInstance } from 'vant'
+import { CellGroup, Button, Field, Form, FormInstance } from 'vant'
 import { dialog, fullloading } from '@/utils/vant'
 import { usePerformanceModifyContact } from '@/business/performance'
 
@@ -46,7 +49,7 @@ const props = defineProps({
     }
 })
 
-const { formData, formSubmit} = usePerformanceModifyContact()
+const { formData, formSubmit } = usePerformanceModifyContact()
 const formRef = shallowRef<FormInstance>()
 
 const contracted = () => {
@@ -55,7 +58,7 @@ const contracted = () => {
         showCancelButton: true,
     }).then(() => {
         /// PerformancePlanID
-        formData.value.PerformancePlanID = Number(props.selectedRow.performanceplanid)
+        formData.value.PerformancePlanID = props.selectedRow.performanceplanid
         /// loding....
         fullloading((hideLoading) => {
             formSubmit().then(() => {

src/packages/mobile/views/order/position/components/swap/list/Index.vue

@@ -17,15 +17,15 @@
                     <ul>
                         <li>
                             <span>持有数量：</span>
-                            <span>{{ formatDecimal(item.curpositionqty) }}</span>
+                            <span>{{ item.curpositionqty }}</span>
                         </li>
                         <li>
                             <span>持仓均价：</span>
-                            <span>{{ item.averageprice === 0.0 ? '--' : formatDecimal(item.averageprice) }}</span>
+                            <span>{{ handleNumberValue(formatDecimal(item.averageprice)) }}</span>
                         </li>
                         <li>
                             <span>冻结数量：</span>
-                            <span>{{ formatDecimal(item.frozenqty) }}</span>
+                            <span>{{ item.frozenqty }}</span>
                         </li>
                         <li>
                             <span>持仓金额：</span>
@@ -33,7 +33,7 @@
                         </li>
                         <li>
                             <span>可用数量：</span>
-                            <span>{{ formatDecimal(item.enableqty) }}</span>
+                            <span>{{ item.enableqty }}</span>
                         </li>
                         <li>
                             <span>参考损益：</span>
@@ -59,7 +59,7 @@ import { useRequest } from '@/hooks/request'
 import { queryTradePosition } from '@/services/api/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import { getBuyOrSellName } from '@/constants/order'
-import { formatDecimal } from '@/filters'
+import { formatDecimal, handleNumberValue } from '@/filters'
 
 const componentMap = new Map<string, unknown>([
     ['close', defineAsyncComponent(() => import('../close/Index.vue'))],

src/types/proto/performance.d.ts

@@ -7,13 +7,13 @@ declare global {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// uint64 履约计划ID
-            PerformancePlanID?: number;  
+            PerformancePlanID?: number;
             /// uint32 违约方类型
-            BreachType?: number;  
+            BreachType?: number;
             /// uint64 违约申请人
-            Applicant?: number; 
+            Applicant?: number;
             /// string 申请备注 
-            ApplyRemark: string; 
+            ApplyRemark: string;
             /// string 附件
             Attachment: string;
         }
@@ -22,89 +22,89 @@ declare global {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// 返回码
-            RetCode: number; 
+            RetCode: number;
             /// 描述信息
-            RetDesc: string; 
+            RetDesc: string;
             /// uint64 履约计划ID
-            PerformancePlanID: number; 
+            PerformancePlanID: number;
         }
         // 延期申请请求 0 20 5
         interface PerformanceDelayApplyReq {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// uint64 履约计划步骤ID
-            PerformancePlanStepID?: number;  
+            PerformancePlanStepID?: number;
             /// uint32 申请延期天数
-            delaydays?: number;  
+            delaydays?: number;
             /// uint64 申请人
-            applicant?: number;  
+            applicant?: number;
             /// string 申请备注
-            applyremark?: string; 
+            applyremark?: string;
         }
         // 延期申请应答 0 20 6
         interface PerformanceDelayApplyRsp {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// 返回码
-            RetCode: number; 
+            RetCode: number;
             /// 描述信息
-            RetDesc: string; 
+            RetDesc: string;
             /// uint64 履约计划步骤ID
-            PerformancePlanStepID: number;  
+            PerformancePlanStepID: number;
             /// uint64 申请人
-            applicant: number;  
+            applicant: number;
         }
         // 履约手动确认请求 0 20 3
         interface PerformanceManualConfirmReq {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// uint64 履约计划步骤ID
-            PerformancePlanStepID?: number; 
+            PerformancePlanStepID?: number;
             /// double 溢短金额
-            OverShortAmount?: number;  
+            OverShortAmount?: number;
             /// uint32 履约步骤执行方 1买方 2 卖方
-            PerformanceExecuteSide?: number;  
+            PerformanceExecuteSide?: number;
             /// string 步骤备注
-            StepRemark?: string;  
+            StepRemark?: string;
             /// double 溢短数量
-            OverShortQty?: number;  
+            OverShortQty?: number;
             /// double 运费金额
-            ExpressFee?: number;  
+            ExpressFee?: number;
         }
         // 履约手动确认应答 0 20 4
         interface PerformanceManualConfirmRsp {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// 返回码
-            RetCode: number; 
+            RetCode: number;
             /// 描述信息
-            RetDesc: string; 
+            RetDesc: string;
             /// uint64 履约计划步骤ID
-            PerformancePlanStepID: number;   
+            PerformancePlanStepID: number;
         }
         // 履约修改联络信息请求 0 20 15
         interface PerformanceModifyContactReq {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// uint64 履约计划ID
-            PerformancePlanID?: number;  
+            PerformancePlanID?: string;
             /// uint64 账号
-            AccountID?: number; 
+            AccountID?: number;
             /// string 联络信息
-            ContactInfo?: string; 
+            ContactInfo?: string;
         }
         // 履约修改联络信息回应 0 20 16
         interface PerformanceModifyContactRsp {
             /// MessageHead 消息头
             Header?: IMessageHead;
             /// 返回码
-            RetCode: number; 
+            RetCode: number;
             /// 描述信息
-            RetDesc: string; 
+            RetDesc: string;
             /// uint64 履约计划ID
-            PerformancePlanID: number;  
+            PerformancePlanID: number;
             /// uint64 账号
-            AccountID: number;  
+            AccountID: number;
         }
     }
 }