Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

src/projects/business/views/Common/Health/TemperatureRecord.vue

@@ -142,7 +142,7 @@
 					"type": "date",
 					"beginYear": 2020,
 					"endYear": 2040,
-					"endDate": _this.listForm.endTime,
+					"endDate": new Date(),
 					"value": _this.listForm.startTime
 				});
 				picker.show(function(rs) {
@@ -162,6 +162,7 @@
 					"beginYear": 2020,
 					"endYear": 2040,
 					"beginDate": new Date(_this.listForm.startTime),
+					"endDate": new Date(),
 					"value": _this.listForm.endTime
 				});
 				picker.show(function(rs) {

src/projects/business/views/Master/Attendance/VerifyLeaveList.vue

@@ -283,7 +283,7 @@
 		watch: {
 			//本页面监听到路由（参数）改变
 			'$route': function(to, from) {
-				this.reloadList(to.query.status)
+                this.reloadList(to.query.status?to.query.status:0)
 			}
 		},
 

src/projects/business/views/Master/Attendance/VerifyList.vue

@@ -261,7 +261,7 @@
 		watch: {
 			//本页面监听到路由（参数）改变
 			'$route': function(to, from) {
-				this.reloadList(to.query.status)
+				this.reloadList(to.query.status?to.query.status:0)
 			}
 		},
 	}

src/projects/business/views/Master/Company/RegisterExamine.vue

@@ -281,7 +281,7 @@
 		watch: {
 			//本页面监听到路由（参数）改变
 			'$route': function(to, from) {
-				this.reloadList(to.query.status)
+                this.reloadList(to.query.status?to.query.status:0)
 			}
 		},
 	}

src/projects/business/views/Master/Family/Add.vue

@@ -46,6 +46,10 @@
 		</div>
 
 		<loading :visible="isLoading"></loading>
+		
+		<!--图片裁剪-->
+		<cropper :cwidth="cropperWidth" :cheight="cropperHeight" :visible="cropperVisible" :field="cropperField" :cropper="cropper"
+		 @cropperFinish="cropperFinish" @cropperCancel="cropperCancel"></cropper>
 	</div>
 </template>
 
@@ -55,7 +59,6 @@
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
 	import TopHeader from '$project/components/TopHeader.vue'
-	import NullList from '$project/components/NullList.vue'
 	import {
 		checkPhone,
 		checkIdCard
@@ -72,7 +75,7 @@
 			Common,
 			Loading,
 			TopHeader,
-			NullList
+			Cropper
 		},
 		data() {
 			return {
@@ -255,9 +258,13 @@
 			},
 		},
 		mounted() {
+			//获取微信配置
+			WxJsApi.getWxConfig();
 			if (this.subForm.id) {
 				//获取详情
 				this.getDetail();
+			} else {
+				this.rightLink.show = false;
 			}
 		},
 		destroyed() {

src/projects/business/views/Master/Tenant/Add.vue

@@ -46,6 +46,10 @@
 		</div>
 
 		<loading :visible="isLoading"></loading>
+
+		<!--图片裁剪-->
+		<cropper :cwidth="cropperWidth" :cheight="cropperHeight" :visible="cropperVisible" :field="cropperField" :cropper="cropper"
+		 @cropperFinish="cropperFinish" @cropperCancel="cropperCancel"></cropper>
 	</div>
 </template>
 
@@ -55,7 +59,6 @@
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
 	import TopHeader from '$project/components/TopHeader.vue'
-	import NullList from '$project/components/NullList.vue'
 	import {
 		checkPhone,
 		checkIdCard
@@ -72,7 +75,7 @@
 			Common,
 			Loading,
 			TopHeader,
-			NullList
+			Cropper
 		},
 		data() {
 			return {
@@ -255,9 +258,13 @@
 			},
 		},
 		mounted() {
+			//获取微信配置
+			WxJsApi.getWxConfig();
 			if (this.subForm.id) {
 				//获取详情
 				this.getDetail();
+			} else {
+				this.rightLink.show = false;
 			}
 		},
 		destroyed() {