style:产品、物料、备件-经办人默认带入

master
黄伟杰 7 days ago
parent 55fbdf7ecd
commit c9b67d9683

@ -144,6 +144,7 @@ import { onReady, onShow } from '@dcloudio/uni-app'
import NavBar from '@/components/common/NavBar.vue' import NavBar from '@/components/common/NavBar.vue'
import { createMaterialInbound } from '@/api/mes/materialInbound' import { createMaterialInbound } from '@/api/mes/materialInbound'
import { getProductDetail } from '@/api/mes/sparepart' import { getProductDetail } from '@/api/mes/sparepart'
import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
const itemList = ref([]) const itemList = ref([])
const scanCodeInput = ref('') const scanCodeInput = ref('')
@ -233,6 +234,7 @@ onReady(() => { focusKeywordNoKeyboard() })
onShow(() => { onShow(() => {
const items = getApp().globalData?._materialInboundItems const items = getApp().globalData?._materialInboundItems
if (Array.isArray(items)) itemList.value = [...items] if (Array.isArray(items)) itemList.value = [...items]
setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
const userResult = getApp().globalData?._materialInboundUserSelectResult 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 } if (userResult) { selectedOperatorId.value = userResult.user.id; selectedOperatorName.value = userResult.user.nickname || userResult.user.userName || userResult.user.name || ''; getApp().globalData._materialInboundUserSelectResult = null }
}) })

@ -42,6 +42,7 @@ import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue' import NavBar from '@/components/common/NavBar.vue'
import { createMaterialOutbound } from '@/api/mes/materialOutbound' import { createMaterialOutbound } from '@/api/mes/materialOutbound'
import { getProductDetail } from '@/api/mes/sparepart' import { getProductDetail } from '@/api/mes/sparepart'
import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
const { t } = useI18n() const { t } = useI18n()
const itemList = ref([]); const outboundDate = ref(formatDate(new Date())) 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' }) } 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() }) 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 } })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -143,6 +143,7 @@ import { onShow } from '@dcloudio/uni-app'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue' import NavBar from '@/components/common/NavBar.vue'
import { createProductInbound } from '@/api/mes/productInbound' import { createProductInbound } from '@/api/mes/productInbound'
import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
const { t } = useI18n() const { t } = useI18n()
const itemList = ref([]) const itemList = ref([])
@ -319,6 +320,7 @@ async function handleSubmit() {
onShow(() => { onShow(() => {
const items = getApp().globalData?._productInboundItems const items = getApp().globalData?._productInboundItems
if (Array.isArray(items)) itemList.value = [...items] if (Array.isArray(items)) itemList.value = [...items]
setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
const userResult = getApp().globalData?._productInboundUserSelectResult const userResult = getApp().globalData?._productInboundUserSelectResult
if (userResult) { if (userResult) {
selectedOperatorId.value = userResult.user.id selectedOperatorId.value = userResult.user.id

@ -143,6 +143,7 @@ import { onShow } from '@dcloudio/uni-app'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue' import NavBar from '@/components/common/NavBar.vue'
import { createProductOutbound } from '@/api/mes/productOutbound' import { createProductOutbound } from '@/api/mes/productOutbound'
import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
const { t } = useI18n() const { t } = useI18n()
const itemList = ref([]) const itemList = ref([])
@ -327,6 +328,7 @@ async function handleSubmit() {
onShow(() => { onShow(() => {
const items = getApp().globalData?._productOutboundItems const items = getApp().globalData?._productOutboundItems
if (Array.isArray(items)) itemList.value = [...items] if (Array.isArray(items)) itemList.value = [...items]
setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
const userResult = getApp().globalData?._productOutboundUserSelectResult const userResult = getApp().globalData?._productOutboundUserSelectResult
if (userResult) { if (userResult) {
selectedOperatorId.value = userResult.user.id selectedOperatorId.value = userResult.user.id

@ -145,6 +145,7 @@ import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue' import NavBar from '@/components/common/NavBar.vue'
import { createSparepartInbound } from '@/api/mes/sparepartInbound' import { createSparepartInbound } from '@/api/mes/sparepartInbound'
import { getSparepartDetail } from '@/api/mes/sparepart' import { getSparepartDetail } from '@/api/mes/sparepart'
import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
const { t } = useI18n() const { t } = useI18n()
@ -396,6 +397,7 @@ onShow(() => {
if (Array.isArray(items)) { if (Array.isArray(items)) {
itemList.value = [...items] itemList.value = [...items]
} }
setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
// //
const userResult = getApp().globalData?._sparepartInboundUserSelectResult const userResult = getApp().globalData?._sparepartInboundUserSelectResult
if (userResult) { if (userResult) {

@ -145,6 +145,7 @@ import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue' import NavBar from '@/components/common/NavBar.vue'
import { createSparepartOutbound } from '@/api/mes/sparepartOutbound' import { createSparepartOutbound } from '@/api/mes/sparepartOutbound'
import { getSparepartDetail } from '@/api/mes/sparepart' import { getSparepartDetail } from '@/api/mes/sparepart'
import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
const { t } = useI18n() const { t } = useI18n()
@ -270,6 +271,7 @@ onReady(() => { focusKeywordNoKeyboard() })
onShow(() => { onShow(() => {
const items = getApp().globalData?._sparepartOutboundItems const items = getApp().globalData?._sparepartOutboundItems
if (Array.isArray(items)) itemList.value = [...items] if (Array.isArray(items)) itemList.value = [...items]
setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
const userResult = getApp().globalData?._sparepartOutboundUserSelectResult const userResult = getApp().globalData?._sparepartOutboundUserSelectResult
if (userResult) { if (userResult) {
selectedOperatorId.value = userResult.user.id selectedOperatorId.value = userResult.user.id

@ -0,0 +1,39 @@
import useUserStore from "@/store/modules/user";
import type { Ref } from "vue";
export function getCurrentUserOption() {
const userStore = useUserStore();
const id = userStore.userId;
if (id === undefined || id === null || id === "") return null;
return {
id,
name: userStore.name || String(id),
};
}
function hasSelectedOperator(selectedOperatorId: Ref<string | number | null | undefined>) {
return selectedOperatorId.value !== undefined && selectedOperatorId.value !== null && selectedOperatorId.value !== "";
}
export async function setDefaultOperatorFromCurrentUser(
selectedOperatorId: Ref<string | number | null | undefined>,
selectedOperatorName: Ref<string>
) {
if (hasSelectedOperator(selectedOperatorId)) return;
const userStore = useUserStore();
let currentUser = getCurrentUserOption();
if (!currentUser) {
try {
await userStore.getInfo();
currentUser = getCurrentUserOption();
} catch (e) {
return;
}
}
if (!currentUser || hasSelectedOperator(selectedOperatorId)) return;
selectedOperatorId.value = currentUser.id;
selectedOperatorName.value = currentUser.name;
}
Loading…
Cancel
Save