From 300c85c369ab22a03496693afcf4eaaaa4e4b2ca Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 7 Jun 2024 13:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E8=B4=AD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8C=89=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/components/pageHeader/index.vue   | 28 +++++++++++++++++++
 .../toolsAcceptance/component/home.vue        | 20 ++++---------
 .../toolsAcceptance/component/queryTools.vue  |  2 +-
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/sgzb-ui/src/components/pageHeader/index.vue b/sgzb-ui/src/components/pageHeader/index.vue
index e69de29b..491e2870 100644
--- a/sgzb-ui/src/components/pageHeader/index.vue
+++ b/sgzb-ui/src/components/pageHeader/index.vue
@@ -0,0 +1,28 @@
+<template>
+    <!-- 页头提示 -->
+    <el-page-header @back="goBack" :content="pageContent"> </el-page-header>
+</template>
+
+<script>
+export default {
+    props: {
+        pageContent: {
+            type: String,
+            default: '详情',
+        },
+    },
+    methods: {
+        goBack() {
+            this.$emit('goBack')
+        },
+    },
+}
+</script>
+
+<style>
+.el-page-header {
+    padding-bottom: 5px;
+    margin-bottom: 10px;
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1);
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
index f835d158..f692df30 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
@@ -180,7 +180,7 @@
                         v-if="
                             scope.row.purchasingStatus != '已入库' &&
                             scope.row.purchasingStatus != '已审核' &&
-                            scope.row.purchasingStatus != '已验收合格' &&
+                            scope.row.purchasingStatus != '验收合格' &&
                             scope.row.purchasingStatus != '待审核' &&
                             scope.row.purchasingStatus != '验收不通过' &&
                             scope.row.purchasingStatus != '驳回'
@@ -194,9 +194,8 @@
                         type="text"
                         icon="el-icon-edit"
                         v-if="
-                            (scope.row.purchasingStatus == '已验收合格' ||
-                                scope.row.purchasingStatus == '待审核') &&
-                            scope.row.manageType != '1'
+                            scope.row.purchasingId == 26 &&
+                            scope.row.manageType == 0
                         "
                         @click="handleCode(scope.row)"
                         v-hasPermi="['newPurchase:tools:coding']"
@@ -207,10 +206,8 @@
                         type="text"
                         icon="el-icon-edit"
                         v-if="
-                            scope.row.purchasingStatus == '已验收合格' ||
-                            scope.row.purchasingStatus == '已入库' ||
-                            scope.row.purchasingStatus == '已审核' ||
-                            scope.row.purchasingStatus == '待审核'
+                            scope.row.purchasingId == 26 ||
+                            scope.row.purchasingId == 28
                         "
                         @click="handlePrint(scope.row)"
                         >验收单</el-button
@@ -220,12 +217,7 @@
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
-                        v-if="
-                            scope.row.purchasingStatus != '已入库' &&
-                            scope.row.purchasingStatus != '已审核' &&
-                            scope.row.purchasingStatus != '已验收合格' &&
-                            scope.row.purchasingStatus != '待审核'
-                        "
+                        v-if="scope.row.purchasingId == 25"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['newPurchase:tools:del']"
                         >删除</el-button
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
index 7cf36281..d445bd4f 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="newDevicesAccept">
+    <div>
         <el-form
             :model="queryParams"
             ref="queryForm"