测试修改

property_ui/api/work/work.js

@@ -43,5 +43,6 @@ export function houseInfolistNoPage(data) {
   return request({
     url: '/wuYe/houseInfo/listNoPage',
     method: 'get',
+	'data':data
   })
 }

property_ui/health/pages/health/add.vue

@@ -29,12 +29,12 @@
 					</view>
 					<uni-forms-item label="身份证号" required name="residentIdCard">
 						<view class="flexc">
-							<uni-easyinput  :disabled="isdisabled" v-model="datainfo.residentIdCard"  :inputBorder='false' placeholder="自动识别" />
+							<uni-easyinput  disabled v-model="datainfo.residentIdCard"  :inputBorder='false' placeholder="自动识别" />
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="姓名" required name="residentName">
 						<view class="flexc">
-							<uni-easyinput  :disabled="isdisabled" v-model="datainfo.residentName"  :inputBorder='false' placeholder="自动识别" />
+							<uni-easyinput  disabled v-model="datainfo.residentName"  :inputBorder='false' placeholder="自动识别" />
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="性别" required name="residentGender">
@@ -53,13 +53,13 @@
 							<uni-easyinput  :disabled="isdisabled"  v-model="datainfo.residentPhone"  :inputBorder='false' placeholder="请输入手机号码" />
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="居住门户" required name="portalId">
+					<uni-forms-item label="居住门户" required name="houseId">
 						<w-select
 						      style="margin-left: 20rpx;" 
-						     v-model="chooseValue"
+						     v-model="datainfo.houseId"
 						      :list='fwlist'
-						      valueName='label' 
-						      keyName="value"
+						      valueName='dictLabel' 
+						      keyName="dictValue"
 							  :chosevalue="datainfo.detailedAddress"
 							  :filterable='filterable'
 						      @change='getchange'
@@ -106,7 +106,7 @@
 					<picker range-key='dictLabel' :disabled="isdisabled" :value="dslxidx" :range="dslxList"   @change='bindDateChanged'>
 						<uni-forms-item label="特殊类型" name="specialType">
 							<view class="flexc mh35">
-								<view class="flex1 txr f13 co27" v-if="datainfo.specialType&&!dslx">{{statusFormats(datainfo.residentAppearance,dslxList,'dslx')}}</view>
+								<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>
@@ -152,10 +152,10 @@
 	import config from '@/config'
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
 	import {uploadIdentify,uploadmore} from '@/utils/common.js'
-	import {houseInfolistNoPage} from "@/api/work/work.js"
+	import {houseInfolistNoPage,houseInfoList} from "@/api/work/work.js"
 	import {residentInfoAdd,residentInfoPut,residentInfoDet} from "@/api/work/people.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
-	import {selectValueKey} from "@/utils/common.js"
+	import {selectValueKey,selectDictValue} from "@/utils/common.js"
 	import {getOcrIdCard} from "@/api/system/card.js"
 	import wSelect from "@/people/components/w-select/w-select.vue"
 	export default {
@@ -228,7 +228,9 @@
 				ptype:'add',
 				filterable:true,
 				chooseValue:'',
-				map:{text:'dictLabel',value:'dictValue'}
+				map:{text:'dictLabel',value:'dictValue'},
+				houseId:'',
+				pfrom:'',
 			}
 		},
 		onLoad: function(e) {
@@ -238,6 +240,10 @@
 				this.isdisabled=true;
 				this.getDetail()
 			}
+			if(e.houseId){
+				this.houseId=e.houseId;
+				this.pfrom="house";
+			}
 			this.init()
 			uni.getSystemInfo({
 				success: (e) => {
@@ -256,6 +262,9 @@
 		methods: {
 			checkPermi,
 			checkRole,
+			kaType(data, list) {
+				return selectDictValue(list, data);
+			},
 			getEditFn(){
 				this.isdisabled=false;
 			},
@@ -273,21 +282,42 @@
 				return aite.actions;
 			},
 			getchange(e){
-				this.datainfo.houseId=e.value;
-				this.datainfo.detailedAddress=e.label;
+				this.datainfo.houseId=e.dictValue;
+				this.datainfo.detailedAddress=e.dictLabel;
 			},
 			init(){
-				houseInfolistNoPage().then(res=>{
-					if(res.code==200){
-						this.fwlist= res.rows.map(v => {
-							return {
-								label: v.detailedAddress,
-								value: v.houseId,
-								location: v.location
-							}
-						})
+				if(this.pfrom=='house'){
+					var houseId=this.houseId;
+					var params={
+						houseId:houseId
 					}
-				})
+					houseInfoList(params).then(res=>{
+						if(res.code==200){
+							this.fwlist= res.rows.map(v => {
+								return {
+									dictLabel: v.detailedAddress,
+									dictValue: v.houseId,
+									location: v.location
+								}
+							})
+							this.datainfo.houseId=this.houseId;
+							this.datainfo.detailedAddress=this.kaType(this.houseId,this.fwlist)
+						}
+					})
+				}else{
+					houseInfolistNoPage().then(res=>{
+						if(res.code==200){
+							this.fwlist= res.rows.map(v => {
+								return {
+									dictLabel: v.detailedAddress,
+									dictValue: v.houseId,
+									location: v.location
+								}
+							})
+						}
+					})
+				}
+				
 				// 是否
 				getDictionaryFn('sys_yes_no').then(res=>{
 					if(res.code==200){

property_ui/manage/pages/community/newsadddj.vue

@@ -172,6 +172,9 @@
 				this.isdisabled=true;
 				this.getDetailFn()
 			}
+			if(e.tabval&&e.tabval!='yty'){
+				this.datainfo.partyType=e.tabval;
+			}
 		},
 		methods: {
 			checkPermi,

property_ui/manage/pages/community/newsaddsq.vue

@@ -144,7 +144,7 @@
 					"communityType":"",//社区资讯类型（1：公告 2：通知 3：资讯）
 					"communityContent":"",//社区资讯内容
 					"status":"1",//社区资讯状态（1正常 2关闭）
-	//				"publishTime":"",//发布时间
+					"publishTime":"",//发布时间
 					// "coverImage":"封面图片",
 					// "author":"作者",
 					// "source":"来源",
@@ -173,6 +173,9 @@
 				this.isdisabled=true;
 				this.getDetailFn()
 			}
+			if(e.tabval&&e.tabval!='yty'){
+				this.datainfo.communityType=e.tabval
+			}
 		},
 		methods: {
 			checkPermi,
@@ -252,7 +255,7 @@
 				this.$refs.form.validate().then(res => {
 					var params=JSON.parse(JSON.stringify(this.datainfo))
 					if(!params.communityType){
-						this.$toast('请选择文章类型')
+						this.$toast('请选择资讯类型')
 						return
 					}
 					if(!params.publishTime){

property_ui/manage/pages/community/newsdj.vue

@@ -10,7 +10,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :wzlxList="wzlxList" :wtdt="wtdt" type='newsdj' @getDetail="getDetail"  @getScFn="getScFn"></car-list>
+			<car-list :datainfo="list" :wzlxList="wzlxList" :wtdt="wtdt" type='newsdj' @getDetail="getDetail"  @getScFn="getScFn" @getDelFn="getDelFn"></car-list>
 		</view>
 		<block v-if="checkPermi(['wuYe:partyNews:add'])">
 			<view style="height: 100rpx;"></view>
@@ -44,7 +44,7 @@
 				tablist:[{dictLabel:"已停用",dictValue:'yty'}],
 				wzlxList:[],
 				baseUrl:config.baseUrl,
-				count:'',
+				count:0,
 			}
 		},
 		onUnload() {
@@ -94,7 +94,7 @@
 				})
 			},
 			getAddFn(){
-				this.$tab.navigateTo("/manage/pages/community/newsadddj")
+				this.$tab.navigateTo("/manage/pages/community/newsadddj?tabval="+this.tabval)
 			},
 			getDetail(id){
 				this.$tab.navigateTo("/manage/pages/community/djdetail?id="+id)

property_ui/manage/pages/community/newssq.vue

@@ -88,14 +88,14 @@
 				})
 			},
 			getAddFn(){
-				this.$tab.navigateTo("/manage/pages/community/newsaddsq")
+				this.$tab.navigateTo("/manage/pages/community/newsaddsq?tabval="+this.tabval)
 			},
 			getHdFn(){
 				this.$tab.navigateTo("/mine/pages/news/index");
 				this.hdcount=0;
 			},
 			getPut(id){
-				if(checkPermi((['wuye:news:edit']))){
+				if(checkPermi((['wuYe:news:edit']))){
 					this.$tab.navigateTo("/manage/pages/community/newsaddsq?id="+id)
 				}else{
 					this.$tab.navigateTo("/manage/pages/community/newssqdetail?id="+id)

property_ui/manage/pages/community/sqmoneyadd.vue

@@ -4,7 +4,7 @@
 			<view class="check">
 			<view class="cbox">
 				<view class="chmain">
-					<uni-forms-item label="资讯类型" name="phonenumber">
+					<uni-forms-item label="资产类型" name="phonenumber">
 						<uni-data-picker :map="map" :disabled="isdisabled" placeholder="请选择" popup-title="请选择" :localdata="assetTree" v-model="datainfo.assetId"
 							@change="onchange" >
 						</uni-data-picker>

property_ui/mine/components/box/list.vue

@@ -4,10 +4,7 @@
 	<block v-if="datainfo.length>0">
 		<!-- 我的互动 -->
 		<block v-if="type=='myhd'">
-			<view class="mb12 pr" v-for="(ite,idx) in datainfo" :key="idx"
-				:data-idx="idx"
-				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
-			>
+			<view class="mb12 pr" v-for="(ite,idx) in datainfo" :key="idx">
 				<view class="hdlist pd12 flex">
 					<image :src="man" class="mhead flex0"></image>
 					<view class="flex1 overh">
@@ -29,14 +26,10 @@
 						</view>
 					</view>
 				</view>
-				<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
 			</view>
 		</block>
 		<block v-if="type=='plsh'">
-				<view class="mb12 pr"  v-for="(ite,idx) in datainfo" :key="idx"
-					:data-idx="idx"
-					@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
-				>
+				<view class="mb12 pr"  v-for="(ite,idx) in datainfo" :key="idx">
 					<view class="hdlist ">
 						<view class="pd12 flex">
 							<image :src="ite.avatar?baseUrl+ite.avatar:man" class="mhead flex0"></image>
@@ -54,13 +47,13 @@
 							</view>
 						</view>
 						<view class="shbtns flexc pd12" >
-							<view class="btn bga" @click="getSh('4',ite)">不予展示</view>
+							<!-- <view class="btn bga" @click="getSh('4',ite)">不予展示</view> -->
 							<view class="flex1"></view>
 							<view class="btn bgb" @click="getSh('3',ite)">不通过</view>
 							<view class="btn bgc" @click="getSh('2',ite)">通过</view>
 						</view>
 					</view>
-					<view class="spdel" v-if="ite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(ite.residentId)">删除</view>
+					
 				</view>
 		</block>
 		<!-- 我的点赞，收藏，评论 :data-idx="idx"

property_ui/pages.json

@@ -1,5 +1,12 @@
 {
   "pages": [
+	  {
+	    "path": "pages/login",
+	    "style": {
+	      "navigationBarTitleText": "登录",
+	  	  "navigationStyle": "custom"
+	    }
+	  }, 
 	  {
 	    "path": "pages/index/index",
 	    "style": {
@@ -14,13 +21,7 @@
 	      "navigationStyle": "custom"
 	    }
 	  },
-	  {
-    "path": "pages/login",
-    "style": {
-      "navigationBarTitleText": "登录",
-	  "navigationStyle": "custom"
-    }
-  }, 
+	 
   {
     "path": "pages/tlogin",
     "style": {
@@ -384,6 +385,15 @@
 					}
 				}
 			},
+			{
+				"path": "pages/people/fwindex",
+				"style": {
+					"navigationBarTitleText": "人员管理",
+					"h5":{
+						"titleNView":false
+					}
+				}
+			},
 			{
 				"path": "pages/people/comegl",
 				"style": {

property_ui/pages/mine/info.vue

@@ -15,7 +15,7 @@
 					</uni-forms-item>
 					<uni-forms-item label="性别" name="sex">
 						<picker range-key='dictLabel' :disabled="isdisabled" :value="xbidx" :range="xbList"   @change='bindDateChange'>
-							<view class="flexc">
+							<view class="flexc" style="height: 70rpx;">
 								<view class="flex1 txr f13 co27" v-if="datainfo.sex&&!xb">{{statusFormats(datainfo.sex,xbList,'xb')}}</view>
 								<view class="flex1 txr f13" v-else :class="xb?'co27':'coa'">{{xb||"性别"}}</view>
 							</view>

property_ui/people/components/car/list.vue

@@ -79,6 +79,34 @@
 				</view>
 			</view>
 		</block>
+		<!-- 房屋下的人员 -->
+		<block v-if="type=='fwpeople'">
+			<view class="carlist peolist mb12 pr" v-for="(aite,idx) in datainfo" :key="idx"  @click="getDetail(aite.residentId)"
+				:data-idx="idx"
+				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+aite.right+'px'"
+			>
+				<view class="plists pb10 delleft" >
+					<view class="plist flexc">
+						<image :src="man" class="head" v-if="aite.residentGender==1"></image>
+						<image :src="woman" class="head" v-else></image>
+						<view class="flex1">
+							<view class="ptit">{{aite.residentName}}
+								<view class="btn btnc ml10" v-if="aite.isHouseholder=='Y'">户主</view>
+							</view>
+							<view class="ptxt">身份证号 | {{aite.residentIdCard}}</view>
+							<view class="flexc">
+								<view class="ptxt">性别 | {{aite.residentGender==1?'男':'女'}}</view>
+								<view class="ptxt">年龄 | {{getAgeFromID(aite.residentIdCard)}}岁</view>
+							</view>
+							<view class="flexc" v-if="aite.residentAppearance">
+								<view class="ptxt">人员面貌 | {{kaType(aite.residentAppearance,rymmList)}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="spdel" v-if="aite.right>0&&checkPermi(['wuYe:residentInfo:remove'])" @click.stop="getDelFn(aite.residentId)">删除</view>
+			</view>
+		</block>
 		<!-- 维修人员管理 -->
 		<view v-if="type=='staff'" class="flecw">
 			<view class="stafflist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.staffId)">

property_ui/people/pages/people/comeadd.vue

@@ -22,7 +22,7 @@
 					</uni-forms-item>
 					<uni-forms-item label="来访时间" name="visitorTime" v-if="tabval==1">
 						<view class="flexc">
-							<uni-datetime-picker  :disabled="isdisabled" :class="datainfo.visitorTime?'co27':'coa'" type="date" placeholder="请选择来访时间" :border="false" :hide-second='true' v-model="datainfo.visitorTime" @change="changeLog" />
+							<uni-datetime-picker :start="starttime"  :disabled="isdisabled" :class="datainfo.visitorTime?'co27':'coa'" type="date" placeholder="请选择来访时间" :border="false" :hide-second='true' v-model="datainfo.visitorTime" @change="changeLog" />
 							<view class="rimg"><image :src="rimg"></image></view>
 						</view>
 						<!-- <picker range-key='dictLabel' :value="vxlbidx" :range="vxlbList"   @change='bindDateChangea'>
@@ -146,13 +146,6 @@
 					 // "photo":""//人脸信息
 				},
 				syqxidx:'',
-				sexs: [{
-					text: '男',
-					value: 0
-				}, {
-					text: '女',
-					value: 1
-				}],
 				rules:{name: {rules: [{required: true,errorMessage: '请输入访客姓名' }]},
 				  portalId: {rules: [{required: true,errorMessage: '请选择来访门户' }]},
 				  mobileNumber: {rules: [{required: true,errorMessage: '请输入手机号'}, {pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,errorMessage:'请输入正确的手机号码'}]},},
@@ -164,6 +157,7 @@
 				id:'',
 				isdisabled:false,
 				ptype:'add',
+				starttime:''
 			}
 		},
 		onLoad: function(e) {
@@ -175,6 +169,7 @@
 				this.getDetail()
 			}
 			this.init()
+			this.time()
 		},
 		methods: {
 			checkPermi,
@@ -182,6 +177,21 @@
 			getEditFn(){
 				this.isdisabled=false;
 			},
+			time() {
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var min = date.getMinutes();
+				var s = date.getSeconds();
+				var yearStr = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d)
+				// var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? (
+				// 	'0' + s) : s);
+				// var kaTime = yearStr + ' ' + timeStr;
+				this.starttime=yearStr
+				// return kaTime
+			},
 			init(){
 				houseInfolistNoPage().then(res=>{
 					if(res.code==200){

property_ui/people/pages/people/comegl.vue

@@ -26,7 +26,7 @@
 		</view>
 		<block v-if="checkPermi(['wuYe:visitorManage:add'])">
 			<view style="height: 100rpx;"></view>
-			<view class="rfbtn"  @click="getAddFn">添加访客</view>
+			<view class="rfbtn"  @click="getAddFn">访客信息登记</view>
 		</block>
 		<loading></loading>
 	</view>

property_ui/people/pages/people/fwindex.vue

@@ -0,0 +1,211 @@
+<template>
+	<view class="car">
+		<view class="cartop">
+			<view class="topa flexc">
+				<image :src="reset" class="resetimg" @click="getReset"></image>
+				<picker range-key='dictLabel' 	:range="rymmList"    @change='bindDateChangea'>
+					<view class="chekt flexc">
+						<view class="over">{{rymm|| "选择身份"}}</view>
+						<image :src="up"></image>
+					</view>
+				</picker>
+				<view class="search flexc">
+					<image :src="search"></image>
+					<!-- confirm-type="search" @confirm="getConfirm" -->
+					<input placeholder="请输入人员姓名进行搜索"  v-model="text"/>
+					<view class="btn" @click="getConfirm">搜索</view>
+				</view>
+			</view>
+		</view>
+		<!-- 列表 -->
+		<view class="carlists">
+			<car-list :datainfo="list" :rymmList="rymmList" :wtdt="wtdt" type='fwpeople' @getDelFn="getDelFn" @getDetail="getDetail"></car-list>
+		</view>
+		<block v-if="checkPermi(['wuYe:residentInfo:add'])">
+			<view style="height: 100rpx;"></view>
+			<view class="rfbtn" @click="getAddFn">添加人员</view>
+		</block>
+		<loading></loading>
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+	import carList from "@/people/components/car/list.vue"
+	import {getDictionaryFn} from "@/api/system/user.js"
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import {houseInfoList} from "@/api/work/work.js"
+	import {residentInfoList,residentInfoDel} from "@/api/work/people.js"
+	export default{
+		components:{carList},
+		data(){
+			return{
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				car:require('@/car/static/car/car.png'),
+				cara:require('@/car/static/car/cara.png'),
+				carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
+				sfxx:"",
+				text:'',
+				rymm:'',
+				rymmid:"",
+				rymmList:[],
+				list:[],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'',
+				houseId:'',
+				ftype:'',
+			}
+		},
+		onUnload() {
+			uni.$off('residentInfoList')
+		},
+		onLoad: function(e) {
+			uni.$on('residentInfoList',(res)=>{
+				this.getrefreshData()
+			})
+			if(e.data){
+				var newobj=JSON.parse(decodeURIComponent(e.data));
+				this.houseId=newobj.id;
+				this.ftype=newobj.type
+			}
+			this.init()
+			this.getDataFn()
+		},
+		// 上拉触底加载更多触发事件
+		onReachBottom() {
+			if (this.reachflag) {
+				this.pageNum++
+				this.getDataFn()
+			}
+		},
+		methods:{
+			checkPermi, checkRole,
+			init(){
+				//人员面貌
+				getDictionaryFn('affiliation_personnel').then(res=>{
+					if(res.code==200){
+						this.rymmList = res.data.map(v => {
+							return {
+								dictLabel: v.dictLabel,
+								dictValue: v.dictValue
+							}
+						})
+					}
+				})
+			},
+			getAddFn(){
+				this.$tab.navigateTo("/health/pages/health/add?houseId="+this.houseId)
+			},
+			getDetail(id){
+				this.$tab.navigateTo("/health/pages/health/add?id="+id)
+			},
+			getConfirm(){
+				this.getrefreshData()
+			},
+			getReset(){
+				this.rymm='';
+				this.text='';
+				this.getrefreshData()
+			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getTabFn(val){
+				this.tabval=val
+			},
+			bindDateChangea(e){
+				var val=e.detail.value;
+				this.rymm=this.rymmList[val].dictLabel;
+				this.rymmid=this.rymmList[val].dictValue;
+				this.getrefreshData()
+			},
+			getDelFn(id){
+				var that=this;
+				residentInfoDel(id).then(res=>{
+					if(res.code==200){
+						that.$toast("删除成功")
+						setTimeout(function(){
+							that.getrefreshData()
+						},1500)
+					}
+				})
+			},
+			getDataFn(){
+				var params={
+					pageSize:this.pageSize,
+					pageNum: this.pageNum,
+				}
+				if(this.ftype=='house'){
+					params.houseId=this.houseId
+				}
+				if(this.text){
+					params.residentName=this.text
+				}
+				if(this.rymm){
+					params.residentAppearance=this.rymmid
+				}
+				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 = '到底了~';
+							}
+						}
+						var newArr=JSON.parse(JSON.stringify(res.rows))
+						newArr.forEach(ite=>{
+							ite.right=0;
+						})
+						if (this.pageNum == 1) {
+							this.list = newArr;
+						} else {
+							this.list = this.list.concat(newArr)
+						}
+					}else{
+						this.$toast(res.msg)
+					}
+				})
+				
+			},
+		}
+	}
+</script>
+<style>
+	page{background: #F3F3F0;}
+</style>
+<style lang="scss" scoped>
+.car{padding-top: 140rpx;}
+.cartop{position: fixed;left: 0;right: 0;top: 0;background-color: #ffffff;z-index: 2;
+	.topa{padding: 20rpx 20rpx 32rpx;
+		.resetimg{width: 36rpx;height: 36rpx;margin-right: 24rpx;flex: 0 0 auto;}
+		.chekt{width: 150rpx;overflow: hidden;
+			view{font-weight: 500;font-size: 26rpx;color: #272727;flex: 1;}
+			image{width: 24rpx;height: 16rpx;margin-left: 18rpx;flex: 0 0 auto;}
+		}
+		.search{flex: 1;margin-left: 16rpx;height: 64rpx;background: #EEEEEE;border-radius: 32rpx;border: 2rpx solid #E6E6E6;padding-left: 24rpx;box-sizing: border-box;
+		image{width: 32rpx;height: 34rpx;margin-right: 22rpx;flex: 0 0 auto;}
+		input{flex: 1;font-size: 26rpx;color: #272727;}
+		.btn{width: 100rpx;height: 64rpx;background: #3565ED;border-radius: 32rpx;flex: 0 0 auto;font-weight: bold;text-align: center;line-height: 64rpx;
+font-size: 26rpx;
+color: #FFFFFF;}
+		}
+	}
+
+}
+.carlists{padding: 0 18rpx;}
+</style>

property_ui/service/pages/service/complaintdetail.vue

@@ -12,7 +12,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="cdbox pt50" v-if="datainfo.status==2">
+		<view class="cdbox pt40" v-if="datainfo.status==2">
 			<view class="hftop">
 				<image :src="hline"></image>
 				<view>回复</view>

property_ui/static/style.css

@@ -58,6 +58,7 @@ font-weight: bold;font-size: 26rpx;color: #FFFFFF;background: #0256FD;border-rad
 .plr15{padding: 0 30rpx;}
 
 .pb10{padding-bottom: 20rpx !important;}
+.pt40{padding-top: 80rpx !important;}
 .pt50{padding-top: 100rpx !important;}
 .ml10{margin-left: 20rpx;}
 .mr6{margin-right: 12rpx;}

property_ui/work/pages/manage/addcar.vue

@@ -50,10 +50,10 @@
 						<uni-forms-item label="居住门户" name="houseId">
 							<w-select
 							      style="margin-left: 20rpx;" 
-							     v-model="chooseValue"
+							     v-model="datainfo.houseId"
 							      :list='fwlist'
-							      valueName='label' 
-							      keyName="value"
+							      valueName='dictLabel' 
+							      keyName="dictValue"
 								  :chosevalue="datainfo.detailedAddress"
 								  :filterable='filterable'
 							      @change='getchange'
@@ -120,9 +120,9 @@
 <script>
 	import config from '@/config'
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
-	import {uploadIdentify,selectValueKey} from '@/utils/common.js'
+	import {uploadIdentify,selectValueKey,selectDictValue} from '@/utils/common.js'
 	import wSelect from "@/people/components/w-select/w-select.vue"
-	import {houseInfolistNoPage} from "@/api/work/work.js"
+	import {houseInfolistNoPage,houseInfoList} from "@/api/work/work.js"
 	import {carPut,carAdd,carDet} from "@/api/work/car.js"
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {getvehicleLicense} from "@/api/system/card.js"
@@ -189,6 +189,8 @@
 				ptype:'add',
 				userId:this.$store.state.user.userId,
 				phonenumber:this.$store.state.user.phonenumber,
+				houseId:'',
+				pfrom:'',
 			}
 		},
 		onLoad: function(e) {
@@ -198,11 +200,18 @@
 				this.isdisabled=true;
 				this.getDetail()
 			}
+			if(e.houseId){
+				this.houseId=e.houseId;
+				this.pfrom="house";
+			}
 			this.init()
 			
 		},
 		methods:{
 			checkPermi, checkRole,
+			kaType(data, list) {
+				return selectDictValue(list, data);
+			},
 			getEditFn(){
 				this.isdisabled=false;
 			},
@@ -219,20 +228,38 @@
 			},
 			init(){
 				// 自己的房屋
-				var params={
-					userId:this.userId
-				}
-				houseInfolistNoPage(params).then(res=>{
-					if(res.code==200){
-						this.fwlist= res.rows.map(v => {
-							return {
-								label: v.detailedAddress,
-								value: v.houseId,
-								location: v.location
-							}
-						})
+				if(this.pfrom=='house'){
+					var params={
+						houseId:this.houseId
 					}
-				})
+					houseInfoList(params).then(res=>{
+						if(res.code==200){
+							this.fwlist= res.rows.map(v => {
+								return {
+									dictLabel: v.detailedAddress,
+									dictValue: v.houseId,
+									location: v.location
+								}
+							})
+							this.datainfo.houseId=this.houseId;
+							this.datainfo.detailedAddress=this.kaType(this.houseId,this.fwlist)
+						}
+					})
+				}else{
+					houseInfolistNoPage().then(res=>{
+						if(res.code==200){
+							this.fwlist= res.rows.map(v => {
+								return {
+									dictLabel: v.detailedAddress,
+									dictValue: v.houseId,
+									location: v.location
+								}
+							})
+						}
+					})
+				}
+				
+				
 				// // 车辆类型
 				// getDictionaryFn('cartype').then(res=>{
 				// 	if(res.code==200){

property_ui/work/pages/manage/addhouse.vue

@@ -179,7 +179,7 @@
 					
 				</uni-forms>
 				<view class="rhbtn mt30" @click="getEditFn" v-if="isdisabled">修改</view>
-				<view class="rhbtn mt30" @click="getSubmit" v-else>确定添加</view>
+				<view class="rhbtn mt30" @click="getSubmit" v-else>确定修改</view>
 			</view>
 		</view>
 		<loading></loading>

property_ui/work/pages/manage/car.vue

@@ -82,7 +82,7 @@
 				this.getDataFn()
 			},
 			getAddFn(){
-				this.$tab.navigateTo("/work/pages/manage/addcar")
+				this.$tab.navigateTo("/work/pages/manage/addcar?houseId="+this.houseId)
 			},
 			getDetail(id){
 				this.$tab.navigateTo("/work/pages/manage/addcar?id="+id)

property_ui/work/pages/manage/house.vue

@@ -25,8 +25,10 @@
 			<car-list :datainfo="list" :wtdt="wtdt" type='comehouse' @getDetail="getDetail" @getPut="getPut" @getJuzhu="getJuzhu" @getCar="getCar"></car-list>
 		</view>
 		<view class="cdbtns">
-			<view class="btna" @click="getAddFn">单个添加</view>
-			<view class="btnb" @click="getReplyFn">一键导入</view>
+			<!-- <view class="btna" @click="getAddFn">单个添加</view>
+			<view class="btnb" @click="getReplyFn">一键导入</view> -->
+			<view class="btnb" @click="getAddFn">添加房屋</view>
+			<!-- <view class="btnb" @click="getReplyFn">一键导入</view> -->
 		</view>
 		<loading></loading>
 	</view>
@@ -112,7 +114,7 @@
 					id:e,
 					type:"house"
 				}
-				this.$tab.navigateTo("/people/pages/people/index?data="+encodeURIComponent(JSON.stringify(data)))
+				this.$tab.navigateTo("/people/pages/people/fwindex?data="+encodeURIComponent(JSON.stringify(data)))
 			},
 			getTabFn(val){
 				this.tabval=val;