From 8c84adf2d3cd83d0c5f8ee77d3fb615ae9a02ba7 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: Tue, 11 Oct 2022 17:43:58 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/myApproval/index.vue | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/index.vue b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
index b36d697..13eec8e 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -4,7 +4,8 @@
<!-- <el-tab-pane label="申请中" name="1">-->
<div style="height: 100%">
<el-row class="homeCard">
- <el-col :span="8">
+ <span>作业类型：</span>
+ <el-col :span="10">
<div class="grid-content topInfo">
<el-select v-model="searchWord">
<el-option
@@ -36,9 +37,9 @@
<el-table-column property="workTypeDesc" label="作业类型" />
<el-table-column property="workLevelDesc" label="作业等级" />
<el-table-column property="applyTime" label="申请时间" width="180" />
- <el-table-column label="申请状态" width="180">
+ <el-table-column label="审批状态" align="center" width="180">
<template #default="scope">
- <el-tag type="success">{{ scope.row.statusDesc }}</el-tag>
+ <el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="250">
@@ -84,10 +85,13 @@
<div class="stepCard">
<el-card class="box-card" shadow="always">
<div class="text">
- 审批结果：<span>{{ item.approvalResultDesc }}</span>
+ 审批结果：<span class="bold-text">{{ item.approvalResultDesc }}</span>
</div>
<div class="text">
- 审批类型：<span>{{ item.typeDesc }}</span>
+ 审批层级：<span class="bold-text">{{ item.typeDesc }}</span>
+ </div>
+ <div class="text" v-if="item.auditTypeDesc">
+ 审批类型：<span class="bold-text">{{ item.auditTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
@@ -297,7 +301,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
@@ -350,7 +354,6 @@
const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord } };
let res = await workApprovalApi().getApprovalListPage(data);
if (res.data.code === '200') {
- console.log(res.data.data,'approval')
state.applyData = JSON.parse(JSON.stringify(res.data.data));
state.applyData = state.applyData.map((item) => {
if (item.operators == null || item.operators == []) {
@@ -418,7 +421,7 @@
if (res.data.code === '200') {
ElMessage({
type: 'success',
- message: res.data.msg
+ message: '取消成功！'
});
getListByPage();
} else {
@@ -467,6 +470,21 @@
state.details.workDetail.involvedDepIds = a.split(',').map((item) => {
return state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(item))?.depName;
});
+ }
+ if(state.details.workDetail.csDepId){
+ state.details.workDetail.csDepId = state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(state.details.workDetail.csDepId))?.depName;
+ }
+ if(state.details.workDetail.operationDepId){
+ state.details.workDetail.operationDepId = state.departmentRecursionList.find((i: { depId: number }) => i.depId === Number(state.details.workDetail.operationDepId))?.depName;
+ }
+ if(state.details.workDetail.gbPath){
+ state.details.workDetail.gbPath = state.details.workDetail.gbPath.split(',')
+ }
+ if(state.details.workDetail.bcPath){
+ state.details.workDetail.bcPath = state.details.workDetail.bcPath.split(',')
+ }
+ if(state.details.workDetail.bpLocationMapPath){
+ state.details.workDetail.bpLocationMapPath = state.details.workDetail.bpLocationMapPath.split(',')
}
state.dialogDetails = true;
};
@@ -620,10 +638,13 @@
padding-left: 10px;
span {
- font-weight: bolder;
color: #409eff;
}
+ .bold-text{
+ font-weight: bolder;
+ }
+
&:last-of-type {
margin-bottom: 0;
}
--
Gitblit v1.9.2