From c9b67d9683d8ac1a42014f23f96e98039bce5fd8 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Fri, 26 Jun 2026 15:36:48 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E5=93=81=E3=80=81?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E5=A4=87=E4=BB=B6-=E7=BB=8F?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=BA=E9=BB=98=E8=AE=A4=E5=B8=A6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/materialInbound/create.vue          |  2 +
 .../pages/materialOutbound/create.vue         |  3 +-
 .../pages/productInbound/create.vue           |  2 +
 .../pages/productOutbound/create.vue          |  2 +
 .../pages/sparepartInbound/create.vue         |  2 +
 .../pages/sparepartOutbound/create.vue        |  2 +
 src/utils/currentUser.ts                      | 39 +++++++++++++++++++
 7 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/currentUser.ts

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 } })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages_function/pages/productInbound/create.vue b/src/pages_function/pages/productInbound/create.vue
index 68cc47a..2bee950 100644
--- a/src/pages_function/pages/productInbound/create.vue
+++ b/src/pages_function/pages/productInbound/create.vue
@@ -143,6 +143,7 @@ import { onShow } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
 import NavBar from '@/components/common/NavBar.vue'
 import { createProductInbound } from '@/api/mes/productInbound'
+import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
 
 const { t } = useI18n()
 const itemList = ref([])
@@ -319,6 +320,7 @@ async function handleSubmit() {
 onShow(() => {
   const items = getApp().globalData?._productInboundItems
   if (Array.isArray(items)) itemList.value = [...items]
+  setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
   const userResult = getApp().globalData?._productInboundUserSelectResult
   if (userResult) {
     selectedOperatorId.value = userResult.user.id
diff --git a/src/pages_function/pages/productOutbound/create.vue b/src/pages_function/pages/productOutbound/create.vue
index 9124ff5..0eb1032 100644
--- a/src/pages_function/pages/productOutbound/create.vue
+++ b/src/pages_function/pages/productOutbound/create.vue
@@ -143,6 +143,7 @@ import { onShow } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
 import NavBar from '@/components/common/NavBar.vue'
 import { createProductOutbound } from '@/api/mes/productOutbound'
+import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
 
 const { t } = useI18n()
 const itemList = ref([])
@@ -327,6 +328,7 @@ async function handleSubmit() {
 onShow(() => {
   const items = getApp().globalData?._productOutboundItems
   if (Array.isArray(items)) itemList.value = [...items]
+  setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
   const userResult = getApp().globalData?._productOutboundUserSelectResult
   if (userResult) {
     selectedOperatorId.value = userResult.user.id
diff --git a/src/pages_function/pages/sparepartInbound/create.vue b/src/pages_function/pages/sparepartInbound/create.vue
index 12a6203..412fe63 100644
--- a/src/pages_function/pages/sparepartInbound/create.vue
+++ b/src/pages_function/pages/sparepartInbound/create.vue
@@ -145,6 +145,7 @@ import { useI18n } from 'vue-i18n'
 import NavBar from '@/components/common/NavBar.vue'
 import { createSparepartInbound } from '@/api/mes/sparepartInbound'
 import { getSparepartDetail } from '@/api/mes/sparepart'
+import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
 
 const { t } = useI18n()
 
@@ -396,6 +397,7 @@ onShow(() => {
   if (Array.isArray(items)) {
     itemList.value = [...items]
   }
+  setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
   // 读取用户选择页返回的经办人
   const userResult = getApp().globalData?._sparepartInboundUserSelectResult
   if (userResult) {
diff --git a/src/pages_function/pages/sparepartOutbound/create.vue b/src/pages_function/pages/sparepartOutbound/create.vue
index caee599..005bcc6 100644
--- a/src/pages_function/pages/sparepartOutbound/create.vue
+++ b/src/pages_function/pages/sparepartOutbound/create.vue
@@ -145,6 +145,7 @@ import { useI18n } from 'vue-i18n'
 import NavBar from '@/components/common/NavBar.vue'
 import { createSparepartOutbound } from '@/api/mes/sparepartOutbound'
 import { getSparepartDetail } from '@/api/mes/sparepart'
+import { setDefaultOperatorFromCurrentUser } from '@/utils/currentUser'
 
 const { t } = useI18n()
 
@@ -270,6 +271,7 @@ onReady(() => { focusKeywordNoKeyboard() })
 onShow(() => {
   const items = getApp().globalData?._sparepartOutboundItems
   if (Array.isArray(items)) itemList.value = [...items]
+  setDefaultOperatorFromCurrentUser(selectedOperatorId, selectedOperatorName)
   const userResult = getApp().globalData?._sparepartOutboundUserSelectResult
   if (userResult) {
     selectedOperatorId.value = userResult.user.id
diff --git a/src/utils/currentUser.ts b/src/utils/currentUser.ts
new file mode 100644
index 0000000..90262c3
--- /dev/null
+++ b/src/utils/currentUser.ts
@@ -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;
+}