From 25eebbf282ca6a9031153afaf4c70d572411156d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 24 三月 2023 14:41:01 +0800
Subject: [PATCH] 修改审批展示内容
---
src/views/intellectInspect/inspectIndex/index.vue | 6 +-
src/views/specialWorkSystem/workTicket/wdsqjl/index.vue | 12 +++-
src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue | 50 ++++++++++++++--
src/views/intellectInspect/inspectIndex/components/fullScreen.vue | 72 +++++++++++++++--------
4 files changed, 102 insertions(+), 38 deletions(-)
diff --git a/src/views/intellectInspect/inspectIndex/components/fullScreen.vue b/src/views/intellectInspect/inspectIndex/components/fullScreen.vue
index bcb65de..bd69e59 100644
--- a/src/views/intellectInspect/inspectIndex/components/fullScreen.vue
+++ b/src/views/intellectInspect/inspectIndex/components/fullScreen.vue
@@ -15,22 +15,7 @@
<div class="chart-tit">
<span class="tit">年度巡检异常趋势</span>
<div class="filter-part">
- <el-select v-model="depId1" size="small" :teleported="false">
- <el-option
- v-for="item in depList1"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- />
- </el-select>
- <el-select v-model="depId2" size="small" :teleported="false">
- <el-option
- v-for="item in depList2"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- />
- </el-select>
+ <el-cascader v-model="searchDepId" :options="depList" :props="casProps" :teleported="false" :show-all-levels="false" size="small"/>
</div>
</div>
<div class="chart" :id="xjLine"></div>
@@ -242,7 +227,6 @@
workTypeList: Array<type>;
departmentList: [];
timeType: Array<type>;
- depList1: Array<type>;
classGroupList: Array<classGroup>;
quotaList: [];
inspectPointAllList: [];
@@ -252,8 +236,9 @@
workNum: string;
beImgs: [];
afImgs: [];
- depId1:number|null
- depId2:number|null
+ searchDepId: number|null
+ depList: Array<any>
+ casProps:object
}
interface type {
id: number;
@@ -297,7 +282,7 @@
{ id: 4, name: '月' },
{ id: 5, name: '年' }
],
- depList1: [
+ depList: [
{
name: '电石事业部',
id: 49
@@ -315,8 +300,14 @@
id: 32
}
],
- depId1: null,
- depId2: null,
+ searchDepId: null,
+ casProps: {
+ expandTrigger: 'hover',
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ checkStrictly: true
+ },
classGroupList: [],
quotaList: [],
inspectPointAllList: [],
@@ -857,9 +848,8 @@
display: flex;
align-items: center;
justify-content: right;
- .el-select{
- width: 50% !important;
- margin-left: 10px;
+ :deep(.el-cascader){
+ width: 100% !important;
}
.el-switch{
width: 100% !important;
@@ -867,6 +857,38 @@
width: 100% !important;
}
}
+
+ ::v-deep(.el-popper){
+ background-color: rgba(10,31,92,1);
+ border: 1px solid rgba(17,254,238,.4);
+ color: #11FEEE;
+ .el-cascader-node{
+ .in-active-path{
+ background: #0049af;
+ }
+ &:hover{
+ background: #0049af;
+ }
+ }
+ .el-cascader-node__label{
+ color: #11FEEE;
+ }
+ .el-icon{
+ color: #11FEEE;
+ }
+ .el-select-dropdown__item{
+ color: #11FEEE;
+ }
+ .el-select-dropdown__item.hover{
+ background: #0049af;
+ }
+ }
+ ::v-deep(.el-popper__arrow){
+ &::before{
+ background-color: rgba(10,31,92,.6) !important;
+ border: 1px solid rgba(17,254,238,.4);
+ }
+ }
}
.filter-part2{
display: flex;
diff --git a/src/views/intellectInspect/inspectIndex/index.vue b/src/views/intellectInspect/inspectIndex/index.vue
index a9c9178..9f6635f 100644
--- a/src/views/intellectInspect/inspectIndex/index.vue
+++ b/src/views/intellectInspect/inspectIndex/index.vue
@@ -796,9 +796,8 @@
display: flex;
align-items: center;
justify-content: right;
- .el-select{
- width: 50% !important;
- margin-left: 10px;
+ :deep(.el-cascader){
+ width: 100% !important;
}
.el-switch{
width: 100% !important;
@@ -806,6 +805,7 @@
width: 100% !important;
}
}
+
}
.filter-part2{
display: flex;
diff --git a/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue b/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
index 7880a01..8961e4c 100644
--- a/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
@@ -44,10 +44,30 @@
<!-- <div class="text item">-->
<!-- 所属设备区域：<span>{{ item.regionId }}</span>-->
<!-- </div>-->
+<!-- <div class="text item" v-for="i in typeList">-->
+<!-- <div v-if="i.id === item.type">-->
+<!-- 审批层级：<span>{{ i.name }}</span>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="text item" v-for="i in typeList">
- <div v-if="i.id === item.type">
- 审批层级：<span>{{ i.name }}</span>
- </div>
+ <div v-if="i.id === item.approvalType">
+ 层级类型：<span>{{ i.name }}</span>
+ </div>
+ </div>
+ <div class="text item" v-for="i in auditTypeList">
+ <div v-if="i.id === item.auditType">
+ 审批类型：<span>{{ i.name }}</span>
+ </div>
+ </div>
+ <div class="text item" v-for="i in personTypeList">
+ <div v-if="i.id === item.personType">
+ 人员类型：<span>{{ i.name }}</span>
+ </div>
+ </div>
+ <div class="text item" v-for="i in contentTypeList">
+ <div v-if="i.id === item.contentType">
+ 内容类型：<span>{{ i.name }}</span>
+ </div>
</div>
<!-- <div class="text item">-->
<!-- 关联RFID：<span>{{ item.rfidId }}</span>-->
@@ -73,7 +93,7 @@
<!-- <div class="text item">-->
<!-- 数据填报类型：<span>{{ item.dataReportType }}</span>-->
<!-- </div>-->
- <div class="text item">
+ <div class="text item" v-if="item.contentType == 1">
审批项：<span>{{
item.itemList
.map((item) => {
@@ -131,7 +151,10 @@
workTypeList: Array<type>;
timeList: Array<type>;
typeList: Array<type>;
+ auditTypeList: Array<type>;
workLevelList: Array<type>;
+ personTypeList: Array<type>;
+ contentTypeList: Array<type>;
}
interface type {
@@ -186,9 +209,22 @@
departmentList: [],
userList: [],
typeList: [
- { id: 1, name: '单人' },
- { id: 2, name: '多人' },
- { id: 3, name: '分析人' }
+ { id: 1, name: '单人审批' },
+ { id: 2, name: '多人审批' },
+ // { id: 3, name: '分析人' }
+ ],
+ auditTypeList: [
+ { id: 1, name: '并行单审' },
+ { id: 2, name: '并行会审' },
+ ],
+ personTypeList: [
+ { id: 1, name: '普通人员审批' },
+ { id: 2, name: '监护人员元审批' },
+ { id: 3, name: '分析人员审批' }
+ ],
+ contentTypeList: [
+ { id: 1, name: '审批项审批' },
+ { id: 2, name: '简单审批' },
],
timeList: [
{ id: 1, name: '日' },
diff --git a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
index 9bf63b3..be96b3c 100644
--- a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
@@ -113,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>
@@ -129,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