From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并

---
 admin/src/views/business/labelsBrandSerial.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/src/views/business/labelsBrandSerial.vue b/admin/src/views/business/labelsBrandSerial.vue
index 8fe7763..d6cf530 100644
--- a/admin/src/views/business/labelsBrandSerial.vue
+++ b/admin/src/views/business/labelsBrandSerial.vue
@@ -3,10 +3,10 @@
     <!-- 鎼滅储琛ㄥ崟 -->
     <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" placeholder="璇疯緭鍏ュ搧鐗岀郴鍒楀悕绉�" @keypress.enter.native="search"></el-input>
+        <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ搧鐗岀郴鍒楀悕绉�" clearable @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="鎵�灞炲搧鐗�" prop="parentId">
-        <el-select  v-model="searchForm.parentId"  placeholder="璇烽�夋嫨鎵�灞炲搧鐗�" @change="search" >
+        <el-select  v-model="searchForm.parentId"  placeholder="璇烽�夋嫨鎵�灞炲搧鐗�" clearable @change="search" >
           <el-option
               v-for="item in labels"
               :key="item.id"
@@ -83,8 +83,8 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
-import OperaLabelsWindow from '@/components/business/OperaLabelsZhuanquWindow'
-import { findAll as labelList } from '@/api/business/labels'
+import OperaLabelsWindow from '@/components/business/OperaLabelsOtherWindow'
+import {findAll as labelList, updateStatusById} from '@/api/business/labels'
 export default {
   name: 'Labels',
   extends: BaseTable,
@@ -123,7 +123,7 @@
         })
     },
     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