From 691ea73719924b26f90847c2ecc1331c12075a33 Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Fri, 22 Oct 2021 13:17:24 +0800
Subject: [PATCH] =?UTF-8?q?zww=20-=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=A0=B8bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/purchaseorder/procurementReview.vue |  2 +-
 .../purchaseorder/purchaseRequisition.vue       | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue
index 594c131..89e9d2b 100644
--- a/src/views/modules/purchaseorder/procurementReview.vue
+++ b/src/views/modules/purchaseorder/procurementReview.vue
@@ -625,7 +625,7 @@
     },
     mounted() {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 200;
+        this.height = window.innerHeight - 220;
       })
     },
     activated() {
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index b51a489..ba20bcb 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -551,6 +551,23 @@
             status: true,
             fixed: false
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2101,
+            serialNumber: 'review2101AuthorizeFlag',
+            tableId: "review2101",
+            tableName: "PRHeader",
+            columnProp: "strApproveResult",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "审批结果",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
         ],
         // 展示列集
         columnList1: [