修改待办流程批量任务确认，批量符合性确认 --> 增加批量二字，提醒用户

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

@@ -1774,4 +1774,6 @@ module.exports = {
   theVerificationComplianceProcessCannotBeEmpty:'The delivery type of the verification compliance process cannot be empty',
   deadlineForConfirmationDesignComplianceResponsibility:'Deadline for Confirmation of Design Compliance Responsibility',
   deadlineForVerifyingComplianceResponsibilityConfirmation:'Deadline for verifying compliance responsibility confirmation',
+  batchTaskResponsibilityConfirmation:'Batch task responsibility confirmation',
+  batchComplianceConfirmation:'Batch compliance confirmation',
 }

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

@@ -1876,4 +1876,6 @@ module.exports = {
   theVerificationComplianceProcessCannotBeEmpty:'验证符合性流程的交付物类型不能为空',
   deadlineForConfirmationDesignComplianceResponsibility:'设计符合性责任确认截止日期',
   deadlineForVerifyingComplianceResponsibilityConfirmation:'验证符合性责任确认截止日期',
+  batchTaskResponsibilityConfirmation:'批量任务责任确认',
+  batchComplianceConfirmation:'批量符合性确认',
 }

jero-web/src/views/dashboard/components/myList.vue

@@ -175,7 +175,7 @@
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
           }
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceProcess'))
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -238,7 +238,7 @@
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
           }
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('validationComplianceProcess'))
         }
       }
     }

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

@@ -339,7 +339,7 @@
                  :title="text">
               {{text}}
            </span>
-           <a v-else @click="designFlowStatusClick(result,$t('designComplianceReview'))"
+           <a v-else @click="designFlowStatusClick(result,$t('designComplianceProcess'))"
               :title="text">{{text}}</a>
         </span>
         <span slot="verifyFlowStatusName" slot-scope="text,result">
@@ -348,7 +348,7 @@
                 :title="text">
               {{text}}
            </span>
-           <a v-else @click="designFlowStatusClick(result,$t('verificationComplianceReview'))"
+           <a v-else @click="designFlowStatusClick(result,$t('validationComplianceProcess'))"
               :title="text">{{text}}</a>
         </span>
       </a-table>

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

@@ -20,7 +20,8 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+<!--        @click="RelatedItemsClick(record)"-->
+          <span :title="text">{{text}}</span>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
@@ -49,10 +50,11 @@
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
   import designCompliance from './designCompliance'
+
   export default {
     name: 'SentList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
-    components:{
+    components: {
       designCompliance
     },
     data() {
@@ -227,7 +229,7 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
-          if (row.taskDefinitionKey == 'fqlc'){
+          if (row.taskDefinitionKey == 'fqlc') {
             row.taskId = ''
           }
           query = {
@@ -259,7 +261,7 @@
           //   query: query
           // })
           // window.open(newUrl.href, '_blank')
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceProcess'))
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -295,7 +297,7 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
-          if (row.taskDefinitionKey == 'fqlc'){
+          if (row.taskDefinitionKey == 'fqlc') {
             row.taskId = ''
           }
           query = {
@@ -322,7 +324,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('validationComplianceProcess'))
         }
       },
       searchQuery(value) {
@@ -391,6 +393,7 @@
 
 <style scoped>
   @import '~@assets/less/common.less';
+
   .page {
     text-align: right;
     margin-top: 20px;

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

@@ -22,7 +22,8 @@
              @click="ProcessingClick(record)">{{$t('Processing')}}</a>
       </span>
       <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+<!--        @click="RelatedItemsClick(record)"-->
+          <span :title="text">{{text}}</span>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
         <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
@@ -324,7 +325,7 @@
           //   query: query
           // })
           // window.open(newUrl.href, '_blank')
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceProcess'))
 
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
@@ -400,7 +401,7 @@
           //   query: query
           // })
           // window.open(newUrl.href, '_blank')
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('validationComplianceProcess'))
         }
       },
       searchQuery(value) {

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

@@ -101,7 +101,8 @@
         projectInformationList: [
           {
             title: this.$t('entryName'),
-            value: 'projectName'
+            value: 'projectName',
+            projectVersion:'projectVersion',
           },
           {
             title: this.$t('regulationNo'),

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

@@ -20,9 +20,10 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
+<!--        @click="RelatedItemsClick(record)"-->
+          <span :title="text">
             {{text}}
-          </a>
+          </span>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
         <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
@@ -249,7 +250,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceProcess'))
         }else if(row.flowType == '3'){
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -316,7 +317,7 @@
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
-          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('validationComplianceProcess'))
         }
       },
       searchQuery(value) {

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

@@ -17,6 +17,11 @@
               @click="standardClick(queryForm)"
               v-else-if="item.type == '4'" :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
+        <span class="text-field-right text-field-right-url"
+              @click="RelatedItemsClick(queryForm)"
+              v-else-if="item.projectVersion == 'projectVersion'"
+              :title="queryForm[item.value]+queryForm[item.projectVersion]"
+        >{{queryForm[item.value]+'-'+queryForm[item.projectVersion]}}</span>
         <span class="text-field-right" v-else :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
       </div>
@@ -93,7 +98,21 @@
           }
         })
         window.open(newUrl.href, '_blank')
-      }
+      },
+
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName+'-'+item.projectVersion,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
     }
   }
 </script>

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -81,12 +81,12 @@
       <div @click="TaskresponsibilityrecognitionClick"
            class="operator-text">
         <a-icon type="form"/>
-        {{$t('Taskresponsibilityrecognition')}}
+        {{$t('batchTaskResponsibilityConfirmation')}}
       </div>
       <div @click="complianceConfirmationClick"
            class="operator-text">
         <a-icon type="form"/>
-        {{$t('complianceConfirmation')}}
+        {{$t('batchComplianceConfirmation')}}
       </div>
     </div>
     <a-tabs v-model="tabActive" @change="callback">