liwei2496 2 år sedan
förälder
incheckning
9035813b1d

+ 99 - 71
pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -6,14 +6,10 @@
 			</u-cell>
 		</u-cell-group>
 		<view class="topbill">
-			<view class="topbilledit">
+			<view class="topbilledit" @click="xunjianchange">
 				<view class="changetime1">
-					<picker mode="date" :value="myday" fields="month" @change="dateChange">
-						<view class="selestDate">
-						<!-- {{myday}} -->
-						巡检类型
-						</view>
-					</picker>
+					{{xjlx}}
+
 				</view>
 				<view class="changetime2">
 					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
@@ -21,8 +17,8 @@
 			</view>
 			<view class="topbilledit" @click="typechange">
 				<view class="changetime1">
-					<!-- {{mytype}} -->
-					巡检人员
+					{{xjry}}
+
 				</view>
 				<view class="changetime2">
 					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
@@ -48,50 +44,53 @@
 			</t-tr>
 		</t-table> -->
 
-<view class="u-listdata">
-	
-	
-	<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
-		<u-list-item v-for="(item, index) in indexList" :key="index">
-			<!-- <u-cell :title="`列表长度-${index + 1}`">
+		<view class="u-listdata">
+
+
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+					<!-- <u-cell :title="`列表长度-${index + 1}`">
 				<u-avatar slot="icon" shape="square" size="35" :src="item.url"
 					customStyle="margin: -3px 5px -3px 0"></u-avatar>
 			</u-cell> -->
-			<view class="companylist" @click="seedetail(item)">
-				<view class="settled" v-if="item.status==1">
-					已结清
-				</view>
-				<view class="outstanding" v-if="item.status==0">
-					未结清
-				</view>
-				<h3>{{item.name}}</h3>
-				<view class="Currentamount">
-					本期金额: <span>¥{{item.feeTotal}}</span>
-				</view>
-				<view class="Currentamount">
-					欠费天数: {{item.elecAmount}}
-				</view>
-				<view class="Currentamount">
-					账户余额:¥{{item.balance}}
-				</view>
-				<view class="Currentamount">
-					联系电话: {{item.tel}}
-				</view>
-				<view class="Callfee"  v-if="item.status==0"   @click.stop="handleClick(item.id)">
-					催费
-				</view>
-			</view>
-	
-		</u-list-item>
-	</u-list>
-	
-</view>
+					<view class="companylist" @click="seedetail(item)">
+						<view class="settled" v-if="item.status==1">
+							已结清
+						</view>
+						<view class="outstanding" v-if="item.status==0">
+							未结清
+						</view>
+						<h3>{{item.name}}</h3>
+						<view class="Currentamount">
+							本期金额: <span>¥{{item.feeTotal}}</span>
+						</view>
+						<view class="Currentamount">
+							欠费天数: {{item.elecAmount}}
+						</view>
+						<view class="Currentamount">
+							账户余额:¥{{item.balance}}
+						</view>
+						<view class="Currentamount">
+							联系电话: {{item.tel}}
+						</view>
+						<view class="Callfee" v-if="item.status==0" @click.stop="handleClick(item.id)">
+							催费
+						</view>
+					</view>
 
+				</u-list-item>
+			</u-list>
 
+		</view>
 
 
+		<u-picker :show="showtypexunjian" :columns="columnstypexunjian" keyName="label" @confirm="confirmxunjian"
+			@cancel='cancelxunjian'>
+		</u-picker>
+
 		<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
 		</u-picker>
+
 		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
 		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
@@ -115,6 +114,7 @@
 				format: 'yyyy-mm'
 			})
 			return {
+				showtypexunjian: false,
 				setyesno: true,
 				// tableList: [{
 				// 		id: 0,
@@ -130,7 +130,7 @@
 				// 	},				
 				// ],
 				indexList: [],
-
+				xjlx: '巡检类型',
 
 				dataList: [],
 				dataForm: {
@@ -152,9 +152,21 @@
 				columns: [],
 				columnData: [],
 				myday: '',
-				mytype: '',
+				xjry: '巡检人员',
 				showPicker: false,
 				myday: currentDate,
+				columnstypexunjian: [
+					[{
+							label: '安保',
+							id: ''
+						}, {
+							label: '保洁',
+							id: 0
+						},
+
+					]
+				],
+
 				columnstype: [
 					[{
 							label: '张三',
@@ -196,12 +208,12 @@
 
 
 		methods: {
-			seedetail(e){
-				  console.log('222',e)
+			seedetail(e) {
+				console.log('222', e)
 			},
-			handleClick(e){
-				  console.log('111111111111111111',e)
-				  
+			handleClick(e) {
+				console.log('111111111111111111', e)
+
 			},
 			scrolltolower() {
 				// this.loadmore()				 
@@ -213,7 +225,7 @@
 							this.indexList.push(...res.data.data.list);
 						} else {
 							uni.showToast({
-								title:'暂无更多数据了',
+								title: '暂无更多数据了',
 								icon: 'none',
 								duration: 1500
 							})
@@ -229,7 +241,21 @@
 				// 	})
 				// }
 			},
-
+			xunjianchange() {
+				this.showtypexunjian = true;
+			},
+			cancelxunjian() {
+				this.showtypexunjian = false;
+			},
+			confirmxunjian(e) {
+			
+				this.xjlx = e.value[0].label;
+				// this.dataForm.cycle = e.value[0].id;
+				// this.dataForm.page = 1;
+				// this.getalldata();
+				
+				this.showtypexunjian = false;
+			},
 
 			getalldata() {
 				this.$api.get('/billinfo/paypage', this.dataForm)
@@ -246,11 +272,11 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
-			//	console.log('111111111111111111', e.value[0])
+				//	console.log('111111111111111111', e.value[0])
 				this.showtype = false;
-				this.mytype = e.value[0].label;
+				this.xjry = e.value[0].label;
 				this.dataForm.cycle = e.value[0].id;
-				this.dataForm.page=1;
+				this.dataForm.page = 1;
 				this.getalldata();
 			},
 			typechange() {
@@ -259,7 +285,7 @@
 			dateChange(e) {
 				this.myday = e.target.value;
 				this.dataForm.cycle = e.target.value;
-				this.dataForm.page=1;
+				this.dataForm.page = 1;
 				this.getalldata();
 			},
 			getDate(type) {
@@ -295,7 +321,7 @@
 							}
 							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
-							this.dataForm.page=1;
+							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
 							this.showdct = true
@@ -349,19 +375,21 @@
 			padding-left: 9rpx;
 		}
 	}
-.Callfee{
-	width: 100rpx;
-	height: 45rpx;
-	text-align: center;
-	line-height:45rpx;
-	color: #5C8FFF;
-	border: 1px solid #5C8FFF;
-	font-size: 22rpx;
-	position: absolute;
-	bottom: 10rpx;
-	right: 10px;
-	font-weight: bold;
-}
+
+	.Callfee {
+		width: 100rpx;
+		height: 45rpx;
+		text-align: center;
+		line-height: 45rpx;
+		color: #5C8FFF;
+		border: 1px solid #5C8FFF;
+		font-size: 22rpx;
+		position: absolute;
+		bottom: 10rpx;
+		right: 10px;
+		font-weight: bold;
+	}
+
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;

+ 324 - 267
pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -1,281 +1,338 @@
 <template>
-	<view>
-		<!-- 注意,如果需要兼容微信小程序,最好通过setRules方法设置rules规则 -->
-		<u--form
-				labelPosition="left"
-				:model="model1"
-				:rules="rules"
-				ref="uForm"
-		>
-			<u-form-item
-					labelWidth="150"
-					label="报修位置"
-					prop="userInfo.sex"
-					borderBottom
-					@click="showSex = true; hideKeyboard()"
-					ref="item1"
-			>
-				<u--input
-						v-model="model1.userInfo.sex"
-						disabled
-						
-						placeholder="请选择报修位置"
-						border="none"
-				></u--input>
-				<u-icon
-						slot="right"
-						name="arrow-right"
-				></u-icon>
-			</u-form-item>
-			<u-form-item
-					labelWidth="150"
-					label="报修区域"
-					prop="userInfo.sex"
-					borderBottom
-					@click="showSex = true; hideKeyboard()"
-					ref="item1"
-			>
-				<u--input
-						v-model="model1.userInfo.sex"
-						disabled
-						placeholder="请选择报修区域"
-						border="none"
-				></u--input>
-				<u-icon
-						slot="right"
-						name="arrow-right"
-				></u-icon>
-			</u-form-item>
-			<u-form-item
-					labelWidth="150"
-					label="报修类型"
-					prop="userInfo.sex"
-					borderBottom
-					@click="showSex = true; hideKeyboard()"
-					ref="item1"
-			>
-				<u--input
-						v-model="model1.userInfo.sex"
-						disabled
-						placeholder="请选择报修类型"
-						border="none"
-				></u--input>
-				<u-icon
-						slot="right"
-						name="arrow-right"
-				></u-icon>
-			</u-form-item>
-			<u-form-item
-					labelWidth="120"
-					label="联系人"
-					prop=""
-					
-					borderBottom
-					ref="item1"
-			>
-				<u--input
-						v-model="model1.userInfo.name"
-						border="none"
-						placeholder="请输入联系人"
-				></u--input>
-			</u-form-item>
-			<u-form-item
-					labelWidth="150"
-					label="联系电话"
-					prop=""
-					borderBottom
-					ref="item1"
-			>
-				<u--input
-						v-model="model1.userInfo.name"
-						border="none"
-						placeholder="请输入联系电话"
-				></u--input>
-			</u-form-item>
-		</u--form>
-		<u-action-sheet
-				:show="showSex"
-				:actions="actions"
-				title="请选择报修位置"
-				description=""
-				@close="showSex = false"
-				@select="sexSelect"
-		>
-		</u-action-sheet>
-		<u-action-sheet
-				:show="showSex"
-				:actions="actions"
-				title="请选择报修区域"
-				description=""
-				@close="showSex = false"
-				@select="sexSelect"
-		>
-		</u-action-sheet>
-		<u-action-sheet
-				:show="showSex"
-				:actions="actions"
-				title="请选择报修类型"
-				description=""
-				@close="showSex = false"
-				@select="sexSelect"
-		>
-		</u-action-sheet>
-		<u-form class="description">
-			<u-form-item
-					labelWidth="150"
-					label="故障描述"
-					
-					prop="userInfo.name"
-					ref="item1">
-			</u-form-item>
-			<u--textarea v-model="value2" 
-				placeholder="请输入故障描述" 
-				count height="250">
-			</u--textarea>
-		</u-form>
-		
-			
-		<u-form class="upload">
-			<u-form-item
-					labelWidth="150"
-					label="上传照片"
-					prop="userInfo.name"
-					ref="item1">
-			</u-form-item>
-			<u-upload
-					style="display: flex; justify-content: center; align-items: center;"
-					:fileList="fileList1"
-					@afterRead="afterRead"
-					@delete="deletePic"
-					name="1"
-					multiple
-					uploadIconColor="#5776E6"
-					:maxCount="10"
-					width="200"
-					height="200"
-				></u-upload>
-		</u-form>
-		<u-button type="primary" iconColor="#5776E6" text="提交"></u-button>
-	</view>
+	<view class="OutermostLayer">
+
+		<view class="wfgz">
+			<!-- 注意,如果需要兼容微信小程序,最好通过setRules方法设置rules规则 -->
+			<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1">
+				<!-- <u-form-item labelWidth='180' label="任务名称:" prop="userInfo.name" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.name" border="none"></u--input>
+				</u-form-item> -->
+
+				<u-form-item labelWidth='180' label="报修位置:" prop="userInfo.mydays" borderBottom
+					@click="showfloor = true;" ref="item1">
+					<u--input v-model="model1.userInfo.myposition" disabled disabledColor="#ffffff"
+						placeholder="请选择报修位置" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+
+				<u-form-item labelWidth='180' label="报修区域:" prop="userInfo.tasktype" borderBottom
+					@click="showSex = true;" ref="item1">
+					<u--input v-model="model1.userInfo.tasktype" disabled disabledColor="#ffffff" placeholder="请选择报修区域"
+						border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+
+				<u-form-item labelWidth='180' label="报修类型:" prop="userInfo.taskdegree" borderBottom
+					@click="showtaskdegree = true;" ref="item1">
+					<u--input v-model="model1.userInfo.taskdegree" disabled disabledColor="#ffffff"
+						placeholder="请选择报修类型" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+
+				<!-- <u-form-item labelWidth='180' label="办理人员:" prop="userInfo.taskdegree" borderBottom
+					@click="showtaskpeople = true;" ref="item1">
+					<u--input v-model="model1.userInfo.taskpeople" disabled disabledColor="#ffffff"
+						placeholder="请选择办理人员" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon> -->
+				</u-form-item>
+				
+				
+			</u--form>
+
+			<view class="guidang">
+				<view class="queding">
+					<u-button type="primary" :plain="true" text="返回" @click="returndata"></u-button>
+				</view>
+				<view class="queding">
+					<u-button type="primary" text="提交" @click="editdata"></u-button>
+				</view>
+			</view>
+		</view>
+
+
+	<!-- 	<u-picker @cancel='showtaskpeople = false' @confirm='peopleconfirm' :show="showtaskpeople"
+			:columns="columnspeople" keyName="label">
+		</u-picker> -->
+
+
+		<u-picker @cancel='showtaskdegree = false' @confirm='degreeconfirm' :show="showtaskdegree"
+			:columns="columnshowtaskdegree" keyName="label">
+		</u-picker>
+
+		<u-picker @cancel='showSex = false' @confirm='typeconfirm' :show="showSex" :columns="columns" keyName="label">
+		</u-picker>
+
+			<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
+
 	
+
+	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			showSex: false,
-			fileList1: [],
-			value2:"",
-			model1: {
-				userInfo: {
-					
-				},
-				
-			},
-			actions: [
-				{
-					name: '1',
-				},
-				{
-					name: '2',
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				loading: false,
+
+
+				local: '', //区域
+				localCode: '', //这个变量看个人需求使用
+				addressColumns: [], //数据数组
+				defaultAddress: [], //默认选中 (回填时或者初次显示默认选中)
+				addressData: '', //原始数据 (引入的json文件)							
+
+				columns: [
+					[],
+					[],
+					[]
+				],
+				columnData: [],
+				columnDatalist: [],
+				showfloor: false,
+
+
+				showSex: false,
+				showday: false,
+				showPicker: false,
+				showtaskdegree: false,
+				showtaskpeople: false,
+
+				model1: {
+					userInfo: {
+						myposition: '',
+
+						id: "",
+						buildingId: "",
+						storeyId: "",
+						houseId: "",
+						repairPosition: "",
+						repairPositionName: "",
+						repairRegion: 1,
+						repairRegionName: "",
+						repairType: 1,
+						repairTypeName: "",
+						contactPerson: "",
+						contactPhone: "",
+						faultDes: "",
+						faultPics: "",
+
+
+
+						name: '维修灯具',
+						tasktype: '维修',
+						mydays: '2023/04/15',
+						taskdegree: '一般',
+						taskpeople: '杨刚',
+					},
 				},
-				{
-					name: '3',
+				columns: [
+					[{
+						label: '巡查',
+						id: 1
+
+					}, {
+						label: '维修',
+						id: 2
+					}]
+				],
+
+				columnshowtaskdegree: [
+					[{
+							label: '一般',
+							id: 1
+
+						}, {
+							label: '重要',
+							id: 2
+						},
+						{
+							label: '紧急',
+							id: 3
+						},
+						{
+							label: '非常紧急',
+							id: 4
+						},
+					]
+				],
+				columnspeople: [
+					[{
+						label: '杨刚',
+						id: 1
+
+					}, {
+						label: '李伟',
+						id: 2
+					}]
+				],
+
+				rules: {
+					'userInfo.name': {
+						type: 'string',
+						required: true,
+						message: '请填写姓名',
+						trigger: ['blur', 'change']
+					},
+					'userInfo.sex': {
+						type: 'string',
+						required: true,
+						message: '请选择任务类型',
+						trigger: ['blur', 'change']
+					},
+					'userInfo.mydays': {
+						type: 'string',
+						required: true,
+						message: '请选择办结日期',
+						trigger: ['change']
+					},
+					'userInfo.taskdegree': {
+						type: 'string',
+						required: true,
+						message: '请选择紧急程度',
+						trigger: ['blur', 'change']
+					},
+					'userInfo.taskpeople': {
+						type: 'string',
+						required: true,
+						message: '请选择办理人员',
+						trigger: ['blur', 'change']
+					},
+
 				},
-			],
-			rules: {
-				// 'userInfo.name': {
-				// 	type: 'string',
-				// 	required: true,
-				// 	message: '联系人',
-				// 	trigger: ['blur', 'change']
-				// },
-				// 'userInfo.sex': {
-				// 	type: 'string',
-				// 	max: 1,
-				// 	required: true,
-				// 	message: '请选择男或女',
-				// 	trigger: ['blur', 'change']
-				// },
-			},
-			radio: '',
-			switchVal: false
-		};
-	},
-	methods: {
-		hideKeyboard(){
-			console.log(111);
+
+			};
 		},
-		
-		sexSelect(e) {
-			
-			// this.model1.userInfo.sex = e.name
-			// this.$refs.uForm.validateField('userInfo.sex')
+		onLoad() {
+			this.getfloor();
+			//	this.loadmore();
 		},
-		// 删除图片
-					deletePic(event) {
-						this[`fileList${event.name}`].splice(event.index, 1)
-					},
-					// 新增图片
-					async afterRead(event) {
-						// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
-						let lists = [].concat(event.file)
-						let fileListLen = this[`fileList${event.name}`].length
-						lists.map((item) => {
-							this[`fileList${event.name}`].push({
-								...item,
-								status: 'uploading',
-								message: '上传中'
-							})
-						})
-						for (let i = 0; i < lists.length; i++) {
-							const result = await this.uploadFilePromise(lists[i].url)
-							let item = this[`fileList${event.name}`][fileListLen]
-							this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-								status: 'success',
-								message: '',
-								url: result
-							}))
-							fileListLen++
+
+		methods: {
+
+			changeHandler(e) {
+				// console.log('77777', e)
+				const {
+					columnIndex,
+					index,
+					picker = this.$refs.uPicker
+				} = e
+				console.log('111111111111111111', columnIndex, index, picker)
+
+				if (columnIndex === 0) {
+					this.loading = true
+					picker.setColumnValues(1, this.columnData[index])
+					this.loading = false
+				}
+				// //this.getalldata();
+
+
+			},
+			confirmfloor(e) {
+				console.log('222222', e.value)
+				//	this.model1.userInfo.myposition = e.value[0].orgName + e.value[1].orgName;
+
+				// this.dataForm.buildingId = e.value[0].orgId;
+				// this.dataForm.storeyId = e.value[1].orgId;
+				// this.showfloor = false;
+				// this.getalldata();
+			},
+			cancelfloor() {
+				this.showfloor = false;
+			},
+			getfloor() {
+				this.$api.get('/control/getOrgStructureTree', {})
+					.then(res => {
+						if (res.data.code == 0) {
+							//this.dataForm.projectId = res.data.data[0].orgId;
+
+							this.model1.userInfo.myposition = res.data.data[0].orgName;
+							this.alldata = res.data.data[0].childrenList;
+							console.log('111111111111111111', res.data.data[0].childrenList)
+							this.columns = [
+								res.data.data[0].childrenList,
+								res.data.data[0].childrenList[0].childrenList
+							]
+							let allfloor = [];
+							for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
+								allfloor.push(res.data.data[0].childrenList[i].childrenList)
+							}
+							this.columnData = allfloor;  
+
+
+
+							//	this.getalldata();
+						} else {
+							this.showdct = true
 						}
-					},
-					uploadFilePromise(url) {
-						return new Promise((resolve, reject) => {
-							let a = uni.uploadFile({
-								url: 'http://192.168.2.21:7001/upload', // 仅为示例,非真实的接口地址
-								filePath: url,
-								name: 'file',
-								formData: {
-									user: 'test'
-								},
-								success: (res) => {
-									setTimeout(() => {
-										resolve(res.data.data)
-									}, 1000)
-								}
-							});
-						})
-					},
-	},
-	onReady() {
-		//如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
-    	// this.$refs.uForm.setRules(this.rules)
-    },
-	onLoad() {
-		
-	}
-};
+					})
+			},
+			onShowDatePicker() { //显示
+
+				this.showPicker = true;
+				//  this.value =this.model1.userInfo.mydays;
+			},
+
+			returndata() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			editdata() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+
+			typeconfirm(e) {
+				console.log('111111111111111111', e.value[0].label)
+				this.model1.userInfo.tasktype = e.value[0].label;
+				this.showSex = false;
+				// this.model1.userInfo.sex = e.name
+				this.$refs.form1.validateField('userInfo.tasktype')
+			},
+
+			degreeconfirm(e) {
+				//console.log('111111111111111111', e.value[0].label)
+				this.model1.userInfo.taskdegree = e.value[0].label;
+				this.showtaskdegree = false;
+				// this.model1.userInfo.sex = e.name
+				this.$refs.form1.validateField('userInfo.taskdegree')
+			},
+			peopleconfirm(e) {
+				//console.log('111111111111111111', e.value[0].label)
+				this.model1.userInfo.taskpeople = e.value[0].label;
+				this.showtaskpeople = false;
+				// this.model1.userInfo.sex = e.name
+				this.$refs.form1.validateField('userInfo.taskpeople')
+			},
+
+
+		},
+		onReady() {
+			//如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
+			this.$refs.form1.setRules(this.rules)
+		},
+	};
 </script>
 
+<style>
+	.guidang {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 40rpx;
+	}
 
-<style lang="scss">
-	
-	uni-text.u-icon_icon.uicon-camera-fill{
-		span{
-			width: 150rpx;
-			height: 150rpx;
-		}
-		
+	.queding {
+		width: 40%;
+	}
+
+	.wfgz {
+		padding: 20rpx;
 	}
-</style>
+</style>

+ 44 - 131
pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -25,57 +25,37 @@
 				</view>
 			</view>
 		</view>
-		<!-- 列表 -->
-		<!-- <t-table>
-			<t-tr>
-				<t-th>序号</t-th>
-				<t-th>姓名</t-th>
-				<t-th>年龄</t-th>
-				<t-th>爱好</t-th>
-				<t-th>操作</t-th>
-			</t-tr>
-			<t-tr v-for="item in tableList" :key="item.id">
-				<t-td>{{ item.id + 1 }}</t-td>
-				<t-td>{{ item.name }}</t-td>
-				<t-td>{{ item.age }}</t-td>
-				<t-td>{{ item.hobby }}</t-td>
-				  <t-td align="left"> <u-button @click="edit(item)"  size="small" type="primary" :plain="true" text="编辑"></u-button></t-td>
-				
-			</t-tr>
-		</t-table> -->
-
+		
 <view class="u-listdata">
 	
 	
 	<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 		<u-list-item v-for="(item, index) in indexList" :key="index">
-			<!-- <u-cell :title="`列表长度-${index + 1}`">
-				<u-avatar slot="icon" shape="square" size="35" :src="item.url"
-					customStyle="margin: -3px 5px -3px 0"></u-avatar>
-			</u-cell> -->
+		
 			<view class="companylist" @click="seedetail(item)">
-				<view class="settled" v-if="item.status==1">
+				<!-- <view class="settled" v-if="item.status==1">
 					已结清
-				</view>
-				<view class="outstanding" v-if="item.status==0">
+				</view> -->
+			<!-- 	<view class="outstanding" v-if="item.status==0">
 					未结清
-				</view>
-				<h3>{{item.name}}</h3>
+				</view> -->
+				<view class="outstanding">
+						预存
+					</view>
+				<h3>{{item.tenantInfo.name}}</h3>
 				<view class="Currentamount">
-					本期金额: <span>¥{{item.feeTotal}}</span>
+					扣缴金额: <span>¥{{item.surplus}}</span>
 				</view>
 				<view class="Currentamount">
-					欠费天数: {{item.elecAmount}}
+					租户电话: {{item.tenantInfo.tel}}
 				</view>
 				<view class="Currentamount">
-					账户余额:¥{{item.balance}}
+					操作人:{{item.createName}}
 				</view>
 				<view class="Currentamount">
-					联系电话: {{item.tel}}
-				</view>
-				<view class="Callfee"  v-if="item.status==0"   @click.stop="handleClick(item.id)">
-					催费
+					扣缴时间: {{item.createDate}}
 				</view>
+				
 			</view>
 	
 		</u-list-item>
@@ -86,7 +66,7 @@
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>
 		</u-picker>
 		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
@@ -95,46 +75,23 @@
 </template>
 
 <script>
-	// import tTable from '@/components/t-table/t-table.vue';
-	// import tTh from '@/components/t-table/t-th.vue';
-	// import tTr from '@/components/t-table/t-tr.vue';
-	// import tTd from '@/components/t-table/t-td.vue';
+import { isEmpty, getDictDataList } from "@/utils/index";
 	export default {
 		components: {
-			// tTable,
-			// tTh,
-			// tTr,
-			// tTd
+		
 		},
 		data() {
-			const currentDate = this.getDate({
-				format: 'yyyy-mm'
-			})
+			
 			return {
 				setyesno: true,
-				// tableList: [{
-				// 		id: 0,
-				// 		name: '张三',
-				// 		age: '19',
-				// 		hobby: '游泳'
-				// 	},
-				// 	{
-				// 		id: 1,
-				// 		name: '李四',
-				// 		age: '21',
-				// 		hobby: '绘画'
-				// 	},				
-				// ],
 				indexList: [],
-
-
 				dataList: [],
 				dataForm: {
 					projectId: "",
 					buildingId: "",
 					storeyId: "",
-					cycle: "",
-					status: "",
+					type: "",
+					tenantId: "",
 					page: 1,
 					limit: 10,
 				},
@@ -150,40 +107,8 @@
 				myday: '',
 				mytype: '全部',
 				showPicker: false,
-				myday: currentDate,
-				columnstype: [
-					[
-						{
-							label: '全部',
-							id: ''
-						}, {
-							label: '水费',
-							id: 0
-						},
-						{
-							label: '电费',
-							id: 1
-						},
-						{
-							label: '物业费',
-							id: 2
-						}, {
-							label: '预存',
-							id: 3
-						},
-						{
-							label: '补助',
-							id: 4
-						},
-						{
-							label: '撤销补助',
-							id: 5
-						}, {
-							label: '退费',
-							id: 6
-						},
-						
-					]
+				//myday: currentDate,
+				columnstype: [					
 				],
 
 
@@ -192,6 +117,8 @@
 		},
 		//监听页面加载,其参数为上个页面传递的数据,参数类型为 Object(用于页面传参
 		onLoad() {
+			this.columnstype=[getDictDataList("PayType")]
+			//  console.log('111111111111111111',this.columnstype)
 			this.getfloor();
 			//	this.loadmore();
 		},
@@ -215,10 +142,7 @@
 			seedetail(e){
 				  console.log('222',e)
 			},
-			handleClick(e){
-				  console.log('111111111111111111',e)
-				  
-			},
+			
 			scrolltolower() {
 				// this.loadmore()				 
 				this.dataForm.page = this.dataForm.page + 1;
@@ -248,49 +172,38 @@
 
 
 			getalldata() {
-				this.$api.get('/billinfo/paypage', this.dataForm)
+				this.$api.get('/payrecord/page', this.dataForm)
 					.then(res => {
 						this.indexList = [];
 						this.indexList = res.data.data.list;
 
 					})
 			},
-			// edit(item) {
-			// 	console.log('111111111111111111', item)
-			// },
+			
 			canceltype() {
 				this.showtype = false;
 			},
 			confirmtype(e) {
-			//	console.log('111111111111111111', e.value[0])
+				console.log('111111111111111111', e.value[0])
 				this.showtype = false;
-				this.mytype = e.value[0].label;
-				this.dataForm.cycle = e.value[0].id;
-				this.dataForm.page=1;
-				this.getalldata();
+				if( e.value[0].dictValue=='all'){
+					this.mytype = e.value[0].dictLabel;
+					this.dataForm.type ='';
+					this.dataForm.page=1;
+					this.getalldata();
+				}else{
+					this.mytype = e.value[0].dictLabel;
+					this.dataForm.type = e.value[0].dictValue;
+					this.dataForm.page=1;
+					this.getalldata();
+				}
+				
 			},
 			typechange() {
 				this.showtype = true;
 			},
-			dateChange(e) {
-				this.myday = e.target.value;
-				this.dataForm.cycle = e.target.value;
-				this.dataForm.page=1;
-				this.getalldata();
-			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				// day = day > 9 ? day : '0' + day;
-				return `${year}-${month}`;
-			},
+			
+			
 			getfloor() {
 				this.$api.get('/control/getOrgStructureTree/', {})
 					.then(res => {
@@ -408,7 +321,7 @@
 	}
 
 	.outstanding {
-		background-color: #FA5555;
+		background-color: #30D3A2;
 		width: 100rpx;
 		height: 40rpx;
 		text-align: center;

+ 5 - 5
pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue

@@ -2,10 +2,10 @@
 	<view class="OutermostLayer">
 			<u-cell-group>				
 				<u-cell icon="integral-fill" title="报修时间"  :value="details.shijian" >
-					<u-icon slot="icon" size="40" name="order"></u-icon>					
+					<u-icon slot="icon" size="40" name="calendar"></u-icon>					
 				</u-cell>
 				<u-cell icon="integral-fill" title="报修位置" :value="details.weizhi" >
-					<u-icon slot="icon" size="40" name="calendar"></u-icon>					
+					<u-icon slot="icon" size="40" name="map"></u-icon>					
 				</u-cell>
 				<u-cell icon="integral-fill" title="报修区域" :value="details.quyu" >
 					<u-icon slot="icon" size="40" name="grid"></u-icon>					
@@ -17,14 +17,14 @@
 					<u-icon slot="icon" size="40" name="man-add"></u-icon>					
 				</u-cell>
 				<u-cell icon="integral-fill" title="联系电话" :value="details.lxdh">
-					<u-icon slot="icon" size="40" name="man-add"></u-icon>					
+					<u-icon slot="icon" size="40" name="phone"></u-icon>					
 				</u-cell>
 				<u-cell icon="integral-fill" title="故障描述" :value="details.gzms" >
-					<u-icon slot="icon" size="40" name="man-add"></u-icon>					
+					<u-icon slot="icon" size="40" name="order"></u-icon>					
 				</u-cell>
 				
 				 <u-cell icon="integral-fill" title="故障照片" >
-					 <u-icon slot="icon" size="40" name="man-add"></u-icon>		
+					 <u-icon slot="icon" size="40" name="photo"></u-icon>		
 				    	<view
 				    	    slot="title"
 				    	    class="guzhang"