调整

admin/src/views/PlanMngr/PlanModel.vue

@@ -256,7 +256,7 @@
 				<el-button type="primary" @click="PiLiangZhuanFunc(0,null)">
 					全部转换
 				</el-button>
-				<el-button type="primary" @click="PiLiangOpenFunc2()">
+				<el-button type="primary" @click="PiLiangOpenFunc2(0)">
 					批量勾选
 				</el-button>
 			</div>
@@ -612,6 +612,7 @@
 	}
 	let ToPlanType=ref(null)
 	const PiLiangOpenFunc2=(type)=>{ //从原来类型转换为目标类型，记录目标类型
+	 
 		ToPlanType.value=type
 		PiLiangDialogVisible.value=true
 	}
@@ -684,7 +685,9 @@
 				  start_k=i
 			  }
 			  if(start_k !==null && (v.time<=PiliangSelectedEndTime.value+':00' || v.time<=PiliangSelectedEndTime.value)){
-				  if( (v.plan_type_id==SelectedPlanType.value.id && j==0) || v.plan_type_id===ToPlanType.value.id){ //已经选中的同类型也算作数量
+				  if(ToPlanType.value!==0 && ((v.plan_type_id==SelectedPlanType.value.id && j==0) 
+				  //|| v.plan_type_id===ToPlanType.value.id//已经选中的同类型也算作数量（之所以屏蔽这句，是因为只想勾选选定的类型进行转换，已经是目标类型的不做计数）
+				  )){ 
 					  console.log(v.time)
 					  if(count<PiLiangNeedCount.value){
 						 
@@ -695,6 +698,17 @@
 					  }
 					  
 				  }
+				  if(ToPlanType.value===0  && (v.plan_type_id==SelectedPlanType.value.id && j==0)){
+					  if(count<PiLiangNeedCount.value){
+						  console.log(999999999)
+						  timeList.value[i].class = ""
+						  timeList.value[i].type_color =null
+						  timeList.value[i].plan_type_id =null
+						  PlanUseCount.value--
+						  PlanUnuseCount.value++
+						   count++
+					   }
+				  }
 				   
 				  j++
 				  if(j%PiLiangJianGe.value===0){
@@ -704,7 +718,7 @@
 		  })
 		  if(count==PiLiangNeedCount.value){
 			  PlabTypeList.value.forEach((t_v,t_i)=>{//新类型数量增加
-			  	if(ToPlanType.value.id==t_v.id){
+			  	if(ToPlanType.value!==0 && ToPlanType.value.id==t_v.id){
 			  		t_v.count=t_v.count+count
 			  	}
 			  	if(SelectedPlanType.value.id==t_v.id){ //之前的数量减少