Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0

components/bottomSheet/bottomSheet.vue

@@ -4,7 +4,7 @@
 		</view>
 		<view class="share-item" :class="{'share-show': shareState}">
 			<view class="share-to">
-				<text style="font-size: 16px;color: #000;">{{title}}</text>
+				<text style="font-size: 14px;color: #000;">{{title}}</text>
 			</view>
 
 
@@ -31,68 +31,37 @@
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									施工时间:{{value.createTime}}</view>
 							</view>
-							<view v-else-if="title=='立杠'||title=='表后管'">
+							<view v-else-if="title=='立杠'||title=='表后管'||title=='挂表'||title=='阀管'||title=='报警器切断阀'">
 								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									规格:{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									施工时间:{{value.createTime}}</view>
-							</view>
-							<view v-else-if="title=='挂表'">
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									品牌:{{value.zEngineeringMaterialBo[0].brand}}</view>
-
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									施工时间:{{value.createTime}}</view>
-							</view>
-							<!-- <view v-else-if="title=='表后管'">
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									规格:{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
-									施工时间:{{value.createTime}}</view>
-							</view> -->
-							<view v-else-if="title=='阀管'">
-								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
+									style="font-size: 13px;color: #000;margin-top: 5px;" v-show="title=='阀管'">
 									上门类型:{{value.zEngineeringMaterialBo[0].visitType}}</view>
 								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
+									style="font-size: 13px;color: #000;margin-top: 5px;" v-show="title=='阀管'">
 									自闭阀类型:{{value.zEngineeringMaterialBo[0].selfClosingValveType}}</view>
 								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
+									style="font-size: 13px;color: #000;margin-top: 5px;"
+									v-show="title=='立杠'||title=='表后管'||title=='阀管'">
 									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
 								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
+									style="font-size: 13px;color: #000;margin-top: 5px;"
+									v-show="title=='立杠'||title=='表后管'||title=='阀管'">
 									规格:{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
 								<view class="uni-media-list-text-top"
-									style="font-size: 13px;color: #000;margin-top: 5px;">
+									style="font-size: 13px;color: #000;margin-top: 5px;" v-show="title=='挂表'">
+									品牌:{{value.zEngineeringMaterialBo[0].brand}}</view>
+									<view class="uni-media-list-text-top"
+										style="font-size: 13px;color: #000;margin-top: 5px;" v-show="title=='报警器切断阀'">
+										厂家:{{value.zEngineeringMaterialBo[0].brand}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;" v-show="title=='立杠'||title=='表后管'||title=='挂表'||title=='阀管'">
 									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
 								<view class="uni-media-list-text-top"
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									施工时间:{{value.createTime}}</view>
 							</view>
 							
-							<view v-else-if="title=='放线'||title=='挖沟'||title=='焊接'||title=='下沟'||title=='除锈'||title=='刷油'||title=='打磨'||title=='焊接'">
+							<view
+								v-else-if="title=='放线'||title=='挖沟'||title=='焊接'||title=='下沟'||title=='除锈'||title=='刷油'||title=='打磨'||title=='焊接'">
 								<view class="uni-media-list-text-top"
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									施工时间:{{value.constructTime}}</view>
@@ -320,25 +289,25 @@
 			margin-left: 15px;
 			align-items: center;
 
-			// &::after {
-			// 	content: '';
-			// 	width: 240rpx;
-			// 	height: 0rpx;
-			// 	border-top: 1px solid #E4E7ED;
-			// 	-webkit-transform: scaleY(0.5);
-			// 	transform: scaleY(0.5);
-			// 	margin-left: 30rpx;
-			// }
+			&::after {
+				content: '';
+				width: 240rpx;
+				height: 0rpx;
+				border-top: 1px solid #E4E7ED;
+				-webkit-transform: scaleY(0.5);
+				transform: scaleY(0.5);
+				margin-left: 30rpx;
+			}
 
-			// &::before {
-			// 	content: '';
-			// 	width: 240rpx;
-			// 	height: 0rpx;
-			// 	border-top: 1px solid #E4E7ED;
-			// 	-webkit-transform: scaleY(0.5);
-			// 	transform: scaleY(0.5);
-			// 	margin-right: 30rpx;
-			// }
+			&::before {
+				content: '';
+				width: 240rpx;
+				height: 0rpx;
+				border-top: 1px solid #E4E7ED;
+				-webkit-transform: scaleY(0.5);
+				transform: scaleY(0.5);
+				margin-right: 30rpx;
+			}
 		}
 
 		.content {

package.json

@@ -1,19 +0,0 @@
-{
-    "id": "dengrq-datetime-picker",
-    "name": "日期时间选择器组件",
-    "displayName": "日期时间选择器组件",
-    "version": "1.0.6",
-    "description": "适用于 uni-app 的日期时间选择器组件，兼容 H5 和小程序。支持多种日期模式，包括年月日 / 年月日时分秒 / 年月 / 年份 / 时分秒 / 时分，支持配置默认选中日期与最小最大日期范围。",
-    "keywords": [
-        "日期选择器",
-        "时间选择器",
-        "日期时间选择器",
-        "日期范围选择"
-    ],
-    "dcloudext": {
-        "category": [
-            "前端组件",
-            "通用组件"
-        ]
-    }
-}

pages/oldrenovation/courtyard/courtyard.vue

@@ -9,13 +9,11 @@
 						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 
 					</view>
@@ -28,13 +26,11 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 
 					</view>
@@ -48,13 +44,11 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -66,13 +60,11 @@
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -102,7 +94,7 @@
 							<view>
 								施工时间
 							</view>
-							<view  @click="openDatetimePicker('sg')">
+							<view @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
 								<uni-icons style=" position: absolute;" type="right" color="darkgray"
 									size="15"></uni-icons>
@@ -188,7 +180,7 @@
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
 								maxlength="11" style="margin-left: 10px;text-align: right;"></input>
 						</view>
-						
+
 					</view>
 
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
@@ -258,7 +250,7 @@
 					headers: {
 						Authorization: "Bearer " + getToken()
 					},
-				
+
 					type: '',
 					open: false,
 					objValue: '', //上一页面传过来的值  新增接口用
@@ -317,7 +309,7 @@
 
 			},
 			methods: {
-			
+
 				// 打开picker
 				openDatetimePicker(type) {
 					this.timeType = type;
@@ -805,59 +797,50 @@
 						this.$modal.msg("请选择小区")
 						return
 					}
-					// if (this.isEmpty(this.LDValue.id)) {
-					// 	this.$modal.msg("请选择楼栋")
-					// }
-					// if (this.isEmpty(this.DYValue.id)) {
-					// 	this.$modal.msg("请选择单元")
-					// }
-					// if (this.isEmpty(this.FJValue.id)) {
-					// 	this.$modal.msg("请选择房间")
-					// } else {
-					else {
-						let unitId = '';
-						let houseId = '';
-						let buildingId = '';
-						if (this.isEmpty(this.LDValue.id)) {
-							buildingId = '';
-						} else {
-							buildingId = this.LDValue.id
-						}
-						let param = {
-							areaId: this.XQValue.id, // 小区id
-							buildingId: buildingId, // 楼宇id
-							enginCycle: this.projectValue.dictValue, // 工程周期
-							unitId: unitId,
-							houseId: houseId, //传空
-							enginType: this.objValue.enginType, //写死 上一页面传过来的
-							enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-						}
-						getRoomProjectId(param).then(res => {
 
-							if (res.code == '200') {
+					let unitId = '';
+					let houseId = '';
+					let buildingId = '';
+					if (this.isEmpty(this.LDValue.id)) {
+						buildingId = '';
+					} else {
+						buildingId = this.LDValue.id
+					}
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: buildingId, // 楼宇id
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						unitId: unitId,
+						houseId: houseId, //传空
+						enginType: this.objValue.enginType, //写死 上一页面传过来的
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
+
+						if (res.code == '200') {
 
-								if (res.data != null) {
+							if (res.data != null) {
 
-									getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
-										res => {
+								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
+									res => {
 
-											this.historyList = res.data
-											if (res.data.zEngineeringNodeBo != null) {
-												this.showHistoryList();
-											} else {
-												this.$modal.msg("暂无历史信息")
-											}
+										this.historyList = res.data
+										if (res.data.zEngineeringNodeBo != null) {
+											this.showHistoryList();
+										} else {
+											this.$modal.msg("暂无历史信息")
+										}
 
-										})
+									})
 
-								} else {
-									this.$modal.msg("暂无工程信息")
-								}
 							} else {
-								this.$modal.msg(res.msg)
+								this.$modal.msg("暂无工程信息")
 							}
-						})
-					}
+						} else {
+							this.$modal.msg(res.msg)
+						}
+					})
+
 				},
 				showHistoryList() {
 					this.$refs.refShare.handleShowShare();

pages/oldrenovation/indoor/indoor.vue

@@ -33,13 +33,11 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 
 					</view>
@@ -53,13 +51,11 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -71,13 +67,11 @@
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -89,13 +83,11 @@
 						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('dy')">
 							<span style="color: darkgray;">请选择单元</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
 							<span style="color: black;">{{DYValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -107,13 +99,11 @@
 						<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('fj')">
 							<span style="color: darkgray;">请选择房间</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
 							<span style="color: black;">{{FJValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -132,8 +122,38 @@
 				<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
 					titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 			</view>
-			<!--拆旧管-->
+			<!--报警器切断阀-->
 			<view class="background">
+				<view v-if="objValue.enginClassValue=='报警器切断阀'">
+					<view class="uni-list">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+							报警器切断阀
+
+							<span
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								@click="history">历史</span>
+						</view>
+
+						<view class="container">
+
+							<text>厂 家</text>
+							<view v-if="this.isEmpty(this.brandValue.dictValue)" style="margin-top: 10;"
+								@click="pickerShow('brand')">
+								<span style="color: darkgray;">请选择厂家</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('brand')">
+								<span style="color: black;">{{brandValue.dictLabel}}</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
+							</view>
+						</view>
+					</view>
+
+				</view>
+				<!--拆旧管-->
+
 				<view v-if="objValue.enginClassValue=='拆旧管'">
 					<view class="uni-list">
 						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
@@ -928,6 +948,13 @@
 						this.$modal.msg("请选择单元")
 					} else if (this.isEmpty(this.FJValue.id)) {
 						this.$modal.msg("请选择房间")
+					} else if (this.objValue.enginClassValue == '报警器切断阀') {
+						if (this.isEmpty(this.brandValue.dictValue)) {
+							this.$modal.msg("请选择厂家")
+						} else {
+							this.onsubmit();
+						}
+
 					} else if (this.objValue.enginClassValue == '打孔') {
 						if (this.isEmpty(this.LevelValue.dictValue)) {
 							this.$modal.msg("请选择孔距") //打孔  判断孔距
@@ -1074,6 +1101,31 @@
 
 							}
 							//this.onsubmit(param)
+						} 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,
@@ -1174,51 +1226,62 @@
 				history() {
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
-					} else if (this.isEmpty(this.XZQValue.dictValue)) {
+						return
+					}
+					if (this.isEmpty(this.XZQValue.dictValue)) {
 						this.$modal.msg("请选择行政区")
-					} else if (this.isEmpty(this.XQValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.XQValue.id)) {
 						this.$modal.msg("请选择小区")
-					} else if (this.isEmpty(this.LDValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg("请选择楼栋")
-					} else if (this.isEmpty(this.DYValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.DYValue.id)) {
 						this.$modal.msg("请选择单元")
-					} else if (this.isEmpty(this.FJValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.FJValue.id)) {
 						this.$modal.msg("请选择房间")
-					} else {
-						let param = {
-							areaId: this.XQValue.id, // 小区id
-							buildingId: this.LDValue.id, // 楼宇id
-							unitId: this.DYValue.id, // 单元id
-							houseId: this.FJValue.id, // 房间id
-							enginCycle: this.projectValue.dictValue, // 工程周期
-							enginType: this.objValue.enginType, //写死 上一页面传过来的
-							enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-						}
-						getRoomProjectId(param).then(res => {
+						return
+					}
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: this.LDValue.id, // 楼宇id
+						unitId: this.DYValue.id, // 单元id
+						houseId: this.FJValue.id, // 房间id
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						enginType: this.objValue.enginType, //写死 上一页面传过来的
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
 
-							if (res.code == '200') {
+						if (res.code == '200') {
 
-								if (res.data != null) {
+							if (res.data != null) {
 
-									getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
+								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
 
-										this.historyList = res.data
-										if (res.data.zEngineeringNodeBo != null) {
-											this.showHistoryList();
-										} else {
-											this.$modal.msg("暂无历史信息")
-										}
+									this.historyList = res.data
+									if (res.data.zEngineeringNodeBo != null) {
+										this.showHistoryList();
+									} else {
+										this.$modal.msg("暂无历史信息")
+									}
 
-									})
+								})
 
-								} else {
-									this.$modal.msg("暂无工程信息")
-								}
 							} else {
-								this.$modal.msg(res.msg)
+								this.$modal.msg("暂无工程信息")
 							}
-						})
-					}
+						} else {
+							this.$modal.msg(res.msg)
+						}
+					})
+
 				},
 				showHistoryList() {
 					this.$refs.refShare.handleShowShare();

pages/oldrenovation/overhead/overhead.vue

@@ -9,13 +9,11 @@
 						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 
 					</view>
@@ -28,13 +26,11 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 
 					</view>
@@ -48,13 +44,11 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -66,13 +60,11 @@
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -84,13 +76,11 @@
 						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('dy')">
 							<span style="color: darkgray;">请选择单元</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
 							<span style="color: black;">{{DYValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -205,7 +195,7 @@
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
 								maxlength="11" style="margin-left: 10px;text-align: right;"></input>
 						</view>
-						
+
 					</view>
 
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
@@ -263,7 +253,7 @@
 		import {
 			getToken
 		} from '../../../utils/auth';
-		
+
 
 		export default {
 			components: {
@@ -276,7 +266,7 @@
 					headers: {
 						Authorization: "Bearer " + getToken()
 					},
-				
+
 					startDate: '2022-02-04',
 					endDate: '2025-02-04',
 					mode: 4,
@@ -340,7 +330,7 @@
 
 			},
 			methods: {
-			
+
 				// 打开picker
 				openDatetimePicker(type) {
 					this.timeType = type;
@@ -836,64 +826,64 @@
 				history() {
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
-					} else if (this.isEmpty(this.XZQValue.dictValue)) {
+						return
+					}
+					if (this.isEmpty(this.XZQValue.dictValue)) {
 						this.$modal.msg("请选择行政区")
-					} else if (this.isEmpty(this.XQValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.XQValue.id)) {
 						this.$modal.msg("请选择小区")
-					} else if (this.isEmpty(this.LDValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg("请选择楼栋")
+						return
 					}
-					//  else if (this.isEmpty(this.DYValue.id)) {
-					// 	this.$modal.msg("请选择单元")
-					// } 
-					// else if (this.isEmpty(this.FJValue.id)) {
-					// 	this.$modal.msg("请选择房间")
-					// } 
-					else {
-
-						let unitId = '';
-						let houseId = '';
-						if (this.isEmpty(this.DYValue.id)) {
-							unitId = '';
-						} else {
-							unitId = this.DYValue.id
-						}
 
-						let param = {
-							areaId: this.XQValue.id, // 小区id
-							buildingId: this.LDValue.id, // 楼宇id
-							unitId: unitId, // 单元id
-							houseId: houseId, // 房间id
-							enginCycle: this.projectValue.dictValue, // 工程周期
-							enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
-							enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-						}
-						getRoomProjectId(param).then(res => {
 
-							if (res.code == '200') {
+					let unitId = '';
+					let houseId = '';
+					if (this.isEmpty(this.DYValue.id)) {
+						unitId = '';
+					} else {
+						unitId = this.DYValue.id
+					}
+
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: this.LDValue.id, // 楼宇id
+						unitId: unitId, // 单元id
+						houseId: houseId, // 房间id
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
 
-								if (res.data != null) {
+						if (res.code == '200') {
 
-									getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
-										res => {
+							if (res.data != null) {
 
-											this.historyList = res.data
-											if (res.data.zEngineeringNodeBo != null) {
-												this.showHistoryList();
-											} else {
-												this.$modal.msg("暂无历史信息")
-											}
+								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
+									res => {
 
-										})
+										this.historyList = res.data
+										if (res.data.zEngineeringNodeBo != null) {
+											this.showHistoryList();
+										} else {
+											this.$modal.msg("暂无历史信息")
+										}
+
+									})
 
-								} else {
-									this.$modal.msg("暂无工程信息")
-								}
 							} else {
-								this.$modal.msg(res.msg)
+								this.$modal.msg("暂无工程信息")
 							}
-						})
-					}
+						} else {
+							this.$modal.msg(res.msg)
+						}
+					})
 				},
 				showHistoryList() {
 					this.$refs.refShare.handleShowShare();