From 43e2289adaa6826e02432d7c51df390f6682c4ec Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 29 Aug 2025 17:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/ma/gadget/index.vue | 69 +++++++++++---------------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/views/material/ma/gadget/index.vue b/src/views/material/ma/gadget/index.vue
index 4401247f..1091bca7 100644
--- a/src/views/material/ma/gadget/index.vue
+++ b/src/views/material/ma/gadget/index.vue
@@ -185,7 +185,7 @@
 <script>
 import {
   addWsMaInfoData, delGadget,
-  getDeviceType, getGadgetInfo, getGadgetList
+  getDeviceType, getGadgetInfo, getGadgetList, updateGadgetInfo
 } from '@/api/ma/device'
 
 export default {
@@ -227,6 +227,7 @@ export default {
       open: false,
       // 表单参数
       form: {
+        id:null,
         deviceTypeId: null,
         deviceModelId: null,
         deviceCode: '',
@@ -383,8 +384,8 @@ export default {
       this.reset();
       try {
         const response = await getGadgetInfo(row.id);
-        this.form = { ...response.data };
-        this.form.deviceCode = response.data.maCode;
+        this.form = { ...response.data,deviceCode: response.data.maCode};
+        // this.form.deviceCode = response.data.maCode;
 
         // 先设置设备类型ID
         this.form.deviceTypeId =response.data.deviceTypeId;
@@ -433,20 +434,32 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          const data = { ...this.form };
+          // 获取设备类型名称
+          const deviceType = this.deviceTypeOptions.find(item => item.typeId === data.deviceTypeId);
+          if (deviceType) {
+            data.maName = deviceType.typeName; // 添加设备类型名称
+          }
+
+          // 获取设备型号名称
+          const deviceModel = this.deviceModelOptions.find(item => item.typeId === data.deviceModelId);
+          if (deviceModel) {
+            data.maModel = deviceModel.typeName; // 添加设备型号名称
+          }
+          const params = {
+            id: this.form.id,
+            maName: data.maName,
+            maModel:data.maModel,
+            modelId:this.form.deviceModelId,
+            maCode:this.form.deviceCode,
+            thisCheckTime:this.form.thisCheckTime,
+            nextCheckTime:this.form.nextCheckTime,
+            repairMan: this.form.repairMan,
+            checkMan: this.form.checkMan,
+            phone: this.form.phone,
+            result:this.form.result,
+          }
           if (this.form.id) {
-            const params = {
-              id: this.form.id,
-              maName: data.maName,
-              maModel:data.maModel,
-              modelId:this.form.deviceModelId,
-              maCode:this.form.deviceCode,
-              thisCheckTime:this.form.thisCheckTime,
-              nextCheckTime:this.form.nextCheckTime,
-              repairMan: this.form.repairMan,
-              checkMan: this.form.checkMan,
-              phone: this.form.phone,
-              result:this.form.result,
-            }
             // 这里替换为您的实际API调用
             updateGadgetInfo(params).then(response => {
               this.$message.success("修改成功");
@@ -454,30 +467,6 @@ export default {
               this.getList();
             });
           } else {
-            const data = { ...this.form };
-            // 获取设备类型名称
-            const deviceType = this.deviceTypeOptions.find(item => item.typeId === data.deviceTypeId);
-            if (deviceType) {
-              data.maName = deviceType.typeName; // 添加设备类型名称
-            }
-
-            // 获取设备型号名称
-            const deviceModel = this.deviceModelOptions.find(item => item.typeId === data.deviceModelId);
-            if (deviceModel) {
-              data.maModel = deviceModel.typeName; // 添加设备型号名称
-            }
-            const params = {
-              maName: data.maName,
-              maModel:data.maModel,
-              modelId:this.form.deviceModelId,
-              maCode:this.form.deviceCode,
-              thisCheckTime:this.form.thisCheckTime,
-              nextCheckTime:this.form.nextCheckTime,
-              repairMan: this.form.repairMan,
-              checkMan: this.form.checkMan,
-              phone: this.form.phone,
-              result:this.form.result,
-            }
             // 这里替换为您的实际API调用
             addWsMaInfoData(params).then(response => {
               this.$message.success("新增成功");