Ver código fonte

选择删除

zouling 3 semanas atrás
pai
commit
f7058f2747

+ 28 - 6
property_ui/health/pages/health/add.vue

@@ -60,6 +60,7 @@
 						      :list='fwlist'
 						      valueName='dictLabel' 
 						      keyName="dictValue"
+							  :valuea="datainfo.houseId"
 							  :chosevalue="datainfo.detailedAddress"
 							  :filterable='filterable'
 						      @change='getchange'
@@ -81,7 +82,9 @@
 							<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>
@@ -90,7 +93,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>
@@ -99,7 +104,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>
@@ -108,7 +115,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>
@@ -281,6 +290,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;
@@ -314,8 +338,6 @@
 									location: v.location
 								}
 							})
-							this.datainfo.houseId=this.houseId;
-							this.datainfo.detailedAddress=this.kaType(this.houseId,this.fwlist)
 						}
 					})
 				// }

+ 1 - 1
property_ui/people/components/car/list.vue

@@ -146,7 +146,7 @@
 					</block>
 				</view>
 				<view style="height: 20rpx;"></view>
-				<view class="pshbox flexc" v-if="ite.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
+				<view class="pshbox flexc" v-if="type=='staff'&&ite.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
 					<view class="btna" @click.stop="getShFn(ite,'3')">拒绝</view>
 					<view class="btnb" @click.stop="getShFn(ite,'2')">同意</view>
 				</view>

+ 0 - 1
property_ui/utils/request.js

@@ -23,7 +23,6 @@ const request = config => {
   config.header = config.header || {}
   if (getToken() && !isToken) {
     config.header['Authorization'] = 'Bearer ' + getToken()
-	config.header['Clientid'] = Clientid
   }
   // get请求映射params参数
   if (config.params) {

+ 28 - 1
property_ui/work/pages/manage/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>
@@ -130,6 +133,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>
@@ -139,6 +145,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>
@@ -148,6 +157,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>
@@ -252,7 +264,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: '请输入面积' }]},
 				},
@@ -332,6 +344,21 @@
 				}
 				return aite.actions;
 			},
+			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='';
+				}
+			},
 			init(){
 				// 房屋状态
 				getDictionaryFn('house_status').then(res=>{

+ 1 - 1
property_ui/work/pages/manage/houseadd.vue

@@ -123,7 +123,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: '请输入面积' }]},
 				},

+ 86 - 1
property_ui/work/pages/manage/housedetail.vue

@@ -68,6 +68,9 @@
 										<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>
 										</view>
 									</uni-forms-item>
@@ -107,6 +110,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="clearSize" color="#c0c4cc" @click="onClear('rymm')"></uni-icons>
+														</view>
 														<view class="rimg"><image :src="rimg"></image></view>
 													</view>
 												</uni-forms-item>
@@ -116,6 +122,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>
@@ -174,6 +183,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>
@@ -209,6 +221,18 @@
 												<view class="rimg"></view>
 											</view>
 										</uni-forms-item>
+										<uni-forms-item label="房屋类型" required name="houseType">
+											<picker range-key='dictLabel' :disabled="isdisabled" :value="fwlxidx" :range="fwlxList"   @change='bindDateChangeh'>
+											<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>
+										</uni-forms-item>
 										<uni-forms-item label="使用期限" name="usagePeriod">
 											<view class="flexc">
 												<uni-easyinput :disabled="isdisabled" v-model="houserinfo.usagePeriod" :inputBorder='false' placeholder="请输入使用期限" />
@@ -246,6 +270,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>
@@ -255,6 +282,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>
@@ -264,6 +294,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>
@@ -325,7 +358,7 @@
 					"houseId":"",//关联房屋信息表的house_id
 					"residentRelationship":"",//居住人员与户主的关系,如父子、夫妻等
 					"isHouseholder":"",//是否是户主 N不是 Y是
-					
+					"houseType":null,//房屋类型 1:普通住宅,2:洋房
 					"residentIdCard":"",//居住人员身份证号码,18位
 					// "residentBirthday":"",//居住人员出生日期
 					"residentGender":'',//居住人员性别:1-男,2-女
@@ -401,14 +434,19 @@
 				qllxList:[],
 				fwytList:[],
 				sfList:[],
+				fwlxList:[],
+				fwlxidx:'',
+				fwlx:'',
 				rzflag:false,
 				choseidx:'',
+				clearSize:24,
 				houserinfo:{
 					"houseId":'',
 					"tenantId":"",//租户id
 					"houseImage":null,//房本照片
 					"ownerName":null,//权利人姓名
 					"location":null,//房屋坐落位置
+					"houseType":null,//房屋类型 1:普通住宅,2:洋房
 					"rightType":null,//权利类型,如所有权、使用权等
 					"area":null,//房屋面积,单位为平方米
 					"documentNumber":null,//房屋相关的字第号
@@ -532,6 +570,33 @@
 				}
 				return aite.actions;
 			},
+			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='';
+				}
+			},
 			getchangea(e){
 				var tenantId=this.datainfo.tenantId;
 				this.datainfo.tenantId=e.dictValue;
@@ -599,6 +664,17 @@
 						})
 					}
 				})
+				// 房屋类型
+				getDictionaryFn('house_type').then(res=>{
+					if(res.code==200){
+						this.fwlxList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
 				// 是否
 				getDictionaryFn('sys_yes_no').then(res=>{
 					if(res.code==200){
@@ -734,6 +810,11 @@
 				this.datainfo.specialType=this.dslxList[val].dictValue;
 				this.dslx=this.dslxList[val].dictLabel;
 			},
+			bindDateChangeh(e){
+				var val=e.detail.value;
+				this.houserinfo.houseType=this.fwlxList[val].dictValue;
+				this.fwlx=this.fwlxList[val].dictLabel;
+			},
 			getDetail(){
 				residentInfoDet(this.id).then(res=>{
 					if(res.code==200){
@@ -783,6 +864,10 @@
 							this.$toast('请输入门牌号')
 							return
 						}
+						if(!houserinfo.houseType){
+							this.$toast('请选择房屋类型')
+							return
+						}
 						houserinfo.tenantId=params.tenantId;
 						var newarr=[]
 						newarr.push(houserinfo)