sgzb-ui/src/components/Notice/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="notice-dialog">
+    <div>
         <!-- 消息通知弹框 -->
         <el-dialog
             :title="noticeTitle"
@@ -10,18 +10,12 @@
             :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()"
-                :loading="loading"
+            <el-button class="notice-known" type="primary" @click="handleKnow()"
                 >我知道了</el-button
             >
             <h2 class="release-time">发布时间：{{ releaseTime }}</h2>
@@ -55,7 +49,6 @@ export default {
         return {
             unreadNUm: 1,
             noticeListDoc: [],
-            loading: false,
         }
     },
     computed: {
@@ -75,7 +68,7 @@ export default {
             return this.noticeList[this.unreadNUm - 1].createTime.slice(0, 10)
         },
         releaseCreateName() {
-            return this.noticeList[this.unreadNUm - 1].nickName
+            return this.noticeList[this.unreadNUm - 1].createBy
         },
     },
 
@@ -92,14 +85,12 @@ 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)

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"

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 && returnInfo.taskStatus != 40"
+                    v-if="data.num == 0"
                 >
                     撤回
                 </el-button>

sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue

@@ -310,9 +310,7 @@ export default {
                     const res = await addCompleteSetToolsApi(this.saveParams)
 
                     if (res.code == 200) {
-                        this.$message.success(
-                            !this.editInfo ? '新增成功！' : '修改成功！',
-                        )
+                        this.$message.success('新增成功！')
                         this.$emit('openHomePage')
                     }
                 }

sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue

@@ -310,9 +310,7 @@ export default {
                     const res = await addCompleteSetToolsApi(this.saveParams)
 
                     if (res.code == 200) {
-                        this.$message.success(
-                            !this.editInfo ? '新增成功！' : '修改成功！',
-                        )
+                        this.$message.success('新增成功！')
                         this.$emit('openHomePage')
                     }
                 }

sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue

@@ -65,10 +65,12 @@ export default {
     methods: {
         // 新增
         handleAddComplete() {
+            console.log('新增！')
             this.$emit('handleAddComplete')
         },
         // 编辑
         handleEdit(data) {
+            console.log(data, '编辑')
             this.$emit('handleAddComplete', data)
         },
         // 删除