From 89546bbd77c9346b07d9cf7e3817cc3c7290cb93 Mon Sep 17 00:00:00 2001
From: zhaochencheng <zccbbg@qq.com>
Date: Fri, 30 Dec 2022 14:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8DDictRadio=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictRadio/index.vue |  8 +++-----
 src/views/pms/brand/index.vue      | 28 +++++++++++-----------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/components/DictRadio/index.vue b/src/components/DictRadio/index.vue
index de0bd8a..a29ee55 100644
--- a/src/components/DictRadio/index.vue
+++ b/src/components/DictRadio/index.vue
@@ -31,13 +31,11 @@ export default {
       }
     },
     dictList(){
-      if(this.showAll === "all"){
-        let list = this.radioData;
+      let list = [...this.radioData];
+      if(this.showAll === "all"){ 
         list.splice(0, 0, {label:"全部"})
-        return list
-      }else{
-        return this.radioData
       }
+      return list
     }
   },
   methods: {
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index fdfd4d6..565a099 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="状态" prop="showStatus">
+        <DictRadio v-model="queryParams.showStatus" @change="handleQuery" size="small"
+                   :radioData="dict.type.sys_normal_disable" :showAll="'all'"/>
+      </el-form-item>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.nameLike"
@@ -10,18 +14,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优先级" prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="请输入优先级"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="展示状态" prop="showStatus">
-        <dict-select v-model="queryParams.showStatus" prop-name="sys_normal_disable" />
-      </el-form-item>
       <el-form-item class="flex_one tr">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -85,17 +77,18 @@
 
     <!-- 添加或修改品牌管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
+        <el-form-item label="状态">
+          <DictRadio v-model="form.showStatus" size="small"
+                   :radioData="dict.type.sys_normal_disable"/>
+        </el-form-item>
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="名称" />
         </el-form-item>
         <el-form-item label="优先级" prop="sort">
           <el-input v-model="form.sort" placeholder="请输入优先级" />
         </el-form-item>
-        <el-form-item label="展示状态">
-          <dict-select v-model="form.showStatus" prop-name="sys_normal_disable" />
-        </el-form-item>
-        <el-form-item label="品牌logo" prop="logo">
+        <el-form-item label="logo" prop="logo">
           <oss-image-upload v-model="form.logo" :limit="1" />
         </el-form-item>
       </el-form>
@@ -112,6 +105,7 @@ import { listPmsBrand, getPmsBrand, delPmsBrand, addPmsBrand, updatePmsBrand, ex
 
 export default {
   name: "PmsBrand",
+  dicts: ['sys_normal_disable'],
   data() {
     return {
       // 遮罩层