From 47481e8fb4386800df25ae2d1a13086b12b2b6e3 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 10 Jul 2024 14:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=86=E6=96=99=E5=82=AC=E5=8A=9E=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/components/Notice/index.vue           | 15 ++++++++++++---
 .../return/receive/component/handlePage.vue       |  8 ++++----
 .../return/scrap/component/return.vue             |  2 +-
 .../completeParts/component/addCompleteTools.vue  |  4 +++-
 .../completeTools/component/addCompleteTools.vue  |  4 +++-
 .../machinery/completeTools/component/home.vue    |  2 --
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/sgzb-ui/src/components/Notice/index.vue b/sgzb-ui/src/components/Notice/index.vue
index 44841fd1..6ce0c93a 100644
--- a/sgzb-ui/src/components/Notice/index.vue
+++ b/sgzb-ui/src/components/Notice/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="notice-dialog">
         <!-- 消息通知弹框 -->
         <el-dialog
             :title="noticeTitle"
@@ -10,12 +10,18 @@
             :before-close="handleCloseDialog"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
+            top="0vh"
             append-to-body
+            custom-class="center-dialog"
         >
             <el-button class="notice-num" type="primary"
                 >重要通知({{ unreadNUm }}/{{ noticeNum }})</el-button
             >
-            <el-button class="notice-known" type="primary" @click="handleKnow()"
+            <el-button
+                class="notice-known"
+                type="primary"
+                @click="handleKnow()"
+                :loading="loading"
                 >我知道了</el-button
             >
             <h2 class="release-time">发布时间：{{ releaseTime }}</h2>
@@ -49,6 +55,7 @@ export default {
         return {
             unreadNUm: 1,
             noticeListDoc: [],
+            loading: false,
         }
     },
     computed: {
@@ -68,7 +75,7 @@ export default {
             return this.noticeList[this.unreadNUm - 1].createTime.slice(0, 10)
         },
         releaseCreateName() {
-            return this.noticeList[this.unreadNUm - 1].createBy
+            return this.noticeList[this.unreadNUm - 1].nickName
         },
     },
 
@@ -85,12 +92,14 @@ export default {
         },
         // 点击我知道了
         async handleKnow() {
+            this.loading = true
             const params = {
                 noticeId: [],
                 userId: sessionStorage.getItem('userId'),
             }
             params.noticeId.push(this.noticeList[this.unreadNUm - 1].noticeId)
             const res = await setQueryNoticeApi(params)
+            this.loading = false
             if (res.code == 200) {
                 if (this.noticeNum === 1) {
                     this.$emit('closeDialog', false)
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
index acea28fa..b2d56319 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -158,7 +158,7 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="退料数量"
+                label="待退料数量"
                 align="center"
                 :show-overflow-tooltip="true"
             >
@@ -250,7 +250,7 @@
             append-to-body
         >
             <div style="margin-left: 40px; margin-bottom: 10px"
-                >退料数量：{{ returnNum }}</div
+                >待退料数量：{{ returnNum }}</div
             >
             <el-form
                 :model="codeQuery"
@@ -502,7 +502,7 @@
 
             <div v-else>
                 <div style="margin-left: 40px; margin-bottom: 10px"
-                    >退料数量：{{ returnNum }}</div
+                    >待退料数量：{{ returnNum }}</div
                 >
                 <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
                     <el-col :span="1.5">
@@ -531,7 +531,7 @@
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column
-                        label="退料数量"
+                        label="待退料数量"
                         align="center"
                         prop="backNum"
                         :show-overflow-tooltip="true"
diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
index 379d05e1..917d9864 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
@@ -50,7 +50,7 @@
                     @click="handleRevoke(data)"
                     icon="el-icon-circle-close"
                     style="color: #de3115"
-                    v-if="data.num == 0"
+                    v-if="data.num == 0 && returnInfo.taskStatus != 40"
                 >
                     撤回
                 </el-button>
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
index c45c4881..a75b18ec 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
@@ -310,7 +310,9 @@ export default {
                     const res = await addCompleteSetToolsApi(this.saveParams)
 
                     if (res.code == 200) {
-                        this.$message.success('新增成功！')
+                        this.$message.success(
+                            !this.editInfo ? '新增成功！' : '修改成功！',
+                        )
                         this.$emit('openHomePage')
                     }
                 }
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
index 94b3e5d0..8ae6e12f 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
@@ -310,7 +310,9 @@ export default {
                     const res = await addCompleteSetToolsApi(this.saveParams)
 
                     if (res.code == 200) {
-                        this.$message.success('新增成功！')
+                        this.$message.success(
+                            !this.editInfo ? '新增成功！' : '修改成功！',
+                        )
                         this.$emit('openHomePage')
                     }
                 }
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
index f3cd30ca..7418e4e6 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
@@ -65,12 +65,10 @@ export default {
     methods: {
         // 新增
         handleAddComplete() {
-            console.log('新增！')
             this.$emit('handleAddComplete')
         },
         // 编辑
         handleEdit(data) {
-            console.log(data, '编辑')
             this.$emit('handleAddComplete', data)
         },
         // 删除