diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts
index e1826525..cdee2490 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts
@@ -5,6 +5,7 @@ export interface CustomerVO {
code: string
brief: string
name: string
+ briefOrName:string
industry: string
level: number
userId: string
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
index 648e194f..b89e5e28 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
@@ -1,77 +1,117 @@
-
-
+
+
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 255606ea..d3468fa4 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
@@ -135,9 +135,10 @@
-
+
+
@@ -408,7 +409,7 @@
-
+
{{ getDictLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, scope.row.type) }}
@@ -466,9 +467,10 @@ import download from '@/utils/download'
import { useUserStore } from '@/store/modules/user'
import { getUserProfile } from '@/api/system/user/profile'
import { getOperateLogPage } from '@/api/system/operatelog'
-import UserSelect from '../hlvuestyle/userSelect.vue'
+import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
import CompositionSelect from '@/views/heli/hlvuestyle/compositionSelect.vue'
import EquipSelect from '@/views/heli/hlvuestyle/equipSelect.vue'
+import ClientSelect from '@/views/heli/hlvuestyle/clientSelect.vue'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -558,45 +560,26 @@ const fieldHasAlterInRow = (fieldName, row) => {
}
const deptList = ref([]) // 树形结构
-const userList = ref([]) // 用户列表
-// const userSelectList = ref([])
-// const userSelectLoading = ref(false)
+// const userList = ref([]) // 用户列表
+
+// const customerList = ref([])
+// const customerSelectList = ref([])
+// const customerSelectLoading = ref(false)
-// const remoteUserSearch = (query: string) => {
+// const remoteCustomerSearch = (query: string) => {
// if (query) {
-// userSelectLoading.value = true
+// customerSelectLoading.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())
-// )
+// customerSelectLoading.value = false
+// customerSelectList.value = customerList.value.filter((item) => {
+// return item.name.toLowerCase().includes(query.toLowerCase())
// })
// }, 200)
// } else {
-// userSelectList.value = userList.value
+// customerSelectList.value = customerList.value
// }
// }
-const customerList = ref([])
-const customerSelectList = ref([])
-const customerSelectLoading = ref(false)
-
-const remoteCustomerSearch = (query: string) => {
- if (query) {
- customerSelectLoading.value = true
- setTimeout(() => {
- customerSelectLoading.value = false
- customerSelectList.value = customerList.value.filter((item) => {
- return item.name.toLowerCase().includes(query.toLowerCase())
- })
- }, 200)
- } else {
- customerSelectList.value = customerList.value
- }
-}
-
/** 子表的表单 */
const projectOrderSubFormRef = ref()
@@ -610,6 +593,7 @@ const queryData = async (type: string, id?: number) => {
try {
if (id) {
formData.value = await ProjectOrderApi.getProjectOrder(id)
+
if (formData.value.hasAlter == 1) {
alterDisabled.value = true
@@ -645,46 +629,23 @@ const queryData = async (type: string, id?: number) => {
}
// 加载部门树
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
-
- // // 获得用户列表
- // let userParams = {
+ // 获得客户列表
+ // let customerParams = {
// pageNo: 1,
// pageSize: 10,
- // status: '0'
+ // status: '1'
// }
- // const data = await UserApi.getUserPage(userParams)
- // userList.value = data.list
- // userSelectList.value = data.list
-
- // 获得客户列表
- let customerParams = {
- pageNo: 1,
- pageSize: 10,
- status: '1'
- }
- const customerData = await CustomerApi.getCustomerPage(customerParams)
- customerList.value = customerData.list
- customerSelectList.value = customerData.list
+ // const customerData = await CustomerApi.getCustomerPage(customerParams)
+ // customerList.value = customerData.list
+ // customerSelectList.value = customerData.list
// // 绑定默认部门
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
- // })
- // }
- // }
} finally {
formLoading.value = false
}
@@ -959,9 +920,14 @@ const handleSelectedUser = (newValue: any) => {
}
// 设备
const handleSelectedequip = (currentIndex: number, newValue: any) => {
- console.log(currentIndex, newValue)
+ // console.log(currentIndex, newValue)
formData.value.projectOrderSubs[currentIndex].deviceModel = newValue?.id
}
+//客户
+const handleSelectedClient = (newValue: any) => {
+ console.log(newValue)
+ formData.value.customerId = newValue?.id
+}