From b605c7aa55ef07e00dac954422e7763db6421669 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Sun, 31 Aug 2025 22:35:31 +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 |  1 -
 src/views/material/ma/type/index.vue   | 42 +++++++++++++++++++-------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/material/ma/gadget/index.vue b/src/views/material/ma/gadget/index.vue
index 1091bca7..74c84849 100644
--- a/src/views/material/ma/gadget/index.vue
+++ b/src/views/material/ma/gadget/index.vue
@@ -385,7 +385,6 @@ export default {
       try {
         const response = await getGadgetInfo(row.id);
         this.form = { ...response.data,deviceCode: response.data.maCode};
-        // this.form.deviceCode = response.data.maCode;
 
         // 先设置设备类型ID
         this.form.deviceTypeId =response.data.deviceTypeId;
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index 425f4cca..892ac73c 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -612,19 +612,15 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="库管员">
+            <el-form-item label="是否为机具" prop="jiJuType">
               <el-select
-                v-model="form.keeperArr"
-                filterable multiple
-                placeholder="请选择库管员"
+                v-model="form.jiJuType"
+                filterable
+                placeholder="请选择"
                 style="width: 100%"
               >
-                <el-option
-                  v-for="keeper in KeeperOptions"
-                  :key="keeper.userId"
-                  :label="keeper.userName"
-                  :value="keeper.userId+''"
-                ></el-option>
+                <el-option value="2" label="否">否</el-option>
+                <el-option value="1" label="是">是</el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -641,6 +637,25 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="库管员">
+              <el-select
+                v-model="form.keeperArr"
+                filterable multiple
+                placeholder="请选择库管员"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="keeper in KeeperOptions"
+                  :key="keeper.userId"
+                  :label="keeper.userName"
+                  :value="keeper.userId+''"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="维修班组">
               <el-select
@@ -857,7 +872,8 @@ export default {
       // 表单参数
       form: {
         companyId: "",
-        isCheck: '0'
+        isCheck: '0',
+        jiJuType:'1'
       },
       chosenTypeId: "",
       leasePrice: "",
@@ -1156,6 +1172,7 @@ export default {
         documentUrl: "",
         documentName: "",
         parentId: "",
+        jiJuType: '1',
       };
       this.resetForm("form");
     },
@@ -1184,6 +1201,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.jiJuType = '1';
       this.open = true;
       this.title = "新增";
     },
@@ -1200,6 +1218,7 @@ export default {
           this.form.keeperArr = response.data.keeperId.split(",")
         }
         this.form.isCharging = this.form.isCharging + "";
+        this.form.jiJuType = this.form.jiJuType + "";
         this.form.isTest = this.form.isTest + "";
 
         // this.form.houseName = row.houseName;
@@ -1228,6 +1247,7 @@ export default {
           this.form.keeperArr = response.data.keeperId.split(",")
         }
         this.form.isCharging = this.form.isCharging + "";
+        this.form.jiJuType = this.form.jiJuType + "";
         this.form.isTest = this.form.isTest + "";
         // this.form.houseName = row.houseName;
         this.form.itemType = row.itemType;