复选地址提交，历史列表条件优化

package.json

@@ -1,3 +0,0 @@
-{
-  
-}

pages/oldrenovation/indoor/indoor.vue

@@ -1,109 +1,126 @@
 	<template>
 		<scroll-view>
 			<view class="background">
-
-				<view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view>
-							行政区
-						</view>
-						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('xzq')">
-							<span style="color: darkgray;">请选择行政区</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
-							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+				<view>
+					<view
+						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view style="display: flex;align-items: center;">房间信息
+						<image :src="loadImgSrc('icon_copy.png')" @click='copyAddress()'
+						style="display: flex;justify-content:flex-end; margin-left: 10px;width: 15px;height: 15px;"></image>
 						</view>
-
+						<image v-if="changefj==false" :src="loadImgSrc('icon_user_open.png')" @click='this.changefj = !this.changefj'
+							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						</image>
+						<image v-if="changefj==true" :src="loadImgSrc('icon_user_close.png')" @click='this.changefj = !this.changefj'
+							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
+						</image>
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view>
-							小区
-						</view>
+				<view v-show="changefj">
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view>
+								行政区
+							</view>
+							<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
+								@click="pickerShow('xzq')">
+								<span style="color: darkgray;">请选择行政区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
+								<span style="color: black;">{{XZQValue.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 
-						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-							@click="pickerShow('xq')">
-							<span style="color: darkgray;">请选择小区</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
-							<span style="color: black;">{{XQValue.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 					</view>
-				</view>
-				<view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view class="uni-list-cell-left">
-							楼栋
-						</view>
-						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-							@click="pickerShow('ld')">
-							<span style="color: darkgray;">请选择楼栋</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
-							<span style="color: black;">{{LDValue.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view>
+								小区
+							</view>
+
+							<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('xq')">
+								<span style="color: darkgray;">请选择小区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
+								<span style="color: black;">{{XQValue.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 					</view>
-				</view>
-				<view class="uni-list" style="margin-top: 10;">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view class="uni-list-cell-left">
-							单元
-						</view>
-						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-							@click="pickerShow('dy')">
-							<span style="color: darkgray;">请选择单元</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
-							<span style="color: black;">{{DYValue.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								楼栋
+							</view>
+							<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('ld')">
+								<span style="color: darkgray;">请选择楼栋</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
+								<span style="color: black;">{{LDValue.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 					</view>
-				</view>
-				<view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view class="uni-list-cell-left">
-							房间
-						</view>
-						<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-							@click="pickerShow('fj')">
-							<span style="color: darkgray;">请选择房间</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
-							<span style="color: black;">{{FJValue.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list" style="margin-top: 10;">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								单元
+							</view>
+							<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('dy')">
+								<span style="color: darkgray;">请选择单元</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
+								<span style="color: black;">{{DYValue.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 					</view>
+					<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">
+								房间
+							</view>
+							<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
+								@click="pickerShow('fj')">
+								<span style="color: darkgray;">请选择房间</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
+								<span style="color: black;">{{FJValue.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
 
 
-					<view v-for="(user,index) in currentResidentsPhoe" :key="index" class="num-style">
+						<view v-for="(user,index) in currentResidentsPhoe" :key="index" class="num-style">
 
 
 
 
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<spane>现住人电话</spane>
-							<view style="display: flex; justify-content: flex-end; ">
-								<input class="uni-input" type="tel" v-model="user.phone" maxlength="11"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<spane>现住人电话</spane>
+								<view style="display: flex; justify-content: flex-end; ">
+									<input class="uni-input" type="tel" v-model="user.phone" maxlength="11"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 
+								</view>
 							</view>
+							<button v-if="index!=0" @click="this.currentResidentsPhoe.splice(index,1)"
+								class="sc-btn">删除</button>
 						</view>
-						<button v-if="index!=0" @click="this.currentResidentsPhoe.splice(index,1)"
-							class="sc-btn">删除</button>
-					</view>
-					<button @click="this.currentResidentsPhoe.push({phone:''})" class="tj-btn">添加</button>
+						<button @click="this.currentResidentsPhoe.push({phone:''})" class="tj-btn">添加</button>
 
+					</view>
 				</view>
+
 			</view>
 
 
@@ -129,10 +146,10 @@
 						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 						户主信息
 
-						<image v-if="change==false" src="../../../static/images/icon_open.png" @click='change1'
+						<image v-if="change==false" :src="loadImgSrc('icon_user_open.png')" @click='change1'
 							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
 						</image>
-						<image v-if="change==true" src="../../../static/images/icon_close.png" @click='change1'
+						<image v-if="change==true" :src="loadImgSrc('icon_user_close.png')" @click='change1'
 							style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
 						</image>
 					</view>
@@ -522,7 +539,6 @@
 	<script>
 		import SelectPicker from '../../../components/selectPicker/select_picker.vue'
 		import bottomSheet from '../../../components/bottomSheet/bottomSheet.vue'
-
 		import {
 			getDicts
 		} from "@/api/system/dict/data";
@@ -564,6 +580,7 @@
 					houseHeadPhone: '',
 					houseHeadIDcardNumber: '',
 					type: '',
+					changefj:false,
 					change: false,
 					open: false,
 					reviewStatus: '', //是否可以点击
@@ -585,7 +602,6 @@
 					LDValue: {},
 					DYValue: {},
 					FJValue: {},
-					FSValue: {},
 					specificationValue: {}, //规格
 					materialValue: {}, //材质
 					brandValue: {}, //品牌
@@ -627,10 +643,30 @@
 						title: this.title
 					})
 				}
-
-
 			},
 			methods: {
+				copyAddress(){
+					if(uni.getStorageSync('XZQValue') != {}){
+						this.type = 'xzq';
+						this.changeSelectDict(uni.getStorageSync('XZQValue'));
+					}
+					if(uni.getStorageSync('XQValue') != {}){
+						this.type = 'xq';
+						this.changeSelect(uni.getStorageSync('XQValue'))
+					}
+					if(uni.getStorageSync('LDValue') != {}){
+						this.type = 'ld';
+						this.changeSelect(uni.getStorageSync('LDValue'))
+					}
+					if(uni.getStorageSync('DYValue') != {}){
+						this.type = 'dy';
+						this.changeSelect(uni.getStorageSync('DYValue'))
+					}
+					if(uni.getStorageSync('FJValue') != {}){
+						this.type = 'fj';
+						this.changeSelect(uni.getStorageSync('FJValue'))
+					}
+				},
 				//判断是否选择
 
 				isEmpty(str) {
@@ -863,11 +899,9 @@
 						getDicts("engin_cycle").then(response => {
 							this.dictOptions = response.data;
 						});
-
 					} else if (e == 'xzq') { //行政区
 						if (this.isEmpty(this.projectValue.dictValue)) {
 							this.$modal.msg('请选择工程周期')
-
 						} else {
 							this.openDict = true;
 							getDicts("district").then(response => {
@@ -941,6 +975,10 @@
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
 						this.FJValue = ''; //重置房间数据
+						this.currentResidentsPhoe = [];
+						this.houseHeadName = "";
+						this.houseHeadPhone = "";
+						this.houseHeadIDcardNumber = "";
 						getAreaList(item.dictValue).then(res => {
 							this.XQList = res.data;
 						})
@@ -968,6 +1006,10 @@
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
 						this.FJValue = ''; //重置房间数据
+						this.currentResidentsPhoe = [];
+						this.houseHeadName = "";
+						this.houseHeadPhone = "";
+						this.houseHeadIDcardNumber = "";
 						getBuildingList(item.id).then(res => {
 							this.LDList = res.data
 						})
@@ -976,13 +1018,21 @@
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
 						this.FJValue = ''; //重置房间数据
+						this.currentResidentsPhoe = [];
+						this.houseHeadName = "";
+						this.houseHeadPhone = "";
+						this.houseHeadIDcardNumber = "";
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
 						})
 					} else if (this.type == 'dy') {
 						this.DYValue = item;
-						//根据单元数据 获取房间数据 
+						//根据单元数据 获取房间数据
 						this.FJValue = ''; //重置房间数据
+						this.currentResidentsPhoe = [];
+						this.houseHeadName = "";
+						this.houseHeadPhone = "";
+						this.houseHeadIDcardNumber = "";
 						getHousesList(item.id).then(res => {
 							this.FJList = res.data
 						})
@@ -1117,7 +1167,7 @@
 							}
 
 
-							getAreaList(this.XZQValue.id).then(res => {
+							getAreaList(this.XZQValue.dictValue).then(res => {
 								this.XQList = res.data;
 							})
 							getBuildingList(this.XQValue.id).then(res => {
@@ -1166,6 +1216,12 @@
 						return
 					}
 
+					uni.setStorageSync("XZQValue",this.XZQValue)
+					uni.setStorageSync("XQValue",this.XQValue)
+					uni.setStorageSync("LDValue",this.LDValue)
+					uni.setStorageSync("DYValue",this.DYValue)
+					uni.setStorageSync("FJValue",this.FJValue)
+
 					try {
 						this.currentResidentsPhoe.forEach((list) => {
 							if (this.isEmpty(list.phone)) {
@@ -1214,7 +1270,7 @@
 							this.onsubmit();
 						}
 					} else if (this.objValue.enginClassValue == '挂表') {
-						//挂表  判断  品牌  
+						//挂表  判断  品牌
 						if (this.isEmpty(this.brandValue.id)) {
 							this.$modal.msg("请选择品牌")
 						} else {
@@ -1265,7 +1321,7 @@
 												buildingId: this.LDValue.id,
 												unitId: this.DYValue.id,
 												houseId: this.FJValue.id,
-												enginType: this.objValue.enginType, //写死 上一页面传过来的 
+												enginType: this.objValue.enginType, //写死 上一页面传过来的
 												enginClassification: this.objValue
 													.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 												enginCycle: this.projectValue.dictValue, //工程周期
@@ -1319,7 +1375,7 @@
 						}
 						// else if (this.isEmpty(this.inputIntegerNumberValue)) {
 						// 	this.$modal.msg("请输入米数")
-						// } 
+						// }
 						else {
 
 							if (this.isEmpty(this.inputDecimalNumberValue)) {
@@ -1368,7 +1424,7 @@
 							buildingId: this.LDValue.id,
 							unitId: this.DYValue.id,
 							houseId: this.FJValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
 							enginClassification: this.objValue
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
@@ -1394,7 +1450,7 @@
 							buildingId: this.LDValue.id,
 							unitId: this.DYValue.id,
 							houseId: this.FJValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
 							enginClassification: this.objValue
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
@@ -1420,7 +1476,7 @@
 							buildingId: this.LDValue.id,
 							unitId: this.DYValue.id,
 							houseId: this.FJValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
 							enginClassification: this.objValue
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
@@ -1448,7 +1504,7 @@
 							buildingId: this.LDValue.id,
 							unitId: this.DYValue.id,
 							houseId: this.FJValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
 							enginClassification: this.objValue
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
@@ -1477,7 +1533,7 @@
 							buildingId: this.LDValue.id,
 							unitId: this.DYValue.id,
 							houseId: this.FJValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
 							enginClassification: this.objValue
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
@@ -1836,4 +1892,4 @@
 		// 	min-height: 100upx;
 		// 	line-height: 20px;
 		// }
-	</style>
+	</style>

pages/statistics/statistics.vue

@@ -230,8 +230,6 @@
 							{{item.createTime}}
 						</view>
 					</view>
-
-
 				</view>
 			</cc-pullScroolView>
 
@@ -246,8 +244,7 @@
 					<scroll-view scroll-y="true" class="scroll-Y">
 						<view class="content">
 							<view class="block" v-for="(item, index) in typeList" :key="index"
-								@click="showTypeSheet(item)">
-								<!-- <image :src="item.image" mode="aspectFill"></image> -->
+								@click="showTypeSheet(item)" v-if="item.Type!='开栓'">
 								<text>{{item.Type}}</text>
 							</view>
 						</view>
@@ -709,7 +706,7 @@
 							}
 
 						} else {
-							this.$modal.msg("暂无数据")
+							this.list = [];
 							this.$refs.pullScroll.empty();
 						}
 					} else {

static/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		  <meta name="renderer" content="webkit">
-		<title><%= htmlWebpackPlugin.options.title %></title>
-    <link rel="shortcut icon" type="image/x-icon" href="<%= BASE_URL %>static/favicon.ico">
-		<script>
-			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-			document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-		</script>
-		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
-	</head>
-	<body>
-		<noscript>
-			<strong>本站点必须要开启JavaScript才能运行.</strong>
-		</noscript>
-		<div id="app"></div>
-</html>