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

# Conflicts:
#	src/components/navMenu/index.vue
This commit is contained in:
Way Downtown
2021-07-08 21:06:17 +08:00
7 changed files with 530 additions and 863 deletions
+33 -10
View File
@@ -3,15 +3,11 @@
<div class="nav-menu">
<div class="lattice">
<div class="menu-wrap">
<enter-card label="高级检索" path="/advancedSearch"></enter-card>
<enter-card label="个人中心" path="/collection"></enter-card>
<enter-card label="统计图表" path="/"></enter-card>
<enter-card label="国内法规" path="/domesticStandardsAndRegulations"></enter-card>
<enter-card label="国外法规" path="/foreignStandardsAndRegulations"></enter-card>
<enter-card label="标准清单" path="/accessStandardsAndRegulations"></enter-card>
<enter-card label="国内外政策" path="/"></enter-card>
<enter-card label="企业标准" path="/"></enter-card>
<enter-card label="标准预警" path="/standardWarning"></enter-card>
<enter-card v-for="(item, index) in list"
:key="index"
:label="item.label"
:path="item.path"
:class="list.length === 1 ? 'wx-card1' : (list.length == 2 ? 'wx-card2' :'')"></enter-card>
</div>
</div>
</div>
@@ -25,12 +21,32 @@
mixins: [],
data() {
return {
list: []
}
},
computed: {},
watch: {},
mounted() {},
mounted() {
this.getData()
},
methods: {
getData (){
this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList',
{
userId: this.$store.getters.userInfo.userId
}, {_this: this}, res => {
if (res.ok) {
res.data.records.forEach( item => {
if (item.state == 1) {
var json = {}
json.label = item.menuName
json.path = item.menuUrl
this.list.push(json)
}
})
}
})
},
toPage() {
this.$router.push(this.path)
}
@@ -42,6 +58,7 @@
.nav-menu {
.lattice {
.menu-wrap {
height: 324px;
display: flex;
flex-wrap: wrap;
justify-content:space-between;
@@ -55,6 +72,12 @@
width: 32%;
margin: 0 0 10px 0;
}
.wx-card1 {
width: 100%;
}
.wx-card2 {
width: 49%;
}
.menu-item {
flex: 1;
line-height: 88px;
+120 -2
View File
@@ -7,7 +7,7 @@
</div>
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<a>{{ item.prcName }}</a>
<a @click="dealWith(item)">{{ item.prcName }}</a>
</li>
</ul>
</div>
@@ -48,7 +48,125 @@ export default {
},
toPage() {
this.$router.push(this.path)
}
},
dealWith (row) { // 办理
// this.setHandleInfo(JSON.stringify(row))
const prcType = row.prcType
switch(prcType) {
case '1':
if (row.taskInfo === '标准法规业务经理审批') {
this.$router.push({
name: 'bzrkStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '责任人会签'){
this.$router.push({
name: 'bzrkStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '申请人修订'){
this.$router.push({
name: 'bzrkStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
name: 'bzdyStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人上传调研结果') {
this.$router.push({
name: 'bzdyStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break;
//标准清单更新/发布流程
case'4' :
if (row.taskInfo === '进行会签,填写意见') {
this.$router.push({
name: 'bzqdfbStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '根据会签意见修订') {
this.$router.push({
name: 'bzqdfbStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '业务经理审批') {
this.$router.push({
name: 'bzqdfbStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break;
//项目合规评估流程
case '5' :
if(row.taskInfo === ''){
this.$router.push({
name: '',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
}
},
},
}
</script>