Browse Source

修改bug

chenrui 1 year ago
parent
commit
a1e3a5dc89

+ 25 - 11
src/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue

@@ -17,22 +17,32 @@
             <div class="table-page-search-wrapper">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-row :gutter="15">
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="4" :sm="24">
                     <a-form-model-item label="地区">
                       <AreaList id="actualSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="4" :sm="24">
                     <a-form-model-item label="区域/分区">
                       <subarea ref="subarea" id="relatedDealersList-subarea" @change="subareaChange"></subarea>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="4" :sm="24">
                     <a-form-item label="经销商名称">
                       <a-input id="relatedDealersList-purchaseBillNo" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入经销商名称"/>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                  <a-col :md="4" :sm="24">
+                    <a-form-item label="商户类型">
+                      <v-select code="DEALER_TYPE" id="relatedDealersList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="4" :sm="24">
+                    <a-form-model-item label="商户级别" prop="dealerLevel">
+                      <v-select code="DEALER_LEVEL" id="relatedDealersList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckMakeInventoryList-refresh">查询</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckMakeInventoryList-reset">重置</a-button>
                     <a-button
@@ -48,7 +58,7 @@
               </a-form>
             </div>
             <div class="relatedDealersList-btn" style="margin-bottom:10px;">
-              <a-button type="primary" class="button-info" @click="openDealersModal">新增经销商</a-button>
+              <a-button type="primary" @click="openDealersModal">新增经销商</a-button>
             </div>
             <!-- 列表 -->
             <s-table
@@ -103,7 +113,7 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { STable } from '@/components'
+import { STable, VSelect } from '@/components'
 import chooseDealer from './chooseDealer.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
@@ -112,7 +122,7 @@ import { queryServiceCenterDealerPage, serviceCenterBinding, serviceCenterUnbind
 export default {
   name: 'LookUpCustomers',
   mixins: [commonMixin],
-  components: { STable, chooseDealer, subarea, AreaList },
+  components: { STable, VSelect, chooseDealer, subarea, AreaList },
   data () {
     return {
       spinning: false,
@@ -126,7 +136,9 @@ export default {
         citySn: undefined,
         districtSn: undefined,
         nameLike: '',
-        relationType: 'purchase'
+        relationType: 'purchase',
+        dealerType: undefined,
+        dealerLevel: undefined
       },
       tableHeight: 0,
       activeKeyVal: '1',
@@ -155,8 +167,8 @@ export default {
         { title: '地区', scopedSlots: { customRender: 'address' }, width: '20%', align: 'center', ellipsis: true },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户类型', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户级别', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '添加时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ],
@@ -244,7 +256,9 @@ export default {
         districtSn: undefined,
         nameLike: '',
         serviceCenterSn: this.$route.params.sn,
-        relationType: 'purchase'
+        relationType: 'purchase',
+        dealerType: undefined,
+        dealerLevel: undefined
       }
       this.$refs.areaList.clearData()
       this.$refs.subarea.clearData()