修改未符合项的传参

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

@@ -480,10 +480,10 @@ module.exports = {
   feedback: 'feedback',
   approvalHistory: 'cpproval history',
   cannotExceed500characters: 'cannot exceed 500 characters',
-  accord: 'conformity',
-  nonConformity: 'non conformity',
-  Tracked: 'to be tracked',
-  notInvolved: 'Not involved',
+  accord: 'Compliance',
+  nonConformity: 'Non-Compliance',
+  Tracked: 'To be tracked',
+  notInvolved: 'NA',
   Operator: 'operator',
   role: 'role',
   operationContent: 'operation content',
@@ -786,10 +786,10 @@ module.exports = {
   adopt: 'adopt',
   reviewedByThePersonInCharge: 'Reviewed by the person in charge',
   onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted',
-  experimentPassed: 'Experiment passed',
-  experimentFailed: 'Experiment failed',
-  toBeStarted: 'To be started',
-  inProgress: 'In Progress',
+  experimentPassed: 'Test passed',
+  experimentFailed: 'Test failed',
+  toBeStarted: 'Not start',
+  inProgress: 'In progress',
   green: 'green',
   red: 'red',
   blue: 'blue',
@@ -809,6 +809,6 @@ module.exports = {
   virtualListDetails:'Virtual list details',
   maintainVirtualList:'Maintain virtual list',
   reasonsForRejection:'Reasons for rejection',
-  inconformity:'inconformity',
-  toTrack:'to track',
+  inconformity:'Non-Compliance',
+  toTrack:'To be tracked',
 }

jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue

@@ -18,16 +18,16 @@
                              :disabled="$route.query.TaskKey == 'fqrsh'?true:false"
                              class="box-input"
                              v-model="formInline.reviewResult">
-                <a-radio value="conformity">
+                <a-radio value="Compliance">
                   {{$t('accord')}}
                 </a-radio>
-                <a-radio value="inconformity">
+                <a-radio value="Non-Compliance">
                   {{$t('nonConformity')}}
                 </a-radio>
-                <a-radio value="to track">
+                <a-radio value="To be tracked">
                   {{$t('Tracked')}}
                 </a-radio>
-                <a-radio value="uninvolved">
+                <a-radio value="NA">
                   {{$t('notInvolved')}}
                 </a-radio>
               </a-radio-group>

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -192,7 +192,7 @@
       },
       isAdopt() {
         if (this.$route.query.TaskKey == 'fqrsh') {
-          if (this.queryBy.reviewResult == 'conformity' || this.queryBy.reviewResult == 'uninvolved') {
+          if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') {
             return true
           }
         }
@@ -225,7 +225,7 @@
       terminationProcess(operatorTime) {
         this.textLoading = this.$t('terminationProcessing')
         this.loading = true
-        this.queryBy.reviewResult = 'termination of task'
+        this.queryBy.reviewResult = 'Termination of task'
         this.completeTask({ flag: 2, operatorTime: operatorTime })
       },
       adopt(operatorTime) {
@@ -240,10 +240,10 @@
       sendBack(operatorTime) {
         this.textLoading = this.$t('Returning')
         this.loading = true
-        if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track') {
+        if (this.queryBy.reviewResult == 'Non-Compliance' || this.queryBy.reviewResult == 'To be tracked') {
 
         } else {
-          this.queryBy.reviewResult = 'to be confirmed'
+          this.queryBy.reviewResult = 'No rating'
         }
         this.completeTask({ flag: 1, operatorTime: operatorTime })
       },

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

@@ -143,30 +143,34 @@
             title: this.$t('standardInformation'),
             align: 'center',
             dataIndex: 'standard',
-            width: 200,
+            width: 202,
             scopedSlots: { customRender: 'standardInformation' }
           },
           {
             title: this.$t('areaOfResponsibility'),
             align: 'center',
+            width: 180,
             dataIndex: 'areaOfResponsibility',
             scopedSlots: { customRender: 'areaOfResponsibility' }
           },
           {
             title: this.$t('confirmationOfDesignConformity'),
             align: 'center',
+            width: 240,
             dataIndex: 'confirmationOfDesignConformity',
             scopedSlots: { customRender: 'confirmationOfDesignConformity' }
           },
           {
             title: this.$t('PrehomoConfirmation'),
             align: 'center',
+            width: 240,
             dataIndex: 'PrehomoConfirmation',
             scopedSlots: { customRender: 'PrehomoConfirmation' }
           },
           {
             title: this.$t('verificationAndConformityconfirmation'),
             align: 'center',
+            width: 240,
             dataIndex: 'verificationAndConformityconfirmation',
             scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
           },
@@ -192,18 +196,18 @@
           'showData': '展示数据'
         },
         color: {
-          'conformity': 'accordColor',
-          'inconformity': 'nonConformityColor',
-          'to track': 'TrackedColor',
-          'uninvolved': 'notInvolvedColor',
-          'to be confirmed': 'submittedColor'
+          'Compliance': 'accordColor',
+          'Non-Compliance': 'nonConformityColor',
+          'To be tracked': 'TrackedColor',
+          'NA': 'notInvolvedColor',
+          'No rating': 'submittedColor'
         },
         statusText: {
-          'conformity': this.$t('accord'),
-          'inconformity': this.$t('nonConformity'),
-          'to track': this.$t('Tracked'),
-          'uninvolved': this.$t('notInvolved'),
-          'to be confirmed': this.$t('toBeConfirmed')
+          'Compliance': this.$t('accord'),
+          'Non-Compliance': this.$t('nonConformity'),
+          'To be tracked': this.$t('Tracked'),
+          'NA': this.$t('notInvolved'),
+          'No rating': this.$t('toBeConfirmed')
         },
 
         queryParam: {},
@@ -391,6 +395,7 @@
     position: relative;
     display: block;
     height: 100%;
+    text-align: left;
   }
 
   .content {
@@ -445,7 +450,7 @@
   }
 
   .box-content-color {
-    width: 78px;
+    width: 138px;
     height: 32px;
     display: inline-block;
     border-radius: 4px;

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

@@ -141,7 +141,7 @@
                 {{ $t('edit') }}
               </a>
               <a class="text-operation"
-                 v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'rejected') && record.roleCode == 0"
+                 v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -752,7 +752,7 @@
         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].taskAffirmStatus == 'Accepted' && this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
               isTrue = true
             } else {
               isTrue = false
@@ -776,7 +776,7 @@
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'rejected') {
+                if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') {
                   isTrue = true
                 } else {
                   isTrue = false
@@ -884,7 +884,7 @@
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if ((this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'rejected') &&
+                if ((this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') &&
                   this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
                   isTrue = true
                 } else {
@@ -912,8 +912,8 @@
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'rejected') &&
-                  this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'accepted') {
+                if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') &&
+                  this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
                   if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId
                     && this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) ||
                     (!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId

jero-web/src/views/projectManagement/projectNonConformance/index.vue

@@ -244,7 +244,8 @@
         url: {
           page: '/project/ncrTrackController/queryPage',
           exportData: '/project/ncrTrackController/exportData'
-        }
+        },
+        content: []
       }
     },
     mounted() {
@@ -269,7 +270,20 @@
         this.getList()
       },
       onSelectChange(value) {
+        this.content = []
         this.selectedRowKeys = value
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.dataSource.forEach(res => {
+            this.selectedRowKeys.forEach(val => {
+              if (res.id == val) {
+                this.content.push({
+                  id: res.id,
+                  flowType: res.flowType
+                })
+              }
+            })
+          })
+        }
       },
       searchReset() {
         this.pageNo = 1
@@ -307,7 +321,7 @@
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         let query = {
           ...this.queryParam,
-          ids: selectedRowKeys.join(',')
+          ncrTrackVOList: this.content
         }
         downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
       },