1

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:28080',
-	//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/oldrenovation/courtyard/courtyard.vue

@@ -308,7 +308,8 @@
 					loading: false,
 					inputNumberValue: '',
 					title: '',
-					historyList: {} //历史数据
+					historyList: {}, //历史数据
+					temporaryOrNot: false, //是否点击恢复暂存
 
 				}
 			},
@@ -872,6 +873,7 @@
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						enginCycle: this.projectValue.dictValue, //工程周期
 						zEngineeringNodeBo: {
+							temporaryOrNot: this.temporaryOrNot,
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
 								state: this.tempState,
@@ -907,6 +909,7 @@
 
 				},
 				history() {
+
 					this.projectContent = '';
 					this.imgGuanArr = [];
 
@@ -960,6 +963,7 @@
 											if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
 												this.$modal.msg("当前步骤以审核通过请谨慎！")
 											} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+												this.temporaryOrNot = true;
 												let dataJson = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0];
 												this.projectContent = dataJson.remark;
 												this.time = dataJson.constructTime;

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -458,6 +458,7 @@
 
 					historyName: '恢复暂存',
 					tempState: '',
+					temporaryOrNot: false, //是否点击恢复暂存
 
 				}
 			},
@@ -1122,6 +1123,7 @@
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						enginCycle: this.projectValue.dictValue, //工程周期
 						zEngineeringNodeBo: {
+							temporaryOrNot: this.temporaryOrNot,
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
 								state: this.tempState,
@@ -1167,6 +1169,7 @@
 
 				},
 				history() {
+					this.temporaryOrNot = true;
 					this.imgArr = [];
 					this.projectContent = '';
 					this.stonePowderArr = [];
@@ -1236,7 +1239,7 @@
 												// this.showHistoryList();
 												this.$modal.msg("当前步骤以审核通过请谨慎！")
 											} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
-
+												this.temporaryOrNot = true;
 												let dataJson = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0];
 												this.projectContent = dataJson.remark;
 												this.time = dataJson.constructTime;

pages/oldrenovation/indoor/indoor.vue

@@ -619,6 +619,7 @@
 					historyList: {}, //历史数据
 					tempState: '',
 					tempSelectList: [],
+					temporaryOrNot: false, //是否点击恢复暂存
 
 				}
 			},
@@ -1430,7 +1431,7 @@
 
 
 					let AddressStr = this.XQValue.name + this.BuildingName + '栋' + this.UnintName + '单元' + this.RoomName + '号';
-					putRoomDetails(this.FJValue.id, phoneArr.join(),AddressStr)
+					putRoomDetails(this.FJValue.id, phoneArr.join(), AddressStr)
 						.then(res => {
 
 							if (res.code == '200') {
@@ -1457,7 +1458,7 @@
 					})
 
 					let AddressStr = this.XQValue.name + this.BuildingName + '栋' + this.UnintName + '单元' + this.RoomName + '号';
-					putRoomDetails(this.FJValue.id, phoneArr.join(),AddressStr)
+					putRoomDetails(this.FJValue.id, phoneArr.join(), AddressStr)
 						.then(res => {
 
 							if (res.code == '200') {
@@ -1472,6 +1473,7 @@
 										.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 									enginCycle: this.projectValue.dictValue, //工程周期
 									zEngineeringNodeBo: {
+										temporaryOrNot: this.temporaryOrNot,
 										type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 										zEngineeringInfoBo: {
 											constructAccordingDrawings: this.isCheck, //是否按图纸施工
@@ -1521,6 +1523,7 @@
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
 							zEngineeringNodeBo: {
+								temporaryOrNot: this.temporaryOrNot,
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
@@ -1548,6 +1551,7 @@
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
 							zEngineeringNodeBo: {
+								temporaryOrNot: this.temporaryOrNot,
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
@@ -1575,6 +1579,7 @@
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
 							zEngineeringNodeBo: {
+								temporaryOrNot: this.temporaryOrNot,
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
@@ -1604,6 +1609,7 @@
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
 							zEngineeringNodeBo: {
+								temporaryOrNot: this.temporaryOrNot,
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
@@ -1635,6 +1641,7 @@
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
 							zEngineeringNodeBo: {
+								temporaryOrNot: this.temporaryOrNot,
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
@@ -1745,7 +1752,7 @@
 											// this.showHistoryList();
 											this.$modal.msg("当前步骤以审核通过请谨慎！")
 										} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
-
+											this.temporaryOrNot = true;
 											let dataJson = res.data.zEngineeringNodeBo
 												.zEngineeringInfoBoList[0];
 											this.imgArr = dataJson.zEngiineeringPhotoBoList;

pages/oldrenovation/overhead/newoverhead.vue

@@ -267,7 +267,8 @@
 					loading: false,
 					inputNumberValue: '',
 					title: '',
-					historyList: {} //历史数据
+					historyList: {}, //历史数据
+					temporaryOrNot: false, //是否点击恢复暂存
 
 				}
 			},
@@ -807,6 +808,7 @@
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						enginCycle: this.projectValue.dictValue, //工程周期
 						zEngineeringNodeBo: {
+							temporaryOrNot: this.temporaryOrNot,
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
 								state: this.tempState,
@@ -840,6 +842,7 @@
 
 				},
 				history() {
+					
 					this.imgArr = [];
 					this.projectContent = '';
 					this.zEngineeringMaterialBo = [];
@@ -893,6 +896,7 @@
 											if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
 												this.$modal.msg("当前步骤以审核通过请谨慎！")
 											} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+												this.temporaryOrNot = true;
 												let dataJson = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0];
 												this.projectContent = dataJson.remark;
 												this.time = dataJson.constructTime;

pages/oldrenovation/overhead/overhead.vue

@@ -213,7 +213,8 @@
 					loading: false,
 					inputNumberValue: '',
 					title: '',
-					historyList: {} //历史数据
+					historyList: {}, //历史数据
+					temporaryOrNot: false, //是否点击恢复暂存
 
 				}
 			},
@@ -680,6 +681,7 @@
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						enginCycle: this.projectValue.dictValue, //工程周期
 						zEngineeringNodeBo: {
+							temporaryOrNot: this.temporaryOrNot,
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
 								state: this.tempState,
@@ -722,6 +724,7 @@
 
 				},
 				history() {
+
 					this.imgArr = [];
 					this.projectContent = '';
 					if (this.isEmpty(this.projectValue.dictValue)) {
@@ -775,6 +778,7 @@
 												// this.showHistoryList();
 												this.$modal.msg("当前步骤以审核通过请谨慎！")
 											} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+												this.temporaryOrNot = true;
 												let dataJson = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0];
 												this.projectContent = dataJson.remark;
 												this.imgArr = dataJson.zEngiineeringPhotoBoList;