巡查保养工单系统-工单功能开发

pages.json

@@ -52,6 +52,22 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/map/maplocation",
+			"style": {
+				"navigationBarTitleText": "地图定位",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/serviceperson/taskOwnerSelect",
+			"style": {
+				"navigationBarTitleText": "人员选择",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/check-order/checkorderlist",
 			"style": {

pages/check-order/orderadd.vue

@@ -16,19 +16,6 @@
 		</uni-nav-bar>
 		<uni-forms ref="baseForm" :model="formData" :rules="rules">
 			<uni-group>
-				<!-- 			<view class="view-flex-inline">
-					<text style="color: black;font-size: 1rem;margin-bottom: 10px;">工单类型</text>
-				</view> -->
-				<!-- 				<uni-forms-item v-if="permission.orgAdmin" name="orderType" label-width="0px" required>
-					<uni-data-checkbox v-model="formData.orderType" :localdata="orderTypeOption.items">
-					</uni-data-checkbox>
-				</uni-forms-item>
-				<uni-forms-item v-else-if="permission.companyServciePerson" label-width="0px">
-					<view class="view-flex-inline">
-						<text class="text" style="color: gray;">当前角色仅支持创建维修工单</text>
-					</view>
-				</uni-forms-item>
-				<uni-forms-item v-else label-width="0px"> -->
 				</uni-forms-item>
 				<view class="view-flex-inline">
 					<text style="color: black;font-size: 1rem;margin-bottom: 10px;">工单描述</text>
@@ -98,92 +85,41 @@
 					</view>
 				</view>
 			</uni-card>
-			<uni-card title="指定人员" :is-shadow="false">
-				<view class="view-flex-rs-flex-wrap">
-					<view v-for="(item, index) in orderVideos" :key="index" class="view-flex-cc" style="width: 80px;">
-						<view class="img-container">
-							<view class="note-image-box">
-								<view class="note-image-item">
-									<view class="close-icon" @click="onVideoDel(index)">
-										<uni-icons type="closeempty" size="18" color="#fff"></uni-icons>
-									</view>
-									<view class="image-box">
-										<image :src="videoImg" mode="widthFix" @click="openVideo(item)">
-										</image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="view-flex-cc" style="width: 80px;">
-						<view class="img-container">
-							<view class="note-image-box">
-								<view class="note-image-item" @click="onCheckVideoAdd()">
-									<view class="image-box">
-										<uni-icons type="plusempty" size="50" color="#eee"></uni-icons>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
+			<uni-card title="指定人员" :is-shadow="false"> 
+				 <view class="view-flex-inline" style="height: 40px;">
+				 	<text v-if="formData.taskOwnerName"
+				 		style="color: gray;font-size: 0.8rem;padding-left: 0px">已选择人员:【{{formData.taskOwnerName}}】</text>
+				 	
+				 </view>
+			      <view class="item-button-group">
+			      	<view class="item-button mid-size" @click="onTaskOwnerSelectClick()">
+			      		<view class="items-line">
+			      			<uni-icons class="input-uni-icon" type="map-pin-ellipse" size="18" color="coral" />
+			      			<text class="button-text">选择</text>
+			      		</view>
+			      	</view>
+			      </view>
 			</uni-card>
 			<uni-card title="时限设定" :is-shadow="false">
-				<view class="view-flex-rs-flex-wrap">
-					<view v-for="(item, index) in orderVideos" :key="index" class="view-flex-cc" style="width: 80px;">
-						<view class="img-container">
-							<view class="note-image-box">
-								<view class="note-image-item">
-									<view class="close-icon" @click="onVideoDel(index)">
-										<uni-icons type="closeempty" size="18" color="#fff"></uni-icons>
-									</view>
-									<view class="image-box">
-										<image :src="videoImg" mode="widthFix" @click="openVideo(item)">
-										</image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="view-flex-cc" style="width: 80px;">
-						<view class="img-container">
-							<view class="note-image-box">
-								<view class="note-image-item" @click="onCheckVideoAdd()">
-									<view class="image-box">
-										<uni-icons type="plusempty" size="50" color="#eee"></uni-icons>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
+				<uni-forms-item name='completeDateTime' label="完成时限" label-width="100px">
+					<uni-datetime-picker type="date" v-model="formData.orderCompleteTime" @change="completeDateTimeChange" />
+				</uni-forms-item>
 			</uni-card>
 			<uni-card title="地图位置添加" :is-shadow="false">
-				<view class="view-flex-rs-flex-wrap">
-					<view v-for="(item, index) in orderVideos" :key="index" class="view-flex-cc" style="width: 80px;">
-						<view class="img-container">
-							<view class="note-image-box">
-								<view class="note-image-item">
-									<view class="close-icon" @click="onVideoDel(index)">
-										<uni-icons type="closeempty" size="18" color="#fff"></uni-icons>
-									</view>
-									<view class="image-box">
-										<image :src="videoImg" mode="widthFix" @click="openVideo(item)">
-										</image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="view-flex-cc" style="width: 80px;">
-						<view class="img-container">
-							<view class="note-image-box">
-								<view class="note-image-item" @click="onCheckVideoAdd()">
-									<view class="image-box">
-										<uni-icons type="plusempty" size="50" color="#eee"></uni-icons>
-									</view>
-								</view>
-							</view>
+				<view class="view-flex-inline" style="height: 40px;">
+					<text v-if="formData.longitude"
+						style="color: gray;font-size: 0.8rem;padding-left: 0px">经度:【{{formData.longitude}}】</text>
+					<text v-if="formData.longitude"
+						style="color: gray;font-size: 0.8rem;padding-left: 5px">纬度:【{{formData.latitude}}】</text>
+				</view>
+				<uni-forms-item name='address' label="地址" label-width="100px">
+					<uni-easyinput v-model="formData.address" placeholder="请录入地址" />
+				</uni-forms-item>
+				<view class="item-button-group">
+					<view class="item-button mid-size" @click="onMapAddClick()">
+						<view class="items-line">
+							<uni-icons class="input-uni-icon" type="map-pin-ellipse" size="18" color="coral" />
+							<text class="button-text">定位</text>
 						</view>
 					</view>
 				</view>
@@ -191,7 +127,7 @@
 		</uni-forms>
 		<view class="footer">
 			<view class="control">
-				<view class="view-flex-rc">
+				<view class="view-flex-inline-center">
 					<view class="block"
 						style="width: 160px;height:32px;margin-left: 10px;margin-right: 10px;border-radius:7px;background-color:lightsalmon"
 						@click="toSubmit()">
@@ -231,18 +167,18 @@
 					borderColor: '#e5e5e5',
 					disableColor: '#FFFFFF'
 				},
-				permission: {
-					'admin': false,
-					'orgAdmin': false,
-					'companyAdmin': false,
-					'companyServciePerson': false,
-				},
 				baseURL: '',
 				baseOSS: '',
 				videoImg: '/static/images/video.png',
 				formData: {
 					orderType: 0,
-					orderDesc: ''
+					orderDesc: '',
+					longitude: '',
+					latitude: '',
+					address: '',
+					orderCompleteTime: '',
+					taskOwnerId:'',
+					taskOwnerName:''
 				},
 				rules: {
 					orderTypeOption: {
@@ -258,16 +194,6 @@
 						}, ]
 					},
 				},
-				orderTypeOption: {
-					items: [{
-						'value': 1,
-						'text': '维修工单'
-					}, {
-						'value': 2,
-						'text': '服务工单'
-					}],
-					current: 0,
-				},
 				orderPhotos: [],
 				orderVideos: [],
 				uuid: '',
@@ -280,47 +206,38 @@
 		},
 		onLoad(options) {
 			this.baseURL = process.env.NODE_ENV === 'development' ? devUrl : prodUrl;
-			console.log(this.baseURL)
 			this.baseOSS = oss;
-			this.permission.admin = false;
-			this.permission.orgAdmin = false;
-			this.permission.companyAdmin = false;
-			this.permission.companyServciePerson = false;
-			if (this.userInfo.role_name === role.admin) {
-				this.permission.admin = true;
-			} else if (this.userInfo.role_name === role.orgAdmin) {
-				this.permission.orgAdmin = true;
-			} else if (this.userInfo.role_name === role.companyAdmin) {
-				this.permission.companyAdmin = true;
-			} else if (this.userInfo.role_name === role.companyServciePerson) {
-				this.permission.companyServciePerson = true;
-				this.formData.orderType = 1;
-			}
 			this.uuid = this.getUuid();
 		},
 		onReady() {
-			console.log("onReady++++++++++++++")
+			//console.log("onReady++++++++++++++")
 			// 需要在onReady中设置规则
 			this.$refs.baseForm.setRules(this.rules)
 		},
 		onShow() {
-			this.permission.admin = false;
-			this.permission.orgAdmin = false;
-			this.permission.companyAdmin = false;
-			this.permission.companyServciePerson = false;
-			if (this.userInfo.role_name === role.admin) {
-				this.permission.admin = true;
-			} else if (this.userInfo.role_name === role.orgAdmin) {
-				this.permission.orgAdmin = true;
-			} else if (this.userInfo.role_name === role.companyAdmin) {
-				this.permission.companyAdmin = true;
-			} else if (this.userInfo.role_name === role.companyServciePerson) {
-				this.permission.companyServciePerson = true;
-				this.formData.orderType = 1;
-			}
+			let that = this;
 			this.uuid = this.getUuid();
+			uni.$once("lngLat", function(data) {
+				let p = JSON.parse(data)
+				that.formData.longitude = p.lng;
+				that.formData.latitude = p.lat;
+				that.formData.address = p.add;
+			})
+			uni.$once("taskOwnerInfo", function(data) {
+				let p = JSON.parse(data)
+				that.formData.taskOwnerId = p.taskOwnerId;
+				that.formData.taskOwnerName = p.taskOwnerName;
+			})
 		},
 		methods: {
+			toOss(path) {
+				return this.baseOSS + path;
+			},
+			toBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
 			getUuid() {
 				return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
 					var r = (Math.random() * 16) | 0,
@@ -328,12 +245,19 @@
 					return v.toString(16);
 				});
 			},
-			toOss(path) {
-				return this.baseOSS + path;
+			completeDateTimeChange(e) {
+				console.log('change事件:', e);
 			},
-			toBack() {
-				uni.navigateBack({
-					delta: 1
+			onTaskOwnerSelectClick(){
+				var url = '/pages/serviceperson/taskOwnerSelect';
+				uni.navigateTo({
+					url: url
+				})
+			},
+			onMapAddClick() {
+				var url = '/pages/map/maplocation';
+				uni.navigateTo({
+					url: url
 				})
 			},
 			onCheckPhotoAdd() {
@@ -477,7 +401,7 @@
 				}
 				let that = this;
 				http.request({
-					url: '/galaxy-business/order/save',
+					url: '/galaxy-business/order/xjgd/save',
 					method: 'POST',
 					data: formdata
 				}).then(res => {
@@ -508,12 +432,7 @@
 		padding: 0 0 100rpx;
 	}
 
-	.view-flex-rc {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
+
 
 	.view-flex-cc {
 		display: flex;

pages/check-order/orderconfirm.vue

@@ -16,45 +16,39 @@
 		</uni-nav-bar>
 		<view class="container">
 			<view class="view-btn">
-				<button style="background-color: lightcoral;" type="default" @click="toOrderProcess()">工单处理填报</button>
+				<button style="background-color: lightcoral;" type="default" @click="toOrderConfirm()">确认</button>
 			</view>
 			<uni-section title="工单详情" titleFontSize="0.8rem" type="circle">
-				<uni-group style="margin-top: 0px;">
-					<view class="items-line">
-						<view class="item-text-lable">工单发起人:</view>
-					</view>
+				<uni-card title="创建人">
 					<view class="items-line">
 						<view class="item-text-content" style="margin-left: 0px;color: deepskyblue;">
 							{{orderInfo.createOrderPersonName}}
 						</view>
 					</view>
-					<view class="items-line line-space">
-						<view class="item-text-lable">发起时间:</view>
-					</view>
-					<view class="items-line line-space">
+				</uni-card>
+				<uni-card title="创建时间">
+					<view class="items-line">
 						<view class="item-text-content" style="margin-left: 0px;color: deepskyblue;">
 							{{orderInfo.createTime}}
 						</view>
 					</view>
-					<view class="items-line line-space">
-						<view class="item-text-lable">问题描述:</view>
-					</view>
-					<view class="items-line line-space">
+				</uni-card>
+				<uni-card title="问题描述">
+					<view class="items-line">
 						<view class="item-text-content" style="margin-left: 0px;color: deepskyblue;">
 							{{orderInfo.orderDesc}}
 						</view>
 					</view>
-				</uni-group>
+				</uni-card>
 				<uni-card title="工单照片">
 					<view class="view-flex-rs-flex-wrap">
-						<view v-for="(path, index) in orderInfo.orderPhotoList" :key="index"
-							class="view-flex-cc" style="width: 80px;">
+						<view v-for="(path, index) in orderInfo.orderPhotoList" :key="index" class="view-flex-cc"
+							style="width: 80px;">
 							<view class="img-container">
 								<view class="note-image-box">
 									<view class="note-image-item">
 										<view class="image-box">
-											<image :src="toOss(path)" mode="widthFix"
-												@click="openPhoto(path)">
+											<image :src="toOss(path)" mode="widthFix" @click="openPhoto(path)">
 											</image>
 										</view>
 									</view>
@@ -62,11 +56,6 @@
 							</view>
 						</view>
 					</view>
-<!-- 					<view class="view-flex-block-center">
-						<image v-for="(path, index) in orderInfo.orderPhotoList" :key="index" mode="widthFix"
-							style="width: 80%;margin-top: 10px;" :src="toOss(path)">
-						</image>
-					</view> -->
 				</uni-card>
 				<uni-card title="工单视频" sub-title="点击视频图标可进行播放预览">
 					<view class="view-flex-rs-flex-wrap">
@@ -101,7 +90,7 @@
 		},
 		data() {
 			return {
-				title: '工单详情',
+				title: '接单',
 				orderId: '',
 				orderInfo: {
 					createOrderPersonName: '',
@@ -115,7 +104,7 @@
 		computed: {},
 		onLoad(option) {
 			this.orderId = option.orderId;
-			this.orderType = option.orderType;
+			//this.orderType = option.orderType;
 			this.getDetail();
 		},
 		onShow() {},
@@ -157,31 +146,24 @@
 					console.log(err)
 				})
 			},
-			toOrderProcess() {
-				var url = '/pages/check-order/orderprocessreport?skipPage=2&costsApprove=1&orderType=' + this.orderType +
-					'&orderId=' + this.orderId;
-				uni.navigateTo({
-					url: url
-				})
-			},
 			toOrderConfirm() {
 				let that = this;
 				uni.showModal({
-					content: '确定接受该维修任务？',
+					content: '确定接受该工单？',
 					showCancel: true,
 					success(res) {
 						if (res.confirm) {
 							let postData = {};
-							postData['id'] = that.id;
+							postData['id'] = that.orderId;
 							http.request({
-								url: '/galaxy-business/rtu/check/order/confirm',
+								url: '/galaxy-business/order/confirm',
 								method: 'POST',
 								data: postData
 							}).then(res => {
 								console.log(res)
 								if (res.success) {
 									uni.showModal({
-										content: '任务已确认，是否立即填报？',
+										content: '已接单，是否立即填报？',
 										showCancel: true,
 										cancelText: "返回",
 										success(res) {
@@ -227,5 +209,4 @@
 	.line-space {
 		margin-top: 4px;
 	}
-	
 </style>

pages/check-order/orderprocessreport.vue

@@ -15,26 +15,20 @@
 			</view>
 		</uni-nav-bar>
 		<uni-forms ref="baseForm" :model="formData">
-			<uni-section :title="failureCheckTitle" ftitleFontSize="0.8rem" type="circle">
-<!-- 				<template v-slot:decoration>
-					<view class="decoration"></view>
-				</template> -->
+			<uni-section title="故障现象描述" ftitleFontSize="0.8rem" type="circle">
 				<view style="padding-top: 10px;padding-bottom: 0px;padding-left: 15px;padding-right: 15px;">
 					<uni-forms-item name='networkPayer' required>
 						<uni-easyinput :styles="styles" type="textarea" v-model="formData.failureCheckDesc"
-							:placeholder="failureCheckPlaceholder" />
+							placeholder="录入故障现象描述" />
 					</uni-forms-item>
 				</view>
 			</uni-section>
 			<uni-section title="解决措施说明" ftitleFontSize="0.8rem" type="circle">
-<!-- 				<template v-slot:decoration>
-					<view class="decoration"></view>
-				</template> -->
 				<view style="padding-top: 10px;padding-bottom: 10px;padding-left: 15px;padding-right: 15px;">
 					<uni-forms-item required>
 						<uni-easyinput type="textarea" v-model="formData.processDesc" placeholder="请录入解决方案说明" />
 					</uni-forms-item>
-					<uni-card title="拍摄照片" extra="点击下方按钮开始拍摄" :is-shadow="false">
+					<!-- 					<uni-card title="拍摄照片" extra="点击下方按钮开始拍摄" :is-shadow="false">
 						<view class="view-flex-rs-flex-wrap">
 							<view v-for="(item, index) in failureProcessPhotos" :key="index" class="view-flex-cc"
 								style="width: 80px;">
@@ -64,13 +58,56 @@
 								</view>
 							</view>
 						</view>
-					</uni-card>
+					</uni-card> -->
 				</view>
 			</uni-section>
-			<uni-section v-if="orderType ==1" title="费用申报" ftitleFontSize="0.8rem" type="circle">
-<!-- 				<template v-slot:decoration>
-					<view class="decoration"></view>
-				</template> -->
+
+
+			<uni-section title="拍摄照片" ftitleFontSize="0.8rem" type="circle">
+				<template v-slot:right>
+					<view style="color:grey">
+						点击下方按钮开始拍摄
+					</view>
+				</template>
+				<view style="padding-top: 10px;padding-bottom: 10px;padding-left: 15px;padding-right: 15px;">
+					<!-- 				<uni-forms-item required>
+						<uni-easyinput type="textarea" v-model="formData.processDesc" placeholder="请录入解决方案说明" />
+					</uni-forms-item> -->
+					<!-- <uni-card title="拍摄照片" extra="点击下方按钮开始拍摄" :is-shadow="false"> -->
+					<view class="view-flex-rs-flex-wrap">
+						<view v-for="(item, index) in failureProcessPhotos" :key="index" class="view-flex-cc"
+							style="width: 80px;">
+							<view class="img-container">
+								<view class="note-image-box">
+									<view class="note-image-item">
+										<view class="close-icon" @click="onPhotoDel(index)">
+											<uni-icons type="closeempty" size="18" color="#fff"></uni-icons>
+										</view>
+										<view class="image-box">
+											<image :src="toOss(item)" mode="widthFix">
+											</image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="view-flex-cc" style="width: 80px;">
+							<view class="img-container">
+								<view class="note-image-box">
+									<view class="note-image-item" @click="onCheckPhotoAdd()">
+										<view class="image-box">
+											<uni-icons type="plusempty" size="50" color="#eee"></uni-icons>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 	</uni-card> -->
+				</view>
+			</uni-section>
+			<!-- 			<uni-section v-if="orderType ==1" title="费用申报" ftitleFontSize="0.8rem" type="circle">
+
 				<view style="padding-top: 10px;padding-bottom: 10px;padding-left: 15px;padding-right: 15px;">
 					<uni-forms-item label="是否产生费用" label-width="130px" required>
 						<uni-data-checkbox v-model="formData.costsReport"
@@ -80,7 +117,7 @@
 						<uni-easyinput type="textarea" v-model="formData.costsReportDesc" placeholder="请录入费用说明" />
 					</uni-forms-item>
 				</view>
-			</uni-section>
+			</uni-section> -->
 		</uni-forms>
 		<view class="footer">
 			<view class="control">
@@ -165,7 +202,7 @@
 					}],
 					current: 1,
 				},
-				title: '工单处理填报',
+				title: '工单处理',
 				desc: '',
 				failureCheckTitle: '',
 				failureCheckPlaceholder: '',
@@ -174,23 +211,23 @@
 		computed: {},
 		onLoad(options) {
 			this.skipPage = options.skipPage;
-			this.costsApprove = options.costsApprove;
-			this.orderProcessId = options.orderProcessId;
+			//this.costsApprove = options.costsApprove;
+			//this.orderProcessId = options.orderProcessId;
 			this.orderId = options.orderId;
-			this.orderType = options.orderType;
-			console.log("order type "+this.orderType);
-			if (this.orderType == 1) {
-				this.failureCheckTitle = '故障问题描述';
-				this.failureCheckPlaceholder = '请录入故障问题现象';
-			} else if (this.orderType == 2) {
-				this.failureCheckTitle = '服务内容描述';
-				this.failureCheckPlaceholder = '请录入服务内容';
-			}
+			// this.orderType = options.orderType;
+			// console.log("order type "+this.orderType);
+			// if (this.orderType == 1) {
+			//this.failureCheckTitle = '故障问题描述';
+			//this.failureCheckPlaceholder = '录入故障现象描述';
+			// } else if (this.orderType == 2) {
+			// 	this.failureCheckTitle = '服务内容描述';
+			// 	this.failureCheckPlaceholder = '请录入服务内容';
+			// }
 			this.baseURL = process.env.NODE_ENV === 'development' ? devUrl : prodUrl;
 			this.baseOSS = oss;
-			if (this.costsApprove == '2') {
-				this.getDetail();
-			}
+			//if (this.costsApprove == '2') {
+			this.getDetail();
+			//}
 		},
 		onReady() {
 			console.log("onReady++++++++++++++")
@@ -199,41 +236,58 @@
 		},
 		onShow() {},
 		methods: {
-			toOss(path) {
-				let url = this.baseOSS + path;
-				//console.log("tooss " + url)
-				return url;
-			},
 			toBack() {
 				uni.navigateBack({
 					delta: Number(this.skipPage)
 				})
 			},
+			toOss(path) {
+				let url = this.baseOSS + path;
+				//console.log("tooss " + url)
+				return url;
+			},
 			getDetail() {
 				let that = this;
 				let postData = {};
-				postData['orderId'] = this.orderId;
+				postData['id'] = this.orderId;
 				http.request({
-					url: '/galaxy-business/order/process/last/report',
+					url: '/galaxy-business/order/detail',
 					method: 'GET',
 					data: postData
 				}).then(res => {
+					console.log(res)
 					if (res.data != null) {
-						console.log(JSON.stringify(res.data))
-						that.formData.processDesc = res.data.processDesc;
-						that.formData.failureCheckDesc = res.data.failureCheckDesc;
-						if (res.data.failureProcessPhotoList != null) {
-							that.failureProcessPhotos = res.data.failureProcessPhotoList;
-						}
+						//that.orderInfo = res.data;
+						that.formData.failureCheckDesc = res.data.orderDesc;
 					}
 				}).catch(err => {
 					console.log(err)
 				})
+
+				// let that = this;
+				// let postData = {};
+				// postData['orderId'] = this.orderId;
+				// http.request({
+				// 	url: '/galaxy-business/order/process/last/report',
+				// 	method: 'GET',
+				// 	data: postData
+				// }).then(res => {
+				// 	if (res.data != null) {
+				// 		console.log(JSON.stringify(res.data))
+				// 		that.formData.processDesc = res.data.processDesc;
+				// 		that.formData.failureCheckDesc = res.data.processDesc;
+				// 		if (res.data.failureProcessPhotoList != null) {
+				// 			that.failureProcessPhotos = res.data.failureProcessPhotoList;
+				// 		}
+				// 	}
+				// }).catch(err => {
+				// 	console.log(err)
+				// })
 			},
 			onCheckPhotoAdd() {
 				let that = this;
 				uni.chooseImage({
-					sourceType: ['album ','camera'],
+					sourceType: ['album ', 'camera'],
 					sizeType: ['compressed'],
 					success: (res) => {
 						const len = res.tempFilePaths.length;
@@ -315,7 +369,7 @@
 				}
 				let that = this;
 				http.request({
-					url: '/galaxy-business/order/process/save',
+					url: '/galaxy-business/order/process/xjgd/save',
 					method: 'POST',
 					data: formdata
 				}).then(res => {

pages/home/home.vue

@@ -50,53 +50,103 @@
 		</uni-card>
 
 		<uni-card title="待办工单" :thumbnail="orderLogo">
-			<uni-list>
-				<uni-list-item v-for="item in todoOrderList" :key="item.id">
-					<template v-slot:body>
-						<view class="list-item-block">
-							<view class="line">
-								<uni-icons type="gear" size="18" color="lightblue" />
-								<view v-if="item.orderType==1" class="text" style="width: 90%;color: gray;">
-									工单类型: <span style="margin-left: 5px;color: cornflowerblue;">维修工单</span>
+			<uni-section title="新工单" type="line">
+
+				<uni-list>
+					<uni-list-item v-for="item in unconfirmOrderList" :key="item.id" showArrow clickable
+						@click="toConfirm(item)" rightText="去接单">
+						<template v-slot:body>
+							<view class="list-item-block">
+								<view class="line">
+									<uni-icons type="personadd" size="18" color="lightblue" />
+									<view class="text" style="width: 90%;color: gray;">
+										创建人: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.createOrderPersonName}}</span>
+									</view>
 								</view>
-								<view v-else class="text" style="width: 90%;color: gray;">
-									工单类型: <span style="margin-left: 5px;color: cornflowerblue;">服务工单</span>
+								<view class="line">
+									<uni-icons type="calendar" size="18" color="lightblue" />
+									<view class="text" style="width: 90%;color: gray;">
+										创建时间: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.createTime}}</span>
+									</view>
 								</view>
-							</view>
-							<view class="line">
-								<uni-icons type="personadd" size="18" color="lightblue" />
-								<view class="text" style="width: 90%;color: gray;">
-									工单发起人: <span
-										style="margin-left: 5px;color: cornflowerblue;">{{item.createOrderPersonName}}</span>
+								<view class="line">
+									<uni-icons type="help" size="18" color="lightblue" />
+									<view class="text text-ellipsis" style="width: 90%;color: gray;">
+										问题描述: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.orderDesc}}</span>
+									</view>
 								</view>
 							</view>
-							<view class="line">
-								<uni-icons type="calendar" size="18" color="lightblue" />
-								<view class="text" style="width: 90%;color: gray;">
-									发起时间: <span
-										style="margin-left: 5px;color: cornflowerblue;">{{item.createTime}}</span>
+						</template>
+					</uni-list-item>
+				</uni-list>
+			</uni-section>
+			<uni-section title="已接工单" type="line">
+				<uni-list>
+					<uni-list-item v-for="item in todoOrderList" :key="item.id" showArrow clickable @click="toDo(item)"
+						rightText="去处理">
+						<template v-slot:body>
+							<view class="list-item-block">
+								<view class="line">
+									<uni-icons type="personadd" size="18" color="lightblue" />
+									<view class="text" style="width: 90%;color: gray;">
+										处理人: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.orderConfirmName}}</span>
+									</view>
 								</view>
-							</view>
-							<view class="line">
-								<uni-icons type="help" size="18" color="lightblue" />
-								<view class="text text-ellipsis" style="width: 90%;color: gray;">
-									问题描述: <span
-										style="margin-left: 5px;color: cornflowerblue;">{{item.orderDesc}}</span>
+								<view class="line">
+									<uni-icons type="calendar" size="18" color="lightblue" />
+									<view class="text" style="width: 90%;color: gray;">
+										完成时限: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.orderCompleteTime}}</span>
+									</view>
 								</view>
+								<!-- 								<view class="line">
+									<uni-icons type="help" size="18" color="lightblue" />
+									<view class="text text-ellipsis" style="width: 90%;color: gray;">
+										问题描述: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.orderDesc}}</span>
+									</view>
+								</view> -->
 							</view>
-							<view class="line">
-								<view class="block">
-									<uni-icons type="arrow-right" size="20" color="coral" />
+						</template>
+					</uni-list-item>
+				</uni-list>
+			</uni-section>
+			<uni-section title="工单完结审批" type="line">
+				<uni-list>
+					<uni-list-item v-for="item in closeApproveOrderList" :key="item.id" showArrow clickable
+						@click="toCloseApprove(item)" rightText="去审批">
+						<template v-slot:body>
+							<view class="list-item-block">
+								<view class="line">
+									<uni-icons type="personadd" size="18" color="lightblue" />
+									<view class="text" style="width: 90%;color: gray;">
+										填报人: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.processorName}}</span>
+									</view>
+								</view>
+								<view class="line">
+									<uni-icons type="calendar" size="18" color="lightblue" />
+									<view class="text" style="width: 90%;color: gray;">
+										填报时间: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.orderProcessTime}}</span>
+									</view>
 								</view>
-								<view class="text text-underline" style="color: coral;margin-left: 2px;font-size: 1rem;"
-									@click="toDo(item)">
-									去处理
+								<view class="line">
+									<uni-icons type="help" size="18" color="lightblue" />
+									<view class="text text-ellipsis" style="width: 90%;color: gray;">
+										反馈意见: <span
+											style="margin-left: 5px;color: cornflowerblue;">{{item.processDesc}}</span>
+									</view>
 								</view>
 							</view>
-						</view>
-					</template>
-				</uni-list-item>
-			</uni-list>
+						</template>
+					</uni-list-item>
+				</uni-list>
+			</uni-section>
 		</uni-card>
 		<uni-card title="巡检保养任务" :thumbnail="checkLogo">
 			<!-- 		<uni-list>
@@ -159,6 +209,8 @@
 				total: 0,
 				noticeDot: false,
 				noticeValue: 0,
+				unconfirmOrderCount: 0,
+				unconfirmOrderList: [],
 				todoOrderCount: 0,
 				todoOrderList: [],
 				costsApproveOrderCount: 0,
@@ -172,49 +224,82 @@
 		computed: {},
 		onLoad() {
 			console.log(JSON.stringify(this.userInfo))
-			this.permission.admin = false;
-			this.permission.orgAdmin = false;
-			this.permission.companyAdmin = false;
-			this.permission.companyServciePerson = false;
-			this.permission.yjServicePerson = false;
-			this.navButton = navBtns.navButtons;
-			if (this.userInfo.role_name === role.admin) {
-				this.permission.admin = true;
-				this.navButtonIndex = navBtns.sysAdminNavButton;
-				this.currentRole = role.admin;
-			} else if (this.userInfo.role_name === role.orgAdmin) {
-				this.permission.orgAdmin = true;
-				this.currentRole = role.orgAdmin;
-				this.navButtonIndex = navBtns.orgAdminNavButton;
-			} else if (this.userInfo.role_name === role.companyAdmin) {
-				this.permission.companyAdmin = true;
-				this.currentRole = role.companyAdmin;
-				this.navButtonIndex = navBtns.companyAdminNavButton;
-			} else if (this.userInfo.role_name === role.companyServciePerson) {
-				this.permission.companyServciePerson = true;
-				this.currentRole = role.companyServciePerson;
-				this.navButtonIndex = navBtns.companyServicePersonNavButton;
-				if (this.userInfo.post_id == '1706859505948098562') {
-					this.postName = "engineer";
-				} else if (this.userInfo.post_id == '1730535542909140993') {
-					this.postName = "servicePerson";
-				}
-			}
+			// this.permission.admin = false;
+			// this.permission.orgAdmin = false;
+			// this.permission.companyAdmin = false;
+			// this.permission.companyServciePerson = false;
+			// this.permission.yjServicePerson = false;
+			// this.navButton = navBtns.navButtons;
+			// if (this.userInfo.role_name === role.admin) {
+			// 	this.permission.admin = true;
+			// 	this.navButtonIndex = navBtns.sysAdminNavButton;
+			// 	this.currentRole = role.admin;
+			// } else if (this.userInfo.role_name === role.orgAdmin) {
+			// 	this.permission.orgAdmin = true;
+			// 	this.currentRole = role.orgAdmin;
+			// 	this.navButtonIndex = navBtns.orgAdminNavButton;
+			// } else if (this.userInfo.role_name === role.companyAdmin) {
+			// 	this.permission.companyAdmin = true;
+			// 	this.currentRole = role.companyAdmin;
+			// 	this.navButtonIndex = navBtns.companyAdminNavButton;
+			// } else if (this.userInfo.role_name === role.companyServciePerson) {
+			// 	this.permission.companyServciePerson = true;
+			// 	this.currentRole = role.companyServciePerson;
+			// 	this.navButtonIndex = navBtns.companyServicePersonNavButton;
+			// 	if (this.userInfo.post_id == '1706859505948098562') {
+			// 		this.postName = "engineer";
+			// 	} else if (this.userInfo.post_id == '1730535542909140993') {
+			// 		this.postName = "servicePerson";
+			// 	}
+			// }
 			// if (this.$u.func.checkLogin()) {
 			// 	console.log("timer start  +++++++ ")
 			// 	this.timer = true;
 			// 	setTimeout(this.timeCall, 10);
 			// }
+			// console.log(JSON.stringify(this.isLogin))
+			// if (this.$u.func.checkLogin()) {} else {
+			// 	this.$u.func.logout();
+			// }
+
 
-			this.getTodoOrderList();
+			if (this.$u.func.checkLogin()) {
+				try {
+					let loginTime = uni.getStorageSync("loginTime");
+					if (loginTime) {
+						let dt = new Date();
+						let time = dt.getTime();
+						let expires = this.userInfo.expires_in;
+						if (expires) {
+							if ((time - loginTime) / 1000 > (expires - 60)) {
+								this.$u.func.logout();
+							}
+						} else {
+							this.$u.func.logout();
+						}
+					} else {
+						this.$u.func.logout();
+					}
+				} catch (e) {
+					this.$u.func.logout();
+				}
+			} else {
+				this.$u.func.logout();
+			}
+			if (this.isLogin) {
+				this.getTodoOrderList();
+				this.getTodoOrderConfirmList();
+			}
 		},
 		onUnload() {
 			//this.timer = false;
 		},
 		onReady() {
-			// if (this.$u.func.checkLogin()) {} else {
-			// 	this.$u.func.logout();
-			// }
+			if (this.$u.func.checkLogin()) {
+
+			} else {
+				// this.$u.func.logout();
+			}
 		},
 		onShow() {
 			// if (this.$u.func.checkLogin()) {
@@ -283,7 +368,24 @@
 					setTimeout(this.timeCall, 10000);
 				}
 			},
+			toConfirm(item) {
+				var url = '/pages/check-order/orderconfirm?orderType=' + item.orderType + '&orderId=' + item.id;
+				uni.navigateTo({
+					url: url
+				})
+			},
 			toDo(item) {
+				var url = '/pages/check-order/orderprocessreport?orderId=' + item.id + '&skipPage=1';
+				uni.navigateTo({
+					url: url
+				})
+
+				// var url = '/pages/check-order/orderconfirm?orderType=' + item.orderType + '&orderId=' + item.id;
+				// uni.navigateTo({
+				// 	url: url
+				// })
+			},
+			toCloseApprove(item) {
 				var url = '/pages/check-order/orderconfirm?orderType=' + item.orderType + '&orderId=' + item.id;
 				uni.navigateTo({
 					url: url
@@ -322,10 +424,29 @@
 				})
 			},
 			getHomeInfo() {
+				this.getTodoOrderConfirmList();
 				this.getTodoOrderList();
-				this.getTodoCostsApproveOrderList();
+				//this.getTodoCostsApproveOrderList();
 				this.getTodoCloseOrderList();
 			},
+			getTodoOrderConfirmList() {
+				let that = this;
+				let postData = {};
+				http.request({
+					url: '/galaxy-business/order/todo/confirm/list',
+					method: 'GET',
+					data: postData,
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					that.unconfirmOrderCount = 0;
+					if (res.data != null) {
+						that.unconfirmOrderCount = res.data.length;
+						that.unconfirmOrderList = res.data;
+					}
+				}).catch(err => {
+					console.log(JOSN.stringify(err))
+				})
+			},
 			getTodoOrderList() {
 				let that = this;
 				let postData = {};

pages/map/maplocation.vue

@@ -0,0 +1,283 @@
+<template>
+	<view class="container">
+		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
+			@clickLeft="toBack">
+			<view class="nav-title">
+				<text>{{title}}</text>
+			</view>
+		</uni-nav-bar>
+		<view style="width: 100%;height: 160px;">
+			<uni-forms ref="baseForm" :model="formData">
+				<uni-card title="定位信息" :is-shadow="false">
+					<view class="view-flex-inline">
+						<uni-icons class="input-uni-icon" type="location" size="18" color="coral" />
+						<text style="color: black;font-size: 1rem;margin-left: 4px;">经纬度:</text>
+						<text
+							style="color: blue;font-size: 0.8rem;padding-left: 5px">{{formData.longitude}},{{formData.latitude}}</text>
+					</view>
+					<view class="view-flex-inline" style="margin-top: 5px;">
+						<uni-icons class="input-uni-icon" type="map-pin-ellipse" size="18" color="coral" />
+						<text style="color: black;font-size: 1rem;margin-left: 4px;">地址:</text>
+						<text style="color: blue;font-size: 0.8rem;padding-left: 5px">{{formData.address}}</text>
+					</view>
+					<view class="item-button-group " style="margin-top: 10px;padding-right: 0px; justify-content: center;">
+						<!-- 定位返回 -->
+						<view class="item-button mid-size" style="background-color: coral;" @click="onGetLngLat()">
+							<view class="items-line">
+								<uni-icons class="input-uni-icon" type="checkmarkempty" size="18" color="black" />
+								<text class="button-text">确定</text>
+							</view>
+						</view>
+						<!-- 提交补录定位 -->
+<!-- 						<view v-else-if="type==2" class="item-button mid-size" style="background-color: coral;" @click="toSubmit()">
+							<view class="items-line">
+								<uni-icons class="input-uni-icon" type="checkmarkempty" size="18" color="black" />
+								<text class="button-text">立即提交</text>
+							</view>
+						</view> -->
+					</view>
+				</uni-card>
+			</uni-forms>
+		</view>
+		<view style="width: 100%;height: 30px;">
+			<view class="view-flex-inline-center">
+				<text style="font-size: 0.8rem;color: orange;">点击下方地图重新拾取坐标信息</text>
+			</view>
+		</view>
+		<view class="page-section page-section-gap">
+			<map id="myMap" ref="myMap" :style="mapStyles" enable-zoom="true" :circles="circles" :scale="scale"
+				:latitude="formData.latitude" :longitude="formData.longitude" @tap="tap">
+			</map>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		gcoord
+	} from '@/static/js/gcoord.global.prod.js'
+	import http from '@/http/api.js';
+	import {
+		devUrl,
+		prodUrl
+	} from '@/common/setting';
+	export default {
+		data() {
+			return {
+				title: '地图拾取坐标',
+				baseURL: '',
+				type: 1,
+				scale: 13,
+				circles: [],
+				formData: {
+					id: '',
+					latitude: '',
+					longitude: '',
+					address: '',
+				},
+				rules: {
+					latitude: {
+						rules: [{
+							required: true,
+							errorMessage: '必填项',
+						}]
+					},
+					longitude: {
+						rules: [{
+							required: true,
+							errorMessage: '必填项',
+						}, ]
+					},
+				},
+				mapStyles: {
+					width: '100%',
+					height: '600px'
+				},
+			}
+		},
+		onLoad(option) {
+			this.baseURL = process.env.NODE_ENV === 'development' ? devUrl : prodUrl;
+			this.type = option.type;
+			//if (this.type == 1) {
+				this.restartLocation();
+			// } else if (this.type == 2) {
+			// 	this.formData.id = option.id;
+			// 	let lng = option.lng;
+			// 	let lat = option.lat;
+			// 	if (lng != undefined && lng != null && lng != '' && lat != undefined && lat != null && lat != '') {
+			// 		this.formData.longitude = lng;
+			// 		this.formData.latitude = lat;
+			// 		if (option.add != undefined && option.add != null) {
+			// 			this.formData.address = option.add;
+			// 		}
+			// 		this.setMapPoint();
+			// 	} else {
+			// 		this.restartLocation();
+			// 	}
+			// }
+			this.mapStyles.height = (uni.getWindowInfo().windowHeight - 50 - 160 - 30 - 10) + "px";
+		},
+		computed: {},
+		onShow() {},
+		onReady() {
+			// 需要在onReady中设置规则
+			// this.$refs.baseForm.setRules(this.rules)
+			this.mapContext = uni.createMapContext('myMap', this);
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			this.addMapEvent();
+			// #endif
+		},
+		methods: {
+			addMapEvent() {
+				let that = this;
+				var maps = uni.createMapContext('myMap', this).$getAppMap();
+				maps.onclick = function(point) {
+					that.formData.longitude = new Number(point.longitude).toFixed(6);
+					that.formData.latitude = new Number(point.latitude).toFixed(6);
+					that.getAddress(point.longitude, point.latitude);
+					that.setMapPoint();
+				}
+			},
+			tap(e) {
+				// #ifdef MP-WEIXIN
+				let lat = e.target.latitude;
+				let lng = e.target.longitude;
+				this.formData.longitude = new Number(lng).toFixed(6);
+				this.formData.latitude = new Number(lat).toFixed(6);
+				this.getAddress(lng, lat);
+				this.setMapPoint();
+				// #endif
+			},
+			//返回上一页
+			toBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			onBackPress() {
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord();
+				// #endif
+			},
+			restartLocation() {
+				console.log('重新定位***********************');
+				let that = this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						console.log('当前位置：' + JSON.stringify(res));
+						let p = gcoord.transform(
+							[res.longitude, res.latitude],
+							gcoord.WGS84,
+							gcoord.GCJ02
+						);
+						that.formData.latitude = new Number(p[1]).toFixed(6);
+						that.formData.longitude = new Number(p[0]).toFixed(6);
+						that.getAddress(res.longitude, res.latitude);
+						that.setMapPoint();
+					}
+				});
+			},
+			setMapPoint() {
+				let circles = [];
+				let rtu = {};
+				rtu['longitude'] = parseFloat(this.formData.longitude);
+				rtu['latitude'] = parseFloat(this.formData.latitude);
+				rtu['color'] = '#FF0000';
+				rtu['fillColor'] = '#FFFF00';
+				rtu['radius'] = 100;
+				circles.push(rtu);
+				this.circles = circles;
+			},
+			getAddress(lng, lat) {
+				let that = this;
+				let url = 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + lat + ',' + lng +
+					'&key=4HYBZ-EB23D-SLC42-HQ5R3-LP3LQ-OZFU5';
+				http.request({
+					url: url,
+					method: 'GET',
+				}).then(res => {
+					//console.log(JSON.stringify(res));
+				}).catch(err => {
+					//console.log(JSON.stringify(err))
+					that.formData.address = err.data.result.address;
+				})
+			},
+			onGetLngLat() {
+				let p = {
+					'lng': this.formData.longitude,
+					'lat': this.formData.latitude,
+					'add': this.formData.address,
+				};
+				uni.$emit('lngLat', JSON.stringify(p))
+				this.toBack();
+			},
+			toSubmit() {
+				let that = this;
+				let lng = this.formData.longitude;
+				let lat = this.formData.latitude;
+				if (lng != undefined && lng != null && lng != '' && lat != undefined && lat != null && lat != '') {
+					this.submit();
+				} else {
+					uni.showModal({
+						content: "经纬度不能为空，请重新再试!",
+						showCancel: false,
+						success(res) {
+							if (res.confirm) {
+
+							}
+						}
+					});
+				}
+			},
+			submit() {
+				let that = this;
+				console.log('toSubmit事件:', JSON.stringify(this.formData));
+				http.request({
+					url: '/galaxy-business/yj/resident/location/add',
+					method: 'POST',
+					data: this.formData
+				}).then(res => {
+					//console.log('res ', JSON.stringify(res));
+					if (res.success) {
+						if (res.code == 200) {
+							//that.clearCache();
+							uni.showModal({
+								content: '操作已成功',
+								showCancel: false,
+								success(res) {
+									if (res.confirm) {
+										that.toBack();
+									}
+								}
+							});
+						} else {
+							uni.showModal({
+								content: '提交失败',
+								showCancel: false
+							});
+						}
+					} else {
+						uni.showModal({
+							content: '提交失败',
+							showCancel: false
+						});
+					}
+				}).catch(err => {
+					uni.showModal({
+						content: '' + err.data.msg,
+						showCancel: false
+					});
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 0 0 100rpx;
+	}
+</style>

pages/serviceperson/taskOwnerSelect.vue

@@ -0,0 +1,143 @@
+<!--
+ * @Title: 
+ * @Description: 当前维修任务列表
+ * @Author: swp
+ * @Date: 2022-08-24 10:49:21
+ * @LastEditors: 
+ * @LastEditTime: 2022-08-24 10:49:21
+-->
+<template>
+	<view class="wrap">
+		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
+			@clickLeft="toBack">
+			<view class="nav-title">
+				<text>{{title}}</text>
+			</view>
+		</uni-nav-bar>
+		<view class="container">
+
+			<uni-section title="人员信息" type="line">
+				<uni-list>
+					<uni-list-item v-for="item in list" :key="item.id" showArrow clickable @click="onClick(item)">
+						<template v-slot:body>
+							<view class="list-item-block">
+								<view class="line">
+									<text class="title">{{item.personName}}</text>
+								</view>
+								<view class="line">
+									<uni-icons class="input-uni-icon" type="person-filled" size="18"
+										color="lightblue" />
+									<text class="text">岗位：{{item.postName}}</text>
+								</view>
+								<view class="line">
+									<uni-icons class="input-uni-icon" type="phone" size="18" color="lightblue" />
+									<text class="text">电话：{{item.contactPhone}}</text>
+								</view>
+							</view>
+						</template>
+					</uni-list-item>
+				</uni-list>
+				<uni-group>
+					<view class="pagination-block">
+						<uni-pagination show-icon :pageSize="pageSize" :current="pageCurrent" :total="total"
+							@change="pageChange" />
+					</view>
+				</uni-group>
+			</uni-section>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		role
+	} from "@/api/role.js";
+	import http from '@/http/api.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				title: '指定任务负责人',
+				pageSize: 10,
+				pageCurrent: 1,
+				total: 0,
+				list: [],
+				query: {},
+				inputStyles: {
+					color: '#808080',
+					borderColor: '#d3d3d3'
+				},
+			}
+		},
+		computed: {
+
+		},
+		onLoad(option) {
+			this.pageCurrent = 1;
+			this.getPage()
+		},
+		onShow() {
+			this.getPage();
+		},
+		methods: {
+			//返回上一页
+			toBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			onBackPress() {
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord();
+				// #endif
+			},
+			// 分页触发
+			pageChange(e) {
+				this.pageCurrent = e.current;
+				this.getPage()
+			},
+			onClick(e) {
+				console.log('执行click事件', JSON.stringify(e))
+				let p = {
+					'taskOwnerId': e.id,
+					'taskOwnerName': e.personName,
+				};
+				uni.$emit('taskOwnerInfo', JSON.stringify(p))
+				this.toBack();
+			},
+			getPage(params = {}) {
+				const current = this.pageCurrent;
+				const size = this.pageSize;
+				let postData = Object.assign(params, this.query);
+				let that = this;
+				http.request({
+					url: '/galaxy-business/serviceperson/xjgd/org/user/page',
+					method: 'GET',
+					params: {
+						current,
+						size,
+					},
+					data: postData,
+				}).then(res => {
+					if (res.data.records != null) {
+						that.list = res.data.records;
+					}
+					this.total = res.data.total;
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.select-checkbox {
+		margin-top: 0px;
+		margin-bottom: 5px;
+		padding-left: 15px;
+	}
+</style>

static/style/app.scss

@@ -62,7 +62,7 @@
 		.text{
 			padding-left: 2px;
 			padding-right: 5px;
-			font-size: 0.8rem;
+			font-size: 0.7rem;
 			color: black;
 		}
 		

utils/func.js

@@ -26,9 +26,9 @@ const install = (Vue, vm) => {
 		// uni.redirectTo({
 		// 	url: '/pages/login/login-account'
 		// })
-		uni.navigateBack({
-			delta: 1
-		})
+		// uni.navigateBack({
+		// 	delta: 1
+		// })
 	}
 
 	// 检查登录状态