minitest2.0 0.0.8 → 0.0.10

package/package.json

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

package/src/api/foreign-position.ts

@@ -7,53 +7,103 @@ import {
 import { useAppStore } from '@/stores/app'
 
 export type ForeignForecastRecord = {
-  /** 业务类型。 */
+  /** 授权标志。 */
+  authorization?: string
+  /** 账户行。 */
+  bankAcct?: string
+  /** 旧接口业务类型字段，详情接口暂时兼容使用。 */
   busiType?: string
-  /** 币种字段，不同后端版本可能返回不同命名。 */
+  /** 币种。 */
   ccy?: string
-  currency?: string
-  currencyCode?: string
-  currCode?: string
-  curType?: string
-  tranCcy?: string
-  /** 客户类型或客户名称，用于列表副标题兜底。 */
+  /** 客户账号。 */
+  clientAcct?: string
+  /** 客户名称。 */
   clientName?: string
-  clientType?: string
+  /** 交易对手账号。 */
+  competAcct?: string
+  /** 交易对手 Swift Code。 */
+  competAcctSc?: string
+  /** 交易对手。 */
   competName?: string
-  /** 交易对手或清算行信息。 */
-  bankSwift?: string
-  bicCode?: string
-  routeCode?: string
-  swiftCode?: string
-  /** 落地机构，列表主标题展示字段。 */
+  /** 单证业务编号。 */
+  docbusinessno?: string
+  /** 落地机构。 */
   groundBranch?: string
+  /** 中间行 Swift Code。 */
+  midBankSc?: string
+  /** 结汇、购汇或现汇。 */
+  originalForeign?: string
+  /** 收支方向。 */
+  payDirec?: string
+  /** 联系电话。 */
+  phoneNo?: string
   /** 预报金额，接口按元级金额返回，页面转换为万元级展示。 */
   predAmt?: string
+  /** 预报人编号。 */
+  predCode?: string
+  /** 预报时间。 */
+  predDate?: string
+  /** 预报机构。 */
+  predDept?: string
+  /** 预报人。 */
+  predName?: string
   /** 预报流水号，后续详情查询主键。 */
   predRefNo?: string
   /** 预报状态。 */
   predStatus?: string
-  /** 交易日期。 */
+  /** 预报类型。 */
+  predType?: string
+  /** 预报方式。 */
+  predWay?: string
+  /** 交易对手行名称。 */
+  rcvBank?: string
+  /** 交易对手行 Swift Code。 */
+  rcvBankSc?: string
+  /** 备注。 */
+  remark?: string
+  /** 起息日期。 */
   tranDate?: string
+  /** 业务类型。 */
+  tranType?: string
+  /** 未核销金额。 */
+  unverifyAmt?: string
+  /** 审批时间。 */
+  updateTime?: string
+  /** 核销金额。 */
+  verifyAmt?: string
   /** 核销状态。 */
   verifyStatus?: string
+  /** 兼容旧接口可能返回的币种字段。 */
+  currency?: string
+  currencyCode?: string
+  currCode?: string
+  curType?: string
+  tranCcy?: string
+  /** 兼容旧接口返回字段。 */
+  clientType?: string
+  bankSwift?: string
+  bicCode?: string
+  routeCode?: string
+  swiftCode?: string
 }
 
 export type ForeignForecastQueryForm = {
-  /** 交易时间，当前视图必填筛选项。 */
+  /** 起息日。 */
   tranDate: string
-  /** 落地机构关键字。 */
-  groundBranch?: string
-  /** 币种，当前后端交易未明确入参时页面做兼容筛选。 */
-  currency?: string
+  /** 机构名称。 */
+  orgName?: string
+  /** 币种。 */
+  ccy?: string
   /** 业务类型。 */
-  busiType?: string
+  tranType?: string
   /** 预报状态。 */
   predStatus?: string
+  /** 筛选 FTU 数据，否为空、是为 1。 */
+  filter?: string
   /** 起始金额，页面单位为万元。 */
-  startTranAmt?: string
+  startAmt?: string
   /** 截止金额，页面单位为万元。 */
-  endTranAmt?: string
+  endAmt?: string
 }
 
 export type ForeignForecastQueryPayload = {
@@ -79,23 +129,30 @@ export type ForeignForecastDetailResult = {
 }
 
 type ForeignForecastQueryBody = {
-  busiType: string
+  amtOrder: number | ''
+  authorization: string
+  ccy: string
   clientName: string
-  competName: string
-  endTransAmt: string
-  groundBranch: string
-  payChannel: string
+  endAmt: string
+  filter: string
+  opType: string
+  orgName: string
+  originalForeign: string
   payDirec: string
+  predOrder: number | ''
   predStatus: string
-  sortRule: string
-  startTransAmt: string
+  predWay: string
+  startAmt: string
+  timeOrder: number | ''
   tranDate: string
+  tranType: string
   verifyStatus: string
 }
 
 type ForeignForecastQueryResultBody = {
-  resultList: ForeignForecastRecord[]
+  resultInfos: ForeignForecastRecord[]
   totalCount: string
+  totalPage: string
 }
 
 type ForeignForecastDetailBody = {
@@ -148,7 +205,7 @@ type QueryOptions = {
   pageSize: number
 }
 
-const QUERY_TRAN_CODE = '/TAM/0001/140101001'
+const QUERY_TRAN_CODE = '/TAM/0001/140201001'
 const DETAIL_TRAN_CODE = '/TAM/0001/140101002'
 
 export function buildForeignForecastQueryPayload({
@@ -163,17 +220,23 @@ export function buildForeignForecastQueryPayload({
     pageIndex,
     pageSize,
     body: {
-      busiType: form.busiType || '',
+      amtOrder: '',
+      authorization: '',
+      ccy: form.ccy || '',
       clientName: '',
-      competName: '',
-      endTransAmt: toRequestAmount(form.endTranAmt),
-      groundBranch: form.groundBranch || '',
-      payChannel: '',
+      endAmt: toRequestAmount(form.endAmt),
+      filter: form.filter || '',
+      opType: '',
+      orgName: form.orgName || '',
+      originalForeign: '',
       payDirec: '',
+      predOrder: '',
       predStatus: form.predStatus || '',
-      sortRule: '',
-      startTransAmt: toRequestAmount(form.startTranAmt),
+      predWay: '',
+      startAmt: toRequestAmount(form.startAmt),
+      timeOrder: '',
       tranDate,
+      tranType: form.tranType || '',
       verifyStatus: '',
     },
   })

package/src/stores/position-filter.ts

@@ -0,0 +1,38 @@
+import { defineStore } from 'pinia'
+
+/**
+ * 头寸预报查询筛选区状态 Store
+ *
+ * 只保存列表页筛选条件面板的展开/收起状态，避免和应用级配置混在一起。
+ */
+export const usePositionFilterStore = defineStore(
+  'positionFilter',
+  () => {
+    /** 人民币头寸预报及查询列表筛选条件是否展开，默认收起并持久化用户选择。 */
+    const rmbFilterExpanded = ref(false)
+
+    /** 外币头寸预报及查询列表筛选条件是否展开，默认收起并持久化用户选择。 */
+    const foreignFilterExpanded = ref(false)
+
+    function setRmbFilterExpanded(value: boolean) {
+      rmbFilterExpanded.value = value
+    }
+
+    function setForeignFilterExpanded(value: boolean) {
+      foreignFilterExpanded.value = value
+    }
+
+    return {
+      rmbFilterExpanded,
+      foreignFilterExpanded,
+      setRmbFilterExpanded,
+      setForeignFilterExpanded,
+    }
+  },
+  {
+    persist: {
+      key: 'mini2_position_filter_settings',
+      pick: ['rmbFilterExpanded', 'foreignFilterExpanded'],
+    },
+  },
+)

package/src/utils/foreign-forecast.ts

@@ -23,28 +23,37 @@ export const allForeignCurrencyOption: ForeignCurrencyOption = {
 
 export const foreignCurrencyOptions: ForeignCurrencyOption[] = [
   allForeignCurrencyOption,
-  { label: '美元', shortLabel: '美元', value: 'USD', unit: '万美元' },
-  { label: '欧元', shortLabel: '欧元', value: 'EUR', unit: '万欧元' },
-  { label: '港币', shortLabel: '港币', value: 'HKD', unit: '万港币' },
-  { label: '日元', shortLabel: '日元', value: 'JPY', unit: '万日元' },
-  { label: '英镑', shortLabel: '英镑', value: 'GBP', unit: '万英镑' },
-  { label: '加拿大元', shortLabel: '加元', value: 'CAD', unit: '万加元' },
-  { label: '澳大利亚元', shortLabel: '澳元', value: 'AUD', unit: '万澳元' },
-  { label: '新加坡元', shortLabel: '新元', value: 'SGD', unit: '万新元' },
-  { label: '瑞士法郎', shortLabel: '瑞郎', value: 'CHF', unit: '万瑞郎' },
+  { label: 'CNY-人民币', shortLabel: '人民币', value: 'CNY', unit: '万元' },
+  { label: 'USD-美元', shortLabel: '美元', value: 'USD', unit: '万美元' },
+  { label: 'HKD-港元', shortLabel: '港元', value: 'HKD', unit: '万港元' },
+  { label: 'EUR-欧元', shortLabel: '欧元', value: 'EUR', unit: '万欧元' },
+  { label: 'AUD-澳大利亚元', shortLabel: '澳大利亚元', value: 'AUD', unit: '万澳大利亚元' },
+  { label: 'CHF-瑞士法郎', shortLabel: '瑞士法郎', value: 'CHF', unit: '万瑞士法郎' },
+  { label: 'GBP-英镑', shortLabel: '英镑', value: 'GBP', unit: '万英镑' },
+  { label: 'CAD-加拿大元', shortLabel: '加拿大元', value: 'CAD', unit: '万加拿大元' },
+  { label: 'NZD-新西兰元', shortLabel: '新西兰元', value: 'NZD', unit: '万新西兰元' },
+  { label: 'SGD-新加坡元', shortLabel: '新加坡元', value: 'SGD', unit: '万新加坡元' },
+  { label: 'JPY-日元', shortLabel: '日元', value: 'JPY', unit: '万日元' },
+  { label: 'SEK-瑞典克朗', shortLabel: '瑞典克朗', value: 'SEK', unit: '万瑞典克朗' },
+  { label: 'NOK-挪威克朗', shortLabel: '挪威克朗', value: 'NOK', unit: '万挪威克朗' },
+  { label: 'DKK-丹麦克朗', shortLabel: '丹麦克朗', value: 'DKK', unit: '万丹麦克朗' },
+  {
+    label: 'KZT-哈萨克斯坦坚戈',
+    shortLabel: '哈萨克斯坦坚戈',
+    value: 'KZT',
+    unit: '万哈萨克斯坦坚戈',
+  },
 ]
 
 export const allForeignBusinessOption: ForeignOption = { label: '全部业务类型', value: '' }
-export const defaultForeignBusinessOption: ForeignOption = { label: '普通汇款', value: '1' }
+export const defaultForeignBusinessOption: ForeignOption = { label: '普通汇款', value: '10' }
 
 export const foreignBusinessOptions: ForeignOption[] = [
   allForeignBusinessOption,
   defaultForeignBusinessOption,
-  { label: '外汇买卖', value: '2' },
-  { label: '结售汇', value: '3' },
-  { label: '资金调拨', value: '4' },
-  { label: '同业业务', value: '5' },
-  { label: '贸易融资', value: '6' },
+  { label: '单证业务', value: '11' },
+  { label: '同业/其他业务', value: '12' },
+  { label: '资金调拨', value: '13' },
 ]
 
 export const allForeignStatusOption: ForeignStatusOption = {

package/src/views/foreign/position/create/index.vue

@@ -30,7 +30,7 @@ const form = reactive({
   tranDate: getInitialTranDate(),
   institution: '北京银行总行核算中心',
   currency: 'USD',
-  business: '1',
+  business: '10',
   counterparty: '',
   amount: '',
 })

package/src/views/foreign/position/index.vue

@@ -6,6 +6,7 @@ import {
   type ForeignForecastRecord,
 } from '@/api/foreign-position'
 import { useAppStore } from '@/stores/app'
+import { usePositionFilterStore } from '@/stores/position-filter'
 import {
   allForeignBusinessOption,
   allForeignStatusOption,
@@ -48,23 +49,30 @@ type PendingForecast = {
   amount: number
 }
 
-type SelectorType = 'currency' | 'business' | 'status'
+type SelectorType = 'currency' | 'business' | 'status' | 'filterFTU'
 
 type SelectorOption = ForeignOption | ForeignStatusOption
 
 const router = useRouter()
 const appStore = useAppStore()
+const positionFilterStore = usePositionFilterStore()
 const defaultTranDate = appStore.systemWorkDate
 const heroImage = `${import.meta.env.BASE_URL}images/12a73787-86a9-4891-a65f-66104746f6a8.png`
 const pageSize = 10
 const backTopThreshold = 520
 const pendingForecastKey = 'foreign-position:pending-create'
+const defaultFilterFTUOption: ForeignOption = { label: '否', value: '' }
+const filterFTUOptions: ForeignOption[] = [
+  defaultFilterFTUOption,
+  { label: '是', value: '1' },
+]
 
 const queryForm = reactive({
   institution: '',
   currency: '',
   business: '',
   status: '',
+  filterFTU: '',
   minAmount: '',
   maxAmount: '',
 })
@@ -74,7 +82,8 @@ const showDatePicker = ref(false)
 const datePickerValue = ref(selectedDate.value.split('-'))
 const minDate = new Date(2020, 0, 1)
 const maxDate = new Date(2030, 11, 31)
-const isFilterExpanded = ref(true)
+// 筛选区展开状态由 Pinia 持久化；首次进入无缓存时默认收起。
+const isFilterExpanded = computed(() => positionFilterStore.foreignFilterExpanded)
 
 const forecastList = ref<Forecast[]>([])
 const forecastTotal = ref(0)
@@ -97,11 +106,16 @@ const selectedStatus = computed(
   () =>
     foreignStatusOptions.find((item) => item.value === queryForm.status) || allForeignStatusOption,
 )
+const selectedFilterFTU = computed(
+  () =>
+    filterFTUOptions.find((item) => item.value === queryForm.filterFTU) || defaultFilterFTUOption,
+)
 const selectorTitle = computed(() => {
   const titleMap: Record<SelectorType, string> = {
     currency: '选择币种',
     business: '选择业务类型',
     status: '选择预报状态',
+    filterFTU: '筛选FTU',
   }
 
   return titleMap[selectorType.value]
@@ -109,6 +123,7 @@ const selectorTitle = computed(() => {
 const selectorOptions = computed<SelectorOption[]>(() => {
   if (selectorType.value === 'currency') return foreignCurrencyOptions
   if (selectorType.value === 'business') return foreignBusinessOptions
+  if (selectorType.value === 'filterFTU') return filterFTUOptions
 
   return foreignStatusOptions
 })
@@ -116,7 +131,7 @@ const filterSummary = computed(() => {
   const institution = queryForm.institution.trim() || '全部机构'
   const currency = selectedCurrency.value.shortLabel
 
-  return `${selectedDate.value} · ${institution} · ${currency}`
+  return `${selectedDate.value} · ${institution} · ${currency} · FTU${selectedFilterFTU.value.label}`
 })
 
 onMounted(async () => {
@@ -135,7 +150,14 @@ function mapForeignRecordToForecast(record: ForeignForecastRecord, index: number
   const currency = resolveForeignCurrency(currencyValue)
   const status = resolveForeignStatus(record.predStatus)
   const counterparty =
-    record.competName || record.clientName || record.bankSwift || record.swiftCode || '-'
+    record.competName ||
+    record.clientName ||
+    record.rcvBank ||
+    record.competAcctSc ||
+    record.rcvBankSc ||
+    record.bankSwift ||
+    record.swiftCode ||
+    '-'
 
   return {
     id: index + 1,
@@ -143,7 +165,7 @@ function mapForeignRecordToForecast(record: ForeignForecastRecord, index: number
     date: formatForeignForecastDate(record.tranDate),
     currency: currency.shortLabel,
     currencyUnit: currency.unit,
-    business: resolveForeignBusinessType(record.busiType),
+    business: resolveForeignBusinessType(record.tranType || record.busiType),
     counterparty,
     amount: toTenThousandAmount(record.predAmt),
     predRefNo: record.predRefNo || '',
@@ -155,12 +177,13 @@ function mapForeignRecordToForecast(record: ForeignForecastRecord, index: number
 function buildQueryForm(): ForeignForecastQueryForm {
   return {
     tranDate: selectedDate.value,
-    groundBranch: queryForm.institution.trim(),
-    currency: queryForm.currency,
-    busiType: queryForm.business,
+    orgName: queryForm.institution.trim(),
+    ccy: queryForm.currency,
+    tranType: queryForm.business,
     predStatus: queryForm.status,
-    startTranAmt: queryForm.minAmount,
-    endTranAmt: queryForm.maxAmount,
+    filter: queryForm.filterFTU,
+    startAmt: queryForm.minAmount,
+    endAmt: queryForm.maxAmount,
   }
 }
 
@@ -183,6 +206,10 @@ function scrollToTop() {
   })
 }
 
+function toggleFilterExpanded() {
+  positionFilterStore.setForeignFilterExpanded(!isFilterExpanded.value)
+}
+
 function openCreatePage() {
   router.push({
     name: 'ForeignPositionCreate',
@@ -200,6 +227,8 @@ function chooseSelectorOption(option: SelectorOption) {
     queryForm.currency = option.value
   } else if (selectorType.value === 'business') {
     queryForm.business = option.value
+  } else if (selectorType.value === 'filterFTU') {
+    queryForm.filterFTU = option.value
   } else {
     queryForm.status = option.value
   }
@@ -238,6 +267,7 @@ async function handleReset() {
   queryForm.currency = ''
   queryForm.business = ''
   queryForm.status = ''
+  queryForm.filterFTU = ''
   queryForm.minAmount = ''
   queryForm.maxAmount = ''
 
@@ -278,20 +308,16 @@ async function loadNextPage() {
 
   try {
     const response = await queryForeignForecastPage(payload)
-    const records = filterRecordsByCurrency(response.body.resultList)
+    const records = response.body.resultInfos || []
     const nextList = records.map((item, index) =>
       mapForeignRecordToForecast(item, forecastList.value.length + index),
     )
 
     forecastList.value.push(...nextList)
-    forecastTotal.value = queryForm.currency
-      ? forecastList.value.length
-      : Number(response.body.totalCount) || forecastList.value.length
+    forecastTotal.value = Number(response.body.totalCount) || forecastList.value.length
     currentPage.value += 1
-    listFinished.value = queryForm.currency
-      ? response.body.resultList.length < pageSize
-      : forecastList.value.length >= forecastTotal.value ||
-        response.body.resultList.length < pageSize
+    listFinished.value =
+      forecastList.value.length >= forecastTotal.value || records.length < pageSize
   } catch (error) {
     console.error('[外币预报查询失败]', error)
     listError.value = true
@@ -302,14 +328,6 @@ async function loadNextPage() {
   }
 }
 
-function filterRecordsByCurrency(records: ForeignForecastRecord[]) {
-  const currency = queryForm.currency.trim().toUpperCase()
-
-  if (!currency) return records
-
-  return records.filter((item) => getRecordCurrency(item) === currency)
-}
-
 function getRecordCurrency(record: ForeignForecastRecord) {
   return (
     record.ccy ||
@@ -417,7 +435,7 @@ function isPendingForecast(value: Partial<PendingForecast> | null): value is Pen
             class="filter-toggle"
             type="button"
             :aria-expanded="isFilterExpanded"
-            @click="isFilterExpanded = !isFilterExpanded"
+            @click="toggleFilterExpanded"
           >
             <van-icon :name="isFilterExpanded ? 'arrow-up' : 'arrow-down'" />
             <span>{{ isFilterExpanded ? '收起' : '展开' }}</span>
@@ -468,6 +486,13 @@ function isPendingForecast(value: Partial<PendingForecast> | null): value is Pen
               <van-icon class="row-arrow" name="arrow" />
             </button>
 
+            <button class="filter-row" type="button" @click="openSelector('filterFTU')">
+              <span class="row-icon"><van-icon name="filter-o" /></span>
+              <span class="row-label">筛选FTU</span>
+              <span class="row-value muted-value">{{ selectedFilterFTU.label }}</span>
+              <van-icon class="row-arrow" name="arrow" />
+            </button>
+
             <div class="filter-row amount-row">
               <span class="row-icon row-icon-money"><van-icon name="gold-coin-o" /></span>
               <span class="row-label">金额区间</span>
@@ -592,7 +617,8 @@ function isPendingForecast(value: Partial<PendingForecast> | null): value is Pen
             v-if="
               (selectorType === 'currency' && item.value === queryForm.currency) ||
               (selectorType === 'business' && item.value === queryForm.business) ||
-              (selectorType === 'status' && item.value === queryForm.status)
+              (selectorType === 'status' && item.value === queryForm.status) ||
+              (selectorType === 'filterFTU' && item.value === queryForm.filterFTU)
             "
             name="success"
           />

package/src/views/rmb/position/index.vue

@@ -6,6 +6,7 @@ import {
   type RmbForecastRecord,
 } from '@/api/rmb-position'
 import { useAppStore } from '@/stores/app'
+import { usePositionFilterStore } from '@/stores/position-filter'
 import {
   forecastStatusMap,
   formatForecastAmount,
@@ -41,6 +42,7 @@ type PendingForecast = {
 
 const router = useRouter()
 const appStore = useAppStore()
+const positionFilterStore = usePositionFilterStore()
 const defaultTranDate = appStore.systemWorkDate
 const heroImage = `${import.meta.env.BASE_URL}images/5798d7aa-ba8b-4605-8079-58b35495ac55.png`
 const pageSize = 10
@@ -58,7 +60,8 @@ const showDatePicker = ref(false)
 const datePickerValue = ref(selectedDate.value.split('-'))
 const minDate = new Date(2020, 0, 1)
 const maxDate = new Date(2030, 11, 31)
-const isFilterExpanded = ref(true)
+// 筛选区展开状态由 Pinia 持久化；首次进入无缓存时默认收起。
+const isFilterExpanded = computed(() => positionFilterStore.rmbFilterExpanded)
 
 const forecastList = ref<Forecast[]>([])
 const forecastTotal = ref(0)
@@ -135,6 +138,10 @@ function scrollToTop() {
   })
 }
 
+function toggleFilterExpanded() {
+  positionFilterStore.setRmbFilterExpanded(!isFilterExpanded.value)
+}
+
 function openCreatePage() {
   router.push({
     name: 'RmbPositionCreate',
@@ -311,7 +318,7 @@ function isPendingForecast(value: Partial<PendingForecast> | null): value is Pen
             class="filter-toggle"
             type="button"
             :aria-expanded="isFilterExpanded"
-            @click="isFilterExpanded = !isFilterExpanded"
+            @click="toggleFilterExpanded"
           >
             <van-icon :name="isFilterExpanded ? 'arrow-up' : 'arrow-down'" />
             <span>{{ isFilterExpanded ? '收起' : '展开' }}</span>