From 205abe315d024088c34025c589fb801f6c1eabec Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 21 Jun 2023 09:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=20=E5=8D=95=E7=8B=AC=E6=8B=86=E5=88=86=E8=A3=85?=
 =?UTF-8?q?=E9=85=8D=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/big/device.js                        |  2 +-
 src/views/big/device/components/add_edit.vue | 11 +----
 src/views/big/device/components/assembly.vue | 45 +++++++++++---------
 src/views/big/device/index.vue               |  9 ++--
 4 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/api/big/device.js b/src/api/big/device.js
index 8b56ed2..6f32170 100644
--- a/src/api/big/device.js
+++ b/src/api/big/device.js
@@ -13,7 +13,7 @@ export function getDeviceList(query) {
 export function updateDevice(query) {
     return request({
         url: 'screen/manage/updateDevice',
-        method: 'get',
+        method: 'post',
         params: query
     })
 }
diff --git a/src/views/big/device/components/add_edit.vue b/src/views/big/device/components/add_edit.vue
index e50ca21..e546329 100644
--- a/src/views/big/device/components/add_edit.vue
+++ b/src/views/big/device/components/add_edit.vue
@@ -40,16 +40,6 @@
                 <el-form-item label="图片">
                     <ImageUpload v-model="prop.form.image" :limit="1" />
                 </el-form-item>
-
-                <el-form-item label="装配组">
-                    <el-input v-model="prop.form.assemblyGroup" placeholder="装配组" />
-                </el-form-item>
-                <el-form-item label="电装组">
-                    <el-input v-model="prop.form.electricGroup" placeholder="电装组" />
-                </el-form-item>
-                <el-form-item label="检验员">
-                    <el-input v-model="prop.form.inspector" placeholder="检验员" />
-                </el-form-item>
             </el-form>
         </div>
     </base-dialog>
@@ -85,6 +75,7 @@ const prop = defineProps({
             deptId: String,
             parentId: String,
             isExhibition: String,
+            model: String,
             image:String
         },
     }
diff --git a/src/views/big/device/components/assembly.vue b/src/views/big/device/components/assembly.vue
index b30a481..5ae7bf9 100644
--- a/src/views/big/device/components/assembly.vue
+++ b/src/views/big/device/components/assembly.vue
@@ -4,16 +4,19 @@
         @handleConfirm="handleConfirm" @close="handleClose">
         <div class="body">
             <el-form ref="formRef" :model="prop.form" label-width="120px">
-                <el-form-item label="装配组" prop="name">
-                    <el-input v-model="prop.form.name" placeholder="装配组" />
+                <el-form-item label="设备名称" prop="name">
+                    <el-input v-model="prop.form.name" disabled placeholder="设备名称" />
                 </el-form-item>
-                <el-form-item label="电装组" prop="name">
-                    <el-input v-model="prop.form.name" placeholder="电装组" />
+                <el-form-item label="装配组">
+                    <el-input v-model="prop.form.assemblyGroup" placeholder="装配组" />
                 </el-form-item>
-                <el-form-item label="检验员" prop="name">
-                    <el-input v-model="prop.form.name" placeholder="检验员" />
+                <el-form-item label="电装组">
+                    <el-input v-model="prop.form.electricGroup" placeholder="电装组" />
                 </el-form-item>
-                <el-form-item label="异常原因" prop="name">
+                <el-form-item label="检验员">
+                    <el-input v-model="prop.form.inspector" placeholder="检验员" />
+                </el-form-item>
+                <!-- <el-form-item label="异常原因" prop="name">
                     <el-input v-model="prop.form.name" type="textarea" placeholder="异常原因" />
                 </el-form-item>
                 <el-form-item label="异常情况反馈" prop="name">
@@ -29,7 +32,7 @@
                         <el-radio label="3" size="large">检验完成</el-radio>
                         <el-radio label="4" size="large">内包完成</el-radio>
                     </el-radio-group>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
         </div>
     </base-dialog>
@@ -52,8 +55,10 @@ const prop = defineProps({
     form: {
         type: Object,
         default: {
-            name: '',
-            isExhibition:'1'
+            id: '',
+            inspector: '',
+            assemblyGroup: '',
+            electricGroup: ''
         },
     }
 })
@@ -99,16 +104,16 @@ async function addDeductionInfo() {
         }
     })
     if (!isValid) return
-        let { code, msg } = await updateDevice(prop.form)
-        ctx.$message({
-            type: code === 200 ? 'success' : 'warning',
-            message: code === 200 ? '修改成功' : '修改失败',
-        })
-        if (code === 200) {
-            // 刷新表格
-            emit('refreshTable')
-            emit('closeDialog')
-        }
+    let { code, msg } = await updateDevice(prop.form)
+    ctx.$message({
+        type: code === 200 ? 'success' : 'warning',
+        message: code === 200 ? '修改成功' : '修改失败',
+    })
+    if (code === 200) {
+        // 刷新表格
+        emit('refreshTable')
+        emit('closeDialog')
+    }
 
 
 }
diff --git a/src/views/big/device/index.vue b/src/views/big/device/index.vue
index 86bac97..c59ddc0 100644
--- a/src/views/big/device/index.vue
+++ b/src/views/big/device/index.vue
@@ -60,10 +60,10 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template #default="scope">
-                    <!-- <el-tooltip content="装配信息" placement="top" v-if="scope.row.roleId !== 1">
+                    <el-tooltip content="装配信息" placement="top" v-if="scope.row.roleId !== 1">
                         <el-button link type="primary" v-hasPermi="['big:device:update']" icon="Document"
                             @click="handleAssembly(scope.row)"></el-button>
-                    </el-tooltip> -->
+                    </el-tooltip>
                     <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
                         <el-button link type="primary" v-hasPermi="['big:device:update']" icon="Edit"
                             @click="handleUpdate(scope.row.id)"></el-button>
@@ -81,7 +81,7 @@
 
         <add_edit @closeDialog="open = false" :type="type" :title="title" :form="form" :visible="open"
             @refreshTable="getList" />
-        <!-- <assemblyVue @closeDialog="assemblyOpen = false" :title="assemblyTitle" :visible="assemblyOpen"></assemblyVue> -->
+        <assemblyVue @closeDialog="assemblyOpen = false" :form="assemblyForm" :title="assemblyTitle" :visible="assemblyOpen"></assemblyVue>
         <el-dialog v-model="imgDialogVisible">
             <img w-full :src="dialogImageUrl" alt="Preview Image" class="img-preview" />
         </el-dialog>
@@ -138,6 +138,7 @@ const type = ref("add");
 const assemblyTitle = ref("设备装配信息")
 const assemblyOpen = ref(false)
 const typeList = ref([])
+const assemblyForm = ref({})
 /** 查询设备列表 */
 function getList() {
     loading.value = true;
@@ -200,7 +201,7 @@ function handleUpdate(id) {
 function handleAssembly(row) {
     assemblyTitle.value = "设备装配信息";
     assemblyOpen.value = true;
-    form.value = row;
+    assemblyForm.value = row;
 }
 
 /** 删除按钮操作 */