From 4538de1fa692cf5454ae7b1b061a8c298be96821 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 17:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue | 4 ++--
src/views/procurementManagement/invoiceEntry/index.vue | 4 ++--
src/views/collaborativeApproval/approvalProcess/index.vue | 6 ++++++
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 1 -
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index e02d3ee..a71d689 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -182,7 +182,6 @@
approverNodes.value = [
{ id: 1, userId: null }
]
- console.log(userStore)
form.value.approveUser = userStore.id;
form.value.approveTime = getCurrentDate();
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 10fbf29..60f0c1a 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -46,6 +46,8 @@
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
const data = reactive({
searchForm: {
@@ -58,6 +60,7 @@
label: "瀹℃壒鐘舵��",
prop: "approveStatus",
dataType: "tag",
+ width: 100,
formatData: (params) => {
if (params == 0) {
return "寰呭鏍�";
@@ -103,6 +106,7 @@
{
label: "鐢宠鏃ユ湡",
prop: "approveTime",
+ width: 120
},
{
label: "缁撴潫鏃ユ湡",
@@ -127,6 +131,7 @@
clickFun: (row) => {
openForm("edit", row);
},
+ disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
},
{
name: "瀹℃牳",
@@ -134,6 +139,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2
},
{
name: "璇︽儏",
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index a1e02e5..6df2bb0 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
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
index ea5b259..2ce140d 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
@@ -12,7 +12,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏉ョエ閲戦锛�">
+ <el-form-item label="鍚◣鎬讳环(鍏�)锛�">
<el-text type="primary">{{ form.taxInclusiveTotalPrice }}</el-text>
</el-form-item>
</el-col>
@@ -32,7 +32,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏉ョエ閲戦锛�">
+ <el-form-item label="鏈鏉ョエ閲戦(鍏�)锛�">
<el-text type="success">{{ form.ticketsAmount }}</el-text>
</el-form-item>
</el-col>
--
Gitblit v1.9.3