zhanghongrui пре 9 месеци
родитељ
комит
d3f7c1976a

+ 7 - 1
pages/oldrenovation/indoor/indoor.vue

@@ -1256,6 +1256,12 @@
 								this.$modal.msg('现住人电话不能为空')
 								throw new Error('End Loop')
 							}
+							if (list.phone.length == 11 || list.phone.length == 8) {
+							}else{
+								this.$modal.msg('现住人电话填写错误')
+								throw new Error('End Loop')
+							}
+
 						})
 					} catch (e) {
 						if (e.message === 'End Loop') throw e
@@ -1271,7 +1277,7 @@
 						// if (this.isEmpty(this.LevelValue.id)) {
 						// 	this.$modal.msg("请选择孔距") //打孔  判断孔距
 						// } else {
-							this.onsubmit();
+						this.onsubmit();
 						//}
 					} else if (this.objValue.enginClassValue == '拆旧管') {
 

+ 4 - 4
pages/statistics/historyDetailsCourtyard.vue

@@ -1230,10 +1230,10 @@
 							}
 						})
 
-						if (res.constructionRecords.length <= 0) {
-							this.$modal.msg('请上传管道施工记录照片')
-							isSubmit = false;
-						}
+						// if (res.constructionRecords.length <= 0) {
+						// 	this.$modal.msg('请上传管道施工记录照片')
+						// 	isSubmit = false;
+						// }
 						if (res.ductalEpithelium.length <= 0) {
 							this.$modal.msg('请上传管上皮深度测量照片')
 							isSubmit = false;

+ 10 - 1
pages/statistics/statistics.vue

@@ -2001,9 +2001,18 @@
 
 					}
 				} else if (e == 'cz') {
+					
 					this.open = true;
 					getEnginMaterialQualityList("民用工程").then(response => {
-						this.selectList = response.data;
+						let list = response.data;
+						let mList = [];
+						list.forEach((item, index) => {
+							mList.push({
+								name: (item.enginSortName !=null ? item.name +'-' +item.enginSortName + item.enginNodeName:item.name),
+								id: item.id
+							})
+						})
+						this.selectList = mList;
 					});
 				}
 			},