From 59d8ae43824bf66d9110a5c597f29ffc93c228c4 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Wed, 28 Feb 2024 09:57:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=96=B0=E5=A2=9E=E6=97=B6=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=91=98=E9=BB=98=E8=AE=A4=E7=99=BB=E5=BD=95=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/heli/projectorder/detail.vue | 121 +++++++++--------- 1 file changed, 61 insertions(+), 60 deletions(-) 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 { } */ From f43c38086eb1b241b9a7d4a679700a497476f947 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Wed, 28 Feb 2024 10:02:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E3=80=91=E5=A4=8D=E9=80=89=E6=A1=86=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - - + + - +