From ebccf3485c0d969de37e666d66612cd3164b0b88 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Wed, 9 Apr 2025 16:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=B4=A3=E4=BB=BB=E4=BA=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/plan/edit.vue              | 243 +++++++++---------
 1 file changed, 123 insertions(+), 120 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
index d241a97..e9bb3b6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
@@ -409,7 +409,7 @@ class="!w-265px" v-model="row.startTwoDimDate" type="date" value-format="x"
 class="!w-265px" v-model="row.twoDimDate" type="date" value-format="x"
                           placeholder="2D结束日期" @change="handleDateChange($index, row.startTwoDimDate,row.twoDimDate,'2',row.twoDimOwner,row.id)"/>
                       </el-form-item>
-                    </template> 
+                    </template>
                   </el-table-column>
 				  <el-table-column prop="twoDimNum" label="2D工时" min-width="90px" align="center" />
                   <el-table-column min-width="150" align="center">
@@ -441,7 +441,7 @@ class="!w-265px" v-model="row.startThreeDimDate" type="date" value-format="x"
                         <el-date-picker
 class="!w-265px" v-model="row.threeDimDate" type="date" value-format="x"
                           placeholder="3D结束日期" @change="handleDateChange($index, row.startThreeDimDate,row.threeDimDate,'3',row.threeDimOwner,row.id)"/>
-                      </el-form-item> 
+                      </el-form-item>
                     </template>
                   </el-table-column>
 				  <el-table-column prop="threeDimNum" label="3D工时" min-width="90px" align="center" />
@@ -504,11 +504,11 @@ style="width: 100%" v-model="row.endDate" type="date" value-format="x"
                 <el-table-column min-width="150" label="责任人" align="center">
                   <template #default="{ row, $index }">
                     <el-form-item :prop="`${$index}.owner`" class="mb-0px!">
-                       <el-select style="width: 100%" v-model="row.owner"  clearable @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name!='检验'">
-                          <el-option v-for="dict in userInit1" :key="dict.id"
+                       <el-select style="width: 100%" v-model="row.owner"  clearable filterable  @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name!='检验'&&row.name!='预验收'">
+                          <el-option v-for="dict in mergedArray" :key="dict.id"
                             :label="dict.username+' '+dict.nickname" :value="dict.id" />
                         </el-select>
-                      <el-select style="width: 100%" v-model="row.owner"  clearable @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name=='检验'">
+                      <el-select style="width: 100%" v-model="row.owner"  clearable filterable @update:new-value="handleSelectedUser9($index,$event)" v-if="row.name=='检验'||row.name=='预验收'">
                         <el-option v-for="dict in userInit2" :key="dict.id"
                                    :label="dict.username+' '+dict.nickname" :value="dict.id" />
                       </el-select>
@@ -589,8 +589,8 @@ const dialogVisible = ref(false); // 弹窗的是否展示
 const dialogTitle = ref('设计时间冲突信息窗'); // 弹窗的标题
 const fuzerenId = ref();
 const startTimeOne = ref();
-const endTimeTwo = ref(); 
-const dateThree = ref(); 
+const endTimeTwo = ref();
+const dateThree = ref();
 const formRef = ref() // 表单
 const subFormRef = ref() //子表单 Ref
 
@@ -673,7 +673,7 @@ const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => {
 };
 const parentMethod = async () => {
    // 检查是否超过要求设计日期
-	 
+
 	 let overdueTime = null; // 初始化变量
 	 let projectName = null; // 初始化变量
 	 const isOverdue = dataList.value.projectOrderSubs.some(sub => {
@@ -681,18 +681,18 @@ const parentMethod = async () => {
 	     const isOverdueSub = sub.blankDate > sub.changeEndTime ||
 	                          sub.twoDimDate > sub.changeEndTime ||
 	                          sub.threeDimDate > sub.changeEndTime;
-	     
+
 	     // 如果当前 sub 是超期的，将 sub.changeEndTime 赋值给 overdueTime
 	     if (isOverdueSub) {
 	       overdueTime = sub.changeEndTime;
 		   projectName = sub.projectSubName;
 	     }
-	     
+
 	     return isOverdueSub;
 	    }
-	    return false;   
+	    return false;
 	 });
-	 
+
    /* const isOverdue = dataList.value.projectOrderSubs.some(sub => {
     if (sub.changeEndTime) {
       return sub.blankDate > sub.changeEndTime ||
@@ -721,7 +721,7 @@ const parentMethod = async () => {
    // 直接调用提交方法
    await submitForm();
    // 清空数据
-   dataListShuju.value = [];   
+   dataListShuju.value = [];
 };
 /* const parentMethod = () => {
 //先判断是否超过要求设计日期，超过时给出提醒，不允许插活
@@ -734,7 +734,7 @@ const parentMethod = async () => {
 				message.error("本次插活已经超过要求设计结束日期，无法插活");
 			}
 		}
-		
+
 	}
 	dialogVisible.value = false
 	for(var a= 0;a<dataList.value.projectOrderSubs.length;a++){
@@ -742,22 +742,22 @@ const parentMethod = async () => {
 			 if(dataList.value.projectOrderSubs[a].id == formData.value.projectPlanSubs[b].id){
 				formData.value.projectPlanSubs[b].startBlankDate 	= dataList.value.projectOrderSubs[a].startBlankDate
 				formData.value.projectPlanSubs[b].blankDate			= dataList.value.projectOrderSubs[a].blankDate
-	
+
 				 formData.value.projectPlanSubs[b].startTwoDimDate  = dataList.value.projectOrderSubs[a].startTwoDimDate
 				 formData.value.projectPlanSubs[b].twoDimDate	    = dataList.value.projectOrderSubs[a].twoDimDate
-	
+
 				 formData.value.projectPlanSubs[b].startThreeDimDate= dataList.value.projectOrderSubs[a].startThreeDimDate
 				 formData.value.projectPlanSubs[b].threeDimDate     =dataList.value.projectOrderSubs[a].threeDimDate
 			 }
-	
+
 		 }
 	}
 	//直接调用提交方法
 	submitForm()
 	dataListShuju.value = []; */
-	
-	
-	
+
+
+
 	/* if(formData.value.changeEndTime){
 		if(currentTime.value>formData.value.changeEndTime){
 			message.error("本次插活已经超过要求设计结束日期，无法插活");
@@ -770,16 +770,16 @@ const parentMethod = async () => {
 					 if(dataList.value.projectOrderSubs[a].id == formData.value.projectPlanSubs[b].id){
 						formData.value.projectPlanSubs[b].startBlankDate 	= dataList.value.projectOrderSubs[a].startBlankDate
 						formData.value.projectPlanSubs[b].blankDate			= dataList.value.projectOrderSubs[a].blankDate
-			
+
 						 formData.value.projectPlanSubs[b].startTwoDimDate  = dataList.value.projectOrderSubs[a].startTwoDimDate
 						 formData.value.projectPlanSubs[b].twoDimDate	    = dataList.value.projectOrderSubs[a].twoDimDate
-			
+
 						 formData.value.projectPlanSubs[b].startThreeDimDate= dataList.value.projectOrderSubs[a].startThreeDimDate
 						 formData.value.projectPlanSubs[b].threeDimDate     =dataList.value.projectOrderSubs[a].threeDimDate
 					 }
-			
+
 				 }
-			
+
 			 }
 		}
 	}else{
@@ -791,22 +791,22 @@ const parentMethod = async () => {
 				 if(dataList.value.projectOrderSubs[a].id == formData.value.projectPlanSubs[b].id){
 					formData.value.projectPlanSubs[b].startBlankDate 	= dataList.value.projectOrderSubs[a].startBlankDate
 					formData.value.projectPlanSubs[b].blankDate			= dataList.value.projectOrderSubs[a].blankDate
-		
+
 					 formData.value.projectPlanSubs[b].startTwoDimDate  = dataList.value.projectOrderSubs[a].startTwoDimDate
 					 formData.value.projectPlanSubs[b].twoDimDate	    = dataList.value.projectOrderSubs[a].twoDimDate
-		
+
 					 formData.value.projectPlanSubs[b].startThreeDimDate= dataList.value.projectOrderSubs[a].startThreeDimDate
 					 formData.value.projectPlanSubs[b].threeDimDate     =dataList.value.projectOrderSubs[a].threeDimDate
 				 }
-		
+
 			 }
-		
+
 		 }
 	} */
-	
 
- 
- 
+
+
+
 
 //};
 const clouse = () => {
@@ -832,7 +832,7 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
 		message.error("开始时间必须早于结束时间，否则无法计算设计天数，请检查")
 		return;
 	}
-	
+
 	//调用查询天数的后端接口
 	getSearchRlTs(startBlankDate,blankDate,index,num,ownder);
 
@@ -847,8 +847,8 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
 	  const timeDiff = Math.abs(date2.getTime() - date1.getTime());
 	  const diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
 	  const tianshu = diffDays+1;
-	  
-	  
+
+
 
 
 
@@ -859,8 +859,8 @@ const getSearchRlTs = async(startDateTime:string,endDateTime:string,index:number
 	if(num === "1"){
 			  //调用接口查询检索设计时间是否冲突
 			formData.value.projectPlanSubs[index].blankNum = data;
-			
-	
+
+
 			 // formatDate(startBlankDate,'YYYY-MM-DD')
 			if(ownder){
 				prod.value.projectPlanSubs  = JSON.parse(JSON.stringify(formData.value.projectPlanSubs));
@@ -869,22 +869,22 @@ const getSearchRlTs = async(startDateTime:string,endDateTime:string,index:number
 				fuzerenId.value = ownder;
 				getOwnderList(index)
 			}
-			
+
 			 /* getOwnderList(index,ownder,startBlankDate,blankDate,id) */
-	
-			  
+
+
 	}else if(num === "2"){
 			  //调用接口查询检索设计时间是否冲突
 			  formData.value.projectPlanSubs[index].twoDimNum = data;
-			  
+
 			  if(ownder){
-				prod.value.projectPlanSubs  = JSON.parse(JSON.stringify(formData.value.projectPlanSubs)); 
+				prod.value.projectPlanSubs  = JSON.parse(JSON.stringify(formData.value.projectPlanSubs));
 				startTimeOne.value = formatDate(startDateTime,'YYYY-MM-DD');
 				endTimeTwo.value = formatDate(endDateTime,'YYYY-MM-DD');
 				fuzerenId.value = ownder;
 				getOwnderLists(index)
 			  }
-			  
+
 	}else{
 			  formData.value.projectPlanSubs[index].threeDimNum = data;
 			  if(ownder){
@@ -892,10 +892,10 @@ const getSearchRlTs = async(startDateTime:string,endDateTime:string,index:number
 				startTimeOne.value = formatDate(startDateTime,'YYYY-MM-DD');
 				endTimeTwo.value = formatDate(endDateTime,'YYYY-MM-DD');
 				fuzerenId.value = ownder;
-				getOwnderListss(index)  
+				getOwnderListss(index)
 			  }
-			  
-			  
+
+
 	}
 }
 
@@ -904,7 +904,7 @@ const getOwnderListss = async (index: number) => {
 	prod.value.projectPlanSubs[index].projectPlanId = formData.value.id;
 	prod.value.projectPlanSubs[index].type = 3;
 	dataListShujus.value = [];
-	
+
     const currentRow = prod.value.projectPlanSubs[index];
     dateThree.value = currentRow.threeDimDate;
     const blankOwner = currentRow.threeDimOwner;
@@ -922,10 +922,10 @@ const getOwnderListss = async (index: number) => {
                 datas.threeDimDates = datas.threeDimDate;
 				datas.startThreeDimDate = datalists[0].dates;
                 datas.threeDimDate = datalists[1].dates;
-				
-				
-				
-				
+
+
+
+
                 datas.changeEndTime = formData.value.changeEndTime;
 				datas.projectPlanId = formData.value.id;
 				datas.type = 2;
@@ -934,9 +934,9 @@ const getOwnderListss = async (index: number) => {
                 dataListShuju.value.push(datas);
 				console.log("最新的一次");
 				console.log(dataListShuju.value);
-				dataListShujus.value.push(datas);	
+				dataListShujus.value.push(datas);
                 await processRecursive(i); // 递归调用
-            } 
+            }
         }
     };
 
@@ -966,7 +966,7 @@ const getOwnderListss = async (index: number) => {
     diffDays.value = '1';
     typeNames.value = '1';
 
-   
+
 
     // 递归执行完毕后，执行以下代码
     const datalistss = await PlanSubApi.getOwnderPlanChaHuo(dataListShujus.value)//(formData.value.id, fuzerenId.value, startTimeOne.value, endTimeTwo.value, "", 0, 1, formatDate(dateThree.value, 'YYYY-MM-DD'));
@@ -991,9 +991,9 @@ const getOwnderListss = async (index: number) => {
 				    existingItem.threeDimDates = existingItem.threeDimDate;
 					existingItem.startThreeDimDate = datalists[0].dates;
 				    existingItem.threeDimDate = datalists[1].dates;
-					
 
-					
+
+
 					lastEndTime = datalists[1].dates;
 				    existingItem.changeEndTime = formData.value.changeEndTime;
 				    existingItem.projectPlanId = formData.value.id;
@@ -1001,22 +1001,22 @@ const getOwnderListss = async (index: number) => {
 				    currentTime.value = datalists[1].dates;
 				    dateThree.value = datalists[1].dates;
 				    dataListShuju.value.push(existingItem);
-				    dataListShujus.value.push(existingItem); 
-				}	
+				    dataListShujus.value.push(existingItem);
+				}
 			}
-	        
+
 	    }
 	}
-	 
+
 	 // 显示对话框
 	 if (dataList.value.projectOrderSubs.length > 0) {
 	     dialogVisible.value = true;
 	 }
 };
 /* const getOwnderListss = async (index: number) => {
-	
+
 	//根据行索引获取到编辑行
-	   
+
 	const currentRow = prod.value.projectPlanSubs[index];
 	//获取到负责人ID
 	const blankOwner = currentRow.threeDimOwner;
@@ -1040,7 +1040,7 @@ const getOwnderListss = async (index: number) => {
 		}
 	}
 	for(let a=0;a<dataListShuju.value.length;a++){
-		
+
 		 for(let b=a+1;b<dataListShuju.value.length;b++){
 			if (dataListShuju.value[a] && dataListShuju.value[a].id && dataListShuju.value[b] && dataListShuju.value[b].id &&dataListShuju.value[a].id === dataListShuju.value[b].id) {
 				dataListShuju.value[a].startThreeDimDate = dataListShuju.value[b].startThreeDimDate;
@@ -1050,9 +1050,9 @@ const getOwnderListss = async (index: number) => {
 				// 由于删除了一个元素，需要调整内层循环的索引
 				b--;
 			}
-		} 
+		}
 	}
-	
+
 	 dataList.value.projectOrderSubs  = dataListShuju.value
 	ownerId.value = blankOwner
 	dateOne.value = formatDate(currentRow.startBlankDate,'YYYY-MM-DD')
@@ -1060,11 +1060,11 @@ const getOwnderListss = async (index: number) => {
 	id.value = currentRow.id
 	diffDays.value = '1'
 	typeNames.value = '1'
-	
+
 	if(dataList.value.projectOrderSubs.length>0){
 		dialogVisible.value = true;
-	} 
-	
+	}
+
 
 
 	 // 通知子组件数据已经更新
@@ -1076,7 +1076,7 @@ const getOwnderLists = async (index: number) => {
 	prod.value.projectPlanSubs[index].projectPlanId = formData.value.id;
 	prod.value.projectPlanSubs[index].type = 2;
 	dataListShujus.value = [];
-	
+
     const currentRow = prod.value.projectPlanSubs[index];
     dateThree.value = currentRow.twoDimDate;
     const blankOwner = currentRow.twoDimOwner;
@@ -1090,13 +1090,13 @@ const getOwnderLists = async (index: number) => {
                 const datalists = await PlanSubApi.getOwnderPlanSub(formatDate(currentRow.twoDimDate, 'YYYY-MM-DD'), prod.value.projectPlanSubs[i].twoDimNum);
                 prod.value.projectPlanSubs[i].startTwoDimDate = datalists[0].dates;
                 prod.value.projectPlanSubs[i].twoDimDate = datalists[1].dates;
-				
+
 				datas.startTwoDimDates = datas.startTwoDimDate;
 				datas.twoDimDates = datas.twoDimDate;
-				
+
                 datas.startTwoDimDate = datalists[0].dates;
                 datas.twoDimDate = datalists[1].dates;
-				
+
                 datas.changeEndTime = formData.value.changeEndTime;
 				datas.projectPlanId = formData.value.id;
 				datas.type = 2;
@@ -1104,11 +1104,11 @@ const getOwnderLists = async (index: number) => {
                 dateThree.value = datalists[1].dates;
                 dataListShuju.value.push(datas);
 				dataListShujus.value.push(datas);
-				
-				
-				
+
+
+
                 await processRecursive(i); // 递归调用
-            } 
+            }
         }
     };
 
@@ -1138,7 +1138,7 @@ const getOwnderLists = async (index: number) => {
     diffDays.value = '1';
     typeNames.value = '1';
 
-   
+
 
     // 递归执行完毕后，执行以下代码
     const datalistss = await PlanSubApi.getOwnderPlanChaHuo(dataListShujus.value)//(formData.value.id, fuzerenId.value, startTimeOne.value, endTimeTwo.value, "", 0, 1, formatDate(dateThree.value, 'YYYY-MM-DD'));
@@ -1147,8 +1147,8 @@ const getOwnderLists = async (index: number) => {
         dataListShuju.value.push(datalistss[a]);
 		prods.value.projectPlanSubs.push(datalistss[a]);
 
-    }  
-	
+    }
+
 	let lastEndTime = null;
 	for (let a = 0; a < prods.value.projectPlanSubs.length; a++) {
 	    const prodItem =  { ...prods.value.projectPlanSubs[a]};
@@ -1160,13 +1160,13 @@ const getOwnderLists = async (index: number) => {
 				    const datalists = await PlanSubApi.getOwnderPlanSub(formatDate(queryStartTime, 'YYYY-MM-DD'), prod.value.projectPlanSubs[b].twoDimNum);
 					prod.value.projectPlanSubs[b].startTwoDimDate = datalists[0].dates;
 				    prod.value.projectPlanSubs[b].twoDimDate = datalists[1].dates;
-					
+
 					existingItem.startTwoDimDates = existingItem.startTwoDimDate;
 					existingItem.twoDimDates = existingItem.twoDimDate;
-					
+
 				    existingItem.startTwoDimDate = datalists[0].dates;
 				    existingItem.twoDimDate = datalists[1].dates;
-					
+
 					lastEndTime = datalists[1].dates;
 				    existingItem.changeEndTime = formData.value.changeEndTime;
 				    existingItem.projectPlanId = formData.value.id;
@@ -1174,13 +1174,13 @@ const getOwnderLists = async (index: number) => {
 				    currentTime.value = datalists[1].dates;
 				    dateThree.value = datalists[1].dates;
 				    dataListShuju.value.push(existingItem);
-				    dataListShujus.value.push(existingItem); 
-				}	
+				    dataListShujus.value.push(existingItem);
+				}
 			}
-	        
+
 	    }
 	}
-	
+
 	 // 显示对话框
 	 if (dataList.value.projectOrderSubs.length > 0) {
 	     dialogVisible.value = true;
@@ -1188,7 +1188,7 @@ const getOwnderLists = async (index: number) => {
 };
 /* const getOwnderLists = async (index: number) => {
 
-	  
+
 	const currentRow = prod.value.projectPlanSubs[index];
 	//获取到负责人ID
 	const blankOwner = currentRow.twoDimOwner;
@@ -1210,7 +1210,7 @@ const getOwnderLists = async (index: number) => {
 		}
 	}
 	for(let a=0;a<dataListShuju.value.length;a++){
-		
+
 		 for(let b=a+1;b<dataListShuju.value.length;b++){
 			if (dataListShuju.value[a] && dataListShuju.value[a].id && dataListShuju.value[b] && dataListShuju.value[b].id &&dataListShuju.value[a].id === dataListShuju.value[b].id) {
 				dataListShuju.value[a].startTwoDimDate = dataListShuju.value[b].startTwoDimDate;
@@ -1220,9 +1220,9 @@ const getOwnderLists = async (index: number) => {
 				// 由于删除了一个元素，需要调整内层循环的索引
 				b--;
 			}
-		} 
+		}
 	}
-	
+
 	 dataList.value.projectOrderSubs  = dataListShuju.value
 	ownerId.value = blankOwner
 	dateOne.value = formatDate(currentRow.startBlankDate,'YYYY-MM-DD')
@@ -1230,19 +1230,19 @@ const getOwnderLists = async (index: number) => {
 	id.value = currentRow.id
 	diffDays.value = '1'
 	typeNames.value = '1'
-	
+
 	if(dataList.value.projectOrderSubs.length>0){
 		dialogVisible.value = true;
-	} 
+	}
 } */
 
 
-// 选择毛坯 ,ownder: number,newdateOne: number,newdateTwo: number,newid:number   
+// 选择毛坯 ,ownder: number,newdateOne: number,newdateTwo: number,newid:number
 const getOwnderList = async (index: number) => {
 	prod.value.projectPlanSubs[index].projectPlanId = formData.value.id;
 	prod.value.projectPlanSubs[index].type = 1;
 	dataListShujus.value = [];
-	
+
     const currentRow = prod.value.projectPlanSubs[index];
     dateThree.value = currentRow.blankDate;
     const blankOwner = currentRow.blankOwner;
@@ -1252,17 +1252,17 @@ const getOwnderList = async (index: number) => {
         const datas = { ...prod.value.projectPlanSubs[i] };
 
         if (i !== index && prod.value.projectPlanSubs[i].blankOwner === blankOwner) {
-			
+
              if (isInRange(currentRow.startBlankDate, currentRow.blankDate, prod.value.projectPlanSubs[i].startBlankDate, prod.value.projectPlanSubs[i].blankDate)) {
                 const datalists = await PlanSubApi.getOwnderPlanSub(formatDate(currentRow.blankDate, 'YYYY-MM-DD'), prod.value.projectPlanSubs[i].blankNum);
                 prod.value.projectPlanSubs[i].startBlankDate = datalists[0].dates;
                 prod.value.projectPlanSubs[i].blankDate = datalists[1].dates;
 				datas.startBlankDates = datas.startBlankDate;
 				datas.blankDates = datas.blankDate;
-				
+
                 datas.startBlankDate = datalists[0].dates;
                 datas.blankDate = datalists[1].dates;
-				
+
                 datas.changeEndTime = formData.value.changeEndTime;
 				datas.projectPlanId = formData.value.id
                 currentTime.value = datalists[1].dates;
@@ -1270,11 +1270,11 @@ const getOwnderList = async (index: number) => {
 				datas.type = 1;
                 dataListShuju.value.push(datas);
 				dataListShujus.value.push(datas);
-				
-				
-				
+
+
+
                 await processRecursive(i); // 递归调用
-            } 
+            }
         }
     };
 
@@ -1304,7 +1304,7 @@ const getOwnderList = async (index: number) => {
     diffDays.value = '1';
     typeNames.value = '1';
 
-    
+
 
     // 递归执行完毕后，执行以下代码
     const datalistss = await PlanSubApi.getOwnderPlanChaHuo(dataListShujus.value)//(formData.value.id, fuzerenId.value, startTimeOne.value, endTimeTwo.value, "", 0, 1, formatDate(dateThree.value, 'YYYY-MM-DD'));
@@ -1314,7 +1314,7 @@ const getOwnderList = async (index: number) => {
 		prods.value.projectPlanSubs.push(datalistss[a]);
 
     }
-	 
+
 	let lastEndTime = null;
 	for (let a = 0; a < prods.value.projectPlanSubs.length; a++) {
 	    const prodItem =  { ...prods.value.projectPlanSubs[a]};
@@ -1326,13 +1326,13 @@ const getOwnderList = async (index: number) => {
 					    const datalists = await PlanSubApi.getOwnderPlanSub(formatDate(queryStartTime, 'YYYY-MM-DD'), prod.value.projectPlanSubs[b].blankNum);
 						prod.value.projectPlanSubs[b].startBlankDate = datalists[0].dates;
 					    prod.value.projectPlanSubs[b].blankDate = datalists[1].dates;
-						
+
 						existingItem.startBlankDates = existingItem.startBlankDate;
 						existingItem.blankDates = existingItem.blankDate;
-						
+
 					    existingItem.startBlankDate = datalists[0].dates;
 					    existingItem.blankDate = datalists[1].dates;
-						
+
 						lastEndTime = datalists[1].dates;
 					    existingItem.changeEndTime = formData.value.changeEndTime;
 					    existingItem.projectPlanId = formData.value.id;
@@ -1340,13 +1340,13 @@ const getOwnderList = async (index: number) => {
 					    currentTime.value = datalists[1].dates;
 					    dateThree.value = datalists[1].dates;
 					    dataListShuju.value.push(existingItem);
-					    dataListShujus.value.push(existingItem); 
+					    dataListShujus.value.push(existingItem);
 					}
 			}
-	        
+
 	    }
-	} 
-	 
+	}
+
 	  // 显示对话框
 	  if (dataList.value.projectOrderSubs.length > 0) {
 	      dialogVisible.value = true;
@@ -1355,8 +1355,8 @@ const getOwnderList = async (index: number) => {
 
 
 //选择毛坯 ,ownder: number,newdateOne: number,newdateTwo: number,newid:number
-/* const getOwnderList = async (index: number) => {	
-	
+/* const getOwnderList = async (index: number) => {
+
 	//根据行索引获取到编辑行
 	const currentRow = prod.value.projectPlanSubs[index];
 	dateThree.value = prod.value.projectPlanSubs[index].blankDate;
@@ -1364,9 +1364,9 @@ const getOwnderList = async (index: number) => {
 	const blankOwner = currentRow.blankOwner;
 	for (let i = 0; i < prod.value.projectPlanSubs.length; i++) {
 		const datas = {...prod.value.projectPlanSubs[i] }
-		
+
 		if (i!== index && prod.value.projectPlanSubs[i].blankOwner === blankOwner) {
-			
+
 			if (isInRange(currentRow.startBlankDate,currentRow.blankDate, prod.value.projectPlanSubs[i].startBlankDate,prod.value.projectPlanSubs[i].blankDate)) {
 				const datalists  = await PlanSubApi.getOwnderPlanSub(formatDate(currentRow.blankDate,'YYYY-MM-DD'),prod.value.projectPlanSubs[i].blankNum)
 				prod.value.projectPlanSubs[i].startBlankDate = datalists[0].dates;
@@ -1383,9 +1383,9 @@ const getOwnderList = async (index: number) => {
 		}
 	}
 
-	
+
 	for(let a=0;a<dataListShuju.value.length;a++){
-		
+
 		 for(let b=a+1;b<dataListShuju.value.length;b++){
 			if (dataListShuju.value[a] && dataListShuju.value[a].id && dataListShuju.value[b] && dataListShuju.value[b].id &&dataListShuju.value[a].id === dataListShuju.value[b].id) {
 				dataListShuju.value[a].startBlankDate = dataListShuju.value[b].startBlankDate;
@@ -1395,7 +1395,7 @@ const getOwnderList = async (index: number) => {
 				// 由于删除了一个元素，需要调整内层循环的索引
 				b--;
 			}
-		} 
+		}
 	}
 		//完成后检查其他项目是否存在日期冲突
 	console.log('调用了');
@@ -1403,7 +1403,7 @@ const getOwnderList = async (index: number) => {
 	for(var a=0;a<datalistss.length;a++){
 		dataListShuju.value.push(datalistss[a]);
 	}
-	
+
 	 dataList.value.projectOrderSubs  = dataListShuju.value
 	ownerId.value = blankOwner
 	dateOne.value = formatDate(currentRow.startBlankDate,'YYYY-MM-DD')
@@ -1411,13 +1411,13 @@ const getOwnderList = async (index: number) => {
 	id.value = currentRow.id
 	diffDays.value = '1'
 	typeNames.value = '1'
-  
+
 
 
 
 	if(dataList.value.projectOrderSubs.length>0){
 		dialogVisible.value = true;
-	} 
+	}
 
 
 	 // 通知子组件数据已经更新
@@ -1563,6 +1563,8 @@ const handleInitPlanSub = async () => {
 const userInit = ref()
 const userInit1 = ref()
 const userInit2= ref()
+const userInit3= ref()
+const mergedArray= ref()
 const equipInit = ref()
 const mouldTypeList = ref()
 const customerInit = ref()
@@ -1572,7 +1574,8 @@ onMounted(async () => {
   userInit.value = await UserApi.getDeptName("设计部")
   userInit1.value = await UserApi.getDeptName("生产部")
   userInit2.value = await UserApi.getDeptName("检验部")
-  console.log(userInit2.value)
+  userInit3.value=await UserApi.getDeptName("采购部")
+  mergedArray.value = [...userInit1.value, ...userInit3.value];
   // 模具类型下拉列表数据
   mouldTypeList.value = await MouldTypeApi.getSimpList()
   // 设备信息下拉列表数据