From a856cfc04747d4d8f3605168531b253240d2e87c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 27 十一月 2024 08:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/operation/device.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/operation/device.vue b/admin/src/views/operation/device.vue
index 202eccd..5c34d4f 100644
--- a/admin/src/views/operation/device.vue
+++ b/admin/src/views/operation/device.vue
@@ -8,11 +8,17 @@
<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 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">姝ｅ父</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="120" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="handleEdit(row)" icon="el-icon-edit"
@@ -104,6 +110,8 @@
this.$nextTick(() => {
this.$refs.EditRef.isShowModal = true
if (row && row.id) {
+ console.log('---');
+
this.$refs.EditRef.getDetail(row.id)
}
})
--
Gitblit v1.9.3