民用旧改室内暂存功能

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:8080',
-	//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/enginproject/enginproject.vue

@@ -1354,9 +1354,7 @@
 						// 	return
 						// }
 
-					}
-
-					if (this.objValue.value == '调压柜') {
+					} else if (this.objValue.value == '调压柜') {
 
 						if (this.imgBoxArr.length <= 0) {
 							this.$modal.msg('请上传调压箱铭牌照片')

pages/municipal/municipal.vue

@@ -1173,9 +1173,7 @@
 							})
 						})
 
-					}
-
-					if (this.objValue.title == '回填、撤场') {
+					} else if (this.objValue.title == '回填、撤场') {
 						if (this.imgHtqArr.length <= 0 && this.imgJspsArr.length <= 0 && this.imgHthArr.length <= 0) {
 							this.$modal.msg('请上传照片')
 							return

pages/oldrenovation/indoor/indoor.vue

@@ -2,20 +2,14 @@
 		<scroll-view>
 			<view class="background">
 				<view>
-					<view
-						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+					<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 :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'
-							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						<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'
-							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						<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>
 				</view>
@@ -25,8 +19,7 @@
 							<view>
 								行政区
 							</view>
-							<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
-								@click="pickerShow('xzq')">
+							<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;" @click="pickerShow('xzq')">
 								<span style="color: darkgray;">请选择行政区</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -43,8 +36,7 @@
 								小区
 							</view>
 
-							<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('xq')">
+							<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>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -59,8 +51,7 @@
 							<view class="uni-list-cell-left">
 								楼栋
 							</view>
-							<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('ld')">
+							<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>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -75,8 +66,7 @@
 							<view class="uni-list-cell-left">
 								单元
 							</view>
-							<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('dy')">
+							<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>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -91,8 +81,7 @@
 							<view class="uni-list-cell-left">
 								房间
 							</view>
-							<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('fj')">
+							<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>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -111,13 +100,11 @@
 							<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; "></input>
+									<input class="uni-input" type="tel" v-model="user.phone" maxlength="11" style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 
 								</view>
 							</view>
-							<button v-if="index!=0" @click="this.currentResidentsPhoe.splice(index,1)"
-								class="sc-btn">删除</button>
+							<button v-if="index!=0" @click="this.currentResidentsPhoe.splice(index,1)" class="sc-btn">删除</button>
 						</view>
 						<button @click="this.currentResidentsPhoe.push({phone:''})" class="tj-btn">添加</button>
 
@@ -127,16 +114,13 @@
 			</view>
 
 
-			<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
-				subtitleKey="id" v-model="name"></SelectPicker>
+			<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name" subtitleKey="id" v-model="name"></SelectPicker>
 
 
-			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
-				titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
+			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict" titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></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>
+				<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 class="tj-btn" style="margin: 40rpx 90rpx;" @click="serchByCard"> 搜索</button>
@@ -145,15 +129,12 @@
 
 				<view>
 
-					<view
-						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+					<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 						户主信息
 
-						<image v-if="change==false" :src="loadImgSrc('icon_user_open.png')" @click='change1'
-							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						<image v-if="change==false" :src="loadImgSrc('icon_user_open.png')" @click='change1' style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
 						</image>
-						<image v-if="change==true" :src="loadImgSrc('icon_user_close.png')" @click='change1'
-							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						<image v-if="change==true" :src="loadImgSrc('icon_user_close.png')" @click='change1' style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
 						</image>
 					</view>
 				</view>
@@ -186,8 +167,7 @@
 								户主身份证号码
 							</view>
 							<view class="uni-list-cell-db" style="margin-top: 10;">
-								<span style="color: darkgray;"
-									v-model="houseHeadIDcardNumber">{{houseHeadIDcardNumber}}</span>
+								<span style="color: darkgray;" v-model="houseHeadIDcardNumber">{{houseHeadIDcardNumber}}</span>
 							</view>
 
 						</view>
@@ -209,20 +189,16 @@
 			<view class="background">
 				<view v-if="objValue.enginClassValue=='报警器'||objValue.enginClassValue=='切断阀'">
 					<view class="uni-list">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
 							{{objValue.enginClassValue}}
 
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>厂 家</text>
-							<view v-if="this.isEmpty(this.brandValue.id)" style="margin-top: 10;"
-								@click="pickerShow('brand')">
+							<view v-if="this.isEmpty(this.brandValue.id)" style="margin-top: 10;" @click="pickerShow('brand')">
 								<span style="color: darkgray;">请选择厂家</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -238,12 +214,9 @@
 
 				<view v-if="objValue.enginClassValue=='拆旧管'">
 					<view class="uni-list">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							拆旧管
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
@@ -251,8 +224,7 @@
 							<view>
 								腐蚀等级
 							</view>
-							<view v-if="this.isEmpty(this.LevelValue.id)" style="margin-top: 10;"
-								@click="pickerShow('fsdj')">
+							<view v-if="this.isEmpty(this.LevelValue.id)" style="margin-top: 10;" @click="pickerShow('fsdj')">
 								<span style="color: darkgray;">请选择腐蚀等级</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -265,13 +237,10 @@
 				</view>
 				<view v-if="objValue.enginClassValue=='打孔'">
 					<view class="uni-list">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							打孔
 
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 
 						<!-- <view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
@@ -294,13 +263,10 @@
 				<!--立杠-->
 				<view v-else-if="objValue.enginClassValue=='立杠'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							立杠
 
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -308,8 +274,7 @@
 							<view>
 								材 质
 							</view>
-							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
-								@click="pickerShow('cz')">
+							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -323,8 +288,7 @@
 							<view>
 								规 格
 							</view>
-							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
-								@click="pickerShow('gg')">
+							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -337,11 +301,9 @@
 							<text>米 数</text>
 							<!-- style="margin-left: 10px;text-align: right;" -->
 							<view style="display: flex; justify-content: right; width: 70%;">
-								<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								<input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1" style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</view>
 						</view>
 					</view>
@@ -349,13 +311,10 @@
 				<!--挂表-->
 				<view v-else-if="objValue.enginClassValue=='挂表'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							挂表
 
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -363,8 +322,7 @@
 							<view>
 								品 牌
 							</view>
-							<view v-if="this.isEmpty(this.brandValue.id)" style="margin-top: 10;"
-								@click="pickerShow('brand')">
+							<view v-if="this.isEmpty(this.brandValue.id)" style="margin-top: 10;" @click="pickerShow('brand')">
 								<span style="color: darkgray;">请选择品牌</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -380,13 +338,10 @@
 				<!--表后管-->
 				<view v-else-if="objValue.enginClassValue=='表后管'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							表后管
 
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -394,8 +349,7 @@
 							<view>
 								材 质
 							</view>
-							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
-								@click="pickerShow('cz')">
+							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
@@ -407,8 +361,7 @@
 							<view>
 								规 格
 							</view>
-							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
-								@click="pickerShow('gg')">
+							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -421,11 +374,9 @@
 							<text>米 数</text>
 							<!-- style="margin-left: 10px;text-align: right;" -->
 							<view style="display: flex; justify-content: right; width: 70%;">
-								<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								<input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1" style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</view>
 
 						</view>
@@ -434,21 +385,17 @@
 				<!--阀管-->
 				<view v-else-if="objValue.enginClassValue=='阀管'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view
-							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							阀管
 
-							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
-								@click="history">{{historyName}}</span>
+							<span style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;" @click="history">{{historyName}}</span>
 						</view>
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								上门类型
 							</view>
-							<view v-if="this.isEmpty(this.doorValue.dictValue)" style="margin-top: 10;"
-								@click="pickerShow('door')">
+							<view v-if="this.isEmpty(this.doorValue.dictValue)" style="margin-top: 10;" @click="pickerShow('door')">
 								<span style="color: darkgray;">请选择上门类型</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -462,8 +409,7 @@
 							<view>
 								自闭阀厂家
 							</view>
-							<view v-if="this.isEmpty(this.SelfClosValve.id)" style="margin-top: 10;"
-								@click="pickerShow('zbf')">
+							<view v-if="this.isEmpty(this.SelfClosValve.id)" style="margin-top: 10;" @click="pickerShow('zbf')">
 								<span style="color: darkgray;">请选择自闭阀厂家</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -477,8 +423,7 @@
 							<view>
 								灶具管厂家
 							</view>
-							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
-								@click="pickerShow('cz')">
+							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择灶具管厂家</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -492,8 +437,7 @@
 							<view>
 								规 格
 							</view>
-							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
-								@click="pickerShow('gg')">
+							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
@@ -517,21 +461,16 @@
 				<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=""
-							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"
-							v-show="reviewStatus!='1'"></image>
+						<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()" v-show="reviewStatus!='1'"></image>
 						<view v-for="(item,index) in imgArr" :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: 200rpx; height: 200rpx; margin: 0 12rpx;"
-									@click="showPhoto(index)">
+							<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: 200rpx; height: 200rpx; margin: 0 12rpx;" @click="showPhoto(index)">
 								</image>
 							</view>
 							<view v-else>
 								<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 							</view>
-							<view @click="remove(index)"
-								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+							<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 								</image>
 							</view>
@@ -541,7 +480,8 @@
 				</view>
 			</view>
 			<view class="action-btn" v-show="reviewStatus!='1'">
-				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
+				<button @click="submit('submit')" class="btn cu-btn block bg-blue lg round">确认上传</button>
+				<button @click="submit('save')" class="btn cu-btn block bg-blue lg round" v-if="objValue.enginType == 'old_renovation'">暂存</button>
 			</view>
 
 			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
@@ -635,7 +575,9 @@
 					inputIntegerNumberValue: '',
 					inputDecimalNumberValue: '',
 					title: '',
-					historyList: {} //历史数据
+					historyList: {}, //历史数据
+					tempState: '',
+					tempSelectList: [],
 
 				}
 			},
@@ -661,6 +603,20 @@
 				}
 			},
 			methods: {
+
+				getSelectName(id) {
+
+
+					let res = '';
+					this.tempSelectList.forEach((val) => {
+						if (id == val.id) {
+							console.log("====", val.name)
+							res = val.name
+
+						};
+					})
+					return res;
+				},
 				copyAddress() {
 					if (uni.getStorageSync('XZQValue') != {}) {
 						this.type = 'xzq';
@@ -1217,8 +1173,9 @@
 				},
 
 				//提交数据
-				submit() {
+				submit(e) {
 
+					this.tempState = e == 'submit' ? '' : '99'
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
 						return
@@ -1256,8 +1213,7 @@
 								this.$modal.msg('现住人电话不能为空')
 								throw new Error('End Loop')
 							}
-							if (list.phone.length == 11 || list.phone.length == 8) {
-							}else{
+							if (list.phone.length == 11 || list.phone.length == 8) {} else {
 								this.$modal.msg('现住人电话填写错误')
 								throw new Error('End Loop')
 							}
@@ -1323,9 +1279,11 @@
 							this.$modal.msg("请输入米数")
 						} else if (this.imgArr.length <= 0) {
 							this.$modal.msg('请上传照片或视频')
-						} else if (this.loading == false) {
-							this.$modal.msg('照片或视频未上传完毕，无法提交！')
-						} else {
+						}
+						// else if (this.loading == false) {
+						// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')
+						// }
+						else {
 							const hasImage = this.imgArr.some(item => item.endsWith('.jpg') || item.endsWith(
 									'.png') || item
 								.endsWith('.jpeg') || item.endsWith('.JPG') || item.endsWith('.PNG') || item
@@ -1344,7 +1302,6 @@
 								this.currentResidentsPhoe.forEach((list) => {
 									phoneArr.push(list.phone)
 								})
-								console.log("ddd", phoneArr.join())
 
 								putRoomDetails(this.FJValue.id, phoneArr
 										.join())
@@ -1365,6 +1322,7 @@
 													type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 													zEngineeringInfoBo: {
 														constructAccordingDrawings: this.isCheck, //是否按图纸施工
+														state: this.tempState,
 														zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
 														zEngineeringMaterialBo: [{
@@ -1428,14 +1386,15 @@
 
 					if (this.imgArr.length <= 0) {
 						this.$modal.msg('请上传照片或视频')
-					} else if (this.loading == false) {
-						this.$modal.msg('照片或视频未上传完毕，无法提交！')
-					} else {
+					}
+					// else if (this.loading == false) {
+					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')
+					// } 
+					else {
 						let phoneArr = [];
 						this.currentResidentsPhoe.forEach((list) => {
 							phoneArr.push(list.phone)
 						})
-						console.log("ddd", phoneArr.join())
 
 						putRoomDetails(this.FJValue.id, phoneArr.join())
 							.then(res => {
@@ -1451,7 +1410,7 @@
 
 				againSubmit() {
 					//提交
-					let param = ';'
+					let param = '';
 					if (this.objValue.enginClassValue == '拆旧管' || this.objValue.enginClassValue ==
 						'打孔') { //拆旧管  打孔
 						param = {
@@ -1468,11 +1427,12 @@
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									state: this.tempState,
 									zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
-									// zEngineeringMaterialBo: [{
-									// 	corrosionLevel: this.LevelValue.id //腐蚀等级 //孔距
-									// }]
+									zEngineeringMaterialBo: [{
+										corrosionLevel: this.LevelValue.id //腐蚀等级 //孔距
+									}]
 								}
 							}
 
@@ -1494,6 +1454,7 @@
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									state: this.tempState,
 									zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
 									zEngineeringMaterialBo: [{
@@ -1520,6 +1481,7 @@
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									state: this.tempState,
 									zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
 									zEngineeringMaterialBo: [{
@@ -1548,6 +1510,7 @@
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									state: this.tempState,
 									zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
 									zEngineeringMaterialBo: [{
@@ -1562,7 +1525,6 @@
 						var onlyNumbers = this.specificationValue.name.replace(/[^\d.]/g, '');
 
 						console.log(this.specificationValue)
-						console.log('数量========', onlyNumbers); // 输出: "123456"
 						param = {
 							district: this.XZQValue.dictValue,
 							areaId: this.XQValue.id,
@@ -1577,6 +1539,7 @@
 								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 								zEngineeringInfoBo: {
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
+									state: this.tempState,
 									zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
 									zEngineeringMaterialBo: [{
@@ -1651,14 +1614,93 @@
 							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' ?
+									// 	'未通过' : '已通过'
+
+
+									if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
+										this.historyName = '已通过';
+
+									} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+										this.historyName = '恢复暂存';
+									} else {
+										this.historyName = '未通过';
+									}
+
+
 									this.historyList = res.data
 									if (res.data.zEngineeringNodeBo != null) {
-										if (res.data.zEngineeringNodeBo.reviewStatus == '0') {
+										if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
 											// this.showHistoryList();
-										} else {
 											this.$modal.msg("当前步骤以审核通过请谨慎！")
+										} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+
+											let dataJson = res.data.zEngineeringNodeBo
+												.zEngineeringInfoBoList[0];
+											this.imgArr = dataJson.zEngiineeringPhotoBoList;
+											this.LevelValue.id = dataJson
+												.zEngineeringMaterialBo[0]
+												.corrosionLevel
+											if (this.objValue.enginClassValue == '拆旧管') {
+												this.LevelValue.id = dataJson
+													.zEngineeringMaterialBo[0]
+													.corrosionLevel
+												this.LevelValue.name = dataJson
+													.zEngineeringMaterialBo[0]
+													.corrosionLevelName
+
+
+											} else if (this.objValue.enginClassValue == '立杠' || this.objValue
+												.enginClassValue == '表后管') {
+												this.materialValue.id = dataJson.zEngineeringMaterialBo[0].materialQuality;
+
+												this.specificationValue.id = dataJson
+													.zEngineeringMaterialBo[0]
+													.specifications;
+												this.materialValue.name = dataJson.zEngineeringMaterialBo[0]
+													.materialQualityName;
+												this.specificationValue.name = dataJson
+													.zEngineeringMaterialBo[0].specificationsName;
+												this.inputIntegerNumberValue = this.getIntegerPart(
+													dataJson
+													.zEngineeringMaterialBo[0].number, 0);
+												this.inputDecimalNumberValue = this.getIntegerPart(dataJson
+													.zEngineeringMaterialBo[0].number, 1);
+											} else if (this.objValue.enginClassValue == '报警器' || this.objValue
+												.enginClassValue == '切断阀' || this.objValue
+												.enginClassValue == '挂表') {
+
+												this.brandValue.id = dataJson.zEngineeringMaterialBo[0]
+													.brand
+												this.brandValue.name = dataJson.zEngineeringMaterialBo[0]
+													.brandName
+
+
+											} else if (this.objValue.enginClassValue == '阀管') {
+												this.doorValue.dictValue = dataJson
+													.zEngineeringMaterialBo[0]
+													.visitType;
+												this.doorValue.dictLabel = dataJson
+													.zEngineeringMaterialBo[0]
+													.visitType;
+												this.SelfClosValve.id = dataJson
+													.zEngineeringMaterialBo[0]
+													.selfClosingValveType;
+												this.SelfClosValve.name = dataJson
+													.zEngineeringMaterialBo[0]
+													.selfClosingValveTypeName;
+												this.materialValue.id = dataJson
+													.zEngineeringMaterialBo[0]
+													.materialQuality;
+												this.specificationValue.id = dataJson
+													.zEngineeringMaterialBo[0]
+													.specifications;
+												this.materialValue.name = dataJson.zEngineeringMaterialBo[0]
+													.materialQualityName;
+												this.specificationValue.name = dataJson
+													.zEngineeringMaterialBo[0].specificationsName;
+											}
+
 										}
 									} else {
 										this.$modal.msg("暂无历史信息")
@@ -1675,6 +1717,18 @@
 					})
 
 				},
+
+				getIntegerPart(numStr, i) {
+					return numStr.toString().split('.')[i] == undefined ? '0' : numStr.toString().split('.')[i];
+				},
+				setInfoBoNumber(key, number, i) {
+					let Ynumber = this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0]
+						.number;
+					let resAry = Ynumber.toString().split('.');
+					resAry[i] = number
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0].number = resAry
+						.join('.');
+				},
 				showHistoryList() {
 					this.$refs.refShare.handleShowShare();
 				}