diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 01b160c62..688bac9c7 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -117,7 +117,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '企标编写汇总修订'){
+ }else if (row.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibrary3',
query: {
@@ -128,7 +128,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){
+ }else if (row.taskInfo === '重新起草'){
this.$router.push({
name: 'bussLibraryC1',
query: {
@@ -139,7 +139,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '标准化员初审'){
+ }else if (row.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibrary4',
query: {
@@ -150,7 +150,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新企标汇总修订'){
+ }else if (row.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryC3',
query: {
@@ -161,7 +161,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '会签征求意见'){
+ }else if (row.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibrary5',
query: {
@@ -172,7 +172,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '技术委员会评审/评审意见修改评审'){
+ }else if (row.taskInfo === '技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibrary6',
query: {
@@ -183,7 +183,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '复审'){
+ }else if (row.taskInfo === '标准化复审'){
this.$router.push({
name: 'bussLibrary7',
query: {
@@ -194,7 +194,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新技术委员会评审/评审意见修改评审'){
+ }else if (row.taskInfo === '重新技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibraryC6',
query: {
@@ -249,7 +249,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '培训'){
+ }else if (row.taskInfo === '主起草人培训'){
this.$router.push({
name: 'bussLibrary12',
query: {
@@ -285,7 +285,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '企标编写汇总修订'){
+ }else if (row.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibraryProduct3',
query: {
@@ -296,7 +296,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新企标编写汇总修订'){
+ }else if (row.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryProductC3',
query: {
@@ -307,7 +307,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '标准化员初审'){
+ }else if (row.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibraryProduct4',
query: {
@@ -318,7 +318,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '会签征求意见'){
+ }else if (row.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibraryProduct5',
query: {
@@ -329,7 +329,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '意见汇总及标准修改'){
+ }else if (row.taskInfo === '意见汇总修订'){
this.$router.push({
name: 'bussLibraryProduct6',
query: {
@@ -340,7 +340,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新意见汇总及标准修改'){
+ }else if (row.taskInfo === '重新意见汇总修订'){
this.$router.push({
name: 'bussLibraryProductC6',
query: {
@@ -420,7 +420,7 @@ export default {
}
break;
case 'buss3':
- if (row.taskInfo === '对接人选择复审人') {
+ if (row.taskInfo === '选择复审人') {
this.$router.push({
name: 'qbfsStepSub1',
query: {
@@ -431,7 +431,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '复审人选择复审结果'){
+ }else if (row.taskInfo === '复审'){
this.$router.push({
name: 'qbfsStepSub2',
query: {
@@ -442,7 +442,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '发起人汇总结果'){
+ }else if (row.taskInfo === '汇总'){
this.$router.push({
name: 'bussFs2',
query: {
@@ -453,7 +453,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新发起人汇总结果'){
+ }else if (row.taskInfo === '重新汇总'){
this.$router.push({
name: 'bussFsC2',
query: {
@@ -464,7 +464,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '标准法规部高级经理批准'){
+ }else if (row.taskInfo === '批准'){
this.$router.push({
name: 'bussFs3',
query: {
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 4d5c3e846..e08585b67 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -126,7 +126,7 @@ export default {
methods: {
getPrcNameFilter(row){
if(row && row.prcType === 'buss3'){
- return row.prcName + '-' + row.taskInfo
+ return row.prcName
}else {
return row.prcName
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 014adfead..a4f738e4f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1340,10 +1340,17 @@
+
+
{
this.loadSarStandard = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 6d38ecf8d..37634e781 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -667,6 +667,8 @@ export default {
} else {
mes.form.endTime = ''
}
+ this.addFjList = mes.filesId
+ this.form.fjListName = mes.filesName
this.form = mes.form
this.roleForm = mes.roleForm
this.commentText1 = mes.commentText1 || ''
@@ -831,8 +833,8 @@ export default {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText1
- json.filesId = this.roleForm.dockUserList
- json.filesName = this.roleForm.dockUserListName
+ json.filesId = this.addFjList
+ json.filesName = this.form.fjListName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index e4d758d0c..f5791462e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -3,7 +3,7 @@
标准征求意见流程
-
+ 批准