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

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

@@ -10,11 +10,17 @@
     <div class="myList-box-content" v-if="dataSource.length > 0">
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
-          <span class="top-text" :title="item.prcName">{{item.prcName}}</span>
+          <span class="top-text" v-if="item.flowType == 10"
-<!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
+                :title="item.flowTypeShow+'-'+item.projectName">
+            {{item.flowTypeShow+'-'+item.projectName}}
+          </span>
+          <span class="top-text" :title="item.flowTypeShow+'-'+item.serialNumber">
+            {{item.flowTypeShow+'-'+item.serialNumber}}
+          </span>
+          <!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
         </div>
         <div class="button">
-          {{item.creatTime}}
+          {{item.endTime}}
         </div>
         <div class="with">
           {{$t('Pending')}}
@@ -43,9 +49,13 @@
         dataSource: [],
         loading: false,
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess'),
+          1: this.$t('listTaskConfirmation'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          2: this.$t('designComplianceReview'),
-          6:this.$t('regulatoryTechnologyAssessmentProcess')
+          3: this.$t('preHomeConfirmation'),
+          4: this.$t('verificationComplianceReview'),
+          10: this.$t('confirmationOfRegulationsList'),
+          5: this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6: this.$t('regulatoryTechnologyAssessmentProcess')
         }
       }
     },
@@ -74,11 +84,11 @@
       queryProcess() {
         this.loading = true
         let parmes = {}
-        parmes.current = this.pageNo
+        parmes.pageNo = this.pageNo
-        parmes.size = this.pageSize
+        parmes.pageSize = this.pageSize
-        parmes.userId = this.userInfo().userId
+        // parmes.userId = this.userInfo().userId
-        postAction('task/todoTaskList', parmes).then((res) => {
+        getAction('/todoCenter/projectProcess/todoTaskList', parmes).then((res) => {
-          this.dataSource = res.list || []
+          this.dataSource = res.result.records || []
           this.loading = false
         })
       },
@@ -88,29 +98,138 @@
         })
       },
       prcClick(row) {
-        // let index = row.taskIds.lastIndexOf(',')
+        let query = {}
-        // row.taskIds = row.taskIds.slice(0, index)
         row.router = this.$route.path
-        if (row.prcType == '1') {
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
-            query: row
+            query: query
           })
           window.open(newUrl.href, '_blank')
-        } else if (row.prcType == '5') {
+        } else if (row.flowType == '10') {
           let newUrl = this.$router.resolve({
-            path: '/regulatoryProcessReview',
+            path: '/ProjectDetails',
-            query: row
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
           })
           window.open(newUrl.href, '_blank')
-        } else if (row.prcType == '6') {
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: true,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
           let newUrl = this.$router.resolve({
-            path: '/evaluationProcess',
+            path: '/taskListProcess',
-            query: row
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: true,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: true,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
           })
           window.open(newUrl.href, '_blank')
         }
-      }
+      },
     }
   }
 </script>
@@ -167,6 +286,7 @@
             text-overflow: ellipsis;
             white-space: nowrap;
           }
+
           /*.top-admin {*/
           /*  font-size: 16px;*/
           /*  font-family: Blue Sky Noto;*/

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

@@ -214,7 +214,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',
@@ -248,7 +248,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',
@@ -282,7 +282,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',

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

@@ -194,7 +194,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',
@@ -228,7 +228,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',
@@ -262,7 +262,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',

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

@@ -216,7 +216,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',
@@ -250,7 +250,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',
@@ -284,7 +284,7 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.PersonChargeFeedback
+            PersonChargeFeedback: row.personChargeFeedback
           }
           let newUrl = this.$router.resolve({
             path: '/taskListProcess',