修改bug

pages/bottom_leg/bottom_leg.vue

@@ -630,21 +630,16 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-            //
-						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-            this.DYValue = ''; //重置单元数据
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
-
-						// }
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -701,7 +696,10 @@
 					this.open = false;
 
 					if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -874,4 +872,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/oldrenovation/courtyard/courtyard.vue

@@ -618,18 +618,28 @@
 					} else if (e == 'xq') { //小区
 						// if (this.isEmpty(this.XZQValue.dictValue)) {
 						// 	this.$modal.msg('请选择行政区')
-            //
+						//
 						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
+						//根据行政区id获取小区数据
+					
+
+						// getAreaList('').then(res => {
+						// 	this.XQList = res.data;
+						// 	this.open = true;
+						// 	this.selectList = this.XQList;
+						// })
 						// }
+
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -693,7 +703,10 @@
 						this.czggslList[this.SelectIndex].gg.id = this.specificationValue.id
 						this.czggslList[this.SelectIndex].gg.name = this.specificationValue.name
 					} else if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 
@@ -1083,4 +1096,4 @@
 			border-radius: 20rpx;
 			border: 1px solid #d4e3f0;
 		}
-	</style>
+	</style>

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -612,20 +612,16 @@
 						//this.selectList = this.dictOptions;
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-            //
-						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
-						// }
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -684,7 +680,10 @@
 						this.specificationValue = item;
 
 					} else if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 
@@ -1008,4 +1007,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/oldrenovation/indoor/indoor.vue

@@ -927,28 +927,16 @@
 						//this.selectList = this.dictOptions;
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-            //
-						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-            this.DYValue = ''; //重置单元数据
-            this.FJValue = ''; //重置房间数据
-            this.currentResidentsPhoe = [];
-            this.historyName = "";
-            this.houseHeadName = "";
-            this.houseHeadPhone = "";
-            this.houseHeadIDcardNumber = "";
-            this.administrative = "";
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
-
-						// }
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -1032,7 +1020,10 @@
 					} else if (this.type == 'gg') {
 						this.specificationValue = item;
 					} else if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -1936,4 +1927,4 @@
 		// 	min-height: 100upx;
 		// 	line-height: 20px;
 		// }
-	</style>
+	</style>

pages/oldrenovation/overhead/newoverhead.vue

@@ -142,11 +142,13 @@
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
 								<view style="display: flex; justify-content: right; width: 70%;">
-								<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue" maxlength="6"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
-								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
-								<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue" maxlength="1"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
+									<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue"
+										maxlength="6"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
+									<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
+									<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue"
+										maxlength="1"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 								</view>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
@@ -550,21 +552,16 @@
 						//this.selectList = this.dictOptions;
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-            //
-						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-            this.DYValue = ''; //重置单元数据
-
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
-						// }
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -637,7 +634,10 @@
 						this.czggslList[this.SelectIndex].gg.id = this.specificationValue.id
 						this.czggslList[this.SelectIndex].gg.name = this.specificationValue.name
 					} else if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -1018,4 +1018,4 @@
 			border-radius: 20rpx;
 			border: 1px solid #d4e3f0;
 		}
-	</style>
+	</style>

pages/oldrenovation/overhead/overhead.vue

@@ -202,7 +202,9 @@
 					imgArr: [],
 					XQValue: {},
 					XZQValue: {},
-					projectValue: {'dictValue':'0'},
+					projectValue: {
+						'dictValue': '0'
+					},
 					LevelValue: {},
 					isOkValue: '', //分段打压是否合格
 					isOkLabel: '', //分段打压是否合格label
@@ -454,7 +456,7 @@
 
 				pickerShow(e) {
 					this.type = e; //赋值类型
-					 if (e == 'gczq') { //工程周期
+					if (e == 'gczq') { //工程周期
 						this.openDict = true;
 						getDicts("engin_cycle").then(response => {
 							this.dictOptions = response.data;
@@ -472,22 +474,16 @@
 						//this.selectList = this.dictOptions;
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-            //
-						// } else {
-             //根据行政区id获取小区数据
-             this.XQValue = ''; //重置小区数据
-             this.LDValue = ''; //重置楼栋数据
-             this.DYValue = ''; //重置单元数据
-
-             getAreaList('').then(res => {
-               this.XQList = res.data;
-               this.open = true;
-               this.selectList = this.XQList;
-             })
-
-						// }
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -544,8 +540,11 @@
 					// this.address = item.communityName;
 					this.open = false;
 
-					 if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+					if (this.type == 'xq') {
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -867,4 +866,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/open_bolt/open_bolt.vue

@@ -1177,21 +1177,16 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-						//
-						// } else {
-						//根据行政区id获取小区数据
-						this.XQValue = ''; //重置小区数据
-						this.LDValue = ''; //重置楼栋数据
-						this.DYValue = ''; //重置单元数据
-						getAreaList('').then(res => {
-							this.XQList = res.data;
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
 							this.open = true;
 							this.selectList = this.XQList;
-						})
-
-						// }
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -1365,7 +1360,7 @@
 			line-height: 20px;
 		}
 
-	
+
 
 		checkbox .wx-checkbox-input {
 			// border-radius: 50%;

pages/piping_record/piping_record.vue

@@ -339,7 +339,7 @@
 						unitName: this.DYValue.name,
 						type: this.reasonValue.dictValue,
 						remark: this.specificReasonsValue,
-						enginType:this.objValue.enginType
+						enginType: this.objValue.enginType
 
 
 					}
@@ -380,22 +380,16 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						// if (this.isEmpty(this.XZQValue.dictValue)) {
-						// 	this.$modal.msg('请选择行政区')
-            //
-						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-            this.DYValue = ''; //重置单元数据
-            this.FJValue = '';
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
-
-						// }
+						if (this.isEmpty(this.XZQValue.dictValue)) {
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
+						} else {
+							this.open = true;
+							this.selectList = this.XQList;
+						}
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -452,7 +446,10 @@
 					this.open = false;
 
 					if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -572,4 +569,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/surge_tank/surge_tank.vue

@@ -477,8 +477,11 @@
 
 					} else if (e == 'xq') { //小区
 						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
-
+							getAreaList('').then(res => {
+								this.XQList = res.data;
+								this.open = true;
+								this.selectList = this.XQList;
+							})
 						} else {
 							this.open = true;
 							this.selectList = this.XQList;
@@ -531,6 +534,10 @@
 
 
 					if (this.type == 'xq') {
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						if (!this.isEmpty(this.projectValue.dictValue)) {