diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 54735c410..6983aaa6e 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -149,11 +149,11 @@ export default {
// // title: '子公司标准库',
// // path: '/subsidiaryStandardLibrary'
// // }
- {
+ /* {
title: '车型/项目库',
path: '/localProductsOrProjectLibrary',
menuId: '42ce39c9f953be65a3e5643a4a2c786f'
- },
+ },*/
{
title: '未符合项整改',
path: '/nonConfomity',
diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue
index f7e585052..062572dca 100644
--- a/src/pages/home1/components/todoList/index.vue
+++ b/src/pages/home1/components/todoList/index.vue
@@ -607,6 +607,35 @@ export default {
}
})
}
+ break
+ //项目清单确认流程
+ case '10' :
+ if(row.taskInfo === '确认人确认'){
+ this.$router.push({
+ name: 'xmqdqrStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ // else if (row.taskInfo === '上传佐证材料填写信息') {
+ // this.$router.push({
+ // name: 'wfhxzgStep4',
+ // query: {
+ // taskIds: row.taskIds,
+ // prcId: row.prcId,
+ // prcNum: row.prcNum,
+ // prcName: row.prcName,
+ // prcType: row.prcType
+ // }
+ // })
+ // }
+ break
+
}
},
},
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 07e605e5a..a3fc3a5c0 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -38,6 +38,15 @@
:loading="submitLoading"
v-if="showOver"
>撤销申请
+ 转办
{
- if (item.xcxssrqgj === null) {
- this.$set(item, "XCXSSRQ", "");
- this.$set(item, "ZCCSSRQ", "");
- } else {
- this.$set(item, "XCXSSRQ", item.xcxssrqgj);
- this.$set(item, "ZCCSSRQ", item.zccssrqgj);
+ if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
+ item.xcxssrqgj = ''
+ }else{
+ this.$set(item, "XCXSSRQ", item.xcxssrqgj)
+ }
+ if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
+ item.zccssrqgj = ''
+ }else{
+ this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
});
this.listForm.dataList = res.data.records;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index b961e76cb..ef2978bae 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1305,11 +1305,15 @@ export default {
}
this.dataList = res.data.records;
this.dataList.forEach(item => {
- if(item.xcxssrqgj === 'undefined'){
+ if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
item.xcxssrqgj = ''
+ }else{
+ this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
- if(item.zccssrqgj === 'undefined'){
+ if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
item.zccssrqgj = ''
+ }else{
+ this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
})
this.listForm.dataList = this.dataList;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 83d65f7c4..bf383749b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -212,11 +212,22 @@
+
+
@@ -224,8 +235,9 @@
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";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
+import axios from "axios";
export default {
name: "bzqdfbStep2",
@@ -240,6 +252,7 @@ export default {
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
+ nodeList:[],
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
@@ -247,6 +260,8 @@ export default {
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
+ isTransfer: false,
+ drawerTitle:'',
saveLoading: false,
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
@@ -255,6 +270,8 @@ export default {
fileList:[],
fileIds: "",
commentText: "", //填写会签意见
+ // 调整处理人抽屉状态
+ drawerModal: false,
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
@@ -384,9 +401,46 @@ export default {
}
}
},
- //保存事件
- handleSave() {
-
+ //确认转办
+ checkedRole (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
},
//提交事件
handleSubmit() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index adcd8df25..9a78bbfad 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -377,14 +377,25 @@
+
+
@@ -392,7 +403,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
export default {
name: "bzqdfbStep3",
@@ -409,6 +420,11 @@ export default {
processType: 1,
searching: false,
commentText:'',
+ nodeList:[],
+ isTransfer: false,
+ drawerTitle:'',
+ // 调整处理人抽屉状态
+ drawerModal: false,
standardTypeOptions: [
{
value: "INLAND",
@@ -482,6 +498,47 @@ export default {
};
},
methods: {
+ //确认转办
+ checkedRole (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,
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 4f1126628..2e04cd733 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -214,15 +214,26 @@
+
+
@@ -230,7 +241,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail } from "api/process";
+import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process";
export default {
name: "bzqdfbStep4",
@@ -241,6 +252,11 @@ export default {
},
data() {
return {
+ nodeList:[],
+ isTransfer: false,
+ drawerTitle:'',
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -296,6 +312,47 @@ export default {
};
},
methods: {
+ //确认转办
+ checkedRole (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,
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index a26fc9188..4f5b90a81 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -213,14 +213,17 @@
{
- item.dutyPeopleInfo = this.roleRow.name
- item.dutyPeopleInfoId = this.roleRow.id
+ if (this.drawerTitle === '转办处理人') {
+ this.turnLoading = true
+ changeAssigneeNew({
+ taskId: this.taskIds, // 任务id
+ assignee: data[0].id, // 被委托人
+ userId: this.userId, // 委托人
+ pId: this.pId // 流程实例
+ }).then(res =>{
+ if (res.success) {
+ this.turnLoading = false
+ this.$message.success('调整成功')
+ this.$router.push("/processCenter")
+ } else {
+ this.$message.warning(res.message)
+ }
})
- this.$refs.multipleTable.clearSelection()
+ } else {
+ this.roleRow = data[0]
+ // 选取负责人时的操作
+ if (this.multipleSelection.length === 0) {
+ this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
+ this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
+ }else {
+ this.multipleSelection.forEach(item => {
+ item.dutyPeopleInfo = this.roleRow.name
+ item.dutyPeopleInfoId = this.roleRow.id
+ })
+ this.$refs.multipleTable.clearSelection()
+ }
+ this.lastDataList = this.dataList
+ // 选取流程信息完成
+ // this.roleForm.dutyUserInfoName = this.roleRow.name
}
- this.lastDataList = this.dataList
- // 选取流程信息完成
- // this.roleForm.dutyUserInfoName = this.roleRow.name
this.modalshowflag = false
},
//查询按钮
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index be1ddaff0..0c109cfbd 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -220,8 +220,11 @@
show-save
show-submit
show-back
+ show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ :transferLoading="turnLoading"
+ @transfer="handleTurnTo"
@back="handleSubmitNo"
@save="handleSave"
@submit="handleSubmit"
@@ -229,7 +232,7 @@
{
- item.dutyPeople = this.roleForm.name
- item.dutyPeopleId = this.roleForm.id
+ if (this.drawerTitle === '转办处理人') {
+ this.turnLoading = true
+ changeAssigneeNew({
+ taskId: this.taskIds, // 任务id
+ assignee: data[0].id, // 被委托人
+ userId: this.userId, // 委托人
+ pId: this.pId // 流程实例
+ }).then(res =>{
+ if (res.success) {
+ this.turnLoading = false
+ this.$message.success('调整成功')
+ this.$router.push("/processCenter")
+ } else {
+ this.$message.warning(res.message)
+ }
})
+ } else {
+ this.roleForm = data[0]
+ // 选择责任人时input框内值
+ if (this.selectTableMore.length ===0) {
+ this.newDataList.dutyPeople = this.roleForm.name
+ this.newDataList.dutyPeopleId = this.roleForm.id
+ }else {
+ this.selectTableMore.forEach(item => {
+ item.dutyPeople = this.roleForm.name
+ item.dutyPeopleId = this.roleForm.id
+ })
+ }
+ this.lastDataList = this.dataList
}
- this.lastDataList = this.dataList
this.modalshowflag = false
},
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 27137d828..7a200f535 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -217,12 +217,22 @@
+
@@ -230,14 +240,15 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {uploadFile} from '@/api/unqualProcess.js';
-import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
-import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries";
+import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process"
export default {
name: "wfhxzgStep4",
data() {
return {
+ drawerTitle: '',
+ nodeList: [],
+ modalshowflag: false, // drawer开关
detailData: [],
loading: false,
textarea: '', // 意见
@@ -251,9 +262,11 @@ export default {
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
+ turnLoading: false,
dataList: [],
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ userId: this.$route.query.taskAssignee,
// 当前页数
pageNo: 1,
total: 0,
@@ -409,6 +422,30 @@ export default {
})
window.open(routeUrl.href, '_blank')
},
+ drawerCheck (data) {
+ this.turnLoading = true
+ changeAssigneeNew({
+ taskId: this.taskIds, // 任务id
+ assignee: data[0].id, // 被委托人
+ userId: this.userId, // 委托人
+ pId: this.pId // 流程实例
+ }).then(res =>{
+ this.isSubmit = true
+ if (res.success) {
+ this.turnLoading = false
+ this.$message.success('调整成功')
+ this.$router.push("/processCenter")
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ this.modalshowflag = false
+ },
+ // 转办按钮
+ handleTurnTo() {
+ this.modalshowflag = true
+ this.drawerTitle = '转办处理人'
+ },
// 保存按钮
handleSave() {
let zqa = new Map();
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 8d0acf0d1..365125470 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -199,9 +199,12 @@
show-submit
show-back
approval
+ show-transfer
@back="handleSubmitNo"
:submitLoading="isSubmit"
:isSubmitBack="backLoading"
+ :transferLoading="turnLoading"
+ @transfer="handleTurnTo"
@submit="handleSubmit"
submitBTNText="同意"
>
@@ -215,6 +218,13 @@
>
+
@@ -223,12 +233,15 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {interfaceUrl} from "@/sysConfig";
-import {inboundLiaisonDetail} from "@/api/process";
+import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process";
export default {
name: "wfhxzgStep5",
data() {
return {
+ drawerTitle: '',
+ nodeList: [],
+ modalshowflag: false, // drawer开关
fileMadel: false,
detailData: [],
loading: false,
@@ -245,11 +258,13 @@ export default {
active: '1', // 默认显示
isSubmit: false,
backLoading: false,
+ turnLoading: false,
dataList: [],
json: {},
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
+ userId: this.$route.query.taskAssignee,
// 当前页数
pageNo: 1,
total: 0,
@@ -360,6 +375,29 @@ export default {
this.isSubmit = false
})
},
+ drawerCheck (data) {
+ this.turnLoading = true
+ changeAssigneeNew({
+ taskId: this.taskIds, // 任务id
+ assignee: data[0].id, // 被委托人
+ userId: this.userId, // 委托人
+ pId: this.pId // 流程实例
+ }).then(res =>{
+ if (res.success) {
+ this.turnLoading = false
+ this.$message.success('调整成功')
+ this.$router.push("/processCenter")
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ this.modalshowflag = false
+ },
+ // 转办按钮
+ handleTurnTo() {
+ this.modalshowflag = true
+ this.drawerTitle = '转办处理人'
+ },
handleSubmitNo() {
this.backLoading = true
if (this.commentText) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 91cc0a018..801ca865e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -178,14 +178,25 @@
+
+
@@ -193,7 +204,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: "xmpgStep2",
@@ -204,6 +215,11 @@ export default {
},
data() {
return {
+ nodeList:[],
+ isTransfer: false,
+ drawerTitle:'',
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -279,6 +295,47 @@ export default {
};
},
methods: {
+ //确认转办
+ checkedRole (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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index a4255e8e0..423aa3dd0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -208,13 +208,24 @@
+
+
@@ -222,7 +233,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep3",
@@ -233,6 +244,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
@@ -325,6 +339,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index dfde5a106..1a8b1978f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -333,13 +333,24 @@
+
+
@@ -348,7 +359,7 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import Moment from 'moment';
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep4",
@@ -359,6 +370,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -418,6 +432,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 68270b16a..93a09b3d9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -298,13 +298,24 @@
+
+
@@ -312,7 +323,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: "xmpgStep5",
@@ -323,6 +334,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -397,6 +411,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index d83c9cb7b..255d7c4e4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -297,13 +297,24 @@
+
+
@@ -311,7 +322,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: "xmpgStep6",
@@ -322,6 +333,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -396,6 +410,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 85cdf276e..66108ec28 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -297,13 +297,24 @@
+
+
@@ -311,7 +322,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: "xmpgStep7",
@@ -322,6 +333,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -396,6 +410,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 3be6e759d..b9672a366 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -281,14 +281,25 @@
+
+
@@ -296,7 +307,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: "xmpg2Step10",
@@ -307,6 +318,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index ceadc25bf..152d68422 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -281,12 +281,23 @@
+
+
@@ -294,7 +305,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: "xmpg2Step11",
@@ -305,6 +316,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -328,6 +342,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index cccc77338..04a6c9f54 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -281,14 +281,25 @@
+
+
@@ -296,7 +307,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: "xmpg2Step12",
@@ -307,6 +318,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index 2cf3cf149..b2797122b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -234,14 +234,25 @@
+
+
@@ -249,7 +260,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: "xmpg2Step2",
@@ -260,6 +271,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -283,6 +297,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index fa7f50d83..2b9320073 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -197,13 +197,24 @@
+
+
{
+ 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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 583ed86e1..5757fb5fe 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -206,12 +206,23 @@
+
+
{
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index a6811563d..47973d3bd 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -206,12 +206,23 @@
+
+
{
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -418,6 +473,8 @@ export default {
handleSubmit() {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
+ this.listForm.children = this.dataList[0].children
+ this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
@@ -512,14 +569,14 @@ export default {
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
- if (item.id == items.id) {
+ if (item.id === items.id) {
items.workPeople = "";
items.workPeopleId = "";
this.$message.warning('您只能针对条款进行分发')
}
if (items.children.length) {
items.children.map(childrenItem => {
- if (childrenItem.id == item.id) {
+ if (childrenItem.id === item.id) {
childrenItem.workPeople = data[0].name;
childrenItem.workPeopleId = data[0].id;
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 8401257ba..64fa1fda8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -342,12 +342,23 @@
+
+
{
+ 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
+ },
//批量编辑确定按钮事件
saveBatchEditForm() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 5f6a355c6..43d8be633 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -281,14 +281,25 @@
+
+
@@ -296,7 +307,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: "xmpg2Step7",
@@ -307,6 +318,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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
+ },
// 点击查看
handlePreview(item) {
console.log(item);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 9abb23b5b..670eb9990 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -279,14 +279,25 @@
+
+
@@ -294,7 +305,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: "xmpg2Step8",
@@ -305,6 +316,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -328,6 +342,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 1a41c0155..d17811e59 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -281,14 +281,25 @@
+
+
@@ -296,7 +307,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: "xmpg2Step9",
@@ -307,6 +318,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
};
},
methods: {
+ //确认转办
+ 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
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index e1d70fffc..57afe1297 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -383,14 +383,25 @@
+
+
@@ -398,7 +409,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
export default {
name: "xmqdqrStep2",
@@ -409,6 +420,9 @@ export default {
},
data() {
return {
+ isTransfer: false,
+ // 调整处理人抽屉状态
+ drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
@@ -468,6 +482,47 @@ export default {
});
},
methods: {
+ //确认转办
+ 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
+ },
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 23b76baf3..a3a901222 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -743,6 +743,7 @@ export default {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
+ taskAssignee: row.taskAssignee,
prcName: row.prcName,
prcType: row.prcType
}
@@ -754,6 +755,7 @@ export default {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
+ taskAssignee: row.taskAssignee,
prcName: row.prcName,
prcType: row.prcType
}
@@ -765,6 +767,7 @@ export default {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
+ taskAssignee: row.taskAssignee,
prcName: row.prcName,
prcType: row.prcType
}
@@ -776,6 +779,7 @@ export default {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
+ taskAssignee: row.taskAssignee,
prcName: row.prcName,
prcType: row.prcType
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index b9ebac65a..244c81671 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -9,12 +9,12 @@
-
+
+
+
@@ -23,8 +23,8 @@