From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/views/business/baggageType.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/baggageType.vue b/admin/src/views/business/baggageType.vue
index b210bae..94b7ebd 100644
--- a/admin/src/views/business/baggageType.vue
+++ b/admin/src/views/business/baggageType.vue
@@ -1,8 +1,14 @@
<template>
<TableLayout :permissions="['business:category:query']">
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="琛屾潕绫诲瀷" prop="name">
+ <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ヨ鏉庣被鍨�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="searchForm.status" clearable placeholder="璇烽�夋嫨鐘舵��" @change="search">
+ <el-option label="姝ｅ父" :value="0"></el-option>
+ <el-option label="鍋滅敤" :value="1"></el-option>
+ </el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -11,7 +17,7 @@
</el-form>
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary" @click="$refs.operaGoodsCategoryEditWindow.open('鏂板缓鐗╁搧绛夌骇', null, 4)" icon="el-icon-plus">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaGoodsCategoryEditWindow.open('鏂板缓琛屾潕绫诲瀷', null, 4)" icon="el-icon-plus">鏂板缓</el-button></li>
</ul>
<el-table
:height="tableHeightNew"
@@ -21,6 +27,11 @@
>
<el-table-column prop="id" label="ID" min-width="80px"></el-table-column>
<el-table-column prop="name" label="琛屾潕绫诲瀷" min-width="120px"></el-table-column>
+ <el-table-column prop="detail" label="鏄惁鐗瑰ぇ灏哄" min-width="120px">
+ <template slot-scope="{row}">
+ {{ row.detail == 1? '鏄�' : '鍚�' }}
+ </template>
+ </el-table-column>
<el-table-column prop="remark" label="澶囨敞璇存槑" min-width="200px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭" min-width="100px"></el-table-column>
<el-table-column prop="createTime" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
@@ -39,7 +50,7 @@
<el-table-column label="鎿嶄綔" min-width="150" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="handleEdit(row)">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row.id)">鍒犻櫎</el-button>
+ <el-button type="text" style="color: red;" @click="deleteById(row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -68,6 +79,7 @@
return {
searchForm: {
name: '',
+ status:'',
type: 4
}
}
@@ -81,7 +93,7 @@
},
methods: {
handleEdit (row) {
- this.$refs.operaGoodsCategoryEditWindow.open('缂栬緫鐗╁搧绛夌骇', row, 4)
+ this.$refs.operaGoodsCategoryEditWindow.open('缂栬緫琛屾潕绫诲瀷', row, 4)
},
handleStatusChange (val, row) {
updateStatus({ id: row.id, status: val }).then(res => {
--
Gitblit v1.9.3