1

api/common.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 底腿获取暂存(最新)
+export function getLowerStaging(param) {
+	return request({
+		'url': '/zdsz/engineeringCivil/lowerStaging',
+		'method': 'get',
+		'data': param
+	})
+}
 // 工业工程修改(最新)
 export function PutengineeringNew(engineering) {
 	return request({
@@ -27,7 +35,7 @@ export function getEngineeringDetailsNew(id) {
 	})
 }
 // 工业工程  根据工程类型查询工程列表
-export function getengineeringNameListNew(enginType,enginClassification) {
+export function getengineeringNameListNew(enginType, enginClassification) {
 	const data = {
 
 		enginType,
@@ -600,4 +608,4 @@ export function getCollisionProjectScheduleDetails(id, type) {
 		'url': '/zdsz/touchOperationEngineering/query/' + id + '/' + type,
 		'method': 'get',
 	})
-}
+}

config.js

@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
 
-	baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.88:8080',
-	//baseUrl: 'http://192.168.4.23:8080',
+	baseUrl: 'http://192.168.4.23:8080',
 	//baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.6:8080',
 

pages/bottom_leg/bottom_leg.vue

@@ -77,7 +77,7 @@
 
 						<span
 							style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-							@click="history">历史</span>
+							@click="history">恢复暂存</span>
 					</view>
 
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -217,7 +217,7 @@
 
 
 			<view class="action-btn" v-show="reviewStatus!='1'">
-				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
+				<button @click="submit" class="btn cu-btn block bg-blue lg round">{{submitTitle}}</button>
 			</view>
 
 			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
@@ -248,6 +248,7 @@
 			addTearOldPipe,
 			getRoomProjectList,
 			getRoomProjectId,
+			getLowerStaging,
 		} from '@/api/common';
 		import {
 			getToken
@@ -265,6 +266,7 @@
 						Authorization: "Bearer " + getToken()
 					},
 					type: '',
+					submitTitle: '暂存',
 					open: false,
 					reviewStatus: '', //是否可以点击
 					objValue: '', //上一页面传过来的值  新增接口用
@@ -407,15 +409,18 @@
 					// else if (this.isEmpty(this.inputIntegerNumberValue)) {
 					// 	this.$modal.msg("请输入米数")
 					// }
-					else if (this.imgArr0.length <= 0) {
-						this.$modal.msg("请上传沟上部分照片")
-					} else if (this.imgArr1.length <= 0) {
-						this.$modal.msg("请上传开挖前照片")
-					} else if (this.imgArr2.length <= 0) {
-						this.$modal.msg("请上传下沟照片")
-					} else if (this.imgArr3.length <= 0) {
-						this.$modal.msg("请上传回填照片")
-					} else {
+					else if (this.imgArr0.length <= 0 && this.imgArr1.length <= 0 && this.imgArr2.length <= 0 && this.imgArr3
+						.length <= 0) {
+						this.$modal.msg("请上传照片")
+					}
+					// else if (this.imgArr1.length <= 0) {
+					// 	this.$modal.msg("请上传开挖前照片")
+					// } else if (this.imgArr2.length <= 0) {
+					// 	this.$modal.msg("请上传下沟照片")
+					// } else if (this.imgArr3.length <= 0) {
+					// 	this.$modal.msg("请上传回填照片")
+					// } 
+					else {
 
 
 						uni.showLoading()
@@ -587,6 +592,13 @@
 												} else if (type == 3) {
 													_this.imgArr3.push(data.data.url)
 												}
+												if (_this.imgArr0.length > 0 && _this.imgArr1
+													.length > 0 && _this.imgArr2.length > 0 &&
+													_this.imgArr3.length > 0) {
+													_this.submitTitle = '确认上传'
+
+												}
+
 												_this.$modal.msg('上传成功！')
 											}
 										}
@@ -712,23 +724,23 @@
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
 
-						if (!this.isEmpty(this.projectValue.dictValue)) {
-							//选完 判断 工程周期
-							this.getStatus();
+						// 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)) {
+						// if (!this.isEmpty(this.projectValue.dictValue)) {
 
-							//选完 判断 工程周期
-							this.getStatus();
+						// 	//选完 判断 工程周期
+						// 	this.getStatus();
 
-						}
+						// }
 					}
 
 				},
@@ -758,39 +770,41 @@
 						this.$modal.msg("请选择楼栋")
 						return
 					}
-
+					if (this.isEmpty(this.positionKey)) {
+						this.$modal.msg("请选择施工位置")
+						return
+					}
+					if (this.isEmpty(this.inputNumberValue)) {
+						this.$modal.msg("请输入施工位置")
+						return
+					}
 					let param = {
 						areaId: this.XQValue.id, // 小区id
 						buildingId: this.LDValue.id, // 楼宇id
 						unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id, // 单元id
-						enginCycle: this.projectValue.dictValue, // 工程周期
-						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
-						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-					}
-					getRoomProjectId(param).then(res => {
-
-						if (res.code == '200') {
-
-							if (res.data != null) {
-
-								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
-									res => {
-
-										this.historyList = res.data
-										if (res.data.zEngineeringNodeBo != null) {
-											this.showHistoryList();
-										} else {
-											this.$modal.msg("暂无历史信息")
-										}
-
-									})
+						direction: this.positionKey,
+						number: this.inputNumberValue,
 
+					}
+					getLowerStaging(param).then(res => {
+						if (res.data != null) {
+							if (res.data.zEngineeringNodeBo != null) {
+								this.imgArr0 = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]
+									.onTheDitch;
+								this.imgArr1 = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]
+									.beforeBottom;
+								this.imgArr2 = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]
+									.legBackfilling;
+								this.imgArr3 = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]
+									.inferiorSulcus;
 							} else {
-								this.$modal.msg("暂无工程信息")
+								this.$modal.msg("暂无数据")
 							}
+
 						} else {
-							this.$modal.msg(res.msg)
+							this.$modal.msg("暂无数据")
 						}
+
 					})
 				},
 				showHistoryList() {

pages/enginproject/enginproject.vue

@@ -541,7 +541,7 @@
 						}
 						this.open = true;
 						//请求
-						getengineeringNameListNew(this.projectType.dictValue,this.objValue.title).then(response => {
+						getengineeringNameListNew(this.projectType.dictValue, this.objValue.title).then(response => {
 
 							this.selectList = response.data;
 						});
@@ -983,18 +983,18 @@
 
 					if (this.objValue.value == '回填、撤场') {
 
-						if (this.imgHtqArr.length <= 0) {
-							this.$modal.msg('请上传回填前照片')
-							return
-						}
-						if (this.imgJspsArr.length <= 0) {
-							this.$modal.msg('请上传警示带铺设照片')
-							return
-						}
-						if (this.imgHthArr.length <= 0) {
-							this.$modal.msg('请上传回填后照片')
+						if (this.imgHtqArr.length <= 0 && this.imgJspsArr.length <= 0 && this.imgHthArr.length <= 0) {
+							this.$modal.msg('请上传照片')
 							return
 						}
+						// if (this.imgJspsArr.length <= 0) {
+						// 	this.$modal.msg('请上传警示带铺设照片')
+						// 	return
+						// }
+						// if (this.imgHthArr.length <= 0) {
+						// 	this.$modal.msg('请上传回填后照片')
+						// 	return
+						// }
 
 					} else {
 						if (this.imgArr.length <= 0) {

pages/municipal/municipal.vue

@@ -1007,18 +1007,18 @@
 
 
 					if (this.objValue.Label == '回填、撤场') {
-						if (this.imgHtqArr.length <= 0) {
-							this.$modal.msg('请上传回填前照片')
-							return
-						}
-						if (this.imgJspsArr.length <= 0) {
-							this.$modal.msg('请上传警示带铺设照片')
-							return
-						}
-						if (this.imgHthArr.length <= 0) {
-							this.$modal.msg('请上传回填后照片')
+						if (this.imgHtqArr.length <= 0 && this.imgJspsArr.length <= 0 && this.imgHthArr.length <= 0) {
+							this.$modal.msg('请上传照片')
 							return
 						}
+						// if (this.imgJspsArr.length <= 0) {
+						// 	this.$modal.msg('请上传警示带铺设照片')
+						// 	return
+						// }
+						// if (this.imgHthArr.length <= 0) {
+						// 	this.$modal.msg('请上传回填后照片')
+						// 	return
+						// }
 					} else {
 						if (this.imgArr.length <= 0) {
 							this.$modal.msg('请上传照片或视频')

pages/statistics/historyDetailMunicipal.vue

@@ -634,18 +634,19 @@
 						}
 
 						if (this.title == '回填、撤场') {
-							if (res.zEngiineeringPhotoBoListOne.length <= 0) {
-								this.$modal.msg('请上传回填前照片')
-								isSubmit = false;
-							}
-							if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
-								this.$modal.msg('请上传警示带铺设照片')
-								isSubmit = false;
-							}
-							if (res.zEngiineeringPhotoBoListThree.length <= 0) {
-								this.$modal.msg('请上传回填后照片')
+							if (res.zEngiineeringPhotoBoListOne.length <= 0 && res.zEngiineeringPhotoBoListTwo
+								.length <= 0 && res.zEngiineeringPhotoBoListThree.length <= 0) {
+								this.$modal.msg('请上传照片')
 								isSubmit = false;
 							}
+							// if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
+							// 	this.$modal.msg('请上传警示带铺设照片')
+							// 	isSubmit = false;
+							// }
+							// if (res.zEngiineeringPhotoBoListThree.length <= 0) {
+							// 	this.$modal.msg('请上传回填后照片')
+							// 	isSubmit = false;
+							// }
 						} else {
 							if (res.zEngiineeringPhotoBoList.length == 0) {
 								this.$modal.msg("请上传照片");

pages/statistics/historyDetailsEnginproject.vue

@@ -649,18 +649,19 @@
 
 						}
 						if (this.title == '回填、撤场') {
-							if (res.zEngiineeringPhotoBoListOne.length <= 0) {
-								this.$modal.msg('请上传回填前照片')
-								isSubmit = false;
-							}
-							if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
-								this.$modal.msg('请上传警示带铺设照片')
-								isSubmit = false;
-							}
-							if (res.zEngiineeringPhotoBoListThree.length <= 0) {
-								this.$modal.msg('请上传回填后照片')
+							if (res.zEngiineeringPhotoBoListOne.length <= 0 && res.zEngiineeringPhotoBoListTwo
+								.length <= 0 && res.zEngiineeringPhotoBoListThree.length <= 0) {
+								this.$modal.msg('请上传照片')
 								isSubmit = false;
 							}
+							// if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
+							// 	this.$modal.msg('请上传警示带铺设照片')
+							// 	isSubmit = false;
+							// }
+							// if (res.zEngiineeringPhotoBoListThree.length <= 0) {
+							// 	this.$modal.msg('请上传回填后照片')
+							// 	isSubmit = false;
+							// }
 						} else {
 							if (res.zEngiineeringPhotoBoList.length == 0) {
 								this.$modal.msg("请上传照片");

pages/statistics/history_details_bottom_leg.vue

@@ -500,29 +500,30 @@
 				if (this.title == '底腿') {
 					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
 						if (this.isEmpty(res.constructAddre)) {
-							this.$modal.msg("请施工位置");
+							this.$modal.msg("请选择施工位置");
 							isSubmit = false;
 						}
 						if (this.isEmpty(res.zEngineeringMaterialBo[0].number)) {
-							this.$modal.msg("请施工位置");
+							this.$modal.msg("请输入第几根");
 							isSubmit = false;
 						}
-						if (res.onTheDitch.length == 0) {
-							this.$modal.msg("请上传沟上部分照片");
-							isSubmit = false;
-						}
-						if (res.beforeBottom.length == 0) {
-							this.$modal.msg("请上传开挖前照片");
-							isSubmit = false;
-						}
-						if (res.legBackfilling.length == 0) {
-							this.$modal.msg("请上传下沟照片");
-							isSubmit = false;
-						}
-						if (res.inferiorSulcus.length == 0) {
-							this.$modal.msg("请上传回填照片");
+						if (res.onTheDitch.length == 0 && res.beforeBottom.length == 0 && res.legBackfilling
+							.length == 0 && res.inferiorSulcus.length == 0) {
+							this.$modal.msg("请上传照片");
 							isSubmit = false;
 						}
+						// if (res.beforeBottom.length == 0) {
+						// 	this.$modal.msg("请上传开挖前照片");
+						// 	isSubmit = false;
+						// }
+						// if (res.legBackfilling.length == 0) {
+						// 	this.$modal.msg("请上传下沟照片");
+						// 	isSubmit = false;
+						// }
+						// if (res.inferiorSulcus.length == 0) {
+						// 	this.$modal.msg("请上传回填照片");
+						// 	isSubmit = false;
+						// }
 					})
 				} else if (this.title == '下沟') {
 					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {