From 8331a3f59b258f8ef003d1651d4a0f5fd379affd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 29 Jan 2022 16:26:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 14 +++++++------- .../pages/creatProcess/bzqdfb/step1-1.vue | 14 +++++++------- .../pages/creatProcess/bzqdfb/step1.vue | 18 +++++++++--------- .../pages/creatProcess/qbzxdjhgk/step1.vue | 18 +++++++++--------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 60e702bfb..0533d6b01 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -200,7 +200,7 @@

标准法规工程师

- +
@@ -208,11 +208,11 @@ -

标准法法规业务经理

+

标准法规部法规分析业务经理

- +
@@ -221,11 +221,11 @@ -

标准法规部领导

+

标准法规部高级经理

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 47c932a89..477713585 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -193,10 +193,10 @@ :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> -

会签人

+

相关业务单位

-
@@ -207,10 +207,10 @@ :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> -

标准/政策法规工程师

+

标准法规工程师

-
@@ -220,11 +220,11 @@ :color="roleForm.directorUser ? '#66b1ff' : ''"> -

业务经理

+

标准法规部法规分析业务经理

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 315f76072..17785de35 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -180,10 +180,10 @@ -

标准/政策法规工程师

+

标准法规工程师

-
@@ -193,10 +193,10 @@ :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> -

会签人

+

相关业务单位

-
@@ -207,10 +207,10 @@ :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> -

标准/政策法规工程师

+

标准法规工程师

-
@@ -220,11 +220,11 @@ :color="roleForm.directorUser ? '#66b1ff' : ''"> -

业务经理

+

标准法规部法规分析业务经理

- +
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index db28bc71c..9154cd1d9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -114,11 +114,11 @@ :color="roleForm.examine ? '#66b1ff' : ''"> -

标准体系专业工作组组长

+

标准体系工作组组长

- +
@@ -128,11 +128,11 @@ :color="roleForm.approver ? '#66b1ff' : ''"> -

工程研究总院标准法规部高级经理

+

标准法规部高级经理

- +
@@ -142,11 +142,11 @@ :color="roleForm.engineer ? '#66b1ff' : ''"> -

相关单位人员、工程研究总院标准法规部周知

+

相关单位、工程研究总院标准法规部

- +
From 1bab862ca7315ccc27de7838a0ce81f45f1e50e7 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 29 Jan 2022 16:36:34 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 4 ++-- .../pages/creatProcess/bzrk/step1.vue | 20 +++++++++---------- .../pages/creatProcess/qbzxdlx/step1.vue | 8 ++++---- .../pages/creatProcess/wfhxzg/step1.vue | 20 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 22d7edfb3..3c4a30940 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1588,7 +1588,7 @@ export default { }, tabsClick(tab, event){ this.historyInfoLoading = true - if (this.commentAverageScoreTag === '1'){ + if (this.commentAverageScoreTag === '1' || this.commentActiveName === 'historyComment'){ this.indexType = 'quality' //查询评分表 const allData = { @@ -1607,7 +1607,7 @@ export default { this.historyInfoLoading = false }) } - else if (this.commentAverageScoreTag === '2'){ + else if (this.commentAverageScoreTag === '2' || this.commentActiveName === 'dynamicComment'){ this.indexType = 'dynamic' //查询评分表 const allData = { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 654101b8b..b7bd1c157 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -953,9 +953,9 @@ -

流程发起人

+

标准法规工程师

- +
@@ -963,9 +963,9 @@ -

会签责任人

+

责任工程师

- +
@@ -974,9 +974,9 @@ -

修订申请人

+

标准法规工程师

- +
@@ -984,9 +984,9 @@ -

标准法规业务经理

+

标准法规部法规分析业务经理

- +
@@ -1598,10 +1598,10 @@ export default { }, roleRules: { zrUserName: [ - {required: true, message: '请选择会签责任人', trigger: 'blur'}, + {required: true, message: '请选择责任工程师', trigger: 'blur'}, ], jlUserName: [ - {required: true, message: '选择标准法规业务经理', trigger: 'blur'}, + {required: true, message: '请选择标准法规部法规分析业务经理', trigger: 'blur'}, ], }, rules: { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index b919a4c6c..32e0b76fc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -107,10 +107,10 @@ -

流程发起人

+

标准法规工程师

- +
@@ -118,10 +118,10 @@ -

责任人

+

责任工程师

- +
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 14cfd3585..2e97cd128 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -76,10 +76,10 @@ -

流程发起人

+

标准法规工程师

- +
@@ -87,10 +87,10 @@ -

标准法规工程师

+

标准法规部法规分析业务经理

- +
@@ -99,10 +99,10 @@ -

确认+选择责任人

+

责任工程师

- +
@@ -111,10 +111,10 @@ -

负责人

+

产品工程经理/项目经理

- +
@@ -123,10 +123,10 @@ -

分发负责人

+

标准法规部高级经理

- +
From f2520e939debb2a0a2a9de8dc9d6e8d11f3c10d5 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 29 Jan 2022 17:22:51 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 63 +++++++++++++++++-- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 3c4a30940..618b26228 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -23,7 +23,7 @@ style="border-top:none;position: absolute;right: 36px;">
- 企标评价 + 企标评价 @@ -1589,7 +1589,11 @@ export default { tabsClick(tab, event){ this.historyInfoLoading = true if (this.commentAverageScoreTag === '1' || this.commentActiveName === 'historyComment'){ - this.indexType = 'quality' + if (this.commentActiveName === 'dynamicComment') { + this.indexType = 'dynamic' + } else { + this.indexType = 'quality' + } //查询评分表 const allData = { lawId: this.$route.params.id, @@ -1607,7 +1611,7 @@ export default { this.historyInfoLoading = false }) } - else if (this.commentAverageScoreTag === '2' || this.commentActiveName === 'dynamicComment'){ + else if (this.commentAverageScoreTag === '2'){ this.indexType = 'dynamic' //查询评分表 const allData = { @@ -2857,7 +2861,58 @@ export default { let value2 = b[property] return value1 - value2 } - } + }, + + qbBtn() { + if (this.commentActiveName === 'historyComment'){ + this.indexType = 'quality' + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.qualityFirstHistoryPeopleId, + evaluationType: this.indexType, + processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + this.qualityHistoryCommentTable = res.data + this.historyInfoLoading = false + + }, e => { + this.historyInfoLoading = false + }) + } + else if (this.commentActiveName === 'dynamicComment'){ + this.indexType = 'dynamic' + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.dynamicFirstHistoryPeopleId, + evaluationType: this.indexType + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + this.dynamicHistoryCommentTable = res.data + this.historyCommentForm.revise = res.data[0].targetScore + this.historyCommentForm.reviseReason = res.data[0].commentReason + + let averageScore = 0 + res.data.forEach(item => { + if (item.valueType === 'number'){ + averageScore += parseInt(item.targetScore) + } + }) + averageScore = averageScore / 4 + this.historyCommentForm.averageScore = averageScore + this.historyInfoLoading = false + }, e => { + this.historyInfoLoading = false + }) + } + this.businessCommentDialog = true + }, }, computed: { titleShow () { From 61b01adc52a1506a2fc65535963007505ae579b6 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sat, 29 Jan 2022 18:21:05 +0800 Subject: [PATCH 04/11] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 23 +-- .../pages/creatProcess/bzdy/step1.vue | 18 +- .../pages/creatProcess/bzjd/step1.vue | 4 +- .../pages/creatProcess/bzzqyj/step1-1.vue | 165 ++++++++---------- .../pages/creatProcess/bzzqyj/step1.vue | 38 ++-- 5 files changed, 116 insertions(+), 132 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 60a3757f0..e32d5e96d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -128,13 +128,13 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form myForm"> - + -

流程发起人

+

标准法规工程师

- +
@@ -145,7 +145,7 @@

责任部门对接人

- +
@@ -157,7 +157,7 @@

标准法规部部长

- +
@@ -165,21 +165,22 @@ -

技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任

+

技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任

- + +
- + -

工程研究总院院长或标准法规主管副院长

+

工程研究总院院长/标准法规业务主管副院长

- +
@@ -417,7 +418,7 @@ 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/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index a03049987..21ca32528 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -128,13 +128,13 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form myForm"> - + -

流程发起人

+

标准法规工程师

- +
@@ -165,22 +165,22 @@ -

技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任

+

技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任

- +
- + -

工程研究总院院长或标准法规主管副院长

+

工程研究总院院长/标准法规业务主管副院长

- +
@@ -408,7 +408,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/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 67061750b..5e70a334e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -220,10 +220,10 @@ -

流程发起人

+

标准法规工程师

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 142a2f9e0..0262d6ef5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -12,98 +12,81 @@
- - - -
- - - -
- 选择标准 -
+ ref="Form" + :model="roleForm" + :rules="roleFormRules" + class="label-input-form myForm"> + + + +

标准法规工程师

+
+ + +
+ + + + + + +

标准法规工程师、事业部标准化员

+
+ - - - - - - - - - - - - -
- 选择附件 -
+ v-model="roleForm.dockUserListName" + placeholder="选择标准法规工程师、事业部标准化员" + @click.native="choiceZRRS('1')"> + +
+ + + + + + +

标准法规部高级经理、责任部门高级经理

+
+ -
-
- {{ item.fileName }} - -
-
- - + v-model="roleForm.ministerUserName" + placeholder="选择标准法规部高级经理、责任部门高级经理" + @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)" + /> +
+ + + + + + +

技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任

+
+ -
-
- {{ item.name }} - -
-
-
- - 点击上传 - -
- - - -
+ v-model="roleForm.directorUserName" + placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任" + @click.native="choiceZRRS('2')" + /> +
+ + + + + + +

工程研究院总院院长/标准法规业务主管副院长

+
+ + +
+ + +
@@ -794,12 +777,12 @@ export default { this.type2 = type this.nodeList2 = [] if (type === '1') { - this.drawerTitle2 = '选择责任部门对接人' + this.drawerTitle2 = '选择标准法规工程师、事业部标准化员' if ( this.roleForm.dockUserList.length > 0) { 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 a24757b4e..5427e7b06 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -128,72 +128,72 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form myForm"> - + -

流程发起人

+

标准法规工程师

- +
- + -

责任部门对接人

+

标准法规工程师、事业部标准化员

 - + -

标准法规部部长

+

标准法规部高级经理、责任部门高级经理

 - + -

技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任

+

技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任

 - + -

工程研究总院院长或标准法规主管副院长

+

工程研究院总院院长/标准法规业务主管副院长

 @@ -782,12 +782,12 @@ export default { this.type2 = type this.nodeList2 = [] if (type === '1') { - this.drawerTitle2 = '选择责任部门对接人' + this.drawerTitle2 = '选择标准法规工程师、事业部标准化员' if ( this.roleForm.dockUserList.length > 0) { this.nodeList2 = this.roleForm.dockUserList.split(',') } } else { - this.drawerTitle2 = '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' + this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任' if (this.roleForm.directorUser.length > 0) { this.nodeList2 = this.roleForm.directorUser.split(',') } From 61ba03c74ef7bf0f6f88ed6fef4d7ac4bc850284 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 29 Jan 2022 19:12:02 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 114 ++++++++++++++++-- 1 file changed, 101 insertions(+), 13 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 618b26228..d66c41d6c 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -25,7 +25,7 @@
企标评价 - + - {{ scope.row.targetScore * 2 }} + {{ scope.row.targetScore * 2 }} @@ -1585,15 +1585,98 @@ export default { }) } + }, + tabsClickBtn(tab, event){ + if (this.commentActiveName === 'dynamicComment'){ + this.indexType = 'dynamic' + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.qualityFirstHistoryPeopleId, + evaluationType: this.indexType, + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + this.qualityHistoryCommentTable = res.data + this.historyInfoLoading = false + + }, e => { + this.historyInfoLoading = false + }) + } + else if (this.commentActiveName === 'historyComment'){ + this.historyInfoLoading = true + this.indexType = 'quality' + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.dynamicFirstHistoryPeopleId, + evaluationType: this.indexType + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + this.dynamicHistoryCommentTable = res.data + this.historyCommentForm.revise = res.data[0].targetScore + this.historyCommentForm.reviseReason = res.data[0].commentReason + + let averageScore = 0 + res.data.forEach(item => { + if (item.valueType === 'number'){ + averageScore += parseInt(item.targetScore) + } + }) + averageScore = averageScore / 4 + this.historyCommentForm.averageScore = averageScore + this.historyInfoLoading = false + }, e => { + this.historyInfoLoading = false + }) + } + + //查询动态评价总平均分和质量评价总平均分 + let standId = this.$route.params.id + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { + _this: this + }, res => { + this.qualityCommentScore = res.data.quality.toFixed(3)/2 + this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + + }, e => { + }) + + // 刷新质量评价评分人表格和动态评价评分人表格 + const qualityRequest = { + lawId: standId, + evaluationType: 'quality' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, { + _this: this + }, res => { + this.qualityHistoryPeopleTable = res.data.records + this.qualityFirstHistoryPeopleId = res.data.records[0].userId + + }, e => { + }) + const dynamicRequest = { + lawId: standId, + evaluationType: 'dynamic' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { + _this: this + }, res => { + this.dynamicHistoryPeopleTable = res.data.records + this.dynamicFirstHistoryPeopleId = res.data.records[0].userId + + }, e => { + }) + }, tabsClick(tab, event){ this.historyInfoLoading = true - if (this.commentAverageScoreTag === '1' || this.commentActiveName === 'historyComment'){ - if (this.commentActiveName === 'dynamicComment') { - this.indexType = 'dynamic' - } else { + if (this.commentAverageScoreTag === '1'){ this.indexType = 'quality' - } //查询评分表 const allData = { lawId: this.$route.params.id, @@ -2864,27 +2947,32 @@ export default { }, qbBtn() { - if (this.commentActiveName === 'historyComment'){ - this.indexType = 'quality' + if (this.commentActiveName === 'dynamicComment'){ + this.indexType = 'dynamic' //查询评分表 const allData = { lawId: this.$route.params.id, userId: this.qualityFirstHistoryPeopleId, evaluationType: this.indexType, - processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null } this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { _this: this }, res => { - this.qualityHistoryCommentTable = res.data + let averageScore = 0 + res.data.forEach(item=>{ + item.targetScore = Number(item.targetScore)/2 + averageScore += item.targetScore + }) + this.businessCommentForm.averageScore = averageScore/4 + this.businessCommentTable = res.data this.historyInfoLoading = false }, e => { this.historyInfoLoading = false }) } - else if (this.commentActiveName === 'dynamicComment'){ - this.indexType = 'dynamic' + else if (this.commentActiveName === 'historyComment'){ + this.indexType = 'quality' //查询评分表 const allData = { lawId: this.$route.params.id, From 3d36948e9bf4c40996c026da032cecf95db7743b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 7 Feb 2022 15:53:47 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 0533d6b01..b83cd4a39 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -918,22 +918,34 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.post("lawss/activiti/completeTask", { + let specialJson = { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: "5", + json: { + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + } + }; + this.$http.post("lawss/activiti/completeTaskNew", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, json: JSON.stringify(json), + specialJson: JSON.stringify(specialJson) }, { _this: this }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { + if (this.bpnId !== "") { let taskId = { id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) + }; + taskDel(taskId).then(res => { + return res; + }); } this.$router.push("/processCenter"); } From e15e9574a8607392653458c48f07aacaa10df226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 7 Feb 2022 16:51:34 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8D=89=E7=A8=BF=E5=8F=8A=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 15 ++++-- .../tabComponents/taskDraft/index.vue | 49 +++---------------- 2 files changed, 18 insertions(+), 46 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index b83cd4a39..f506012a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1125,10 +1125,17 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes); - this.listForm = mes.listForm; - this.dataList = mes.listForm.dataList - this.roleForm = mes.roleForm; - this.commentText = mes.commentText; + if(!mes.json){ + this.listForm = mes.form + this.dataList = mes.form.dataList; + this.roleForm = mes.roleForm + this.commentText = mes.commentText + }else{ + this.listForm = mes.json.form; + this.dataList = mes.json.form.dataList + this.roleForm = mes.json.roleForm; + this.commentText = mes.json.commentText; + } }); }, }, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index d9d3608df..0019a5ff9 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -616,49 +616,14 @@ export default { } break case '5': - if(mes !== null && mes.taskInfo !== null){ - if (mes.taskInfo === '选择已拆分标准') { - this.$router.push({ - name: 'xmpgStep1-1', - query: { - type: '5', - processName: '项目合规评估流程-标准', - bpnId: id, - verifySarStandard: true, - } - }) + this.$router.push({ + name: 'bzpgStep1', + query: { + type: '5', + processName: '项目合规评估流程-标准', + bpnId: id } - // else if (mes.taskInfo === '分发责任人分发任务') { - // this.$router.push({ - // name: 'bzqdfbStep1-3', - // query: { - // type: '5', - // processName: '项目合规评估流程-标准', - // bpnId: id - // } - // }) - // }else if (mes.taskInfo === '责任人填写评估反馈') { - // this.$router.push({ - // name: 'bzqdfbStep1-3', - // query: { - // type: '5', - // processName: '项目合规评估流程-标准', - // bpnId: id - // } - // }) - // } - }else { - this.$router.push({ - name: 'xmpgStep1-1', - query: { - type: '5', - processName: '项目合规评估流程-标准', - bpnId: id, - verifySarStandard: true, - } - }) - } - + }) break case '6': this.$router.push({ From beea2bd79860744dc8e13c74781ebdf53fcf2061 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, 8 Feb 2022 10:54:34 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step1.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index f506012a9..b5ac7fa03 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -16,7 +16,7 @@ { + this.decomposeOptions = res.data; + }); }) }, //折叠/展开基础信息方法 @@ -1154,6 +1159,7 @@ export default { this.getData() } if(this.$route.query.taskIds){ + //被驳回时调用 this.getHistoryData() } this.getStandData(); From 608f85d1edbad534501f1765bd8675e970f35695 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, 8 Feb 2022 10:56:50 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzpg/step1.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index b5ac7fa03..e2122fbc4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1135,11 +1135,21 @@ export default { this.dataList = mes.form.dataList; this.roleForm = mes.roleForm this.commentText = mes.commentText + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: mes.form.standId + }, {}, res => { + this.decomposeOptions = res.data; + }); }else{ this.listForm = mes.json.form; this.dataList = mes.json.form.dataList this.roleForm = mes.json.roleForm; this.commentText = mes.json.commentText; + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: mes.json.form.standId + }, {}, res => { + this.decomposeOptions = res.data; + }); } }); }, From 73d36025e2caa7e9306da31c8dfefd004dd29acd Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 8 Feb 2022 14:42:05 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 2 +- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index f30255b14..1ff6ac433 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1803,7 +1803,7 @@ export default { .to-do-list { margin-right: 10px; border-radius: 3px; - height: calc(~'100% - 269px'); + height: calc(~'100% - 245px'); overflow: hidden; background: #FFFFFF; box-shadow: 1px 1px 10px rgba(0,0,0,0.1); diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 2e97cd128..9396af382 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -285,7 +285,6 @@