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

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

@@ -708,7 +708,7 @@ module.exports = {
   versionName: 'Version Name',
   finalizationTime: 'Finalization Time',
   setting: 'Setting',
-  incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed can be submitted',
+  incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed or rejected can be submitted',
   date: 'Date',
   time: 'Time',
   uploadMaximumATime: 'Upload a Maximum of 20 Images at a time',

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

@@ -703,7 +703,7 @@ module.exports = {
   confirmOverrule: '确认驳回？',
   The: '第',
   submitted: '条数据已提交不能重复提交',
-  incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据',
+  incorrectsubmitted: '条数据状态有误；只能提交状态为待确认或拒绝的数据',
   basicInformationOfParameters: '项目基本信息',
   regulatoryCertificationTaskPlan: '法规/认证任务计划',
   bringInRelevantPersonnel: '带入相关人员',

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

@@ -256,7 +256,7 @@
               let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord))
               for (let i = 0; i < selectedRowKeysRecord.length; i++) {
                 if ((selectedRowKeysRecord[i].gatherResult == 'Completed' &&
-                  selectedRowKeysRecord[i].createBy == this.userInfo().username) || this.administrators) {
+                  selectedRowKeysRecord[i].createBy == _this.userInfo().username) || _this.administrators) {
                   idList.push(selectedRowKeysRecord[i].id)
                 }
               }

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

@@ -343,8 +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' && selectedRowKeysRecord[i].createBy == this.userInfo().username)
-                  || this.administrators) {
+                if ((selectedRowKeysRecord[i].flowStatus == 'Completed' && selectedRowKeysRecord[i].createBy == _this.userInfo().username)
+                  || _this.administrators) {
                   idList.push(selectedRowKeysRecord[i].id)
                 }
               }
@@ -359,7 +359,7 @@
                   }
                 })
               } else {
-                _this.$message.warning(_this.$t('onlyCompletedDataCanBeDeleted'))
+                _this.$message.warning(_this.$t('doNotHavePermissionDeleteData'))
               }
             }
           })

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

@@ -1880,7 +1880,7 @@
         this.rowKeysSuccessList = []
         this.rowKeysWarningList = []
         for (let i = 0; i < dataSource.length; i++) {
-          if (dataSource[i].inventoryAffirmStatus == 'List to confirm') {
+          if (dataSource[i].inventoryAffirmStatus == 'List to confirm' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
             if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) {
 
               this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)