diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/compositionSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/compositionSelect.vue
index a0b4aea9..0645ca78 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/compositionSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/compositionSelect.vue
@@ -25,7 +25,7 @@ const queryParams = {
description: undefined,
status: undefined,
original: undefined,
- density: undefined,
+ density: undefined
}
const valueName: any = ref() //选中的值
@@ -49,6 +49,7 @@ const gitlist = async () => {
let foundInitialUserInList = false
for (const composition of compositionList.value) {
if (composition.id === initialUser.id) {
+ valueName.value = initialUser.name
foundInitialUserInList = true
break
}
@@ -56,6 +57,7 @@ const gitlist = async () => {
// 如果初始用户不在列表中,则将其添加到列表开头
if (!foundInitialUserInList && !compositionSelectList.value.length) {
compositionList.value.unshift(initialUser)
+ valueName.value = initialUser.name
}
// loading.value = false
}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue
new file mode 100644
index 00000000..1ed44ad8
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue
index a5f900ab..e9e5b68a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue
@@ -15,6 +15,7 @@
供应商
材质
物料
+ 设备
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
index 9973bda9..4b3d3d48 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
@@ -31,6 +31,9 @@
+
+
+
确 定
@@ -53,6 +56,7 @@ import CompositionSelect from '../hlvuestyle/compositionSelect.vue'
import WorkshopSelect from '../hlvuestyle/workshopSelect.vue'
import MaterialSelect from '../hlvuestyle/materialSelect.vue'
import ClassesSelect from '../hlvuestyle/classesSelect.vue'
+import EquipSelect from '../hlvuestyle/equipSelect.vue'
import { defineComponent } from 'vue'
defineOptions({ name: 'SystemDeptForm' })
@@ -73,6 +77,7 @@ const formData: any = ref({
workshopId: undefined,
materialId: undefined,
classesId: undefined,
+ eqyipId:undefined,
status: CommonStatusEnum.ENABLE
})
const formRules = reactive({
@@ -182,4 +187,10 @@ const handleSelectedMaterial = (newValue: any) => {
console.log('接收物料对应的数据:', newValue)
formData.value. materialId = newValue.id
}
+
+//接收设备传递的数据
+const handleSelectedEquip = (newValue: any) => {
+ console.log('接收设备对应的数据:', newValue)
+ formData.value.eqyipId = newValue.id
+}
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 4a130d60..e260e174 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
@@ -85,7 +85,7 @@
-
+
@@ -294,10 +294,15 @@
-
+
+
+
+
+
@@ -322,7 +327,7 @@
材质
-
+
@@ -462,7 +467,8 @@ 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 CompositionSelect from "@/views/heli/hlvuestyle/compositionSelect.vue";
+import CompositionSelect from '@/views/heli/hlvuestyle/compositionSelect.vue'
+import EquipSelect from '@/views/heli/hlvuestyle/equipSelect.vue'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -947,12 +953,19 @@ onMounted(() => {
})
// 材质传递的值
-const handleSelected = (currentIndex: number,newValue: any) => {
+const handleSelectedcomposition = (currentIndex: number, newValue: any) => {
+
formData.value.projectOrderSubs[currentIndex].compositionId = newValue?.id
}
+//职工
const handleSelectedUser = (newValue: any) => {
formData.value.businessMan = newValue?.id
}
+// 设备
+const handleSelectedequip = (currentIndex: number, newValue: any) => {
+ console.log(currentIndex, newValue);
+ formData.value.projectOrderSubs[currentIndex].deviceModel = newValue?.id
+}