From bc365ef47ae4e01754aeadbae26170e11c9bb80e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 22 六月 2026 16:56:12 +0800
Subject: [PATCH] 新疆马铃薯 1.删除按钮添加操作权限
---
src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index f61e038..8b7ce82 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -82,7 +82,7 @@
const detailRow = ref({});
const detailData = ref({});
- const approveDialog = reactive({ visible: false, row: null });
+ const approveDialog = reactive({ visible: false, row: null, warehouse: ''});
const approveOpinion = ref("");
const approveSubmitting = ref(false);
@@ -192,13 +192,14 @@
{
name: "瀹℃壒",
type: "text",
- disabled: (row) => row.approvalStatus !== "pending" || !row.isApprove,
+ disabled: (row) => row.approvalStatus !== "pending",
clickFun: (row) => openApprove(row),
},
{
name: "鍒犻櫎",
type: "danger",
clickFun: (row) => removeInstance(row),
+ hasPermi: ['officeProcessAutomation:approveList:remove'],
},
],
},
@@ -366,6 +367,7 @@
}
approveDialog.row = { ...row };
approveOpinion.value = "";
+ approveDialog.warehouse = row?.warehouse || '';
const bizType = Number(row.businessType);
// 鎶ヤ环瀹℃壒锛氱敤瀹℃壒浜嬬敱瀛楁鎵胯浇鐨�"鎶ヤ环鍗曞彿"鍘绘煡鎶ヤ环鍒楄〃
if (bizType === 6) {
@@ -642,7 +644,7 @@
approveSubmitting.value = true;
try {
await approveApprovalInstance(
- buildApproveInstanceDto(row, result, approveOpinion.value)
+ buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse)
);
reimburseDialog.visible = false;
await fetchApprovalList();
@@ -664,8 +666,13 @@
if (approveSubmitting.value) return { ok: false };
approveSubmitting.value = true;
try {
+ // 鍙戣揣瀹℃壒鏃朵紶閫掑嚭搴撴壒鍙�
+ const extraData = {};
+ if (Number(row.businessType) === 7 && detailData.value?.shippingInfo?.outboundBatches) {
+ extraData.outboundBatches = detailData.value.shippingInfo.outboundBatches;
+ }
await approveApprovalInstance(
- buildApproveInstanceDto(row, result, approveOpinion.value)
+ buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse, extraData)
);
approveDialog.visible = false;
await fetchApprovalList();
--
Gitblit v1.9.3