pull

pages/oldrenovation/overhead/overhead.vue

@@ -723,9 +723,9 @@
 						this.$modal.msg("请选择小区")
 						return
 					}
-					// else if (this.isEmpty(this.LDValue.id)) {
-					// 	this.$modal.msg("请选择楼栋")
-					// } 
+					else if (this.isEmpty(this.LDValue.id)) {
+						this.$modal.msg("请选择楼栋")
+					} 
 
 
 					if (this.objValue.enginClassValue == '回填' && this.isEmpty(this.BackfillingTime)) {
@@ -764,14 +764,23 @@
 
 				onsubmit() {
 
-
+					let unitId = '';
+					let houseId = '';
+					let buildingId = '';
+					if (this.isEmpty(this.DYValue.id)) {
+						unitId = '';
+					} else {
+						unitId = this.DYValue.id
+					}
 					//提交
 					let param = {
 						district: this.XZQValue.dictValue,
 						areaId: this.XQValue.id,
 						buildingId: this.LDValue.id,
+						unitId: unitId,
+						houseId: houseId, //传空
 
-						enginType: this.objValue.enginType, //写死 上一页面传过来的 
+						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						enginCycle: this.projectValue.dictValue, //工程周期
 						zEngineeringNodeBo: {
@@ -821,17 +830,31 @@
 						this.$modal.msg("请选择小区")
 					} else if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg("请选择楼栋")
-					} else if (this.isEmpty(this.DYValue.id)) {
-						this.$modal.msg("请选择单元")
-					} else if (this.isEmpty(this.FJValue.id)) {
-						this.$modal.msg("请选择房间")
-					} else {
+					}
+					//  else if (this.isEmpty(this.DYValue.id)) {
+					// 	this.$modal.msg("请选择单元")
+					// } 
+					// else if (this.isEmpty(this.FJValue.id)) {
+					// 	this.$modal.msg("请选择房间")
+					// } 
+					else {
+						
+						let unitId = '';
+						let houseId = '';
+						if (this.isEmpty(this.DYValue.id)) {
+							unitId = '';
+						} else {
+							unitId = this.DYValue.id
+						}
+						
 						let param = {
 							areaId: this.XQValue.id, // 小区id
 							buildingId: this.LDValue.id, // 楼宇id
-							unitId: this.DYValue.id, // 单元id
-							houseId: this.FJValue.id, // 房间id
-							enginCycle: this.projectValue.dictValue // 工程周期
+							unitId: unitId, // 单元id
+							houseId: houseId, // 房间id
+							enginCycle: this.projectValue.dictValue ,// 工程周期
+							enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
+							enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						}
 						getRoomProjectId(param).then(res => {