From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 一月 2025 09:28:10 +0800
Subject: [PATCH] 1

---
 admin/src/views/operation/device.vue |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/admin/src/views/operation/device.vue b/admin/src/views/operation/device.vue
index 202eccd..9025984 100644
--- a/admin/src/views/operation/device.vue
+++ b/admin/src/views/operation/device.vue
@@ -8,16 +8,23 @@
     <el-table v-loading="loading" :data="list" stripe>
       <el-table-column prop="code" label="璁惧缂栧彿" min-width="100" show-overflow-tooltip />
       <el-table-column prop="name" label="璁惧鍚嶇О" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="" label="璁惧鍒嗙被" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="categoryName" label="璁惧鍒嗙被" min-width="100" show-overflow-tooltip />
       <el-table-column prop="modelNo" label="璁惧鍨嬪彿" min-width="100" show-overflow-tooltip />
       <el-table-column prop="realName" label="绠$悊鍛�" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="company" label="璁惧渚涘簲鍟�" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="status" label="璁惧鐘舵��" min-width="100" show-overflow-tooltip />
-      <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
+      <el-table-column prop="supplier" label="璁惧渚涘簲鍟�" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="status" label="璁惧鐘舵��" min-width="100" show-overflow-tooltip>
         <template slot-scope="{row}">
+          <span v-if="row.status == 0">姝e父</span>
+          <span v-if="row.status == 1">鎹熷潖</span>
+          <span v-if="row.status == 2">鎶ュ簾</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="鎿嶄綔" min-width="130" fixed="right">
+        <template slot-scope="{row}">
+          <el-button type="text" @click="handleDetail(row)" v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
           <el-button type="text" @click="handleEdit(row)" icon="el-icon-edit"
             v-permissions="['business:category:update']">缂栬緫</el-button>
-          <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+          <el-button type="text" @click="handleDel(row)" icon="el-icon-delete"
             v-permissions="['business:category:delete']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
@@ -26,6 +33,7 @@
       <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
     </div>
     <Edit v-if="showEdit" ref="EditRef" @success="getList" @close="showEdit = false" />
+    <Detail ref="DetailRef" />
   </div>
 </template>
 
@@ -33,12 +41,14 @@
 import Pagination from '@/components/common/Pagination'
 import QueryForm from '@/components/common/QueryForm'
 import Edit from './components/deviceEdit'
+import Detail from './components/deviceDetail'
 import { fetchList, deleteById } from '@/api/Inspection/device'
 export default {
   components: {
     Pagination,
     QueryForm,
-    Edit
+    Edit,
+    Detail
   },
   data() {
     return {
@@ -99,11 +109,18 @@
         this.loading = false
       })
     },
+    handleDetail(row) {
+      this.$refs.DetailRef.visible = true
+      this.$refs.DetailRef.id = row.id
+      this.$refs.DetailRef.getDetail()
+    },
     handleEdit(row) {
       this.showEdit = true
       this.$nextTick(() => {
         this.$refs.EditRef.isShowModal = true
         if (row && row.id) {
+          console.log('---')
+
           this.$refs.EditRef.getDetail(row.id)
         }
       })
@@ -113,7 +130,6 @@
       let message = `纭鍒犻櫎璇ヨ褰曞悧?`
       this.$dialog.deleteConfirm(message)
         .then(() => {
-          this.isWorking.delete = true
           deleteById(row.id)
             .then(() => {
               this.$tip.apiSuccess('鍒犻櫎鎴愬姛')

--
Gitblit v1.9.3