fix: 统一使用wxStore中的userid替换原有用户id字段
在多个审批相关组件和类型定义中,将分散的用户id字段统一替换为wxStore.userid,确保用户标识的一致性
This commit is contained in:
parent
79cc074bc2
commit
032384cbe8
|
@ -4,6 +4,7 @@ export interface SubmitApprovalRequestData {
|
||||||
returnImages: string
|
returnImages: string
|
||||||
returnRemark: string
|
returnRemark: string
|
||||||
corpid: string
|
corpid: string
|
||||||
|
applyUserid: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface HandleApprovalRequestData {
|
export interface HandleApprovalRequestData {
|
||||||
|
@ -16,6 +17,7 @@ export interface HandleApprovalRequestData {
|
||||||
auditRemark: string
|
auditRemark: string
|
||||||
userid: string
|
userid: string
|
||||||
corpid: string
|
corpid: string
|
||||||
|
auditUserid: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SearchApiReturnApprovalQuery {
|
export interface SearchApiReturnApprovalQuery {
|
||||||
|
@ -55,6 +57,8 @@ export interface ReturnApprovalEntity {
|
||||||
externalApprovalId?: number
|
externalApprovalId?: number
|
||||||
/** 企业微信id */
|
/** 企业微信id */
|
||||||
corpid?: string
|
corpid?: string
|
||||||
|
applyUserid?: string
|
||||||
|
auditUserid?: string
|
||||||
/** 申请数量 */
|
/** 申请数量 */
|
||||||
applyQuantity?: number
|
applyQuantity?: number
|
||||||
/** 审批类型(0为借还柜 1为固资通) */
|
/** 审批类型(0为借还柜 1为固资通) */
|
||||||
|
|
|
@ -28,6 +28,7 @@ const formData = ref<HandleApprovalRequestData>({
|
||||||
auditRemark: '',
|
auditRemark: '',
|
||||||
userid: wxStore.userid,
|
userid: wxStore.userid,
|
||||||
corpid: wxStore.corpid,
|
corpid: wxStore.corpid,
|
||||||
|
auditUserid: wxStore.userid
|
||||||
})
|
})
|
||||||
|
|
||||||
const submitting = ref(false)
|
const submitting = ref(false)
|
||||||
|
@ -169,6 +170,7 @@ onMounted(() => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
...formData.value,
|
...formData.value,
|
||||||
corpid: wxStore.corpid,
|
corpid: wxStore.corpid,
|
||||||
|
auditUserid: wxStore.userid,
|
||||||
status: approvalStore.currentApproval.status,
|
status: approvalStore.currentApproval.status,
|
||||||
returnAmount: approvalStore.currentApproval.returnAmount,
|
returnAmount: approvalStore.currentApproval.returnAmount,
|
||||||
auditRemark: approvalStore.currentApproval.auditRemark,
|
auditRemark: approvalStore.currentApproval.auditRemark,
|
||||||
|
|
|
@ -29,6 +29,7 @@ const formData = ref<HandleApprovalRequestData>({
|
||||||
auditRemark: '',
|
auditRemark: '',
|
||||||
userid: wxStore.userid,
|
userid: wxStore.userid,
|
||||||
corpid: wxStore.corpid,
|
corpid: wxStore.corpid,
|
||||||
|
auditUserid: wxStore.userid
|
||||||
})
|
})
|
||||||
|
|
||||||
const orderGoods = ref<ShopOrderGoodsEntity[]>([]);
|
const orderGoods = ref<ShopOrderGoodsEntity[]>([]);
|
||||||
|
@ -221,6 +222,7 @@ const handleSubmit = async () => {
|
||||||
try {
|
try {
|
||||||
formData.value.userid = wxStore.userid;
|
formData.value.userid = wxStore.userid;
|
||||||
formData.value.corpid = wxStore.corpid;
|
formData.value.corpid = wxStore.corpid;
|
||||||
|
formData.value.auditUserid = wxStore.userid;
|
||||||
const { code, msg } = await handleApprovalApi(formData.value)
|
const { code, msg } = await handleApprovalApi(formData.value)
|
||||||
|
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
|
|
|
@ -21,6 +21,7 @@ const formData = ref<SubmitApprovalRequestData>({
|
||||||
returnImages: '',
|
returnImages: '',
|
||||||
returnRemark: '',
|
returnRemark: '',
|
||||||
corpid: wxStore.corpid,
|
corpid: wxStore.corpid,
|
||||||
|
applyUserid: wxStore.userid,
|
||||||
})
|
})
|
||||||
|
|
||||||
watch(() => route.query.orderGoodsId, (newVal) => {
|
watch(() => route.query.orderGoodsId, (newVal) => {
|
||||||
|
@ -120,6 +121,7 @@ const handleSubmit = async () => {
|
||||||
try {
|
try {
|
||||||
formData.value.returnImages = fileList.value.map(item => item.url).join(',');
|
formData.value.returnImages = fileList.value.map(item => item.url).join(',');
|
||||||
formData.value.corpid = wxStore.corpid;
|
formData.value.corpid = wxStore.corpid;
|
||||||
|
formData.value.applyUserid = wxStore.userid;
|
||||||
|
|
||||||
const { code, data } = await submitApprovalApi(formData.value)
|
const { code, data } = await submitApprovalApi(formData.value)
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ async function handleSubmit() {
|
||||||
mobile: tel.value,
|
mobile: tel.value,
|
||||||
name: isInternal === 2 ? qyName.value : name.value,
|
name: isInternal === 2 ? qyName.value : name.value,
|
||||||
applyRemark: applyRemark.value,
|
applyRemark: applyRemark.value,
|
||||||
qyUserid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
|
qyUserid: wxStore.userid,
|
||||||
isInternal: isInternal
|
isInternal: isInternal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue