民用工程旧改庭院增加暂存功能

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -52,24 +52,19 @@
 
 
 
-				<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="dictLabel"></SelectPicker>
+				<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict" titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 			</view>
 
 			<view class="background">
 				<view>
 					<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">历史</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;">
 
@@ -88,10 +83,7 @@
 							<view class="uni-common-mt" style="width: 100%;">
 								<text class="uni-title uni-common-pl">施工内容</text>
 								<view style="width: 100%;box-sizing: border-box;">
-									<textarea class="textarea" placeholder="请输入施工内容" maxlength="255"
-										placeholder-style="padding: 10rpx;"
-										style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
-										auto-height v-model="projectContent"></textarea>
+									<textarea class="textarea" placeholder="请输入施工内容" maxlength="255" placeholder-style="padding: 10rpx;" style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;" auto-height v-model="projectContent"></textarea>
 								</view>
 							</view>
 						</view>
@@ -101,26 +93,19 @@
 
 
 					</view>
-					<view
-						v-if="objValue.enginClassValue=='开挖前' || objValue.enginClassValue=='开挖后' ||objValue.enginClassValue=='焊口照片' ||objValue.enginClassValue== '隐蔽工程'||objValue.enginClassValue== '管道施工记录'"
-						class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+					<view v-if="objValue.enginClassValue=='开挖前' || objValue.enginClassValue=='开挖后' ||objValue.enginClassValue=='焊口照片' ||objValue.enginClassValue== '隐蔽工程'||objValue.enginClassValue== '管道施工记录'" 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('other')"
-								v-show="reviewStatus!='1'"></image>
+							<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('other')" 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,'other')">
+								<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,'other')">
 									</image>
 								</view>
 								<view v-else>
 									<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 								</view>
-								<view @click="remove(index,'other')"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<view @click="remove(index,'other')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 									</image>
 								</view>
@@ -131,21 +116,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('sfht')"
-									v-show="reviewStatus!='1'"></image>
+								<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('sfht')" v-show="reviewStatus!='1'"></image>
 								<view v-for="(item,index) in stonePowderArr" :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,'sfht')">
+									<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,'sfht')">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="remove(index,'sfht')"
-										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<view @click="remove(index,'sfht')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
 									</view>
@@ -155,23 +135,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('jsdps')"
-										v-show="reviewStatus!='1'"></image>
+									<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('jsdps')" v-show="reviewStatus!='1'"></image>
 									<view v-for="(item,index) in warningtTapeArr" :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,'jsdps')">
+										<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,'jsdps')">
 											</image>
 										</view>
 										<view v-else>
-											<video :src="item"
-												style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+											<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 										</view>
-										<view @click="remove(index,'jsdps')"
-											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<view @click="remove(index,'jsdps')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 											</image>
 										</view>
@@ -179,28 +152,18 @@
 								</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;">
-										<image :src="loadImgSrc('updateimg.png')" mode=""
-											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
-											@click="choose('hth')" v-show="reviewStatus!='1'"></image>
-										<view v-for="(item,index) in photosAfterArr" :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,'hth')">
+									<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('hth')" v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in photosAfterArr" :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,'hth')">
 												</image>
 											</view>
 											<view v-else>
-												<video :src="item"
-													style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+												<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 											</view>
-											<view @click="remove(index,'hth')"
-												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-												<image :src="loadImgSrc('icon_close.png')"
-													style=" width: 15px; height: 15px;">
+											<view @click="remove(index,'hth')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 												</image>
 											</view>
 										</view>
@@ -213,21 +176,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('Box')"
-									v-show="reviewStatus!='1'"></image>
+								<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box')" v-show="reviewStatus!='1'"></image>
 								<view v-for="(item,index) in imgBoxArr" :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,'Box')">
+									<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,'Box')">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="remove(index,'Box')"
-										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<view @click="remove(index,'Box')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
 									</view>
@@ -237,21 +195,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('Sfht')"
-									v-show="reviewStatus!='1'"></image>
+								<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht')" v-show="reviewStatus!='1'"></image>
 								<view v-for="(item,index) in imgSfhtArr" :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,'Sfht')">
+									<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,'Sfht')">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="remove(index,'Sfht')"
-										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<view @click="remove(index,'Sfht')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
 									</view>
@@ -261,23 +214,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('Fljd')"
-										v-show="reviewStatus!='1'"></image>
+									<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd')" v-show="reviewStatus!='1'"></image>
 									<view v-for="(item,index) in imgFljdArr" :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,'Fljd')">
+										<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,'Fljd')">
 											</image>
 										</view>
 										<view v-else>
-											<video :src="item"
-												style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+											<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 										</view>
-										<view @click="remove(index,'Fljd')"
-											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<view @click="remove(index,'Fljd')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 											</image>
 										</view>
@@ -286,27 +232,18 @@
 
 								<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('Dtlj')" v-show="reviewStatus!='1'"></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('Dtlj')" v-show="reviewStatus!='1'"></image>
 										<view v-for="(item,index) in imgDtljArr" :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,'Dtlj')">
+											<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,'Dtlj')">
 												</image>
 											</view>
 											<view v-else>
-												<video :src="item"
-													style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+												<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 											</view>
-											<view @click="remove(index,'Dtlj')"
-												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-												<image :src="loadImgSrc('icon_close.png')"
-													style=" width: 15px; height: 15px;">
+											<view @click="remove(index,'Dtlj')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 												</image>
 											</view>
 										</view>
@@ -314,28 +251,18 @@
 								</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;">
-										<image :src="loadImgSrc('updateimg.png')" mode=""
-											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
-											@click="choose('Hldmyh')" v-show="reviewStatus!='1'"></image>
-										<view v-for="(item,index) in imgHldmyhArr" :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,'Hldmyh')">
+									<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('Hldmyh')" v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in imgHldmyhArr" :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,'Hldmyh')">
 												</image>
 											</view>
 											<view v-else>
-												<video :src="item"
-													style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+												<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 											</view>
-											<view @click="remove(index,'Hldmyh')"
-												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-												<image :src="loadImgSrc('icon_close.png')"
-													style=" width: 15px; height: 15px;">
+											<view @click="remove(index,'Hldmyh')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 												</image>
 											</view>
 										</view>
@@ -349,21 +276,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('Tg')"
-									v-show="reviewStatus!='1'"></image>
+								<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Tg')" v-show="reviewStatus!='1'"></image>
 								<view v-for="(item,index) in imgTgArr" :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,'Tg')">
+									<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,'Tg')">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="remove(index,'Tg')"
-										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<view @click="remove(index,'Tg')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
 									</view>
@@ -373,21 +295,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('Nbmh')"
-									v-show="reviewStatus!='1'"></image>
+								<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Nbmh')" v-show="reviewStatus!='1'"></image>
 								<view v-for="(item,index) in imgNbmhArr" :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,'Nbmh')">
+									<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,'Nbmh')">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="remove(index,'Nbmh')"
-										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<view @click="remove(index,'Nbmh')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
 									</view>
@@ -397,23 +314,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('Fhw')"
-										v-show="reviewStatus!='1'"></image>
+									<image :src="loadImgSrc('updateimg.png')" mode="" style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fhw')" v-show="reviewStatus!='1'"></image>
 									<view v-for="(item,index) in imgFhwArr" :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,'Fhw')">
+										<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,'Fhw')">
 											</image>
 										</view>
 										<view v-else>
-											<video :src="item"
-												style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+											<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 										</view>
-										<view @click="remove(index,'Fhw')"
-											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<view @click="remove(index,'Fhw')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 											</image>
 										</view>
@@ -422,27 +332,18 @@
 
 								<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('Bj')"
-											v-show="reviewStatus!='1'"></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('Bj')" v-show="reviewStatus!='1'"></image>
 										<view v-for="(item,index) in imgBjArr" :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,'Bj')">
+											<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,'Bj')">
 												</image>
 											</view>
 											<view v-else>
-												<video :src="item"
-													style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
+												<video :src="item" style="width: 200rpx; height: 200rpx; margin: 0 12rpx;"></video>
 											</view>
-											<view @click="remove(index,'Bj')"
-												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-												<image :src="loadImgSrc('icon_close.png')"
-													style=" width: 15px; height: 15px;">
+											<view @click="remove(index,'Bj')" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 												</image>
 											</view>
 										</view>
@@ -458,12 +359,12 @@
 				</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>
-			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
-				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
+			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099" :time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
 		</scroll-view>
 	</template>
 
@@ -555,6 +456,9 @@
 					imgBjArr: [],
 
 
+					historyName: '恢复暂存',
+					tempState: '',
+
 				}
 			},
 
@@ -1102,8 +1006,8 @@
 					})
 				},
 				//提交数据
-				submit() {
-
+				submit(e) {
+					this.tempState = e == 'submit' ? '' : '99'
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
 						return
@@ -1185,10 +1089,10 @@
 
 
 					}
-					if (this.loading == false) {
-						this.$modal.msg('照片或视频未上传完毕，无法提交！')
-						return
-					}
+					// if (this.loading == false) {
+					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')
+					// 	return
+					// }
 					//提交
 					this.onsubmit();
 
@@ -1219,15 +1123,15 @@
 						zEngineeringNodeBo: {
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
+								state: this.tempState,
 								zEngiineeringPhotoBoList: this.imgArr, //照片集合
-								stonePowder: this.stonePowderArr,
 								warningtTape: this.warningtTapeArr,
 								photosAfter: this.photosAfterArr,
 								constructTime: this.time, //施工时间
 								remark: this.projectContent, //施工内容
 
 								boxBrand: this.imgBoxArr,
-								stonePowder: this.imgSfhtArr,
+								stonePowder: this.stonePowderArr.length > 0 ? this.stonePowderArr : this.imgSfhtArr,
 								lightning: this.imgFljdArr,
 								bottomLeg: this.imgDtljArr,
 								groundHardening: this.imgHldmyhArr,
@@ -1262,6 +1166,23 @@
 
 				},
 				history() {
+					this.imgArr = [];
+					this.projectContent = '';
+					this.stonePowderArr = [];
+					this.warningtTapeArr = [];
+					this.photosAfterArr = [];
+
+					this.imgBoxArr = [];
+					this.imgSfhtArr = [];
+					this.imgFljdArr = [];
+					this.imgDtljArr = [];
+					this.imgHldmyhArr = [];
+
+					this.imgTgArr = [];
+					this.imgNbmhArr = [];
+					this.imgFhwArr = [];
+					this.imgBjArr = [];
+
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
 						return
@@ -1303,7 +1224,43 @@
 
 										this.historyList = res.data
 										if (res.data.zEngineeringNodeBo != null) {
-											this.showHistoryList();
+											//	this.showHistoryList();
+											// if (res.data.zEngineeringNodeBo.reviewStatus != null && res.data.zEngineeringNodeBo.reviewStatus == '99') {
+											// 	this.historyName = '恢复暂存';
+											// } else {
+											// 	this.historyName = '';
+											// }
+
+											if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
+												// this.showHistoryList();
+												this.$modal.msg("当前步骤以审核通过请谨慎！")
+											} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+
+												let dataJson = res.data.zEngineeringNodeBo.zEngineeringInfoBoList[0];
+												this.projectContent = dataJson.remark;
+												this.time = dataJson.constructTime;
+												if (this.objValue.enginClassValue == '开挖前' || this.objValue.enginClassValue == '开挖后' || this.objValue.enginClassValue == '焊口照片' || this.objValue.enginClassValue == '隐蔽工程' || this.objValue.enginClassValue == '管道施工记录') {
+													this.imgArr = dataJson.zEngiineeringPhotoBoList;
+												} else if (this.objValue.enginClassValue == '回填') {
+													this.stonePowderArr = dataJson.stonePowder;
+													this.warningtTapeArr = dataJson.warningtTape;
+													this.photosAfterArr = dataJson.photosAfter;
+												} else if (this.objValue.enginClassValue == '调压柜') {
+													this.imgBoxArr = dataJson.boxBrand;
+													this.imgSfhtArr = dataJson.stonePowder;
+													this.imgFljdArr = dataJson.lightning;
+													this.imgDtljArr = dataJson.bottomLeg;
+													this.imgHldmyhArr = dataJson.groundHardening;
+												} else if (this.objValue.enginClassValue == '阀井') {
+													this.imgTgArr = dataJson.cannula;
+													this.imgNbmhArr = dataJson.wallPlaster;
+													this.imgFhwArr = dataJson.protectiveNet;
+													this.imgBjArr = dataJson.starAnise;
+												}
+
+											} else {
+												this.$modal.msg("暂无暂存信息")
+											}
 										} else {
 											this.$modal.msg("暂无历史信息")
 										}

pages/oldrenovation/indoor/indoor.vue

@@ -1524,7 +1524,6 @@
 					} else if (this.objValue.enginClassValue == '阀管') { //自闭阀
 						var onlyNumbers = this.specificationValue.name.replace(/[^\d.]/g, '');
 
-						console.log(this.specificationValue)
 						param = {
 							district: this.XZQValue.dictValue,
 							areaId: this.XQValue.id,
@@ -1618,16 +1617,12 @@
 									// 	'未通过' : '已通过'
 
 
-									if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
-										this.historyName = '已通过';
-
-									} else if (res.data.zEngineeringNodeBo.reviewStatus == '99') {
+									if (res.data.zEngineeringNodeBo.reviewStatus != null && res.data.zEngineeringNodeBo.reviewStatus == '99') {
 										this.historyName = '恢复暂存';
 									} else {
-										this.historyName = '未通过';
+										this.historyName = '';
 									}
 
-
 									this.historyList = res.data
 									if (res.data.zEngineeringNodeBo != null) {
 										if (res.data.zEngineeringNodeBo.reviewStatus == '1') {
@@ -1638,9 +1633,7 @@
 											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]