From bea6e84839f61b0a98bd8a230828538a731334df Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Thu, 28 Oct 2021 17:47:18 +0800
Subject: [PATCH] =?UTF-8?q?zww=20-=E5=B7=A5=E5=85=B7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/knifemold/receive.vue                 | 4 ++--
 src/views/modules/purchaseorder/procurementReview.vue   | 4 ++--
 src/views/modules/purchaseorder/purchaseRequisition.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue
index 983acd8..f168f6d 100644
--- a/src/views/modules/knifemold/receive.vue
+++ b/src/views/modules/knifemold/receive.vue
@@ -284,10 +284,10 @@
           {
             userId: this.$store.state.user.name,
             functionId: 1001,
-            serialNumber: '1001viewIfsTableDescription',
+            serialNumber: '1001viewIfsTableToolDescription',
             tableId: "1001poToolTable",
             tableName: "poToolTable",
-            columnProp: "description",
+            columnProp: "toolDescription",
             headerAlign: "center",
             align: "center",
             columnLabel: "实例名称",
diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue
index a8ce21d..3fd1e47 100644
--- a/src/views/modules/purchaseorder/procurementReview.vue
+++ b/src/views/modules/purchaseorder/procurementReview.vue
@@ -412,10 +412,10 @@
             serialNumber: 'review2101AuthorizeFlag',
             tableId: "review2101",
             tableName: "PRHeader",
-            columnProp: "authorizeFlag",
+            columnProp: "approveresult",
             headerAlign: "center",
             align: "left",
-            columnLabel: "是否审批",
+            columnLabel: "审批结果",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index 2c58c48..9c02f7a 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -35,7 +35,7 @@
           <el-option value="N" label="未审批"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="inputSearch4">
+      <el-form-item :label="inputSearch12">
         <el-select v-model="mainQueryData.approveresult" style="width: 110px;">
           <el-option value="" label="全部"></el-option>
           <el-option value="审批全通过" label="审批全通过"></el-option>