diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue
index c6a85f471..41d07fd4c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue
@@ -4,7 +4,7 @@
@@ -135,20 +135,29 @@ export default{
StuInfoFreshEntity:{},
StuInfoFreshFamilyList: [],
StuInfoFreshEmergePeopleList: []
- }
+ },
+ year:'',
+ ready:false,
}
},
onShow() {
- this.init();
+ if(this.ready){
+ this.init();
+ }
},
methods:{
init() {
let _this = this;
_this.userinfo = _this.GET_GLOBAL('loginUser'); //获取登录信息
+ this.year = todayTime.doHandleYear()
_this.LOADING('加载数据中…');
_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.userinfo.account, '加载数据时出错').then(res => {
+ this.ready = true
_this.HIDE_LOADING();
console.log(res);
+ if(res.StuInfoFreshEntity == null){
+ res.StuInfoFreshEntity = {}
+ }
_this.data = _this.COPY(res);
if (this.data["StuInfoFreshFamilyList"].length && this.data["StuInfoFreshFamilyList"].length > 0) {
_this.one = true
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
index 84b366d30..ed4ac64a3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
@@ -219,7 +219,10 @@ export default {
if(!this.photo.length)array.push("[采集照片信息]:不能为空")
// if(!this.queryData.RegionNo)array.push("[籍贯]:不能为空")
// if(!this.queryData.FamilyAddress)array.push("[家庭住址]:不能为空")
- if(!this.queryData.telephone||!/^(\+\d{2,3}\-)?\d{11}$/.test(this.queryData.telephone))array.push("[联系电话]:" + !this.queryData.telephone?"不能为空":"格式错误"))
+ if(!this.queryData.telephone||!/^(\+\d{2,3}\-)?\d{11}$/.test(this.queryData.telephone)){
+ let str = this.queryData.telephone?"格式错误":"不能为空"
+ array.push("[联系电话]:" + str)
+ }
if(!this.queryData.StuInfoFreshFamilyEntities.length||
!this.queryData.StuInfoFreshFamilyEntities.every((item)=>{
return item.Name&&(item.Relation||item.Relation===0)&&(item.Sex||item.Sex===0)&&/^[1-9]\d*$/.test(item.Age)&&(item.Politicy||item.Politicy===0)