From 1a33b944d425b1488f4e5b93725bdf00609271be Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Thu, 30 Mar 2023 14:49:42 +0800
Subject: [PATCH] 修改部门新增规则
---
src/views/specialWorkSystem/workTicket/wdsqjl/index.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
index 2446c26..be96b3c 100644
--- a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
@@ -51,13 +51,18 @@
<el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
</el-row>
<el-table ref="multipleTableRef" :data="applyData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
- <el-table-column property="workPermitNo" label="作业申请单号" width="180" />
- <el-table-column property="applyUname" label="申请人" />
- <el-table-column property="depName" label="部门名称" />
- <el-table-column property="operators" label="作业人" />
- <el-table-column property="workTypeDesc" label="作业类型" />
- <el-table-column property="workLevelDesc" label="作业等级" />
- <el-table-column property="applyTime" label="申请时间" width="180" />
+ <el-table-column property="workPermitNo" label="作业申请单号" width="180" align="center"/>
+ <el-table-column property="applyUname" label="申请人" align="center"/>
+ <el-table-column property="depName" label="部门名称" align="center"/>
+ <el-table-column property="operators" label="作业人" align="center"/>
+ <el-table-column property="workTypeDesc" label="作业类型" align="center"/>
+ <el-table-column property="workLevelDesc" label="作业等级" align="center"/>
+ <el-table-column property="materialStatus" label="物资状态" align="center" width="180">
+ <template #default="scope">
+ <span>{{ scope.row.materialStatus==0?'未关联物资':(scope.row.materialStatus==1?'必选物资配备不足':(scope.row.materialStatus==2?'必选物资配备齐全':(scope.row.materialStatus==3?'物资配置专业':(scope.row.materialStatus==4?'物资配置高端':'-')))) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="applyTime" label="申请时间" width="180" align="center"/>
<el-table-column label="申请状态" align="center" width="180">
<template #default="scope">
<el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
@@ -108,11 +113,17 @@
<div class="text">
审批结果：<span>{{ item.approvalResultDesc }}</span>
</div>
- <div class="text">
- 审批层级：<span>{{ item.typeDesc }}</span>
+ <div class="text" v-if="item.approvalTypeDesc">
+ 层级类型：<span>{{ item.approvalTypeDesc }}</span>
</div>
<div class="text" v-if="item.auditTypeDesc">
审批类型：<span>{{ item.auditTypeDesc }}</span>
+ </div>
+ <div class="text" v-if="item.personTypeDesc">
+ 人员类型：<span>{{ item.personTypeDesc }}</span>
+ </div>
+ <div class="text" v-if="item.contentTypeDesc">
+ 内容类型：<span>{{ item.contentTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
@@ -124,7 +135,7 @@
><span>{{ i.resultDesc }}</span>
</div>
</div>
- <div class="approveItem">
+ <div class="approveItem" v-if="item.contentType==1">
<div class="item-tit">
<span>审批项目</span>
<!-- <span>类型</span>-->
--
Gitblit v1.9.2