调整个人最终测算利率展示并重排详情卡片

ruoyi-ui/src/views/loanPricing/workflow/components/CorporateWorkflowDetail.vue

@@ -46,6 +46,13 @@
 
       <!-- 右侧面板 -->
       <div class="right-panel">
+        <!-- 模型输出卡片 -->
+        <ModelOutputDisplay
+          :cust-type="detailData.custType"
+          :retail-output="null"
+          :corp-output="corpOutput"
+        />
+
         <!-- 流程详情卡片 -->
         <el-card class="detail-card">
           <div slot="header" class="card-header">
@@ -88,13 +95,6 @@
           </div>
         </el-card>
 
-        <!-- 模型输出卡片 -->
-        <ModelOutputDisplay
-          :cust-type="detailData.custType"
-          :retail-output="null"
-          :corp-output="corpOutput"
-        />
-
         <!-- 议价池卡片 -->
         <BargainingPoolDisplay
           v-if="bargainingPool"

ruoyi-ui/src/views/loanPricing/workflow/components/PersonalWorkflowDetail.vue

@@ -19,7 +19,7 @@
             <el-descriptions-item label="浮动BP">
               <span class="total-bp-value">{{ getTotalBp() }}</span>
             </el-descriptions-item>
-            <el-descriptions-item label="测算利率">
+            <el-descriptions-item label="最终测算利率">
               <span class="calculate-rate">{{ getCalculateRate() }}</span> %
             </el-descriptions-item>
             <el-descriptions-item label="执行利率">
@@ -46,6 +46,13 @@
 
       <!-- 右侧面板 -->
       <div class="right-panel">
+        <!-- 模型输出卡片 -->
+        <ModelOutputDisplay
+          :cust-type="detailData.custType"
+          :retail-output="retailOutput"
+          :corp-output="null"
+        />
+
         <!-- 流程详情卡片 -->
         <el-card class="detail-card">
           <div slot="header" class="card-header">
@@ -88,13 +95,6 @@
           </div>
         </el-card>
 
-        <!-- 模型输出卡片 -->
-        <ModelOutputDisplay
-          :cust-type="detailData.custType"
-          :retail-output="retailOutput"
-          :corp-output="null"
-        />
-
         <!-- 议价池卡片 -->
         <BargainingPoolDisplay
           v-if="bargainingPool"
@@ -168,9 +168,9 @@ export default {
     getTotalBp() {
       return this.retailOutput?.totalBp || '-'
     },
-    /** 获取测算利率 */
+    /** 获取最终测算利率 */
     getCalculateRate() {
-      return this.retailOutput?.calculateRate || '-'
+      return this.retailOutput?.finalCalculateRate || '-'
     },
     /** 设定执行利率 */
     handleSetExecuteRate() {

ruoyi-ui/tests/personal-final-calculate-rate-display.test.js

@@ -0,0 +1,21 @@
+const fs = require('fs')
+const path = require('path')
+const assert = require('assert')
+
+function read(relativePath) {
+  return fs.readFileSync(path.join(__dirname, '..', relativePath), 'utf8')
+}
+
+const personalDetail = read('src/views/loanPricing/workflow/components/PersonalWorkflowDetail.vue')
+
+assert(
+  /label="最终测算利率"/.test(personalDetail),
+  '个人流程详情左侧缺少“最终测算利率”标签'
+)
+
+assert(
+  /return this\.retailOutput\?\.finalCalculateRate \|\| '-'/.test(personalDetail),
+  '个人流程详情没有使用 finalCalculateRate 展示最终测算利率'
+)
+
+console.log('personal final calculate rate display assertions passed')

ruoyi-ui/tests/workflow-detail-card-order.test.js

@@ -0,0 +1,27 @@
+const fs = require('fs')
+const path = require('path')
+const assert = require('assert')
+
+function read(relativePath) {
+  return fs.readFileSync(path.join(__dirname, '..', relativePath), 'utf8')
+}
+
+function assertModelOutputBeforeDetailCard(source, label) {
+  const modelOutputIndex = source.indexOf('<ModelOutputDisplay')
+  const detailCardIndex = source.indexOf('<el-card class="detail-card">')
+
+  assert(modelOutputIndex !== -1, `${label} 缺少模型输出卡片`)
+  assert(detailCardIndex !== -1, `${label} 缺少流程详情卡片`)
+  assert(
+    modelOutputIndex < detailCardIndex,
+    `${label} 的模型输出卡片应位于流程详情卡片上方`
+  )
+}
+
+const personalDetail = read('src/views/loanPricing/workflow/components/PersonalWorkflowDetail.vue')
+const corporateDetail = read('src/views/loanPricing/workflow/components/CorporateWorkflowDetail.vue')
+
+assertModelOutputBeforeDetailCard(personalDetail, '个人流程详情')
+assertModelOutputBeforeDetailCard(corporateDetail, '企业流程详情')
+
+console.log('workflow detail card order assertions passed')