From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkCabinetLog.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/jkCabinetLog.vue b/admin/src/views/business/jkCabinetLog.vue
index 6bf29af..eee0af5 100644
--- a/admin/src/views/business/jkCabinetLog.vue
+++ b/admin/src/views/business/jkCabinetLog.vue
@@ -32,6 +32,7 @@
<el-option label="鍏ㄩ儴" value=""></el-option>
<el-option label="鍒疯劯" :value="0"></el-option>
<el-option label="鍒峰崱" :value="1"></el-option>
+ <el-option label="绠＄悊鍛�" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
@@ -61,11 +62,12 @@
<template slot-scope="{row}">
<el-link :underline="false" v-if="row.authType === 0">鍒疯劯</el-link>
<el-link :underline="false" v-if="row.authType === 1">鍒峰崱</el-link>
+ <el-link :underline="false" v-if="row.authType === 2">绠＄悊鍛�</el-link>
</template>
</el-table-column>
<el-table-column prop="cabinetName" label="鎵�灞為挜鍖欐煖" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏌滄牸缂栧彿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="閽ュ寵" min-width="100px"></el-table-column>
+ <el-table-column prop="gridCode" label="鏌滄牸缂栧彿" min-width="100px"></el-table-column>
+ <el-table-column prop="keyInfo" label="閽ュ寵" min-width="100px"></el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<el-link :underline="false" v-if="row.status === 0">鎴愬姛</el-link>
--
Gitblit v1.9.3