对接设计符合性确认流程

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

@@ -67,6 +67,12 @@
 
   export default {
     name: 'circulationHistory',
+    props: {
+      url: {
+        type: String,
+        default: '/workFlow/get_list_by_instance'
+      }
+    },
     data() {
       return {
         dataSource: [],
@@ -140,9 +146,10 @@
     methods: {
       getList() {
         let query = {
-          prcNum: this.$route.query.prcNum
+          prcNum: this.$route.query.prcNum,
+          prcId: this.$route.query.actiProcInstId
         }
-        getAction('/workFlow/get_list_by_instance', query).then((res) => {
+        getAction(this.url, query).then((res) => {
           this.dataSource = res
         })
       },

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

@@ -41,6 +41,7 @@
       <span slot="operation" slot-scope="result">
          <a class="text"
             v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
+            :disabled="!result.createUser"
             @click="edit(result,$t('edit'))">
            {{$t('edit')}}
          </a>
@@ -55,6 +56,7 @@
          </a>
          <a class="text"
             v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
+            :disabled="!result.createUser"
             @click="deleted(result)">
            {{$t('deleteLib')}}
          </a>

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

@@ -52,6 +52,7 @@
 <script>
   export default {
     name: 'reviewedByThePersonInCharge',
+    props: ['queryBy'],
     data() {
       return {
         formInline: {},
@@ -75,6 +76,11 @@
       }
     },
     mounted() {
+      if (this.queryBy) {
+        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
+        this.formInline.approvalOpinion = this.queryBy.approvalOpinion || ''
+        this.formInline = { ...this.formInline }
+      }
     },
     methods: {
       submit(callBack) {

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

@@ -12,30 +12,30 @@
     <div class="detail-box">
       <div class="detail-content">
         <projectInformation
-          v-if="!loading"
+          v-if="isDisplay"
           :projectInformationList="projectInformationList"
           :url="url"
           :projectInformationId="this.queryBy.projectLibraryId"
         />
         <standardContent
-          v-if="!loading"
+          v-if="isDisplay"
           :standardContentList="standardContentList"
           :url="url"
           :standardContentQuery="queryProject"
         />
         <standardContentListTable
-          v-if="!loading"
+          v-if="isDisplay"
           :standardContentListQuery="queryProject"
           :url="url
           "/>
         <examineInformation
           :isFlag="isFlag"
-          v-if="!loading"
+          v-if="isDisplay"
           isViewUploadedFiles
           isApprovalOpinion
           ref="examineInformationRef"
           :url="url"/>
-        <circulationHistory v-if="!loading" :url="url"/>
+        <circulationHistory v-if="isDisplay"/>
       </div>
     </div>
     <JLoading :loading="loading">{{textLoading}}</JLoading>
@@ -156,13 +156,15 @@
           queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds'
         },
         queryBy: {},
+        isDisplay: false,
         queryProject: {},
         loading: false,
-        textLoading:this.$t('dataLoading')
+        textLoading: this.$t('dataLoading')
       }
     },
     mounted() {
       let _this = this
+      this.isDisplay = false
       this.queryTaskDetailByTask(function() {
         _this.queryProjectLawsInventoryInfo()
       })
@@ -243,11 +245,13 @@
         }
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
-            this.queryProject = res.result || {}
+            this.queryProject = res.result[0] || {}
             this.loading = false
+            this.isDisplay = true
           } else {
             this.queryProject = {}
             this.loading = false
+            this.isDisplay = true
           }
         })
       }

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

@@ -14,25 +14,28 @@
     <div class="detail-box">
       <div class="detail-content">
         <projectInformation
-          v-if="!loading"
+          v-if="isDisplay"
           :projectInformationList="projectInformationList"
           :url="url"
           :projectInformationId="this.queryBy.projectLibraryId"
         />
         <standardContent
-          v-if="!loading"
+          v-if="isDisplay"
           :standardContentList="standardContentList"
           :url="url"
           :standardContentQuery="queryProject"
         />
         <engineeringConfirmation
-          v-if="!loading"
+          v-if="isDisplay"
         />
         <reviewedByThePersonInCharge
-          v-if="(!loading && $route.query.TaskKey == 'zrrclrw') ||
-          (!loading && $route.query.TaskKey == 'fqrsh')"
+          ref="reviewedByThePersonInChargeRef"
+          :queryBy="queryBy"
+          v-if="(isDisplay && $route.query.TaskKey == 'zrrclrw') ||
+          (isDisplay && $route.query.TaskKey == 'fqrsh')"
         />
-        <circulationHistory v-if="!loading" :url="url"/>
+        <circulationHistory v-if="isDisplay"
+                            :url="'/workFlow/queryProcessHistoryByPrcId'"/>
       </div>
     </div>
     <JLoading :loading="loading">{{textLoading}}</JLoading>
@@ -71,6 +74,7 @@
         queryBy: {},
         queryProject: {},
         loading: false,
+        isDisplay: false,
         textLoading: this.$t('dataLoading'),
         projectInformationList: [
           {
@@ -202,11 +206,13 @@
     mounted() {
       let _this = this
       if (this.$route.query.taskIds) {
+        this.isDisplay = false
         this.queryTaskDetailByTask(function() {
           _this.queryProjectLawsInventoryInfo()
         })
       } else {
         this.loading = true
+        this.isDisplay = false
         this.queryBy.projectLibraryId = this.$route.query.projectLibraryId
         this.queryBy.id = this.$route.query.projectTaskInventoryId
         this.queryProjectLawsInventoryInfo()
@@ -215,13 +221,50 @@
     methods: {
       ...mapGetters(['userInfo']),
       terminationProcess() {
-
+        this.textLoading = this.$t('terminationProcessing')
+        this.loading = true
+        this.completeTask({ flag: 2 })
       },
       adopt() {
-
+        this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
+          this.textLoading = this.$t('Submitting')
+          this.loading = true
+          this.completeTask(res)
+        })
       },
       sendBack() {
-
+        this.textLoading = this.$t('Returning')
+        this.loading = true
+        this.completeTask({ flag: 1 })
+      },
+      submit() {
+        this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
+          this.textLoading = this.$t('Submitting')
+          this.loading = true
+          this.completeTask(res)
+        })
+      },
+      completeTask(value) {
+        let json = Object.assign(this.queryBy, value)
+        let data = JSON.stringify(json).replace(/\"/g, '\'')
+        let query = {
+          userid: this.userInfo().id,
+          taskId: this.$route.query.taskId || this.$route.query.taskIds,
+          json: data
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.loading = false
+            this.$router.push({
+              path: '/ProjectDetails',
+              query: this.$route.query
+            })
+          } else {
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       },
       queryTaskDetailByTask(callback) {
         this.loading = true
@@ -242,11 +285,13 @@
         }
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
-            this.queryProject = res.result || {}
+            this.queryProject = res.result[0] || {}
             this.loading = false
+            this.isDisplay = true
           } else {
             this.queryProject = {}
             this.loading = false
+            this.isDisplay = true
           }
         })
       }

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

@@ -218,13 +218,17 @@
               actiProcInstId: val.designPId,
               projectTaskInventoryId: val.projectLawsInventoryId,
               projectLibraryId: this.$route.query.id,
+              id: this.$route.query.id,
+              studioEngineer:this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
-              TaskKey:val.designTaskDefinitionKey,
-              flowType:2,
-              Sponsor:'designInitiatorName',
-              personLiable:'designDutyName',
-              typeOfDeliverables:'designDeliverableType_dictText',
-              deliverableTemplate:'designDeliverableTemplate',
+              TaskKey: val.designTaskDefinitionKey,
+              flowType: 2,
+              Sponsor: 'designInitiatorName',
+              personLiable: 'designDutyName',
+              typeOfDeliverables: 'designDeliverableType_dictText',
+              deliverableTemplate: 'designDeliverableTemplate',
+              projectName:this.$route.query.projectName,
+              projectNameId:this.$route.query.projectNameId,
             }
             break
           case 2:
@@ -232,30 +236,37 @@
               taskIds: val.prehomoTaskId,
               actiProcInstId: val.prehomoPId,
               projectTaskInventoryId: val.projectLawsInventoryId,
+              studioEngineer:this.$route.query.studioEngineer,
               projectLibraryId: this.$route.query.id,
               serialNumber: val.serialNumber,
-              TaskKey:val.prehomoTaskDefinitionKey,
-              flowType:3,
-              Sponsor:'prehomoInitiatorName',
-              personLiable:'prehomoDutyName',
-              typeOfDeliverables:'prehomoDeliverableType_dictText',
-              deliverableTemplate:'prehomoDeliverableTemplate',
+              TaskKey: val.prehomoTaskDefinitionKey,
+              flowType: 3,
+              id: this.$route.query.id,
+              Sponsor: 'prehomoInitiatorName',
+              personLiable: 'prehomoDutyName',
+              typeOfDeliverables: 'prehomoDeliverableType_dictText',
+              deliverableTemplate: 'prehomoDeliverableTemplate',
+              projectName:this.$route.query.projectName,
+              projectNameId:this.$route.query.projectNameId,
             }
             break
           case 3:
             query = {
               taskIds: val.verifyTaskId,
               actiProcInstId: val.verifyPId,
-              id: val.id,
+              id: this.$route.query.id,
               projectLibraryId: this.$route.query.id,
+              studioEngineer:this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
               projectTaskInventoryId: val.projectLawsInventoryId,
-              TaskKey:val.verifyTaskDefinitionKey,
-              flowType:4,
-              Sponsor:'verifyInitiatorName',
-              personLiable:'verifyDutyName',
-              typeOfDeliverables:'verifyDeliverableType_dictText',
-              deliverableTemplate:'verifyDeliverableTemplate',
+              TaskKey: val.verifyTaskDefinitionKey,
+              flowType: 4,
+              Sponsor: 'verifyInitiatorName',
+              personLiable: 'verifyDutyName',
+              typeOfDeliverables: 'verifyDeliverableType_dictText',
+              deliverableTemplate: 'verifyDeliverableTemplate',
+              projectName:this.$route.query.projectName,
+              projectNameId:this.$route.query.projectNameId,
             }
             break
         }