历史显示现住人电话不能修改

api/common.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 获取 房间现住人电话
+export function getRoomDetails(id) {
+
+	return request({
+		'url': '/zdsz/house/' + id,
+		'method': 'get',
+	})
+}
 
 // 未安装新增
 export function AddNotInstalled(param) {

pages/oldrenovation/indoor/indoor.vue

@@ -5,13 +5,16 @@
 					<view
 						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 						<view style="display: flex;align-items: center;">房间信息
-						<image :src="loadImgSrc('icon_copy.png')" @click='copyAddress()'
-						style="display: flex;justify-content:flex-end; margin-left: 10px;width: 15px;height: 15px;"></image>
+							<image :src="loadImgSrc('icon_copy.png')" @click='copyAddress()'
+								style="display: flex;justify-content:flex-end; margin-left: 10px;width: 15px;height: 15px;">
+							</image>
 						</view>
-						<image v-if="changefj==false" :src="loadImgSrc('icon_user_open.png')" @click='this.changefj = !this.changefj'
+						<image v-if="changefj==false" :src="loadImgSrc('icon_user_open.png')"
+							@click='this.changefj = !this.changefj'
 							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
 						</image>
-						<image v-if="changefj==true" :src="loadImgSrc('icon_user_close.png')" @click='this.changefj = !this.changefj'
+						<image v-if="changefj==true" :src="loadImgSrc('icon_user_close.png')"
+							@click='this.changefj = !this.changefj'
 							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
 						</image>
 					</view>
@@ -195,8 +198,7 @@
 								管理所
 							</view>
 							<view class="uni-list-cell-db" style="margin-top: 10;">
-								<span style="color: darkgray;"
-									v-model="administrative">{{administrative}}</span>
+								<span style="color: darkgray;" v-model="administrative">{{administrative}}</span>
 							</view>
 
 						</view>
@@ -594,7 +596,7 @@
 					houseHeadIDcardNumber: '',
 					administrative: '',
 					type: '',
-					changefj:false,
+					changefj: false,
 					change: false,
 					open: false,
 					reviewStatus: '', //是否可以点击
@@ -659,24 +661,24 @@
 				}
 			},
 			methods: {
-				copyAddress(){
-					if(uni.getStorageSync('XZQValue') != {}){
+				copyAddress() {
+					if (uni.getStorageSync('XZQValue') != {}) {
 						this.type = 'xzq';
 						this.changeSelectDict(uni.getStorageSync('XZQValue'));
 					}
-					if(uni.getStorageSync('XQValue') != {}){
+					if (uni.getStorageSync('XQValue') != {}) {
 						this.type = 'xq';
 						this.changeSelect(uni.getStorageSync('XQValue'))
 					}
-					if(uni.getStorageSync('LDValue') != {}){
+					if (uni.getStorageSync('LDValue') != {}) {
 						this.type = 'ld';
 						this.changeSelect(uni.getStorageSync('LDValue'))
 					}
-					if(uni.getStorageSync('DYValue') != {}){
+					if (uni.getStorageSync('DYValue') != {}) {
 						this.type = 'dy';
 						this.changeSelect(uni.getStorageSync('DYValue'))
 					}
-					if(uni.getStorageSync('FJValue') != {}){
+					if (uni.getStorageSync('FJValue') != {}) {
 						this.type = 'fj';
 						this.changeSelect(uni.getStorageSync('FJValue'))
 					}
@@ -1237,11 +1239,11 @@
 						return
 					}
 
-					uni.setStorageSync("XZQValue",this.XZQValue)
-					uni.setStorageSync("XQValue",this.XQValue)
-					uni.setStorageSync("LDValue",this.LDValue)
-					uni.setStorageSync("DYValue",this.DYValue)
-					uni.setStorageSync("FJValue",this.FJValue)
+					uni.setStorageSync("XZQValue", this.XZQValue)
+					uni.setStorageSync("XQValue", this.XQValue)
+					uni.setStorageSync("LDValue", this.LDValue)
+					uni.setStorageSync("DYValue", this.DYValue)
+					uni.setStorageSync("FJValue", this.FJValue)
 
 					try {
 						this.currentResidentsPhoe.forEach((list) => {
@@ -1268,7 +1270,9 @@
 						}
 					} else if (this.objValue.enginClassValue == '拆旧管') {
 
-						if (this.isEmpty(this.LevelValue.id)) {
+						if (this.currentResidentsPhoe.length == 0) {
+							this.$modal.msg('现住人电话不能为空')
+						} else if (this.isEmpty(this.LevelValue.id)) {
 							this.$modal.msg("请选择腐蚀等级") //拆旧管  判断腐蚀等级
 						} else {
 							this.onsubmit();
@@ -1636,12 +1640,13 @@
 							if (res.data != null) {
 
 								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
-									this.historyName = res.data.zEngineeringNodeBo.reviewStatus == '0' ? '未通过':'已通过'
+									this.historyName = res.data.zEngineeringNodeBo.reviewStatus == '0' ?
+										'未通过' : '已通过'
 									this.historyList = res.data
-									if (res.data.zEngineeringNodeBo != null ) {
-										if(res.data.zEngineeringNodeBo.reviewStatus == '0'){
+									if (res.data.zEngineeringNodeBo != null) {
+										if (res.data.zEngineeringNodeBo.reviewStatus == '0') {
 											// this.showHistoryList();
-										}else {
+										} else {
 											this.$modal.msg("当前步骤以审核通过请谨慎！")
 										}
 									} else {
@@ -1917,4 +1922,4 @@
 		// 	min-height: 100upx;
 		// 	line-height: 20px;
 		// }
-	</style>
+	</style>

pages/statistics/historyDetails.vue

@@ -1,167 +1,175 @@
 <template>
 	<view>
 		<view class="uni-media-list">
-
 			<view class="uni-media-list-body">
 				<view v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
 					v-if="isEdit(value)">
 					<view class="uni-media-list-text-top">
 						<view class="tit-text">施工时间:</view>{{value.updateTime}}
 					</view>
+					<view v-for="(user,index) in newPhone" :key="index" class="num-style">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<spane>现住人电话</spane>
+							<view style="display: flex; justify-content: flex-end; ">
+								<input class="uni-input" type="tel" v-model="user.phone" maxlength="11"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "  disabled="disabled"></input>
 
-					<view class="uni-media-list-text-top" v-if="title=='拆旧管'">
-						<view class="tit-text">腐蚀等级:</view>
-						<view @click="pickerShow('fsdj',key)">
-							{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
+							</view>
 						</view>
-					</view>
-					<view class="uni-media-list-text-top" v-if="title=='打孔'">
-						<view class="tit-text">孔距:</view>
-						<view @click="pickerShow('kj',key)">
-							<!-- 123 -->
-							{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
 						</view>
-					</view>
-					<view class="uni-media-list-text-top" v-if="title=='挂表'">
-						<view class="tit-text">品牌:</view>
-						<view @click="pickerShow('brand',key)">
-							{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
+						<view class="uni-media-list-text-top" v-if="title=='拆旧管'">
+							<view class="tit-text">腐蚀等级:</view>
+							<view @click="pickerShow('fsdj',key)">
+								{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
+							</view>
 						</view>
-					</view>
-					<view class="uni-media-list-text-top" v-if="title=='切断阀'||title=='报警器'">
-						<view class="tit-text">厂家:</view>
-						<view @click="pickerShow('brand',key)">
-							{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
+						<view class="uni-media-list-text-top" v-if="title=='打孔'">
+							<view class="tit-text">孔距:</view>
+							<view @click="pickerShow('kj',key)">
+								<!-- 123 -->
+								{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
+							</view>
 						</view>
-					</view>
-					<view class="" v-if="title=='立杠'||title=='表后管'">
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
-
-							<view class="tit-text">
-								材 质
+						<view class="uni-media-list-text-top" v-if="title=='挂表'">
+							<view class="tit-text">品牌:</view>
+							<view @click="pickerShow('brand',key)">
+								{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
 							</view>
-
-							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
-								<span
-									style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
-
+						</view>
+						<view class="uni-media-list-text-top" v-if="title=='切断阀'||title=='报警器'">
+							<view class="tit-text">厂家:</view>
+							<view @click="pickerShow('brand',key)">
+								{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
 							</view>
 						</view>
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="" v-if="title=='立杠'||title=='表后管'">
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+
+								<view class="tit-text">
+									材 质
+								</view>
 
-							<view class="tit-text">
-								规 格
+								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
+									<span
+										style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
+
+								</view>
 							</view>
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+
+								<view class="tit-text">
+									规 格
+								</view>
 
-							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
-								<span
-									style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
+								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
+									<span
+										style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
 
+								</view>
 							</view>
-						</view>
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
-							<text class="tit-text">米 数</text>
-							<view style="display: flex; justify-content: right; width: 70%;">
-								<input class="uni-input" type="number"
-									:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,0)"
-									@change="setInfoBoNumber(key,$event.target.value,0)" 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"
-									:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,1)"
-									@change="setInfoBoNumber(key,$event.target.value,1)" maxlength="1"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+								<text class="tit-text">米 数</text>
+								<view style="display: flex; justify-content: right; width: 70%;">
+									<input class="uni-input" type="number"
+										:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,0)"
+										@change="setInfoBoNumber(key,$event.target.value,0)" 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"
+										:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,1)"
+										@change="setInfoBoNumber(key,$event.target.value,1)" maxlength="1"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								</view>
 							</view>
 						</view>
-					</view>
 
-					<view class="uni-list" style="margin-bottom: 20px;" v-if="title=='阀管'">
+						<view class="uni-list" style="margin-bottom: 20px;" v-if="title=='阀管'">
 
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-							<view>
-								上门类型
-							</view>
+								<view>
+									上门类型
+								</view>
 
-							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('door',key)">
-								<span style="color: black;">{{value.zEngineeringMaterialBo[0].visitType}}</span>
+								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('door',key)">
+									<span style="color: black;">{{value.zEngineeringMaterialBo[0].visitType}}</span>
 
+								</view>
 							</view>
-						</view>
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-							<view>
-								自闭阀厂家
-							</view>
+								<view>
+									自闭阀厂家
+								</view>
 
-							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('zbf',key)">
-								<span
-									style="color: black;">{{getSelectZBFName(value.zEngineeringMaterialBo[0].selfClosingValveType)}}</span>
+								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('zbf',key)">
+									<span
+										style="color: black;">{{getSelectZBFName(value.zEngineeringMaterialBo[0].selfClosingValveType)}}</span>
 
+								</view>
 							</view>
-						</view>
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-							<view>
-								灶具管厂家
-							</view>
+								<view>
+									灶具管厂家
+								</view>
 
-							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
-								<span
-									style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
+								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
+									<span
+										style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
 
+								</view>
 							</view>
-						</view>
-						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-							<view>
-								规 格
-							</view>
+								<view>
+									规 格
+								</view>
 
-							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
-								<span
-									style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
+								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
+									<span
+										style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
 
+								</view>
 							</view>
 						</view>
-					</view>
 
-					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<image :src="loadImgSrc('updateimg.png')" mode=""
-							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose(key)">
-						</image>
-						<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :key="index"
-							style="position: relative;">
-							<view
-								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-									@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
-								</image>
-							</view>
-							<view v-else>
-								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-							</view>
-							<view @click="remove(index,key)"
-								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-								</image>
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose(key)">
+							</image>
+							<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :key="index"
+								style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="remove(index,key)"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
 							</view>
 						</view>
+						<!-- </view> -->
 					</view>
-					<!-- </view> -->
 				</view>
 			</view>
+			<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
+				subtitleKey="id">
+			</SelectPicker>
+			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
+				titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
+			<view class="action-btn" v-if="hideButton==false">
+				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
+			</view>
 		</view>
-		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
-			subtitleKey="id">
-		</SelectPicker>
-		<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
-			titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
-		<view class="action-btn" v-if="hideButton==false">
-			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
-		</view>
-	</view>
 </template>
 
 <script>
@@ -177,7 +185,8 @@
 		getHistoryDetails,
 		getEnginMaterialQualityList,
 		putHistory,
-		getEnginSpecificationsList
+		getEnginSpecificationsList,
+		getRoomDetails,
 	} from '@/api/common'
 	export default {
 		components: {
@@ -204,6 +213,8 @@
 				open: false,
 				chooseType: '',
 				hideButton: false,
+				roomId: '',
+				newPhone: []
 			}
 		},
 		onLoad(options) {
@@ -211,31 +222,53 @@
 				let e = JSON.parse(decodeURIComponent(options.params));
 				this.nodeId = e.id;
 				this.type = e.type;
-				getHistoryDetails(this.nodeId, this.type).then(response => {
-					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						this.enginType = response.data.enginType;
-						this.enginClassification = response.data.enginClassification;
-						if (this.type == '阀管') {
-							getEnginMaterialQualityList("民用工程", this.enginType, this.enginClassification, this
-									.title,
-									'自闭阀厂家')
-								.then(
-									response => {
-										this.selectZbfList = response.data;
-										this.selectList = this.selectZbfList;
-									});
-						} else {
+				this.roomId = e.roomId;
+				console.log(this.roomId);
+				this.newPhone = [];
+				getRoomDetails(e.roomId).then(response => {
+						if (!this.isEmpty(response.data.newPhone)) {
+							let str = response.data.newPhone;
+							var array = str.split(",");
+							array.forEach((list) => {
+								this.newPhone.push({
+									phone: list
+								})
+							})
+						}
+
+					}),
+					getHistoryDetails(this.nodeId, this.type).then(response => {
+						if (response.data.zEngineeringNodeBo != null) {
+							this.hideButton = false;
+							// if (response.data.zEngineeringNodeBo.createBy == this.$user.state.name) {
+							// 	this.hideButton = false;
+							// } else {
+							// 	this.hideButton = true;
+							// }
+
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							console.log("===", this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList);
+							this.enginType = response.data.enginType;
+							this.enginClassification = response.data.enginClassification;
+							if (this.type == '阀管') {
+								getEnginMaterialQualityList("民用工程", this.enginType, this.enginClassification, this
+										.title,
+										'自闭阀厂家')
+									.then(
+										response => {
+											this.selectZbfList = response.data;
+											this.selectList = this.selectZbfList;
+										});
+							} else {
 
-							this.getFSDJLevel();
+								this.getFSDJLevel();
+							}
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无历史信息")
 						}
-					} else {
-						this.hideButton = true;
-						this.$modal.msg("暂无历史信息")
-					}
-				});
+					});
 
 			}
 		},

pages/statistics/statistics.vue

@@ -561,6 +561,7 @@
 				nodeId: '',
 				nodeType: '',
 				roomItem: {},
+				roomId: '',
 
 			}
 		},
@@ -625,6 +626,7 @@
 				this.typeList = item.nodeReViewStateList
 				this.nodeId = item.id;
 				this.nodeType = item.enginClassification;
+				this.roomId = item.houseId;
 				if (this.nodeType == 'bottom_leg') { //底腿
 					let obj = {
 						id: this.nodeId,
@@ -685,7 +687,8 @@
 				} else {
 					let obj = {
 						id: this.nodeId,
-						type: item.Type
+						type: item.Type,
+						roomId: this.roomId,
 					};
 					this.handleHiddenShare();