diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 2e5e7caad..29e648d0a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -684,12 +684,23 @@ + + + @@ -697,13 +708,18 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,processCreateStand} from 'api/process' + import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; export default { name: "bzrkStep2", data () { return { + // 调整处理人抽屉状态 + drawerModal: false, + drawerTitle: '', + nodeList: [], + selectPeople:'', xgdFileId: '', fbgbjbdFileId: '', bpgFileId: '', @@ -877,6 +893,26 @@ }, }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.queryProcess() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, downloadFile (fileType) { //文件id中出现了','字符,去除掉 if(fileType === 'fbgbjbd'){ @@ -1032,6 +1068,10 @@ handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, handleSave() {}, handleSubmit() { const val= this.form.country; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 983b1fe33..0de89934e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -665,10 +665,19 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + @transfer="handleTransfer" @save="handleSave" @submit="handleSubmit" > + + @@ -677,7 +686,7 @@ import {saveTaskFirst} from "api/process"; import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail,processCreateStand} from 'api/process' +import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; export default { @@ -835,6 +844,11 @@ export default { // 流程路由信息 prcNum : this.$route.query.prcNum, prcName : this.$route.query.prcName, + // 调整处理人抽屉状态 + drawerModal: false, + drawerTitle: '', + nodeList: [], + selectPeople:'', } }, components: { @@ -849,6 +863,26 @@ export default { }, }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.queryProcess() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, downloadFile (fileType) { if(fileType === 'fbgbjbd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",",""); @@ -991,6 +1025,10 @@ export default { handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, handleSave() { this.saveLoading = true let _formData = new FormData() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 81ad48785..ed0db369b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1041,6 +1041,14 @@ 提交 + + @@ -1049,7 +1057,7 @@ import {saveTaskFirst, queryTaskFirst} from "api/process"; import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail,processCreateStand} from 'api/process' +import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -1283,6 +1291,11 @@ export default { // 流程路由信息 prcNum : this.$route.query.prcNum, prcName : this.$route.query.prcName, + // 调整处理人抽屉状态 + drawerModal: false, + drawerTitle: '', + nodeList: [], + selectPeople:'', } }, computed: { @@ -1291,6 +1304,26 @@ export default { }, }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.queryProcess() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, getTaskId () { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 1a8b1978f..703b60f80 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -370,6 +370,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 93a09b3d9..b838b003b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -334,6 +334,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 255d7c4e4..51123b86d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -333,6 +333,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 66108ec28..d7f86783d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -333,6 +333,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index b9672a366..42ee80131 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -318,6 +318,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 152d68422..6129cbca3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -316,6 +316,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 04a6c9f54..f5ba8d935 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -318,6 +318,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index b2797122b..dcd9cb57d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -271,6 +271,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 7b8d1c6b8..47973d3bd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -473,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, @@ -567,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 64fa1fda8..d5d1f6c90 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -444,6 +444,7 @@ export default { }, data() { return { + nodeList:[], isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 43d8be633..d0f81fbdf 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -318,6 +318,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 670eb9990..4c1f58735 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -316,6 +316,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index d17811e59..af43983f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -318,6 +318,8 @@ export default { }, data() { return { + nodeList:[], + drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 4844a5468..fbb422655 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -128,7 +128,7 @@ 查看 - 强制撤回 + 撤回 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 1cc0226a8..643f200b2 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -184,11 +184,16 @@ label="标准号" > @@ -197,7 +202,8 @@ label="标准名称" > @@ -227,7 +235,8 @@ width="150px" label="新车型实施日期"> --> diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c65b035dd..bf92cb8d4 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -297,7 +297,9 @@ > diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 6fa61cf87..d8f118bf8 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -189,7 +189,11 @@ width="110px" label="发布日期"> @@ -209,7 +213,7 @@ width="150px" label="新车型实施日期"> -->