diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 22d7edfb3..d66c41d6c 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -23,9 +23,9 @@ style="border-top:none;position: absolute;right: 36px;">
- 企标评价 + 企标评价 - + - {{ scope.row.targetScore * 2 }} + {{ scope.row.targetScore * 2 }} @@ -1585,11 +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.indexType = 'quality' + this.indexType = 'quality' //查询评分表 const allData = { lawId: this.$route.params.id, @@ -2857,7 +2944,63 @@ export default { let value2 = b[property] return value1 - value2 } - } + }, + + qbBtn() { + 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 => { + 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 === 'historyComment'){ + 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 + }) + } + this.businessCommentDialog = true + }, }, computed: { titleShow () { 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/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 60e702bfb..f506012a9 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 @@ -

标准法规部领导

+

标准法规部高级经理

- +
@@ -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"); } @@ -1113,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/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/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/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(',') } 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' : ''"> -

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

+

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

- +
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 @@ -

分发负责人

+

标准法规部高级经理

- +
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({