From 03de688e713a606c24440d090ea9eff1ce50400b Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Tue, 8 Nov 2022 21:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskList.vue | 51 ++++++++++---------
 .../components/listOfRegulations.vue          |  1 +
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index c3f80231d..624e6b18d 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -349,11 +349,11 @@
           exportXls: '/project/projectTaskInventoryEO/exportXls'
         },
         loading: false,
-        visibleoperationFailed:false,
-        NotSelectedNoEngineerValue:[],
+        visibleoperationFailed: false,
+        NotSelectedNoEngineerValue: [],
         dataSource: [],
-        selectionRowsArray:[],
-        roleCodes:[],
+        selectionRowsArray: [],
+        roleCodes: [],
         long: ''
       }
     },
@@ -377,6 +377,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'
@@ -541,39 +542,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
               }
@@ -588,26 +589,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
               }
@@ -620,17 +621,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