优化，增加完成时间可选， 上报类型

config/.env.dev.js

@@ -6,7 +6,7 @@ const UNI_APP = {
 	BASE_URL: 'https://youdian-test.hbjp.com.cn/floorlock-server/',
 	//##https://youdian-test.hbjp.com.cn/floorlock-portal/#/home
 	
-	BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
+	//BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
 	//BASE_URL: 'https://dgj.jzrccs.com/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
@@ -16,6 +16,7 @@ const UNI_APP = {
 
 
 	openId:"oRGjz7GpSbld27nUK9Q6V6jvXMJo",
+	openId:"oRGjz7DZM-rK3MpkjV6_VnoUhLI0",
 	
 	
 	//appid

pages/index/index.vue

@@ -34,7 +34,7 @@
 					故障上报
 				</view>
 			</view>
-			<view class="item-na-b"  >
+			<view class="item-na-b"  v-if="isAdmin"  >
 
 			</view>
 			<view class="item-na end"   @click="gotoUrl('/pages/team/teamList')" v-if="isAdmin"  >
@@ -44,8 +44,13 @@
 				<view class="na-text">
 					团队管理
 				</view>
-			</view>
-			<view class="item-na end"   @click="gotoUrl('/pages/task/listTask')" v-else  >
+			</view>
+			
+			<view class="item-na-b"  >
+			
+			</view>
+			
+			<view class="item-na end"   @click="gotoUrl('/pages/task/listTask')"   >
 				<view class="na-img">
 					<image class="img" src="@/assets/img/index/na-2.png" mode=""></image>
 				</view>
@@ -155,7 +160,10 @@
 					</view>
 					<view class="body">
 						<view class="line1">
-							<view class="title">
+							<view class="title">
+								<span  v-if="item.type" :class="'typeN typeN'+item.type">
+									{{item.typeN}}
+								</span>
 								{{item.errorCodeText}}
 
 							</view>
@@ -691,8 +699,28 @@ import {
 						font-size: 24rpx;
 						margin-top: 8rpx;
 					}
-					.line1 {
-						.title {
+					.line1 {
+						.typeN{
+							font-size: 24rpx;
+							margin-right: 8rpx;
+							display: flex;
+							align-items: center;
+								border-radius: 4px;
+								padding: 2px 8rpx;
+								color: #fff;
+								font-weight: 400;
+						}
+						.typeN1{
+							background-color:#1677ff;
+							//border: 1px solid #1677ff;
+						}
+						.typeN2{
+							background-color:#19be6b;
+							//border: 1px solid #19be6b;
+							 
+						}
+						.title {
+							display: flex;
 							color: rgba(51, 51, 51, 1);
 							font-size: 28rpx;
 							font-weight: bold;

pages/task/maintenanceTaks.vue

@@ -2,7 +2,10 @@
 	<view  class="jpmain  " >
 			<u-navbar  title="维修结果" title-color="#101010"></u-navbar>
 			
-			
+				<u-picker mode="time" v-model="completionTimeShow"
+				@confirm="completionTimeConfirm" :default-time="taskInfo.completionTime"
+				 :params="params"></u-picker>
+
 			
 			<view class="list" >
 				<view class="item">
@@ -11,8 +14,12 @@
 				
 					</view>
 					<view class="value">
+						<span  v-if="floorlockErrorRecord.type" :class="'typeN typeN'+floorlockErrorRecord.type">
+							{{floorlockErrorRecord.typeN}}
+						</span>
 						{{floorlockErrorRecord.errorCodeText}}
 						
+						
 					</view>
 				</view>
 				<view class="item item-plus"  v-if="floorlockErrorRecord.errorDesc">
@@ -47,6 +54,16 @@
 						
 					</view>
 				</view>
+				<view class="item" v-if="floorlockErrorRecord.type==2">
+					<view class="name">
+						上报人
+				
+					</view>
+					<view class="value">
+						{{floorlockErrorRecord.createByName}}
+						
+					</view>
+				</view>
 			</view>
 			
 			
@@ -56,7 +73,7 @@
 						地锁编号
 				
 					</view>
-					<view class="value">
+					<view class="value valueplus">
 						{{floorlockInfo.lockNo}}
 						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 					</view>
@@ -76,7 +93,7 @@
 						所属停车场
 				
 					</view>
-					<view class="value" @click="navigate">
+					<view class="value valueplus" @click="navigate">
 						<view>{{parkingInfo.name}}</view>
 						<image class="img" v-if="parkingInfo.latitude&&parkingInfo.longitude"
 						 src="@/assets/img/daohuang.png" mode=""></image>
@@ -95,15 +112,22 @@
 				
 			</view>
 			<view class="list" >
-				<view class="item"  v-if="floorlockErrorRecord.status!=0">
+				<view class="item"  >
 					<view class="name">
 						处理时间
 				
 					</view>
-					<view class="value">
+					<view class="value" v-if="floorlockErrorRecord.status!=0">
 						{{floorlockErrorRecord.updateTime}}
 						
 					</view>
+					<view class="value valueplus" 
+					@click="completionTimeShow=true"
+					v-else>
+						{{taskInfo.completionTime}}
+						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
+						
+					</view>
 				</view>
 				
 				
@@ -118,7 +142,7 @@
 						class="textarea"></textarea>
 					</view>
 					<view class="value"  v-else >
-						<textarea placeholder="请记录处理步骤及结果" 
+						<textarea placeholder="" 
 						placeholder-class="textareaclass"
 						v-model="floorlockErrorRecord.repairDesc"
 						class="textarea"></textarea>
@@ -172,6 +196,12 @@
 	import * as API from '@/apis/pagejs/pagesTask.js'
 	import * as WxJsApi from '@/apis/utils/wxJsApi.js'
 	
+	import {
+		
+		currentTimeStamp,
+		parseUnixTime
+	} from '@/apis/utils'
+	
 	export default {
 		data() {
 			return {
@@ -182,6 +212,15 @@
 				},
 				header:{
 					
+				},
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true,
+					timestamp: true,
 				},
 				codeN:"",
 				selectTaskInfoCode:false,
@@ -196,12 +235,14 @@
 					id:"",
 					desc:"",
 					images:"",
+					completionTime:"",
 					
 				},
 				codeList:[],
 				id:"",
 				imgList:[],
 				repairImageList:[],
+				completionTimeShow:false,
 			};
 		},
 		onLoad(op) {
@@ -213,6 +254,7 @@
 				'Authorization':token
 			}
 			this.id=op.id
+			this.taskInfo.completionTime= parseUnixTime(currentTimeStamp())
 			this.errDetails()
 			
 			
@@ -225,6 +267,11 @@
 			})
 		},
 		methods:{
+			completionTimeConfirm(e){
+				console.log(e)
+				
+				this.taskInfo.completionTime= parseUnixTime(new Date(e.timestamp* 1000))
+			},
 			previewImage(i,name) {
 				let imgs = this[name];
 				//imgs.push(img);
@@ -293,9 +340,7 @@
 					})
 				})
 			},
-			submit(){
-				
-				
+			submitApi(){
 				let files = [];
 				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
 				files = this.$refs.uUpload.lists.filter(val => {
@@ -348,6 +393,28 @@
 						icon: "none"
 					})
 				})
+			},
+			submit(){
+				
+				if(!this.taskInfo.desc){
+					uni.showModal({
+						title: '提示',
+						showCancel: true,
+						cancelText:"返回填写",
+						confirmText:"继续提交",
+						content: "未填写处理步骤，是否继续提交",
+						success: res1 => {
+							if (res1.confirm) {
+								this.submitApi()
+							} else if (res1.cancel) {
+								//('用户点击取消');
+							}
+						}
+					})
+				}else{
+					this.submitApi()
+				}
+			
 				
 				
 			},
@@ -378,11 +445,15 @@
 					}
 					white-space: pre;
 			}
+			.valueplus{
+				display: flex;
+				justify-content: space-between;
+			}
 			.value{
 				font-size: 32rpx;
 				    width: 60%;
-				display: flex;
-				    justify-content: space-between;
+				    display: flex;
+					align-items: center;
 					input::placeholder{
 						color:#AAAAAA;
 					}
@@ -396,7 +467,24 @@
 						width: 100%;
 						border-radius: 4px;
 					}
-					
+					.typeN{
+						font-size: 24rpx;
+						margin-right: 8rpx;
+						display: flex;
+						align-items: center;
+							border-radius: 4px;
+							padding: 2px 8rpx;
+							color: #fff;
+					}
+					.typeN1{
+						background-color:#1677ff;
+						//border: 1px solid #1677ff;
+					}
+					.typeN2{
+						background-color:#19be6b;
+						//border: 1px solid #19be6b;
+						 
+					}
 			}
 		}
 		.item-plus{

pages/team/teamList.vue

@@ -28,7 +28,7 @@
 				<view class="body">
 					<view class="line1">
 						<view class="title">
-							{{item.realName}}
+							{{item.realName}} （{{item.userName}}）
 		
 						</view>
 						
@@ -36,8 +36,8 @@
 					
 					<view class="line2">
 						<view class="value">
-							{{item.userName}}
-		
+							
+							{{roleNamesShow(item.roleNames)}}
 						</view>
 					
 					</view>
@@ -99,6 +99,17 @@
 			this.getList()
 		},
 		methods: {
+			roleNamesShow(str){
+				var sz=str.split(",")
+				var rsz=[]
+				sz.forEach(item=>{
+					if(item.indexOf('巡检')!=-1){
+						rsz.push(item)
+					}
+					
+				})
+				return rsz.join(',')
+			},
 			submit(){
 					
 			},