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

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

@@ -1801,4 +1801,8 @@ module.exports = {
   verifytheconformancedeliverabletype:'Verify the conformance deliverable type',
   designaconformancedeliverabletype:'Design a conformance deliverable type',
   reasonForReturnOfCompliance:'Reason for compliance return',
+  supplementarySubmission:'Supplementary Submission',
+  confirmSupplementarySubmission:'Confirm Supplementary Submission ?',
+  onlyProcessStatusOfApprovedCanBeSelected:'Only data with a process status of approved can be selected',
+  andTheOperatorCurrentData:' And the operator is the responsible person for the current data',
 }

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

@@ -1903,4 +1903,8 @@ module.exports = {
   verifytheconformancedeliverabletype:'验证符合性交付物类型',
   designaconformancedeliverabletype:'设计符合性交付物类型',
   reasonForReturnOfCompliance: '符合性退回原因',
+  supplementarySubmission:'补充提交',
+  confirmSupplementarySubmission:'确认补充提交?',
+  onlyProcessStatusOfApprovedCanBeSelected:'只能选择流程状态为审查通过的数据',
+  andTheOperatorCurrentData:',并且登录人为当前数据的责任人',
 }

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

@@ -227,6 +227,14 @@
           {{ $t('reviewAndReturn') }}
         </div>
 
+        <!--        补充提交-->
+        <div @click="supplementarySubmissionClick()"
+             v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+             class="operator-text">
+          <a-icon type="rollback"/>
+          {{ $t('supplementarySubmission') }}
+        </div>
+
         <!--        任务接受-->
         <div @click="missionAcceptedClick('zrrjsrw',$t('confirmToAcceptTheTask'))"
              v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
@@ -599,7 +607,7 @@
             type: 'date',
             value: 'endTime',
             text: this.$t('closingDate')
-          },
+          }
         ],
         disabled: false,
         queryParamQuery: {},
@@ -2106,6 +2114,62 @@
           }
         })
         window.open(newUrl.href, '_blank')
+      },
+      supplementarySubmissionClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let ids = []
+          let notConditions = []
+          let _this = this
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
+              if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else if (this.roleSwitchingCode == 21) {
+                ids.push(this.selectedRowKeysList[i].id)
+              } else {
+                notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+              }
+            } else {
+              notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          let data = ''
+          if (notConditions && notConditions.length > 0) {
+            if (this.roleSwitchingCode == 20) {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusOfApprovedCanBeSelected') + this.$t('andTheOperatorCurrentData')
+            } else {
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusOfApprovedCanBeSelected')
+            }
+          }
+          if (ids && ids.length > 0) {
+            this.$confirm({
+              content: _this.$t('confirmSupplementarySubmission'),
+              onOk() {
+                let query = {
+                  ids: ids.join(','),
+                  'flowStatus': 'Results to be submitted'
+                }
+                postAction('/project/projectCertificationInventoryEO/updateStatusBatch', query).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.getList()
+                    _this.selectedRowKeys = []
+                    _this.selectedRowKeysList = []
+                    if (notConditions && notConditions.length > 0) {
+                      _this.failedMessage(data)
+                    }
+                  } else {
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+              }
+            })
+          } else {
+            this.failedMessage(data)
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       }
     }
   }