From fd3e3b19aaf23c4f68d8b98d514499510b152e39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 15:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/invoiceEntry/index.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 6df5636..0a22685 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -24,8 +24,8 @@
<el-button type="primary" @click="handleAdd('add')">
鏂板鐧昏
</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+<!-- <el-button @click="handleOut">瀵煎嚭</el-button>-->
+<!-- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>-->
</div>
</div>
<PIMTable
@@ -61,7 +61,7 @@
</template>
</PIMTable>
</div>
- <Modal ref="modalRef"></Modal>
+ <Modal ref="modalRef" @refreshList="getTableData"></Modal>
</div>
</template>
@@ -203,7 +203,13 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map((item) => item.id);
+ // 鏂板鍒ゆ柇锛氬鏋滄湁閫変腑鐨勬暟鎹病鏈塼icketRegistrationId锛屾彁绀哄苟缁堟
+ const noTicket = selectedRows.value.some(item => !item.ticketRegistrationId);
+ if (noTicket) {
+ proxy.$modal.msgWarning("閲囪喘鍙拌处杩樻湭杩涜鏉ョエ鐧昏,鏃犳硶杩涜鍒犻櫎鎿嶄綔");
+ return;
+ }
+ ids = selectedRows.value.map((item) => item.ticketRegistrationId);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
--
Gitblit v1.9.3