lilei hace 3 días
padre
commit
22f0bacba3

+ 15 - 2
src/views/reportData/billingStatistics/customerCountList.vue

@@ -60,8 +60,19 @@
                   <customerService ref="customerName" id="customerCountList-customerName" v-model="queryParam.subareaArea.kfSn"></customerService>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-if="removeReportFlag==1">
+                <a-form-item label="业务类型">
+                  <v-select
+                    v-model="queryParam.bizType"
+                    ref="bizType"
+                    id="customerCountList-bizType"
+                    code="REMOVE_BIZ_TYPE"
+                    placeholder="请选择业务类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="removeReportFlag==1&&advanced?24:6" :sm="24" :style="{textAlign:removeReportFlag==1&&advanced?'center':'left'}">
               <a-button
                 type="primary"
                 @click="handleSearch"
@@ -172,7 +183,8 @@ export default {
           subareaAreaSn: '', // 分区
           bizUserSn: undefined, // 区域负责人
           kfSn: undefined// 客服
-        }
+        },
+        bizType: undefined
       },
       columns: [], // 表格  列数据
       totalData: null, // 合计
@@ -314,6 +326,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.subareaArea.kfSn = undefined
       this.queryParam.dealerLevel = undefined
+      this.queryParam.bizType = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.dealerSubareaScopeList.resetForm()

+ 2 - 1
src/views/reportData/billingStatistics/dataCustomer.js

@@ -308,7 +308,8 @@ export default {
         'align': 'center',
         'key': 'dealerLevel'
       },
-      { 'title': '销售退货单号', 'key': 'bizNo', 'dataIndex': 'bizNo', 'fixed': 'left', 'align': 'center'},
+      { 'title': '业务类型', 'key': 'bizTypeDictValue','dataIndex': 'bizTypeDictValue','fixed': 'left', 'align': 'center'},
+      { 'title': '业务单号', 'key': 'bizNo', 'dataIndex': 'bizNo', 'fixed': 'left', 'align': 'center'},
       {
         'type': 'amount',
         'dataIndex': 'jplqq',

+ 2 - 1
src/views/reportData/billingStatistics/dataProvince.js

@@ -287,7 +287,8 @@ export default {
       "align": "center",
       "key": "provinceName"
     },
-    { 'title': '销售退货单号', 'key': 'bizNo', 'dataIndex': 'bizNo', 'fixed': 'left', 'align': 'center'},
+    { 'title': '业务类型', 'key': 'bizTypeDictValue','dataIndex': 'bizTypeDictValue','fixed': 'left', 'align': 'center'},
+    { 'title': '业务单号', 'key': 'bizNo', 'dataIndex': 'bizNo', 'fixed': 'left', 'align': 'center'},
     {
       "type": "amount",
       "dataIndex": "jplqq",

+ 18 - 5
src/views/reportData/billingStatistics/provinceCountList.vue

@@ -11,7 +11,7 @@
           :rules="rules"
           :model="queryParam">
           <a-row :gutter="15">
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="月份" required>
                 <a-range-picker
                   id="customerCountList-monthBox"
@@ -24,21 +24,32 @@
                 />
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="地区">
                 <Area id="provinceCountList-areaList" v-model="queryParam.provinceSn" placeholder="请选择省份"></Area>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="所在区域">
                 <subarea id="provinceCountList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="区域负责人">
                 <BizUser id="provinceCountList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
               </a-form-model-item>
             </a-col>
+            <a-col :md="4" :sm="24" v-if="removeReportFlag==1">
+              <a-form-item label="业务类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="customerCountList-bizType"
+                  code="REMOVE_BIZ_TYPE"
+                  placeholder="请选择业务类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="4" :sm="24">
               <a-button
                 type="primary"
@@ -138,7 +149,8 @@ export default {
           subareaSn: '', // 区域
           subareaAreaSn: '', // 分区
           bizUserSn: undefined// 区域负责人
-        }
+        },
+        bizType: undefined // 业务类型
       },
       columns: [], // 表格列
       countLabel: null, // 统计名称合集
@@ -260,6 +272,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
       this.queryParam.subareaArea.bizUserSn = undefined
+      this.queryParam.bizType = undefined
       this.$refs.subarea.clearData()
       this.totalData = null
       this.$refs.table.clearTable()