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/goodsCategoryList.vue |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/admin/src/views/business/goodsCategoryList.vue b/admin/src/views/business/goodsCategoryList.vue
index d09308c..434230f 100644
--- a/admin/src/views/business/goodsCategoryList.vue
+++ b/admin/src/views/business/goodsCategoryList.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="姝e父" :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, 2)" icon="el-icon-plus">鏂板缓</el-button></li>
+        <li><el-button type="primary" @click="$refs.operaGoodsCategoryEditWindow.open('鏂板缓鐗╁搧鍚嶇О', null, 2)" icon="el-icon-plus">鏂板缓</el-button></li>
       </ul>
       <el-table
         :height="tableHeightNew"
@@ -38,7 +44,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>
@@ -81,7 +87,7 @@
   },
   methods: {
     handleEdit (row) {
-      this.$refs.operaGoodsCategoryEditWindow.open('缂栬緫鐗╁搧鍒嗙被', row, 2)
+      this.$refs.operaGoodsCategoryEditWindow.open('缂栬緫鐗╁搧鍚嶇О', row, 2)
     },
     handleStatusChange (val, row) {
       updateStatus({ id: row.id, status: val }).then(res => {

--
Gitblit v1.9.3