From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf
---
 company_admin/src/views/business/brand.vue |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/company_admin/src/views/business/brand.vue b/company_admin/src/views/business/brand.vue
index eb27ae8..07746a4 100644
--- a/company_admin/src/views/business/brand.vue
+++ b/company_admin/src/views/business/brand.vue
@@ -5,6 +5,16 @@
         <el-form-item label="鍝佺墝鍚嶇О" prop="name">
           <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ搧鐗屽悕绉�" @keypress.enter.native="search"></el-input>
         </el-form-item>
+        <el-form-item label="绫诲瀷" prop="type">
+          <el-select v-model="searchForm.type" clearable placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in typeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <section>
           <el-button type="primary" @click="search">鎼滅储</el-button>
           <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:brand:exportExcel']" @click="exportExcel">瀵煎嚭</el-button> -->
@@ -22,8 +32,7 @@
           stripe
           border
           :header-cell-style="rowStyle"
-          :cell-style="rowStyle"
-        >
+          :cell-style="rowStyle">
           <el-table-column prop="name" label="鍝佺墝鍚嶇О" min-width="100px"></el-table-column>
           <el-table-column prop="imgurl" label="鍥炬爣" min-width="100px">
             <template slot-scope="{row}">
@@ -35,6 +44,12 @@
                 fit="cover"></el-image>
             </template>
           </el-table-column>
+          <el-table-column prop="categoryName" label="绫诲瀷" min-width="100px">
+            <template slot-scope="{row}">
+              <span v-if="row.type == 0">鑷畾涔�</span>
+              <span v-else>绯荤粺</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" min-width="100px"></el-table-column>
           <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
           <el-table-column
@@ -44,8 +59,10 @@
             fixed="right"
           >
             <template slot-scope="{row}">
-              <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:brand:update']">缂栬緫</el-button>
-              <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:brand:delete']">鍒犻櫎</el-button>
+              <template v-if="row.type == 0">
+                <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:brand:update']">缂栬緫</el-button>
+                <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:brand:delete']">鍒犻櫎</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -74,8 +91,13 @@
       return {
         // 鎼滅储
         searchForm: {
-          name: ''
-        }
+          name: '',
+          type: ''
+        },
+        typeList: [
+          { name: '鑷畾涔�', id: 0 },
+          { name: '绯荤粺', id: 1 }
+        ]
       }
     },
     created () {
--
Gitblit v1.9.3