diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index e495a235..255606ea 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -283,7 +283,7 @@
新增
-
+
子项目名称
@@ -559,25 +559,25 @@ const fieldHasAlterInRow = (fieldName, row) => {
const deptList = ref([]) // 树形结构
const userList = ref([]) // 用户列表
-const userSelectList = ref([])
-const userSelectLoading = ref(false)
-
-const remoteUserSearch = (query: string) => {
- if (query) {
- userSelectLoading.value = true
- setTimeout(() => {
- userSelectLoading.value = false
- userSelectList.value = userList.value.filter((item) => {
- return (
- item.nickname.toLowerCase().includes(query.toLowerCase()) ||
- item.username.toLowerCase().includes(query.toLowerCase())
- )
- })
- }, 200)
- } else {
- userSelectList.value = userList.value
- }
-}
+// const userSelectList = ref([])
+// const userSelectLoading = ref(false)
+
+// const remoteUserSearch = (query: string) => {
+// if (query) {
+// userSelectLoading.value = true
+// setTimeout(() => {
+// userSelectLoading.value = false
+// userSelectList.value = userList.value.filter((item) => {
+// return (
+// item.nickname.toLowerCase().includes(query.toLowerCase()) ||
+// item.username.toLowerCase().includes(query.toLowerCase())
+// )
+// })
+// }, 200)
+// } else {
+// userSelectList.value = userList.value
+// }
+// }
const customerList = ref([])
const customerSelectList = ref([])
@@ -646,15 +646,15 @@ const queryData = async (type: string, id?: number) => {
// 加载部门树
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
- // 获得用户列表
- let userParams = {
- pageNo: 1,
- pageSize: 10,
- status: '0'
- }
- const data = await UserApi.getUserPage(userParams)
- userList.value = data.list
- userSelectList.value = data.list
+ // // 获得用户列表
+ // let userParams = {
+ // pageNo: 1,
+ // pageSize: 10,
+ // status: '0'
+ // }
+ // const data = await UserApi.getUserPage(userParams)
+ // userList.value = data.list
+ // userSelectList.value = data.list
// 获得客户列表
let customerParams = {
@@ -666,27 +666,25 @@ const queryData = async (type: string, id?: number) => {
customerList.value = customerData.list
customerSelectList.value = customerData.list
- // 绑定默认部门与业务员
- if (!formData.value.businessMan) {
- formData.value.businessMan = useUserStore().getUser.id // 当前登录的编码
- }
+ // // 绑定默认部门
+
const userProfile = await getUserProfile(formData.value.businessMan)
if (userProfile.dept) {
formData.value.businessDeptId = userProfile.dept.id
}
- // 判断远程查询中是否存在当前默认人 如无则手动设置
- const hasContainMe = userSelectList.value.some((user) => {
- return user.id == formData.value.businessMan
- })
- if (!hasContainMe) {
- if (userSelectList.value.length == userParams.pageSize) {
- userSelectList.value.splice(userSelectList.value.length - 1, 1, {
- id: userProfile.id,
- username: userProfile.username,
- nickname: userProfile.nickname
- })
- }
- }
+ // // 判断远程查询中是否存在当前默认人 如无则手动设置
+ // const hasContainMe = userSelectList.value.some((user) => {
+ // return user.id == formData.value.businessMan
+ // })
+ // if (!hasContainMe) {
+ // if (userSelectList.value.length == userParams.pageSize) {
+ // userSelectList.value.splice(userSelectList.value.length - 1, 1, {
+ // id: userProfile.id,
+ // username: userProfile.username,
+ // nickname: userProfile.nickname
+ // })
+ // }
+ // }
} finally {
formLoading.value = false
}
@@ -945,6 +943,10 @@ onMounted(() => {
detailDisabled.value = true
}
queryData(query.active, query.id)
+ // 绑定默认业务员
+ if (!formData.value.businessMan) {
+ formData.value.businessMan = useUserStore().getUser.id // 当前登录的编码
+ }
})
// 材质传递的值
@@ -983,22 +985,21 @@ a {
} */
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
index 7ab6fbd6..37358187 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
@@ -64,8 +64,8 @@
-
-
+
+
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
index 124c3879..5920b52b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
@@ -106,7 +106,7 @@
-
+
@@ -127,7 +127,7 @@
{{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
-
+
{{ userList.find((user) => user.id === scope.row.creator)?.nickname }}