minitest2.0 0.0.6 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minitest2.0",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "private": false,
   "type": "module",
   "repository": {

package/src/api/foreign-position.ts

@@ -67,6 +67,17 @@ export type ForeignForecastQueryResult = {
   head: TamResponse<ForeignForecastQueryResultBody>['head']
 }
 
+export type ForeignForecastDetailPayload = {
+  appHead: TamRequestPayload<ForeignForecastDetailBody>['appHead']
+  body: ForeignForecastDetailBody
+  head: TamRequestPayload<ForeignForecastDetailBody>['head']
+}
+
+export type ForeignForecastDetailResult = {
+  body: ForeignForecastDetailRecord
+  head: TamResponse<ForeignForecastDetailRecord>['head']
+}
+
 type ForeignForecastQueryBody = {
   busiType: string
   clientName: string
@@ -87,6 +98,50 @@ type ForeignForecastQueryResultBody = {
   totalCount: string
 }
 
+type ForeignForecastDetailBody = {
+  /** 预报流水号，详情查询主键。 */
+  predRefNo: string
+}
+
+export type ForeignForecastDetailRecord = ForeignForecastRecord & {
+  /** 出票日 */
+  billDate?: string
+  /** 票号 */
+  billNo?: string
+  /** 交易对手账号 */
+  competAcct?: string
+  /** 额度标志 */
+  eduFlag?: string
+  /** 落地机构代码 */
+  groundBranchCode?: string
+  /** 联系人 */
+  linkMan?: string
+  /** 支付渠道 */
+  payChannel?: string
+  /** 收支方向 */
+  payDirec?: string
+  /** 联系电话 */
+  phoneNo?: string
+  /** 预报机构 */
+  predBranch?: string
+  /** 预报机构名称 */
+  predBranchName?: string
+  /** 预报人员编号 */
+  predCode?: string
+  /** 预报日期 */
+  predDate?: string
+  /** 预报人员姓名 */
+  predName?: string
+  /** 用途 */
+  purpose?: string
+  /** 备注 */
+  remark?: string
+  /** 标准名称 */
+  standardName?: string
+  /** 已核销金额 */
+  verifyAmt?: string
+}
+
 type QueryOptions = {
   form: ForeignForecastQueryForm
   pageIndex: number
@@ -94,6 +149,7 @@ type QueryOptions = {
 }
 
 const QUERY_TRAN_CODE = '/TAM/0001/140101001'
+const DETAIL_TRAN_CODE = '/TAM/0001/140101002'
 
 export function buildForeignForecastQueryPayload({
   form,
@@ -129,6 +185,21 @@ export async function queryForeignForecastPage(
   return tamRequest<ForeignForecastQueryBody, ForeignForecastQueryResultBody>(payload)
 }
 
+export function buildForeignForecastDetailPayload(predRefNo: string): ForeignForecastDetailPayload {
+  return buildTamRequestPayload({
+    tranCode: DETAIL_TRAN_CODE,
+    body: {
+      predRefNo,
+    },
+  })
+}
+
+export async function queryForeignForecastDetail(
+  payload: ForeignForecastDetailPayload,
+): Promise<ForeignForecastDetailResult> {
+  return tamRequest<ForeignForecastDetailBody, ForeignForecastDetailRecord>(payload)
+}
+
 function normalizeDate(value: string) {
   if (/^\d{8}$/.test(value)) return value
   return value.replaceAll('-', '')

package/src/router/index.ts

@@ -45,7 +45,19 @@ const router = createRouter({
       path: '/foreign-position',
       name: 'ForeignPosition',
       component: () => import('@/views/foreign-position/index.vue'),
-      meta: { requiresAuth: true, title: '外币头寸预报及查询' },
+      meta: { requiresAuth: true, title: '外币预报信息查询' },
+    },
+    {
+      path: '/foreign-position/new',
+      name: 'ForeignPositionCreate',
+      component: () => import('@/views/foreign-position-create/index.vue'),
+      meta: { requiresAuth: true, title: '新增外币预报' },
+    },
+    {
+      path: '/foreign-position/:predRefNo',
+      name: 'ForeignPositionDetail',
+      component: () => import('@/views/foreign-position-detail/index.vue'),
+      meta: { requiresAuth: true, title: '外币预报详情' },
     },
     {
       path: '/pbc-position',

package/src/utils/foreign-forecast.ts

@@ -14,8 +14,15 @@ export type ForeignStatusOption = ForeignOption & {
   className: string
 }
 
+export const allForeignCurrencyOption: ForeignCurrencyOption = {
+  label: '全部币种',
+  shortLabel: '全部币种',
+  value: '',
+  unit: '万元',
+}
+
 export const foreignCurrencyOptions: ForeignCurrencyOption[] = [
-  { label: '全部币种', shortLabel: '全部币种', value: '', unit: '万元' },
+  allForeignCurrencyOption,
   { label: '美元', shortLabel: '美元', value: 'USD', unit: '万美元' },
   { label: '欧元', shortLabel: '欧元', value: 'EUR', unit: '万欧元' },
   { label: '港币', shortLabel: '港币', value: 'HKD', unit: '万港币' },
@@ -27,9 +34,12 @@ export const foreignCurrencyOptions: ForeignCurrencyOption[] = [
   { label: '瑞士法郎', shortLabel: '瑞郎', value: 'CHF', unit: '万瑞郎' },
 ]
 
+export const allForeignBusinessOption: ForeignOption = { label: '全部业务类型', value: '' }
+export const defaultForeignBusinessOption: ForeignOption = { label: '普通汇款', value: '1' }
+
 export const foreignBusinessOptions: ForeignOption[] = [
-  { label: '全部业务类型', value: '' },
-  { label: '普通汇款', value: '1' },
+  allForeignBusinessOption,
+  defaultForeignBusinessOption,
   { label: '外汇买卖', value: '2' },
   { label: '结售汇', value: '3' },
   { label: '资金调拨', value: '4' },
@@ -37,8 +47,14 @@ export const foreignBusinessOptions: ForeignOption[] = [
   { label: '贸易融资', value: '6' },
 ]
 
+export const allForeignStatusOption: ForeignStatusOption = {
+  label: '全部预报状态',
+  value: '',
+  className: 'status-tag-unknown',
+}
+
 export const foreignStatusOptions: ForeignStatusOption[] = [
-  { label: '全部预报状态', value: '', className: 'status-tag-unknown' },
+  allForeignStatusOption,
   { label: '已确认', value: '1', className: 'status-tag-confirmed' },
   { label: '待确认', value: '2', className: 'status-tag-pending' },
   { label: '已撤销', value: '3', className: 'status-tag-cancelled' },
@@ -56,7 +72,7 @@ export function resolveForeignCurrency(value?: string) {
   const normalizedValue = value?.trim().toUpperCase()
 
   if (!normalizedValue) {
-    return foreignCurrencyOptions[0]
+    return allForeignCurrencyOption
   }
 
   return (
@@ -100,3 +116,19 @@ export function formatForeignForecastAmount(value: number) {
   const sign = value >= 0 ? '+' : '-'
   return `${sign}${Math.abs(value).toFixed(2)}`
 }
+
+export function formatForeignForecastAmountText(value?: string, currencyValue?: string) {
+  const currency = resolveForeignCurrency(currencyValue)
+  return `${formatForeignForecastAmount(toTenThousandAmount(value))}${currency.unit}`
+}
+
+export function formatForeignForecastAmountYuanText(value?: string) {
+  const amount = Number(value?.replaceAll(',', '') || 0)
+
+  if (!Number.isFinite(amount)) return '-'
+
+  return `${amount.toLocaleString('zh-CN', {
+    maximumFractionDigits: 2,
+    minimumFractionDigits: 2,
+  })} 元`
+}

package/src/views/article-detail/index.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { showImagePreview } from 'vant'
 import { highlightArticleHtml } from '@/utils/code-highlight'
 import { copyText } from '@/utils/copy'
 import { formatArticleDate, getArticleDetail, type Article } from '@/api/announcement'
@@ -81,6 +82,38 @@ function articleContentToText(html: string) {
 
   return root.textContent?.replace(/\n{3,}/g, '\n\n').trim() || ''
 }
+
+function previewArticleImage(event: MouseEvent) {
+  if (!(event.target instanceof HTMLImageElement)) {
+    return
+  }
+
+  const container = event.currentTarget
+
+  if (!(container instanceof HTMLElement)) {
+    return
+  }
+
+  const images = Array.from(container.querySelectorAll('img'))
+    .map((image) => image.currentSrc || image.src || image.getAttribute('src') || '')
+    .filter(Boolean)
+  const currentSrc =
+    event.target.currentSrc || event.target.src || event.target.getAttribute('src') || ''
+  const startPosition = Math.max(images.findIndex((image) => image === currentSrc), 0)
+
+  if (!images.length || !currentSrc) {
+    return
+  }
+
+  event.preventDefault()
+  event.stopPropagation()
+
+  showImagePreview({
+    images,
+    startPosition,
+    closeable: true,
+  })
+}
 </script>
 
 <template>
@@ -98,7 +131,7 @@ function articleContentToText(html: string) {
         </div>
       </div>
 
-      <div class="article-content" v-html="highlightedContent"></div>
+      <div class="article-content" @click="previewArticleImage" v-html="highlightedContent"></div>
 
       <footer class="detail-actions">
         <van-button block plain type="danger" icon="description-o" @click="copyArticleContent">
@@ -225,6 +258,7 @@ function articleContentToText(html: string) {
   height: auto;
   margin: 8px auto 14px;
   border-radius: 6px;
+  cursor: zoom-in;
   object-fit: contain;
 }