From 431d087010381cb7b55a25d90059058e4a3fa2a7 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 9 Jul 2024 08:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/App.vue                           | 14 +++-
 sgzb-ui/src/components/Notice/index.vue       | 83 +++++++++++++++++++
 .../picking/apply/component/AddPicking.vue    | 16 ++--
 .../warehousing/newTools/index.vue            |  8 +-
 4 files changed, 105 insertions(+), 16 deletions(-)
 create mode 100644 sgzb-ui/src/components/Notice/index.vue

diff --git a/sgzb-ui/src/App.vue b/sgzb-ui/src/App.vue
index ab9ab38f..320c2606 100644
--- a/sgzb-ui/src/App.vue
+++ b/sgzb-ui/src/App.vue
@@ -2,16 +2,19 @@
     <div id="app">
         <router-view />
         <theme-picker />
+
+        <!-- <Notice :noticeDialog="noticeDialog"></Notice> -->
     </div>
 </template>
 
 <script>
 import ThemePicker from '@/components/ThemePicker'
 import { getHomeNoticeApi, setQueryNoticeApi } from '@/api/system/notice.js'
+import Notice from '@/components/Notice'
 
 export default {
     name: 'App',
-    components: { ThemePicker },
+    components: { ThemePicker, Notice },
     metaInfo() {
         return {
             title:
@@ -34,6 +37,11 @@ export default {
                 '/qrCode/qrCodePage',
             ],
             isWindowRefresh: false,
+            noticeDialog: {
+                outerTitle: '重要通知',
+                outerWidth: '70%',
+                outerVisible: false,
+            },
         }
     },
     mounted() {
@@ -41,6 +49,7 @@ export default {
         // if (this.isWindowRefresh) {
         //     this.getHomeNoticeFun()
         // }
+        // this.noticeDialog.outerVisible = true
     },
 
     updated() {
@@ -78,9 +87,6 @@ export default {
                 })
             }
         },
-        handleBeforeUnload() {
-            this.isWindowRefresh = true
-        },
     },
 }
 </script>
diff --git a/sgzb-ui/src/components/Notice/index.vue b/sgzb-ui/src/components/Notice/index.vue
new file mode 100644
index 00000000..9b93e9ef
--- /dev/null
+++ b/sgzb-ui/src/components/Notice/index.vue
@@ -0,0 +1,83 @@
+<template>
+    <div>
+        <!-- 消息通知弹框 -->
+        <el-dialog
+            :title="noticeDialog.outerTitle"
+            :width="noticeDialog.outerWidth"
+            :visible.sync="noticeDialog.outerVisible"
+            v-if="noticeDialog.outerVisible"
+            :center="true"
+            :height="`300px`"
+            append-to-body
+        >
+            <el-button class="notice-num" type="primary"
+                >重要通知(1/1)</el-button
+            >
+            <el-button class="notice-known" type="primary">我知道了</el-button>
+            <slot />
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        noticeDialog: {
+            type: Object,
+            default: () => {
+                return {}
+            },
+        },
+    },
+}
+</script>
+
+<style scoped lang="scss">
+::v-deep .el-dialog {
+    height: 500px;
+}
+
+::v-deep .el-dialog__header {
+    width: 95%;
+    margin: 0 auto;
+    border-bottom: 2px solid #999;
+}
+::v-deep .el-dialog__title {
+    font-size: 20px;
+    font-weight: bold;
+    letter-spacing: 3px;
+    color: #409eff;
+}
+
+::v-deep .el-dialog__headerbtn {
+    position: absolute;
+    width: 32px;
+    height: 32px;
+    top: -15px;
+    right: -15px;
+    padding: 8px;
+    background-color: #409eff;
+    border-radius: 50%;
+    line-height: 16px;
+}
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+    color: #fff;
+}
+
+.notice-num {
+    position: absolute;
+    top: -38px;
+    left: 0;
+    height: 38px;
+    letter-spacing: 2px;
+}
+
+.notice-known {
+    position: absolute;
+    bottom: -43px;
+    right: 0;
+    height: 38px;
+    letter-spacing: 2px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index 85f9c5cb..656b0c65 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -70,7 +70,7 @@
                     </el-select>
                 </el-form-item>
 
-                <!-- <el-form-item label="成套设备">
+                <el-form-item label="成套设备">
                     <el-select
                         @change="completeSetChange"
                         style="width: 240px"
@@ -86,7 +86,7 @@
                             :label="item.wholeTypeName"
                         />
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="物品类型" prop="status">
                     <el-cascader
                         placeholder="请选择物品类型"
@@ -900,12 +900,12 @@ export default {
                 (e) => e.companyId == val,
             )
 
-            // const res = await getCompleteSetToolsApi({
-            //     companyId: val,
-            //     pageNum: 1,
-            //     pageSize: 9999,
-            // })
-            // this.completeSetList = res.rows
+            const res = await getCompleteSetToolsApi({
+                companyId: val,
+                pageNum: 1,
+                pageSize: 9999,
+            })
+            this.completeSetList = res.rows
         },
 
         // 成套设备下拉框选择
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index 050c8274..9ccc1f82 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -607,9 +607,9 @@ export default {
                 dictName: undefined,
                 dictType: undefined,
                 status: undefined,
-                keyWord: '',
+                keyWord: '', 
                 typeId: '',
-                flag: 0,
+                // flag: 0,
             },
             query: {
                 pageNum: 1,
@@ -658,8 +658,8 @@ export default {
         getList() {
             this.loading = true
             getPutInList(this.queryParams).then((response) => {
-                this.tableList = response.data.rows
-                this.total = response.data.total
+                this.tableList = response.rows
+                this.total = response.total
                 this.loading = false
             })
         },