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
This commit is contained in:
super_liu
2021-10-25 14:07:28 +08:00
parent e36796d3e5 a0f1fdc2f1
commit 185ce228ed
8 changed files with 309 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+5 -1
View File
@@ -18,9 +18,10 @@
class="label-input-form"
label-width="210px"
>
<ProcessTitle style="float: left">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
@@ -84,8 +85,10 @@
</el-col>
</el-row>
</div>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
@@ -141,6 +144,7 @@
</el-col>
</el-row>
</div>
</el-collapse-transition>
</el-form>
</div>
<ProcessTitle>
src/pages/processCenter/pages/creatProcess/zcch/step1.vue
+26
View File
@@ -0,0 +1,26 @@
<template>
<div class="zcch-step1">
<div>政策参会</div>
</div>
</template>
<script>
export default {
name: "zcchStep1",
components: {},
data() {
return {}
},
methods: {},
mounted() {}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.zcch-step1 {}
</style>
src/pages/processCenter/pages/creatProcess/zchh/step1.vue
+26
View File
@@ -0,0 +1,26 @@
<template>
<div class="zchh-step1">
<div>政策会后</div>
</div>
</template>
<script>
export default {
name: "zchhStep1",
components: {},
data() {
return {}
},
methods: {},
mounted() {}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.zchh-step1 {}
</style>
src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
+26
View File
@@ -0,0 +1,26 @@
<template>
<div class="zcrh-step1">
<div>政策入会</div>
</div>
</template>
<script>
export default {
name: "zcrhStep1",
components: {},
data() {
return {}
},
methods: {},
mounted() {}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.zcrh-step1 {}
</style>
src/pages/processCenter/pages/newProcess/index.vue
+69 -46
View File
@@ -34,9 +34,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -52,9 +49,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -70,9 +64,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -88,9 +79,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -106,9 +94,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -124,9 +109,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -142,9 +124,6 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -160,13 +139,54 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'7d81e0afa045f8ba8911bcf984b64675'">
<el-card shadow="hover">
<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-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'7128980e23ca7726ef92aad579ac7cb1'">
<el-card shadow="hover">
<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-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('17')">
<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>
<!-- &lt;!&ndash;严逸舟写的分割线&ndash;&gt;-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="">-->
<!-- <el-card shadow="hover">-->
@@ -225,21 +245,6 @@
<!-- &lt;!&ndash;严逸舟写的分割线&ndash;&gt;-->
</div>
</div>
<div v-if="zcgllc">
<el-divider content-position="left"><h2>政策管理流程</h2></el-divider>
<div class="process-box">
</div>
</div>
<div v-if="qbgllc">
<el-divider content-position="left"><h2>企标管理流程</h2></el-divider>
<div class="process-box">
</div>
</div>
<div v-if="bzcgfysqlc">
<el-divider content-position="left"><h2>工作组会议管理流程</h2></el-divider>
<div class="process-box">
</div>
</div>
</div>
</template>
<script>
@@ -316,12 +321,6 @@ export default {
name: 'xmpgStep1'
})
break
case '10':
//项目评估流程- 项目
this.$router.push({
name: 'xmpg2Step1'
})
break
case '8':
//未符合项整改流程
this.$router.push({
@@ -334,6 +333,12 @@ export default {
name:'bzjdStep1'
})
break
case '10':
//项目评估流程- 项目
this.$router.push({
name: 'xmpg2Step1'
})
break
case '11':
// 项目清单确认流程
this.$router.push({
@@ -358,6 +363,24 @@ export default {
name: 'zhangyuhuanStep1'
})
break
case '15':
//政策课题入会流程
this.$router.push({
name: 'zcrhStep1'
})
break
case '16':
//政策课题参会流程
this.$router.push({
name: 'zcchStep1'
})
break
case '17':
//政策课题会后流程
this.$router.push({
name: 'zchhStep1'
})
break
}
},
checkPermission(permissionIdArray) {