Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue

@@ -282,6 +282,7 @@ import { getOperateLogPage } from '@/api/system/operatelog'
 import UserSelect from '@/views/biz/hlvuestyle/userSelect.vue'
 import EquipSelect from '@/views/biz/hlvuestyle/equipSelect.vue'
 import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
+import * as WorkshopApi from '@/api/biz/workshop'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { query } = useRoute()
@@ -406,6 +407,12 @@ onMounted(async () => {
   //车间计划
   var workshop = await PlanApi.getPlanWorkshopListByProjectPlanId(formData.value.id)
   formData.value.planWorkshops = workshop
+
+  formData.value.planWorkshops.forEach(async item => {
+   const initiaworkshop = await WorkshopApi.getWorkshop(item.workshopId)
+   item.leaderUserName=initiaworkshop.leaderUserName
+  })
+
 })
 
 // 计划编制人
@@ -428,7 +435,7 @@ const handleSelectedUser9 = (currentIndex, newValue: any) => {
 //车间
 //接收车间传递的数据
 const handleSelectedWorkshop = (currentIndex, newValue: any) => {
-  console.log('接收车间对应的数据:', newValue, currentIndex)
+  // console.log('接收车间对应的数据:', newValue, currentIndex)
   formData.value.planWorkshops[currentIndex].workshopId = newValue?.id
   formData.value.planWorkshops[currentIndex].leaderUserName = newValue?.leaderUserName
   formData.value.planWorkshops[currentIndex].leaderUserId = newValue?.leaderUserId