update

src/business/order/index.ts

@@ -55,15 +55,18 @@ export function usePerformance(buyorsell?: BuyOrSell) {
 }
 
 // 履约手动申请
-export function usePerformanceManual(selectedRow: Ermcp.MyPerformancRsp) {
+export function usePerformanceManual({ curstepid }: Ermcp.MyPerformancRsp) {
     const loading = shallowRef(false)
 
-    const formData = reactive<Proto.PerformanceManualConfirmReq>({
-        PerformancePlanStepID: Long.fromString(selectedRow.curstepid), // uint64 履约计划步骤ID
+    const formData = reactive<Partial<Proto.PerformanceManualConfirmReq>>({
         PerformanceExecuteSide: 1, // uint32 履约步骤执行方 1买方 2 卖方
         StepRemark: '',
     })
 
+    if (curstepid) {
+        formData.PerformancePlanStepID = Long.fromString(curstepid)
+    }
+
     const formSubmit = async () => {
         try {
             loading.value = true
@@ -81,14 +84,17 @@ export function usePerformanceManual(selectedRow: Ermcp.MyPerformancRsp) {
 }
 
 // 履约延期申请
-export function usePerformanceDelay(selectedRow: Ermcp.MyPerformancRsp) {
+export function usePerformanceDelay({ curstepid }: Ermcp.MyPerformancRsp) {
     const loading = shallowRef(false)
 
-    const formData = reactive<Proto.PerformanceDelayApplyReq>({
-        PerformancePlanStepID: Long.fromString(selectedRow.curstepid), // uint64 履约计划步骤ID
+    const formData = reactive<Partial<Proto.PerformanceDelayApplyReq>>({
         applicant: userId.value, // uint64 申请人
     })
 
+    if (curstepid) {
+        formData.PerformancePlanStepID = Long.fromString(curstepid)
+    }
+
     const formSubmit = async () => {
         try {
             loading.value = true

src/business/table/columns.ts

@@ -217,7 +217,7 @@ export const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'zscolortype1display', label: '颜色' },
         { prop: 'sizedisplay', label: '尺寸' },
         { prop: 'weight', label: '重量' },
-        { prop: 'price', label: '履约金额' },
+        { prop: 'amount', label: '履约金额' },
         { prop: 'accountname', label: '对手方' },
         { prop: 'paidamount', label: '已付/已付金额' },
         { prop: 'freezeamountremain', label: '履约剩余冻结' },

src/packages/pc/components/layouts/header/index.less

@@ -5,6 +5,7 @@
     min-height: var(--statusbar-height);
     color: #fff;
     background-color: var(--header-bg);
+    //background-color: #2c875f;
     //border-bottom: 1px solid #f2f2f2;
     padding: 0 20px;
 

src/packages/pc/components/layouts/page/index.vue

@@ -53,14 +53,14 @@ watch(() => route.matched, (newMatched, oldMatched) => {
     // 判断当前路由和上个路由是否属于同个父级路由
     if (parentRoute.name !== old?.name) {
       secondMenus.value = getChildrenMenus(parentRoute.name?.toString())
-      dataIndex.value = secondMenus.value.findIndex((e) => e.code === route.name)
     }
+    dataIndex.value = secondMenus.value.findIndex((e) => e.code === route.name)
   } else {
     secondMenus.value = []
     dataIndex.value = -1
   }
 }, {
-  immediate: true
+  immediate: true,
 })
 </script>
 

src/packages/pc/views/mine/profile/components/sign/index.vue

@@ -30,7 +30,8 @@
                 <span>{{ formData.CertID }}</span>
             </el-form-item>
             <el-form-item label="银行卡户名" prop="BankAccountName">
-                <el-input placeholder="请输入" v-model="formData.BankAccountName" />
+                <!-- <el-input placeholder="请输入" v-model="formData.BankAccountName" /> -->
+                <span>{{ formData.BankAccountName }}</span>
             </el-form-item>
         </el-form>
         <template #footer>
@@ -55,7 +56,6 @@ const formRef = ref<FormInstance>()
 
 const formRules: FormRules = {
     BankAccountNo: [{ required: true, message: '请输入银行卡号', trigger: 'blur' }],
-    BankAccountName: [{ required: true, message: '请输入银行卡户名', trigger: 'blur' }],
     CustodianBank: [{
         required: true,
         validator: (rule, value, callback) => {

src/packages/pc/views/order/main/components/contracted/index.vue

@@ -3,10 +3,10 @@
     <app-drawer title="违约申请" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" label-width="80px" :model="formData" :rules="formRules">
             <el-form-item label="关联单号">
-                <span>{{ selectedRow.relatedorderid }}</span>
+                <span>{{ handleNoneValue(selectedRow.relatedorderid) }}</span>
             </el-form-item>
             <el-form-item label="当前步骤">
-                <span>{{ getStepTypeName(selectedRow.steptypeid) }}</span>
+                <span>{{ handleNumberValue(getStepTypeName(selectedRow.steptypeid)) }}</span>
             </el-form-item>
             <el-form-item label="备注" prop="ApplyRemark">
                 <el-input type="textarea" :rows="3" v-model="formData.ApplyRemark" />
@@ -24,8 +24,8 @@
 
 <script lang="ts" setup>
 import { ref, PropType } from 'vue'
-import { ElMessage } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { handleNoneValue, handleNumberValue } from '@/filters'
 import { getStepTypeName } from '@/constants/order'
 import { usePerformanceContracted } from '@/business/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

src/packages/pc/views/order/main/components/delay/index.vue

@@ -3,10 +3,10 @@
     <app-drawer title="延期申请" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" label-width="110px" :model="formData" :rules="formRules">
             <el-form-item label="关联单号">
-                <span>{{ selectedRow.relatedorderid }}</span>
+                <span>{{ handleNoneValue(selectedRow.relatedorderid) }}</span>
             </el-form-item>
             <el-form-item label="当前步骤">
-                <span>{{ getStepTypeName(selectedRow.steptypeid) }}</span>
+                <span>{{ handleNumberValue(getStepTypeName(selectedRow.steptypeid)) }}</span>
             </el-form-item>
             <el-form-item label="申请延期天数" prop="delaydays">
                 <el-input type="number" placeholder="请输入" v-model="formData.delaydays" />
@@ -24,8 +24,8 @@
 
 <script lang="ts" setup>
 import { ref, PropType } from 'vue'
-import { ElMessage } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { handleNoneValue, handleNumberValue } from '@/filters'
 import { getStepTypeName } from '@/constants/order'
 import { usePerformanceDelay } from '@/business/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

src/packages/pc/views/order/main/components/edit/index.vue

@@ -3,7 +3,7 @@
     <app-drawer title="买方联络信息" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" label-width="80px" :model="formData" :rules="formRules">
             <el-form-item label="履约计划">
-                <span>{{ selectedRow.curstepid }}</span>
+                <span>{{ handleNoneValue(selectedRow.curstepid) }}</span>
             </el-form-item>
             <el-form-item label="联络信息">
                 <el-input type="textarea" :rows="3" v-model="formData.contactInfo" />
@@ -26,8 +26,8 @@
 
 <script lang="ts" setup>
 import { ref, PropType } from 'vue'
-import { ElMessage } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { handleNoneValue } from '@/filters'
 import { usePerformanceModify } from '@/business/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppAddress from '@pc/components/modules/address/index.vue'

src/packages/pc/views/order/main/components/manual/index.vue

@@ -3,7 +3,7 @@
     <app-drawer title="手动执行" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" label-width="60px" :model="formData" :rules="formRules">
             <el-form-item>
-                <span>是否执行当前步骤【{{ getStepTypeName(selectedRow.steptypeid) }}】？</span>
+                <span>是否执行当前步骤【{{ handleNumberValue(getStepTypeName(selectedRow.steptypeid)) }}】？</span>
             </el-form-item>
             <el-form-item label="备注" prop="StepRemark">
                 <el-input type="textarea" :rows="3" v-model="formData.StepRemark" />
@@ -18,8 +18,8 @@
 
 <script lang="ts" setup>
 import { ref, PropType } from 'vue'
-import { ElMessage } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { handleNumberValue } from '@/filters'
 import { getStepTypeName } from '@/constants/order'
 import { usePerformanceManual } from '@/business/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

src/packages/pc/views/order/main/index.vue

@@ -12,6 +12,10 @@
             </app-filter>
         </template>
         <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+            <!-- 履约金额 -->
+            <template #amount="{ value }">
+                {{ handleNumberValue(value) }}
+            </template>
             <!-- 已付金额 -->
             <template #paidamount="{ row }">
                 {{ row.buyorsell === BuyOrSell.Buy ? row.buypaidamount : row.sellreceivedamount }}
@@ -26,7 +30,7 @@
             </template>
             <!-- 履约步骤 -->
             <template #steptypeid="{ value }">
-                {{ getStepTypeName(value) }}
+                {{ handleNumberValue(getStepTypeName(value)) }}
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
@@ -44,6 +48,7 @@
 <script lang="ts" setup>
 import { ElMessage } from 'element-plus'
 import { useRoute } from 'vue-router'
+import { handleNumberValue } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { BuyOrSell, StepType, getStepTypeName, getPerformanceStatusName } from '@/constants/order'
 import { usePerformance } from '@/business/order'

src/packages/pc/views/search/jewelry/index.less

@@ -16,6 +16,8 @@
             gap: 20px;
 
             &-item {
+                display: flex;
+                flex-direction: column;
                 width: 200px;
                 background-color: #fff;
                 border-radius: 4px;
@@ -28,6 +30,7 @@
                 }
 
                 &__body {
+                    flex: 1;
                     cursor: pointer;
                     padding: 10px 15px;
 

src/packages/pc/views/search/jewelry/index.vue

@@ -42,7 +42,7 @@
                         </div>
                         <div class="list-item__body" @click="openDetails(item)">
                             <div class="block block--price">
-                                <span>{{ item.zscurrencytypedisplayunit + formatDecimal(item.priceper) }}</span>
+                                <span>{{ item.zscurrencytypedisplayunit + formatDecimal(item.price) }}</span>
                             </div>
                             <div class="block block--title">
                                 <span>{{ item.zsstyletypedisplay }}</span>

src/packages/pc/views/trade/buy/components/delisting/index.vue

@@ -99,6 +99,7 @@ const onSubmit = () => {
             if (formData.WRStandardID) {
                 formSubmit().then(() => {
                     ElMessage.success('提交成功')
+                    formData.WRStandardID = 0
                     formData.ApplyPrice = undefined
                     formData.ApplyRemark = undefined
                     tableRef.value?.elTable.clearSelection() // 清空所选商品

src/services/api/performance/index.ts

@@ -15,7 +15,7 @@ export function performanceContractedApply(params: Proto.PerformanceContractedAp
 /**
  * 履约延期申请
  */
-export function performanceDelayApply(params: Proto.PerformanceDelayApplyReq) {
+export function performanceDelayApply(params: Partial<Proto.PerformanceDelayApplyReq>) {
     return tradeServer.sendMessage<Proto.PerformanceDelayApplyRsp>({
         params,
         reqName: 'PerformanceDelayApplyReq',
@@ -26,7 +26,7 @@ export function performanceDelayApply(params: Proto.PerformanceDelayApplyReq) {
 /**
  * 履约手动申请
  */
-export function performanceManualConfirm(params: Proto.PerformanceManualConfirmReq) {
+export function performanceManualConfirm(params: Partial<Proto.PerformanceManualConfirmReq>) {
     return tradeServer.sendMessage<Proto.PerformanceManualConfirmRsp>({
         params,
         reqName: 'PerformanceManualConfirmReq',

src/stores/modules/performance.ts

@@ -18,7 +18,7 @@ export const performanceStore = createStore({
                     return Promise.resolve()
                 }
                 this.state.loading = true
-                const res = await queryPermancePlanTmp()
+                const res = await queryPermancePlanTmp({ marketid: 67201 })
                 this.state.performanceTemplates = res.data
             } finally {
                 this.state.loading = false

src/types/proto/order.d.ts

@@ -43,11 +43,11 @@ declare global {
         interface PerformanceManualConfirmReq {
             Header?: IMessageHead;
             PerformancePlanStepID: Long; // uint64 履约计划步骤ID
-            OverShortAmount?: number; // double 溢短金额
+            OverShortAmount: number; // double 溢短金额
             PerformanceExecuteSide: number; // uint32 履约步骤执行方 1买方 2 卖方
             StepRemark: string; // string 步骤备注
-            OverShortQty?: number; // double 溢短数量
-            ExpressFee?: number; // double 运费金额
+            OverShortQty: number; // double 溢短数量
+            ExpressFee: number; // double 运费金额
         }
 
         /** 履约手动确认应答 */