Browse Source

【修改】bug

howie 2 years ago
parent
commit
67b190ed0a
2 changed files with 17 additions and 13 deletions
  1. 1 1
      src/views/sales_policy/codealer_list.vue
  2. 16 12
      src/views/sales_policy/policy_list.vue

+ 1 - 1
src/views/sales_policy/codealer_list.vue

@@ -3,8 +3,8 @@
     <div class="screen-container">
       <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
         <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
           <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
-          <el-button type="primary" size="mini" @click="resetScreenForm">清空</el-button>
         </template>
         <template #search>
           <el-form

+ 16 - 12
src/views/sales_policy/policy_list.vue

@@ -3,8 +3,8 @@
     <div class="screen-container">
       <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
         <template #right_btn>
-          <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
           <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
         </template>
         <template #search>
           <el-form
@@ -87,7 +87,13 @@
               <el-row :gutter="20">
                 <el-col :xs="24" :ms="6" :lg="6">
                   <el-form-item label="状态" prop="status">
-                    <el-select v-model="screenForm.status" size="mini" placeholder="状态" class="select_height">
+                    <el-select
+                      v-model="screenForm.status"
+                      clearable
+                      size="mini"
+                      placeholder="状态"
+                      class="select_height"
+                    >
                       <el-option
                         v-for="(item, index) in statusOptions"
                         :key="index"
@@ -100,7 +106,13 @@
 
                 <el-col :xs="24" :ms="6" :lg="6">
                   <el-form-item label="销售政策类型" prop="type">
-                    <el-select v-model="screenForm.type" size="mini" placeholder="销售政策类型" class="select_height">
+                    <el-select
+                      v-model="screenForm.type"
+                      size="mini"
+                      clearable
+                      placeholder="销售政策类型"
+                      class="select_height"
+                    >
                       <el-option
                         v-for="item in typeOptions"
                         :key="item.value"
@@ -116,10 +128,10 @@
                       v-model="screenForm.customerId"
                       size="mini"
                       filterable
+                      clearable
                       placeholder="经销商名称"
                       class="select_height"
                     >
-                      <el-option label="全部" :value="null"></el-option>
                       <el-option v-for="item in CrList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                   </el-form-item>
@@ -321,10 +333,6 @@ export default {
       fileList: [],
       statusOptions: [
         {
-          vlaue: '',
-          label: '全部'
-        },
-        {
           value: true,
           label: '已生效'
         },
@@ -335,10 +343,6 @@ export default {
       ],
       typeOptions: [
         {
-          vlaue: '',
-          label: '全部'
-        },
-        {
           vlaue: 'PROVISION',
           label: '配提'
         },