From e6d1b329dff19a6f0c9a80de9056285c092838f4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 29 一月 2026 13:12:10 +0800
Subject: [PATCH] 进销存升级 1.来票登记优化 2.采购审批、报价审批删除按钮需去除
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 4 ----
src/views/procurementManagement/invoiceEntry/index.vue | 2 ++
src/views/collaborativeApproval/approvalProcess/index.vue | 2 +-
src/views/procurementManagement/paymentEntry/index.vue | 6 ++----
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index aad5b23..20a4ee6 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -197,10 +197,6 @@
<div v-if="!activity.isShen" class="node-reason">
<span>瀹℃壒鎰忚锛�</span>{{ activity.approveNodeReason }}
</div>
- <div v-if="!activity.isShen" class="node-reason">
- <span>绛惧悕锛�</span>
- <img :src="activity.urlTem" class="signImg" alt="" v-if="activity.urlTem"/>
- </div>
<div v-else-if="activity.isShen">
<el-form-item
:prop="'activities.' + index + '.approveNodeReason'"
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index bd281dd..65941e1 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -45,7 +45,7 @@
type="danger"
plain
@click="handleDelete"
- v-if="currentApproveType !== 7"
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7"
>鍒犻櫎</el-button>
</div>
</div>
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 11a6b4b..00a6881 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -112,6 +112,8 @@
gePurchaseListPage,
{
purchaseContractNumber: undefined,
+ // 鍙煡璇㈠凡瀹℃壒閫氳繃锛堟垨鎸囧畾鐘舵�佷负 3锛夌殑璁板綍
+ approvalStatus: 3,
},
[
{
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 5ee8d17..3f4512b 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -261,7 +261,6 @@
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
- width:240
},
{
label: "浠樻鐘舵��",
@@ -282,7 +281,6 @@
label: "浜у搧澶х被",
prop: "productCategory",
showOverflowTooltip: true,
- width: 100
},
{
label: "瑙勬牸鍨嬪彿",
@@ -293,7 +291,6 @@
{
label: "宸蹭粯娆鹃噾棰�(鍏�)",
prop: "ticketsTotal",
- width: 120,
formatData: (params) => {
return params ? parseFloat(params).toFixed(2) : 0;
},
@@ -301,7 +298,6 @@
{
label: "寰呬粯娆鹃噾棰�(鍏�)",
prop: "pendingTicketsTotal",
- width: 120,
formatData: (params) => {
return params ? parseFloat(params).toFixed(2) : 0;
},
@@ -327,6 +323,8 @@
searchForm: {
supplierNameOrContractNo: "",
status: false,
+ // 鍙煡璇㈠鎵圭姸鎬佷负 3 鐨勮褰�
+ approvalStatus: 3,
},
form: {
purchaseContractNumber: "",
--
Gitblit v1.9.3