vue3-element-plus-app-chu 0.0.35 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-plus-app-chu",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "private": false,
   "type": "module",
   "files": [

package/src/view/dcps/estimation/index.vue

@@ -683,9 +683,10 @@ onBeforeUnmount(() => {
   background: var(--el-bg-color-page, #f7f8fa);
 }
 .estimation-header { flex: 0 0 auto; }
-.estimation-heading { display: flex; align-items: flex-end; gap: 6px 14px; }
+.estimation-heading { display: flex; align-items: center; gap: 6px 14px; }
 
-.filter-field label { display: block; margin-bottom: 5px; color: var(--el-text-color-secondary); font-size: 11px; }
+.filter-field { display: flex; align-items: center; gap: 8px; }
+.filter-field label { color: var(--el-text-color-secondary); font-size: 11px; white-space: nowrap; }
 /* 交易日期设定宽度：el-date-editor 默认宽度更高，其根节点不带本页
    scoped 属性，需要经 :deep 从宿主命中。 */
 .estimation-heading :deep(.filter-date) { width: 140px; }

package/src/view/dcps/forecast/index.vue

@@ -764,7 +764,7 @@ watch([detailDialogVisible, detailDialogPredRefNo], ([visible]) => {
 <template>
   <ElConfigProvider :size="listTableSettings.size">
   <!-- 新增 / 修改页 -->
-  <main v-if="isEditor" class="dcps-forecast-shell">
+  <div v-if="isEditor" class="dcps-forecast-shell dcps-forecast-shell--editor">
     <el-card class="shell-header" shadow="never" :body-style="{ padding: '10px' }">
       <div class="shell-heading">
         <el-button class="shell-back" :disabled="submitting" @click="backToList">
@@ -870,7 +870,7 @@ watch([detailDialogVisible, detailDialogPredRefNo], ([visible]) => {
         </div>
       </div>
     </el-card>
-  </main>
+  </div>
 
   <!-- 详情页 -->
   <main v-else-if="isDetail" class="dcps-forecast-shell">
@@ -1073,6 +1073,12 @@ watch([detailDialogVisible, detailDialogPredRefNo], ([visible]) => {
 .shell-title { margin: 0; color: var(--el-text-color-primary); font-size: 16px; font-weight: 600; line-height: 22px; }
 
 /* ---------- 新增 / 修改页 ---------- */
+.dcps-forecast-shell--editor > .shell-header,
+.dcps-forecast-shell--editor > .editor-card {
+  box-sizing: border-box;
+  width: clamp(min(100%, 560px), calc(100% - 32px), 1080px);
+  margin-inline: auto;
+}
 .dcps-forecast-shell .editor-card { display: flex; flex: 1; flex-direction: column; min-height: 0; min-width: 0; }
 /* 显式建立卡片内容区的高度链，不依赖宿主的 Element Plus 卡片布局。 */
 .dcps-forecast-shell .editor-card > :deep(.el-card__body) { box-sizing: border-box; display: flex; flex: 1; flex-direction: column; min-width: 0; min-height: 0; overflow: hidden; }

package/src/view/dcps/write-off/api.ts

@@ -6,22 +6,7 @@ import type {
   Tam120502003InBody,
 } from './typs'
 
-// 同一操作的相同请求失败后复用流水号，避免响应丢失后重试导致重复记账。
-// 成功后结束本次操作；请求体变化时自动生成新的流水号。
-const pendingOperations = new Map<string, string>()
-const submitOperation = async (code: string, body: unknown) => {
-  const key = `${code}:${JSON.stringify(body)}`
-  let consumerSeqNo = pendingOperations.get(key)
-  if (!consumerSeqNo) {
-    consumerSeqNo = crypto.randomUUID()
-    pendingOperations.set(key, consumerSeqNo)
-  }
-  const response = await baseHttpClient.post<any>(`/TAM/0001/${code}`, {
-    appHead: {}, head: { consumerSeqNo }, body,
-  })
-  if (response.head?.retCode === '00000') pendingOperations.delete(key)
-  return response
-}
+type WriteOffRequest<T> = T & { consumerSeqNo: string }
 
 export default {
   /**
@@ -29,20 +14,20 @@ export default {
    * @param params 修改参数：predRefNo 为预报流水号，predAmt 为预报金额，
    * beforeVerifyAmt 为修改前已核销金额，verifyAmt 为修改后的已核销金额。
    */
-  editApi: (params: EditVerifyFormValues) => submitOperation('120502001', params),
+  editApi: (params: WriteOffRequest<EditVerifyFormValues>) => baseHttpClient.post<any>('/TAM/0001/120502001', params),
   /**
    * 提交头寸核销。
    * @param params 核销参数：predList 为预报核销集合（必填），每项包含 predRefNo、predAmt、
    * verifyAmt、verifyStatus 均为查询时的原值快照；服务端按剩余金额自动分配，不能传入拟核销额。
    * tranList 为流水核销集合（可选），每项包含原 refNo、tranAmt、verifyStatus。
    */
-  writeOffApi: (params: Tam120502002InBody) => submitOperation('120502002', params),
+  writeOffApi: (params: WriteOffRequest<Tam120502002InBody>) => baseHttpClient.post<any>('/TAM/0001/120502002', params),
   /**
    * 撤销头寸核销。
    * @param params 撤销参数：predList 为预报集合，tranList 为流水集合，均可选；
    * 预报项按行原值提交，流水项需包含 refNo、tranAmt、verifyStatus。
    */
-  cancelWriteOffApi: (params: Tam120502003InBody) => submitOperation('120502003', params),
+  cancelWriteOffApi: (params: WriteOffRequest<Tam120502003InBody>) => baseHttpClient.post<any>('/TAM/0001/120502003', params),
   /**
    * 分页查询核销预报信息。
    * @param params 查询参数：tranDate 为交易日期（必填，YYYYMMDD）；pageIndex、pageSize 为页码和每页条数。
@@ -50,8 +35,7 @@ export default {
    * clientName 为客户名称，competName 为交易对手名称，payDirec 为收支方向（1 收入、2 支出），
    * startTransAmt、endTransAmt 为金额范围，verifyStatusList 待核销传 [1,3]、已核销传 [2]。
    */
-  queryForecastApi: (params: ForecastQueryParams) =>
-    baseHttpClient.post<any>('/TAM/0001/140502001', params),
+  queryForecastApi: (params: ForecastQueryParams) => baseHttpClient.post<any>('/TAM/0001/140502001', params),
   /**
    * 分页查询核销流水信息。
    * @param params 查询参数：tranDate 为交易日期（必填，YYYYMMDD）；pageIndex、pageSize 为页码和每页条数。
@@ -59,5 +43,5 @@ export default {
    * payerName、payeeName 为付款人和收款人名称，
    * payDirec 为收支方向（I 收入、O 支出），startTransAmt、endTransAmt 为金额范围，verifyStatus 为核销状态。
    */
-  queryFlowApi: (params: unknown) => baseHttpClient.post<any>("/TAM/0001/140502002", params)
+  queryFlowApi: (params: unknown) => baseHttpClient.post<any>('/TAM/0001/140502002', params)
 }

package/src/view/dcps/write-off/index.vue

@@ -1,3 +1,8 @@
+<script lang="ts">
+// 响应丢失后，重新进入页面提交相同操作时仍复用原流水号。
+const pendingConsumerSeqNos = new Map<string, string>()
+</script>
+
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
 import { ElConfigProvider, ElMessage, ElMessageBox } from 'element-plus'
@@ -179,6 +184,20 @@ const remainingAmountSort = localSort(
 
 // ---------- 提交状态 ----------
 
+const submitMutation = async <T extends object>(
+  action: 'edit' | 'writeOff' | 'cancel',
+  send: (params: T & { consumerSeqNo: string }) => Promise<unknown>,
+  params: T,
+  fallback: string,
+) => {
+  const key = `${action}:${JSON.stringify(params)}`
+  const consumerSeqNo = pendingConsumerSeqNos.get(key) ?? crypto.randomUUID()
+  pendingConsumerSeqNos.set(key, consumerSeqNo)
+
+  ensureSuccess(await send({ ...params, consumerSeqNo }), fallback)
+  pendingConsumerSeqNos.delete(key)
+}
+
 // 两个表格的勾选行；按预报流水号、流水号过滤出可提交的记录。
 const predSelection = ref<ForecastRow[]>([])
 const flowSelection = ref<FlowRow[]>([])
@@ -268,7 +287,8 @@ const submitWriteOff = async () => {
   }))
   mutation.value = 'writeOff'
   try {
-    ensureSuccess(await API.writeOffApi(tranList.length ? { predList, tranList } : { predList }) as any, '核销提交失败')
+    const payload = tranList.length ? { predList, tranList } : { predList }
+    await submitMutation('writeOff', API.writeOffApi, payload, '核销提交失败')
     ElMessage.success('操作成功')
     writeOffVisible.value = false
     await refreshBoth()
@@ -333,7 +353,7 @@ const cancelWriteOff = async () => {
     const payload = predList.length && tranList.length
       ? { predList, tranList }
       : predList.length ? { predList } : { tranList }
-    ensureSuccess(await API.cancelWriteOffApi(payload) as any, '撤销核销提交失败')
+    await submitMutation('cancel', API.cancelWriteOffApi, payload, '撤销核销提交失败')
     ElMessage.success('操作成功')
     await refreshBoth()
   } catch (error) {
@@ -579,12 +599,12 @@ const submitEdit = async () => {
   if (compareAmounts(amount, editForm.value.beforeVerifyAmt) === 0) return void ElMessage.warning('请先调整已核销金额')
   editRequesting.value = true
   try {
-    ensureSuccess(await API.editApi({
+    await submitMutation('edit', API.editApi, {
       predRefNo: editForm.value.predRefNo,
       predAmt: editForm.value.predAmt,
       beforeVerifyAmt: editForm.value.beforeVerifyAmt,
       verifyAmt: amount,
-    }) as any, '修改提交失败')
+    }, '修改提交失败')
     if (disposed) return
     ElMessage.success('操作成功')
     editVisible.value = false