suzhou-jichuang-lanhai
/
TcAssetVerificationPc
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationPc into lijinlong

Browse Source
lijinlong
李劲龙 2 months ago
parent e62abb7944 710eba2aca
commit 4b3f9f795b
6 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File

8
src/components/Breadcrumb/index.vue
Unescape View File

@ -77,13 +77,15 @@ export default {
this.levelList = [activeRoute[0].children[0],matched[0]]
} else if(matched[0].path == "/taskAuditInfo") {
// 管理端--任务管理--任务审核--资产审核
const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myTask')
this.levelList = [activeRoute[0].children[0],matched[0]]
const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'task')
const route = sidebarRouters.filter(item => item.path == '')
const twoActiveRoute = route[0].children.filter(item => item.path == "taskInfo")
this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]]
} else if(matched[0].path == "/mytaskAuditInfo") {
// 单位端--我的任务--资产核查--资产审核详情
const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myTask')
const route = sidebarRouters.filter(item => item.path == '')
const twoActiveRoute = route[0].children.filter(item => item.path == "mytaskAudit")
const twoActiveRoute = route[0].children.filter(item => item.path == "mytaskInfo")
this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]]
} else if(matched[0].path == "/unitAuth" ) {
// 管理端--资产管理--新增资产

8
src/views/auditPages/taskManagement/audit.vue
Unescape View File

@ -3102,12 +3102,10 @@ export default {
},
},
beforeRouteEnter(to,from,next){
if(to.query.pageType == 'add') {
to.meta.title = '新增资产'
} else if(to.query.pageType == 'change') {
to.meta.title = '修改资产'
if(to.query.pageType == 'change') {
to.meta.title = '审核资产'
} else if(to.query.pageType == 'look') {
to.meta.title = '资产详情'
to.meta.title = '查看资产'
}
next();
},

8
src/views/auditPages/taskManagement/auditList.vue
Unescape View File

@ -111,13 +111,13 @@
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info" @click="goInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
<span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
</div>
<div v-if="scope.row.status == 1" style="display: flex;align-items: center;">
<div v-if="scope.row.status == 1" style="display: flex;align-items: center;cursor: pointer;" @click="delInfo(scope.row)">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info" @click="delInfo(scope.row)" style="color: #1485EF;margin-right: 15px;cursor: pointer;">审核</span>
<span class="del-info" style="color: #1485EF;margin-right: 15px;">审核</span>
</div>
</div>
</template>

12
src/views/auditPages/taskManagement/index.vue
Unescape View File

@ -95,16 +95,16 @@
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info" @click="goInfo(scope.row)"
style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
<span class="look-info"
style="color: #1485EF;margin-right: 15px;">查看</span>
</div>
<!-- v-if="scope.row.taskStatus == 1" -->
<div style="display: flex;align-items: center;cursor: pointer;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="delInfo(scope.row)">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info" @click="delInfo(scope.row)"
style="color: #1485EF;margin-right: 15px;cursor: pointer;">审核</span>
<span class="del-info"
style="color: #1485EF;margin-right: 15px;">审核</span>
</div>
</div>
</template>

33
src/views/auditPages/taskManagement/info.vue
Unescape View File

@ -127,9 +127,18 @@
</el-table-column>
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<span class="look-info" @click="goInfo(1, scope.row)" style="color: #192A92;cursor: pointer;">查看</span>
<span class="look-info" @click="goInfo(2, scope.row)" style="color: #192A92;cursor: pointer;"
v-if="$route.query.pageType == 'info'">审核</span>
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;margin-right: 15px;">查看</span>
</div>
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)" v-if="$route.query.pageType == 'info' || $route.meta.pageType == 'info'">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;margin-right: 15px;">审核</span>
</div>
</div>
</template>
</el-table-column>
</el-table>
@ -157,7 +166,7 @@
@pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
</div>
</div>
<div class="info-right" v-if="$route.query.pageType == 'look'">
<div class="info-right" v-if="$route.query.pageType == 'look' || $route.meta.pageType == 'look'">
<div class="info-title">任务流程节点</div>
<div class="timeline">
<div class="timeline-items" v-for="(item,index) in timeLineData">
@ -295,8 +304,8 @@ export default {
}
},
titleInfo() {
console.log(this.$route.query);
getassetTaskid(this.$route.query.id).then(res => {
// console.log(this.$route.query);
getassetTaskid(this.$route.query.id || this.$route.meta.id).then(res => {
if (res.code == 200) {
this.titleInfoObj = res.data
}
@ -388,6 +397,18 @@ export default {
this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120;
}
},
beforeRouteEnter(to,from,next){
if(to.query.pageType == 'info') {
to.meta.title = '任务审核'
to.meta.pageType = to.query.pageType
to.meta.id = to.query.id
} else if(to.query.pageType == 'look') {
to.meta.title = '任务详情'
to.meta.pageType = to.query.pageType
to.meta.id = to.query.id
}
next();
},
}
</script>
<style lang="scss" scoped>

19
src/views/unitPages/myTask/info.vue
Unescape View File

@ -130,7 +130,7 @@
<template slot-scope="scope">
<span class="look-info" @click="goInfo(1, scope.row)" style="color: #192A92;cursor: pointer;">查看</span>
<span class="look-info" @click="goInfo(2, scope.row)" style="color: #192A92;cursor: pointer;"
v-if="$route.query.pageType == 'info'&& scope.row.status != 3&& scope.row.status != 5&&scope.row.status != 1">核查</span>
v-if="($route.query.pageType == 'info' || $route.meta.pageType == 'look') && scope.row.status != 3&& scope.row.status != 5&&scope.row.status != 1">核查</span>
</template>
</el-table-column>
</el-table>
@ -139,7 +139,7 @@
@pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
</div>
</div>
<div class="info-right" v-if="$route.query.pageType == 'look'">
<div class="info-right" v-if="$route.query.pageType == 'look' || $route.meta.pageType == 'look'">
<div class="info-title">任务流程节点</div>
<div class="timeline">
<div class="timeline-items" v-for="(item,index) in timeLineData">
@ -278,8 +278,7 @@ export default {
}
},
titleInfo() {
console.log(this.$route.query);
getassetTaskid(this.$route.query.id).then(res => {
getassetTaskid(this.$route.query.id || this.$route.meta.id).then(res => {
if (res.code == 200) {
this.titleInfoObj = res.data
}
@ -373,6 +372,18 @@ export default {
this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120;
}
},
beforeRouteEnter(to,from,next){
if(to.query.pageType == 'info') {
to.meta.title = '任务审核'
to.meta.pageType = to.query.pageType
to.meta.id = to.query.id
} else if(to.query.pageType == 'look') {
to.meta.title = '任务详情'
to.meta.pageType = to.query.pageType
to.meta.id = to.query.id
}
next();
},
}
</script>
<style lang="scss" scoped>

Write Preview
Loading…
Cancel
Save