From 7b5144442b37ccab23d8226b32d1898f96e84e84 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 6 Nov 2024 09:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machinery/coding-nw/index.vue             | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/warehouseManage/machinery/coding-nw/index.vue b/src/views/warehouseManage/machinery/coding-nw/index.vue
index e315e55..347a04c 100644
--- a/src/views/warehouseManage/machinery/coding-nw/index.vue
+++ b/src/views/warehouseManage/machinery/coding-nw/index.vue
@@ -152,7 +152,11 @@
                 type="selection"
                 width="55"
                 align="center"
-                :selectable="(row) => row.maStatus == '15'"
+                :selectable="
+                    (row) =>
+                        row.maStatus == '15' &&
+                        (row.pushStatus == 0 || row.pushStatus == null)
+                "
             />
             <el-table-column
                 align="center"
@@ -243,6 +247,26 @@
                     <template v-else> - </template>
                 </template>
             </el-table-column>
+            <el-table-column
+                label="推送状态"
+                align="center"
+                v-if="ENV === 'development-nw' || ENV === 'production-nw'"
+            >
+                <template slot-scope="{ row }">
+                    <el-tag
+                        v-if="row.pushStatus == 0 || row.pushStatus == null"
+                        type="warning"
+                        size="mini"
+                        >未推送</el-tag
+                    >
+                    <el-tag
+                        v-if="row.pushStatus == 1"
+                        type="success"
+                        size="mini"
+                        >已推送</el-tag
+                    >
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="150">
                 <template slot-scope="scope">
                     <el-button
@@ -885,7 +909,7 @@ export default {
                     }
                 })
                 .catch(() => {
-                    this.$message.info('已取消推送')
+                    // this.$message.info('已取消推送')
                 })
         },