Merge remote-tracking branch 'origin/master'

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

@@ -6,15 +6,21 @@
       </div>
     </div>
     <div class="header-content">
-      <div class="operator-text" @click="distributionEngineerClick($t('distributionEngineer'))">
+      <div class="operator-text"
+           v-if="$route.query.TaskKey == 'zrrclrw'"
+           @click="distributionEngineerClick($t('distributionEngineer'))">
         <a-icon type="audit"/>
         {{ $t('distributionEngineer') }}
       </div>
-      <div class="operator-text" @click="reminderHandling()">
+      <div class="operator-text"
+           v-if="$route.query.TaskKey == 'zrrclrw'"
+           @click="reminderHandling()">
         <a-icon type="sound"/>
         {{ $t('reminderHandling') }}
       </div>
-      <div class="operator-text" @click="distributionEngineerClick($t('addFeedback'))">
+      <div class="operator-text"
+           v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
+           @click="distributionEngineerClick($t('addFeedback'))">
         <a-icon type="plus-circle"/>
         {{ $t('addFeedback') }}
       </div>
@@ -33,10 +39,25 @@
          </a>
       </span>
       <span slot="operation" slot-scope="result">
-         <a class="text" @click="edit(result,$t('edit'))">{{$t('edit')}}</a>
+         <a class="text"
-         <a class="text" @click="detailsClick(result)">{{$t('details')}}</a>
+            v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
-         <a class="text" @click="answerClick(result,$t('replyFromProjectContactPerson'))">{{$t('answer')}}</a>
+            @click="edit(result,$t('edit'))">
-         <a class="text" @click="deleted(result)">{{$t('deleteLib')}}</a>
+           {{$t('edit')}}
+         </a>
+         <a class="text"
+            @click="detailsClick(result)">
+           {{$t('details')}}
+         </a>
+         <a class="text"
+            v-if="$route.query.TaskKey == 'zrrclrw'"
+            @click="answerClick(result,$t('replyFromProjectContactPerson'))">
+           {{$t('answer')}}
+         </a>
+         <a class="text"
+            v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
+            @click="deleted(result)">
+           {{$t('deleteLib')}}
+         </a>
       </span>
     </a-table>
     <a-modal
@@ -394,7 +415,13 @@
       },
       feedbackData(url, Action) {
         this.confirmLoading = true
-        Action(url, this.formInline).then((res) => {
+        let query = {
+          projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
+          actiProcInstId: this.$route.query.actiProcInstId,
+          flowType: this.$route.query.flowType,
+          ...this.formInline
+        }
+        Action(url, query).then((res) => {
           if (res.success) {
             this.confirmLoading = false
             this.getList()
@@ -424,7 +451,7 @@
       getReminderHandlingList() {
         this.loadingTable = true
         let query = {
-          taskDefinitionKey:'dreDispose',
+          taskDefinitionKey: 'dreDispose',
           actiProcInstId: this.$route.query.actiProcInstId
         }
         getAction(this.url.queryByActiProcInstId, query).then((res) => {

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

@@ -5,9 +5,11 @@
       :is-termination-process="isTerminationProcess"
       :is-adopt="isAdopt"
       :isSendBack="isSendBack"
+      :isSubmit="isSubmit"
       @terminationProcess="terminationProcess"
       @adopt="adopt"
       @sendBack="sendBack"
+      @submit="submit"
     />
     <div class="detail-box">
       <div class="detail-content">
@@ -27,7 +29,8 @@
           v-if="!loading"
         />
         <reviewedByThePersonInCharge
-          v-if="!loading"
+          v-if="(!loading && $route.query.TaskKey == 'zrrclrw') ||
+          (!loading && $route.query.TaskKey == 'fqrsh')"
         />
         <circulationHistory v-if="!loading" :url="url"/>
       </div>
@@ -135,11 +138,11 @@
           },
           {
             title: this.$t('Sponsor'),
-            value: 'designInitiatorName'
+            value: this.$route.query.Sponsor
           },
           {
             title: this.$t('personLiable'),
-            value: 'designDutyName'
+            value: this.$route.query.personLiable
           },
           {
             title: this.$t('regulatoryEngineer'),
@@ -152,12 +155,11 @@
           {},
           {
             title: this.$t('typeOfDeliverables'),
-            value: 'designDeliverableType_dictText'
+            value: this.$route.query.typeOfDeliverables
           },
           {
             title: this.$t('deliverableTemplate'),
-            value: 'designDeliverableTemplate',
+            value: this.$route.query.deliverableTemplate,
-            name: 'designDeliverableTemplateName',
             type: 2
           },
           {
@@ -173,13 +175,28 @@
     },
     computed: {
       isSendBack() {
-        return true
+        if (this.$route.query.TaskKey == 'fqrsh') {
+          return true
+        }
+        return false
       },
       isTerminationProcess() {
-        return true
+        if (this.$route.query.TaskKey == 'fqrsh' || this.$route.query.TaskKey == 'zrrclrw') {
+          return true
+        }
+        return false
       },
       isAdopt() {
-        return true
+        if (this.$route.query.TaskKey == 'fqrsh') {
+          return true
+        }
+        return false
+      },
+      isSubmit() {
+        if (this.$route.query.TaskKey == 'zrrclrw') {
+          return true
+        }
+        return false
       }
     },
     mounted() {

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

@@ -63,30 +63,30 @@
           </div>
         </div>
         <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.designTaskStatus">
+          <div class="content" v-if="result.designTaskStatus" @click="verifyTaskClick(result,1)">
-            <span class="box-content">截止时间: 2022-06-01</span><br/>
+            <span class="box-content">{{$t('cutoffTime')}}: {{result.designDueDate}}</span><br/>
-            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.designFlowTaskStatus}}</span><br/>
-            <span class="box-content-color">待追踪</span>
+            <span class="box-content-color">{{result.designStatus}}</span>
           </div>
           <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1)">
             <div class="content-box-jiao"></div>
           </div>
         </div>
         <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.prehomoTaskStatus">
+          <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2)">
-            <span class="box-content">截止时间: 2022-06-01</span><br/>
+            <span class="box-content">{{$t('cutoffTime')}}: {{result.prehomoDueDate}}</span><br/>
-            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoFlowTaskStatus}}</span><br/>
-            <span class="box-content-color">待追踪</span>
+            <span class="box-content-color">{{result.prehomoTaskStatus}}</span>
           </div>
           <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2)">
             <div class="content-box-jiao"></div>
           </div>
         </div>
         <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.verifyTaskStatus">
+          <div class="content" v-if="result.verifyTaskStatus" @click="verifyTaskClick(result,3)">
-            <span class="box-content">截止时间: 2022-06-01</span><br/>
+            <span class="box-content">{{$t('cutoffTime')}}: {{result.verifyDueDate}}</span><br/>
-            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.verifyFlowTaskStatus}}</span><br/>
-            <span class="box-content-color">待追踪</span>
+            <span class="box-content-color">{{result.verifyStatus}}</span>
           </div>
           <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3)">
             <div class="content-box-jiao"></div>
@@ -113,6 +113,7 @@
   import certificationDirectory from './certificationDirectory'
   import TaskListModel from './TaskListModel'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'TaskList',
@@ -194,6 +195,7 @@
       this.getList()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       searchQuery() {
         this.getList()
       },
@@ -216,7 +218,13 @@
               actiProcInstId: val.designPId,
               projectTaskInventoryId: val.projectLawsInventoryId,
               projectLibraryId: this.$route.query.id,
-              serialNumber: val.serialNumber
+              serialNumber: val.serialNumber,
+              TaskKey:val.designTaskDefinitionKey,
+              flowType:2,
+              Sponsor:'designInitiatorName',
+              personLiable:'designDutyName',
+              typeOfDeliverables:'designDeliverableType_dictText',
+              deliverableTemplate:'designDeliverableTemplate',
             }
             break
           case 2:
@@ -225,7 +233,13 @@
               actiProcInstId: val.prehomoPId,
               projectTaskInventoryId: val.projectLawsInventoryId,
               projectLibraryId: this.$route.query.id,
-              serialNumber: val.serialNumber
+              serialNumber: val.serialNumber,
+              TaskKey:val.prehomoTaskDefinitionKey,
+              flowType:3,
+              Sponsor:'prehomoInitiatorName',
+              personLiable:'prehomoDutyName',
+              typeOfDeliverables:'prehomoDeliverableType_dictText',
+              deliverableTemplate:'prehomoDeliverableTemplate',
             }
             break
           case 3:
@@ -236,6 +250,12 @@
               projectLibraryId: this.$route.query.id,
               serialNumber: val.serialNumber,
               projectTaskInventoryId: val.projectLawsInventoryId,
+              TaskKey:val.verifyTaskDefinitionKey,
+              flowType:4,
+              Sponsor:'verifyInitiatorName',
+              personLiable:'verifyDutyName',
+              typeOfDeliverables:'verifyDeliverableType_dictText',
+              deliverableTemplate:'verifyDeliverableTemplate',
             }
             break
         }