diff --git a/pages/projectEnd/safeSame/list.vue b/pages/projectEnd/safeSame/list.vue index ffdc52fc..30d3a7ab 100644 --- a/pages/projectEnd/safeSame/list.vue +++ b/pages/projectEnd/safeSame/list.vue @@ -299,6 +299,10 @@ name: '已撤回', type: 3, value: 6 + }, { + name: '超期未关闭', + type: 3, + value: 7 }], //状态 urgencyList: [{ name: '全部', @@ -378,7 +382,10 @@ if (option.sourceIdList) { this.sourceIdList = JSON.parse(option.sourceIdList); } - this.checkedTabType = option.checkedTabType; + if(option.checkedTabType) { + this.checkedTabType = Number(option.checkedTabType); + } + this.roleFlag = this.userInfo.accountType==5 || this.userInfo.accountType==10; this.getCheckPointList(); @@ -423,8 +430,10 @@ data, success: res => { // this.countMyTodoInfo = res.result; - if(res.result.length == 0) return; - this.roleName = res.result[0].roleName; + if(res.result.length > 0) { + this.roleName = res.result[0].roleName; + }; + let countNum = 0; if(this.roleFlag || this.roleName.includes('项目管理员') || this.roleName.includes('安全管理员')) { countNum = this.checkedTabType ? this.checkedTabType : 0; @@ -954,38 +963,41 @@ this.listData = []; this.checkPointName = '' this.regionId = [] + this.condition.reviewId = ''; + this.condition.changeId = ''; + this.condition.verifyManId = '' + this.condition.regionId = '' this.getListData() }, //获取列表数据 getListData() { if (this.checkedTab == 2 || this.checkedTab == 5) { this.condition.changeId = this.userInfo.userId - this.condition.reviewId = '' - this.condition.verifyManId = '' - this.condition.regionId = [] + // this.condition.reviewId = '' + // this.condition.verifyManId = '' + // this.condition.regionId = [] } else if (this.checkedTab == 3) { this.condition.reviewId = this.userInfo.userId - this.condition.changeId = ''; - this.condition.verifyManId = '' - this.condition.regionId = [] + // this.condition.changeId = ''; + // this.condition.verifyManId = '' + // this.condition.regionId = [] } else if (this.checkedTab == 4) { this.condition.verifyManId = this.userInfo.userId - this.condition.changeId = ''; - this.condition.reviewId = '' - this.condition.regionId = [] + // this.condition.changeId = ''; + // this.condition.reviewId = '' + // this.condition.regionId = [] } else if (this.checkedTab == 6) { - this.condition.status = '' - this.condition.verifyManId = '' - this.condition.changeId = ''; - this.condition.reviewId = '' + // this.condition.status = '' + // this.condition.verifyManId = '' + // this.condition.changeId = ''; + // this.condition.reviewId = '' this.condition.regionId = this.regionId } else { - this.condition.status = '' - this.condition.reviewId = ''; - this.condition.changeId = ''; - this.condition.verifyManId = '' - this.condition.regionId = '' - + // this.condition.status = '' + // this.condition.reviewId = ''; + // this.condition.changeId = ''; + // this.condition.verifyManId = '' + // this.condition.regionId = '' } console.log('查询列表条件数据', this.checkedTab) let that = this;