From 20fb862f61a66e074c0f6e0effe95f186212700a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=81=82=E9=BB=8E?= <329261568@qq.com>
Date: Tue, 25 Jul 2023 10:16:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=A1=AC=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E6=9D=A1=E7=A0=81=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/library/index.vue | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/iot/library/index.vue b/src/views/iot/library/index.vue
index 9f0f20ad..5cc62c0e 100644
--- a/src/views/iot/library/index.vue
+++ b/src/views/iot/library/index.vue
@@ -192,19 +192,18 @@
           label-width="80px"
         >
           <el-form-item label="芯片ID" prop="uId">
-            <el-input v-model="form.uId" :disabled="true" placeholder="请输入芯片ID" />
+            <el-input v-model="form.uId" :disabled="form.hardwareId || form.hardwareId === 0" placeholder="请输入芯片ID" />
           </el-form-item>
-          <el-form-item label="批次" prop="batchId">
+          <el-form-item label="批次" prop="batchId" v-if="!(form.hardwareId || form.hardwareId === 0)">
             <el-input
-              :disabled="true"
               v-model="batchNumber"
               placeholder="点击选择批次"
               @focus="openTableSelectDialog()"
             />
           </el-form-item>
-          <el-form-item label="硬件条码">
+          <el-form-item label="硬件条码" prop="devId" v-if="form.hardwareId || form.hardwareId === 0">
             <el-input
-              v-model="batchNumber"
+              v-model="form.devId"
               placeholder="请输入硬件吗"
             />
           </el-form-item>
@@ -400,6 +399,15 @@ export default {
         batchId: [
           { required: true, message: "批次主键不能为空", trigger: "change" },
         ],
+        devId: [
+          { required: true, message: '硬件条码不能为空', trigger: "change,blur"},
+          {
+            type: "string",
+            pattern: /^[1-9][0-9]{15}$/,
+            message: "格式不正确：[0-9] 16字符",
+            trigger: "blur",
+          },
+        ]
       },
       selectResult: {},
       tableSelectOption: {},
@@ -664,7 +672,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.hardwareId != null) {
-            updateLibrary(this.form).then((response) => {
+            updateLibrary({'hardwareId': this.form.hardwareId, 'devId': this.form.devId}).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();