From 305ce2ea1b12c87b26cc9bd7fb4279e745d9cb44 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, 30 Dec 2021 16:07:13 +0800 Subject: [PATCH 1/7] commit --- .../pages/creatProcess/xmpg/step3.vue | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 5f71a91bc..d6d14e9ee 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -903,30 +903,34 @@ export default { standList.push(item); } }); - this.listForm.breakdownList = standList; - 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.approvalOpinion = ""; - this.listForm.signFlag = ""; - const json = JSON.stringify(this.listForm.breakdownList); - 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 => { - }); + if(standList.length < 1){ + this.$message.warning('请选择落实人') + }else{ + this.listForm.breakdownList = standList; + 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.approvalOpinion = ""; + this.listForm.signFlag = ""; + const json = JSON.stringify(this.listForm.breakdownList); + 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 => { + }); + } } }, drawerCheck(data) { From 2b460ad24d653250cedef43ce4a0ed792f1dbc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 4 Jan 2022 09:11:47 +0800 Subject: [PATCH 2/7] commit --- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index d6d14e9ee..d44502ae5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -935,7 +935,7 @@ export default { }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if (getlist.length == 1) { + if (getlist.length === 1) { this.roleRow = getlist[0]; } else { this.$refs.tree.setCheckedKeys([data.id]); From a0e238e57fc5b27a70ef8a23c47bbd88bb8901d7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 4 Jan 2022 09:36:47 +0800 Subject: [PATCH 3/7] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 9dd9b11ab..804dfd70f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -222,6 +222,7 @@ :on-success="importFileSuccess" :on-remove="importFileRemove" :show-file-list="true" + :file-list="form.modelList" >
@@ -242,6 +243,7 @@ :on-success="importFileSuccess2" :on-remove="importFileRemove2" :show-file-list="true" + :file-list="form.fjList" >
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index e8db14614..c7cca446e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -224,6 +224,7 @@ :on-success="importFileSuccess" :on-remove="importFileRemove" :show-file-list="true" + :file-list="form.fjList" >
@@ -244,6 +245,7 @@ :on-success="importFileSuccess2" :on-remove="importFileRemove2" :show-file-list="true" + :file-list="form.modelList" >
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 999e05d59..2e614ea85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -354,6 +354,7 @@ :on-success="importFileSuccess" :on-remove="importFileRemove" :show-file-list="true" + :file-list="form.modelList" >
@@ -787,7 +788,7 @@ export default { this.nodeList2 = this.roleForm.dockUserList.split(',') } } else { - this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' + this.drawerTitle2 = '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' if (this.roleForm.directorUser.length > 0) { this.nodeList2 = this.roleForm.directorUser.split(',') } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 679272a01..3e72263b0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -363,6 +363,7 @@ :on-success="importFileSuccess" :on-remove="importFileRemove" :show-file-list="true" + :file-list="form.modelList" >
@@ -786,7 +787,7 @@ export default { this.nodeList2 = this.roleForm.dockUserList.split(',') } } else { - this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' + this.drawerTitle2 = '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' if (this.roleForm.directorUser.length > 0) { this.nodeList2 = this.roleForm.directorUser.split(',') } From 16f55cd1d752491361eb1a2bba52fc9d676cc462 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 4 Jan 2022 10:03:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index ce92499e4..34eecdb81 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -176,7 +176,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentStep1"> + v-model="commentInfo">
From 6baea0650e7a1982ff32ee447200916aa00fe6a8 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 4 Jan 2022 10:32:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 738fc2820..06537d031 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -505,6 +505,8 @@ export default { } this.lastYear = selYear this.lastMonth = selMonth + // 获取日历变化的日期并显示 + this.value = new Date(this.value.setDate(1)) this.value = new Date(this.value.setMonth(this.value.getMonth() - monthNum)) this.value = new Date(this.value.setFullYear(this.value.getFullYear() - yearNum)) }, From 863311fcdc647eb30ac43a21b64560f51b77d1e7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 4 Jan 2022 11:08:32 +0800 Subject: [PATCH 6/7] commit --- .../workingGroup/components/workingGroup1/index.vue | 11 ++++++++--- .../workingGroup/components/workingGroup2/index.vue | 12 ++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index c2fdb3a50..f5b3b5368 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -222,7 +222,7 @@ label="我司在工作组排名顺序" prop="deptOrder" align="center" - width="150"> + width="170"> @@ -1555,6 +1555,7 @@ this.addForm.wgMeetingInfos.forEach(item => { item.joinfile = JSON.stringify(item.joinfile) }) + this.addForm.status = '3' this.$http.postData('wg_work_group/add', this.addForm, { _this: this }, res => { @@ -1670,6 +1671,7 @@ drawShape: function drawShape(cfg, group) { const level = cfg.level const nodeType = cfg.nature + const processType = cfg.status if (nodeType === '0') { const circle = group.addShape('circle', { attrs: { @@ -1760,7 +1762,11 @@ radius: (bbox.height + 12) / 2 }); // 自定义层级颜色 - if (nodeType === '1') { + if (processType !== '1') { + rect.attr({ + fill: '#666' + }); + } else if (nodeType === '1') { rect.attr({ fill: '#1C98B8' }); @@ -1880,7 +1886,6 @@ graph.setItemState(ce, 'click', false); }); const edgeItem = e.item; // 获取被点击的边元素对象 - console.log('EdgeClick', edgeItem) graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true this.handleEdgeClick (edgeItem) }); diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 966207c0f..7d6e0f37a 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -222,7 +222,7 @@ label="我司在工作组排名顺序" prop="deptOrder" align="center" - width="150"> + width="170"> @@ -1411,6 +1411,7 @@ this.addForm.wgMeetingInfos.forEach(item => { item.joinfile = JSON.stringify(item.joinfile) }) + this.addForm.status = '3' this.$http.postData('wg_work_group/add', this.addForm, { _this: this }, res => { @@ -1474,7 +1475,6 @@ this.headerNo = true let row = node._cfg.model this.addForm.pName = row.name - console.log(row); if (row.level === '2') { this.standId = row.wgStandorpolicyInfos[0].standId } @@ -1512,6 +1512,7 @@ drawShape: function drawShape(cfg, group) { const level = cfg.level const nodeType = cfg.nature + const processType = cfg.status if (nodeType === '0') { const circle = group.addShape('circle', { attrs: { @@ -1602,7 +1603,11 @@ radius: (bbox.height + 12) / 2 }); // 自定义层级颜色 - if (nodeType === '1') { + if (processType !== '1') { + rect.attr({ + fill: '#666' + }); + } else if (nodeType === '1') { rect.attr({ fill: '#1C98B8' }); @@ -1722,7 +1727,6 @@ graph.setItemState(ce, 'click', false); }); const edgeItem = e.item; // 获取被点击的边元素对象 - console.log('EdgeClick', edgeItem) graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true this.handleEdgeClick (edgeItem) }); From e93e07d5988e7c09a298ff41821f921d4180df72 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 4 Jan 2022 11:12:41 +0800 Subject: [PATCH 7/7] commit --- .../workingGroup/components/workingGroup1/index.vue | 2 +- .../workingGroup/components/workingGroup2/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index f5b3b5368..8fb1ea55b 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -1591,7 +1591,7 @@ this.destoryGraph() this.getData() } else { - this.$message.warning('修改失败') + // this.$message.warning(res.message) } }) } diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 7d6e0f37a..1dc9f030e 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -1447,7 +1447,7 @@ this.destoryGraph() this.getData() } else { - this.$message.warning('修改失败') + // this.$message.warning('修改失败') } }) }