lilei il y a 1 semaine
Parent
commit
5583141492

+ 5 - 5
src/views/reportData/actualSalesReport/list.vue

@@ -56,9 +56,9 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="新/老客户">
-                  <a-select id="actualSalesReportList-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                    <a-select-option value="0">新客户</a-select-option>
-                    <a-select-option value="1">老客户</a-select-option>
+                  <a-select id="actualSalesReportList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>
@@ -178,7 +178,7 @@ export default {
           dealerLevel: undefined// 客户等价
         },
         bizUserSn: undefined, // 客服
-        customFlag: undefined
+        dealerNewFlag: undefined
       },
       totalData: null, // 统计数据
       columns: [], // 列表表头
@@ -309,7 +309,7 @@ export default {
       }
       this.totalData = null
       this.queryParam.bizUserSn = undefined
-      this.queryParam.customFlag = undefined
+      this.queryParam.dealerNewFlag = undefined
       if (this.advanced) {
         this.$refs.areaList.clearData()
         this.$refs.subarea.clearData()

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

@@ -55,13 +55,21 @@
                   <AreaList id="customerCountList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" id="customerCountList-customerName" v-model="queryParam.subareaArea.kfSn"></customerService>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="customerCountList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="advanced&&isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:advanced&&isShowCustomerSearch?'center':'left'}">
               <a-button
                 type="primary"
                 @click="handleSearch"
@@ -167,6 +175,7 @@ export default {
         provinceSn: undefined, // 省
         citySn: undefined, // 市
         districtSn: undefined, // 区
+        dealerNewFlag: undefined,
         subareaArea: {
           subareaSn: '', // 区域
           subareaAreaSn: '', // 分区
@@ -314,6 +323,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.subareaArea.kfSn = undefined
       this.queryParam.dealerLevel = undefined
+      this.queryParam.dealerNewFlag = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.dealerSubareaScopeList.resetForm()

+ 13 - 3
src/views/reportData/promotionFeeReport/customerFeeList.vue

@@ -65,13 +65,21 @@
                   ></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" id="customerFeeList-customerName" v-model="queryParam.kfSn"></customerService>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="customerFeeList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="isShowCustomerSearch&&advanced?24:6" :sm="24" style="margin-bottom:5px;" :style="{textAlign: isShowCustomerSearch&&advanced?'center':''}">
               <a-button
                 type="primary"
                 @click="handleSearch"
@@ -164,7 +172,8 @@ export default {
           bizUserSn: undefined// 区域负责人
         },
         discountFlag: '0', // 是否包含特价
-        kfSn: undefined// 客服
+        kfSn: undefined, // 客服
+        dealerNewFlag: undefined // 新老客户
       },
       columns: [], // 表头
       countLabel: null, // 合计名称
@@ -299,6 +308,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.kfSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.queryParam.discountFlag = '0'
       this.$refs.dealerSubareaScopeList.resetForm()
       if (this.advanced) {

+ 3 - 3
src/views/reportData/promotionSalesOrderReport/list.vue

@@ -87,9 +87,9 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="新/老客户">
-                  <a-select id="productInfoList-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                    <a-select-option value="0">新客户</a-select-option>
-                    <a-select-option value="1">老客户</a-select-option>
+                  <a-select id="productInfoList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>

+ 5 - 5
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -100,9 +100,9 @@
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-model-item label="新/老客户">
-                        <a-select id="promotionSalesRealTimeReport-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                          <a-select-option value="0">新客户</a-select-option>
-                          <a-select-option value="1">老客户</a-select-option>
+                        <a-select id="promotionSalesRealTimeReport-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                          <a-select-option value="1">新客户</a-select-option>
+                          <a-select-option value="0">老客户</a-select-option>
                         </a-select>
                       </a-form-model-item>
                     </a-col>
@@ -245,7 +245,7 @@ export default {
         dealerDistrictSn: undefined, // 区域编码
         giveMoney: undefined, // 采购额
         bizUserSn: undefined, // 客服
-        customFlag: undefined // 客户类型
+        dealerNewFlag: undefined // 客户类型
       },
       rules: {
         salesDate: [{ required: true, message: '请选择销售审核时间', trigger: 'change' }]
@@ -429,7 +429,7 @@ export default {
         dealerDistrictSn: undefined, // 区域编码
         giveMoney: undefined,
         bizUserSn: undefined, // 客服
-        customFlag: undefined // 自定义
+        dealerNewFlag: undefined // 自定义
       }
       this.time = undefined
       this.$refs.subarea.clearData()

+ 5 - 5
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -98,9 +98,9 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="新/老客户">
-                    <a-select id="promotionSalesRealTimeList-customFlag" v-model="newQueryParam.customFlag" placeholder="请选择" allowClear>
-                      <a-select-option value="0">新客户</a-select-option>
-                      <a-select-option value="1">老客户</a-select-option>
+                    <a-select id="promotionSalesRealTimeList-dealerNewFlag" v-model="newQueryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                      <a-select-option value="1">新客户</a-select-option>
+                      <a-select-option value="0">老客户</a-select-option>
                     </a-select>
                   </a-form-model-item>
                 </a-col>
@@ -242,7 +242,7 @@ export default {
         dealerCitySn: undefined, // 城市编码
         dealerDistrictSn: undefined, // 区域编码
         bizUserSn: undefined, // 客服
-        customFlag: undefined // 客户类型
+        dealerNewFlag: undefined // 客户类型
       },
       rules: {
         salesDate: [{ required: true, message: '请选择下推时间', trigger: 'change' }]
@@ -560,7 +560,7 @@ export default {
         dealerCitySn: undefined, // 城市编码
         dealerDistrictSn: undefined, // 区域编码
         bizUserSn: undefined,
-        customFlag: undefined
+        dealerNewFlag: undefined
       }
       this.$set(this.newQueryParam, 'salesDate', [
         getDate.getCurrMonthDays().starttime,

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

@@ -48,7 +48,15 @@
                   <customerService id="regionTypeSalesList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="(activeKey==0&&!isShowCustomerSearch)?24:activeKey==1&&isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:(activeKey==0&&!isShowCustomerSearch)?'center':(activeKey==1&&isShowCustomerSearch)?'center':'left'}">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="regionTypeSalesList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="(activeKey==1&&!isShowCustomerSearch)?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:(activeKey==1&&!isShowCustomerSearch)?'center':'left'}">
                 <a-button type="primary" @click="handleSearch" :disabled="disabled" id="regionTypeSalesList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="regionTypeSalesList-reset">重置</a-button>
                 <a-button
@@ -128,7 +136,8 @@ export default {
           bizUserSn: undefined// 区域负责人
         },
         salesStatusType: 'REAL_SALES', // 销售状态
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择时间', trigger: 'change' }],
@@ -204,6 +213,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'
       if (this.activeKey == 0) {
         this.$refs.subarea.clearData()

+ 5 - 5
src/views/reportData/salesAmountReport/list.vue

@@ -56,9 +56,9 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="新/老客户">
-                  <a-select id="salesAmountReportList-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                    <a-select-option value="0">新客户</a-select-option>
-                    <a-select-option value="1">老客户</a-select-option>
+                  <a-select id="salesAmountReportList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>
@@ -176,7 +176,7 @@ export default {
           bizUserSn: undefined// 区域负责人
         },
         bizUserSn: undefined, // 客服
-        customFlag: undefined
+        dealerNewFlag: undefined
       },
       totalData: null, // 统计数据
       columns: [], // 列表表头
@@ -303,7 +303,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.bizUserSn = undefined
-      this.queryParam.customFlag = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.totalData = null
       this.$refs.subarea.clearData()
       if (this.advanced) {

+ 5 - 5
src/views/reportData/salesDetails/list.vue

@@ -129,9 +129,9 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="新/老客户">
-                  <a-select id="salesDetailsList-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                    <a-select-option value="0">新客户</a-select-option>
-                    <a-select-option value="1">老客户</a-select-option>
+                  <a-select id="salesDetailsList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>
@@ -270,7 +270,7 @@ export default {
         giftFLag: undefined, // 是否是促销产品  1是  0不是
         promotionFlag: undefined, // 产品类型
         bizUserSn: undefined, // 客服
-        customFlag: undefined // 客户类型
+        dealerNewFlag: undefined // 客户类型
       },
       isAveragePrice: false, // 平均公斤单价
       productType: [], // 产品分类
@@ -472,7 +472,7 @@ export default {
       this.queryParam.giftFLag = undefined
       this.queryParam.promotionFlag = undefined
       this.queryParam.bizUserSn = undefined
-      this.queryParam.customFlag = undefined
+      this.queryParam.dealerNewFlag = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()

+ 5 - 5
src/views/reportData/salesOrderTotal/list.vue

@@ -85,9 +85,9 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="新/老客户">
-                  <a-select id="salesOrderTotalList-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                    <a-select-option value="0">新客户</a-select-option>
-                    <a-select-option value="1">老客户</a-select-option>
+                  <a-select id="salesOrderTotalList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>
@@ -219,7 +219,7 @@ export default {
         },
         dealerProvinceSn: undefined, // 省份
         bizUserSn: undefined, // 客服
-        customFlag: undefined // 客户类型
+        dealerNewFlag: undefined // 客户类型
       },
       rules: { 'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }] }, // 查询时间必选项
 
@@ -400,7 +400,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.bizUserSn = undefined
-      this.queryParam.customFlag = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 12 - 2
src/views/reportData/salesPresentation/list.vue

@@ -55,8 +55,16 @@
                   <AreaList id="salesPresentationList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="salesPresentationList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="advanced?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:advanced?'center':'left'}">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesPresentationList-reset">重置</a-button>
               <a-button
@@ -157,7 +165,8 @@ export default {
           'citySn': undefined,
           'districtSn': undefined,
           'dealerLevel': undefined
-        }
+        },
+        dealerNewFlag: undefined
       },
       columns: [],
       countLabel: [],
@@ -269,6 +278,7 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.salesBillNo = ''
+      this.queryParam.dealerNewFlag = undefined
       this.queryParam.subareaArea = {
         'subareaSn': undefined,
         'subareaAreaSn': undefined,

+ 11 - 1
src/views/reportData/salesReturnsReport/list.vue

@@ -80,6 +80,14 @@
                   <customerService id="salesReturnsReportList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="customerCountList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
@@ -198,7 +206,8 @@ export default {
         dealerProvinceSn: undefined, // 省
         dealerCitySn: undefined, // 市
         dealerCountySn: undefined, // 区
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
@@ -398,6 +407,7 @@ export default {
       this.queryParam.goodFlag = undefined
       this.queryParam.salesReturnType = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.custList.resetForm()

+ 3 - 3
src/views/reportData/salesSlipReport/list.vue

@@ -61,9 +61,9 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="新/老客户">
-                  <a-select id="salesSlipReportList-customFlag" v-model="queryParam.customFlag" placeholder="请选择" allowClear>
-                    <a-select-option value="0">新客户</a-select-option>
-                    <a-select-option value="1">老客户</a-select-option>
+                  <a-select id="salesSlipReportList-dealerNewFlag" v-model="queryParam.dealerNewFlag" placeholder="请选择" allowClear>
+                    <a-select-option value="1">新客户</a-select-option>
+                    <a-select-option value="0">老客户</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>