menchuang 1 year ago
parent
commit
00bd9c12bf
3 changed files with 43 additions and 36 deletions
  1. 19 16
      pages/bottom_leg/bottom_leg.vue
  2. 8 7
      pages/dangerous/dangerous.vue
  3. 16 13
      pages/piping_record/piping_record.vue

+ 19 - 16
pages/bottom_leg/bottom_leg.vue

@@ -94,10 +94,10 @@
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>米 数</text>
 					<!-- style="margin-left: 10px;text-align: right;" -->
-					<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="3"
+					<input class="uni-input" type="number" v-model="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="inputDecimalNumberValue" maxlength="2"
+					<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
 						style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 				</view>
 				<view class="container" style="color: #b2b2b2;">*开挖前照片</view>
@@ -303,7 +303,7 @@
 				handleSubmit(e) {
 					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
 				},
-				
+
 				getStatus() {
 					let buildingId = '';
 					if (this.isEmpty(this.LDValue.id)) {
@@ -320,25 +320,25 @@
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 					}
 					getRoomProjectId(param).then(res => {
-				
+
 						if (res.code == '200') {
-				
+
 							if (res.data != null && res.data.zEngineeringNodeBoList != null) {
-				
+
 								res.data.zEngineeringNodeBoList.forEach((item, index) => {
 									if (this.objValue.enginClassValue == item.type) {
 										this.reviewStatus = item.reviewStatus;
 										if (item.reviewStatus == '1')
 											this.$modal.msg('当前工程已结束')
 									}
-				
+
 								})
-				
-				
+
+
 							} else {
 								this.reviewStatus = '' //置空
 							}
-				
+
 						} else {
 							this.$modal.msg(res.msg)
 							this.reviewStatus = '' //置空
@@ -362,12 +362,14 @@
 						this.$modal.msg("请上传下沟照片")
 					} else if (this.imgArr3.length <= 0) {
 						this.$modal.msg("请上传回填照片")
-					}else {
+					} else {
 						if (this.isEmpty(this.inputDecimalNumberValue)) {
 							this.inputNumberValue = this.inputIntegerNumberValue;
 						} else {
 							this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
 						}
+
+						uni.showLoading()
 						let param = {
 							district: this.XZQValue.dictValue,
 							areaId: this.XQValue.id,
@@ -394,6 +396,7 @@
 						}
 
 						addTearOldPipe(param).then(res => {
+							uni.hideLoading()
 							if (res.code == '200') {
 								uni.showToast({
 									title: res.msg,
@@ -625,23 +628,23 @@
 						this.LDValue = item;
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
-						
+
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 							//选完 判断 工程周期
 							this.getStatus();
-						
+
 						}
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
 						})
 					} else if (this.type == 'dy') {
 						this.DYValue = item;
-						
+
 						if (!this.isEmpty(this.projectValue.dictValue)) {
-						
+
 							//选完 判断 工程周期
 							this.getStatus();
-						
+
 						}
 					}
 

+ 8 - 7
pages/dangerous/dangerous.vue

@@ -483,8 +483,7 @@
 										title: '下载成功'
 									})
 								},
-								fail: error => {
-								}
+								fail: error => {}
 							})
 						}
 					}
@@ -600,7 +599,7 @@
 										_this.$modal.msg(data.msg)
 									} else {
 										if (_this.progress === 100) {
-										
+
 											_this.fileArr.push({
 												'fileName': item
 													.name,
@@ -623,16 +622,16 @@
 							});
 							task.onProgressUpdate(res => {
 								_this.progress = res.progress;
-								
+
 								uni.showLoading({
 									title: '上传中'
 								})
 								if (_this.progress != 100) {
 									_this.loading = false
-								
+
 								} else {
 									_this.loading = true
-									
+
 								}
 							});
 
@@ -643,7 +642,7 @@
 			},
 			isShowRemoveFile(item) {
 				var isShow = item.createBy == this.$user.state.name;
-				
+
 				return isShow;
 			},
 			removeFile(index) {
@@ -782,7 +781,9 @@
 				this.projectObj.enginTime = this.projectTime;
 				this.projectObj.pics = this.fileArr;
 
+				uni.showLoading()
 				updateDangerousWorkProject(this.projectObj).then(res => {
+					uni.hideLoading()
 					this.$modal.msg(res.msg);
 					setTimeout(() => {
 						uni.navigateBack();

+ 16 - 13
pages/piping_record/piping_record.vue

@@ -244,7 +244,7 @@
 				handleSubmit(e) {
 					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
 				},
-				
+
 				getStatus() {
 					let buildingId = '';
 					if (this.isEmpty(this.LDValue.id)) {
@@ -261,25 +261,25 @@
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 					}
 					getRoomProjectId(param).then(res => {
-				
+
 						if (res.code == '200') {
-				
+
 							if (res.data != null && res.data.zEngineeringNodeBoList != null) {
-				
+
 								res.data.zEngineeringNodeBoList.forEach((item, index) => {
 									if (this.objValue.enginClassValue == item.type) {
 										this.reviewStatus = item.reviewStatus;
 										if (item.reviewStatus == '1')
 											this.$modal.msg('当前工程已结束')
 									}
-				
+
 								})
-				
-				
+
+
 							} else {
 								this.reviewStatus = '' //置空
 							}
-				
+
 						} else {
 							this.$modal.msg(res.msg)
 							this.reviewStatus = '' //置空
@@ -350,9 +350,11 @@
 						this.$modal.msg("请选择小区")
 					} else if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg("请选择楼栋")
-					}else if (this.imgArr.length <= 0) {
+					} else if (this.imgArr.length <= 0) {
 						this.$modal.msg("请上传照片")
 					} else {
+
+						uni.showLoading()
 						let param = {
 							district: this.XZQValue.dictValue,
 							areaId: this.XQValue.id,
@@ -373,6 +375,7 @@
 						}
 
 						addTearOldPipe(param).then(res => {
+							uni.hideLoading()
 							if (res.code == '200') {
 								uni.showToast({
 									title: res.msg,
@@ -617,22 +620,22 @@
 						this.LDValue = item;
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
-						
+
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 							//选完 判断 工程周期
 							this.getStatus();
-						
+
 						}
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
 						})
 					} else if (this.type == 'dy') {
 						this.DYValue = item;
-						
+
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 							//选完 判断 工程周期
 							this.getStatus();
-						
+
 						}
 					}
 				},