From 9806c46e048ab84190e42f43cc74bd57dd6d59e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 30 Jan 2024 10:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step1-9.vue     |   4 +
 .../pages/creatProcess/bzzqyj/step2.vue       |   4 +
 .../pages/creatProcess/bzzqyj/step5-1.vue     |   4 +
 .../pages/processDetail/index.vue             | 107 ++++++++++++------
 4 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index eea930efe..39e2ce387 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -225,6 +225,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">数据获取中</loading>
     </div>
     <el-dialog
             title="查看修改前内容"
@@ -248,6 +249,7 @@ export default {
   name: "bzzqyjStep1-9",
   data() {
     return {
+      loading:false,
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
       histortData: [],
@@ -298,10 +300,12 @@ export default {
       }
     },
     getHistoryData () {
+      this.loading = true
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
+        this.loading = false
       }, e => {})
     },
     upload(row, title) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 29595f68f..36c8d6fb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -176,6 +176,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">数据获取中</loading>
     </div>
     <ProcessFooter
       show-submit
@@ -216,6 +217,7 @@ export default {
   name: "bzzqyjStep2",
   data() {
     return {
+      loading:false,
       commentText2: '',
       onlyKey: '',
       drawerModal: false,
@@ -312,10 +314,12 @@ export default {
       window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
     },
     getHistoryData() {
+      this.loading = true
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum
       }, {}, res => {
         this.histortData = res;
+        this.loading = false
       }, e => {
       });
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue
index 520704048..92e436032 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue
@@ -278,6 +278,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">数据获取中</loading>
     </div>
     <ProcessFooter
         v-show="!disabledXX"
@@ -385,6 +386,7 @@ export default {
   name: "bzzqyjStep5-1",
   data() {
     return {
+      loading:false,
       disabledXX:!!this.$route.query.disabledXX,
       activeNames: '1',
       clickFlag: false,
@@ -614,10 +616,12 @@ export default {
       window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
     },
     getHistoryData() {
+      this.loading = true
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum
       }, {}, res => {
         this.histortData = res;
+        this.loading = false
       }, e => {
       });
     },
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 0cec8a725..b5e7b6748 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -33,12 +33,13 @@
                                         {{val1}}
                                     </div>
                                 </div>
-                            <div class="flow-group-process-content-bottom" v-if="item.userNames && item.userNames.length > 0">
+                                <div class="flow-group-process-content-bottom"
+                                     v-if="item.userNames && item.userNames.length > 0">
                                     <div v-if="item.userNames && item.userNames.length > 0"
                                          v-for="val in item.userNames">
-                                           <div>{{val}}</div>
+                                        <div>{{val}}</div>
                                     </div>
-                            </div>
+                                </div>
                             </el-tooltip>
                             <div class="flow-group-process-content-bottom" v-if="!item.userNames">
                                 <div>暂未选择处理人</div>
@@ -134,18 +135,15 @@
                         prop="taskKeyShow"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 />
                 <el-table-column
                         prop="userName"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 />
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center"
                 >
                     <template slot-scope="scope">
@@ -176,7 +174,7 @@
                         align="center"
                 >
                     <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
+                        <span>{{ scope.row.taskStatusShow }}</span>
                     </template>
                 </el-table-column>
             </el-table>
@@ -332,10 +330,10 @@
                     _this: this
                 }, res => {
                     this.nameList = res
-                    this.nameList.forEach(val=>{
-                         if (val.userNames){
-                             val.userNames = val.userNames.split(',')
-                         }
+                    this.nameList.forEach(val => {
+                        if (val.userNames) {
+                            val.userNames = val.userNames.split(',')
+                        }
                     })
                     this.$nextTick(() => {
                         let flowGroupProcess = document.getElementsByClassName('flow-group-process')
@@ -354,10 +352,10 @@
             checkedRole(data) {
                 this.assigneeNewLoading = true
                 changeAssigneeNew({
-                    taskId: this.selectPeople.id, // 任务id
+                    taskId: this.selectPeople.taskId || this.selectPeople.id, // 任务id
                     assignee: data[0].id, // 被委托人
-                    userId: this.selectPeople.assigneeId, // 委托人
-                    pId: this.selectPeople.processInstanceId // 流程实例
+                    userId: this.selectPeople.userId || this.selectPeople.assigneeId, // 委托人
+                    pId: this.selectPeople.prcId || this.selectPeople.processInstanceId // 流程实例
                 }).then(res => {
                     this.assigneeNewLoading = false
                     if (res.success) {
@@ -370,22 +368,51 @@
                     }
                 })
             },
+            integrateData(list) {
+                list = list.reverse()
+                let row = {}
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].taskId) {
+                        row = list[i]
+                       return row
+                    } else {
+                        if (list[i].children && list[i].children.length > 0) {
+                            let children = list[i].children.reverse()
+                            for (let j = 0; j < children.length; j++) {
+                                if (children[j].taskId){
+                                    row = children[j]
+                                    return row
+                                }
+                            }
+                        }
+                    }
+                }
+            },
             // 汇总流程
             approveHandler() {
                 const index = this.detailData.length - 1 // 当前流程任务最后一步index
                 const isEnd = true
-                let row = {...this.detailData[this.approveRowIndex + 1]}// 汇总页下一步拿到数据
-                if (this.approveRowIndex === this.detailData.length - 1) { // 最后一步
-                    row = {...this.detailData[this.approveRowIndex]}
+                let prcType = ''
+                let row = {}
+                if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') {
+                    row = this.integrateData(JSON.parse(JSON.stringify(this.detailData)))
+                    prcType = row.flowType
+                    row.taskInfo = row.taskKeyShow
+                    row.taskIds = row.taskId
+                    row.tabsName = this.$route.query.tabsName
+                    row.prcType = row.flowType
+                } else {
+                    row = {...this.detailData[this.approveRowIndex + 1]}// 汇总页下一步拿到数据
+                    if (this.approveRowIndex === this.detailData.length - 1) { // 最后一步
+                        row = {...this.detailData[this.approveRowIndex]}
+                    }
+                    row.taskIds = row.id
+                    row.taskInfo = row.name
+                    row.tabsName = this.$route.query.tabsName
+                    const currentItem = this.detailData[this.approveRowIndex]
+                    row.currentItem = currentItem
+                    prcType = this.detailData[index].prcType
                 }
-                row.taskIds = row.id
-                row.taskInfo = row.name
-                row.tabsName = this.$route.query.tabsName
-
-                const currentItem = this.detailData[this.approveRowIndex]
-                row.currentItem = currentItem
-
-                const prcType = this.detailData[index].prcType || this.detailData[index].flowType // 流程类型
                 if (isEnd) {
                     if (this.$store.state.detailMap !== '') {
                         const lastDetailMap = this.$store.getters.getLastDetailMap
@@ -492,14 +519,22 @@
              * @Description: 查看流程最后一步
              */
             seeProcessLast() {
+                const row = {...this.detailData[0]}
+                let prcType = ''
                 const index = this.detailData.length - 1 // 当前流程任务最后一步index
                 const isEnd = true
-                const row = {...this.detailData[0]}
-                row.taskIds = row.id
-                row.taskInfo = row.name
-                row.tabsName = this.$route.query.tabsName
-                const prcType = this.detailData[index].prcType // 流程类型
-                console.log(prcType);
+                if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') {
+                    prcType = row.flowType
+                    row.taskInfo = row.taskKeyShow
+                    row.taskIds = row.taskId
+                    row.tabsName = this.$route.query.tabsName
+                    row.prcType = row.flowType
+                } else {
+                    row.taskIds = row.id
+                    row.taskInfo = row.name
+                    row.tabsName = this.$route.query.tabsName
+                    prcType = this.detailData[index].prcType
+                }
                 // 判断当前流程是否已全部办理完成
                 // this.detailData.map(item => {
                 //   if (!item.endTime) {
@@ -666,15 +701,15 @@
                     name: componentName,
                     query: {
                         bpnId: row.bpnId,
-                        taskIds: row.id,
-                        prcId: row.processInstanceId,
+                        taskIds: row.taskIds || row.id,
+                        prcId: row.prcId || row.processInstanceId,
                         prcNum: row.prcNum,
                         prcName: row.prcName,
                         prcType: row.prcType,
                         disabledXX: true,
                         verifySarStandard: true,
                         index: this.approveRowIndex,
-                        processInstanceId: row.processInstanceId
+                        processInstanceId: row.prcId || row.processInstanceId
                     },
                     params: {
                         currentItem: row.currentItem
@@ -1575,9 +1610,9 @@
             }
         },
         mounted() {
-            if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3'){
+            if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') {
                 this.getProcessList()
-            }else{
+            } else {
                 this.processNum()
             }
             this.processTable()