Ver código fonte

封堵历史功能开发

menchuang 1 ano atrás
pai
commit
e79b87bdda

+ 14 - 35
components/bottomSheet/bottomSheetGasSealing.vue

@@ -10,7 +10,16 @@
 					:key="key">
 					<view class="uni-media-list">
 						<view class="uni-media-list-body">
+							
 							<view class="uni-media-list-text-top">
+								<view class="tit-text">负责人:</view>
+								<view class="normal-text">{{value.constructUser}}</view>
+							</view>
+							<view class="uni-media-list-text-top">
+								<view class="tit-text">负责人联系电话:</view>
+								<view class="normal-text">{{value.constructPhone}}</view>
+							</view>
+							<view class="uni-media-list-text-top" v-if="!isEmpty(value.constructTime)">
 								<view class="tit-text">施工时间:</view>
 								<view class="normal-text">{{value.constructTime}}</view>
 							</view>
@@ -26,14 +35,6 @@
 									</view>
 								</view>
 							</view>
-							<view class="uni-media-list-text-top">
-								<view class="tit-text">负责人:</view>
-								<view class="normal-text">{{value.constructUser}}</view>
-							</view>
-							<view class="uni-media-list-text-top">
-								<view class="tit-text">负责人联系电话:</view>
-								<view class="normal-text">{{value.constructPhone}}</view>
-							</view>
 
 							<view class="uni-media-list-text-top-no" v-if="type==='pe'">
 								<!-- 开孔照片 -->
@@ -441,6 +442,9 @@
 			};
 		},
 		methods: {
+			isEmpty(str) {
+				return (!str || 0 === str.length);
+			},
 			showPhoto(index, list) {
 				let newArr = [];
 				list.forEach((item, index) => {
@@ -459,7 +463,6 @@
 				var selectData = this.data;
 				this.title = this.titleLabel;
 				this.type = this.titleType;
-				debugger
 				this.historyList = selectData.zEngineeringNodeBo.zEngineeringInfoBoList;
 			},
 			// 显示分享
@@ -473,7 +476,6 @@
 		}
 	}
 </script>
-
 <style lang="scss">
 	.uni-media-list-body {
 		border: 1px solid #eee;
@@ -493,8 +495,6 @@
 		margin-right: 20rpx;
 	}
 
-	.normal-text {}
-
 	.cz-style {
 		background: #e8f4f9;
 		margin: 20rpx;
@@ -560,29 +560,9 @@
 			width: 100%;
 			height: 30px;
 			display: flex;
-			justify-content: left;
-			margin: 30rpx 35rpx;
+			justify-content: center;
+			margin: 30rpx 0;
 			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;
-			// }
-
-			// &::before {
-			// 	content: '';
-			// 	width: 240rpx;
-			// 	height: 0rpx;
-			// 	border-top: 1px solid #E4E7ED;
-			// 	-webkit-transform: scaleY(0.5);
-			// 	transform: scaleY(0.5);
-			// 	margin-right: 30rpx;
-			// }
 		}
 
 		.content {
@@ -621,6 +601,5 @@
 			border-top: 1rpx solid #E4E7ED;
 		}
 
-
 	}
 </style>

+ 10 - 11
pages/gas_sealing_project/gas_sealing_project.vue

@@ -18,11 +18,11 @@
 					<view>
 						工程名称
 					</view>
-					<view v-if="this.isEmpty(this.enginName)" style="margin-top: 10;" @click="pickerShow('name')">
+					<view v-if="this.isEmpty(this.enginName)" @click="pickerShow">
 						<span style="color: darkgray;">请选择工程</span>
 						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
-					<view v-else style="margin-top: 10;" @click="pickerShow('name')">
+					<view v-else @click="pickerShow">
 						<span style="color: black;">{{enginName}}</span>
 						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
@@ -542,7 +542,8 @@
 
 		<SelectPicker :list="rows" @change="projectListSelect" v-if="open" @close="close" titleKey="enginName"
 			subtitleKey="id" v-model="enginName"></SelectPicker>
-		<bottom-sheet ref="refShare" :data="historyList" :titleType="objValue.value" :titleLabel="objValue.Label"></bottom-sheet>
+		<bottom-sheet ref="refShare" :data="historyList" :titleType="objValue.value"
+			:titleLabel="objValue.Label"></bottom-sheet>
 
 		<!-- 下载提示页面 -->
 		<mypopup :show="show_loding" :popupText="popupText" :titleText="titleText" :cancelText="cancelText"
@@ -605,7 +606,7 @@
 				fileSteel06Arr: [], //下堵照片
 				fileSteel07Arr: [], //四通防腐照片
 
-				historyList:{},
+				historyList: {},
 
 				projectTime: "",
 				imgList: [],
@@ -721,13 +722,11 @@
 				})
 
 			},
-			pickerShow(e) {
-				if (e == 'name') {
-					this.open = true;
-					getGasSealingProjectList(this.projectType).then(res => {
-						this.rows = res.rows;
-					})
-				}
+			pickerShow() {
+				this.open = true;
+				getGasSealingProjectList(this.projectType).then(res => {
+					this.rows = res.rows;
+				})
 			},
 			changeSelect(e) {