认证清单提示语优化

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

@@ -1765,4 +1765,5 @@ module.exports = {
   andTheAndTaskPendingConfirmation:'And the process status is Result Pending Submission, Review Returned, and Task Pending Confirmation',
   andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation',
   andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned',
+  deliverablesFor:'Deliverables for',
 }

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

@@ -1867,4 +1867,5 @@ module.exports = {
   andTheAndTaskPendingConfirmation:'并且流程状态为结果待提交、审查退回、任务待确认',
   andProcessStatusIsTaskPendingConfirmation:'并且流程状态为任务待确认',
   andPendingSubmissionReviewReturned:'并且流程状态为结果待提交、审查退回',
+  deliverablesFor:'的交付结果',
 }

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -569,7 +569,7 @@
             type: 'date',
             value: 'endTime',
             text: this.$t('closingDate')
-          },
+          }
         ],
         disabled: false,
         queryParamQuery: {},
@@ -626,7 +626,7 @@
             width: 180,
             ellipsis: true,
             fixed: 'left',
-            sorter: true,
+            sorter: true
           },
           {
             title: this.$t('inspectionItems'),
@@ -766,7 +766,7 @@
         toDoIds: [],
         toDoNotConditions: [],
         userInfoQuery: {},
-        DeliverableTreeList:[],
+        DeliverableTreeList: []
       }
     },
     mounted() {
@@ -826,7 +826,7 @@
               type: 'treeChoice',
               value: 'deliverableType',
               text: this.$t('typeOfDeliverables'),
-              tree:this.DeliverableTreeList
+              tree: this.DeliverableTreeList
             })
           } else {
             this.DeliverableTreeList = []
@@ -1456,7 +1456,7 @@
           let notConditionsOne = []
           let data = ''
           let dataOne = ''
-          let detailedWarningList= []
+          let detailedWarningList = []
           if (this.roleSwitchingCode == 20) {
             for (let i = 0; i < this.selectedRowKeysList.length; i++) {
               if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
@@ -1480,14 +1480,14 @@
           }
           if (notConditions && notConditions.length > 0) {
             data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
-            detailedWarningList.push(<div>{data}</div>)
+            detailedWarningList.push( < div > { data } < /div>)
           }
-          if (notConditionsOne && notConditionsOne.length > 0){
+          if (notConditionsOne && notConditionsOne.length > 0) {
-            dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission')
+            dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、') + '"' + this.$t('operationWithoutPermission')
-            detailedWarningList.push(<div>{dataOne}</div>)
+            detailedWarningList.push( < div > { dataOne } < /div>)
           }
           if (ids && ids.length > 0) {
-            this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList)
+            this.$refs.referenceDeliverablesListRef.transferModel(ids, detailedWarningList)
           } else {
             this.failedMessageOne(detailedWarningList)
           }
@@ -1542,7 +1542,7 @@
         }
         this.toDoData = ''
         if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
-          this.toDoData = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andTheAndTaskPendingConfirmation')
+          this.toDoData = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andTheAndTaskPendingConfirmation')
         }
         if (this.toDoIds && this.toDoIds.length > 0) {
           this.$refs.SelectedByRef.getPush()
@@ -1715,7 +1715,7 @@
         let data = ''
         if (notConditions && notConditions.length > 0) {
           // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
-          data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andProcessStatusIsTaskPendingConfirmation')
+          data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andProcessStatusIsTaskPendingConfirmation')
         }
         if (ids && ids.length > 0) {
           this.submitTask(value, prompt, ids, notConditions, data)
@@ -1729,6 +1729,15 @@
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let ids = []
           let notConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].valueType == 'text' || this.selectedRowKeysList[i].valueType == 'select' ||
+              this.selectedRowKeysList[i].valueType == 'file') {
+              if (!this.selectedRowKeysList[i].deliveryResult) {
+                  this.$message.warning(this.$t('inspectionItems')+'"'+this.selectedRowKeysList[i].inspectionItem+'"'+this.$t('deliverablesFor')+this.$t('cannotEmpty'))
+                 return
+              }
+            }
+          }
           if (this.roleSwitchingCode == 20) {
             this.submitClickJC(value, prompt)
             return
@@ -1771,7 +1780,7 @@
         let data = ''
         if (notConditions && notConditions.length > 0) {
           // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
-          data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andPendingSubmissionReviewReturned')
+          data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andPendingSubmissionReviewReturned')
         }
         if (ids && ids.length > 0) {
           this.submitTask(value, prompt, ids, notConditions, data)
@@ -1857,7 +1866,7 @@
           }
         })
         window.open(newUrl.href, '_blank')
-      },
+      }
     }
   }
 </script>
@@ -2207,7 +2216,8 @@
     color: #00B3BE;
     cursor: pointer;
   }
-  .operator-text-title:last-child{
+
+  .operator-text-title:last-child {
     margin-bottom: 0;
   }
 </style>