lilei 2 年之前
父節點
當前提交
d4711f1fa9

+ 75 - 0
src/views/common/bizUser.js

@@ -0,0 +1,75 @@
+import { queryPage } from '@/api/bizuser'
+const BizUser = {
+  template: `
+      <a-select
+        :placeholder="placeholder"
+        :id="id"
+        allowClear
+        :value="defaultVal"
+        :showSearch="true"
+        :disabled="disabledFlag"
+        @change="handleChange"
+        option-filter-prop="children"
+        :filter-option="filterOption">
+        <a-select-option v-for="item in list" :key="item.userSn" :value="item.userSn">
+        {{ item.userName }}
+        </a-select-option>
+      </a-select>
+    `,
+  props: {
+    value: {
+      type: String,
+      defatut: ''
+    },
+    id: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请选择负责人'
+    },
+    disabledFlag: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      defaultVal: this.value,
+      list: []
+    }
+  },
+  mounted () {
+    this.getList()
+  },
+  watch: {
+    value (newValue, oldValue) {
+      this.defaultVal = newValue
+    }
+  },
+  methods: {
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    handleChange (value) {
+      this.defaultVal = value
+      const item = this.list.find(item => item.userSn == value)
+      this.$emit('input', value)
+      this.$emit('change', value, item)
+    },
+    getList () {
+      queryPage({bizUserType:'qy',pageNo:1,pageSize:100}).then(res => {
+        if (res.status == 200) {
+          this.list = res.data.list
+        } else {
+          this.list = []
+        }
+      })
+    }
+  }
+}
+
+export default BizUser

+ 4 - 4
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -110,12 +110,12 @@ export default {
       },
       exportLoading: false, // 导出loading
       columns: [
-        { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { 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: '18%', align: 'center' },
-        { title: '区域负责人', scopedSlots: { customRender: 'qyfzr' }, dataIndex: 'userNameQyfzrs', width: '18%', align: 'center' },
-        { title: '销售总监', scopedSlots: { customRender: 'xszj' }, dataIndex: 'userNameXszjs', width: '18%', align: 'center' }
+        { 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' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 11 - 3
src/views/reportData/actualSalesReport/list.vue

@@ -40,6 +40,11 @@
                 <subarea id="actualSalesReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="actualSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -113,13 +118,14 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesBillRealReportTitle, salesBillRealAmountQueryPageList, salesBillRealReportCount } from '@/api/salesBillReport'
 import { actualSalesExport } from '@/api/reportData'
 export default {
   name: 'ActualSalesReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser },
   data () {
     return {
       spinning: false,
@@ -135,7 +141,8 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealer: {
           dealerSn: undefined,
@@ -256,7 +263,8 @@ export default {
       }
       this.queryParam.subareaArea = {
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
       }
       this.totalData = null
       if (this.advanced) {

+ 10 - 2
src/views/reportData/billingReturnReport/list.vue

@@ -40,6 +40,11 @@
                 <subarea id="billingReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="billingReturnReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -114,12 +119,13 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnList, salesReportReturnCount, billingReturnExport, salesReturnReportTitle } from '@/api/reportData'
 export default {
   name: 'BillingReturnReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList, BizUser },
   data () {
     return {
       spinning: false,
@@ -139,7 +145,8 @@ export default {
         districtSn: undefined,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealerLevel: undefined
       },
@@ -253,6 +260,7 @@ export default {
       this.queryParam.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {

+ 13 - 4
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -59,6 +59,11 @@
                   <subarea id="hPriceDifferenceDetailList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="省级区域">
                   <Area id="hPriceDifferenceDetailList-provinceSn" v-model="queryParam.dealer.provinceSn" placeholder="请选择省"></Area>
@@ -135,12 +140,13 @@ import reportModal from '@/views/common/reportModal.vue'
 import Area from '@/views/common/area.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { headRebateDetailReportList, headRebateDetailReportCount, headRebateDetailReportExport } from '@/api/reportData'
 export default {
   name: 'HPriceDifferenceDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, reportModal },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, reportModal, BizUser },
   data () {
     return {
       spinning: false,
@@ -161,7 +167,8 @@ export default {
         },
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         product: {
           brandType: undefined,
@@ -216,8 +223,9 @@ export default {
     columns () {
       let _this=this
       const arr = [
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '负责人', dataIndex: 'subareaArea.bizUserName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '订单号', dataIndex: 'bizNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '日期', dataIndex: 'bizCreateDate', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
@@ -325,6 +333,7 @@ export default {
       this.queryParam.dealer.dealerLevel = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealer.provinceSn = undefined
       this.queryParam.product.brandType = ''
       this.queryParam.product.productBrandSn = ''

+ 10 - 2
src/views/reportData/regionTypeSalesReport/list.vue

@@ -32,6 +32,11 @@
                 <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-if="activeKey==0">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
             <!--  <template v-if="advanced && activeKey==0">
               <a-col :md="6" :sm="24">
                 <a-form-model-item prop="dealerProvinceSn" style="margin: 0;" label="地区">
@@ -81,13 +86,14 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import Area from '@/views/common/area.js'
 import subarea from '@/views/common/subarea.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
 import { realReportSalesByProvince, realReportSalesByProvinceExport, subareaAreaReportTitle, subareaReportTitle, realReportSalesBySubArea, realReportSalesBySubAreaExport } from '@/api/reportData.js'
 export default {
   name: 'RegionTypeSalesReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, Area, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, Area, reportModal, BizUser },
   data () {
     return {
       spinning: false,
@@ -105,7 +111,8 @@ export default {
         dealerProvinceSn: undefined,
         subareaArea: {
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         salesStatusType: 'REAL_SALES'
       },
@@ -181,6 +188,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'
       if (this.activeKey == 0) {
         this.$refs.subarea.clearData()

+ 11 - 3
src/views/reportData/returnGoodsPresentation/list.vue

@@ -46,6 +46,11 @@
                   <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="returnGoodsPresentationList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -118,13 +123,14 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { returnDocReportTitle, reportSalesReturnThjdReportList, reportSalesReturnThjdReportCount, reportSalesReturnThjdReportExport } from '@/api/reportData'
 export default {
   name: 'ReturnGoodsPresentationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, AreaList, reportModal, dealerSubareaScopeList },
+  components: { STable, VSelect, rangeDate, subarea, AreaList, reportModal, dealerSubareaScopeList, BizUser },
   data () {
     return {
       spinning: false,
@@ -137,7 +143,8 @@ export default {
         salesReturnBillNo: '',
         subareaArea: {
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealer: {
           'dealerSn': '',
@@ -247,7 +254,8 @@ export default {
       this.queryParam.salesReturnBillNo = ''
       this.queryParam.subareaArea = {
         subareaSn: undefined,
-        subareaAreaSn: undefined
+        subareaAreaSn: undefined,
+        bizUserSn: undefined
       }
       this.queryParam.dealer = {
         'dealerName': '',

+ 10 - 2
src/views/reportData/returnSlipReport/list.vue

@@ -45,6 +45,11 @@
                   <subarea id="returnSlipReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                     <AreaList id="returnSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -119,12 +124,13 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnTitle, salesReportReturnBillList, salesReportReturnBillCount, returnSlipExport } from '@/api/reportData'
 export default {
   name: 'ReturnSlipReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList, BizUser },
   data () {
     return {
       spinning: false,
@@ -144,7 +150,8 @@ export default {
         districtSn: undefined,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealerLevel: undefined,
         salesReturnBillNo: ''
@@ -263,6 +270,7 @@ export default {
       this.queryParam.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.salesReturnBillNo = ''
       this.$refs.custList.resetForm()

+ 10 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -39,6 +39,11 @@
                 <subarea id="salesAmountReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="salesAmountReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -113,13 +118,14 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesKdxxReportTitle, salesBillReportGroupByBuyerList, salesBillReportCountByBuyer } from '@/api/salesBillReport'
 import { salesAmountExport } from '@/api/reportData'
 export default {
   name: 'SalesAmountReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser },
   data () {
     return {
       spinning: false,
@@ -140,7 +146,8 @@ export default {
         dealerLevel: undefined,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
       },
       columns: [],
@@ -251,6 +258,7 @@ export default {
       this.queryParam.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subarea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       this.$refs.subarea.clearData()

+ 11 - 3
src/views/reportData/salesDetails/list.vue

@@ -74,13 +74,18 @@
                   <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                     <AreaList id="salesDetailsList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="12" :sm="24" style="margin-bottom: 10px;">
               <a-button
                 type="primary"
                 class="button-info"
@@ -147,12 +152,13 @@ import AreaList from '@/views/common/areaList.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
 export default {
   name: 'SalesDetailsList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse, BizUser },
   data () {
     return {
       spinning: false,
@@ -178,7 +184,8 @@ export default {
         productTypeSn3: '', //  产品三级分类
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
@@ -220,6 +227,7 @@ export default {
       const arr = [
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '负责人', dataIndex: 'subareaArea.bizUserName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 9 - 1
src/views/reportData/salesPresentation/list.vue

@@ -45,6 +45,11 @@
                   <subarea id="salesPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="salesPresentationList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -118,12 +123,13 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesXsjdReportTitle, reportDispatchReportList, reportDispatchReportCount, reportDispatchReportExport } from '@/api/reportData'
 export default {
   name: 'SalesPresentationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, AreaList, dealerSubareaScopeList, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, AreaList, dealerSubareaScopeList, reportModal, BizUser },
   data () {
     return {
       spinning: false,
@@ -137,6 +143,7 @@ export default {
         'subareaArea':{
             'subareaSn': undefined,
             'subareaAreaSn': undefined,
+            'bizUserSn': undefined
         },
         dealer: {
           'dealerSn': undefined,
@@ -247,6 +254,7 @@ export default {
       this.queryParam.subareaArea = {
           'subareaSn': undefined,
           'subareaAreaSn': undefined,
+          'bizUserSn': undefined
          }
       this.queryParam.dealer = {
         'dealerSn': undefined,

+ 10 - 2
src/views/reportData/salesReturnDetailReport/list.vue

@@ -74,6 +74,11 @@
                   <subarea id="salesReturnDetailList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                     <AreaList id="salesReturnDetailList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -150,12 +155,13 @@ import AreaList from '@/views/common/areaList.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesReturnDetailExport } from '@/api/reportData'
 export default {
   name: 'SalesReturnDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse, BizUser },
   data () {
     return {
       spinning: false,
@@ -182,7 +188,8 @@ export default {
         warehouseSn: undefined,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
@@ -371,6 +378,7 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined

+ 10 - 2
src/views/reportData/salesReturnReport/list.vue

@@ -40,6 +40,11 @@
                 <subarea id="salesReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="salesReturnDetailList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -114,13 +119,14 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesReportReturnRebateTitle, salesReportReturnRebateList, salesReportReturnRebateCount, salesReturnExport } from '@/api/reportData'
 
 export default {
   name: 'SalesReturnReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, rangeDate, reportModal, AreaList, BizUser },
   data () {
     return {
       spinning: false,
@@ -140,7 +146,8 @@ export default {
         districtSn: undefined,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealerLevel: undefined
       },
@@ -257,6 +264,7 @@ export default {
       this.queryParam.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       this.$refs.subarea.clearData()

+ 10 - 2
src/views/reportData/salesSlipReport/list.vue

@@ -45,6 +45,11 @@
                   <subarea id="salesSlipReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                    <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="salesSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -119,13 +124,14 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import BizUser from '@/views/common/bizUser.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { salesKdxxdReportTitle, salesBillReportList, salesBillReportCount } from '@/api/salesBillReport'
 import { salesSlipExport } from '@/api/reportData'
 export default {
   name: 'SalesSlipReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, BizUser },
   data () {
     return {
       spinning: false,
@@ -146,7 +152,8 @@ export default {
         districtSn: undefined,
         subareaArea:{
           subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaAreaSn: undefined,
+          bizUserSn: undefined
         },
         dealerLevel: undefined
       },
@@ -259,6 +266,7 @@ export default {
       this.queryParam.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {