测试修改

property_ui/api/login.js

@@ -53,10 +53,11 @@ export function gettenantList() {
   })
 }
 // 获取用户租户列表
-export function gettenantUserName() {
+export function gettenantUserName(data) {
   return request({
     'url': '/system/tenant/userName/list',
-    'method': 'get'
+    'method': 'get',
+	'data':data
   })
 }
 // 切换租户

property_ui/manage/pages/community/newssqdetail.vue

@@ -141,16 +141,31 @@
 			 },
 			 // 分享
 			 getshareFn(){
-				 var params={
-					 communityId:this.id,
-					 tenantId:this.tenantId
-				 }
-				 setShare(params).then(res=>{
-					 if(res.code==200){
-						 this.$toast("分享成功")
-						 this.datainfo.userShare++
-					 }
-				 })
+				 var that=this;
+				 uni.share({
+				 	provider: "weixin",
+				 	scene: "WXSceneSession",
+				 	type: 0,
+				 	href: this.shareurl+'/news/pages/news/detail?id='+this.id,
+				 	title: this.datainfo.communityTitle,
+				 	summary: "邀请信息",
+				 	imageUrl: "https://zxyzhsq.qs163.cn/prod-api/profile/upload/2025/06/11/applogo_20250611033931A020.png",
+				 	success: function (res) {
+				 		var params={
+				 			communityId:that.id,
+				 			tenantId:that.tenantId
+				 		}
+				 		setShare(params).then(res=>{
+				 			if(res.code==200){
+				 				// that.$toast("分享成功")
+				 				that.datainfo.userShare++
+				 			}
+				 		})
+				 	},
+				 	fail: function (err) {
+				 		console.log("fail:" + JSON.stringify(err));
+				 	}
+				 });
 			 },
 			 btns(){
 				 

property_ui/manifest.json

@@ -20,7 +20,9 @@
         "modules" : {
             "Maps" : {},
             "Camera" : {},
-            "Speech" : {}
+            "Speech" : {},
+            "VideoPlayer" : {},
+            "Share" : {}
         },
         "distribute" : {
             "android" : {
@@ -51,7 +53,12 @@
                 "dSYMs" : false
             },
             "sdkConfigs" : {
-                "share" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx47d585d225f26459",
+                        "UniversalLinks" : ""
+                    }
+                },
                 "ad" : {},
                 "maps" : {
                     "amap" : {

property_ui/people/pages/people/staffadd.vue

@@ -106,15 +106,17 @@
 				</view>
 			</view>
 		</uni-forms>
-		<!-- &&checkPermi(['wuYe:staffManage:add']) -->
-		<view class="pdlr12 mt55" v-if="rzflag">
-			<!-- <view class="rhbtn" @click="getEditFn" v-if="isdisabled">修改</view> -->
-			<view class="rhbtn" @click="getSubmit">确定</view>
-		</view>
-		<view class="pdlr12 mt55" v-if="!rzflag&&checkPermi(['wuYe:staffManage:authentication'])">
-			<!-- <view class="rhbtn"  @click="getEditFn" v-if="isdisabled">修改</view> -->
-			<view class="rhbtn"  @click="getSubmit" >确定</view>
-		</view>
+		<block v-if="datainfo.examine!=2">
+			<!-- &&checkPermi(['wuYe:staffManage:add']) -->
+			<view class="pdlr12 mt55" v-if="rzflag">
+				<!-- <view class="rhbtn" @click="getEditFn" v-if="isdisabled">修改</view> -->
+				<view class="rhbtn" @click="getSubmit">确定</view>
+			</view>
+			<view class="pdlr12 mt55" v-if="!rzflag&&checkPermi(['wuYe:staffManage:authentication'])">
+				<!-- <view class="rhbtn"  @click="getEditFn" v-if="isdisabled">修改</view> -->
+				<view class="rhbtn"  @click="getSubmit" >确定</view>
+			</view>
+		</block>
 		<loading></loading>
 	</view>
 </template>
@@ -127,7 +129,7 @@
 	import {getDictionaryFn} from "@/api/system/user.js"
 	import {selectValueKey,uploadIdentify} from "@/utils/common.js"
 	import wSelect from "@/people/components/w-select/w-select.vue"
-	import {gettenantList} from "@/api/login.js"
+	import {gettenantList,gettenantUserName} from "@/api/login.js"
 	import {getOcrIdCard} from "@/api/system/card.js"
 	export default {
 		components: {wSelect},
@@ -203,8 +205,9 @@
 			this.gettenantList();
 			if(e.id){
 				this.id=e.id;
-				if(this.rztype=='rz'){
-					this.ptype='edit';
+				this.ptype='edit';
+				if(this.rztype=='rzadd'){
+					this.ptype='add';
 				}
 				// this.isdisabled=true;
 				this.getDetailFn()
@@ -229,21 +232,41 @@
 			},
 			// 获取租户列表
 			gettenantList(){
-				gettenantList().then(res=>{
-					if(res.code==200){
-						if(res.data.voList&&res.data.voList.length){
-							this.voList = res.data.voList.map(v => {
-								return {
-									dictLabel: v.companyName,
-									dictValue: v.tenantId
-								}
-							})
+				if(this.rzflag){
+					gettenantList().then(res=>{
+						if(res.code==200){
+							if(res.data.voList&&res.data.voList.length){
+								this.voList = res.data.voList.map(v => {
+									return {
+										dictLabel: v.companyName,
+										dictValue: v.tenantId
+									}
+								})
+							}
+						}else{
+							this.$toast(res.msg)
 						}
-						
-					}else{
-						this.$toast(res.msg)
+					})
+				}else{
+					var params={
+						userName:this.$store.state.user.name
 					}
-				})
+					gettenantUserName(params).then(res=>{
+						if(res.code==200){
+							if(res.data&&res.data.length){
+								this.voList = res.data.map(v => {
+									return {
+										dictLabel: v.companyName,
+										dictValue: v.tenantId
+									}
+								})
+							}
+						}else{
+							this.$toast(res.msg)
+						}
+					})
+				}
+				
 			},
 			init(){
 				// 员工类别

property_ui/service/components/car/list.vue

@@ -65,7 +65,7 @@
 						<view class="btns">
 							<view class="btn btna" v-if="checkPermi(['wuYe:repair:remove'])&&ite.repairStatus<2" @click.stop="getDelFn(ite.repairId)">删除</view>
 							<view class="btn btnb" v-if="checkPermi(['wuYe:repair:assign'])&&ite.repairStatus==1" @click.stop="getAssignFn(ite)">指派</view>
-							<block v-if="checkPermi(['wuYe:repair:edit'])">
+							<block v-if="checkPermi(['wuYe:repair:edit'])&&userId==ite.staffUserId">
 								<view class="btn btnc" v-if="ite.repairStatus==2" @click.stop="getCheckFn(ite)">我已上门</view>
 								<view class="btn btnc" v-if="ite.repairStatus==3" @click.stop="getCheckFn(ite)">我已完成</view>
 							</block>
@@ -313,6 +313,7 @@
 				cira:require('@/service/static/service/cira.png'),
 				cirb:require('@/service/static/service/cirb.png'),
 				filico:require('@/work/static/filico.png'),
+				userId:this.$store.state.user.userId,
 				autoplay:false,
 				incolorh:'#C0C3C3',
 				activecolorh:'#FFFFFF',

property_ui/utils/request.js

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

property_ui/work/pages/manage/houseadd.vue

@@ -72,9 +72,9 @@
 							</view>
 						</picker>
 					</uni-forms-item>
-					<uni-forms-item label="车位号" name="phonenumber">
+					<uni-forms-item label="车位号" name="parkingNumber">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.phonenumber" :inputBorder='false' placeholder="请输入车位号" />
+							<uni-easyinput :disabled="isdisabled" v-model="datainfo.parkingNumber" :inputBorder='false' placeholder="请输入车位号" />
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
@@ -118,6 +118,7 @@
 					 // "coOwner":"",//共有人姓名，多个共有人可以用逗号分隔
 					 "detailedAddress":null,//房屋的门牌号
 					 "hasParkingSpace":null,//是否有车位，Y表示有，N表示无
+					 "parkingNumber":null,//车位号
 					 "communityName":this.$store.state.user.companyName,//房屋所在小区名称
 					 // "houseStatus":""//房屋状态：1-自住，2-出租，3-空闲，4-待售
 				},

property_ui/work/pages/manage/housedetail.vue

@@ -69,7 +69,7 @@
 											<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>
+												<uni-icons v-if="datainfo.residentRelationship&&!isdisabled" 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>
@@ -111,7 +111,7 @@
 														<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>
+															<uni-icons v-if="datainfo.residentAppearance&&!isdisabled" 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>
@@ -123,7 +123,7 @@
 														<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>
+															<uni-icons v-if="datainfo.specialType&&!isdisabled" 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>
@@ -184,7 +184,7 @@
 													<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>
+														<uni-icons v-if="houserinfo.rightType&&!isdisabled" 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>
@@ -227,7 +227,7 @@
 												<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>
+													<uni-icons v-if="houserinfo.houseType&&!isdisabled" 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>
@@ -271,7 +271,7 @@
 													<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>
+														<uni-icons v-if="houserinfo.houseStatus&&!isdisabled" 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>
@@ -283,7 +283,7 @@
 													<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>
+														<uni-icons v-if="houserinfo.usageType&&!isdisabled" 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>
@@ -295,7 +295,7 @@
 													<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>
+														<uni-icons v-if="houserinfo.hasParkingSpace&&!isdisabled" 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>
@@ -571,6 +571,9 @@
 				return aite.actions;
 			},
 			onClear(type){
+				if(this.isdisabled){
+					return
+				}
 				 if(type=='hzgx'){
 					this.datainfo.residentRelationship='';
 					this.hzgx='';