Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -8,7 +8,7 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('evaluationResults')}}
         </div>
-        <div class="doc-detail-right" v-if='!this.flag'>
+        <div class="doc-detail-right" v-if='flag'>
           <div @click="endProcessClick"
                v-if="(formInline.createBy == this.userInfoQuery.username || administrators) && formInline.gatherResult == 'Underway'"
                class="operator-text-text" :title="$t('endProcess')">
@@ -92,7 +92,7 @@
         total: 0,
         pageSize: 10,
         pageNo: 1,
-        flag:'',
+        flag:false,
         dataSource: [],
         formInline: {},
         administrators:false,
@@ -163,10 +163,7 @@
         })
       }
       getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => {
-        if (res.success) {
           this.flag = res
-        } else {
-        }
       })
     },
     methods: {

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -8,7 +8,7 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
-        <div class="doc-detail-right" v-if='!this.flag'>
+        <div class="doc-detail-right" v-if='flag'>
           <div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
             <a-icon type="profile"/>
             {{$t('initiateSupplementaryProcess')}}
@@ -96,7 +96,7 @@
       return {
         queryParam: {},
         dataSource: [],
-        flag:'',
+        flag:false,
         userInfoQuery: {},
         administrators: false,
         url: {
@@ -182,10 +182,7 @@
         })
       }
       getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsTechnologyEvaluation',id : this.$route.query.id}).then((res) => {
-        if (res.success) {
           this.flag = res
-        } else {
-        }
       })
     },
     methods: {

jero-web/src/views/regulationsKanban/index.vue

@@ -298,10 +298,11 @@ export default {
     },
     //虚拟清单名称事件
     entryNameClick(item) {
-      this.$router.push({
-        path: '/ParameterTemplateList',
+      let newUrl = this.$router.resolve({
+        path: '/docManage/library/detail',
         query: item
       })
+      window.open(newUrl.href, '_blank')
     },
     searchQuery() {
       this.pageNo = 1

jero-web/src/views/system/UserAnnouncementList.vue

@@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
             ellipsis: true,
             scopedSlots: { customRender: 'msgTitile' }
           },
-          {
-            title: this.$t('Sponsor'),
-            align: 'left',
-            ellipsis: true,
-            dataIndex: 'initiator',
-            width: 200
-          },
+          // {
+          //   title: this.$t('Sponsor'),
+          //   align: 'left',
+          //   ellipsis: true,
+          //   dataIndex: 'initiator',
+          //   width: 200
+          // },
           {
             title: this.$t('MessageType'),
             align: 'left',