FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/pages/processCenter/pages/newProcess/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
This commit is contained in:
yanyizhou
2021-11-03 10:02:59 +08:00
parent 5b9848e2bc 5a66653370
commit 9d0ba2373b
74 changed files with 35924 additions and 1618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/newProcess/index.vue
+102 -11
View File
@@ -142,9 +142,24 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'7d81e0afa045f8ba8911bcf984b64675'">
<el-col :span="size ? 6 : 8" v-btn-permission="''">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('15')">
<div class="card-box" @click="handleCreateProcess('laws1')">
<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" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('17')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
@@ -157,9 +172,9 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'7128980e23ca7726ef92aad579ac7cb1'">
<el-col :span="size ? 6 : 8" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('16')">
<div class="card-box" @click="handleCreateProcess('18')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
@@ -174,13 +189,13 @@
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('17')">
<div class="card-box" @click="handleCreateProcess('16')">
<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-text">外部署名推荐审批流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
@@ -189,13 +204,58 @@
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('18')">
<div class="card-box" @click="handleCreateProcess('15')">
<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-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('14')">
<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>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('21')">
<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>
@@ -280,6 +340,12 @@ export default {
name: 'bzdyStep1'
})
break
case 'laws1':
// 政策入库流程
this.$router.push({
name: 'zcrkStep1'
})
break
case '1':
// 标准入库流程
this.$router.push({
@@ -353,29 +419,54 @@ export default {
})
break
case '15':
case '17':
//政策课题入会流程
this.$router.push({
name: 'zcrhStep1'
})
break
case '16':
case '18':
//政策课题参会流程
this.$router.push({
name: 'zcchStep1'
})
break
case '17':
case '19':
//政策课题会后流程
this.$router.push({
name: 'zchhStep1'
})
break
case '18':
case '16':
//外部署名推荐审批流程
this.$router.push({
name: 'wbsmStep1'
})
break
case '15':
//加入标准化协会信息提报流程
this.$router.push({
name: 'jrbzhxhStep1'
})
break
case '14':
//参与外部标准制修订信息提报流程
this.$router.push({
name: 'cywbbzzxdStep1'
})
break
// 外部标准化协会入会流程
case '20':
this.$router.push({
name: 'bzrhStep1'
})
break
// 外部标准化协会参会流程
case '21':
this.$router.push({
name: 'bzchStep1'
})
break
}
},
checkPermission(permissionIdArray) {