合并分支 'fix_bug_first_stage' 到 'master'

修改禅道已知bug

查看合并请求 laws-nio/laws-weilai!38

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -90,7 +90,8 @@
         <div class="Virtual-detail-right"
              :style="{'width':isDisplay?'calc(100% - 240px)':'calc(100% - 66px)'}">
           <ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === $t('projectDetails')"/>
-          <listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"/>
+          <listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"
+          :areaOfResponsibilityList="areaOfResponsibilityList"/>
           <TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility"
                     v-else-if="textTitle === $t('taskList')"/>
           <TaskParameterCollection v-else-if="textTitle === $t('TaskParameterCollection')"/>
@@ -137,7 +138,7 @@
         isTrue: true,
         loading: false,
         isDisplay: true,
-
+        areaOfResponsibilityList:{},
         url: {
           logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: '',
@@ -216,6 +217,8 @@
         }
       },
       textClick(num, name) {
+        this.areaOfResponsibilityList = {}
+        this.areaOfResponsibility = {}
         this.textTitle = name
         let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
         if (textColor && textColor.length > 0) {
@@ -286,15 +289,20 @@
         })
       },
       TaskListChange(item) {
-        this.areaOfResponsibility = item
+        if (item.isListing && item.isListing == '1'){
-        this.textTitle = this.$t('taskList')
+          this.areaOfResponsibilityList = item
+          this.textTitle = this.$t('listOfRegulations')
+        }else{
+          this.areaOfResponsibility = item
+          this.textTitle = this.$t('taskList')
+        }
         let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
         if (textColor && textColor.length > 0) {
           textColor[0].classList.remove('Virtual-detail-left-text-color')
         }
         let text = document.getElementsByClassName('Virtual-detail-left-text')
         for (let i = 0; i < text.length; i++) {
-          if (text[i].title == this.$t('taskList')) {
+          if (text[i].title == this.textTitle) {
             text[i].classList.add('Virtual-detail-left-text-color')
           }
         }

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -387,6 +387,7 @@
 
   export default {
     name: 'listOfRegulations',
+    props:['areaOfResponsibilityList'],
     components: {
       ImportFile,
       listAddModel,
@@ -911,6 +912,9 @@
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
+      if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) {
+        this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory
+      }
       // } else {
       //   this.isDisplay = false
       // }

jero-web/src/views/projectManagement/components/responsibilityList.vue

@@ -98,6 +98,9 @@
         this.visible = false
       },
       areaOfResponsibilityClick(item) {
+        if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){
+            item.isListing = '1'
+        }
         this.$emit('responsibility', item)
       }
     }