Browse Source

经销商所属分区

chenrui 1 tháng trước cách đây
mục cha
commit
9b23474c33

+ 21 - 11
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -5,6 +5,11 @@
       <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="地区">
+                <Area id="dealerZoneSearch-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="所属区域/分区">
                 <subarea id="dealerZoneSearch-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -15,12 +20,12 @@
                 <custList id="dealerZoneSearch-dealerName" placeholder="请输入经销商名称搜索" ref="indirectDealer" @change="dealerChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="7" :sm="24">
-              <a-form-item label="客服/区域负责人/销售总监">
-                <a-input id="dealerZoneSearch-bizUserName" v-model.trim="queryParam.bizUserName" allowClear placeholder="请输入客服/区域负责人/销售总监"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客服/品类经理/区域负责人/销售总监">
+                <a-input id="dealerZoneSearch-bizUserName" v-model.trim="queryParam.bizUserName" allowClear placeholder="请输入客服/品类经理/区域负责人/销售总监"/>
               </a-form-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align: center;margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="dealerZoneSearch-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="dealerZoneSearch-reset">重置</a-button>
               <a-button
@@ -90,12 +95,13 @@ import { exportExcel } from '@/libs/JGPrint.js'
 import { STable } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
+import Area from '@/views/common/area.js'
 // 接口
 import { queryDealerWithBizuser, exportDealerWithBizuser } from '@/api/dealerRelation'
 export default {
   name: 'DealerZoneSearch',
   mixins: [commonMixin],
-  components: { STable, subarea, custList },
+  components: { STable, subarea, custList, Area },
   data () {
     return {
       spinning: false,
@@ -110,15 +116,18 @@ export default {
           dealerSn: '', // 经销商sn
           dealerName: ''// 经销商名称
         },
-        bizUserName: ''// 客服/区域负责人/销售总监
+        bizUserName: '', // 客服/区域负责人/销售总监
+        dealerProvinceSn: undefined// 地区
       },
       columns: [
         { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '所属区域', dataIndex: 'subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属分区', dataIndex: 'subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客服', scopedSlots: { customRender: 'kf' }, dataIndex: 'userNameKfs', width: '40%', align: 'center' },
-        { title: '区域负责人', scopedSlots: { customRender: 'qyfzr' }, dataIndex: 'userNameQyfzrs', width: '10%', align: 'center' },
-        { title: '销售总监', scopedSlots: { customRender: 'xszj' }, dataIndex: 'userNameXszjs', width: '10%', align: 'center' }
+        { title: '省份', dataIndex: 'dealerProvinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属区域', dataIndex: 'subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客服', scopedSlots: { customRender: 'kf' }, dataIndex: 'userNameKfs', width: '30%', align: 'center' },
+        { title: '品类经理', dataIndex: 'subareaAreaName1', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', scopedSlots: { customRender: 'qyfzr' }, dataIndex: 'userNameQyfzrs', width: '11%', align: 'center' },
+        { title: '销售总监', scopedSlots: { customRender: 'xszj' }, dataIndex: 'userNameXszjs', width: '8%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -161,6 +170,7 @@ export default {
       this.queryParam.dealer.dealerSn = ''
       this.queryParam.dealer.dealerName = ''
       this.queryParam.bizUserName = ''
+      this.queryParam.dealerProvinceSn = undefined
       this.$refs.indirectDealer.resetForm()
       this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)

+ 2 - 2
src/views/reportData/regionTypeBusinessReport/list.vue

@@ -70,7 +70,7 @@
           :style="{ height: tableHeight+'px' }"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y: tableHeight}"
+          :scroll="{ y: tableHeight-40}"
           :defaultLoadData="false"
           :showPagination="false"
           bordered>
@@ -297,7 +297,7 @@ export default {
     // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 160
+      this.tableHeight = window.innerHeight - tableSearchH - 130
     }
   },
   mounted () {