暂未选择处理人
@@ -134,18 +135,15 @@
prop="taskKeyShow"
label="任务步骤"
align="center"
- sortable="custom"
/>
@@ -176,7 +174,7 @@
align="center"
>
- {{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}
+ {{ scope.row.taskStatusShow }}
@@ -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()
From 91291443503d806982349c7f81d1c4ae83688cec 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:54:04 +0800
Subject: [PATCH 04/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/processDetail/index.vue | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index b5e7b6748..c91c6f666 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -361,7 +361,11 @@
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
+ if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') {
+ this.getProcessList()
+ } else {
+ this.processNum()
+ }
this.processTable()
} else {
this.$message.warning(res.message)
@@ -1346,7 +1350,11 @@
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
+ if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') {
+ this.getProcessList()
+ } else {
+ this.processNum()
+ }
this.processTable()
} else {
this.$message.warning(res.message)
From 550817b67e3207623b314d1fcbe79af71baba659 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 11:03:23 +0800
Subject: [PATCH 05/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/processDetail/index.vue | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index c91c6f666..6ebe26235 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -1298,9 +1298,20 @@
// 调整处理人
adjustmentHandler() {
if (this.tableRow.length === 1 && !this.tableRow[0].endTime) {
- this.drawerModal = true
- this.drawerTitle = '调整处理人'
- this.selectPeople = this.tableRow[0]
+ if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3'){
+ if (this.tableRow[0].taskId){
+ this.drawerModal = true
+ this.drawerTitle = '调整处理人'
+ this.selectPeople = this.tableRow[0]
+ }else{
+ this.$message.warning('请选择子流程节点数据')
+ }
+ }else{
+ this.drawerModal = true
+ this.drawerTitle = '调整处理人'
+ this.selectPeople = this.tableRow[0]
+ }
+
} else {
this.$message.warning('请选择一条未完成的数据')
}
From f859f380bc398eea58d8f076c64e54bd96561acb 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 14:21:01 +0800
Subject: [PATCH 06/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/processDetail/index.vue | 33 ++++++++++++-------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 6ebe26235..5df36a19c 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -1451,18 +1451,29 @@
},
// 导出事件
exportStandard() {
- const ids = []
- if (this.tableRow.length > 0) {
- this.tableRow.map(item => {
- ids.push(item.id)
- })
- } else {
- this.detailData.map(item => {
- ids.push(item.id)
- })
+ if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') {
+ const ids = []
+ if (this.tableRow.length > 0) {
+ this.tableRow.map(item => {
+ ids.push(item.id)
+ })
+ }
+ window.location.href = '/api/lawss/activiti/exportFlowHistoryList?idAndSartypeList=' + ids.join(',') + '&prcNum=' + this.$route.query.prcNum + '&actiProcInstId=' + this.$route.query.actiProcInstId + '&flowType=' + this.$route.query.flowType
+ this.$message.success('导出信息成功')
+ }else{
+ const ids = []
+ if (this.tableRow.length > 0) {
+ this.tableRow.map(item => {
+ ids.push(item.id)
+ })
+ } else {
+ this.detailData.map(item => {
+ ids.push(item.id)
+ })
+ }
+ window.location.href = '/api/lawss/activiti/exportProcessDetailInfo?idAndSartypeList=' + ids.join(',') + '&prcNum=' + this.$route.query.prcNum
+ this.$message.success('导出信息成功')
}
- window.location.href = '/api/lawss/activiti/exportProcessDetailInfo?idAndSartypeList=' + ids.join(',') + '&prcNum=' + this.$route.query.prcNum
- this.$message.success('导出信息成功')
},
// 表格排序
sortChange(sortObj) {
From 5b069a66a7891eda78e679209881c1ab0c74821b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 31 Jan 2024 10:35:33 +0800
Subject: [PATCH 07/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/index.js | 2 +
.../processNodeInformation/index.vue | 551 ++++++++++++++++++
.../pages/creatProcess/bzzqyj/step1-9.vue | 117 ++--
.../pages/creatProcess/bzzqyj/step2.vue | 129 ++--
.../pages/creatProcess/bzzqyj/step3.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step4-1.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step4-2.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step4.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step5-1.vue | 129 ++--
.../pages/creatProcess/bzzqyj/step5.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step6.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step7.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step8.vue | 127 ++--
.../pages/creatProcess/bzzqyj/step9.vue | 127 ++--
.../pages/processDetail/index.vue | 1 -
.../tabComponents/processCenter/index.vue | 39 +-
16 files changed, 1371 insertions(+), 740 deletions(-)
create mode 100644 src/components/processNodeInformation/index.vue
diff --git a/src/components/index.js b/src/components/index.js
index cb817aa18..099c29b90 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -27,6 +27,7 @@ import SQTree from './SQTree'
import OrgTable from './OrgTable'
import MySelect from './mySelect'
import PhoneHistortTable from './phoneHistortTable'
+import processNodeInformation from './processNodeInformation'
import phoneRole from './phoneRole'
@@ -57,6 +58,7 @@ const install = function (Vue) {
Vue.component('MySelect', MySelect)
Vue.component('phoneRole', phoneRole)
Vue.component('PhoneHistortTable', PhoneHistortTable)
+ Vue.component('processNodeInformation', processNodeInformation)
}
export default {
diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue
new file mode 100644
index 000000000..3176aa671
--- /dev/null
+++ b/src/components/processNodeInformation/index.vue
@@ -0,0 +1,551 @@
+
+
+
+
+
+ 开始
+
+
+
+
+
+
+ {{item.taskKeyName}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 结束
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.commitText }}
+
+
+
+
+ {{ scope.row.taskStatusShow }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}
+
+
+
+
+
流程列表加载中
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index 39e2ce387..b6108727c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -171,61 +171,66 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}
-
-
-
-
数据获取中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+