Ver Fonte

测试修改

zouling há 3 meses atrás
pai
commit
8dcfab053c

+ 1 - 0
property_ui/config.js

@@ -5,6 +5,7 @@ module.exports = {
   baseUrl: 'http://192.168.101.245:8065',
   // baseUrl: 'http://192.168.101.168:8065',
   // baseUrlimg: 'http://114.99.127.243:2001',
+  baseName:'智慧社区物管端',
   // 应用信息
   appInfo: {
     // 应用名称

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

@@ -237,7 +237,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype="edit";
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetail()
 			}
 			if(e.houseId){
@@ -409,7 +409,10 @@
 			getDetail(){
 				residentInfoDet(this.id).then(res=>{
 					if(res.code==200){
-						this.datainfo=res.data
+						this.datainfo=res.data;
+						if(res.data.facePhoto){
+							this.phofile=res.data.facePhoto.split(',')
+						}
 					}
 				})
 			},
@@ -417,10 +420,10 @@
 				var that=this;
 				this.$refs.form.validate().then(res => {
 					var params=JSON.parse(JSON.stringify(this.datainfo))
-					// var phofile=JSON.parse(JSON.stringify(this.phofile))
-					// if(phofile&&phofile.length){
-					// 	params.equipmentPhotos=this.phofile.join(',');
-					// }
+					var phofile=JSON.parse(JSON.stringify(this.phofile))
+					if(phofile&&phofile.length){
+						params.facePhoto=this.phofile.join(',');
+					}
 					// if(!params.assetId){
 					// 	this.$toast('请选择资产类型')
 					// 	return

+ 1 - 1
property_ui/manage/pages/community/newsadd.vue

@@ -153,7 +153,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

+ 1 - 1
property_ui/manage/pages/community/newsadddj.vue

@@ -169,7 +169,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 			if(e.tabval&&e.tabval!='yty'){

+ 1 - 1
property_ui/manage/pages/community/newsaddsq.vue

@@ -170,7 +170,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 			if(e.tabval&&e.tabval!='yty'){

+ 1 - 1
property_ui/manage/pages/community/newsaddvideo.vue

@@ -129,7 +129,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

+ 3 - 0
property_ui/manage/pages/community/newsdj.vue

@@ -45,6 +45,9 @@
 				wzlxList:[],
 				baseUrl:config.baseUrl,
 				count:0,
+				userId:this.$store.state.user.userId,
+				nickName:this.$store.state.user.nickName,
+				avatar:this.$store.state.user.avatar,
 			}
 		},
 		onUnload() {

+ 1 - 1
property_ui/manage/pages/community/sqmoneyadd.vue

@@ -176,7 +176,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

+ 1 - 1
property_ui/pages/mine/info.vue

@@ -63,7 +63,7 @@
 				aphoto:require("@/static/images/mine/head.png"),
 				baseUrl: config.baseUrl,
 				checkflag:true,
-				isdisabled:true,
+				isdisabled:false,
 				roleGroup: "",
 				postGroup: "",
 				datainfo: {},

+ 1 - 1
property_ui/people/pages/people/comeadd.vue

@@ -165,7 +165,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype="edit";
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetail()
 			}
 			this.init()

+ 1 - 1
property_ui/people/pages/people/staffadd.vue

@@ -123,7 +123,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

+ 3 - 2
property_ui/service/components/popup/popup.vue

@@ -63,7 +63,7 @@
 					</lsj-upload>
 				</view>
 				<view class="fjlists"  v-for="(fite,fidx) in filelist" :key='fidx'>
-					<view class="flext" @click="getDown(fite.url)">
+					<view class="flext" @click="getDownloader(fite.url)">
 						<view class="imgl"><image :src="filico" ></image></view>
 						<view class="tit">{{fite.name}}</view>
 					</view>
@@ -81,8 +81,10 @@
 </template>
 
 <script>
+	import self from '@/utils/location.js';
 	import config from '@/config'
 	const baseUrl = config.baseUrl
+	const baseName = config.baseName
 	import { getToken } from '@/utils/auth'
 	import {uploadmore} from '@/utils/common.js'
 	import {selectDictValue} from "@/utils/common.js"
@@ -217,7 +219,6 @@
 		},
 		methods:{
 			kaType(data, list) {
-				console.log(data,list)
 				return selectDictValue(list, data);
 			},
 			getVoiceFn(){

+ 4 - 1
property_ui/service/pages/service/complaintdetail.vue

@@ -25,7 +25,7 @@
 				<view class="tit">{{datainfo.replyContent}}</view>
 				<block v-if="datainfo.suggestionFjList">
 				<view class="fjlists"  v-for="(fite,fidx) in datainfo.suggestionFjList" :key='fidx'>
-					<view class="flext" @click="getDown(fite.url)">
+					<view class="flext" @click="getDownloader(fite.url,fite.name)">
 						<view class="imgl"><image :src="filico" ></image></view>
 						<view class="tit">{{fite.name}}</view>
 					</view>
@@ -50,6 +50,8 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
+	const baseName = config.baseName
+	import self from '@/utils/location.js';
 	import popUp from "@/service/components/popup/popup.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {suggestionlDet,suggestionlPut} from "@/api/work/service.js"
@@ -165,6 +167,7 @@
 							title: '加载中'
 						});
 						var url = baseUrl + path;
+						console.log(url)
 						let dtask = plus.downloader.createDownload(url, {
 							filename: 'file://storage/emulated/0/'+baseName+'/' + name
 						}, (d, status) => {

+ 2 - 1
property_ui/service/pages/service/warrantydetail.vue

@@ -119,6 +119,7 @@
 				completionPhoto:[],//结束拍照
 				repairStatus:'',//
 				bxlbList:[],
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onLoad: function(e) {
@@ -132,7 +133,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

+ 53 - 1
property_ui/utils/location.js

@@ -65,7 +65,58 @@ function get_cookie(key) {
 		return '';
 	}
 };
-
+// 文件写入
+function getFilePermissions(callback) {
+	callback = typeof(callback) == 'function' ? callback : function(res) {};
+		var num=1;
+		// #ifdef MP-WEIXIN
+		
+		// #endif
+		// #ifdef APP-PLUS
+		plus.android.requestPermissions(
+			['android.permission.WRITE_EXTERNAL_STORAGE',
+			'android.permission.READ_EXTERNAL_STORAGE',], // 理论上支持多个权限同时查询,但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
+			function(resultObj) {
+				var result = 0;
+				for (var i = 0; i < resultObj.granted.length; i++) {
+					var grantedPermission = resultObj.granted[i];
+					console.log('已获取的权限:' + grantedPermission);
+					result = 1
+				}
+				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+					var deniedPresentPermission = resultObj.deniedPresent[i];
+					console.log('拒绝本次申请的权限:' + deniedPresentPermission);
+					result = 0
+				}
+				for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+					var deniedAlwaysPermission = resultObj.deniedAlways[i];
+					console.log('永久拒绝申请的权限:' + deniedAlwaysPermission);
+					result = -1
+				}
+				// resolve(result);
+				// 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
+				if (result != 1) {
+					showConfirm('您还未开启文件权限,是否去开启文件?').then(res => {
+					  if (res.confirm) {
+					    gotoAppPermissionSetting()
+						callback(result)
+					  }
+					})
+				}else{
+					callback(result)
+				}
+			},
+			function(error) {
+				console.log('申请权限错误:' + error.code + " = " + error.message);
+				// resolve({
+				// 	code: error.code,
+				// 	message: error.message
+				// });
+			}
+		);
+			
+		// #endif
+};
 function getLocation(callback) {
 	
 	callback = typeof(callback) == 'function' ? callback : function(res) {};
@@ -290,6 +341,7 @@ function getLocationaddr(callback){
 const self = {
 	getLocation,
 	setUxLocation,
+	getFilePermissions,
 	__CFG
 }
 export default self

+ 1 - 1
property_ui/work/pages/blackManage/add.vue

@@ -75,7 +75,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

+ 1 - 1
property_ui/work/pages/fee/set.vue

@@ -62,7 +62,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype='edit';
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetailFn()
 			}
 		},

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

@@ -197,7 +197,7 @@
 			if(e.id){
 				this.id=e.id;
 				this.ptype="edit";
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetail()
 			}
 			if(e.houseId){

+ 19 - 2
property_ui/work/pages/manage/addhouse.vue

@@ -79,7 +79,7 @@
 						</picker> -->
 						<!-- :hide-second='true' -->
 						<view class="flexc">
-							<uni-datetime-picker  :disabled="isdisabled" :class="datainfo.registrationDate?'co27':'coa'" type="datetime" placeholder="请选择登记日期" :border="false"  v-model="datainfo.registrationDate" @change="changeLog" />
+							<uni-datetime-picker   :disabled="isdisabled" :class="datainfo.registrationDate?'co27':'coa'" type="datetime" placeholder="请选择登记日期" :border="false"  v-model="datainfo.registrationDate" @change="changeLog" />
 							<view class="rimg"><image :src="rimg"></image></view>
 						</view>
 					</uni-forms-item>
@@ -241,15 +241,17 @@
 				isdisabled:false,
 				latitude:'',
 				longitude:"",
+				starttime:''
 			}
 		},
 		onLoad: function(e) {
 			if(e.id){
 				this.id=e.id;
 				this.ptype="edit";
-				this.isdisabled=true;
+				// this.isdisabled=true;
 				this.getDetail()
 			}
+			this.time()
 			this.init()
 		},
 		onPageScroll(e) {
@@ -265,6 +267,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
+			},
 			statusFormats(data, list,type) {
 				var aite=selectValueKey(list, data);
 				if(type=='qllx'){