From f53f85dc33d020540da6ebeadb362e8dccc4f2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 23 Sep 2021 14:34:50 +0800
Subject: [PATCH] commit
---
.../pages/creatProcess/xmpg/step1-7.vue | 164 ++++++++++++------
.../pages/creatProcess/xmpg/step7.vue | 2 +-
2 files changed, 114 insertions(+), 52 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
index 1fc659729..1503278e3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -15,7 +15,7 @@
基础信息
隐藏基础信息
展开基础信息
@@ -111,7 +111,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
- :height="sarProStateTableHeight"
+ height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -360,7 +381,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep1-7",
@@ -373,6 +394,11 @@ export default {
return {
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
+ nodeList:[],
+ drawerTitle:'',
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -451,6 +477,47 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
+ //确认转办
+ checkedTransferRole (data) {
+ this.assigneeNewLoading = true
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ assignee: data[0].id, // 被委托人
+ userId: this.$store.getters.userInfo.userId, // 委托人
+ pId: this.$route.query.prcId // 流程实例
+ }).then(res => {
+ this.isTransfer = false
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.$router.push("/processCenter");
+ this.processNum()
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+ // 请求转换流程图
+ processNum (row) {
+ axios.request({
+ url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+ responseType: 'blob',
+ method: 'get',
+ params: {
+ prcNum: this.$route.query.prcNum
+ }
+ }).then(res => {
+ // let blob = new Blob([res.data], {type: 'image/jpg'})
+ // let url = window.URL.createObjectURL(res.data)
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
+ //转办事件
+ handleTransfer(){
+ this.drawerModal = true
+ this.drawerTitle = '转办处理人'
+ this.selectPeople = row
+ },
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -517,35 +584,31 @@ export default {
},
//提交事件
handleSubmit() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- } else {
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
- this.listForm.commentText = this.commentText;
- this.listForm.standId = this.listForm.standId;
- this.listForm.fenFlag = "1";
- this.listForm.dataList = this.dataList
- const json = JSON.stringify(this.listForm);
- this.isSubmit = true
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- this.isSubmit = false
- }, e => {
+ this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+ this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+ this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+ this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+ this.listForm.commentText = this.commentText;
+ this.listForm.standId = this.listForm.standId;
+ this.listForm.fenFlag = "1";
+ this.listForm.dataList = this.dataList
+ const json = JSON.stringify(this.listForm);
+ this.isSubmit = true
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json,
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$router.push('/processCenter')
+ }
+ this.isSubmit = false
+ }, e => {
- });
- }
+ });
},
//标准表格选择框改变
selectStandChange(data) {
@@ -580,7 +643,6 @@ export default {