From 31bde1f290279ebf195b34bdcfd6e226219a407d Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Fri, 21 Jul 2023 10:30:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E6=94=B9=E4=B8=BADi?=
 =?UTF-8?q?ctRadio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictRadio/index.vue          |  9 +++++++--
 src/views/oms/aftersale/index.vue           |  8 ++------
 src/views/oms/order/index.vue               | 17 +++++++++--------
 src/views/oms/orderOperateHistory/index.vue | 15 ++-------------
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/components/DictRadio/index.vue b/src/components/DictRadio/index.vue
index a29ee55..58941c0 100644
--- a/src/components/DictRadio/index.vue
+++ b/src/components/DictRadio/index.vue
@@ -15,7 +15,7 @@
 
 <script>
 export default {
-  props: ['radioData','size', 'value','showAll'],
+  props: ['radioData','size', 'value','showAll', 'filter'],
   data() {
     return {
       // value:this.value
@@ -32,7 +32,12 @@ export default {
     },
     dictList(){
       let list = [...this.radioData];
-      if(this.showAll === "all"){ 
+      if (this.filter) {
+        list = list.filter(it => {
+          return this.filter.indexOf(it.value) == -1
+        })
+      }
+      if(this.showAll === "all"){
         list.splice(0, 0, {label:"全部"})
       }
       return list
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 1e2b976..ad437b9 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -2,14 +2,10 @@
   <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="status">
-        <el-select v-model="queryParams.status" placeholder="请选择申请状态" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_aftersale_status" :label="item.label" :value="item.value" />
-        </el-select>
+        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_aftersale_status" size="small" :show-all="'all'"></DictRadio>
       </el-form-item>
       <el-form-item label="售后类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择售后类型" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_aftersale_type" :label="item.label" :value="item.value" />
-        </el-select>
+        <DictRadio v-model="queryParams.type" :radioData="dict.type.oms_aftersale_type" size="small" :show-all="'all'"></DictRadio>
       </el-form-item>
       <el-form-item label="订单号" prop="orderSn">
         <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small"
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 6741504..87e7307 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -2,19 +2,17 @@
   <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="status">
-        <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_order_status" :label="item.label" :value="item.value" v-if="item.value < 11"/>
-        </el-select>
+        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_order_status" size="small" :show-all="'all'" :filter="['11', '12', '13', '14']"></DictRadio>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderSn">
         <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable size="small"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="支付方式" prop="payType">
-        <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_pay_type" :label="item.label" :value="item.value"/>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="支付方式" prop="payType">-->
+<!--        <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small">-->
+<!--          <el-option v-for="(item, index) in dict.type.oms_pay_type" :label="item.label" :value="item.value"/>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="商品名称" prop="productName">-->
 <!--        <el-input v-model.trim="queryParams.productName" placeholder="请输入商品名称" clearable size="small"-->
 <!--                  @keyup.enter.native="handleQuery"/>-->
@@ -601,4 +599,7 @@ export default {
 .el-link.el-link--default {
   color: #409eff;
 }
+.el-select{
+  width: 100%;
+}
 </style>
diff --git a/src/views/oms/orderOperateHistory/index.vue b/src/views/oms/orderOperateHistory/index.vue
index 4cd2f40..77d9327 100644
--- a/src/views/oms/orderOperateHistory/index.vue
+++ b/src/views/oms/orderOperateHistory/index.vue
@@ -10,19 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="操作人" prop="operateMan">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.operateMan"-->
-<!--          placeholder="请输入操作人"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="订单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_order_status" :label="item.label" :value="item.value"/>
-        </el-select>
+      <el-form-item label="订单状态" prop="status">
+        <DictRadio v-model="queryParams.status" :radioData="dict.type.oms_order_status" size="small" :show-all="'all'"></DictRadio>
       </el-form-item>
       <el-form-item class="flex_one tr">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>