diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 0860825fe..094476140 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -348,11 +348,11 @@ exportXls: '/project/projectTaskInventoryEO/exportXls' }, loading: false, - visibleoperationFailed:false, - NotSelectedNoEngineerValue:[], + visibleoperationFailed: false, + NotSelectedNoEngineerValue: [], dataSource: [], - selectionRowsArray:[], - roleCodes:[], + selectionRowsArray: [], + roleCodes: [], long: '' } }, @@ -376,6 +376,7 @@ mounted() { if (this.areaOfResponsibility.dutyTerritory) { this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory + this.queryParam = { ...this.queryParam } } this.getList() this.long = localStorage.getItem('language') || 'zh-cn' @@ -540,39 +541,39 @@ this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus')) }, // 催办 - cuibanClick(){ - if(this.selectionRowsArray.length <1){ + cuibanClick() { + if (this.selectionRowsArray.length < 1) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.$refs.cModelRef.getData(this.selectionRowsArray) } }, - cibanModel(){ + cibanModel() { this.getList() }, //批量维护进度 BatchMaintenanceProgress() { - if(this.selectionRowsArray.length <1){ + if (this.selectionRowsArray.length < 1) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { let query = {} let projectLawsInventoryIds = [] let roleCodes = [] - this.selectionRowsArray.forEach((item,index) => { + this.selectionRowsArray.forEach((item, index) => { projectLawsInventoryIds.push(item.projectLawsInventoryId) roleCodes.push(item.roleCode) }) query = { roleCodes: roleCodes.join(','), - operation:'1', + operation: '1', projectLawsInventoryIds: projectLawsInventoryIds.join(',') } postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { if (res.success) { - if(res.result.length == 0){ + if (res.result.length == 0) { this.$refs.batchModelRef.getData(this.selectedRowKeys) - }else{ + } else { this.NotSelectedNoEngineerValue = res.result this.visibleoperationFailed = true } @@ -587,26 +588,26 @@ }, //批量修改状态 BatchChangeStatus() { - if(this.selectionRowsArray.length <1){ + if (this.selectionRowsArray.length < 1) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { let query = {} let projectLawsInventoryIds = [] let roleCodes = [] - this.selectionRowsArray.forEach((item,index) => { + this.selectionRowsArray.forEach((item, index) => { projectLawsInventoryIds.push(item.projectLawsInventoryId) roleCodes.push(item.roleCode) }) query = { roleCodes: roleCodes.join(','), - operation:'2', + operation: '2', projectLawsInventoryIds: projectLawsInventoryIds.join(',') } postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { if (res.success) { - if(res.result.length == 0){ + if (res.result.length == 0) { this.$refs.batchChangeModelRef.getData(this.selectionRowsArray) - }else{ + } else { this.NotSelectedNoEngineerValue = res.result this.visibleoperationFailed = true } @@ -619,17 +620,17 @@ }, // 催办 - cuibanClick(){ - if(this.selectionRowsArray.length <1){ + cuibanClick() { + if (this.selectionRowsArray.length < 1) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.$refs.cModelRef.getData(this.selectionRowsArray) } }, - cibanModel(){ + cibanModel() { this.getList() }, - cancleoperationFailed(){ + cancleoperationFailed() { this.visibleoperationFailed = false }, TaskListModelList() { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 0e0329c86..1fd293f24 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1002,6 +1002,7 @@ }) if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) { this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory + this.queryParam = {...this.queryParam} } // } else { // this.isDisplay = false