From 8611a1ba1696e76cced04ff5d658ba138a05dafd Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期六, 19 八月 2023 14:37:32 +0800
Subject: [PATCH] 设备管理前端代码提交 截止 20230819 13：55 分
---
src/views/eam/EquipmentScrapList.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/EquipmentScrapList.vue b/src/views/eam/EquipmentScrapList.vue
index 79611d4..dad5582 100644
--- a/src/views/eam/EquipmentScrapList.vue
+++ b/src/views/eam/EquipmentScrapList.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" title="璁惧鎶ュ簾">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -127,7 +127,7 @@
slot-scope="text, record"
>
<a-popconfirm
- v-if="record.auditStatus == 'notSubmitted'"
+ v-if="record.auditStatus == 'notSubmitted'||record.auditStatus =='Rejected'"
title="纭鎻愪氦鍚�?"
@confirm="() =>handleCommit(record,'commit')"
>
@@ -142,16 +142,16 @@
</a-popconfirm>
<a-divider
- v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'"
+ v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'||record.auditStatus =='Rejected'"
type="vertical"
/>
<a
- v-if="record.auditStatus == 'notSubmitted' "
+ v-if="record.auditStatus == 'notSubmitted' ||record.auditStatus =='Rejected'"
@click="handleEdit(record)"
>缂栬緫</a>
<a v-if="record.auditStatus == 'pendingApproval'" @click="handleApprove(record)">瀹℃壒</a>
<a-divider
- v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'"
+ v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'||record.auditStatus =='Rejected'"
type="vertical"
/>
<a-dropdown>
@@ -209,7 +209,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EquipmentScrapModal from './modules/equipmentScrap/EquipmentScrapModal.vue'
-import EquipmentScrapDetailList from './modules/equipmentScrap/EquipmentScrapDetailList.vue'
+import EquipmentScrapDetailList from './modules/equipmentScrap/EquipmentScrapDetailList'
import { getAction,postAction } from '@/api/manage'
import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
import JEllipsis from '@/components/jeecg/JEllipsis'
--
Gitblit v1.9.3