zouling 3 tygodni temu
rodzic
commit
854d71c38a

+ 0 - 1
user_ui/components/toptab/phonebtn.vue

@@ -34,7 +34,6 @@
 	  },
 	data(){
 		return{
-			sucimg:require("@/static/images/mine/success.png") 
 		}
 	},
 	methods:{

+ 28 - 5
user_ui/health/pages/health/add.vue

@@ -86,11 +86,13 @@
 						</uni-forms-item>
 					</picker>
 					<picker range-key='dictLabel' :disabled="isdisabled" :value="hzgxidx" :range="hzgxList"   @change='bindDateChangea'>
-						<uni-forms-item label="与户主关系" required name="residentRelationship">
+						<uni-forms-item label="与户主关系" name="residentRelationship">
 							<view class="flexc mh35">
 								<view class="flex1 txr f13 co27" v-if="datainfo.residentRelationship&&!hzgx">{{statusFormats(datainfo.residentRelationship,hzgxList,'hzgx')}}</view>
 								<view class="flex1 txr f13" v-else :class="hzgx?'co27':'coa'">{{hzgx||"请选择与户主关系"}}</view>
-								
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.residentRelationship" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('hzgx')"></uni-icons>
+								</view>
 							</view>
 						</uni-forms-item>
 					</picker>
@@ -99,7 +101,9 @@
 							<view class="flexc mh35">
 								<view class="flex1 txr f13 co27" v-if="datainfo.isTenant&&!sfzh">{{statusFormats(datainfo.isTenant,sfList,'sfzh')}}</view>
 								<view class="flex1 txr f13" v-else :class="sfzh?'co27':'coa'">{{sfzh||"请选择是/否"}}</view>
-								
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.isTenant" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('sfzh')"></uni-icons>
+								</view>
 							</view>
 						</uni-forms-item>
 					</picker>
@@ -108,7 +112,9 @@
 							<view class="flexc mh35">
 								<view class="flex1 txr f13 co27" v-if="datainfo.residentAppearance&&!rymm">{{statusFormats(datainfo.residentAppearance,rymmList,'rymm')}}</view>
 								<view class="flex1 txr f13" v-else :class="rymm?'co27':'coa'">{{rymm||"请选择人员面貌"}}</view>
-								
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.residentAppearance" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('rymm')"></uni-icons>
+								</view>
 							</view>
 						</uni-forms-item>
 					</picker>
@@ -117,7 +123,9 @@
 							<view class="flexc mh35">
 								<view class="flex1 txr f13 co27" v-if="datainfo.specialType&&!dslx">{{statusFormats(datainfo.specialType,dslxList,'dslx')}}</view>
 								<view class="flex1 txr f13" v-else :class="dslx?'co27':'coa'">{{dslx||"如有五保户等特殊类型,请选择"}}</view>
-								
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.specialType" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('dslx')"></uni-icons>
+								</view>
 							</view>
 						</uni-forms-item>
 					</picker>
@@ -290,6 +298,21 @@
 				}
 				return aite.actions;
 			},
+			onClear(type){
+				 if(type=='hzgx'){
+					this.datainfo.residentRelationship='';
+					this.hzgx='';
+				}else if(type=='sfzh'){
+					this.datainfo.isTenant='';
+					this.sfzh='';
+				}else if(type=='rymm'){
+					this.datainfo.residentAppearance='';
+					this.rymm='';
+				}else if(type=='dslx'){
+					this.datainfo.specialType='';
+					this.dslx='';
+				}
+			},
 			getchange(e){
 				this.datainfo.houseId=e.dictValue;
 				this.datainfo.detailedAddress=e.dictLabel;

+ 28 - 48
user_ui/mine/pages/house/addhouse.vue

@@ -45,6 +45,9 @@
 							<view class="flexc">
 								<view class="flex1 txr f13 co27" v-if="datainfo.rightType&&!qllx">{{statusFormats(datainfo.rightType,qllxList,'qllx')}}</view>
 								<view class="flex1 txr f13" v-else :class="qllx?'co27':'coa'">{{qllx||"请选择权利类型"}}</view>
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.rightType" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('qllx')"></uni-icons>
+								</view>
 								<view class="rimg"><image :src="rimg"></image></view>
 							</view>
 						</picker>
@@ -136,6 +139,9 @@
 							<view class="flexc">
 								<view class="flex1 txr f13 co27" v-if="datainfo.houseStatus&&!fwzt">{{statusFormats(datainfo.houseStatus,fwztList,'fwzt')}}</view>
 								<view class="flex1 txr f13" v-else :class="fwzt?'co27':'coa'">{{fwzt||"请选择房屋状态"}}</view>
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.houseStatus" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('fwzt')"></uni-icons>
+								</view>
 								<view class="rimg"><image :src="rimg"></image></view>
 							</view>
 						</picker>
@@ -145,6 +151,9 @@
 							<view class="flexc">
 								<view class="flex1 txr f13 co27" v-if="datainfo.usageType&&!fwyt">{{statusFormats(datainfo.usageType,fwytList,'fwyt')}}</view>
 								<view class="flex1 txr f13" v-else :class="fwyt?'co27':'coa'">{{fwyt||"请选择房屋用途"}}</view>
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.usageType" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('fwyt')"></uni-icons>
+								</view>
 								<view class="rimg"><image :src="rimg"></image></view>
 							</view>
 						</picker>
@@ -154,6 +163,9 @@
 							<view class="flexc">
 								<view class="flex1 txr f13 co27" v-if="datainfo.hasParkingSpace&&!ywcw">{{statusFormats(datainfo.hasParkingSpace,ywcwList,'ywcw')}}</view>
 								<view class="flex1 txr f13" v-else :class="ywcw?'co27':'coa'">{{ywcw||"请选择有/无"}}</view>
+								<view class="flex0" @click.stop="">
+									<uni-icons v-if="datainfo.hasParkingSpace" class="content-clear-icon" type="clear" size="24" color="#c0c4cc" @click="onClear('ywcw')"></uni-icons>
+								</view>
 								<view class="rimg"><image :src="rimg"></image></view>
 							</view>
 						</picker>
@@ -164,53 +176,6 @@
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
-					<!-- <uni-forms-item label="房型" name="realName">
-						<view class="flexjd">
-							<picker range-key='dictLabel' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
-								<view class="flexc ml10">
-									<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'请选择'}}</view>
-									<view class="tips">室</view>
-								</view>
-							</picker>
-							<picker range-key='dictLabel' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
-								<view class="flexc ml10">
-									<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'请选择'}}</view>
-									<view class="tips">厅</view>
-								</view>
-							</picker>
-							<view class="rimg"></view>
-						</view>
-					</uni-forms-item> -->
-					<!-- <uni-forms-item label="住户类型" name="realName">
-						<picker range-key='dictLabel' :disabled="isdisabled" :value="syqxidx" :range="sexs"   @change='bindDateChange'>
-							<view class="flexc">
-								<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'请选择住户类型'}}</view>
-								<view class="rimg"><image :src="rimg"></image></view>
-							</view>
-						</picker>
-					</uni-forms-item> -->
-					<!-- <uni-forms-item label="是否户主"  name="phonenumber">
-						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.phonenumber" disabled :inputBorder='false' placeholder="自动识别" />
-							<view class="rimg"></view>
-						</view>
-					</uni-forms-item>
-					<uni-forms-item label="与户主关系" :disabled="isdisabled" name="realName">
-						<picker range-key='dictLabel' :value="syqxidx" :range="sexs"   @change='bindDateChange'>
-							<view class="flexc">
-								<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'请选择与户主关系'}}</view>
-								<view class="rimg"><image :src="rimg"></image></view>
-							</view>
-						</picker>
-					</uni-forms-item>
-					<uni-forms-item label="居住人口" name="realName">
-						<picker range-key='dictLabel' :disabled="isdisabled" :value="syqxidx" :range="sexs"   @change='bindDateChange'>
-							<view class="flexc">
-								<view class="flex1 txr f13" :class="datainfo.iszc?'co27':'coa'">{{datainfo.iszc?'是':'请选择居住人口'}}</view>
-								<view class="rimg"><image :src="rimg"></image></view>
-							</view>
-						</picker>
-					</uni-forms-item> -->
 					
 				</uni-forms>
 				<view class="rhbtn mt30" @click="getEditFn" v-if="isdisabled">修改</view>
@@ -257,7 +222,7 @@
 				},
 				rules: {
 				  location: {rules: [{required: true,errorMessage: '请输入房屋坐落位置' }]},
-				  houseType: {rules: [{required: true,errorMessage: '请选择房屋类型' }]},
+				  // houseType: {rules: [{required: true,errorMessage: '请选择房屋类型' }]},
 				  // detailedAddress: {rules: [{required: true,errorMessage: '请输入门牌号' }]},
 				  area: {rules: [{required: true,errorMessage: '请输入面积' }]},
 				},
@@ -299,6 +264,21 @@
 			getEditFn(){
 				this.isdisabled=false;
 			},
+			onClear(type){
+				 if(type=='qllx'){
+					this.datainfo.rightType='';
+					this.qllx='';
+				}else if(type=='fwzt'){
+					this.datainfo.houseStatus='';
+					this.fwzt='';
+				}else if(type=='fwyt'){
+					this.datainfo.usageType='';
+					this.fwyt='';
+				}else if(type=='ywcw'){
+					this.datainfo.hasParkingSpace='';
+					this.ywcw='';
+				}
+			},
 			time() {
 				var date = new Date();
 				var y = date.getFullYear();

+ 60 - 3
user_ui/mine/pages/info/authenadd.vue

@@ -64,10 +64,13 @@
 							</uni-forms-item>
 							<block v-if="datainfo.isHouseholder!='Y'">
 								<picker range-key='dictLabel' :disabled="isdisabled" :value="hzgxidx" :range="hzgxList"   @change='bindDateChangea'>
-									<uni-forms-item class="isnobor" label="与户主关系" required name="residentRelationship">
+									<uni-forms-item class="isnobor" label="与户主关系"  name="residentRelationship">
 										<view class="flexc mh35">
 											<view class="flex1 txr f13 co27" v-if="datainfo.residentRelationship&&!hzgx">{{statusFormats(datainfo.residentRelationship,hzgxList,'hzgx')}}</view>
 											<view class="flex1 txr f13" v-else :class="hzgx?'co27':'coa'">{{hzgx||"请选择与户主关系"}}</view>
+											<view class="flex0" @click.stop="">
+												<uni-icons v-if="datainfo.residentRelationship" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('hzgx')"></uni-icons>
+											</view>
 											<view class="rimg">
 												<image :src="rimg"></image>
 											</view>
@@ -110,7 +113,10 @@
 													<view class="flexc mh35">
 														<view class="flex1 txr f13 co27" v-if="datainfo.residentAppearance&&!rymm">{{statusFormats(datainfo.residentAppearance,rymmList,'rymm')}}</view>
 														<view class="flex1 txr f13" v-else :class="rymm?'co27':'coa'">{{rymm||"请选择人员面貌"}}</view>
-														<view class="rimg"><image :src="rimg"></image></view>
+														<view class="flex0" @click.stop="">
+															<uni-icons v-if="datainfo.residentAppearance" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('rymm')"></uni-icons>
+														</view>
+														<view class="rimg" @click.stop="datainfo.residentAppearance=''"><image :src="rimg"></image></view>
 													</view>
 												</uni-forms-item>
 											</picker>
@@ -119,6 +125,9 @@
 													<view class="flexc mh35">
 														<view class="flex1 txr f13 co27" v-if="datainfo.specialType&&!dslx">{{statusFormats(datainfo.specialType,dslxList,'dslx')}}</view>
 														<view class="flex1 txr f13" v-else :class="dslx?'co27':'coa'">{{dslx||"如有五保户等特殊类型,请选择"}}</view>
+														<view class="flex0" @click.stop="">
+															<uni-icons v-if="datainfo.specialType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('dslx')"></uni-icons>
+														</view>
 														<view class="rimg"><image :src="rimg"></image></view>
 													</view>
 												</uni-forms-item>
@@ -177,6 +186,9 @@
 												<view class="flexc">
 													<view class="flex1 txr f13 co27" v-if="houserinfo.rightType&&!qllx">{{statusFormats(houserinfo.rightType,qllxList,'qllx')}}</view>
 													<view class="flex1 txr f13" v-else :class="qllx?'co27':'coa'">{{qllx||"请选择权利类型"}}</view>
+													<view class="flex0" @click.stop="">
+														<uni-icons v-if="houserinfo.rightType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('qllx')"></uni-icons>
+													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
 											</picker>
@@ -217,6 +229,9 @@
 											<view class="flexc mh35">
 												<view class="flex1 txr f13 co27" v-if="houserinfo.houseType&&!fwlx">{{statusFormats(houserinfo.houseType,fwlxList,'fwlx')}}</view>
 												<view class="flex1 txr f13" v-else :class="fwlx?'co27':'coa'">{{fwlx||"请选择房屋类型"}}</view>
+												<view class="flex0" @click.stop="">
+													<uni-icons v-if="houserinfo.houseType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwlx')"></uni-icons>
+												</view>
 												<view class="rimg"><image :src="rimg"></image></view>
 											</view>
 											</picker>
@@ -251,6 +266,9 @@
 												<view class="flexc">
 													<view class="flex1 txr f13 co27" v-if="houserinfo.houseStatus&&!fwzt">{{statusFormats(houserinfo.houseStatus,fwztList,'fwzt')}}</view>
 													<view class="flex1 txr f13" v-else :class="fwzt?'co27':'coa'">{{fwzt||"请选择房屋状态"}}</view>
+													<view class="flex0" @click.stop="">
+														<uni-icons v-if="houserinfo.houseStatus" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwzt')"></uni-icons>
+													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
 											</picker>
@@ -260,6 +278,9 @@
 												<view class="flexc">
 													<view class="flex1 txr f13 co27" v-if="houserinfo.usageType&&!fwyt">{{statusFormats(houserinfo.usageType,fwytList,'fwyt')}}</view>
 													<view class="flex1 txr f13" v-else :class="fwyt?'co27':'coa'">{{fwyt||"请选择房屋用途"}}</view>
+													<view class="flex0" @click.stop="">
+														<uni-icons v-if="houserinfo.usageType" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('fwyt')"></uni-icons>
+													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
 											</picker>
@@ -269,6 +290,9 @@
 												<view class="flexc">
 													<view class="flex1 txr f13 co27" v-if="houserinfo.hasParkingSpace&&!ywcw">{{statusFormats(houserinfo.hasParkingSpace,ywcwList,'ywcw')}}</view>
 													<view class="flex1 txr f13" v-else :class="ywcw?'co27':'coa'">{{ywcw||"请选择有/无"}}</view>
+													<view class="flex0" @click.stop="">
+														<uni-icons v-if="houserinfo.hasParkingSpace" class="content-clear-icon" type="clear" :size="clearSize" color="#c0c4cc" @click="onClear('ywcw')"></uni-icons>
+													</view>
 													<view class="rimg"><image :src="rimg"></image></view>
 												</view>
 											</picker>
@@ -316,6 +340,7 @@
 				cmico: require('@/mine/static/house/cmico.png'),
 				del: require('@/mine/static/house/del.png'),
 				aphoto: require('@/work/static/service/photo.png'),
+				close:require('@/work/static/close.png'),
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				backgroundColor: "transparent",
@@ -431,7 +456,8 @@
 					"communityName":null,//房屋所在小区名称
 					"houseStatus":null,//房屋状态:1-自住,2-出租,3-空闲,4-待售
 					"parkingNumber":null,//车位号
-				}
+				},
+				clearSize: 24,
 			}
 		},
 		onLoad: function(e) {
@@ -468,6 +494,33 @@
 			getEditFn(){
 				this.isdisabled=false;
 			},
+			onClear(type){
+				 if(type=='hzgx'){
+					this.datainfo.residentRelationship='';
+					this.hzgx='';
+				}else if(type=='rymm'){
+					this.datainfo.residentAppearance='';
+					this.rymm='';
+				}else if(type=='dslx'){
+					this.datainfo.specialType='';
+					this.dslx='';
+				}else if(type=='qllx'){
+					this.houserinfo.rightType='';
+					this.qllx='';
+				}else if(type=='fwlx'){
+					this.houserinfo.houseType='';
+					this.fwlx='';
+				}else if(type=='fwzt'){
+					this.houserinfo.houseStatus='';
+					this.fwzt='';
+				}else if(type=='fwyt'){
+					this.houserinfo.usageType='';
+					this.fwyt='';
+				}else if(type=='ywcw'){
+					this.houserinfo.hasParkingSpace='';
+					this.ywcw='';
+				}
+			},
 			getSyFn(e){
 				this.datainfo.isHouseholder=e
 				console.log(this.datainfo.isHouseholder)
@@ -796,6 +849,10 @@
 							this.$toast('请输入详细门牌号')
 							return
 						}
+						if(!houserinfo.houseType){
+							this.$toast('请选择房屋类型')
+							return
+						}
 						houserinfo.tenantId=params.tenantId;
 						var newarr=[]
 						newarr.push(houserinfo)

+ 1 - 0
user_ui/static/style.css

@@ -19,6 +19,7 @@ image{display: block !important;}
   display: block; 
   clear: both;
 }
+.clearimg{width: 48rpx;height: 48rpx;}
 .w50{width: 50%;}
 .mw50{min-width: 50%;}
 .fw5{font-weight: 500;}

BIN
user_ui/work/static/close.png