Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/pages/processCenter/pages/newProcess/index.vue
This commit is contained in:
zhutianqi
2021-10-26 16:36:17 +08:00
4 changed files with 92 additions and 0 deletions
@@ -202,6 +202,36 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('19')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">加入标准化协会信息提报流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('20')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
</div>
</div>
</div>
@@ -328,6 +358,18 @@ export default {
name: 'wbsmStep1'
})
break
case '19':
//加入标准化协会信息提报流程
this.$router.push({
name: 'jrbzhxhStep1'
})
break
case '20':
//参与外部标准制修订信息提报流程
this.$router.push({
name: 'cywbbzzxdStep1'
})
break
}
},
checkPermission(permissionIdArray) {