测试修改

property_ui/1.txt

@@ -13,7 +13,7 @@ SHA256: 85:03:9B:CE:FF:A4:57:D6:E3:EE:8E:D8:33:E4:4D:73:33:98:EE:24:B1:59:D0:A6:
 极光appkey：
 
 百度语音
-
+一键登录Py5XnBoMcD8AlY28CDiAE6
 语音识别： AppID:30799445
 	API Key :MuVtMTc6EHaLbrr38WEhqjml
 	Secret Key:rPGCiA3L41VwuTCBHkwkmcOt0IPTsi8z

property_ui/api/work/people.js

@@ -218,4 +218,19 @@ export function residentInfoDel(data) {
     method: 'get',
   })
 }
-
+// 居住人员-管理员新增wuYe:residentInfo:addResidentInfo
+export function addResidentInfo(data) {
+  return request({
+    url: '/wuYe/residentInfo/addResidentInfo',
+    method: 'post',
+    data: data
+  })
+}
+// 居住人员-管理员修改wuYe:residentInfo:editAuthentication
+export function authenticationPut(data) {
+  return request({
+    url: '/wuYe/residentInfo/put/authentication',
+    method: 'post',
+    data: data
+  })
+}

property_ui/api/work/work.js

@@ -45,4 +45,28 @@ export function houseInfolistNoPage(data) {
     method: 'get',
 	'data':data
   })
+}
+// 居住人员-认证审核wuYe:residentInfo:examineStaff
+export function examineResident(data) {
+  return request({
+    url: '/wuYe/residentInfo/examineResident',
+    method: 'post',
+	'data':data
+  })
+}
+// 居住人员-删除员工信息和权限wuYe:residentInfo:deleteResident
+export function deleteResident(data) {
+  return request({
+    url: '/wuYe/residentInfo/deleteResident',
+    method: 'post',
+	'data':data
+  })
+}
+//房屋信息-列表不分页 查询条件带租户id  wuYe:houseInfo:listNoPageTenant
+export function listNoPageTenant(data) {
+  return request({
+    url: '/wuYe/houseInfo/listNoPageTenant',
+    method: 'get',
+	'data':data
+  })
 }

property_ui/health/pages/health/add.vue

@@ -153,7 +153,7 @@
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
 	import {uploadIdentify,uploadmore} from '@/utils/common.js'
 	import {houseInfolistNoPage,houseInfoList} from "@/api/work/work.js"
-	import {residentInfoAdd,residentInfoPut,residentInfoDet} from "@/api/work/people.js"
+	import {addResidentInfo,authenticationPut,residentInfoDet} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {selectValueKey,selectDictValue} from "@/utils/common.js"
 	import {getOcrIdCard} from "@/api/system/card.js"
@@ -445,7 +445,7 @@
 						return
 					}
 					if(this.ptype=='add'){
-						residentInfoAdd(params).then(res=>{
+						addResidentInfo(params).then(res=>{
 							if(res.code==200){
 								this.$toast("新增成功")
 								setTimeout(function(){
@@ -457,7 +457,7 @@
 							}
 						})
 					}else{
-						residentInfoPut(params).then(res=>{
+						authenticationPut(params).then(res=>{
 							if(res.code==200){
 								this.$toast("修改成功")
 								setTimeout(function(){

property_ui/manage/pages/community/newsadd.vue

@@ -374,7 +374,7 @@
 						let imglen = res.tempFilePaths.length;
 						var fuwufile = [];
 						uploadmore('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
-							var url=that.baseUrl+rs[0];
+							var url=that.baseUrl+rs;
 							that.editorCtx.insertImage({
 								src: url,
 								alt: '图像',

property_ui/manage/pages/community/newsadddj.vue

@@ -23,7 +23,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='0'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -142,7 +142,7 @@
 					"partyTitle":"",//建资讯标题
 					"partyType":"",//建资讯类型（1：党建活动 2：党建学习3：党建知识）
 					"partyContent":"",//建资讯内容
-					"status":"1",//建资讯状态（1正常 2关闭）
+					"status":"0",//建资讯状态（0正常 1关闭）
 					"publishTime":"",//发布时间
 					// "coverImage":"封面图片",
 					// "author":"作者",
@@ -397,7 +397,7 @@
 						let imglen = res.tempFilePaths.length;
 						var fuwufile = [];
 						uploadmore('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
-							var url=that.baseUrl+rs[0];
+							var url=that.baseUrl+rs;
 							that.editorCtx.insertImage({
 								src: url,
 								alt: '图像',

property_ui/manage/pages/community/newsaddsq.vue

@@ -23,7 +23,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='0'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -143,7 +143,7 @@
 					"communityTitle":"",//社区资讯标题
 					"communityType":"",//社区资讯类型（1：公告 2：通知 3：资讯）
 					"communityContent":"",//社区资讯内容
-					"status":"1",//社区资讯状态（1正常 2关闭）
+					"status":"0",//社区资讯状态（0正常 1关闭）
 					"publishTime":"",//发布时间
 					// "coverImage":"封面图片",
 					// "author":"作者",
@@ -398,7 +398,7 @@
 						let imglen = res.tempFilePaths.length;
 						var fuwufile = [];
 						uploadmore('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
-							var url=that.baseUrl+rs[0];
+							var url=that.baseUrl+rs;
 							that.editorCtx.insertImage({
 								src: url,
 								alt: '图像',

property_ui/manage/pages/community/newsaddvideo.vue

@@ -14,7 +14,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='0'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -111,7 +111,7 @@
 					"manualTitle":"",//员工培训手册标题
 					"manualType":"2",//员工培训手册类型（1：图片 2:视频）
 					"manualContent":"",//员工培训手册内容
-					"status":"1",//员工培训手册状态（1正常 2关闭）
+					"status":"0",//员工培训手册状态（0正常 1关闭）
 					"publishTime":"",//发布时间
 					"videoUrl":"",//视频地址URL
 					// "coverImage":"封面图片",

property_ui/manage/pages/community/newsdj.vue

@@ -175,10 +175,10 @@
 					
 				}
 				if(this.tabval=='yty'){
-					params.status='2'
+					params.status='1'
 				}else{
 					params.partyType=this.tabval;
-					params.status='1'
+					params.status='0'
 				}
 				partyNewsList(params).then(res=>{
 					if(res.code==200){

property_ui/manage/pages/community/newssq.vue

@@ -151,10 +151,10 @@
 					pageNum: this.pageNum,
 				}
 				if(this.tabval=='yty'){
-					params.status='2'
+					params.status='1'
 				}else{
 					params.communityType=this.tabval;
-					params.status='1'
+					params.status='0'
 				}
 				newsList(params).then(res=>{
 					if(res.code==200){

property_ui/manage/pages/community/newsyg.vue

@@ -42,7 +42,7 @@
 				wtdt:'',
 				tabval:'ystv',
 				type:'',
-				wzlxList:[],
+				wzlxList:[{dictLabel:"已停用",dictValue:'yty'}],
 				stayDuration: 0,
 				pageLoadTime:0,
 			}
@@ -104,12 +104,14 @@
 							}else{
 								this.type='ygsp'
 							}
-							this.wzlxList = res.data.map(v => {
+							var newArr = res.data.map(v => {
 								return {
 									dictLabel: v.dictLabel,
 									dictValue: v.dictValue
 								}
 							})
+							// var newArr=JSON.parse(JSON.stringify(this.tablist))
+							this.wzlxList=newArr.concat(this.wzlxList)
 							this.getDataFn()
 						}
 					}
@@ -187,7 +189,7 @@
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
-					manualType:this.tabval
+					manualType:this.tabval,
 				}
 				manualList(params).then(res=>{
 					if(res.code==200){

property_ui/mine/pages/info.vue

@@ -157,6 +157,10 @@
 			  this.$refs.form.validate().then(res => {
 			    updateUserProfile(this.datainfo).then(response => {
 			      this.$modal.msgSuccess("修改成功")
+				  // 判断是不是改了nickname;
+				  this.$store.dispatch('checkName', this.datainfo.nickName).then(() => {
+				  	
+				  })
 			    })
 			  })
 			}

property_ui/pages/index/index.vue

@@ -17,7 +17,7 @@
 				<view class="flexc mb14">
 					<image :src="adraimg" class="adr"></image>
 					<view class="adrtit flex0">智慧<text>社区</text></view>
-					<view>
+					<view v-if="voList&&voList.length>1">
 						<w-select
 						      style="margin-left: 20rpx;" 
 						     v-model="chooseValue"
@@ -322,15 +322,15 @@ const Clientid = config.Clientid
 			}
 		})
 		this.gettenantList()
-		// if(checkPermi(['wuYe:statistics:num:app'])){
-		// 	this.getCount()
-		// }
-		// if(checkPermi(['wuYe:statistics:wuYeTips'])){
-		// 	this.getCountTips()
-		// }
-		// if(checkPermi(['wuYe:repair:list'])){
-		// 	this.repairList()
-		// }
+		if(checkPermi(['wuYe:statistics:num:app'])){
+			this.getCount()
+		}
+		if(checkPermi(['wuYe:statistics:wuYeTips'])){
+			this.getCountTips()
+		}
+		if(checkPermi(['wuYe:repair:list'])){
+			this.repairList()
+		}
 		// #ifndef H5
 		self.getLocation(function(res){
 			if(res==-1){

property_ui/pages/mine/index.vue

@@ -224,6 +224,9 @@
 				return uni.getSystemInfoSync().windowHeight - 50
 			}
 		},
+		onShow() {
+			this.nickName=this.$store.state.user.nickName;
+		},
 		onPageScroll(e) {
 			// var scrollTop = Number(e.scrollTop);
 			// var listTop=Number(this.listTop)-Number(this.nvaHeight)

property_ui/people/components/w-select/w-select.vue

@@ -26,7 +26,7 @@
 		  @input="inputChange"
 		  @blur="blurChange"
 		  :placeholder="multiple ? multiSelectList.length === 0 ? defaultValue : '' : defaultValue"
-		  :disabled="!filterable"
+		  :disabled="!filterable||isdisabled"
 		  :style="!filterable ? 'pointer-events: none' : ''"
 		  :value="inputData"
 		>
@@ -190,6 +190,11 @@
 		type: String,
 		default: 'label'
 	  },
+	  // 禁止输入
+	  isdisabled:{
+	  	type: Boolean,
+	  	default: false
+	  },
 	  // 绑定的内容
 	  keyName: {
 		type: String,
@@ -293,6 +298,9 @@
 		}
 	  },
 	  changeShow () {
+		  if(this.isdisabled){
+		  	return
+		  }
 		this.isShow = !this.isShow
 		if (this.isShow === false) {
 		  this.filterList = this.list

property_ui/store/getters.js

@@ -15,6 +15,6 @@ const getters = {
   loading: state => state.user.loading,
   tenantId: state => state.user.tenantId,
   initFace: state => state.user.initFace,
-  tenantId: state => state.user.tenantId,
+  companyName:state => state.user.companyName,
 }
 export default getters

property_ui/store/modules/user.js

@@ -26,6 +26,7 @@ const user = {
 	loading: false,
 	tenantId:storage.get(constant.tenantId),
 	initFace: storage.get(constant.initFace),
+	companyName:storage.get(constant.companyName),
   },
 
   mutations: {
@@ -38,6 +39,10 @@ const user = {
 		} */
 		state.loading = tf;
 	},
+	SET_COMPANNAME: (state, companyName) => {
+	  state.companyName = companyName
+	  storage.set(constant.companyName, companyName)
+	},
 	SET_TENANID: (state, tenantId) => {
 	  state.tenantId = tenantId
 	  storage.set(constant.tenantId, tenantId)
@@ -104,6 +109,10 @@ const user = {
 	SetwgtFn({ commit}, code ){
 		commit('SET_WGTCODE',code)
 	},
+	//修改名称
+	checkName({commit},data){
+		commit('SET_NICKNAME', data)
+	},
 	//修改认证状态
 	checkInitFace({commit},data){
 		commit('SET_INITFACE', data)
@@ -175,6 +184,7 @@ const user = {
 		  const nickName = (user == null || user.nickName == "" || user.nickName == null) ? "" : user.nickName
 		  const userId = (user == null || user.userId == "" || user.userId == null) ? "" : user.userId
 		   const tenantId = (user == null || user.tenantId == "" || user.tenantId == null) ? "" : user.tenantId
+		   const companyName = (user == null || user.companyName == "" || user.companyName == null) ? "" : user.companyName
 		  const phonenumber = (user == null || user.phonenumber == "" || user.phonenumber == null) ? "" : user.phonenumber
 		   const initFace = (res == null || res.authenticationUser == "" || res.authenticationUser == null) ? "" : res.authenticationUser
 		  const deptId = (user == null || user.deptId == "" || user.deptId == null) ? "" : user.deptId
@@ -203,6 +213,7 @@ const user = {
 		  commit('SET_NICKNAME', nickName)
           commit('SET_AVATAR', avatar)
 		  commit('SET_USERID', userId)
+		  commit('SET_COMPANNAME', companyName)
 		  commit('SET_TENANID', tenantId)
 		  commit('SET_PHONENUMBER', phonenumber)
 		  commit('SET_INITFACE', initFace)

property_ui/utils/common.js

@@ -221,7 +221,7 @@ export function uploadmore(api, filePaths, successUp, failUp, i, length, files,
 			// console.log(result.fileName,8)
 			if (result.code == 200) {
 				successUp++;
-				files[i] = result.fileName;
+				files[i] = result.data.fileName;
 			} else if(result.code==401) {
 				showConfirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then(res => {
 				  if (res.confirm) {

property_ui/utils/constant.js

@@ -13,6 +13,7 @@ const constant = {
    deptName: 'vuex_deptName',
    initFace:'vuex_initFace',
    tenantId:'vuex_tenantId',
+   companyName:'vuex_companyName',
  }
 
  export default constant

property_ui/utils/storage.js

@@ -4,7 +4,7 @@ import constant from './constant'
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name,constant.nickName, constant.roles,constant.roleName,constant.permissions,constant.autologin,constant.wgtcode,constant.userId,constant.phonenumber,constant.deptId,constant.deptName,constant.initFace,constant.tenantId]
+let storageNodeKeys = [constant.avatar, constant.name,constant.nickName, constant.roles,constant.roleName,constant.permissions,constant.autologin,constant.wgtcode,constant.userId,constant.phonenumber,constant.deptId,constant.deptName,constant.initFace,constant.tenantId,constant.companyName]
 
 const storage = {
   set: function(key, value) {

property_ui/work/components/car/list.vue

@@ -4,7 +4,7 @@
 	<block v-if="datainfo.length>0">
 		<!-- 房屋管理 -->
 		<block v-if="type=='comehouse'">
-			<view class="carlist houselist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.houseId)">
+			<view class="carlist houselist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite)">
 				<view class="ctop flexc">
 					<image :src="house" class="imgs" v-if="ite.houseStatus==1"></image>
 					<image :src="housea" class="imgs" v-if="ite.houseStatus==4"></image>
@@ -12,9 +12,10 @@
 					<image :src="housec" class="imgs" v-if="ite.houseStatus==3"></image>
 					<view class="tit">{{ite.communityName}}{{ite.detailedAddress}}</view>
 					<view class="flex1"></view>
-					<block v-if="tabval=='-1'">
-						<view class="shbtn btna" @click="getSh('3',ite)">拒绝</view>
-						<view class="shbtn btnb" @click="getSh('2',ite)">通过</view>
+					<view @click.stop="getDelFn(ite)" v-if="checkPermi(['wuYe:residentInfo:deleteResident'])">删除</view>
+					<block v-if="tabval=='-1'&&ite.examine==1&&checkPermi(['wuYe:residentInfo:examineStaff'])">
+						<view class="shbtn btna" @click.stop="getSh('3',ite)">拒绝</view>
+						<view class="shbtn btnb" @click.stop="getSh('2',ite)">通过</view>
 					</block>
 					<block v-else>
 						<view class="txt ca" v-if="ite.houseStatus==1">自住</view>
@@ -24,7 +25,9 @@
 					</block>
 				</view>
 				<view class="clists" v-if="tabval=='-1'">
-					<view class="clist"><view class="tit">房屋坐落</view>{{ite.location}}</view>
+					<view class="clist"><view class="tit">姓名</view>{{ite.residentName}}</view>
+					<view class="clist"><view class="tit">手机号</view>{{ite.residentPhone}}</view>
+					<!-- <view class="clist"><view class="tit">房屋坐落</view>{{ite.location}}</view>
 					<view class="w50 flexc">
 						<view class="clist"><view class="tit">房屋状态</view>
 							<view class="txtb ca" v-if="ite.houseStatus==1">自住</view>
@@ -36,8 +39,8 @@
 					</view>
 					<view class="w50 flexc">
 						<view class="clist"><view class="tit">建筑面积</view>{{ite.area}}m²</view>
-						<view class="clist"><view class="tit">有无车位  </view>{{ite.hasParkingSpace=='Y'?'有':'无'}}</view>
-					</view>
+						<view class="clist"><view class="tit">有无车位</view>{{ite.hasParkingSpace=='Y'?'有':'无'}}</view>
+					</view> -->
 				</view>
 				<block v-else>
 					<view class="clists">
@@ -301,31 +304,36 @@
 				// this.datainfo.splice(idx,1,obj);
 				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
 			},
-			getSh(type,ite){
+			getSh(e,ite){
 				var that=this;
-				var str="";
-				if(type=='2'){
-					str="通过"
-				}else if(type=='3'){
-					str="拒绝"
+				var obj={
+					ite:ite,
+					sh:e
 				}
-				uni.showModal({
-					title: '确认'+str,
-					content: "是否确认"+str,
-					cancelText: '取消',
-					confirmText: '确认',
-					success: function(res) {
-						if (res.confirm) {
-							// var obj={
-							// 	status:type,
-							// 	contentId:ite.contentId,
-							// 	commentId:ite.commentId,
-							// }
-							// that.$emit('getSh',obj)
-						} else if (res.cancel) {
-						}
-					}
-				});
+				this.$emit('getShFn',obj)
+				// var str="";
+				// if(type=='2'){
+				// 	str="通过"
+				// }else if(type=='3'){
+				// 	str="拒绝"
+				// }
+				// uni.showModal({
+				// 	title: '确认'+str,
+				// 	content: "是否确认"+str,
+				// 	cancelText: '取消',
+				// 	confirmText: '确认',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			// var obj={
+				// 			// 	status:type,
+				// 			// 	contentId:ite.contentId,
+				// 			// 	commentId:ite.commentId,
+				// 			// }
+				// 			that.$emit('getSh',obj)
+				// 		} else if (res.cancel) {
+				// 		}
+				// 	}
+				// });
 			},
 			getDelFn(id){
 				var that=this;

property_ui/work/pages/manage/addhouse.vue

@@ -8,10 +8,17 @@
 			<view class="chmain">
 				<uni-forms ref="form" :model="datainfo" :rules="rules">
 				<view class="upbox" @click="getaddImage">
-					<image :src="baseUrl+datainfo.front" class="img" v-if="datainfo.front"></image>
+					
 					<image :src="cmico" class="addimg"></image>
 					<view>扫描房产证自动填写</view>
 				</view>
+				<uni-forms-item label="房产证" required name="location" v-if="datainfo.houseImage">
+					<view class="flexc">
+						<view class="flex1"></view>
+						<image :src="baseUrl+datainfo.houseImage" class="fczimg" v-if="datainfo.houseImage" @click="getPreview(datainfo.houseImage)"></image>
+						<view class="rimg"></view>
+					</view>
+				</uni-forms-item>
 				  <uni-forms-item label="房屋坐落" required name="location">
 					  <view class="flexc">
 					  	<uni-easyinput :disabled="isdisabled" v-model="datainfo.location" :inputBorder='false' placeholder="自动识别" />
@@ -58,9 +65,22 @@
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="门牌号" required name="detailedAddress">
+					<uni-forms-item label="楼栋" required name="loudong">
+						<view class="flexcc">
+							<view class="flexc ml10">
+								<uni-easyinput :disabled="isdisabled" v-model="datainfo.loudong" :inputBorder='false' placeholder="请输入" />
+								<view class="tips">栋</view>
+							</view>
+							<view class="flexc ml10">
+								<uni-easyinput :disabled="isdisabled" v-model="datainfo.danyuan" :inputBorder='false' placeholder="请输入" />
+								<view class="tips">单元</view>
+							</view>
+							<view class="rimg"></view>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="详细门牌号" required name="xxaddress">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.detailedAddress" :inputBorder='false' placeholder="请输入门牌号" />
+							<uni-easyinput :disabled="isdisabled" v-model="datainfo.xxaddress" :inputBorder='false' placeholder="请输入详细门牌号" />
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
@@ -215,13 +235,14 @@
 					 "coOwner":"",//共有人姓名，多个共有人可以用逗号分隔
 					 "detailedAddress":"",//房屋的详细门牌号
 					 "hasParkingSpace":"",//是否有车位，Y表示有，N表示无
-					 "communityName":"",//房屋所在小区名称
+					 "communityName":this.$store.state.user.companyName,//房屋所在小区名称
 					 "houseStatus":"",//房屋状态：1-自住，2-出租，3-空闲，4-待售
 					 "parkingNumber":'',//车位号
+					 'houseImage':'',//房本照片
 				},
 				rules: {
 				  location: {rules: [{required: true,errorMessage: '请输入房屋坐落位置' }]},
-				  detailedAddress: {rules: [{required: true,errorMessage: '请输入详细门牌号' }]},
+				  // detailedAddress: {rules: [{required: true,errorMessage: '请输入详细门牌号' }]},
 				  area: {rules: [{required: true,errorMessage: '请输入面积' }]},
 				},
 				id:'',
@@ -358,13 +379,31 @@
 				houseInfoDet(this.id).then(res=>{
 					if(res.code==200){
 						this.datainfo=res.data;
-						
+						if(res.data&&res.data.detailedAddress){
+							this.datainfo.xxaddress=res.data.detailedAddress
+							var address=res.data.detailedAddress;
+							var indxa=address.indexOf('栋')
+							var indxb=address.indexOf('单元')
+							var a = address.split(/[栋单元]/).filter(Boolean);
+							this.datainfo.loudong=a[0];
+							this.datainfo.danyuan=a[1];
+							this.datainfo.xxaddress=a[2];
+						}
 					}
 				})
 			},
 			getSubmit(){
 				this.$refs.form.validate().then(res => {
 					var params=JSON.parse(JSON.stringify(this.datainfo))
+					if(!params.loudong||!params.danyuan){
+						this.$toast("请输入楼栋")
+						return
+					}
+					if(!params.xxaddress){
+						this.$toast("请输入详细门牌号")
+						return
+					}
+					params.detailedAddress=`${params.loudong?params.loudong+'栋':''}` + `${params.danyuan?params.danyuan+'单元':''}` + params.xxaddress;
 					if(this.ptype=='add'){
 						houseInfoAdd(params).then(res=>{
 							if(res.code==200){
@@ -392,6 +431,17 @@
 					}
 				})
 			},
+			getPreview(img) {
+				var newArr=[];
+				var url=this.baseUrl+img
+				newArr.push(url)
+				uni.previewImage({
+					urls: newArr,
+					current:0,
+					success: function(data) {},
+					fail: function(err) {}
+				});
+			},
 			getaddImage(e){
 				let that = this;
 				let file =[],count=9
@@ -410,6 +460,7 @@
 							var fuwufile = [];
 							uploadIdentify('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
 								var resurl=rs[0];
+								that.datainfo.houseImage=resurl.fileName
 								if(rs&&rs.length>0){
 									var obj={
 										type:e,
@@ -481,4 +532,5 @@
 	}
 }
 .tips{font-weight: bold;color: #272727;font-size: 26rpx;margin-left: 8rpx;}
+.fczimg{width: 100rpx;height: 100rpx;}
 </style>

property_ui/work/pages/manage/house.vue

@@ -27,7 +27,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :wtdt="wtdt" :tabval="tabval" type='comehouse' @getDetail="getDetail" @getPut="getPut" @getJuzhu="getJuzhu" @getCar="getCar" @getSh="getSh"></car-list>
+			<car-list :datainfo="list" :wtdt="wtdt" :tabval="tabval" type='comehouse' @getDetail="getDetail" @getPut="getPut" @getJuzhu="getJuzhu" @getDelFn="getDelFn" @getCar="getCar" @getShFn="getShFn"></car-list>
 		</view>
 		<view class="cdbtns">
 			<!-- <view class="btna" @click="getAddFn">单个添加</view>
@@ -43,7 +43,8 @@
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	import carList from "@/work/components/car/list.vue"
-	import {houseInfoList} from "@/api/work/work.js"
+	import {houseInfoList,examineResident,deleteResident} from "@/api/work/work.js"
+	import {residentInfoList} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
@@ -84,6 +85,24 @@
 		},
 		methods:{
 			checkPermi, checkRole,
+			getDelFn(data){
+				var that=this;
+				var info=JSON.parse(JSON.stringify(data))
+				var params={
+					residentId:info.residentId,
+					userId:info.userId,
+					tenantId:info.tenantId,
+					houseId:info.houseId,
+				}
+				deleteResident(params).then(res=>{
+					if(res.code==200){
+						this.$toast("删除成功");
+						setTimeout(function(){
+							that.getrefreshData()
+						},1500)
+					}
+				})
+			},
 			init(){
 				// 房屋状态
 				getDictionaryFn('house_status').then(res=>{
@@ -105,12 +124,15 @@
 			getAddFn(){
 				this.$tab.navigateTo("/work/pages/manage/houseadd")
 			},
-			getDetail(e){
+			getDetail(data){
+				var info=JSON.parse(JSON.stringify(data))
 				var tabval=this.tabval;
 				if(tabval=='-1'){
-					this.$tab.navigateTo(`/work/pages/manage/housedetail?id=${e}`)
+					var id=info.residentId
+					this.$tab.navigateTo(`/work/pages/manage/housedetail?id=${id}`)
 				}else{
-					this.$tab.navigateTo("/work/pages/manage/addhouse?id="+e)
+					var id=info.houseId
+					this.$tab.navigateTo(`/work/pages/manage/addhouse?id=${id}`)
 				}
 				
 			},
@@ -120,17 +142,19 @@
 			getCar(e){
 				this.$tab.navigateTo("/work/pages/manage/car?id="+e)
 			},
-			getSh(e){
+			getShFn(data){
 				var that=this;
-				var params=JSON.parse(JSON.stringify(data))
-				// commentContentPut(params).then(res=>{
-				// 	if(res.code==200){
-				// 		this.$toast('审核成功')
-				// 		setTimeout(function() {
-				// 			that.getrefreshData()
-				// 		}, 1500);
-				// 	}
-				// })
+				var info=JSON.parse(JSON.stringify(data))
+				var params=JSON.parse(JSON.stringify(info.ite))
+				params.examine=info.sh;
+				examineResident(params).then(res=>{
+					if(res.code==200){
+						this.$toast('审核成功')
+						setTimeout(function() {
+							that.getrefreshData()
+						}, 1500);
+					}
+				})
 			},
 			getJuzhu(e){
 				var data={
@@ -172,31 +196,58 @@
 				if(this.text){
 					params.detailedAddress=this.text
 				}
-				houseInfoList(params).then(res=>{
-					if(res.code==200){
-						if (res.rows.length < this.pageSize) {
-							this.reachflag = false
-							this.wtdt = '到底了~';
-						} else {
-							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
-							if (num < res.total) {
-								this.reachflag = true
-								this.wtdt = ''
-							} else {
+				if(this.tabval==-1){
+					params.examine=1
+					residentInfoList(params).then(res=>{
+						if(res.code==200){
+							if (res.rows.length < this.pageSize) {
 								this.reachflag = false
 								this.wtdt = '到底了~';
+							} else {
+								var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+								if (num < res.total) {
+									this.reachflag = true
+									this.wtdt = ''
+								} else {
+									this.reachflag = false
+									this.wtdt = '到底了~';
+								}
 							}
+							if (this.pageNum == 1) {
+								this.list = res.rows;
+							} else {
+								this.list = this.list.concat(res.rows)
+							}
+						}else{
+							this.$toast(res.msg)
 						}
-						if (this.pageNum == 1) {
-							this.list = res.rows;
-						} else {
-							this.list = this.list.concat(res.rows)
+					})
+				}else{
+					houseInfoList(params).then(res=>{
+						if(res.code==200){
+							if (res.rows.length < this.pageSize) {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							} else {
+								var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+								if (num < res.total) {
+									this.reachflag = true
+									this.wtdt = ''
+								} else {
+									this.reachflag = false
+									this.wtdt = '到底了~';
+								}
+							}
+							if (this.pageNum == 1) {
+								this.list = res.rows;
+							} else {
+								this.list = this.list.concat(res.rows)
+							}
+						}else{
+							this.$toast(res.msg)
 						}
-					}else{
-						this.$toast(res.msg)
-					}
-				})
-				
+					})
+				}	
 			},
 		}
 	}

property_ui/work/pages/manage/houseadd.vue

@@ -21,7 +21,7 @@
 					</uni-forms-item>
 					<uni-forms-item label="建筑面积" required name="area">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.area" :inputBorder='false' placeholder="请输入建筑面积" />
+							<uni-easyinput :disabled="isdisabled" type="number" v-model="datainfo.area" :inputBorder='false' placeholder="请输入建筑面积" />
 							<view class="tips">m²</view>
 							<view class="rimg"></view>
 						</view>
@@ -32,9 +32,23 @@
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="门牌号" required name="detailedAddress">
+					
+					<uni-forms-item label="楼栋" required name="loudong">
+						<view class="flexcc">
+							<view class="flexc ml10">
+								<uni-easyinput :disabled="isdisabled" v-model="datainfo.loudong" :inputBorder='false' placeholder="请输入" />
+								<view class="tips">栋</view>
+							</view>
+							<view class="flexc ml10">
+								<uni-easyinput :disabled="isdisabled" v-model="datainfo.danyuan" :inputBorder='false' placeholder="请输入" />
+								<view class="tips">单元</view>
+							</view>
+							<view class="rimg"></view>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="详细门牌号" required name="xxaddress">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.detailedAddress" :inputBorder='false' placeholder="请输入门牌号" />
+							<uni-easyinput :disabled="isdisabled" v-model="datainfo.xxaddress" :inputBorder='false' placeholder="请输入详细门牌号" />
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
@@ -80,6 +94,10 @@
 					 "location":"",//房屋坐落位置
 					 "rightType":"",//权利类型，如所有权、使用权等
 					 "area":"",//房屋面积，单位为平方米
+					 "loudong":"",//楼栋
+					 "danyuan":"",//单元
+					 "xxaddress":"",//详细
+					 
 					 // "documentNumber":"",//房屋相关的字第号
 					 // "propertyUnitNumber":"",//不动产单元号
 					 // "coOwnership":"",//房屋的共有情况，如共有比例等
@@ -89,12 +107,12 @@
 					 // "coOwner":"",//共有人姓名，多个共有人可以用逗号分隔
 					 "detailedAddress":"",//房屋的详细门牌号
 					 "hasParkingSpace":"",//是否有车位，Y表示有，N表示无
-					 "communityName":"",//房屋所在小区名称
+					 "communityName":this.$store.state.user.companyName,//房屋所在小区名称
 					 // "houseStatus":""//房屋状态：1-自住，2-出租，3-空闲，4-待售
 				},
 				rules: {
 				  location: {rules: [{required: true,errorMessage: '请输入房屋坐落位置' }]},
-				  detailedAddress: {rules: [{required: true,errorMessage: '请输入详细门牌号' }]},
+				  // detailedAddress: {rules: [{required: true,errorMessage: '请输入详细门牌号' }]},
 				  area: {rules: [{required: true,errorMessage: '请输入面积' }]},
 				},
 				id:'',
@@ -136,6 +154,16 @@
 			getSubmit(){
 				this.$refs.form.validate().then(res => {
 					var params=JSON.parse(JSON.stringify(this.datainfo))
+					if(!params.loudong||!params.danyuan){
+						this.$toast("请输入楼栋")
+						return
+					}
+					if(!params.xxaddress){
+						this.$toast("请输入详细门牌号")
+						return
+					}
+					params.detailedAddress=`${params.loudong?params.loudong+'栋':''}` + `${params.danyuan?params.danyuan+'单元':''}` + params.xxaddress;
+					
 					houseInfoAdd(params).then(res=>{
 						if(res.code==200){
 							this.$toast("新增成功")