refactor(approval): 修改审批状态默认值并优化用户类型判断逻辑

将审批处理页面的默认状态值从1改为2,以符合业务需求。同时,在结账组件中优化用户类型判断逻辑,使用新增的corpidLogin变量替代corpid.value的判断,提高代码可读性和维护性。
This commit is contained in:
dzq 2025-04-12 16:08:46 +08:00
parent 1582ca6f2f
commit 349bc2a65f
3 changed files with 9 additions and 6 deletions

View File

@ -29,7 +29,7 @@ const approvalStore = useApprovalStore()
const formData = ref<HandleApprovalRequestData>({ const formData = ref<HandleApprovalRequestData>({
approvalId: approvalStore.currentApproval?.approvalId || 0, approvalId: approvalStore.currentApproval?.approvalId || 0,
status: 1, status: 2,
returnAmount: 0, returnAmount: 0,
auditImages: '', auditImages: '',
auditRemark: '' auditRemark: ''

View File

@ -14,7 +14,7 @@ const cartStore = useCartStore()
const { cartItems, totalPrice } = storeToRefs(cartStore) const { cartItems, totalPrice } = storeToRefs(cartStore)
const wxStore = useWxStore() const wxStore = useWxStore()
const { openid, balance, corpid, userid: qyUserid } = storeToRefs(wxStore) const { openid, balance, corpid, corpidLogin, userid: qyUserid } = storeToRefs(wxStore)
const ab98UserStore = useAb98UserStore() const ab98UserStore = useAb98UserStore()
const { tel, userid: ab98Userid } = storeToRefs(ab98UserStore) const { tel, userid: ab98Userid } = storeToRefs(ab98UserStore)
@ -77,10 +77,10 @@ async function handleSubmit() {
submitting.value = true submitting.value = true
try { try {
// //
// 2 - corpid // 2 -
// 1 - qyUserid // 1 -
// 0 - // 0 -
const isInternal = corpid.value ? 2 : qyUserid.value ? 1 : 0; const isInternal = corpidLogin ? 2 : ab98Userid.value ? 1 : 0;
const requestData: SubmitOrderRequestData = { const requestData: SubmitOrderRequestData = {
openid: openid.value, openid: openid.value,
userid: wxStore.userid, userid: wxStore.userid,

View File

@ -15,6 +15,8 @@ export const useWxStore = defineStore("wx", () => {
const balance = ref<number>(0); const balance = ref<number>(0);
// 企业id // 企业id
const corpid = ref<string>(""); const corpid = ref<string>("");
// 是否企业微信登录
const corpidLogin = ref<boolean>(false);
// 是否是柜子管理员 // 是否是柜子管理员
const isCabinetAdmin = ref<boolean>(false); const isCabinetAdmin = ref<boolean>(false);
@ -37,6 +39,7 @@ export const useWxStore = defineStore("wx", () => {
code.value = params.code code.value = params.code
state.value = params.state || state.value state.value = params.state || state.value
corpid.value = params.corpid || corpid.value corpid.value = params.corpid || corpid.value
corpidLogin.value = !!corpid.value;
try { try {
if (!corpid.value) { if (!corpid.value) {
@ -82,7 +85,7 @@ export const useWxStore = defineStore("wx", () => {
} }
} }
return { code, state, openid, corpid, userid, balance, isCabinetAdmin, return { code, state, openid, corpid, userid, balance, isCabinetAdmin, corpidLogin,
setOpenid, setBalance, handleWxCallback, setIsCabinetAdmin } setOpenid, setBalance, handleWxCallback, setIsCabinetAdmin }
}) })