修改bug

pages/index/orderDetail.vue

@@ -339,10 +339,22 @@
 			getPersons(code) {
 				let _that = this;
 				_that.personSelectList = [];
+				let userinfo = uni.getStorageSync('user')
+				let user = null
+				if(userinfo) {
+					user = JSON.parse(userinfo)
+				}
 				_that.$http.getUserListByStationCode(code).then(res => {
 					uni.hideLoading();
 					if(res.code == 200) {
-						_that.personSelectList = res.data || [];
+						let list = res.data || [];
+						if(list && list.length > 0) {
+							list.forEach(item => {
+								if(user.userId != item.userId) {
+									_that.personSelectList.push(item);
+								}
+							})
+						}
 					} else {
 						_that.$utils.msg(res.msg);
 					}

pages/index/orderUp.vue

@@ -4,45 +4,47 @@
 			<span class="order-imp">*</span>
 			工单信息填写
 		</view>
-		<u-form :model="form" ref="uform" :rules="rules" label-align='left' label-width="170">
-			<u-form-item label="*电站名称" prop="stationName">
-				<u-input type="select" :select-open="siteSelectShow" placeholder="请选择换电站" v-model="form.stationName" @click="siteSelectShow = true"/>
-			</u-form-item>
-			<u-form-item label="*设备名称" prop="deviceName">
-				<u-input type="select" :select-open="nameSelectShow" placeholder="请选择设备名称" v-model="form.deviceName" @click="nameSelectShow = true"/>
-			</u-form-item>
-			<u-form-item label="设备编号">
-				<u-input v-model="form.sn" placeholder="请输入设备编号" />
-			</u-form-item>
-			<u-form-item label="故障等级">
-				<u-input type="select" :select-open="levelSelectShow" placeholder="请选择故障等级" v-model="form.levelText" @click="levelSelectShow = true"/>
-			</u-form-item>
-			<u-form-item label="*发生时间" prop="occurrenceTime">
-				<u-input type="select" :select-open="show" placeholder="请选择发生时间" v-model="form.occurrenceTime" @click="show = true"/>
-			</u-form-item>
-			<u-form-item label="处理人员">
-				<u-input type="select" :select-open="showPerson" placeholder="请选择处理人员" v-model="form.nextPerson" @click="personHandle"/>
-			</u-form-item>
-			<u-form-item label="*问题描述" prop="problemTitle" :label-position="'top'">
-				<u-input placeholder="请输入问题描述 不超过15个字" :maxlength="15" v-model="form.problemTitle" />
-			</u-form-item>
-			<u-form-item label="*问题记录" prop="deviceProblem" :label-position="'top'">
-				<u-input type="textarea" placeholder="请输入问题记录 不超过200个字" :maxlength="200" v-model="form.deviceProblem" />
-			</u-form-item>
-			<u-form-item label="问题图片(不超过5张,20M以内)" prop="intro" :label-position="'top'">
-				<u-upload action="#" multiple :fileList="fileList" @on-choose-complete="onChooseComplete" :auto-upload="false" @delete="deletePic" name="1" :maxCount="5"></u-upload>
-			</u-form-item>
-			<u-form-item label="问题视频(不超过1个,50M以内)" prop="intro" :label-position="'top'">
-				<view class="uploadv" @click="onVideoChooseComplete" v-if="!form.video">
-					<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
-					<view class="u-add-tips">选择视频</view>
-				</view>
-				<view class="uploadv" v-if="form.video">
-					<video class="u-add-btn" :src="form.video"></video>
-					<image class="u-add-img" src="@/static/index-delete.png" alt="" @click="delHandle"/>
-				</view>
-			</u-form-item>
-		</u-form>
+		<scroll-view class="content" scroll-y="true" scroll-top=0 enable-back-to-top>
+			<u-form :model="form" ref="uform" :rules="rules" label-align='left' label-width="170">
+				<u-form-item label="*电站名称" prop="stationName">
+					<u-input type="select" :select-open="siteSelectShow" placeholder="请选择换电站" v-model="form.stationName" @click="siteSelectShow = true"/>
+				</u-form-item>
+				<u-form-item label="*设备名称" prop="deviceName">
+					<u-input type="select" :select-open="nameSelectShow" placeholder="请选择设备名称" v-model="form.deviceName" @click="nameSelectShow = true"/>
+				</u-form-item>
+				<u-form-item label="设备编号">
+					<u-input v-model="form.sn" placeholder="请输入设备编号" />
+				</u-form-item>
+				<u-form-item label="故障等级">
+					<u-input type="select" :select-open="levelSelectShow" placeholder="请选择故障等级" v-model="form.levelText" @click="levelSelectShow = true"/>
+				</u-form-item>
+				<u-form-item label="*发生时间" prop="occurrenceTime">
+					<u-input type="select" :select-open="show" placeholder="请选择发生时间" v-model="form.occurrenceTime" @click="show = true"/>
+				</u-form-item>
+				<u-form-item label="处理人员">
+					<u-input type="select" :select-open="showPerson" placeholder="请选择处理人员" v-model="form.nextPerson" @click="personHandle"/>
+				</u-form-item>
+				<u-form-item label="*问题描述" prop="problemTitle" :label-position="'top'">
+					<u-input placeholder="请输入问题描述 不超过15个字" :maxlength="15" v-model="form.problemTitle" />
+				</u-form-item>
+				<u-form-item label="*问题记录" prop="deviceProblem" :label-position="'top'">
+					<u-input type="textarea" placeholder="请输入问题记录 不超过200个字" :maxlength="200" v-model="form.deviceProblem" />
+				</u-form-item>
+				<u-form-item label="问题图片(不超过5张,20M以内)" prop="intro" :label-position="'top'">
+					<u-upload action="#" multiple :fileList="fileList" @on-choose-complete="onChooseComplete" :auto-upload="false" @delete="deletePic" name="1" :maxCount="5"></u-upload>
+				</u-form-item>
+				<u-form-item label="问题视频(不超过1个,50M以内)" prop="intro" :label-position="'top'">
+					<view class="uploadv" @click="onVideoChooseComplete" v-if="!form.video">
+						<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
+						<view class="u-add-tips">选择视频</view>
+					</view>
+					<view class="uploadv" v-if="form.video">
+						<video class="u-add-btn" :src="form.video"></video>
+						<image class="u-add-img" src="@/static/index-delete.png" alt="" @click="delHandle"/>
+					</view>
+				</u-form-item>
+			</u-form>
+		</scroll-view>
 		<u-select :list="siteSelectList" v-model="siteSelectShow" value-name="stationCode" label-name="stationName" @confirm="siteSelectCallback"> </u-select>
 		<u-select :list="levelSelectList" v-model="levelSelectShow" @confirm="levelSelectCallback"> </u-select>
 		<u-select :list="personSelectList" v-model="showPerson" value-name="userId" label-name="nickName" @confirm="personSelectCallback"> </u-select>
@@ -263,10 +265,22 @@
 			getPersons(code) {
 				let _that = this;
 				_that.personSelectList = [];
+				let userinfo = uni.getStorageSync('user')
+				let user = null
+				if(userinfo) {
+					user = JSON.parse(userinfo)
+				}
 				_that.$http.getUserListByStationCode(code).then(res => {
 					uni.hideLoading();
 					if(res.code == 200) {
-						_that.personSelectList = res.data || [];
+						let list = res.data || [];
+						if(list && list.length > 0) {
+							list.forEach(item => {
+								if(user.userId != item.userId) {
+									_that.personSelectList.push(item);
+								}
+							})
+						}
 					} else {
 						_that.$utils.msg(res.msg);
 					}
@@ -386,10 +400,15 @@
 		height: 100vh;
 		position: relative;
 		box-sizing: border-box;
-		padding: 0 30rpx;
 		padding-bottom: calc(80rpx + env(safe-area-inset-bottom));
-		background-color: $uni-bg-color;
-		overflow-y: auto;
+		background-color: #FFFFFF;
+		padding: 0 30rpx;
+		.content {
+			height: calc(100vh - 200rpx - env(safe-area-inset-bottom));
+			margin-bottom: 30rpx;
+			background-color: #FFFFFF;
+		}
+
 		.order-tips {
 			height: 80rpx;
 			line-height: 80rpx;
@@ -401,14 +420,13 @@
 			padding-left: 30rpx;
 			margin: 0 -30rpx;
 			.order-imp {
-				color: red;
 				margin-right: 5rpx;
 			}
 		}
 		.commit-button {
 			position: fixed;
 			width: calc(100% - 60rpx);
-			bottom: calc(40rpx + env(safe-area-inset-bottom));
+			bottom: calc(20rpx + env(safe-area-inset-bottom));
 			z-index: 999;
 		}
 		.uploadv {