历史文字修改

config.js

@@ -2,7 +2,7 @@
 module.exports = {
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	baseUrl: 'http://192.168.4.23:8080',
+	baseUrl: 'http://192.168.4.23:8082',
 	//baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

manifest.json

@@ -41,7 +41,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx41e003e1c9067d02",
+        "appid" : "wxf75b34dd1f737174",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,

pages/oldrenovation/indoor/indoor.vue

@@ -213,7 +213,7 @@
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -241,7 +241,7 @@
 							拆旧管
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
@@ -269,7 +269,7 @@
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
@@ -298,7 +298,7 @@
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -353,7 +353,7 @@
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -384,7 +384,7 @@
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -438,7 +438,7 @@
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">历史</span>
+								@click="history">{{historyName}}</span>
 						</view>
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
@@ -588,6 +588,7 @@
 					headers: {
 						Authorization: "Bearer " + getToken()
 					},
+					historyName: '',
 					houseHeadName: '',
 					houseHeadPhone: '',
 					houseHeadIDcardNumber: '',
@@ -989,6 +990,7 @@
 						this.DYValue = ''; //重置单元数据
 						this.FJValue = ''; //重置房间数据
 						this.currentResidentsPhoe = [];
+						this.historyName = "";
 						this.houseHeadName = "";
 						this.houseHeadPhone = "";
 						this.houseHeadIDcardNumber = "";
@@ -1021,6 +1023,7 @@
 						this.DYValue = ''; //重置单元数据
 						this.FJValue = ''; //重置房间数据
 						this.currentResidentsPhoe = [];
+						this.historyName = "";
 						this.houseHeadName = "";
 						this.houseHeadPhone = "";
 						this.houseHeadIDcardNumber = "";
@@ -1034,6 +1037,7 @@
 						this.DYValue = ''; //重置单元数据
 						this.FJValue = ''; //重置房间数据
 						this.currentResidentsPhoe = [];
+						this.historyName = "";
 						this.houseHeadName = "";
 						this.houseHeadPhone = "";
 						this.houseHeadIDcardNumber = "";
@@ -1045,6 +1049,7 @@
 						//根据单元数据 获取房间数据
 						this.FJValue = ''; //重置房间数据
 						this.currentResidentsPhoe = [];
+						this.historyName = "";
 						this.houseHeadName = "";
 						this.houseHeadPhone = "";
 						this.houseHeadIDcardNumber = "";
@@ -1053,6 +1058,7 @@
 						})
 					} else if (this.type == 'fj') {
 						this.FJValue = item;
+						this.history();
 						this.houseHeadName = item.houseUserName;
 						this.houseHeadPhone = item.phone;
 						this.houseHeadIDcardNumber = item.idCard;
@@ -1630,10 +1636,14 @@
 							if (res.data != null) {
 
 								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
-
+									this.historyName = res.data.zEngineeringNodeBo.reviewStatus == '0' ? '未通过':'已通过'
 									this.historyList = res.data
-									if (res.data.zEngineeringNodeBo != null) {
-										this.showHistoryList();
+									if (res.data.zEngineeringNodeBo != null ) {
+										if(res.data.zEngineeringNodeBo.reviewStatus == '0'){
+											this.showHistoryList();
+										}else {
+											this.$modal.msg("当前步骤以审核通过请谨慎！")
+										}
 									} else {
 										this.$modal.msg("暂无历史信息")
 									}