From 032384cbe87541d5e0cf14478a2c0de7421305be Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Wed, 11 Jun 2025 16:25:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8wxSt?=
 =?UTF-8?q?ore=E4=B8=AD=E7=9A=84userid=E6=9B=BF=E6=8D=A2=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=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字段统一替换为wxStore.userid，确保用户标识的一致性
---
 src/common/apis/approval/type.ts          | 4 ++++
 src/pages/approval/handle.vue             | 2 ++
 src/pages/approval/handleApply.vue        | 2 ++
 src/pages/approval/submit.vue             | 2 ++
 src/pages/product/components/checkout.vue | 2 +-
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/common/apis/approval/type.ts b/src/common/apis/approval/type.ts
index 7a75c3e..f5a17a6 100644
--- a/src/common/apis/approval/type.ts
+++ b/src/common/apis/approval/type.ts
@@ -4,6 +4,7 @@ export interface SubmitApprovalRequestData {
   returnImages: string
   returnRemark: string
   corpid: string
+  applyUserid: string
 }
 
 export interface HandleApprovalRequestData {
@@ -16,6 +17,7 @@ export interface HandleApprovalRequestData {
   auditRemark: string
   userid: string
   corpid: string
+  auditUserid: string
 }
 
 export interface SearchApiReturnApprovalQuery {
@@ -55,6 +57,8 @@ export interface ReturnApprovalEntity {
   externalApprovalId?: number
   /** 企业微信id */
   corpid?: string
+  applyUserid?: string
+  auditUserid?: string
   /** 申请数量 */
   applyQuantity?: number
   /** 审批类型（0为借还柜 1为固资通） */
diff --git a/src/pages/approval/handle.vue b/src/pages/approval/handle.vue
index 93360cd..c726b34 100644
--- a/src/pages/approval/handle.vue
+++ b/src/pages/approval/handle.vue
@@ -28,6 +28,7 @@ const formData = ref<HandleApprovalRequestData>({
     auditRemark: '',
     userid: wxStore.userid,
     corpid: wxStore.corpid,
+    auditUserid: wxStore.userid
 })
 
 const submitting = ref(false)
@@ -169,6 +170,7 @@ onMounted(() => {
         formData.value = {
             ...formData.value,
             corpid: wxStore.corpid,
+            auditUserid: wxStore.userid,
             status: approvalStore.currentApproval.status,
             returnAmount: approvalStore.currentApproval.returnAmount,
             auditRemark: approvalStore.currentApproval.auditRemark,
diff --git a/src/pages/approval/handleApply.vue b/src/pages/approval/handleApply.vue
index a24fdb1..c2b995b 100644
--- a/src/pages/approval/handleApply.vue
+++ b/src/pages/approval/handleApply.vue
@@ -29,6 +29,7 @@ const formData = ref<HandleApprovalRequestData>({
     auditRemark: '',
     userid: wxStore.userid,
     corpid: wxStore.corpid,
+    auditUserid: wxStore.userid
 })
 
 const orderGoods = ref<ShopOrderGoodsEntity[]>([]);
@@ -221,6 +222,7 @@ const handleSubmit = async () => {
     try {
         formData.value.userid = wxStore.userid;
         formData.value.corpid = wxStore.corpid;
+        formData.value.auditUserid = wxStore.userid;
         const { code, msg } = await handleApprovalApi(formData.value)
 
         if (code === 0) {
diff --git a/src/pages/approval/submit.vue b/src/pages/approval/submit.vue
index 014981d..cc7f801 100644
--- a/src/pages/approval/submit.vue
+++ b/src/pages/approval/submit.vue
@@ -21,6 +21,7 @@ const formData = ref<SubmitApprovalRequestData>({
     returnImages: '',
     returnRemark: '',
     corpid: wxStore.corpid,
+    applyUserid: wxStore.userid,
 })
 
 watch(() => route.query.orderGoodsId, (newVal) => {
@@ -120,6 +121,7 @@ const handleSubmit = async () => {
     try {
         formData.value.returnImages = fileList.value.map(item => item.url).join(',');
         formData.value.corpid = wxStore.corpid;
+        formData.value.applyUserid = wxStore.userid;
 
         const { code, data } = await submitApprovalApi(formData.value)
 
diff --git a/src/pages/product/components/checkout.vue b/src/pages/product/components/checkout.vue
index d095d0c..aa9c572 100644
--- a/src/pages/product/components/checkout.vue
+++ b/src/pages/product/components/checkout.vue
@@ -131,7 +131,7 @@ async function handleSubmit() {
       mobile: tel.value,
       name: isInternal === 2 ? qyName.value : name.value,
       applyRemark: applyRemark.value,
-      qyUserid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
+      qyUserid: wxStore.userid,
       isInternal: isInternal
     }