修改三期优化点

jero-web/src/common/lang/en-us.js

@@ -1315,4 +1315,5 @@ module.exports = {
   consistentAssessment:'Consistent assessment',
   viewConsistentAssessment:'View Consistent Assessment',
   viewAll:'View All',
+  endProcess:'End Process',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1416,4 +1416,5 @@ module.exports = {
   consistentAssessment:'一致评估',
   viewConsistentAssessment:'查看一致评估',
   viewAll:'查看全部',
+  endProcess:'结束流程',
 }

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

@@ -8,6 +8,14 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('evaluationResults')}}
         </div>
+        <div class="doc-detail-right">
+          <div @click="endProcessClick"
+               v-if="(formInline.createBy == this.userInfoQuery.username || administrators) && formInline.gatherResult == 'Underway'"
+               class="operator-text-text" :title="$t('endProcess')">
+            <a-icon type="profile"/>
+            {{$t('endProcess')}}
+          </div>
+        </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content" style="padding:12px 24px">
@@ -70,6 +78,7 @@
   import viewFileModel from '@/components/viewFileModel/index'
   import { getAction, putAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import { postAction } from '../../../../api/manage'
 
   export default {
     name: 'evaluationResultsList',
@@ -85,6 +94,7 @@
         pageNo: 1,
         dataSource: [],
         formInline: {},
+        administrators:false,
         userInfoQuery: {},
         columns: [
           {
@@ -143,6 +153,14 @@
     mounted() {
       this.userInfoQuery = this.userInfo()
       this.getData()
+      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']),
@@ -232,6 +250,20 @@
       },
       seeFileClick(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
+      endProcessClick() {
+        let query = {
+          ids: this.$route.query.id
+        }
+        postAction('/lawsOpinionGather/lawsOpinionGatherEO/batchCompleteTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.pageNo = 1
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       }
     }
   }
@@ -239,6 +271,7 @@
 
 <style scoped lang="less">
   @import '~@assets/less/common.less';
+
   .doc-detail {
     background: #fff;
     height: 100%;
@@ -268,7 +301,7 @@
         }
 
         .doc-detail-right {
-          width: 800px;
+          /*width: 800px;*/
           line-height: 68px;
           display: flex;
 
@@ -329,4 +362,17 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
+  .operator-text-text {
+    cursor: pointer;
+    margin-right: 23px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-align: right;
+  }
 </style>

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

@@ -10,19 +10,26 @@
         </div>
         <div class="doc-detail-right">
           <div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
-            <a-icon type="profile" />
+            <a-icon type="profile"/>
             {{$t('initiateSupplementaryProcess')}}
           </div>
+          <div @click="endProcessClick"
+               v-if="this.$route.query.createBy == this.userInfoQuery.username
+               && this.$route.query.gatherResult == 'Underway'"
+               class="operator-text-text" :title="$t('endProcess')">
+            <a-icon type="profile"/>
+            {{$t('endProcess')}}
+          </div>
         </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content">
           <div class="content-box">
-<!--            <div class="header-text">-->
+            <!--            <div class="header-text">-->
-<!--              <a-button class="box-button-top" type="primary" @click="CurrentStandard">-->
+            <!--              <a-button class="box-button-top" type="primary" @click="CurrentStandard">-->
-<!--                {{$t('initiateSupplementaryProcess')}}-->
+            <!--                {{$t('initiateSupplementaryProcess')}}-->
-<!--              </a-button>-->
+            <!--              </a-button>-->
-<!--            </div>-->
+            <!--            </div>-->
             <div class="processBackground-text">
               <span style="font-size: 16px;font-weight: 400;color: #000F16;"> {{$t('processBackground')}}:</span>
               {{$route.query.processBackground}}
@@ -122,6 +129,7 @@
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import viewFileModel from '@/components/viewFileModel/index'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'evaluationResultsClause',
@@ -228,14 +236,30 @@
             ellipsis: true,
             width: 160
           }
-        ]
+        ],
+        userInfoQuery: {}
       }
     },
     mounted() {
       document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
+      this.userInfoQuery = this.userInfo()
       this.getList()
     },
     methods: {
+      ...mapGetters(['userInfo']),
+      endProcessClick() {
+        let query = {
+          ids: this.$route.query.id
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/batchCompleteTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
       CurrentStandard() {
         let query = {
           firstInitiation: '2',
@@ -439,6 +463,7 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
   .operator-text-text {
     cursor: pointer;
     margin-right: 23px;

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

@@ -13,6 +13,13 @@
             <a-icon type="profile"/>
             {{$t('initiateSupplementaryProcess')}}
           </div>
+          <div @click="endProcessClick"
+               v-if="this.$route.query.createBy == this.userInfoQuery.username
+               && this.$route.query.gatherResult == 'Underway'"
+               class="operator-text-text" :title="$t('endProcess')">
+            <a-icon type="profile"/>
+            {{$t('endProcess')}}
+          </div>
         </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
@@ -77,6 +84,7 @@
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import viewFileModel from '@/components/viewFileModel/index'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'evaluationResultsWhole',
@@ -88,6 +96,7 @@
       return {
         queryParam: {},
         dataSource: [],
+        administrators:false,
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
           exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
@@ -121,10 +130,33 @@
       }
     },
     mounted() {
+      this.userInfoQuery = this.userInfo()
       document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
       this.getList()
+      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']),
+      endProcessClick() {
+        let query = {
+          ids: this.$route.query.id
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/batchCompleteTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
       CurrentStandard() {
         let query = {
           firstInitiation: '2',

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -463,7 +463,8 @@
               serialNumber: row.serialNumber,
               lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
-              remark: row.remark
+              remark: row.remark,
+              createBy:row.createBy
             }
           })
           window.open(newUrl.href, '_blank')
@@ -476,7 +477,8 @@
               serialNumber: row.serialNumber,
               lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
-              remark: row.remark
+              remark: row.remark,
+              createBy:row.createBy
             }
           })
           window.open(newUrl.href, '_blank')