From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并

---
 admin/src/views/business/goodsBrand.vue |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/business/goodsBrand.vue b/admin/src/views/business/goodsBrand.vue
index 618d955..8bef49b 100644
--- a/admin/src/views/business/goodsBrand.vue
+++ b/admin/src/views/business/goodsBrand.vue
@@ -1,7 +1,7 @@
 <template>
   <TableLayout :permissions="['business:productlabel:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
-    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
       <el-form-item label="鍝佺墝鍚嶇О" prop="name">
         <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ搧鐗屽悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
@@ -31,7 +31,7 @@
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:productlabel:create', 'business:productlabel:delete']">
         <li><el-button type="primary" @click="$refs.operaProductLabelWindow.open('鏂板缓鍟嗗搧鏍囩淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:productlabel:create']">鏂板缓</el-button></li>
-        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:productlabel:delete']">鍒犻櫎</el-button></li>
+        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:productlabel:delete']">鍒犻櫎</el-button></li>
       </ul>
       <el-table
         v-loading="isWorking.search"
@@ -69,7 +69,7 @@
         >
           <template slot-scope="{row}">
             <el-button type="text" @click="$refs.operaProductLabelWindow.open('缂栬緫鍟嗗搧鏍囩淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:productlabel:update']">缂栬緫</el-button>
-            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:productlabel:delete']">鍒犻櫎</el-button>
+            <el-button type="text" style="color: red;"  @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:productlabel:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -90,6 +90,7 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import OperaGoodsBrandWindow from '@/components/business/OperaGoodsBrandWindow'
+import {updateStatusById} from "@/api/business/labels";
 export default {
   name: 'ProductLabel',
   extends: BaseTable,
@@ -116,7 +117,7 @@
   },
   methods: {
     statusChange (row) {
-      this.api.updateById({ id: row.id, status: row.status })
+      this.api.updateStatusById({ id: row.id, status: row.status })
         .then(() => {
           this.$message.success('鎿嶄綔鎴愬姛')
         })

--
Gitblit v1.9.3