From 91c0464a0e259d92eb07a2d4cd912acb58f7f9f1 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 12 Jun 2024 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=BA=93-=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=85=A5=E5=BA=93-=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehousing/Inventory/config.js           |  1 +
 .../warehousing/Inventory/index.vue           | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/config.js b/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/config.js
index 0e3f7a27..be132c88 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/config.js
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/config.js
@@ -19,6 +19,7 @@ export const dialogConfig = {
         { t_width: '', t_props: 'num', t_label: '设备数量' },
         { t_width: '', t_props: 'modelName', t_label: '入库人' },
         { t_width: '', t_props: 'createDate', t_label: '入库日期' },
+        { t_width: '', t_props: 'remark', t_label: '备注' },
     ],
 
 }
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue
index 6c9ae1ae..6f8d040d 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue
@@ -530,15 +530,18 @@
                     type="index"
                 />
                 <el-table-column
-                    label="设备编码"
                     align="center"
                     prop="maCode"
                     :show-overflow-tooltip="true"
                 >
+                    <template v-slot:header>
+                        <span style="color: red;">* </span>设备编码
+                    </template>
                     <template v-slot:default="{ row }" v-if="!isNumCheck">
                         <el-input
                             v-model="row.maCode"
                             placeholder="请输入设备编码"
+                            @blur="handleMaCodeBlur(row)"
                         ></el-input>
                     </template>
                 </el-table-column>
@@ -950,6 +953,7 @@ export default {
             dialogConfig,
             getInventoryWarehousingApi,
             sendParams: {},
+            requiredMaCode: false,
         }
     },
     created() {
@@ -1224,6 +1228,14 @@ export default {
                             this.getList()
                         })
                     } else {
+                        // this.codeTableList 中只要有一个maCode为空, 则不允许提交
+                        this.requiredMaCode = this.codeTableList.some(
+                            (item) => !item.maCode,
+                        )
+                        if (this.requiredMaCode) {
+                            this.$message.error('设备编码不能为空')
+                            return
+                        }
                         // 统一处理时间格式为 yyyy-MM-dd
                         this.codeTableList.forEach((item) => {
                             if (item.thisCheckTime) {
@@ -1492,6 +1504,11 @@ export default {
         closeDialogOuter() {
             this.dialogConfig.outerVisible = false
         },
+        handleMaCodeBlur(row) {
+            if (!row.maCode) {
+                this.$message.warning('设备编码不能为空')
+            }
+        },
     },
 }
 </script>