update

src/business/table/index.ts

@@ -227,7 +227,6 @@ const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'charge', label: '服务费' },
         { prop: 'updatetime', label: '申请时间' },
         { prop: 'applystatus', label: '状态' },
-        { prop: 'operate', label: '操作' }
     ]],
     // 会员中心-我的地址
     ['mine_address', [
@@ -359,7 +358,7 @@ const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'priceper', label: '单价(美元/克拉)', width: 160 },
         { prop: 'undefined', label: '备注' },
         { prop: 'gzbsstatusdisplay', label: '单据状态' },
-        { prop: 'operate', label: '操作', width: 260 }
+        { prop: 'operate', label: '操作', width: 280 }
     ]],
     // 交易服务-保税服务-文件下载
     ['customs_bsfw_file', [

src/hooks/menu/index.ts

@@ -76,7 +76,7 @@ export function useMenu(authCode?: string) {
     const getAuth = (authType: AuthType) => {
         const children = findChildren(userMenus.value, authCode)
         return children.reduce((res, cur) => {
-            if (cur.authType === authType) {
+            if (!cur.hidden && cur.authType === authType) {
                 if (!componentMap.get(cur.code) && cur.component) {
                     const componentString = cur.component.replace(/^\/+/, '') // 过滤字符串前面所有 '/' 字符
                     const componentPath = componentString.replace(/\.\w+$/, '') // 过滤后缀名，为了让 import 加入 .vue ，不然会有警告提示...

src/mock/router.ts

@@ -720,6 +720,7 @@ const appmenu = {
                                 component: 'views/mine/profile/components/password/index.vue',
                                 buttonName: 'accountPassword',
                                 buttonType: 'primary',
+                                hidden: true,
                             }
                         ]
                     },

src/packages/pc/views/customs/bonded/components/advance-payment/index.vue

@@ -1,7 +1,7 @@
 <!-- 交易服务-保税服务-确认预付款 -->
 <template>
-    <app-drawer title="确认预付款" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-descriptions v-if="details">
+    <app-drawer title="确认预付款" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-descriptions :column="2" border v-if="details">
             <el-descriptions-item label="单据编号">{{ selectedRow.orderid }}</el-descriptions-item>
             <el-descriptions-item label="税费保证金">{{ details.taxmargin }}</el-descriptions-item>
             <el-descriptions-item label="汇款银行手续费">{{ details.bankfee }}</el-descriptions-item>

src/packages/pc/views/customs/bonded/components/payment/index.vue

@@ -1,7 +1,7 @@
 <!-- 交易服务-保税服务-确认付款 -->
 <template>
-    <app-drawer title="确认付款" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-descriptions v-if="details">
+    <app-drawer title="确认付款" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-descriptions :column="2" border v-if="details">
             <el-descriptions-item label="单据编号">{{ selectedRow.orderid }}</el-descriptions-item>
             <el-descriptions-item label="综合服务费">{{ details.servicefee }}</el-descriptions-item>
             <el-descriptions-item label="代缴物流保险费">{{ details.logisticsfee }}</el-descriptions-item>

src/packages/pc/views/customs/bonded/index.vue

@@ -33,23 +33,26 @@ const { loading, dataList, columns, total, pageIndex, pageSize, getBSFWOrderList
 const { filterOptons } = useDataFilter<Ermcp.GZBSFWOrderRsp>()
 
 const handleOperateButtons = (row: Ermcp.GZBSFWOrderRsp) => {
+    const buttons = ['customs_bonded_details', 'customs_bonded_download']
     switch (row.gzbsstatus) {
         case GZBSStatus.UploadBill: {
-            return ['customs_bonded_details', 'customs_bonded_download', 'customs_bonded_upload_bill']
+            buttons.push('customs_bonded_upload_bill')
+            break
         }
         case GZBSStatus.UploadSeal: {
-            return ['customs_bonded_upload_seal']
+            buttons.push('customs_bonded_upload_seal')
+            break
         }
         case GZBSStatus.AdvancePaymentConfirm: {
-            return ['customs_bonded_advance_payment']
+            buttons.push('customs_bonded_advance_payment')
+            break
         }
         case GZBSStatus.PaymentConfirm: {
-            return ['customs_bonded_payment']
-        }
-        default: {
-            return ['customs_bonded_details', 'customs_bonded_download']
+            buttons.push('customs_bonded_payment')
+            break
         }
     }
+    return buttons
 }
 
 const onRefresh = () => {

src/packages/pc/views/customs/exit/components/advance-payment/index.vue

@@ -1,7 +1,7 @@
 <!-- 交易服务-出境检测-确认预付款 -->
 <template>
-    <app-drawer title="确认预付款" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-descriptions v-if="details">
+    <app-drawer title="确认预付款" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-descriptions :column="2" border v-if="details">
             <el-descriptions-item label="单据编号">{{ selectedRow.orderidstr }}</el-descriptions-item>
             <el-descriptions-item label="GIA检测费">{{ details.giausdfee }}{{ details.giarmbfee }}</el-descriptions-item>
             <el-descriptions-item label="海关税费">{{ details.customsfee }}</el-descriptions-item>

src/packages/pc/views/customs/exit/components/details/index.less

@@ -28,4 +28,8 @@
             padding: 5px;
         }
     }
+
+    .el-descriptions {
+        margin-bottom: 20px;
+    }
 }

src/packages/pc/views/customs/exit/components/details/index.vue

@@ -26,7 +26,9 @@
             <el-descriptions-item label="天然钻石毛坯原产地">{{ selectedRow.origincountry }}</el-descriptions-item>
             <el-descriptions-item label="完成检测后收货方式">{{ selectedRow.gzcjdeliverytypedisplay }}</el-descriptions-item>
         </el-descriptions>
-        <h3>批次信息</h3>
+        <h3 class="el-descriptions__header">
+            <span class="el-descriptions__title">批次信息</span>
+        </h3>
         <app-table :data="detailList" :columns="columns" :loading="loading" :show-header="false" border>
             <!-- 刻印服务(证书号/ 其他/ 无) -->
             <template #gzcjmarktype="{ value }">

src/packages/pc/views/customs/exit/components/payment/index.vue

@@ -1,8 +1,8 @@
 <!-- 交易服务-出境检测-确认付款 -->
 <template>
-    <app-drawer title="确认付款" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-descriptions v-if="details">
-            <el-descriptions-item label="单据编号">{{ selectedRow.orderid }}</el-descriptions-item>
+    <app-drawer title="确认付款" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-descriptions :column="2" border v-if="details">
+            <el-descriptions-item label="单据编号">{{ selectedRow.orderidstr }}</el-descriptions-item>
             <el-descriptions-item label="综合服务费">{{ details.servicefee }}</el-descriptions-item>
             <el-descriptions-item label="代缴物流保险费">{{ details.logisticsfee }}</el-descriptions-item>
             <el-descriptions-item label="GIA检测费">{{ details.giausdfee }}{{ details.giarmbfee }}</el-descriptions-item>

src/packages/pc/views/customs/exit/index.vue

@@ -7,7 +7,7 @@
         <!-- 表格数据 -->
         <app-table :data="dataList" v-model:columns="columns" :loading="loading">
             <template #header>
-                <app-auth-operation :menus="['customs_exit_add']" @closed="onRefresh" />
+                <app-auth-operation :menus="['customs_exit_add']" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
@@ -47,16 +47,16 @@ const handleOperateButtons = (row: Ermcp.GZCJJCOrderRsp) => {
             return ['customs_exit_details', 'customs_exit_download', 'customs_exit_delivery']
         }
         case GZCJStatus.CheckConfirm: {
-            return ['customs_exit_check']
+            return ['customs_exit_details', 'customs_exit_download', 'customs_exit_check']
         }
         case GZCJStatus.AdvancePaymentConfirm: {
-            return ['customs_exit_advance_payment']
+            return ['customs_exit_details', 'customs_exit_download', 'customs_exit_advance_payment']
         }
         case GZCJStatus.PaymentConfirm: {
-            return ['customs_exit_payment']
+            return ['customs_exit_details', 'customs_exit_download', 'customs_exit_payment']
         }
         default: {
-            return null
+            return ['customs_exit_details', 'customs_exit_download']
         }
     }
 }

src/packages/pc/views/mine/bank/components/deposit/index.vue

@@ -11,9 +11,9 @@
             <el-form-item label="入金金额" prop="Amount">
                 <el-input type="number" placeholder="请输入" v-model.number="formData.Amount" />
             </el-form-item>
-            <el-form-item label="金额大写">
+            <!-- <el-form-item label="金额大写">
                 <span>壹万元</span>
-            </el-form-item>
+            </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-form-item>

src/packages/pc/views/mine/bank/components/withdraw/index.vue

@@ -8,12 +8,12 @@
             <el-form-item label="账户余额">
                 <span>{{ accountInfo?.balance }}</span>
             </el-form-item>
-            <el-form-item label="入金金额" prop="Amount">
+            <el-form-item label="出金金额" prop="Amount">
                 <el-input type="number" placeholder="请输入" v-model.number="formData.Amount" />
             </el-form-item>
-            <el-form-item label="金额大写">
+            <!-- <el-form-item label="金额大写">
                 <span>壹万元</span>
-            </el-form-item>
+            </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-form-item>

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

@@ -3,7 +3,7 @@
     <app-drawer :title="passwordType === 1 ? '登录密码' : '资金密码'" :width="460" v-model:show="show" :loading="loading">
         <el-form ref="formRef" label-width="80px" :model="formData" :rules="formRules">
             <el-form-item label="登录代码">
-                <span>{{ LoginCode }}</span>
+                <span>{{ handleNoneValue(LoginCode) }}</span>
             </el-form-item>
             <el-form-item label="原密码" prop="OldPwd">
                 <el-input type="password" placeholder="请输入" v-model="formData.OldPwd" />
@@ -26,6 +26,7 @@
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import { handleNoneValue } from '@/filters'
 import { usePassword } from '@/business/account'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import eventBus from '@/services/bus'

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

@@ -13,7 +13,8 @@
             <el-descriptions-item label="证件号码">{{ handleNoneValue(decryptAES(userInfo.cardnum)) }}
             </el-descriptions-item>
             <el-descriptions-item label="联系人">{{ handleNoneValue(userInfo.contactname) }}</el-descriptions-item>
-            <el-descriptions-item label="联系电话">{{ handleNoneValue(userInfo.telphone) }}</el-descriptions-item>
+            <el-descriptions-item label="联系电话">{{ handleNoneValue(decryptAES(userInfo.telphone))
+            }}</el-descriptions-item>
         </el-descriptions>
         <el-divider />
         <el-descriptions title="签约信息" :column="2" style="padding:20px" v-if="accountInfo">
@@ -22,10 +23,11 @@
             <el-descriptions-item label="冻结资金">{{ accountInfo.freezemargin }}</el-descriptions-item>
             <el-descriptions-item label="可用资金">{{ accountInfo.usedmargin }}</el-descriptions-item>
             <template v-if="bankInfo">
-                <el-descriptions-item label="托管银行">{{ bankInfo.cusbankid }}</el-descriptions-item>
+                <el-descriptions-item label="托管银行">{{ bankInfo.cusbankname }}</el-descriptions-item>
                 <el-descriptions-item label="开户银行">{{ bankInfo.bankname }}</el-descriptions-item>
                 <el-descriptions-item label="证件类型">{{ bankInfo.cardtype ?
-                getCertificateTypeName(Number(bankInfo.cardtype)) : handleNoneValue('') }}
+                        getCertificateTypeName(Number(bankInfo.cardtype)) : handleNoneValue('')
+                }}
                 </el-descriptions-item>
                 <el-descriptions-item label="银行卡户名">{{ bankInfo.bankaccountname }}</el-descriptions-item>
                 <el-descriptions-item label="证件号码">{{ handleNoneValue(bankInfo.cardno) }}</el-descriptions-item>

src/types/ermcp/bank.d.ts

@@ -83,6 +83,7 @@ declare global {
             cardtype: string;//证件类型
             currency: string;//币种
             cusbankid: string;//托管银行编号
+            cusbankname: string; // 托管银行名称
             direct: number;//方向(可以判断那方先发起的签约)
             exchticket: string;//最后一次签约成功的流水号
             extendinfo: string;//扩展信息(JSON字符串)