2024.07.04 补充提交

src/views/finance/withdrawal/components/DetailModal.vue

@@ -42,6 +42,24 @@
         <el-descriptions-item label="备注：">
           {{ formData.cause || '--' }}
         </el-descriptions-item>
+        <el-descriptions-item label="惠市宝订单的分账状态：">
+          <div>
+            <span v-if="formData.summaryHsbSplitState === -1">无需分账</span>
+            <span v-else-if="formData.summaryHsbSplitState === 0">未分账</span>
+            <span v-else-if="formData.summaryHsbSplitState === 1">部分分账</span>
+            <span v-else-if="formData.summaryHsbSplitState === 2">已分账</span>
+            <span v-else>--</span>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="惠市宝已分账金额：">
+          {{ formData.summaryHsbSplitedAmount }}
+        </el-descriptions-item>
+        <el-descriptions-item label="惠市宝剩余分账金额：">
+          {{ formData.summaryHsbSplitRemainAmount }}
+        </el-descriptions-item>
+        <el-descriptions-item label="非惠市宝订单的相关提现金额：">
+          {{ formData.summaryNotHsbAmount }}
+        </el-descriptions-item>
       </el-descriptions>
     </div>
 
@@ -145,7 +163,11 @@ export default {
         relatedOrders: {}, // 相关订单
         relatedPresenterVoucherLogs: {}, // 代金券记录
         relatedCommissionLogs: {}, // 佣金记录
-        relatedBuyerUsers: [] // 用户列表
+        relatedBuyerUsers: [], // 用户列表
+        summaryHsbSplitState: '',
+        summaryHsbSplitedAmount: '',
+        summaryHsbSplitRemainAmount: '',
+        summaryNotHsbAmount: ''
       }
     }
   },
@@ -181,7 +203,11 @@ export default {
           relatedOrders: res.data.relatedOrders || {},
           relatedPresenterVoucherLogs: res.data.relatedPresenterVoucherLogs || {},
           relatedCommissionLogs: res.data.relatedCommissionLogs || {},
-          relatedBuyerUsers: res.data.relatedBuyerUsers || []
+          relatedBuyerUsers: res.data.relatedBuyerUsers || [],
+          summaryHsbSplitState: res.data.summaryHsbSplitState,
+          summaryHsbSplitedAmount: res.data.summaryHsbSplitedAmount,
+          summaryHsbSplitRemainAmount: res.data.summaryHsbSplitRemainAmount,
+          summaryNotHsbAmount: res.data.summaryNotHsbAmount
         })
       } finally {
         loading.close()

src/views/finance/withdrawal/components/WithdrawalProcessing.vue

@@ -47,10 +47,10 @@
         </el-descriptions-item>
         <el-descriptions-item label="惠市宝订单的分账状态：">
           <div>
-            <span v-if="formData.summaryHsbSplitState === 0">未分账</span>
-            <span v-else-if="formData.summaryHsbSplitState === 1">无需分账</span>
-            <span v-else-if="formData.summaryHsbSplitState === 2">部分分账</span>
-            <span v-else-if="formData.summaryHsbSplitState === 3">已分账</span>
+            <span v-if="formData.summaryHsbSplitState === -1">无需分账</span>
+            <span v-else-if="formData.summaryHsbSplitState === 0">未分账</span>
+            <span v-else-if="formData.summaryHsbSplitState === 1">部分分账</span>
+            <span v-else-if="formData.summaryHsbSplitState === 2">已分账</span>
             <span v-else>--</span>
           </div>
         </el-descriptions-item>
@@ -155,10 +155,10 @@ export default {
           state: res.data.state || 0,
           type: res.data.type || '',
           cause: res.data.cause || '',
-          summaryHsbSplitState: res.data.summaryHsbSplitState || '',
-          summaryHsbSplitedAmount: res.data.summaryHsbSplitedAmount || '',
-          summaryHsbSplitRemainAmount: res.data.summaryHsbSplitRemainAmount || '',
-          summaryNotHsbAmount: res.data.summaryNotHsbAmount || ''
+          summaryHsbSplitState: res.data.summaryHsbSplitState,
+          summaryHsbSplitedAmount: res.data.summaryHsbSplitedAmount,
+          summaryHsbSplitRemainAmount: res.data.summaryHsbSplitRemainAmount,
+          summaryNotHsbAmount: res.data.summaryNotHsbAmount
         })
         this.$nextTick(() => {
           this.$refs.formData && this.$refs.formData.validate()