From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/spare/SparePartScrapList.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/spare/SparePartScrapList.vue b/src/views/spare/SparePartScrapList.vue
index 4caa00e..4613af8 100644
--- a/src/views/spare/SparePartScrapList.vue
+++ b/src/views/spare/SparePartScrapList.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered='false' title='澶囦欢鎶ュ簾'>
+ <a-card :bordered='false' title=''>
<!-- 鏌ヨ鍖哄煙 -->
<!-- <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -38,9 +38,9 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class='table-operator'>
- <a-button @click='handleAdd' type='primary' icon='plus'>鏂板</a-button>
+ <a-button @click='handleAdd' type='primary' icon='plus' v-has="'sparePartScrap:add'">鏂板</a-button>
<a-button @click='handleSubmit' type='primary' icon='check'
- v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')">
+ v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')" v-has="'sparePartScrap:submitAndCancel'">
鎻愪氦
</a-button>
<a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus==='pendingApproval'"
@@ -118,10 +118,10 @@
slot-scope='text, record'
>
<a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'"
- @click='handleEdit(record)'>缂栬緫</a>
+ @click='handleEdit(record)' v-has="'sparePartScrap:edit'">缂栬緫</a>
<a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
<a-divider
- v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'Rejected' || record.auditStatus == 'pendingApproval'"
+ v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected' || record.auditStatus === 'pendingApproval'"
type='vertical'
/>
<a-dropdown>
@@ -130,7 +130,7 @@
<a-menu-item>
<a @click='handleDetail(record)'>璇︽儏</a>
</a-menu-item>
- <a-menu-item v-if="record.auditStatus == 'notSubmitted'||record.auditStatus == 'Rejected'">
+ <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'" v-has="'sparePartScrap:delete'">
<a-popconfirm
title='纭畾鍒犻櫎鍚�?'
@confirm='() => handleDelete(record.id)'
--
Gitblit v1.9.3