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

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

@@ -1779,4 +1779,6 @@ module.exports = {
   batchComplianceConfirmation:'Batch compliance confirmation',
   onlyDataWithApprovedCanCeSelected:'Only data with a process status of result pending review or approved can be selected',
   deadlineForResponsibilityConfirmation:'Deadline for Responsibility Confirmation',
+  checkRegulatoryCompletedBefore: "Check the implementation of regulatory requirements before product design freezes. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before G3.",
+  checkVerificationResultsBeforeMP:'Check the verification results required by regulations before mass production of the product. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before MP.',
 }

jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue

@@ -80,7 +80,7 @@
             width: 300
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('ProcessType'),
             align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -58,6 +58,7 @@
         </span>
         <span slot="approvalFile" slot-scope="text,result">
               <span class="viewFile"
+                    :title="$t('viewFile')"
                     @click="viewFileClick(result.approvalFile)"
                     v-if="result.approvalFile">
                 {{$t('viewFile')}}

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -92,7 +92,7 @@
             width: 300
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('ProcessType'),
             align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,

jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue

@@ -15,7 +15,10 @@
                 v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
                 type="primary">{{$t('referenceDeliverables')}}
       </a-button>
-      <a-icon class="questionClass" type="question-circle"/>
+      <a-icon v-if="this.queryData.isDisplay"
+              class="questionClass"
+              :title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')"
+              type="question-circle"/>
       <projectInformation
         v-if="isDisplay"
         :title="$t('basicInformation')"
@@ -343,10 +346,14 @@
     top: 20px;
     right: 70px;
     font-size: 16px;
+    z-index: 20;
   }
   ::v-deep .ant-drawer-header {
     top: 0;
     position: sticky;
     z-index: 20;
   }
+  ::v-deep .ant-drawer-header .ant-drawer-title{
+     font-weight: bold;
+  }
 </style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

@@ -85,7 +85,7 @@
             width: 300
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('ProcessType'),
             align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,

jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue

@@ -98,15 +98,15 @@
         total: 0,
         ids: '',
         detailedWarningList: [],
-        queryProject:{},
+        queryProject: {},
-        type:'',
+        type: ''
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel(type,queryProject) {
+      transferModel(type, queryProject) {
         this.visible = true
         this.queryParam = {}
         this.selectedRowKeys = []
@@ -160,33 +160,27 @@
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = true
           let query = {
-            serialNumber:this.queryProject.serialNumber,
+            serialNumber: this.queryProject.serialNumber,
-            dutyTerritory:this.queryProject.dutyTerritory,
+            dutyTerritory: this.queryProject.dutyTerritory,
-            citeProjectLibraryId:selectedRowKeys.join(','),
+            citeProjectLibraryId: selectedRowKeys.join(',')
           }
-          if (this.type == '2'){
+          if (this.type == '2') {
             query.operateType = 'lawsInventoryDesignCiteDeliverable'
             query.designDeliverableType = this.queryProject.designDeliverableType
-          }else if(this.type == '4'){
+          } else if (this.type == '4') {
             query.operateType = 'lawsInventoryVerifyCiteDeliverable'
-            query.verifyDeliverableType =this.queryProject.verifyDeliverableType
+            query.verifyDeliverableType = this.queryProject.verifyDeliverableType
           }
           postAction('/project/projectLawsInventoryEO/citeDeliverable', query).then((res) => {
             if (res.success) {
               this.confirmLoading = false
-              if (res.result) {
+              this.$message.success(res.message)
-                this.$message.warning(res.result)
-              } else {
-                this.$message.success(this.$t('OperationSuccessful'))
-              }
               this.visible = false
-              this.$emit('referenceDeliverablesListForm')
+              if (res.result){
-            } else {
+                this.$emit('referenceDeliverablesListForm',res.result)
-              if (res.result) {
-                this.$message.warning(res.result)
-              } else {
-                this.$message.warning(this.$t('operationFailed'))
               }
+            } else {
+              this.$message.warning(res.message)
               this.confirmLoading = false
             }
           })

jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue

@@ -181,7 +181,10 @@
     },
     methods: {
       getData(data) {
-
+        this.formInline.disposeResult = data.operatorResult
+        this.formInline.approvalOpinion = data.approvalOpinion
+        this.formInline.approvalFile = data.approvalFile
+        this.formInline = { ...this.formInline }
       },
       submit(callBack) {
         this.$refs.ruleForm.validate(valid => {