From d92a3ab720fcbc0ed97f4b6a56d06efd87cd26d9 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 17 Feb 2025 09:01:49 +0800
Subject: [PATCH] 2025-02-17
---
.../modules/proofing/requestForProofing.vue | 33 +++++++++++++++----
.../modules/quotation/requestForQuote.vue | 33 +++++++++++++++----
src/views/modules/test/requestForTest.vue | 33 +++++++++++++++----
3 files changed, 81 insertions(+), 18 deletions(-)
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 569b03a..6352e7f 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -357,11 +357,13 @@
保存
关闭
-
- 同意
-
-
- 驳回
+
+
+ 同意
+
+
+ 驳回
+
@@ -1492,6 +1494,24 @@ export default {
fixed: '',
columnWidth: 150
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table1ApprovalUsername',
+ tableId: '103001Table1',
+ tableName: '打样信息表',
+ columnProp: 'approvalUsername',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '当前节点审批人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
{
userId: this.$store.state.user.name,
functionId: 103001,
@@ -2442,7 +2462,8 @@ export default {
rejectFlag: row.rejectFlag,
rejectStepId: row.rejectStepId,
isReject: row.isReject,
- nodeId: row.nodeId
+ nodeId: row.nodeId,
+ approvalUsername: row.approvalUsername,
}
this.searchDelegateAccessByUser();
this.modalDisableFlag = true
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 1da35a1..dbb2472 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -389,11 +389,13 @@
保存
关闭
-
- 同意
-
-
- 驳回
+
+
+ 同意
+
+
+ 驳回
+
@@ -1484,6 +1486,24 @@ export default {
fixed: '',
columnWidth: 150
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 102001,
+ serialNumber: '102001Table1ApprovalUsername',
+ tableId: '102001Table1',
+ tableName: '询价信息表',
+ columnProp: 'approvalUsername',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '当前节点审批人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
{
userId: this.$store.state.user.name,
functionId: 102001,
@@ -2426,7 +2446,8 @@ export default {
rejectFlag: row.rejectFlag,
rejectStepId: row.rejectStepId,
isReject: row.isReject,
- nodeId: row.nodeId
+ nodeId: row.nodeId,
+ approvalUsername: row.approvalUsername,
}
if (this.modalData.flag !== '1'){
this.projectPartData.testPartNo = this.modalData.testPartNo
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index fa3412b..3f29600 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -354,11 +354,13 @@
保存
关闭
-
- 同意
-
-
- 驳回
+
+
+ 同意
+
+
+ 驳回
+
@@ -1509,6 +1511,24 @@
fixed: '',
columnWidth: 150
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table1ApprovalUsername',
+ tableId: '103001Table1',
+ tableName: '测试信息表',
+ columnProp: 'approvalUsername',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '当前节点审批人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
{
userId: this.$store.state.user.name,
functionId: 103001,
@@ -2484,7 +2504,8 @@
rejectFlag: row.rejectFlag,
rejectStepId: row.rejectStepId,
isReject: row.isReject,
- nodeId: row.nodeId
+ nodeId: row.nodeId,
+ approvalUsername: row.approvalUsername,
}
this.activeTabList = ['product','process','attribute','partAttribute','file']
// this.$nextTick(()=>{