From b35320720bd8ad34d5c28e4093ceef250735db7a Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 12 Jul 2022 13:52:51 +0800
Subject: [PATCH] upup

---
 order/order/order/order.vue                   | 397 ++++++++++++++++++
 order/order/orderInfo/orderInfo.vue           | 259 ++++++++++++
 order/order/orderList/orderList.vue           | 359 ++++++++++++++++
 .../pages/generalPatrol/generalPatrol.vue     |  12 +-
 .../pages/dailyInspection/dailyInspection.vue |  18 +-
 pages.json                                    |  28 +-
 pages/index/index.vue                         |  13 +
 pages/mine/mine.vue                           |  13 +
 .../raininspection/raininspection.vue         |  25 +-
 rainmaintain/rainmaintain/rainmaintain.vue    |  18 +-
 10 files changed, 1096 insertions(+), 46 deletions(-)
 create mode 100644 order/order/order/order.vue
 create mode 100644 order/order/orderInfo/orderInfo.vue
 create mode 100644 order/order/orderList/orderList.vue

diff --git a/order/order/order/order.vue b/order/order/order/order.vue
new file mode 100644
index 0000000..ba7d0ec
--- /dev/null
+++ b/order/order/order/order.vue
@@ -0,0 +1,397 @@
+<template>
+	<view class="content">
+		<u-form :model="form" ref="uForm">
+			<u-form-item label="反馈科室" label-position="top" prop="type">
+				<u-input placeholder="请选择反馈科室" v-model="depName" type="select" :border="true" @click="depshow = true" />
+				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+				<u-select v-model="depshow" mode="single-column" value-name="id" label-name="name" :list="rainArr.depList"
+					@confirm="confirmDepType"></u-select>
+			</u-form-item>
+			<u-form-item label="工单标题" label-position="top" prop="name" required>
+				<u-input v-model="form.name" type="text" :border="true" placeholder="请填写标题"/>
+			</u-form-item>
+			<u-form-item label="地址" label-position="top" required>
+				<!-- <text>{{form.address}}</text> -->
+				<u-input v-model="form.address" disabled type='text'/>
+				<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
+			</u-form-item>
+			<u-form-item label-position="top" label="内容" prop="content" required>
+				<u-input v-model="form.content" placeholder="请填写内容" type='textarea' height='100' :border="true" />
+			</u-form-item>
+			<u-form-item label-position="top" label="现场照片">
+				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
+					: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="异常处置建议" prop="tip">
+				<u-input v-model="form.tip" placeholder="请填写异常处置建议" type='textarea' height='100' :border="true" />
+			</u-form-item>
+			
+			<u-form-item labelWidth="240" label-position="left" label="是否隶属于雨管科">
+				<u-radio-group v-model="form.is_rain">
+					<u-radio 
+						v-for="(item, index) in rainArr.rains" :key="index" 
+						:name="item.id"
+					>
+						{{item.name}}
+					</u-radio>
+				</u-radio-group>
+			</u-form-item>
+			<u-form-item labelWidth="240" label-position="left" label="是否现场处理">
+				<u-radio-group v-model="form.is_scene" @change="radioGroupChange">
+					<u-radio 
+						v-for="(item, index) in rainArr.scenes" :key="index" 
+						:name="item.id"
+					>
+						{{item.name}}
+					</u-radio>
+				</u-radio-group>
+			</u-form-item>
+			
+
+			<div v-if="form.is_scene==1">
+				<u-form-item label-position="top" label="现场处理结果" prop="result">
+					<u-input v-model="form.result" type='textarea' height='100' :border="true" />
+				</u-form-item>
+				
+				<u-form-item label-position="top" label="处理后照片">
+					<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
+						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="dealFilesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
+						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
+					</u-upload>
+				</u-form-item>
+			</div>
+		</u-form>
+		<u-button type="primary" @click="submit">提交</u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				otherData: {
+					token: ""
+				},
+				depshow:false,
+				depName:"",
+				rainArr:{
+					depList:[],
+					rains:[{
+						id:0,
+						name:"否"
+					},{
+						id:1,
+						name:"是"
+					}],
+					scenes:[{
+						id:0,
+						name:"否"
+					},{
+						id:1,
+						name:"是"
+					}]
+				},
+				action: "",
+				infoId:"",
+				
+				filesList:[],
+				dealFilesList:[],
+				changeResult:"",
+				changedealFilesList:[],
+				form: {
+					feedback_department_id:"",
+					name:"",
+					content:"",
+					status:0,
+					is_rain:"",
+					is_scene:"",
+					tip:"",
+					result:"",
+					address:"",
+					files_list:"",
+					files_end_list:""
+				},
+				width: 300,
+				height: 300,
+				rules: {
+					name: [{
+						required: true,
+						message: '请填写标题',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['blur'],
+					}],
+					content: [{
+						required: true,
+						message: '请填写内容',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['blur'],
+					}]
+				}
+			}
+		},
+		onLoad(options) {
+			var that = this;
+			if(options.id){
+				this.infoId = options.id;
+				this.showInfo(this.infoId);
+			}
+			this.loadDep();
+			
+			this.action = this.util.HOST + "/api/mobile/upload-file";
+			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+			let that = this;
+			uni.getLocation({
+				type: "gcj02",
+				geocode:true,
+				success(res) {
+
+					const url = "https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location="+res.latitude+","+res.longitude+"&output=jsonp"
+					that.$jsonp(
+							url
+					 ).then(re => {
+						that.form.address = re.result.formatted_addresses.recommend
+					})
+				}
+				
+			})
+			uni.getSystemInfo({
+				complete(res) {
+					that.width = res.screenWidth * .8
+					that.height = res.screenHeight * .6
+				}
+			})
+
+		},
+		methods: {
+			loadDep(){
+				var that = this
+				that.util.request({
+					api: '/api/mobile/other/department-list',
+					method: "get",
+					data: {
+						is_tree:0
+					},
+					utilSuccess: function(res) {
+						that.rainArr.depList = res
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			radioGroupChange(e){
+					console.log(e)
+				if(e==0){
+					this.form.result = "";
+					this.dealFilesList = [];
+				}else{
+					this.form.result = this.changeResult;
+					this.dealFilesList = this.changedealFilesList;
+				}
+			},
+			confirmDepType(val){
+				var that = this
+				console.log(val)
+				that.form.feedback_department_id = val[0].value
+				that.depName = val[0].label
+				
+			},
+			toremove(index, lists, name,whatfile) {
+				if(whatfile=="filesList"){
+					this.filesList.splice(index,1)
+					// this.form.files_list = list;
+				}
+				if(whatfile=="dealFilesList"){
+					this.dealFilesList.splice(index,1)
+					// this.form.files_end_list = list;
+				}
+			},
+			onprogress(res){
+				uni.showToast({
+					icon: "none",
+					title: "上传中",
+					duration: 2000
+				})
+			},
+			tosuccess(){
+				uni.showToast({
+					icon: "none",
+					title: "上传成功",
+					duration: 2000
+				})
+			},
+			toupload(lists, name, whatfile) {
+				var that = this;
+				let list = [];
+				if(whatfile=="filesList"){
+					that.filesList = lists
+					// this.form.files_list = list;
+				}
+				if(whatfile=="dealFilesList"){
+					that.dealFilesList = lists;
+					
+				}
+			},
+			submit() {
+				let that = this;
+				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.files_end_list = deallist;
+				that.changeResult = that.form.result
+				that.changedealFilesList = that.deallist
+				console.log("form",that.form)
+				// return;
+				// return;
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						console.log('验证通过');
+						if(that.infoId){
+							that.util.request({
+								api: '/api/mobile/mobile-worksheet/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/mobile-worksheet/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('验证失败');
+					}
+				});
+			},
+			afterSubmit(res) {
+				uni.redirectTo({
+					url: "../orderList/orderList"
+				})
+			},
+			showInfo(id){
+				var that = this;
+				that.util.request({
+					api: '/api/mobile/mobile-worksheet/show',
+					method: "get",
+					data: {
+						id:id
+					},
+					utilSuccess: function(result) {
+						that.form = result;
+						for(var m of that.rainArr.depList){
+							if(result.feedback_department_id==m.id){
+								console.log(m)
+								that.depName = m.name
+							}
+						}
+						let _files = [];
+						let _dealfiles = [];
+						for (var mod of result.worksheet_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.worksheet_end_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.changeResult = result.result
+						that.changedealFilesList = _dealfiles
+						// that.form.files_list = _upfiles;
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			
+			chooseLocation(e) { //打开地图选择位置
+				var that = this;
+				uni.chooseLocation({
+					success: res => {
+						that.form.address = res.name;
+
+					}
+				});
+			},
+
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding: 20rpx;
+	}
+
+	.popuptitle {
+		background: #2979ff;
+		color: #fff;
+		padding: 20rpx 30rpx;
+	}
+</style>
diff --git a/order/order/orderInfo/orderInfo.vue b/order/order/orderInfo/orderInfo.vue
new file mode 100644
index 0000000..58b2c95
--- /dev/null
+++ b/order/order/orderInfo/orderInfo.vue
@@ -0,0 +1,259 @@
+<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">
+						<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">
+								<view class="demo-layout bg-purple-light">{{lists.depName}}</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">
+								{{lists.address}}
+							</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">
+								{{lists.content}}
+							</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 filesList">
+								<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="6">
+								<view class="demo-layout bg-purple">异常处置建议：</view>
+							</u-col>
+							<u-col span="12">
+								{{lists.tip}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="6">
+								<view class="demo-layout bg-purple">是否隶属于雨管科：</view>
+							</u-col>
+							<u-col span="9">
+								{{lists.is_rain_name}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="6">
+								<view class="demo-layout bg-purple">是否现场处理：</view>
+							</u-col>
+							<u-col span="9">
+								{{lists.is_scene_name}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16" v-if="lists.is_scene==1">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">现场处理结果：</view>
+							</u-col>
+							<u-col span="12">
+								{{lists.result}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16" v-if="lists.is_scene==1">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">处理后照片：</view>
+							</u-col>
+							<u-col span="12" v-for="(item,index) in dealFilesList">
+								<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
+							</u-col>
+						</u-row>
+						
+						
+						
+						
+						
+					</view>
+					
+				</u-card>
+		
+			</block>
+		</view>
+
+	
+		
+	</view>
+
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				lists:{},
+				filesList:[],
+				dealFilesList:[],
+				depList:[]
+				
+			}
+		},
+		
+		
+		
+		onLoad(options) {
+			if(options.id){
+				this.loadInfo(options.id)
+			}
+			this.loadDep()
+		},
+		methods: {
+			loadDep(){
+				var that = this
+				that.util.request({
+					api: '/api/mobile/other/department-list',
+					method: "get",
+					data: {
+						is_tree:0
+					},
+					utilSuccess: function(res) {
+						that.depList = res
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			loadInfo: function(id) {
+				var that = this;
+				this.util.request({
+					method:"get",
+					api: '/api/mobile/mobile-worksheet/show',
+					customLoading: false,
+					data: {
+						id:id
+					},
+					
+					utilSuccess: function(r) {
+						
+						that.lists = r
+						that.filesList = r.worksheet_files
+						that.dealFilesList = r.worksheet_end_files
+						for(var m of that.depList){
+							if(r.feedback_department_id==m.id){
+								that.lists.depName = m.name
+							}
+						}
+						
+						that.lists.is_rain_name = r.is_rain==0 ? "否" : "是" 
+						that.lists.is_scene_name = r.is_scene==0?"否":"是"
+						
+					},
+					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/order/order/orderList/orderList.vue b/order/order/orderList/orderList.vue
new file mode 100644
index 0000000..a55af5e
--- /dev/null
+++ b/order/order/orderList/orderList.vue
@@ -0,0 +1,359 @@
+<template>
+	<view class="boxContent">
+
+		<view class="box-header">
+			<view class="search-wrap">
+				<!-- 如果使用u-search组件，必须要给v-model绑定一个变量 -->
+				<u-search v-model="keyword" placeholder="关键词" @change="tosearch()" @search="tosearch()" height="56"
+					:action-style="{color: '#fff'}">
+				</u-search>
+			</view>
+		</view>
+		
+		<view :class="mask?'list listfixed':'list'" style="padding-top: 100rpx;">
+			<!-- <u-dropdown @open="openmask" @close="closemask" :class="mask?'':'overflowmask'" ref="uDropdown">
+				
+				<u-dropdown-item v-model="proStatusId" :title="proStatus==''?'处理方式':proStatus" @change="toChangeStatus"
+					:options="prostatusList">
+				</u-dropdown-item>
+				
+				<u-dropdown-item v-model="lzStatusId" :title="lzStatus==''?'状态':lzStatus" @change="toChangelzStatus"
+					:options="lzstatusList">
+				</u-dropdown-item>
+			</u-dropdown> -->
+			<block v-for="(item, index) in dataList">
+				<u-card :title="item.created_at" padding="20" margin="20rpx" :border="true"
+					 :thumb="thumb" thumb-width="36" :sub-title="item.statusName">
+					<view class="" slot="body" @click="todetail(item.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">{{item.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">
+								<view class="demo-layout bg-purple-light">{{item.feedbackName}}</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">
+								{{item.address}}
+							</u-col>
+						</u-row>
+					</view>
+					<view class="footer" slot="foot">
+						<block >
+							<u-button :custom-style="editStyle" type="primary"  size="medium"
+								@click="toedit(item.id)" :ripple="true">编辑
+							</u-button>
+						</block>
+						<block >
+							<u-button type="error"  size="medium" @click="del(item.id)"
+								:custom-style="customStyle" :ripple="true">删除
+							</u-button>
+						</block>
+					</view>
+					
+				</u-card>
+		
+			</block>
+			<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText"/>
+			<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
+		</view>
+		<u-toast ref="uToast" />
+
+	
+		
+	</view>
+
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundColor: '#007AFF'
+				},
+				mask: false,
+				loadStatus:"loadmore",
+				loadText:{
+					loadmore:"加载更多",
+					nomore:"已经到底了"
+				},
+				dataList: [],
+				thumb: "/static/img/location.png",
+				currentPage: 0,
+				lastPage:0,
+				editStyle:{
+					fontSize:'30rpx'
+				},
+				customStyle: {
+					marginLeft: '20px',
+					fontSize:'30rpx'
+				},
+				keyword: "",
+				title: "",
+				depList:[],
+				feedbackName:"",
+				statusList:[{
+					id:0,
+					value:'待处理'
+				},{
+					id:1,
+					value:'已处理'
+				}]
+				
+			}
+		},
+		
+		
+		onReachBottom: function(e) {
+			if(this.currentPage>=this.lastPage){
+				this.loadStatus = "nomore"
+				return;
+			}
+			this.loadPage(this.currentPage + 1);
+		},
+		onPullDownRefresh: function(e) {
+			this.loadStatus = 'loadmore';
+			console.log("onPullDownRefresh")
+			this.loadPage(1);
+		},
+		onShow: function() {
+			var that = this;
+		},
+		onLoad(options) {
+			this.loadDep()
+			this.loadPage(1);
+		},
+		methods: {
+			loadDep(){
+				var that = this
+				that.util.request({
+					api: '/api/mobile/other/department-list',
+					method: "get",
+					data: {
+						is_tree:0
+					},
+					utilSuccess: function(res) {
+						that.depList = res
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			
+			tosearch() {
+				
+				this.loadPage(1)
+				this.$refs.uDropdown.close();
+			},
+			todetail: function(id) {
+				uni.navigateTo({
+					url: "../orderInfo/orderInfo?id=" + id
+				})
+			},
+			toedit(id){
+				uni.navigateTo({
+					url: "../order/order?id=" + id
+				})
+			},
+			loadPage: function(page) {
+				uni.hideKeyboard()
+				var that = this;
+				this.util.request({
+					bindThis: that,
+					api: '/api/mobile/mobile-worksheet/index',
+					customLoading: false,
+					data: {
+						page: page,
+						page_size: 5,
+						keyword: that.keyword,
+					},
+					
+					utilSuccess: function(r) {
+						var res = r.data;
+						that.lastPage = r.last_page;
+						uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
+						if(r.total<6){
+							that.loadStatus = "nomore";
+						}
+						var hasNoMore = that.dataList.length < 5 && page > 1 ;
+						if (hasNoMore || res.length == 0 && page > 1) {
+							that.loadStatus = "nomore";
+							// 已加载到最后一页
+							uni.showToast({
+								title: '已加载到最后一页',
+								icon: 'none'
+							});
+							return;
+						}
+						var dataList = that.dataList;
+						if (page == 1) {
+							dataList = res;
+						} else {
+							dataList.push(...res);
+						}
+						for (var m of dataList) {
+							m.created_at = m.created_at.split("T")[0]
+							for(var k of that.statusList){
+								if(m.status==k.id){
+									m.statusName = k.value
+								}
+							}
+							for(var l of that.depList){
+								if(m.feedback_department_id==l.id){
+									m.feedbackName = l.name
+								}
+							}
+							
+						}
+
+						that.currentPage = page;
+						that.dataList = dataList;
+					},
+					utilFail: function(res) {
+						uni.stopPullDownRefresh();
+
+						if (page == 1) {
+
+							that.currentPage = page;
+						}
+
+						this.util.alert(res);
+					}
+				});
+			},
+			del(id){
+				 var that = this;
+				 uni.showModal({
+					  title: '提示',
+					  content: '是否确定删除？',
+					  success(res) {
+						  if(res.confirm){
+							  that.util.request({
+								  api: '/api/mobile/mobile-worksheet/destroy',
+								  customLoading: false,
+								  method:"get",
+								  data: {
+								  	id:id
+								  },
+								  utilSuccess: function(r) {
+									  uni.showToast({
+									  	icon: "none",
+									  	title: "提交成功",
+									  	complete() {
+									  		that.loadPage(1)
+									  	},
+									  	duration: 2000
+									  })
+								  },
+								  utilFail:function(r) {
+									  this.util.alert(res);
+								  },
+								  
+							  })
+						  }else if(res.cancel){
+							  
+						  }
+					  }
+					 
+					 
+					 
+				 })
+			}
+
+		}
+
+	}
+</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;
+	}
+	.listfixed{
+		position: fixed;
+		width:100%;
+	}
+
+	.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/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
index a1d203d..fc69fe2 100644
--- a/packageA/pages/generalPatrol/generalPatrol.vue
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -148,12 +148,12 @@
 			toupload(lists, name) {
 				console.log(lists)
 				let list = [];
-				for (var m of lists) {
-					if(m.response){
-						this.filesList.push(m)
-					}
-				}
-				// this.form.files_list = list;
+				// for (var m of lists) {
+				// 	if(m.response){
+				// 		this.filesList.push(m)
+				// 	}
+				// }
+				 this.filesList = list;
 			},
 			confirmUnit(e) {
 				var that = this;
diff --git a/packageB/pages/dailyInspection/dailyInspection.vue b/packageB/pages/dailyInspection/dailyInspection.vue
index 6423c0b..43bd9e0 100644
--- a/packageB/pages/dailyInspection/dailyInspection.vue
+++ b/packageB/pages/dailyInspection/dailyInspection.vue
@@ -180,17 +180,13 @@
 			toupload(lists, name, whatfile) {
 				var that = this;
 				let 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);
-							
-						}
-					}
+				if(whatfile=="filesList"){
+					that.filesList = lists
+					// this.form.files_list = list;
+				}
+				if(whatfile=="dealFilesList"){
+					that.dealFilesList = lists;
+					
 				}
 			},
 			radioChange(val){
diff --git a/pages.json b/pages.json
index 0152375..767d59a 100644
--- a/pages.json
+++ b/pages.json
@@ -126,7 +126,33 @@
 
 				}
 			}]
-		}],
+		}, {
+		"root": "order/order",
+		"pages": [{
+			"path": "order/order",
+			"style": {
+				"navigationBarTitleText": "工单执行",
+				"enablePullDownRefresh": false
+			}
+
+		},{
+			"path": "orderList/orderList",
+			"style": {
+				"navigationBarTitleText": "工单执行",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				 "disableScroll": true
+			}
+		},{
+			"path": "orderInfo/orderInfo",
+			"style": {
+				"navigationBarTitleText": "工单执行",
+				"enablePullDownRefresh": false,
+				 "disableScroll": true
+				
+			}
+		}]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "巡查养护",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 99aa87f..1ea79ae 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -20,6 +20,16 @@
 					<text class="navtxt">雨管养护</text>
 				</view>
 			</u-col>
+		</u-row>
+		<u-row gutter="16">
+		
+		
+			<u-col span="12">
+				<view class="demo-layout bg-purple-light" @click="toview(6)">
+					<text class="iconfont icon-gongnengxingquexianshuju"></text>
+					<text class="navtxt">工单执行</text>
+				</view>
+			</u-col>
 		</u-row>
 		<u-row gutter="16">
 
@@ -85,6 +95,9 @@
 				}
 				if (type == 5) {
 					url = "/raininspection/raininspection/raininspection"
+				}
+				if (type == 6) {
+					url = "/order/order/order/order"
 				}
 				uni.navigateTo({
 					url: url
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 41adb78..de03647 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -20,6 +20,16 @@
 					<text class="navtxt">我的养护</text>
 				</view>
 			</u-col>
+		</u-row>
+		<u-row gutter="16">
+		
+		
+			<u-col span="12">
+				<view class="demo-layout bg-purple-light" @click="toview(5)">
+					<text class="iconfont icon-gongnengxingquexianshuju"></text>
+					<text class="navtxt">我的工单</text>
+				</view>
+			</u-col>
 		</u-row>
 		<u-row gutter="16">
 
@@ -76,6 +86,9 @@
 				}
 				if (type == 4) {
 					url = "/raininspection/raininspectionlist/raininspectionList"
+				}
+				if (type == 5) {
+					url = "/order/order/orderList/orderList"
 				}
 				uni.navigateTo({
 					url: url
diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue
index c0834ab..9e2baa0 100644
--- a/raininspection/raininspection/raininspection.vue
+++ b/raininspection/raininspection/raininspection.vue
@@ -59,12 +59,7 @@
 				<u-input v-model="form.address" disabled type='text'/>
 				<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
 			</u-form-item>
-			
-			<view v-if="!formshow">
-				
-				
-				
-			</view>
+		
 				
 			<u-form-item label-position="top" label="描述" prop="content" required>
 				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
@@ -413,17 +408,13 @@
 			toupload(lists, name, whatfile) {
 				var that = this;
 				let 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);
-							
-						}
-					}
+				if(whatfile=="filesList"){
+					that.filesList = lists
+					// this.form.files_list = list;
+				}
+				if(whatfile=="dealFilesList"){
+					that.dealFilesList = lists;
+					
 				}
 			},
 			afterSubmit(res) {
diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue
index d0c59d5..991658a 100644
--- a/rainmaintain/rainmaintain/rainmaintain.vue
+++ b/rainmaintain/rainmaintain/rainmaintain.vue
@@ -292,17 +292,13 @@
 			toupload(lists, name, whatfile) {
 				var that = this;
 				let 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);
-							
-						}
-					}
+				if(whatfile=="filesList"){
+					that.filesList = lists
+					// this.form.files_list = list;
+				}
+				if(whatfile=="dealFilesList"){
+					that.dealFilesList = lists;
+					
 				}
 			},
 			afterSubmit(res) {