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({ 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({ auditRemark: '', userid: wxStore.userid, corpid: wxStore.corpid, + auditUserid: wxStore.userid }) const orderGoods = ref([]); @@ -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({ 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 }