From db34dcd7911caf17ad694ccac9175c178ae5bf39 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Sep 2021 16:45:21 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=96=E6=B8=85=E5=8D=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8Dref=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 6 +++--- .../pages/creatProcess/xmqdqr/step1-1.vue | 12 ++++++------ .../pages/creatProcess/xmqdqr/step1.vue | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 78963c902..bff12a826 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -305,7 +305,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectListChange" - ref="selection" + ref="listSelection" > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.listSelection.clearSelection() + this.$refs.listSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 3c394b217..70a72333c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -179,7 +179,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" - ref="selection" + ref="projectSelection" > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.listSelection.clearSelection() + this.$refs.listSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data @@ -605,8 +605,8 @@ export default { selectProjectChange(data) { // 单选 if (data.length > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.projectSelection.clearSelection() + this.$refs.projectSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 84e45ea32..72d440094 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -178,7 +178,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" - ref="selection" + ref="projectSelection" > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.listSelection.clearSelection() + this.$refs.listSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data @@ -604,8 +604,8 @@ export default { selectProjectChange(data) { // 单选 if (data.length > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.projectSelection.clearSelection() + this.$refs.projectSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data From 7ae9e262e801aa79bf9340eb52875d0b2ea97fe5 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, 2 Sep 2021 10:17:37 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=BA=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 13 +++++ .../pages/creatProcess/xmqdqr/step1-2.vue | 17 +++--- .../pages/creatProcess/xmqdqr/step2.vue | 58 ++++++++++++++----- 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 266344463..07e605e5a 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -66,6 +66,15 @@ :loading="submitLoading" v-if="showSubmit" >{{ submitBTNTextShow }} + 确认 @@ -131,6 +140,10 @@ export default { type: Boolean, default: false }, + showConfirm: { + type: Boolean, + default: false + }, // 是否显示委托按钮 showEntrust: { type: Boolean, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index fb27029e4..76bcc77c7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -349,14 +349,15 @@ export default { //动态表单读取 getFormFieldList(item) { this.$nextTick(() => { - this.qdform = JSON.parse(JSON.stringify(item)); - this.qdform.prcNum = this.prcNum; - this.qdform.prcName = this.prcName; - this.qdform["id"] = item.id; - this.projectId = item.projectId; - this.detailedId = item.detailedListId; - this.getStandData(); - this.getStand(); + if(item.form === undefined){ + this.qdform = JSON.parse(JSON.stringify(item)); + this.qdform.prcNum = this.prcNum; + this.qdform.prcName = this.prcName; + this.qdform["id"] = item.id; + }else{ + this.qdform = item.form + this.dataList =item.form.dataList + } }); }, //查询清单下的标准 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index d6786ff8b..ec81787ca 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -382,10 +382,13 @@ @@ -395,7 +398,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, saveTaskForPub } from "api/process"; export default { name: "xmqdqrStep2", @@ -517,14 +520,22 @@ export default { //动态表单读取 getFormFieldList(item) { this.$nextTick(() => { - this.qdform = JSON.parse(JSON.stringify(item)); - this.qdform.prcNum = this.prcNum; - this.qdform.prcName = this.prcName; - this.qdform["id"] = item.id; - // this.projectId = item.projectId; - this.detailedId = item.detailedListId; - // this.getStandData(); - this.getStand(); + if(item.form === undefined){ + this.qdform = JSON.parse(JSON.stringify(item)); + this.qdform.prcNum = this.prcNum; + this.qdform.prcName = this.prcName; + this.qdform["id"] = item.id; + // this.projectId = item.projectId; + //获取清单id 查询对应清单下的标准 + this.detailedId = item.detailedListId; + // this.getStandData(); + this.getStand(); + }else{ + this.qdform = item.form + this.dataList =item.form.dataList + this.detailedId = item.form.detailedListId; + this.getStand(); + } }); }, //查询清单下的标准 @@ -549,6 +560,26 @@ export default { // }); // }); // }, + //保存事件 + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + this.qdform.dataList = this.dataList + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "10"); + _formData.append('taskIds', this.taskIds) + _formData.append("json", JSON.stringify({ + form: this.qdform, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, //提交事件 handleSubmit() { this.isSubmit = true; @@ -623,7 +654,7 @@ export default { this.standList.map(item => { let addIndex addIndex = this.dataList.findIndex(items =>{ - return items.standId === item.id + return items.id === item.id }) if(addIndex > -1){ this.$message.warning('请勿重复添加数据') @@ -656,7 +687,8 @@ export default { this.pageSize = pageSize; this.getStand(); }, - getStand(data) { + //查询清单下的标准 + getStand() { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: this.detailedId, page: this.page, From 46afe87fea90ae1629acfa410e5650398fd33de8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 2 Sep 2021 13:55:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=20=E5=88=86=E9=A1=B5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 11 ++++++++--- .../regulatoryRepository/partCodeApply/index.vue | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 10d2c6945..b6edd4b70 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -138,7 +138,7 @@ class="common-button-primary" size="mini" v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'" - @click="querySarProStateZero">查询 + @click="querySarProStateZeroBtn">查询 + class="common-button-primary" @click="getTableByPageBtn"> 查询 @@ -203,6 +203,11 @@ export default { }) } }, + // 查询之后跳回第一页 + getTableByPageBtn(){ + this.pageNo = 1 + this.getTableByPage() + }, // 查询零部件table列表 getTableByPage() { this.tableLoading.loadData = true @@ -231,7 +236,7 @@ export default { //零件分类号 partCategoryCode: "" } - this.getTableByPage() + this.getTableByPageBtn() }, // 分页事件 pageChange(page) { From cbf2ebab7fa5174ce83bc97e4c7e83f839b286d8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 2 Sep 2021 15:09:28 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83/?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=20=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=88+?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index a391d8d4e..f8f02eaf0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -563,7 +563,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -998,6 +998,10 @@ export default { }; this.getStandData(); }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, //查询项目下的标准 getStandData() { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { From f197165cbbeabd064ff7c7d7580a766b8fc70b2f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 2 Sep 2021 15:20:34 +0800 Subject: [PATCH 05/11] feat: There is no way the Transfer and withdrawal --- .../pages/processDetail/index.vue | 52 ++++++-- .../processCenter/pages/processList/index.vue | 9 +- .../tabComponents/alreadySend/index.vue | 28 ++++ .../tabComponents/processCenter/index.vue | 61 +++++++++ .../tabComponents/taskDraft/index.vue | 120 ++++++++++++------ 5 files changed, 212 insertions(+), 58 deletions(-) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index f450ea977..40c5d9a12 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -29,7 +29,6 @@ v-if="tzclrEnable" class="common-button-default" @click="adjustmentHandler" - v-btn-permission="'39ETS7LEANXL8GG9MH8T'" round >调整处理人 @@ -113,17 +112,24 @@ 流程列表加载中 - - + + + + + + + + + + + + @@ -140,6 +146,8 @@ export default { loginPeople: '', // 调整处理人抽屉状态 drawerModal: false, + drawerTitle: '', + nodeList: [], tasksName: '', selectPeople: '', // loading @@ -167,6 +175,25 @@ export default { } }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.selectPeople.id, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.selectPeople.assigneeId, // 委托人 + pId: this.selectPeople.processInstanceId // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.processTable() + } else { + this.$message.warning(res.message) + } + }) + }, /** * @author liruohao * @date 2019/4/22 @@ -821,6 +848,7 @@ export default { adjustmentHandler () { if (this.tableRow.length === 1 && !this.tableRow[0].endTime) { this.drawerModal = true + this.drawerTitle = '调整处理人' this.selectPeople = this.tableRow[0] } else { this.$message.warning('请选择一条未完成的数据') diff --git a/src/pages/processCenter/pages/processList/index.vue b/src/pages/processCenter/pages/processList/index.vue index 33a6c4341..dc8e893b7 100644 --- a/src/pages/processCenter/pages/processList/index.vue +++ b/src/pages/processCenter/pages/processList/index.vue @@ -40,11 +40,10 @@ export default { title: '已发流程', name: 'AlreadySend' }, - { - title: '监控流程', - name: 'MonitorProcess', - permission: 'XYK2MHR5UMBL6SJ5BCHV' - }, + // { + // title: '监控流程', + // name: 'MonitorProcess', + // }, { title: '草稿', name: 'TaskDraft' diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 790046a7f..4844a5468 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -128,6 +128,7 @@ 查看 + 强制撤回 @@ -173,6 +174,33 @@ export default { case '查看': this.dealWith(command[0]) break + case '强制撤回': + this.rejectTaskToStart(command[0]) + break + } + }, + // 强制撤回 + rejectTaskToStart (rows) { + if (rows.isEnd === '0') { + this.$confirm('您确认要强制撤回该任务吗', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + confirmButtonClass: 'common-button-primary', + roundButton: true + }).then(() => { + this.$http.get('lawss/activiti/forceRecall', { + prcId: rows.prcId + }, { + _this: this + }, res => { + this.$message.success('撤回成功') + this.queryProcess() + }, e => { + }) + }) + } else { + this.$message.warning('当前流程数据已完成，请选择未完成的流程数据') } }, resetSelect () { //清空 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 0856bd2e9..49f4299c8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -134,6 +134,7 @@ 办理 + 转办 @@ -149,13 +150,24 @@ @pageChange="pageChange" @pageSizeChange="pageSizeChange"> 数据获取中 + + +