From 8a0d748efe82de91386d5443b940dff797a7691a Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 14 Jun 2022 16:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=B7=A1=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/pages/dailyInfo/dailyInfo.vue        | 208 +++++++++++++++-
 .../pages/dailyInspection/dailyInspection.vue | 234 ++++++++++++------
 packageB/pages/dailyList/dailyList.vue        |  20 +-
 pages.json                                    |   3 +-
 4 files changed, 374 insertions(+), 91 deletions(-)

diff --git a/packageB/pages/dailyInfo/dailyInfo.vue b/packageB/pages/dailyInfo/dailyInfo.vue
index f56348f..bcf49a5 100644
--- a/packageB/pages/dailyInfo/dailyInfo.vue
+++ b/packageB/pages/dailyInfo/dailyInfo.vue
@@ -1,10 +1,202 @@
-<template>
-	
-	
-</template>
+<template>
+	<view class="boxContent">
+
+		<view class="box-header">
+			
+		</view>
+		
+		<view class="list" style="padding-top: 20rpx;">
+			<block>
+				<u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true">
+					<view class="" slot="body" @click="todetail(lists.id)">
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">巡查项目：</view>
+							</u-col>
+							<u-col span="9">
+								<view class="demo-layout bg-purple-light">{{lists.name}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">项目状态：</view>
+							</u-col>
+							<u-col span="9">
+								<u-tag v-if="lists.status==1" text="无异常" type="primary" />
+								<u-tag v-if="lists.status==2" text="已现场处理" type="warning" />
+								<u-tag v-if="lists.status==3" text="不可现场处理" type="error" />
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">巡查记录：</view>
+							</u-col>
+							<u-col span="12">
+								<view class="demo-layout bg-purple-light">{{lists.content}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">现场图片：</view>
+							</u-col>
+							<u-col span="12" v-for="(item,index) in lists.daily_inspection_files">
+								<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
+							</u-col>
+						</u-row>
+						
+						<u-row gutter="16" v-if="lists.status==2">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">处理记录：</view>
+							</u-col>
+							<u-col span="12">
+								<view class="demo-layout bg-purple-light">{{lists.deal_content}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16" v-if="lists.status==2">
+							<u-col span="4">
+								<view class="demo-layout bg-purple">处理后照片：</view>
+							</u-col>
+							<u-col span="12" v-for="(item,index) in lists.daily_inspection_deal_files">
+								<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
+							</u-col>
+						</u-row>
+						
+						<u-row gutter="16" v-if="lists.status==3">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">定位地址：</view>
+							</u-col>
+							<u-col span="9">
+								{{lists.address}}
+							</u-col>
+						</u-row>
+					</view>
+					
+				</u-card>
+		
+			</block>
+		</view>
 
-<script>
-</script>
-
-<style>
+	
+		
+	</view>
+
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				lists:{}
+			}
+		},
+		
+		
+		
+		onLoad(options) {
+			if(options.id){
+				this.loadInfo(options.id)
+			}
+		},
+		methods: {
+			loadInfo: function(id) {
+				var that = this;
+				this.util.request({
+					method:"get",
+					api: '/api/mobile/daily-inspection/show',
+					customLoading: false,
+					data: {
+						id:id
+					},
+					
+					utilSuccess: function(r) {
+						
+						that.lists = r
+					},
+					utilFail: function(res) {
+						
+
+						this.util.alert(res);
+					}
+				});
+			}
+			
+
+		}
+
+	}
+</script>
+<style>
+	.boxContent {
+		background: #f3f4f6;
+		min-height: 100vh;
+	}
+
+	.footer {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.box-header {
+
+		position: fixed;
+		top: 0;
+		width: 100%;
+		z-index: 99;
+	}
+
+	.u-row {
+		margin: 10rpx 0;
+		font-size: 28rpx;
+	}
+	.u-card{
+		z-index: 1;
+	}
+</style>
+
+
+<style scoped lang="scss">
+	.overflowmask{
+		overflow: hidden;
+	}
+	.loadmore{
+		padding:24rpx!important
+	}
+	.search-wrap {
+		background: #007AFF;
+		padding: 20rpx;
+	}
+
+	.u-config-wrap {
+		padding: 30rpx;
+	}
+
+	.bg-purple {
+		font-weight: bold;
+	}
+
+	.slot-content {
+		background-color: #FFFFFF;
+		padding: 24rpx;
+
+		.item-box {
+			margin-bottom: 50rpx;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.item {
+				border: 1px solid $u-type-primary;
+				color: $u-type-primary;
+				padding: 8rpx 40rpx;
+				border-radius: 100rpx;
+				margin-top: 30rpx;
+			}
+
+			.active {
+				color: #FFFFFF;
+				background-color: $u-type-primary;
+			}
+		}
+	}
 </style>
diff --git a/packageB/pages/dailyInspection/dailyInspection.vue b/packageB/pages/dailyInspection/dailyInspection.vue
index e199aa9..ef88ae8 100644
--- a/packageB/pages/dailyInspection/dailyInspection.vue
+++ b/packageB/pages/dailyInspection/dailyInspection.vue
@@ -9,12 +9,12 @@
 			</u-form-item>
 			<u-form-item label-position="top" label="现场照片">
 				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-					:previewFullImage="true" :file-list="filesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
+					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
 					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
 				</u-upload>
 			</u-form-item>
 			<u-form-item label-position="top" label="状态">
-				<u-radio-group v-model="form.status">
+				<u-radio-group v-model="normalstatus">
 					<u-radio 
 						@change="radioChange" 
 						v-for="(item, index) in statuss" :key="index" 
@@ -24,14 +24,14 @@
 					</u-radio>
 				</u-radio-group>
 			</u-form-item>
-			<div v-if="form.status==2">
+			<div v-if="normalstatus==2">
 				<u-form-item label="" label-position="top" prop="nextStatus">
 					<u-input v-model="nextStatus" type="select" :border="true" @click="nextShow = true" />
 					<u-select v-model="nextShow" mode="single-column" value-name="id" label-name="name" :list="slist"
 						@confirm="confirmNext"></u-select>
 				</u-form-item>
 			</div>
-			<div v-if="form.status==2 && nextStatusId==2">
+			<div v-if="normalstatus==2 && nextStatusId==2">
 				<u-form-item label-position="top" label="处理记录" prop="deal_content">
 					<u-input v-model="form.deal_content" type='textarea' height='100' :border="true" />
 				</u-form-item>
@@ -43,7 +43,7 @@
 					</u-upload>
 				</u-form-item>
 			</div>
-			<div v-if="nextStatusId==3">
+			<div v-if="normalstatus==2 && nextStatusId==3">
 				<u-form-item label="位置" label-position="top" required>
 					<!-- <text>{{form.address}}</text> -->
 					<u-input v-model="form.address" disabled type='text'/>
@@ -65,10 +65,11 @@
 				},
 				showMap: false,
 				nextStatus:"可现场处理",
+				normalstatus:1,
 				nextStatusId:2,
 				nextShow:false,
-				action: "",
-				location: {},
+				action: "",
+				infoId:"",
 				slist:[
 					{
 						id:2,
@@ -114,8 +115,13 @@
 				}
 			}
 		},
-		onLoad() {
-			var that = this;
+		onLoad(options) {
+			var that = this;
+			if(options.id){
+				this.infoId = options.id;
+				this.showInfo(this.infoId);
+			}
+			
 			this.action = this.util.HOST + "/api/mobile/upload-file";
 			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
 		},
@@ -126,11 +132,8 @@
 				type: "gcj02",
 				geocode:true,
 				success(res) {
-					that.location = res;
 					that.form.deal_latitude = res.latitude;
-					that.form.deal_longitude = res.longitude;
-					
-					
+					that.form.deal_longitude = res.longitude;
 				}
 			})
 			uni.getSystemInfo({
@@ -142,36 +145,44 @@
 
 		},
 		methods: {
-			toremove(index, lists, name,whatfile) {
-				console.log(lists);
-				console.log(whatfile);
-				let list = [];
-				for (var m of lists) {
-					list.push({
-						upload_id: m.response.id
-					})
-				}
+			toremove(index, lists, name,whatfile) {
 				if(whatfile=="filesList"){
-					this.form.files_list = list;
+					this.filesList.splice(index,1)
+					// this.form.files_list = list;
 				}
 				if(whatfile=="dealFilesList"){
-					this.form.deal_files_list = list;
+					this.dealFilesList.splice(index,1)
+					// this.form.deal_files_list = list;
 				}
+			},
+			onprogress(res){
+				uni.showToast({
+					icon: "none",
+					title: "上传中",
+					duration: 2000
+				})
+			},
+			tosuccess(){
+				uni.showToast({
+					icon: "none",
+					title: "上传成功",
+					duration: 2000
+				})
 			},
-			toupload(lists, name,whatfile) {
-				console.log(lists)
-				console.log(whatfile)
+			toupload(lists, name, whatfile) {
+				var that = this;
 				let list = [];
-				for (var m of lists) {
-					list.push({
-						upload_id: m.response.id
-					})
-				}
-				if(whatfile=="filesList"){
-					this.form.files_list = list;
-				}
-				if(whatfile=="dealFilesList"){
-					this.form.deal_files_list = list;
+				for (var m of lists) {
+					if(m.response){
+						if(whatfile=="filesList"){
+							that.filesList.push(m);
+							// this.form.files_list = list;
+						}
+						if(whatfile=="dealFilesList"){
+							that.dealFilesList.push(m);
+							
+						}
+					}
 				}
 			},
 			radioChange(val){
@@ -188,32 +199,80 @@
 				if(that.nextStatusId==3){
 					that.form.status = that.nextStatusId
 				}else{
+					that.form.status = that.normalstatus;
 					that.form.deal_latitude = "";
 					that.form.deal_longitude = "";
 				}
-				// console.log(that.form);
+				let list = [];
+				let deallist=[];
+				for(var mod of that.filesList){
+					if( mod.response){
+						list.push({
+							upload_id: mod.response.id
+						})
+					}else{
+						list.push({
+							upload_id:mod.id
+						})
+					}
+				}
+				for(var mod of that.dealFilesList){
+					if( mod.response){
+						deallist.push({
+							upload_id: mod.response.id
+						})
+					}else{
+						deallist.push({
+							upload_id: mod.id
+						})
+					}
+				}
+				that.form.files_list = list;
+				that.form.deal_files_list = deallist;
 				// return;
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-						console.log('验证通过');
-						that.util.request({
-							api: '/api/mobile/daily-inspection/store',
-							method: "POST",
-							data: that.form,
-							utilSuccess: function(res) {
-								uni.showToast({
-									icon: "none",
-									title: "提交成功",
-									complete() {
-										that.afterSubmit(res);
-									},
-									duration: 2000
-								})
-							},
-							utilFail: function(res) {
-								this.util.alert(res);
-							}
-						});
+						console.log('验证通过');
+						if(that.infoId){
+							that.util.request({
+								api: '/api/mobile/daily-inspection/save',
+								method: "POST",
+								data: that.form,
+								utilSuccess: function(res) {
+									uni.showToast({
+										icon: "none",
+										title: "提交成功",
+										complete() {
+											that.afterSubmit(res);
+										},
+										duration: 2000
+									})
+								},
+								utilFail: function(res) {
+									that.util.alert(res);
+								}
+							});
+						}else{
+							that.util.request({
+								api: '/api/mobile/daily-inspection/store',
+								method: "POST",
+								data: that.form,
+								utilSuccess: function(res) {
+									uni.showToast({
+										icon: "none",
+										title: "提交成功",
+										complete() {
+											that.afterSubmit(res);
+										},
+										duration: 2000
+									})
+								},
+								utilFail: function(res) {
+									that.util.alert(res);
+								}
+							});
+						}
+						
 					} else {
 						console.log('验证失败');
 					}
@@ -224,27 +283,58 @@
 					url: "../dailyList/dailyList"
 				})
 			},
+			showInfo(id){
+				var that = this;
+				that.util.request({
+					api: '/api/mobile/daily-inspection/show',
+					method: "get",
+					data: {
+						id:id
+					},
+					utilSuccess: function(result) {
+						that.form = result;
+						that.normalstatus = result.status;
+						if(result.status==3){
+							that.nextStatusId = 3;
+							that.normalstatus = 2;
+							that.nextStatus = "不可现场处理"
+						}
+						let _files = [];
+						let _dealfiles = [];
+						for (var mod of result.daily_inspection_files) {
+						  let m = Object.assign({}, mod);
+						  m.url = mod.files.url;
+						  m.id = mod.files.id;
+						  m.name = mod.files.original_name;
+						  _files.push(m);
+						}
+						
+						for (var mod of result.daily_inspection_deal_files) {
+						  let m = Object.assign({}, mod);
+						  m.url = mod.files.url;
+						  m.id = mod.files.id;
+						  m.name = mod.files.original_name;
+						  _dealfiles.push(m);
+						}
+						that.filesList = _files
+						that.dealFilesList = _dealfiles
+						// that.form.files_list = _upfiles;
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
 			
 			chooseLocation(e) { //打开地图选择位置
 				var that = this;
 				uni.chooseLocation({
+					longitude : that.form.deal_longitude,
+					latitude : that.form.deal_latitude,
 					success: res => {
-						console.log('位置名称：' + res.name);
-						console.log('详细地址：' + res.address);
-						console.log('纬度：' + res.latitude);
-						console.log('经度：' + res.longitude);
 						that.form.address = res.name;
-						uni.getLocation({
-							type: 'gcj02',
-							altitude:true,
-							geocode:true,
-							success: function(res) {
-								that.form.deal_longitude = res.longitude;
-								that.form.deal_latitude = res.latitude;
-							}
-						});
-						
-						
+						that.form.deal_longitude = res.longitude;
+						that.form.deal_latitude = res.latitude;
 					}
 				});
 			},
diff --git a/packageB/pages/dailyList/dailyList.vue b/packageB/pages/dailyList/dailyList.vue
index eb20f3b..c00d210 100644
--- a/packageB/pages/dailyList/dailyList.vue
+++ b/packageB/pages/dailyList/dailyList.vue
@@ -19,7 +19,7 @@
 			</u-dropdown>
 			<block v-for="(item, index) in dataList">
 				<u-card :title="item.created_at" padding="20" margin="20rpx" :border="true"
-					:sub-title="item.created_at" :thumb="thumb" thumb-width="36">
+					 :thumb="thumb" thumb-width="36">
 					<view class="" slot="body" @click="todetail(item.id)">
 						<u-row gutter="16">
 							<u-col span="3">
@@ -124,7 +124,6 @@
 		
 		
 		onReachBottom: function(e) {
-			console.log(this.currentPage,this.lastPage);
 			if(this.currentPage>=this.lastPage){
 				this.loadStatus = "nomore"
 				return;
@@ -133,7 +132,7 @@
 		},
 		onPullDownRefresh: function(e) {
 			this.loadStatus = 'loadmore';
-			console.log("bbb")
+			console.log("onPullDownRefresh")
 			this.loadPage(1);
 		},
 		onShow: function() {
@@ -178,8 +177,7 @@
 			},
 			loadPage: function(page) {
 				uni.hideKeyboard()
-				var that = this;
-				console.log(page)
+				var that = this;
 				this.util.request({
 					bindThis: that,
 					api: '/api/mobile/daily-inspection/index',
@@ -217,7 +215,6 @@
 						for (var m of dataList) {
 							m.created_at = m.created_at.split("T")[0]
 						}
-						console.log(dataList)
 
 						that.currentPage = page;
 						that.dataList = dataList;
@@ -249,10 +246,13 @@
 								  	id:id
 								  },
 								  utilSuccess: function(r) {
-									  that.$refs.uToast.show({
-										  title: '删除成功',
-										  duration: 2000,
-										  url: '/packageB/pages/dailyList/dailyList'
+									  uni.showToast({
+									  	icon: "none",
+									  	title: "提交成功",
+									  	complete() {
+									  		that.loadPage(1)
+									  	},
+									  	duration: 2000
 									  })
 								  },
 								  utilFail:function(r) {
diff --git a/pages.json b/pages.json
index 7d74462..e0f2f52 100644
--- a/pages.json
+++ b/pages.json
@@ -78,7 +78,8 @@
 			"style": {
 				"navigationBarTitleText": "日常监管巡查",
 				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				 "disableScroll": true
+				
 			}
 		}]
 	}],