From e383337642355c938606c9028692412f9a8dea39 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sat, 19 Apr 2025 10:25:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=A1=E6=89=B9):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7ID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在审批处理接口和页面中，新增了审批人姓名和用户ID字段，以便更好地跟踪审批流程和记录审批人信息
---
 src/common/apis/approval/type.ts |  3 +++
 src/pages/approval/handle.vue    | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/common/apis/approval/type.ts b/src/common/apis/approval/type.ts
index 5a2dd57..fb8c327 100644
--- a/src/common/apis/approval/type.ts
+++ b/src/common/apis/approval/type.ts
@@ -13,6 +13,7 @@ export interface HandleApprovalRequestData {
   returnAmount: number
   auditImages: string
   auditRemark: string
+  userid: string
 }
 
 export interface SearchApiReturnApprovalQuery {
@@ -69,6 +70,8 @@ export interface ReturnApprovalEntity {
   name: string
   /** 是否内部用户（0否 1汇邦云用户 2企业微信用户） */
   isInternal: number
+  /** 审核人姓名 */
+  auditName: string
 }
 
 export type SubmitApprovalResponseData = ApiResponseMsgData<{
diff --git a/src/pages/approval/handle.vue b/src/pages/approval/handle.vue
index af02878..e7b0c98 100644
--- a/src/pages/approval/handle.vue
+++ b/src/pages/approval/handle.vue
@@ -1,25 +1,27 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { showConfirmDialog, showSuccessToast, showFailToast, showToast, UploaderFileListItem, Popup, Picker } from 'vant'
-
 import axios from "axios"
 import { handleApprovalApi } from '@/common/apis/approval'
 import { openCabinetApi } from '@/common/apis/shop'
 import type { HandleApprovalRequestData } from '@/common/apis/approval/type'
 import { useRoute, useRouter } from 'vue-router'
 import { useApprovalStore } from '@/pinia/stores/approval'
+import { useWxStore } from '@/pinia/stores/wx'
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const router = useRouter()
 const route = useRoute()
-const approvalStore = useApprovalStore()
+const approvalStore = useApprovalStore();
+const wxStore = useWxStore();
 
 const formData = ref<HandleApprovalRequestData>({
     approvalId: approvalStore.currentApproval?.approvalId || 0,
     status: 2,
     returnAmount: approvalStore.currentApproval?.goodsPrice || 0,
     auditImages: '',
-    auditRemark: ''
+    auditRemark: '',
+    userid: wxStore.userid
 })
 
 const submitting = ref(false)
@@ -186,6 +188,7 @@ const handleSubmit = async () => {
 
     submitting.value = true
     try {
+        formData.value.userid = wxStore.userid;
         const { code, msg } = await handleApprovalApi(formData.value)
 
         if (code === 0) {
@@ -232,6 +235,7 @@ const handleSubmit = async () => {
                 <van-cell title="商品单价" :value="`¥${approvalStore.currentApproval?.goodsPrice}`" />
                 <van-cell title="当前状态" :value="statusMap[approvalStore.currentApproval?.status || 1]" />
                 <van-cell title="退还说明" :value="approvalStore.currentApproval?.returnRemark" />
+                <van-cell title="审批人" :value="approvalStore.currentApproval?.auditName" />
             </van-cell-group>
 
             <van-cell-group class="image-section">