定版

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

@@ -852,7 +852,7 @@ module.exports = {
   record: 'Record',
   replyToComments: 'Reply To Comments',
   noComment: 'No Comment',
-  theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of All data are received',
+  theReceived: 'Finalize all process data only after completing the task responsibility confirmation node',
   notEvaluated: 'Not Evaluated',
   cannotExceed: 'Cannot Exceed',
   Characters: 'Characters',

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

@@ -868,7 +868,7 @@ module.exports = {
   record: '记录',
   replyToComments: '回复评论',
   noComment: '暂无评论',
-  theReceived: '所有数据的清单确认状态和任务确认状态都为接受才可以定版',
+  theReceived: '所有流程数据均完成任务责任确认节点后才能进行定版操作',
   notEvaluated: '未评估',
   cannotExceed: '不能超出',
   Characters: '个字符',

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

@@ -1608,7 +1608,20 @@
         if (this.dataSource && this.dataSource.length > 0) {
           let isTrue
           for (let i = 0; i < this.dataSource.length; i++) {
-            if (this.dataSource[i].taskAffirmStatus == 'Accepted' && this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
+            if ((this.dataSource[i].verifyFlowStatus == 'Results to be submitted' ||
+                this.dataSource[i].verifyFlowStatus == 'Results to be reviewed' ||
+                this.dataSource[i].verifyFlowStatus == 'Compliance' ||
+                this.dataSource[i].verifyFlowStatus == 'Non-Compliance' ||
+                this.dataSource[i].verifyFlowStatus == 'To be tracked' ||
+                this.dataSource[i].verifyFlowStatus == 'NA'
+              ) &&
+              (this.dataSource[i].designFlowStatus == 'Results to be submitted' ||
+              this.dataSource[i].designFlowStatus == 'Results to be reviewed' ||
+              this.dataSource[i].designFlowStatus == 'Compliance' ||
+              this.dataSource[i].designFlowStatus == 'Non-Compliance' ||
+              this.dataSource[i].designFlowStatus == 'To be tracked' ||
+              this.dataSource[i].designFlowStatus == 'NA'
+              )) {
               isTrue = true
             } else {
               isTrue = false
@@ -1729,13 +1742,13 @@
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
                 if (
-                   (this.dataSource[i].verifyFlowStatus == 'List to be released' ||
+                  (this.dataSource[i].verifyFlowStatus == 'List to be released' ||
                     this.dataSource[i].verifyFlowStatus == 'Compliance' ||
                     this.dataSource[i].verifyFlowStatus == 'Non-Compliance' ||
                     this.dataSource[i].verifyFlowStatus == 'To be tracked' ||
                     this.dataSource[i].verifyFlowStatus == 'NA')
-                   &&
+                  &&
-                   (this.dataSource[i].designFlowStatus == 'List to be released' ||
+                  (this.dataSource[i].designFlowStatus == 'List to be released' ||
                     this.dataSource[i].designFlowStatus == 'Compliance' ||
                     this.dataSource[i].designFlowStatus == 'Non-Compliance' ||
                     this.dataSource[i].designFlowStatus == 'To be tracked' ||