diff --git a/src/pages_function/pages/materialInbound/create.vue b/src/pages_function/pages/materialInbound/create.vue index fba5ae2..74d8c59 100644 --- a/src/pages_function/pages/materialInbound/create.vue +++ b/src/pages_function/pages/materialInbound/create.vue @@ -144,6 +144,7 @@ import { onReady, onShow } from '@dcloudio/uni-app' import NavBar from '@/components/common/NavBar.vue' import { createMaterialInbound } from '@/api/mes/materialInbound' import { getProductDetail } from '@/api/mes/sparepart' +import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser' const itemList = ref([]) const scanCodeInput = ref('') @@ -233,6 +234,7 @@ onReady(() => { focusKeywordNoKeyboard() }) onShow(() => { const items = getApp().globalData?._materialInboundItems if (Array.isArray(items)) itemList.value = [...items] + setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName) const userResult = getApp().globalData?._materialInboundUserSelectResult if (userResult) { selectedOperatorId.value = userResult.user.id; selectedOperatorName.value = userResult.user.nickname || userResult.user.userName || userResult.user.name || ''; getApp().globalData._materialInboundUserSelectResult = null } }) diff --git a/src/pages_function/pages/materialOutbound/create.vue b/src/pages_function/pages/materialOutbound/create.vue index afe64dd..2553e1e 100644 --- a/src/pages_function/pages/materialOutbound/create.vue +++ b/src/pages_function/pages/materialOutbound/create.vue @@ -42,6 +42,7 @@ import { useI18n } from 'vue-i18n' import NavBar from '@/components/common/NavBar.vue' import { createMaterialOutbound } from '@/api/mes/materialOutbound' import { getProductDetail } from '@/api/mes/sparepart' +import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser' const { t } = useI18n() const itemList = ref([]); const outboundDate = ref(formatDate(new Date())) @@ -87,7 +88,7 @@ async function handleSubmit() { catch(e) { uni.hideLoading(); const msg = e?.message||e?.data?.msg||e?.response?.data?.msg||t('functionCommon.saveFailed'); uni.showToast({ title: String(msg).substring(0,50), icon:'none' }) } } onReady(()=>{ focusKeywordNoKeyboard() }) -onShow(()=>{ const its = getApp().globalData?._materialOutboundItems; if (Array.isArray(its)) itemList.value = [...its]; const ur = getApp().globalData?._materialOutboundUserSelectResult; if (ur) { selectedOperatorId.value = ur.user.id; selectedOperatorName.value = ur.user.nickname||ur.user.userName||ur.user.name||''; getApp().globalData._materialOutboundUserSelectResult = null } }) +onShow(()=>{ const its = getApp().globalData?._materialOutboundItems; if (Array.isArray(its)) itemList.value = [...its]; setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName); const ur = getApp().globalData?._materialOutboundUserSelectResult; if (ur) { selectedOperatorId.value = ur.user.id; selectedOperatorName.value = ur.user.nickname||ur.user.userName||ur.user.name||''; getApp().globalData._materialOutboundUserSelectResult = null } })