feat(审批): 添加审批人信息和用户ID字段
在审批处理接口和页面中,新增了审批人姓名和用户ID字段,以便更好地跟踪审批流程和记录审批人信息
This commit is contained in:
parent
91edf31223
commit
e383337642
|
@ -13,6 +13,7 @@ export interface HandleApprovalRequestData {
|
||||||
returnAmount: number
|
returnAmount: number
|
||||||
auditImages: string
|
auditImages: string
|
||||||
auditRemark: string
|
auditRemark: string
|
||||||
|
userid: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SearchApiReturnApprovalQuery {
|
export interface SearchApiReturnApprovalQuery {
|
||||||
|
@ -69,6 +70,8 @@ export interface ReturnApprovalEntity {
|
||||||
name: string
|
name: string
|
||||||
/** 是否内部用户(0否 1汇邦云用户 2企业微信用户) */
|
/** 是否内部用户(0否 1汇邦云用户 2企业微信用户) */
|
||||||
isInternal: number
|
isInternal: number
|
||||||
|
/** 审核人姓名 */
|
||||||
|
auditName: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export type SubmitApprovalResponseData = ApiResponseMsgData<{
|
export type SubmitApprovalResponseData = ApiResponseMsgData<{
|
||||||
|
|
|
@ -1,25 +1,27 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
import { showConfirmDialog, showSuccessToast, showFailToast, showToast, UploaderFileListItem, Popup, Picker } from 'vant'
|
import { showConfirmDialog, showSuccessToast, showFailToast, showToast, UploaderFileListItem, Popup, Picker } from 'vant'
|
||||||
|
|
||||||
import axios from "axios"
|
import axios from "axios"
|
||||||
import { handleApprovalApi } from '@/common/apis/approval'
|
import { handleApprovalApi } from '@/common/apis/approval'
|
||||||
import { openCabinetApi } from '@/common/apis/shop'
|
import { openCabinetApi } from '@/common/apis/shop'
|
||||||
import type { HandleApprovalRequestData } from '@/common/apis/approval/type'
|
import type { HandleApprovalRequestData } from '@/common/apis/approval/type'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
import { useApprovalStore } from '@/pinia/stores/approval'
|
import { useApprovalStore } from '@/pinia/stores/approval'
|
||||||
|
import { useWxStore } from '@/pinia/stores/wx'
|
||||||
|
|
||||||
const { VITE_APP_BASE_API } = import.meta.env;
|
const { VITE_APP_BASE_API } = import.meta.env;
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const approvalStore = useApprovalStore()
|
const approvalStore = useApprovalStore();
|
||||||
|
const wxStore = useWxStore();
|
||||||
|
|
||||||
const formData = ref<HandleApprovalRequestData>({
|
const formData = ref<HandleApprovalRequestData>({
|
||||||
approvalId: approvalStore.currentApproval?.approvalId || 0,
|
approvalId: approvalStore.currentApproval?.approvalId || 0,
|
||||||
status: 2,
|
status: 2,
|
||||||
returnAmount: approvalStore.currentApproval?.goodsPrice || 0,
|
returnAmount: approvalStore.currentApproval?.goodsPrice || 0,
|
||||||
auditImages: '',
|
auditImages: '',
|
||||||
auditRemark: ''
|
auditRemark: '',
|
||||||
|
userid: wxStore.userid
|
||||||
})
|
})
|
||||||
|
|
||||||
const submitting = ref(false)
|
const submitting = ref(false)
|
||||||
|
@ -186,6 +188,7 @@ const handleSubmit = async () => {
|
||||||
|
|
||||||
submitting.value = true
|
submitting.value = true
|
||||||
try {
|
try {
|
||||||
|
formData.value.userid = wxStore.userid;
|
||||||
const { code, msg } = await handleApprovalApi(formData.value)
|
const { code, msg } = await handleApprovalApi(formData.value)
|
||||||
|
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
|
@ -232,6 +235,7 @@ const handleSubmit = async () => {
|
||||||
<van-cell title="商品单价" :value="`¥${approvalStore.currentApproval?.goodsPrice}`" />
|
<van-cell title="商品单价" :value="`¥${approvalStore.currentApproval?.goodsPrice}`" />
|
||||||
<van-cell title="当前状态" :value="statusMap[approvalStore.currentApproval?.status || 1]" />
|
<van-cell title="当前状态" :value="statusMap[approvalStore.currentApproval?.status || 1]" />
|
||||||
<van-cell title="退还说明" :value="approvalStore.currentApproval?.returnRemark" />
|
<van-cell title="退还说明" :value="approvalStore.currentApproval?.returnRemark" />
|
||||||
|
<van-cell title="审批人" :value="approvalStore.currentApproval?.auditName" />
|
||||||
</van-cell-group>
|
</van-cell-group>
|
||||||
|
|
||||||
<van-cell-group class="image-section">
|
<van-cell-group class="image-section">
|
||||||
|
|
Loading…
Reference in New Issue