From d8666bdd2d3a77a3e5e7f9759fdc96b71f7fd19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Thu, 8 Sep 2022 17:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionOfRegulatoryOpinions/index.vue  | 24 +++++++++++---
 .../technologyAssessment/index.vue            | 33 ++++++++++++++-----
 .../projectManagement/components/TaskList.vue |  2 +-
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index a77fa7d9b..392eefebb 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -105,7 +105,7 @@
            <a class="text-operation" v-if="record.gatherResult == 'Completed'"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
           <a class="text-operation"
-             v-if="record.gatherResult == 'Completed'"
+             v-if="(record.gatherResult == 'Completed' && userInfoQuery.username == record.createBy) || administrators"
              v-has="'regulatoryComments:delete'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
@@ -130,6 +130,7 @@
 <script>
   import evaluationResultsList from './components/evaluationResultsList'
   import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'index',
@@ -144,6 +145,7 @@
           getSysCategoryTree: '/sys/category/getSysCategoryTree',
           deleteBatch: '/lawsOpinionGather/lawsOpinionGatherEO/deleteBatch'
         },
+        userInfoQuery: {},
         loading: false,
         toggleSearchStatus: false,
         dataSource: [],
@@ -216,14 +218,25 @@
             width: 320,
             scopedSlots: { customRender: 'operation' }
           }
-        ]
+        ],
+        administrators: false
       }
     },
     mounted() {
       this.getList()
       this.getSysCategoryTree()
+      this.administrators = false
+      this.userInfoQuery = this.userInfo()
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
+      ...mapGetters(['userInfo']),
       getSysCategoryTree() {
         getAction(this.url.getSysCategoryTree, {}).then((res) => {
           if (res.success) {
@@ -234,7 +247,7 @@
         })
       },
       BatchDelete() {
-        if (this.selectedRowKeys.length > 0) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let _this = this
           this.$confirm({
             content: _this.$t('ConfirmBatchDeletion'),
@@ -242,7 +255,8 @@
               let idList = []
               let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord))
               for (let i = 0; i < selectedRowKeysRecord.length; i++) {
-                if (selectedRowKeysRecord[i].gatherResult == 'Completed') {
+                if ((selectedRowKeysRecord[i].gatherResult == 'Completed' &&
+                  selectedRowKeysRecord[i].createBy == this.userInfo().username) || this.administrators) {
                   idList.push(selectedRowKeysRecord[i].id)
                 }
               }
@@ -257,7 +271,7 @@
                   }
                 })
               } else {
-                _this.$message.warning(_this.$t('onlyCompletedDataCanBeDeleted'))
+                _this.$message.warning(_this.$t('doNotHavePermissionDeleteData'))
               }
             }
           })
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 541b1a430..4654ae3c6 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -106,7 +106,7 @@
            <a class="text-operation" v-if="record.flowStatus == 'Completed'"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
           <a class="text-operation"
-             v-if="record.flowStatus == 'Completed'"
+             v-if="(record.flowStatus == 'Completed' && userInfoQuery.username == record.createBy) || administrators"
              v-has="'regulatoryAndTechnicalAssessment:delete'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
@@ -166,8 +166,9 @@
 </template>
 
 <script>
-  import { getAction, postAction ,deleteAction} from '@/api/manage'
+  import { getAction, postAction, deleteAction } from '@/api/manage'
   import processInformation from './components/processInformation'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'index',
@@ -180,14 +181,14 @@
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
           getSysCategoryTree: '/sys/category/getSysCategoryTree',
-          deleteBatch:'/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch',
+          deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch'
         },
         visible: false,
         loading: false,
         toggleSearchStatus: false,
         dataSource: [],
         selectedRowKeys: [],
-        selectedRowKeysRecord:[],
+        selectedRowKeysRecord: [],
         serialNumber: '',
         total: 0,
         pageSize: 10,
@@ -288,14 +289,26 @@
             width: 320,
             scopedSlots: { customRender: 'operation' }
           }
-        ]
+        ],
+        userInfoQuery: {},
+        administrators: false
       }
     },
     mounted() {
       this.getList()
       this.getSysCategoryTree()
+      this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
+      ...mapGetters(['userInfo']),
       getSysCategoryTree() {
         getAction(this.url.getSysCategoryTree, {}).then((res) => {
           if (res.success) {
@@ -330,7 +343,8 @@
               let idList = []
               let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord))
               for (let i = 0; i < selectedRowKeysRecord.length; i++) {
-                if (selectedRowKeysRecord[i].flowStatus == 'Completed') {
+                if ((selectedRowKeysRecord[i].flowStatus == 'Completed' && selectedRowKeysRecord[i].createBy == this.userInfo().username)
+                  || this.administrators) {
                   idList.push(selectedRowKeysRecord[i].id)
                 }
               }
@@ -406,7 +420,7 @@
           }
         })
       },
-      onSelectChange(value,record) {
+      onSelectChange(value, record) {
         this.selectedRowKeys = value
         this.selectedRowKeysRecord = record
       },
@@ -530,12 +544,13 @@
     color: red;
     margin-right: 4px;
   }
+
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.9;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 1ab2063a7..5e0142614 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -106,7 +106,7 @@
         class="taskTable"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: true,y:'calc(100vh - 335px)'}"
         :data-source="dataSource"
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"