Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/packages/mobile/views/mine/Index.vue

@@ -188,6 +188,7 @@ const userLogout = () => {
 }
 
 onActivated(() => {
+    console.log(authStatus.value)
     if (authStatus.value !== AuthStatus.Certified) {
         // 获取用户账号信息
         queryUserAccount().then((res) => {

src/packages/mobile/views/order/delivery/components/offline/detail/Index.vue

@@ -10,8 +10,8 @@
                     <Cell title="商品代码/名称" :value="selectedRow.goodsnamedisplay" />
                     <Cell title="交收方向" :value="selectedRow.buyorselldisplay" />
                     <Cell title="交收数量" :value="selectedRow.deliveryqty" />
-                    <Cell title="交收价格" :value="selectedRow.deliveryprice" />
-                    <Cell title="交收货款" :value="selectedRow.deliveryamount" />
+                    <Cell title="交收价格" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryprice" />
+                    <Cell title="交收货款" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryamount" />
                     <Cell title="交收对手方" :value="selectedRow.matchusername" />
                     <Cell title="交收信息" :value="selectedRow.deliveryinfo" />
                     <Cell title="申请时间" :value="selectedRow.reqtime" />

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

@@ -16,7 +16,7 @@
                     <Cell title="卖方" :value="selectedRow.sellusername" />
                     <Cell title="买方已付" :value="formatDecimal(selectedRow.buypaidamount)" />
                     <Cell title="卖方已收" :value="formatDecimal(selectedRow.sellreceivedamount)" />
-                    <Cell title="当前步骤" :value="selectedRow.curstepname" />
+                    <Cell title="当前步骤" :value="handleNoneValue(selectedRow.curstepname)" />
                     <Cell title="步骤到期时间" :value="formatDate(selectedRow.curstepdeadline)" />
                     <Cell title="开始时间" :value="formatDate(selectedRow.starttime)" />
                     <Cell title="关联单号" :value="selectedRow.relatedorderid" />

src/packages/mobile/views/order/position/components/transfer/listing/Index.vue

@@ -35,7 +35,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" :min="quote?.limitdown"
-                                :max="quote?.limitup" :decimal-length="2" :auto-fixed="false" button-size="22" />
+                                :max="quote?.limitup" :step="Math.pow(10, -selectedRow.decimalplace)" :decimal-length="selectedRow.decimalplace" :auto-fixed="false" button-size="22" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="转让数量">

src/packages/pc/views/account/address/components/edit/index.vue

@@ -6,18 +6,18 @@
             <el-form-item label="收货人" prop="ReceiverName">
                 <el-input placeholder="请输入" v-model="formData.ReceiverName" />
             </el-form-item>
-            <el-form-item label="证件类型" prop="CardTypeID">
+            <!-- <el-form-item label="证件类型" prop="CardTypeID">
                 <el-select v-model="formData.CardTypeID">
                     <el-option :label="item.label" :value="item.value" v-for="(item, index) in certificateTypeList.slice(0, 1)"
                         :key="index" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="联系电话" prop="PhoneNum">
                 <el-input placeholder="请输入" v-model="formData.PhoneNum" />
             </el-form-item>
-            <el-form-item label="证件号码" prop="CardNum">
+            <!-- <el-form-item label="证件号码" prop="CardNum">
                 <el-input placeholder="请输入" v-model="formData.CardNum" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item class="el-form-item--row" label="收货地址" prop="area">
                 <app-region class="el-form-item--col" v-model:province="formData.ProvinceID"
                     v-model:city="formData.CityID" v-model:district="formData.DistrictID" />
@@ -48,7 +48,7 @@ const props = defineProps({
     }
 })
 
-const { loading, formData, certificateTypeList, addOrUpdate } = useAddressForm(props.selectedRow)
+const { loading, formData, addOrUpdate } = useAddressForm(props.selectedRow)
 const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()

src/packages/pc/views/account/address/components/new/index.vue

@@ -6,18 +6,18 @@
             <el-form-item label="收货人" prop="ReceiverName">
                 <el-input placeholder="请输入" v-model="formData.ReceiverName" />
             </el-form-item>
-            <el-form-item label="证件类型" prop="CardTypeID">
+            <!-- <el-form-item label="证件类型" prop="CardTypeID">
                 <el-select v-model="formData.CardTypeID">
                     <el-option :label="item.label" :value="item.value" v-for="(item, index) in certificateTypeList.slice(0, 1)"
                         :key="index" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="联系电话" prop="PhoneNum">
                 <el-input placeholder="请输入" v-model="formData.PhoneNum" />
             </el-form-item>
-            <el-form-item label="证件号码" prop="CardNum">
+            <!-- <el-form-item label="证件号码" prop="CardNum">
                 <el-input placeholder="请输入" v-model="formData.CardNum" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item class="el-form-item--row" label="收货地址" prop="area">
                 <app-region class="el-form-item--col" v-model:province="formData.ProvinceID"
                     v-model:city="formData.CityID" v-model:district="formData.DistrictID" />
@@ -41,7 +41,7 @@ import { useAddressForm } from '@/business/user/address'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppRegion from '@pc/components/base/region/index.vue'
 
-const { loading, formData, certificateTypeList, addOrUpdate } = useAddressForm()
+const { loading, formData, addOrUpdate } = useAddressForm()
 const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()

src/packages/pc/views/account/address/index.vue

@@ -58,8 +58,8 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'receivername', label: '收货人' },
-    { prop: 'cardtypeid', label: '证件类型' },
-    { prop: 'cardnum', label: '证件号码' },
+    // { prop: 'cardtypeid', label: '证件类型' },
+    // { prop: 'cardnum', label: '证件号码' },
     { prop: 'phonenum', label: '联系电话' },
     { prop: 'address', label: '收货地址' },
     { prop: 'isdefault', label: '是否默认' },

src/packages/pc/views/account/certification/index.vue

@@ -1,97 +0,0 @@
-<!-- 账户管理-实名认证 -->
-<!-- <template>
-    <app-view class="g-form account-certification">
-        <template #header>
-            <app-navbar title="实名认证" />
-        </template>
-        <Form ref="formRef" class="g-form__container" @submit="onSubmit">
-            <CellGroup inset>
-                <Field v-model="formData.username" name="username" label="姓名" placeholder="请输入用户姓名"
-                    :rules="formRules.username" />
-                <Field name="cardtype" label="证件类型" :rules="formRules.cardtype" is-link>
-                    <template #input>
-                        <app-select v-model="formData.cardtype" placeholder="请选择证件类型" :options="enums" />
-                    </template>
-                </Field>
-                <Field v-model="formData.cardnum" name="cardnum" label="证件号码" placeholder="请输入证件号码"
-                    :rules="formRules.cardnum" />
-                <Field name="cardfrontphotourl" label="证件正面照片" :rules="formRules.cardfrontphotourl">
-                    <template #input>
-                        <app-uploader @success="b_afterRead" />
-                    </template>
-                </Field>
-                <Field name="cardbackphotourl" label="证件反面照片" :rules="formRules.cardbackphotourl">
-                    <template #input>
-                        <app-uploader @success="f_afterRead" />
-                    </template>
-                </Field>
-            </CellGroup>
-        </Form>
-        <img src="../../../assets/images/certification.png" />
-        <template #footer>
-            <div class="g-form__footer">
-                <Button type="primary" @click="formRef?.submit" round block>提交实名认证</Button>
-            </div>
-        </template>
-    </app-view>
-</template> -->
-
-<script lang="ts" setup>
-// import { ref, PropType, computed } from 'vue'
-// import { ElMessage, FormInstance, FormRules } from 'element-plus'
-// import { getCertificateTypeList } from "@/constants/account";
-// import { addAuthReq } from '@/business/user'
-// import AppUpload from '@pc/components/base/upload/index.vue'
-// import AppDrawer from '@pc/components/base/drawer/index.vue'
-
-// const show = ref(true)
-// const refresh = ref(false)
-// const formRef = ref<FormInstance>()
-// const { formData, formSubmit } = addAuthReq()
-
-/// 获取对应的证件枚举类型
-// const enums = computed(() => { return getCertificateTypeList().map(obj => { return { label: obj.label, value: obj.value } }) })
-
-// const b_afterRead = (filePath: string) => {
-//     formData.cardfrontphotourl = filePath
-// }
-
-// const f_afterRead = (filePath: string) => {
-//     formData.cardbackphotourl = filePath
-// }
-
-// 表单验证规则
-// const formRules: FormRules = {
-//     username: [{
-//         required: true,
-//         message: '请输入用户姓名',
-//     }],
-//     cardnum: [{
-//         required: true,
-//         message: '请输入证件号码',
-
-//     }],
-//     cardbackphotourl: [{
-//         required: true,
-//         message: '请上传证件背面照片',
-//     }],
-//     cardfrontphotourl: [{
-//         required: true,
-//         message: '请上传证件正面照片',
-//     }],
-// }
-
-// const onCancel = (isRefresh = false) => {
-//     show.value = false
-//     refresh.value = isRefresh
-// }
-
-// const onSubmit = () => {
-//     formSubmit().then(() => {
-//         ElMessage.success('实名认证提交请求成功')
-//         onCancel(true)
-//     }).catch((err) => {
-//         ElMessage.error('实名认证提交请求失败：' + err)
-//     })
-// }
-</script>

src/packages/pc/views/account/sign/components/certification/index.vue

@@ -0,0 +1,90 @@
+<!-- 账户管理-实名认证 -->
+<template>
+    <app-drawer title="实名认证" v-model:show="show" :width="500" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :rules="formRules">
+            <el-form-item prop="username" label="姓名">
+                <el-input placeholder="请输入用户姓名" v-model="formData.username" name="username" :rules="formRules.username" />
+            </el-form-item>
+            <el-form-item prop="cardnum" label="证件号码">
+                <el-input placeholder="请输入证件号码" v-model="formData.cardnum" name="cardnum" :rules="formRules.cardnum" />
+            </el-form-item>
+            <el-form-item label="证件类型" prop="cardtype">
+                <el-select v-model="formData.cardtype">
+                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in enums"
+                        :key="index" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="证件正面照片">
+                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="b_afterRead" :rules="formRules.cardfrontphotourl" />
+            </el-form-item>
+            <el-form-item label="证件反面照片">
+                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="f_afterRead" :rules="formRules.cardbackphotourl" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button type="info" @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="primary" @click="onSubmit">提交</el-button>
+        </template>
+    </app-drawer>
+</template>  
+
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { getCertificateTypeList } from "@/constants/account";
+import { addAuthReq } from '@/business/user'
+import AppUpload from '@pc/components/base/upload/index.vue'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+
+const show = ref(true)
+const refresh = ref(false)
+const formRef = ref<FormInstance>()
+const { formData, formSubmit, loading } = addAuthReq()
+
+/// 获取对应的证件枚举类型
+const enums = computed(() => { return getCertificateTypeList().map(obj => { return { label: obj.label, value: obj.value } }) })
+
+const b_afterRead = (filePath: string) => {
+    formData.cardfrontphotourl = filePath
+}
+
+const f_afterRead = (filePath: string) => {
+    formData.cardbackphotourl = filePath
+}
+
+// 表单验证规则
+const formRules: FormRules = {
+    username: [{
+        required: true,
+        message: '请输入用户姓名',
+        trigger: 'blur'
+    }],
+    cardnum: [{
+        required: true,
+        message: '请输入证件号码',
+        trigger: 'blur'
+    }],
+    cardbackphotourl: [{
+        required: true,
+        message: '请上传证件背面照片',
+    }],
+    cardfrontphotourl: [{
+        required: true,
+        message: '请上传证件正面照片',
+    }],
+}
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSubmit = () => {
+    formSubmit().then(() => {
+        ElMessage.success('实名认证提交请求成功')
+        onCancel(true)
+    }).catch((err) => {
+        ElMessage.error('实名认证提交请求失败：' + err)
+    })
+}
+</script>

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-drawer :title="bankInfo ? '修改签约账户' : '添加签约账户'" :width="460" v-model:show="show" :loading="loading"
         :refresh="refresh">
-        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="bankInfo" :rules="formRules">
+        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
             <el-form-item label="开户银行" prop="OpenBankAccId">
                 <el-select v-model="formData.OpenBankAccId">
                     <el-option :label="item.bankname" :value="item.bankid" v-for="(item, index) in banklist"
@@ -10,13 +10,13 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="银行卡号" prop="BankAccountNo">
-                <el-input name="BankAccountNo" placeholder="银行卡账户名" v-model="formData.BankAccountNo" :rules="formRules.BankAccountNo"/>
+                <el-input name="BankAccountNo" placeholder="银行卡账户名" :maxlength="30" v-model="formData.BankAccountNo" :rules="formRules.BankAccountNo"/>
             </el-form-item>
             <el-form-item label="姓名" prop="BankAccountName">
-                <el-input name="BankAccountName" placeholder="银行卡账户名" v-model="formData.BankAccountName" :rules="formRules.BankAccountName"/>
+                <el-input name="BankAccountName" readonly placeholder="银行卡账户名" v-model="formData.BankAccountName" :rules="formRules.BankAccountName"/>
             </el-form-item>
             <el-form-item label="支行名称" prop="BranchBankName">
-                <el-input name="BranchBankName" placeholder="请输入银行卡支行名称" v-model="formData.OpenBankName" :rules="formRules.OpenBankName"/>
+                <el-input name="BranchBankName" placeholder="请输入银行卡支行名称" :maxlength="20" v-model="formData.OpenBankName" :rules="formRules.OpenBankName"/>
             </el-form-item>
         </el-form>
         <template #footer>

src/packages/pc/views/account/sign/index.vue

@@ -3,7 +3,8 @@
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey"
         :expand-row-keys="expandKeys" @row-click="rowClick">
         <template #header>
-            <app-filter :options="filterOptons" />
+            <el-button type="primary" v-if="authStatus === AuthStatus.Certified" @click="openComponent('sign')">添加签约账户</el-button>
+            <el-button type="warning" v-else @click="openComponent('certification')" plain>实名认证</el-button>
         </template>
         <!-- 证件类型 -->
         <template #cardtype="{ value }">
@@ -28,25 +29,26 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent, onMounted } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
 import { useRequest } from '@/hooks/request'
-import { useDataFilter } from '@/hooks/datatable'
 import { queryBankAccountSign } from '@/services/api/bank'
 import { getSignStatusName, SignStatus } from '@/constants/bank'
 import { getCertificateTypeCodeName } from '@/constants/account'
+import { queryUserAccount } from '@/services/api/account'
+import { AuthStatus } from '@/constants/account'
 import AppTable from '@pc/components/base/table/index.vue'
-import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const componentMap = new Map<string, unknown>([
     ['cancel', defineAsyncComponent(() => import('./components/cancel/index.vue'))],
     ['sign', defineAsyncComponent(() => import('./components/sign/index.vue'))],
+    ['certification', defineAsyncComponent(() => import('./components/certification/index.vue'))], // 实名认证
 ])
 
 const { rowKey, expandKeys, rowClick, selectedRow } = useComposeTable<Model.BankAccountSignRsp>({ rowKey: 'applyexchticket' })
-const { filterOptons } = useDataFilter<Model.BankAccountSignReq>()
 const { loading, dataList, run } = useRequest(queryBankAccountSign, {})
+const authStatus = shallowRef(AuthStatus.Uncertified) // 实名认证状态
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     run()
@@ -64,7 +66,13 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'signstatus', label: '状态' },
 ])
 
-filterOptons.buttonList = [
-    { lable: '添加签约账户', className: 'el-button--primary', onClick: () => openComponent('sign') },
-]
+onMounted(() => {
+    if (authStatus.value !== AuthStatus.Certified) {
+        // 获取用户账号信息
+        queryUserAccount().then((res) => {
+            authStatus.value = res.data.hasauth
+        })
+    }
+})
+
 </script>

src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -4,10 +4,10 @@
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" label-position="left" :model="formData"
             :rules="formRules">
             <el-form-item prop="Amount" label="充值金额">
-                <el-input-number placeholder="请输入" v-model="formData.Amount" />
+                <el-input-number placeholder="请输入" :max="9999999999" :precision="2" v-model="formData.Amount" :rules="formRules.Amount"/>
             </el-form-item>
-            <el-form-item label="凭证">
-                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange" />
+            <el-form-item label="凭证" prop="filePath">
+                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange" :rules="formRules.filePath"/>
             </el-form-item>
         </el-form>
         <template #footer>
@@ -23,6 +23,7 @@ import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useDoDeposit } from '@/business/bank'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppUpload from '@pc/components/base/upload/index.vue'
+import { shallowRef } from 'vue'
 
 const props = defineProps({
     selectedRow: {
@@ -35,13 +36,15 @@ const { formData, onSubmit, extendInfo, loading } = useDoDeposit(props.selectedR
 const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()
+const filePath = shallowRef('')
 
 const formRules: FormRules = {
     Amount: [{ required: true, message: '请输入充值金额' }],
+    filePath: [{ required: true, message: '请上传转账凭证' }],
 }
 
 const onUploadChange = (file: { filePath: string }) => {
-    console.log(file.filePath)
+    filePath.value = file.filePath
     extendInfo.certificate_photo_url = file.filePath
 }
 

src/packages/pc/views/footer/capital/summary/index.vue

@@ -9,8 +9,8 @@
         <!-- 展开行 -->
         <template #expand>
             <div class="buttonbar">
-                <el-button type="danger" size="small" @click="openComponent('deposit')">充值</el-button>
-                <el-button type="primary" size="small" @click="openComponent('withdraw')">提现</el-button>
+                <el-button type="danger" size="small" @click="doInOutMoney('deposit')">充值</el-button>
+                <el-button type="primary" size="small" @click="doInOutMoney('withdraw')">提现</el-button>
             </div>
         </template>
         <template #footer>
@@ -21,12 +21,16 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent, onMounted } from 'vue'
 import { useAccountStore } from '@/stores'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
-import AppTable from '@pc/components/base/table/index.vue'
 import { getTradeStatusName } from '@/constants/order'
+import { AuthStatus } from '@/constants/account'
+import { queryBankAccountSign } from '@/services/api/bank'
+import { queryUserAccount } from '@/services/api/account'
+import AppTable from '@pc/components/base/table/index.vue'
+import { ElMessage } from 'element-plus'
 
 const componentMap = new Map<string, unknown>([
     ['deposit', defineAsyncComponent(() => import('./deposit/index.vue'))], // 充值
@@ -48,4 +52,31 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'outamount', label: '今日出金', decimal: 2 },
     { prop: 'tradestatus', label: '状态' },
 ])
+
+const authStatus = shallowRef(AuthStatus.Uncertified) // 实名认证状态
+/// 进行出入金操作判断
+const doInOutMoney = (code: string) => {
+    if (authStatus.value === AuthStatus.Certified) {
+        queryBankAccountSign().then((res) => {
+                const { signstatus } = res.data[0] ?? {}
+                /// 只有已签约的情况下才可以进行出入金
+                if (signstatus && signstatus === 4) {
+                    openComponent(code)
+                } else {
+                    ElMessage({ showClose: true, message: '请先添加签约账户信息！', })
+                }
+            })
+    } else {
+        ElMessage({ showClose: true, message: '请先实名认证，再进行该操作！' })
+    }
+}
+
+onMounted(() => {
+    if (authStatus.value !== AuthStatus.Certified) {
+        // 获取用户账号信息
+        queryUserAccount().then((res) => {
+            authStatus.value = res.data.hasauth
+        })
+    }
+})
 </script>

src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -5,17 +5,17 @@
             <el-form-item label="资金账号">
                 <span>{{ accountStore.currentAccountId }}</span>
             </el-form-item>
-            <el-form-item label="账户余额">
+            <el-form-item label="可用余额">
                 <span>{{ accountStore.currentAccount.currentbalance?.toFixed(2) }}</span>
             </el-form-item>
             <el-form-item label="出金金额" prop="Amount">
-                <el-input type="number" placeholder="请输入" v-model="formData.Amount" />
+                <el-input-number placeholder="请输入出金金额" :precision="2" v-model="formData.Amount" />
             </el-form-item>
             <!-- <el-form-item label="金额大写">
                 <span>壹万元</span>
             </el-form-item> -->
             <el-form-item class="el-form-item--row" label="备注" prop="Remark">
-                <el-input type="textarea" :rows="3" v-model="formData.Remark" />
+                <el-input type="textarea" :maxlength="50" :rows="3" v-model="formData.Remark" />
             </el-form-item>
         </el-form>
         <template #footer>

src/packages/pc/views/footer/performance/components/details/index.vue

@@ -8,35 +8,39 @@
             </template>
             <!-- 买方冻结 -->
             <template #buyerfreezeamount="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 卖方冻结 -->
             <template #sellerfreezeamount="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 买方冻结剩余 -->
             <template #buyerfreezeamountremain="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 卖方冻结剩余 -->
             <template #sellerfreezeamountremain="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 买方今日付款 -->
             <template #buytodayamount="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 卖方今日收款 -->
             <template #selltodayamount="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 已付金额 -->
             <template #buypaidamount="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
             </template>
             <!-- 已收金额 -->
             <template #sellreceivedamount="{ value }">
-                {{ handleNumberValue(value) }}
+                {{ formatDecimal(value) }}
+            </template>
+             <!-- 对手方 -->
+             <template #accountname>
+                {{ selectedRow.buyorsell === 0 ? selectedRow.buyusername : selectedRow.sellusername }}
             </template>
             <!-- 买方联络信息 -->
             <template #buyerInfo>
@@ -82,7 +86,7 @@ export default defineComponent({
 
 <script lang="ts" setup>
 import { PropType, computed, ref, shallowRef } from 'vue'
-import { handleNumberValue, handleNoneValue } from '@/filters'
+import { formatDecimal, handleNoneValue } from '@/filters'
 import { getPerformanceStepStatusName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryWrPerformancePlanStep } from '@/services/api/performance'
@@ -91,11 +95,6 @@ import AppTableDetails from '@pc/components/base/table-details/index.vue'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const props = defineProps({
-    code: String,
-    teleportTo: {
-        type: String,
-        default: '#appPageTeleport'
-    },
     selectedRow: {
         type: Object as PropType<Model.PerformancePlanRsp>,
         default: () => ({})
@@ -118,9 +117,9 @@ const detailProps = [
     { prop: 'paymenttype', label: '付款方式：' },
     { prop: 'accountname', label: '对手方：' },
     { prop: 'buyerfreezeamount', label: '买方冻结：' },
-    { prop: 'buytodayamount', label: '买方今日付款：' },
+    // { prop: 'buytodayamount', label: '买方今日付款：' },
     { prop: 'sellerfreezeamount', label: '卖方冻结：' },
-    { prop: 'selltodayamount', label: '卖方今日收款：' },
+    // { prop: 'selltodayamount', label: '卖方今日收款：' },
     { prop: 'buyerfreezeamountremain', label: '买方冻结剩余：' },
     { prop: 'buypaidamount', label: '已付金额：' },
     { prop: 'sellerfreezeamountremain', label: '卖方冻结剩余：' },

src/services/http/index.ts

@@ -243,7 +243,7 @@ export default new (class {
                     return Promise.resolve(res as T)
                 }
                 const { getErrorInfoByCode } = useErrorInfoStore()
-                const msg = getErrorInfoByCode(res.RetCode)
+                const msg = getErrorInfoByCode([6003, 6007].includes(res.status) ? res.status : res.RetCode)
                 const error = String(res.RetDesc || res.RetCode || res.Status)
                 return Promise.reject(msg ?? error)
             }

src/types/model/transfer.d.ts

@@ -33,11 +33,13 @@ declare namespace Model {
         depositremain: number; // 未付定金
         goodscode: string; // 期货合约代码(内部)
         goodsid: number; // 商品Id
+        decimalplace: number; // 行情小数位
         goodsname: string; // 期货合约名称
         goodsnamedisplay: string; // 商品名称
         lasttradedate: string; // 最后交易日期
         paystatus: number; // 支付状态 -1:待支付 2：已支付
         presaleprice: number; // 发售价(49)
+        quoteminunit: number; // 行情小数位
         relatedgoodsid: number; // 关联交易合约ID
         sellname: string; // 客户名称(企业名称)
         transferdeposit: number; // 转让定金(49)