1

api/common.js

@@ -1,6 +1,31 @@
 import request from '@/utils/request'
 
 
+//  修改房间信息
+export function putRoomDetails(id, newPhone) {
+	const data = {
+		id,
+		newPhone
+
+	}
+	return request({
+		'url': '/zdsz/house/editById',
+		'method': 'post',
+		'data': data
+	})
+}
+//  通过身份证查询房间信息 
+export function getRoomDetailsIDCard(idCard) {
+	const data = {
+		idCard,
+
+	}
+	return request({
+		'url': '/zdsz/house/getHousesByIdCard',
+		'method': 'get',
+		'data': data
+	})
+}
 
 // 获取公告列表
 export function getNoticeList(noticeType, pageNum, pageSize) {
@@ -200,13 +225,14 @@ export function getEnginSpecificationsList(materId) {
 }
 
 // 工程材质下拉
-export function getEnginMaterialQualityList(enginType, enginSort,enginNode) {
+export function getEnginMaterialQualityList(enginType, enginSort, enginNode, enginStep) {
 	const data = {
 		enginType
 	}
 	if (enginSort !== undefined) {
 		data['enginSort'] = enginSort
 		data['enginNode'] = enginNode
+		data['enginStep'] = enginStep
 	}
 	return request({
 		'url': '/zdsz/enginMaterialQuality/getEnginMaterialQualityList',

pages/oldrenovation/courtyard/courtyard.vue

@@ -145,7 +145,7 @@
 						}})" class="tj-btn">添加</button>
 
 					</view>
-					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+				<!-- 	<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
 						<view class="container" style="color: #b2b2b2;">*请上传管道施工记录照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 							<image :src="loadImgSrc('updateimg.png')" mode=""
@@ -168,7 +168,7 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
 						<view class="container" style="color: #b2b2b2;">*请上传管上皮深度测量照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
@@ -589,7 +589,8 @@
 					this.type = e; //赋值类型
 					if (e == 'cz') { //材质
 						this.open = true;
-						getEnginMaterialQualityList("民用工程", this.objValue.enginType, this.objValue.enginClassification).then(
+						getEnginMaterialQualityList("民用工程", this.objValue.enginType, this.objValue.enginClassification, this
+							.objValue.enginClassValue).then(
 							response => {
 								this.selectList = response.data;
 							});

pages/oldrenovation/indoor/indoor.vue

@@ -114,7 +114,12 @@
 			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
 				titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 			</view>
+			<view class="background">
+				<input class="uni-input" type="idcard" v-model="idCard" maxlength="18" placeholder="请输入身份证号码"
+					style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 
+			</view>
+			<button @click="serchByCard"> 搜索</button>
 			<view class="background">
 
 
@@ -531,6 +536,8 @@
 			getEnginSpecificationsList,
 			getRoomProjectList,
 			getRoomProjectId,
+			getRoomDetailsIDCard,
+			putRoomDetails
 		} from '@/api/common'
 		import {
 			getToken
@@ -538,6 +545,9 @@
 		import {
 			showConfirm
 		} from '../../../utils/common';
+		import {
+			login
+		} from '../../../api/login';
 
 		export default {
 			components: {
@@ -562,6 +572,7 @@
 					selectList: [],
 					dictOptions: [],
 					imgArr: [],
+					idCard: '',
 					XQValue: {},
 					XZQValue: {},
 					projectValue: {
@@ -803,7 +814,8 @@
 
 					} else if (e == 'cz') { //材质
 						this.open = true;
-						getEnginMaterialQualityList("民用工程").then(response => {
+						getEnginMaterialQualityList("民用工程", this.objValue.enginType, this.objValue.enginClassification, this
+							.objValue.enginClassValue).then(response => {
 							this.selectList = response.data;
 						});
 
@@ -1035,6 +1047,78 @@
 						}
 					})
 				},
+
+				serchByCard() {
+					if (this.isEmpty(this.idCard)) {
+						this.$modal.msg("请输入身份证号码")
+						return
+					}
+
+					if (!this.$validation.idCard(this.idCard)) {
+
+						this.$modal.msg("身份证号码格式不正确")
+						return
+					}
+					getRoomDetailsIDCard(this.idCard).then(res => {
+						if (res.code == '200') {
+							if (!this.isEmpty(res.data.newPhone)) {
+								this.currentResidentsPhoe = [];
+								let str = res.data.newPhone;
+								var array = str.split(",");
+								array.forEach((list) => {
+									this.currentResidentsPhoe.push({
+										phone: list
+									})
+								})
+							}
+
+							this.houseHeadName = res.data.houseUserName;
+							this.houseHeadIDcardNumber = res.data.idCard;
+							this.houseHeadPhone = res.data.phone;
+							this.XZQValue = {
+								dictValue: res.data.district,
+								dictLabel: res.data.districtName
+							};
+
+							this.XQValue = {
+								id: res.data.areaId,
+								name: res.data.areaName
+							}
+							this.LDValue = {
+								id: res.data.buildingId,
+								name: res.data.buildingName
+							}
+							this.DYValue = {
+								id: res.data.unitId,
+								name: res.data.unitName
+							}
+							this.FJValue = {
+								id: res.data.id,
+								name: res.data.name
+							}
+
+
+							getAreaList(this.XZQValue.dictValue).then(res => {
+								this.XQList = res.data;
+							})
+							getBuildingList(this.XQValue.id).then(res => {
+								this.LDList = res.data
+							})
+
+
+							getUnitList(this.LDValue.id).then(res => {
+								this.DYList = res.data
+							})
+
+
+
+							getHousesList(this.DYValue.id).then(res => {
+								this.FJList = res.data
+							})
+						}
+					})
+				},
+
 				//提交数据
 				submit() {
 
@@ -1144,44 +1228,61 @@
 								} else {
 									this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
 								}
-								let param = {
-									district: this.XZQValue.dictValue,
-									areaId: this.XQValue.id,
-									buildingId: this.LDValue.id,
-									unitId: this.DYValue.id,
-									houseId: this.FJValue.id,
-									enginType: this.objValue.enginType, //写死 上一页面传过来的 
-									enginClassification: this.objValue
-										.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-									enginCycle: this.projectValue.dictValue, //工程周期
-									zEngineeringNodeBo: {
-										type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-										zEngineeringInfoBo: {
-											constructAccordingDrawings: this.isCheck, //是否按图纸施工
-											zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-											zEngineeringMaterialBo: [{
-												materialQuality: this.materialValue.id, //材质
-												specifications: this.specificationValue.id, //规格
-												number: this.inputNumberValue //米数
-											}]
-										}
-									}
 
-								}
-								uni.showLoading()
-								addTearOldPipe(param).then(res => {
-									if (res.code == '200') {
-										uni.hideLoading()
-										uni.showToast({
-											title: res.msg,
-											icon: 'none',
-											//显示持续时间为 1秒
-											duration: 1000
-										});
-										uni.navigateBack();
-									}
+								let phoneArr = [];
+								this.currentResidentsPhoe.forEach((list) => {
+									phoneArr.push(list.phone)
 								})
+								console.log("ddd", phoneArr.join())
+
+								putRoomDetails(this.FJValue.id, phoneArr
+										.join())
+									.then(res => {
+
+										if (res.code == '200') {
+											let param = {
+												district: this.XZQValue.dictValue,
+												areaId: this.XQValue.id,
+												buildingId: this.LDValue.id,
+												unitId: this.DYValue.id,
+												houseId: this.FJValue.id,
+												enginType: this.objValue.enginType, //写死 上一页面传过来的 
+												enginClassification: this.objValue
+													.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+												enginCycle: this.projectValue.dictValue, //工程周期
+												zEngineeringNodeBo: {
+													type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+													zEngineeringInfoBo: {
+														constructAccordingDrawings: this.isCheck, //是否按图纸施工
+														zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+														zEngineeringMaterialBo: [{
+															materialQuality: this.materialValue.id, //材质
+															specifications: this.specificationValue.id, //规格
+															number: this.inputNumberValue //米数
+														}]
+													}
+												}
+
+											}
+											uni.showLoading()
+											addTearOldPipe(param).then(res => {
+												if (res.code == '200') {
+													uni.hideLoading()
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														//显示持续时间为 1秒
+														duration: 1000
+													});
+													uni.navigateBack();
+												}
+											})
+										}
+
+									})
+
+
 							} else {
 								this.$modal.msg('请至少上传一张照片和一个视频')
 							}
@@ -1210,7 +1311,6 @@
 					}
 				},
 
-
 				onsubmit() {
 
 					if (this.imgArr.length <= 0) {
@@ -1218,161 +1318,179 @@
 					} else if (this.loading == false) {
 						this.$modal.msg('照片或视频未上传完毕，无法提交！')
 					} else {
-						//提交
-						let param = ';'
-						if (this.objValue.enginClassValue == '拆旧管' || this.objValue.enginClassValue ==
-							'打孔') { //拆旧管  打孔
-							param = {
-								district: this.XZQValue.dictValue,
-								areaId: this.XQValue.id,
-								buildingId: this.LDValue.id,
-								unitId: this.DYValue.id,
-								houseId: this.FJValue.id,
-								enginType: this.objValue.enginType, //写死 上一页面传过来的 
-								enginClassification: this.objValue
-									.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-								enginCycle: this.projectValue.dictValue, //工程周期
-								zEngineeringNodeBo: {
-									type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-									zEngineeringInfoBo: {
-										constructAccordingDrawings: this.isCheck, //是否按图纸施工
-										zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-										zEngineeringMaterialBo: [{
-											corrosionLevel: this.LevelValue.dictValue //腐蚀等级 //孔距
-										}]
-									}
-								}
+						let phoneArr = [];
+						this.currentResidentsPhoe.forEach((list) => {
+							phoneArr.push(list.phone)
+						})
+						console.log("ddd", phoneArr.join())
 
-							}
-							//this.onsubmit(param)
-						} else if (this.objValue.enginClassValue == '报警器' || this.objValue.enginClassValue ==
-							'切断阀') { //报警器切断阀
-							param = {
-								district: this.XZQValue.dictValue,
-								areaId: this.XQValue.id,
-								buildingId: this.LDValue.id,
-								unitId: this.DYValue.id,
-								houseId: this.FJValue.id,
-								enginType: this.objValue.enginType, //写死 上一页面传过来的 
-								enginClassification: this.objValue
-									.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-								enginCycle: this.projectValue.dictValue, //工程周期
-								zEngineeringNodeBo: {
-									type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-									zEngineeringInfoBo: {
-										constructAccordingDrawings: this.isCheck, //是否按图纸施工
-										zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-										zEngineeringMaterialBo: [{
-											brand: this.brandValue.dictValue, //品牌
-											// number: this.inputNumberValue //米数
-										}]
-									}
+						putRoomDetails(this.FJValue.id, phoneArr.join())
+							.then(res => {
+
+								if (res.code == '200') {
+									this.againSubmit();
 								}
 
-							}
+							})
+					}
 
-						} else if (this.objValue.enginClassValue == '立杠') { //立杠
-							param = {
-								district: this.XZQValue.dictValue,
-								areaId: this.XQValue.id,
-								buildingId: this.LDValue.id,
-								unitId: this.DYValue.id,
-								houseId: this.FJValue.id,
-								enginType: this.objValue.enginType, //写死 上一页面传过来的 
-								enginClassification: this.objValue
-									.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-								enginCycle: this.projectValue.dictValue, //工程周期
-								zEngineeringNodeBo: {
-									type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-									zEngineeringInfoBo: {
-										constructAccordingDrawings: this.isCheck, //是否按图纸施工
-										zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-										zEngineeringMaterialBo: [{
-											materialQuality: this.materialValue.id, //材质
-											specifications: this.specificationValue.id, //规格
-											number: this.inputNumberValue //米数
-										}]
-									}
+				},
+
+				againSubmit() {
+					//提交
+					let param = ';'
+					if (this.objValue.enginClassValue == '拆旧管' || this.objValue.enginClassValue ==
+						'打孔') { //拆旧管  打孔
+						param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							houseId: this.FJValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+									zEngineeringMaterialBo: [{
+										corrosionLevel: this.LevelValue.dictValue //腐蚀等级 //孔距
+									}]
 								}
+							}
 
+						}
+						//this.onsubmit(param)
+					} else if (this.objValue.enginClassValue == '报警器' || this.objValue.enginClassValue ==
+						'切断阀') { //报警器切断阀
+						param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							houseId: this.FJValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+									zEngineeringMaterialBo: [{
+										brand: this.brandValue.dictValue, //品牌
+										// number: this.inputNumberValue //米数
+									}]
+								}
 							}
 
+						}
 
-						} else if (this.objValue.enginClassValue == '挂表') { //挂表
-							param = {
-								district: this.XZQValue.dictValue,
-								areaId: this.XQValue.id,
-								buildingId: this.LDValue.id,
-								unitId: this.DYValue.id,
-								houseId: this.FJValue.id,
-								enginType: this.objValue.enginType, //写死 上一页面传过来的 
-								enginClassification: this.objValue
-									.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-								enginCycle: this.projectValue.dictValue, //工程周期
-								zEngineeringNodeBo: {
-									type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-									zEngineeringInfoBo: {
-										constructAccordingDrawings: this.isCheck, //是否按图纸施工
-										zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-										zEngineeringMaterialBo: [{
-											brand: this.brandValue.dictValue, //品牌
-											//number: this.inputNumberValue //米数
-										}]
-									}
+					} else if (this.objValue.enginClassValue == '立杠') { //立杠
+						param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							houseId: this.FJValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+									zEngineeringMaterialBo: [{
+										materialQuality: this.materialValue.id, //材质
+										specifications: this.specificationValue.id, //规格
+										number: this.inputNumberValue //米数
+									}]
 								}
-
 							}
-						} else if (this.objValue.enginClassValue == '阀管') { //自闭阀
-							param = {
-								district: this.XZQValue.dictValue,
-								areaId: this.XQValue.id,
-								buildingId: this.LDValue.id,
-								unitId: this.DYValue.id,
-								houseId: this.FJValue.id,
-								enginType: this.objValue.enginType, //写死 上一页面传过来的 
-								enginClassification: this.objValue
-									.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-								enginCycle: this.projectValue.dictValue, //工程周期
-								zEngineeringNodeBo: {
-									type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-									zEngineeringInfoBo: {
-										constructAccordingDrawings: this.isCheck, //是否按图纸施工
-										zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-										zEngineeringMaterialBo: [{
-											visitType: this.doorValue.dictValue, //上门类型
-											selfClosingValveType: this.SelfClosValve.dictValue, //自闭阀类型
-											materialQuality: this.materialValue.id, //材质
-											specifications: this.specificationValue.id, //规格
-											number: this.inputNumberValue //米数
-										}]
-									}
-								}
 
-							}
 						}
-						uni.showLoading()
-						addTearOldPipe(param).then(res => {
-
-							if (res.code == '200') {
-								uni.hideLoading()
-								uni.showToast({
-									title: res.msg,
-									icon: 'none',
-									//显示持续时间为 3秒
-									duration: 2000
-								});
-								setTimeout(function() {
-									uni.navigateBack();
-								}, 1000)
 
+
+					} else if (this.objValue.enginClassValue == '挂表') { //挂表
+						param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							houseId: this.FJValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+									zEngineeringMaterialBo: [{
+										brand: this.brandValue.dictValue, //品牌
+										//number: this.inputNumberValue //米数
+									}]
+								}
 							}
-						})
+
+						}
+					} else if (this.objValue.enginClassValue == '阀管') { //自闭阀
+						param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							houseId: this.FJValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+									zEngineeringMaterialBo: [{
+										visitType: this.doorValue.dictValue, //上门类型
+										selfClosingValveType: this.SelfClosValve.dictValue, //自闭阀类型
+										materialQuality: this.materialValue.id, //材质
+										specifications: this.specificationValue.id, //规格
+										number: this.inputNumberValue //米数
+									}]
+								}
+							}
+
+						}
 					}
+					uni.showLoading()
+					addTearOldPipe(param).then(res => {
+
+						if (res.code == '200') {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								//显示持续时间为 3秒
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack();
+							}, 1000)
+
+						}
+					})
 
 				},
 				history() {