Forráskód Böngészése

Merge branch 'develop_yh250608' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh62

# Conflicts:
#	src/views/reportData/billingStatistics/customerCountList.vue
lilei 6 napja
szülő
commit
536baee927

+ 3 - 3
src/api/bizRemove.js

@@ -3,11 +3,11 @@ import { axios } from '@/utils/request'
 // 根据销售退货单号查询客户
 export const salesReturnDetailByNo = (params) => {
   return axios({
-    url: `/salesReturn/findByNo/${params.salesReturnBillNo}`,
+    url: `/bizRemoveConfig/findBizInfo`,
     data: params,
-    method: 'get',
+    method: 'post',
     headers: {
-      'module': encodeURIComponent('根据销售退货单号查询客户信息')
+      'module': encodeURIComponent('剔除配置根据业务单号查询客户信息')
     }
   })
 }

+ 24 - 9
src/views/dealerManagement/marketingDivisionSetNew/addZoneModal.vue

@@ -17,8 +17,8 @@
       :label-col="formItemLayout.labelCol"
       :wrapper-col="formItemLayout.wrapperCol"
     >
-      <a-form-model-item label="所属区域">
-        {{ parentData&&parentData.subareaName }}
+      <a-form-model-item label="所属区域" prop="subareaSn">
+        <subarea id="chooseDealer-subarea" ref="subarea" showLeve="1" v-model="subareaSn" @change="subareaChange"></subarea>
       </a-form-model-item>
       <a-form-model-item label="分区名称" prop="subareaAreaName">
         <a-input
@@ -39,9 +39,10 @@
 
 <script>
 import { subareaSaveSubareaArea } from '@/api/subarea'
+import subarea from '@/views/common/subarea.js'
 export default {
   name: 'MarketingDivisionAddZoneModal',
-  components: { },
+  components: { subarea },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -71,12 +72,18 @@ export default {
       },
       // 提交数据
       form: {
-        subareaAreaName: '' // 分区名称
+        subareaAreaName: '', // 分区名称
+        subareaSn: undefined,
+        subareaAreaSn: undefined
       },
+      subareaSn: [],
       // 表单验证规则
       zoneRules: {
         subareaAreaName: [
           { required: true, message: '请输入分区名称', trigger: 'blur' }
+        ],
+        subareaSn: [
+          { required: true, message: '请选择区域', trigger: 'change' }
         ]
       }
     }
@@ -90,17 +97,15 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       this.form.subareaAreaName = str
     },
+    subareaChange (val) {
+      this.form.subareaSn = val[0] ? val[0] : undefined
+    },
     //  保存
     handleSave () {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const formData = JSON.parse(JSON.stringify(_this.form))
-          // 编辑
-          if (this.parentData.subareaAreaSn) {
-            formData.subareaAreaSn = this.parentData.subareaAreaSn
-          }
-          formData.subareaSn = this.parentData.subareaSn
           // console.log(formData, 'formData')
           _this.spinning = true
           subareaSaveSubareaArea(formData).then(res => {
@@ -130,9 +135,19 @@ export default {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
         this.form.subareaAreaName = ''
+        this.$refs.subarea.clearData()
+        this.subareaSn = []
       } else {
+        // 编辑
         if (this.parentData.subareaAreaSn) {
+          this.form.subareaSn = this.parentData.subareaSn
+          this.subareaSn = [this.form.subareaSn]
+          this.form.subareaAreaSn = this.parentData.subareaAreaSn
           this.form.subareaAreaName = this.parentData.subareaAreaName
+        } else {
+          this.form.subareaSn = this.parentData.subareaSn
+          this.subareaSn = [this.form.subareaSn]
+          this.form.subareaAreaSn = undefined
         }
       }
     }

+ 12 - 9
src/views/reportData/allocationDetails/list.vue

@@ -92,15 +92,16 @@
                   <customerService ref="customerName" id="allocationDetailsList-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="allocationDetailsList-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: 0px"
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="allocationDetailsList-stockDate">盘点区间日期</a-button> -->
+            <a-col :md="isShowCustomerSearch&&advanced?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch&&advanced?'center':''}">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocationDetailsList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocationDetailsList-reset">重置</a-button>
               <a-button
@@ -214,7 +215,8 @@ export default {
         },
         dealerProvinceSn: undefined, // 地区  省份
         warehouseSn: undefined, // 出库仓库
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined
       },
       productType: [], // 产品分类
       allocateTypeVal: [], // 已选费用/调拨类型 值
@@ -403,6 +405,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.productType = []
       this.allocateTypeVal = []
       if (this.advanced) {

+ 12 - 8
src/views/reportData/allocationOrderTotal/list.vue

@@ -64,14 +64,16 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="allocationOrderTotalList-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
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="allocationOrderTotalList-stockDate">盘点区间日期</a-button> -->
+            <a-col :md="isShowCustomerSearch&&advanced?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch&&advanced?'center':''}">
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="allocationOrderTotalList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocationOrderTotalList-reset">重置</a-button>
               <a-button
@@ -179,7 +181,8 @@ export default {
         allocateTypeSn: undefined, //  调拨类型2
         bizUserSn: undefined, // 客服
         targetName: undefined, // 客户名称
-        targetType: undefined// 客户类型
+        targetType: undefined, // 客户类型
+        dealerNewFlag: undefined
       },
       allocateTypeList: [], //  调拨类型
       allocateTypeVal: [], // 已选费用/调拨类型
@@ -328,6 +331,7 @@ export default {
       this.queryParam.bizUserSn = undefined
       this.queryParam.targetName = undefined
       this.queryParam.targetType = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.allocateTypeVal = []
       this.$refs.ruleForm.resetFields()
       this.totalData = null

+ 10 - 1
src/views/reportData/allocationPresentation/list.vue

@@ -50,6 +50,14 @@
                     <AreaList id="allocationPresentationList-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="allocationPresentationList-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-button type="primary" @click="handleSearch" :disabled="disabled" id="allocationPresentationList-refresh">查询</a-button>
@@ -179,6 +187,7 @@ export default {
         endDate: '', // 结束日期
         allocateNo: '', // 调拨单号
         targetName: '', // 客户名称
+        dealerNewFlag: undefined,
         subareaArea: {
           subareaSn: undefined, // 区域
           subareaAreaSn: undefined// 分区
@@ -279,7 +288,6 @@ export default {
         if (res.status == 200) {
           this.allocateType = res.data
           this.atypeColList = this.getCol(this.allocateType, '')
-          // console.log(JSON.stringify(this.atypeColList))
         } else {
           this.allocateType = []
         }
@@ -351,6 +359,7 @@ export default {
       this.queryParam.endDate = ''
       this.queryParam.allocateNo = ''
       this.queryParam.targetName = ''
+      this.queryParam.dealerNewFlag = undefined
       this.queryParam.subareaArea = {
         subareaSn: undefined,
         subareaAreaSn: undefined

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

@@ -55,8 +55,16 @@
                   <customerService id="billingReturnReportList-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="billingReturnReportList-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="isShowCustomerSearch&&advanced?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch&&advanced?'center':''}">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="billingReturnReportList-reset">重置</a-button>
               <a-button
@@ -166,7 +174,8 @@ export default {
           bizUserSn: undefined// 区域负责人
         },
         dealerLevel: undefined, // 客户等级
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
@@ -290,6 +299,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.areaList.clearData()

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

@@ -68,8 +68,23 @@
                   </a-select>
                 </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="advanced&&isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:advanced&&isShowCustomerSearch?'center':'left'}">
+            <a-col
+              :md="isCenter=='center'?24:6"
+              :sm="24"
+              style="margin-bottom: 10px;"
+              :style="{textAlign:isCenter}">
               <a-button
                 type="primary"
                 @click="handleSearch"
@@ -181,7 +196,8 @@ export default {
           subareaAreaSn: '', // 分区
           bizUserSn: undefined, // 区域负责人
           kfSn: undefined// 客服
-        }
+        },
+        bizType: undefined
       },
       columns: [], // 表格  列数据
       totalData: null, // 合计
@@ -217,6 +233,23 @@ export default {
       }
     }
   },
+  computed: {
+    isCenter () {
+      if (this.removeReportFlag == 0) {
+        if (this.isShowCustomerSearch) {
+          return this.advanced ? 'center' : 'left'
+        } else {
+          return 'left'
+        }
+      } else {
+        if (this.isShowCustomerSearch) {
+          return 'left'
+        } else {
+          return this.advanced ? 'center' : 'left'
+        }
+      }
+    }
+  },
   watch: {
     advanced (newValue, oldValue) {
       const _this = this
@@ -324,6 +357,8 @@ export default {
       this.queryParam.subareaArea.kfSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.dealerNewFlag = 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()

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

@@ -55,8 +55,16 @@
                   <AreaList id="returnGoodsPresentationList-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="returnGoodsPresentationList-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':''}">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
               <a-button
@@ -163,7 +171,8 @@ export default {
           'citySn': undefined, // 市
           'districtSn': undefined, // 区
           'dealerLevel': undefined// 客户级别
-        }
+        },
+        dealerNewFlag: undefined
       },
       columns: [], // 表头数据
       countLabel: [], // 统计分类数据
@@ -279,6 +288,7 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.salesReturnBillNo = ''
+      this.queryParam.dealerNewFlag = undefined
       this.queryParam.subareaArea = {
         subareaSn: undefined,
         subareaAreaSn: undefined,

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

@@ -80,6 +80,14 @@
                   <customerService id="returnSlipReportList-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="returnSlipReportList-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 type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
@@ -194,7 +202,8 @@ export default {
         salesReturnType: undefined, // 退货类型
         goodFlag: undefined, // 退货类别
         salesReturnBillNo: '', // 退货单号
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined// 客户类型
       },
       rules: {
         'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
@@ -327,6 +336,7 @@ export default {
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.queryParam.salesReturnBillNo = ''
       this.$refs.custList.resetForm()
       this.totalData = null

+ 12 - 8
src/views/reportData/salesReturnDetailReport/list.vue

@@ -115,14 +115,16 @@
                   <customerService id="salesReturnDetailList-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="salesReturnDetailList-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="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
-              <!-- <a-button
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="salesReturnDetailList-stockDate">盘点区间日期</a-button> -->
+            <a-col :md="!isShowCustomerSearch?24:(advanced?6:24)" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: !isShowCustomerSearch?'center':(advanced?'':'center')}">
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnDetailList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnDetailList-reset">重置</a-button>
               <a-button
@@ -264,7 +266,8 @@ export default {
         dealerProvinceSn: undefined, // 省
         dealerCitySn: undefined, // 市
         dealerCountySn: undefined, // 区
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined // 客户类型
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
@@ -526,6 +529,7 @@ export default {
       this.queryParam.goodFlag = undefined
       this.queryParam.salesReturnType = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.productType = []
       if (this.advanced) {
         this.$refs.subarea.clearData()

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

@@ -54,8 +54,16 @@
                   <customerService id="salesReturnDetailList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="新/老客户">
+                  <a-select id="salesReturnDetailList-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="isShowCustomerSearch&&advanced?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch&&advanced?'center':''}">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
               <a-button
@@ -166,7 +174,8 @@ export default {
           bizUserSn: undefined// 区域负责人
         },
         dealerLevel: undefined, // 客户级别
-        bizUserSn: undefined// 客服
+        bizUserSn: undefined, // 客服
+        dealerNewFlag: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
@@ -293,6 +302,7 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.dealerNewFlag = undefined
       this.totalData = null
       this.$refs.subarea.clearData()
       if (this.advanced) {

+ 19 - 19
src/views/setting/dailyReportSettings/baseModal.vue

@@ -20,21 +20,21 @@
       >
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="销售退货单号" prop="salesReturnBillNo">
+            <a-form-model-item label="业务单号" prop="bizNo">
               <a-input
-                id="base-salesReturnBillNo"
+                id="base-bizNo"
                 :disabled="bizSn"
-                v-model.trim="form.salesReturnBillNo"
+                v-model.trim="form.bizNo"
                 @change="fetchUser"
                 allowClear
-                placeholder="请输入销售退货单号"/>
+                placeholder="请输入业务单号"/>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="客户名称" prop="buyerSn">
-              {{ dealerData&&dealerData.buyerName||'--' }}
+            <a-form-model-item label="客户名称" prop="dealerSn">
+              {{ dealerData&&dealerData.dealerName||'--' }}
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -113,8 +113,8 @@ export default {
         wrapperCol: { span: 18 }
       },
       form: {
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         configType: 'DAILY_REPORT',
         bizSn: undefined, // bizsn
         dailyPl: undefined,
@@ -123,8 +123,8 @@ export default {
         areaSalesDay: undefined
       },
       rules: {
-        salesReturnBillNo: [{ required: true, message: '请输入销售退货单号', trigger: ['change', 'blur'] }],
-        buyerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
+        bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
+        dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
         dailyPl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         countrySalesDay: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         dailyPljl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
@@ -137,23 +137,23 @@ export default {
   },
   methods: {
     fetchUser () {
-      if (!this.form.salesReturnBillNo) return
+      if (!this.form.bizNo) return
       this.lastFetchId += 1
       const fetchId = this.lastFetchId
       this.dealerData = null
       this.fetching = true
       this.spinning = true
-      salesReturnDetailByNo({ salesReturnBillNo: this.form.salesReturnBillNo }).then(res => {
+      salesReturnDetailByNo({ bizNo: this.form.bizNo, configType: 'DAILY_REPORT' }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
         if (res.data) {
           this.dealerData = res.data
-          this.form.buyerSn = res.data.buyerSn
+          this.form.dealerSn = res.data.dealerSn
           this.form.bizSn = res.data.salesReturnBillSn
         } else {
           this.dealerData = null
-          this.form.buyerSn = undefined
+          this.form.dealerSn = undefined
           this.form.bizSn = undefined
         }
         this.spinning = false
@@ -192,8 +192,8 @@ export default {
       this.opened = false
       this.form = {
         configType: 'DAILY_REPORT',
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         bizSn: undefined, // bizsn
         dailyPl: undefined,
         countrySalesDay: undefined,
@@ -208,10 +208,10 @@ export default {
     getDetail () {
       bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'DAILY_REPORT' }).then(res => {
         const { bizSn, bizNo, dealerSn, dealerName, areaSalesDay, countrySalesDay, dailyPl, dailyPljl } = res.data
-        this.dealerData = { buyerName: dealerName }
+        this.dealerData = { dealerName: dealerName }
         this.form = Object.assign(this.form, {
-          salesReturnBillNo: bizNo,
-          buyerSn: dealerSn,
+          bizNo: bizNo,
+          dealerSn: dealerSn,
           bizSn: bizSn,
           dailyPl: dailyPl,
           countrySalesDay: countrySalesDay,

+ 20 - 7
src/views/setting/dailyReportSettings/salesReturnRemove.vue

@@ -16,11 +16,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="业务单号">
+                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
+              <a-form-item label="业务类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="salesReturnRemove-bizType"
+                  code="REMOVE_BIZ_TYPE"
+                  placeholder="请选择业务类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="24" :sm="24" style="text-align: center;margin-bottom: 10px;">
               <span class="table-page-search-submitButtons">
                 <a-button id="salesReturnRemove-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button id="salesReturnRemove-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -128,7 +139,8 @@ export default {
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         dealerSn: undefined, //  客户名称
-        bizNo: undefined //  总部销退单号
+        bizNo: undefined, //  业务单号
+        bizType: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -158,10 +170,11 @@ export default {
       const a = ['', '剔除']
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货日期', dataIndex: 'bizDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '全国销售日报', dataIndex: 'countrySalesDay', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '项目销售日报1', dataIndex: 'dailyPl', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '项目销售日报2', dataIndex: 'dailyPljl', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
@@ -228,7 +241,7 @@ export default {
       this.queryParam.dealerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.bizNo = ''
-
+      this.queryParam.bizType = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 20 - 20
src/views/setting/salesReturnRemove/baseModal.vue

@@ -20,21 +20,21 @@
       >
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="销售退货单号" prop="salesReturnBillNo">
+            <a-form-model-item label="业务单号" prop="bizNo">
               <a-input
-                id="base-salesReturnBillNo"
+                id="base-bizNo"
                 :disabled="bizSn"
-                v-model.trim="form.salesReturnBillNo"
+                v-model.trim="form.bizNo"
                 @change="fetchUser"
                 allowClear
-                placeholder="请输入销售退货单号"/>
+                placeholder="请输入业务单号"/>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="客户名称" prop="buyerSn">
-              {{ dealerData&&dealerData.buyerName||'--' }}
+            <a-form-model-item label="客户名称" prop="dealerSn">
+              {{ dealerData&&dealerData.dealerName||'--' }}
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -93,16 +93,16 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         configType: 'BILLING_REPORT',
         bizSn: undefined, // bizsn
         salesStatsProvince: undefined,
         salesStatsDealer: undefined
       },
       rules: {
-        salesReturnBillNo: [{ required: true, message: '请输入销售退货单号', trigger: ['change', 'blur'] }],
-        buyerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
+        bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
+        dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
         salesStatsProvince: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         salesStatsDealer: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
       },
@@ -113,23 +113,23 @@ export default {
   },
   methods: {
     fetchUser () {
-      if (!this.form.salesReturnBillNo) return
+      if (!this.form.bizNo) return
       this.lastFetchId += 1
       const fetchId = this.lastFetchId
       this.dealerData = null
       this.spinning = true
       this.fetching = true
-      salesReturnDetailByNo({ salesReturnBillNo: this.form.salesReturnBillNo }).then(res => {
+      salesReturnDetailByNo({ bizNo: this.form.bizNo, configType: 'BILLING_REPORT' }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
         if (res.data) {
           this.dealerData = res.data
-          this.form.buyerSn = res.data.buyerSn
-          this.form.bizSn = res.data.salesReturnBillSn
+          this.form.dealerSn = res.data.dealerSn
+          this.form.bizSn = res.data.bizSn
         } else {
           this.dealerData = null
-          this.form.buyerSn = undefined
+          this.form.dealerSn = undefined
           this.form.bizSn = undefined
         }
         this.fetching = false
@@ -149,7 +149,7 @@ export default {
         }
       })
     },
-    // 新建销售退货
+    // 新建业务
     salesSaveFun () {
       const _this = this
       const form = this.form
@@ -168,8 +168,8 @@ export default {
       this.opened = false
       this.form = {
         configType: 'BILLING_REPORT',
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         bizSn: undefined, // bizsn
         salesStatsProvince: undefined,
         salesStatsDealer: undefined
@@ -184,8 +184,8 @@ export default {
         const { bizSn, bizNo, dealerSn, dealerName, salesStatsDealer, salesStatsProvince } = res.data
         this.dealerData = { buyerName: dealerName }
         this.form = Object.assign(this.form, {
-          salesReturnBillNo: bizNo,
-          buyerSn: dealerSn,
+          bizNo: bizNo,
+          dealerSn: dealerSn,
           bizSn: bizSn,
           salesStatsProvince: salesStatsProvince,
           salesStatsDealer: salesStatsDealer

+ 20 - 6
src/views/setting/salesReturnRemove/list.vue

@@ -16,11 +16,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="业务单号">
+                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
+              <a-form-item label="业务类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="salesReturnRemove-bizType"
+                  code="REMOVE_BIZ_TYPE"
+                  placeholder="请选择业务类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="24" :sm="24" style="text-align: center;margin-bottom: 10px;">
               <span class="table-page-search-submitButtons">
                 <a-button id="salesReturnRemove-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button id="salesReturnRemove-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -131,7 +142,8 @@ export default {
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         dealerSn: undefined, //  客户名称
-        bizNo: undefined //  总部销退单号
+        bizNo: undefined, //  业务单号
+        bizType: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -161,10 +173,11 @@ export default {
       const a = ['', '剔除']
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货状态', dataIndex: 'billStatusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货日期', dataIndex: 'bizDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '26%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '开单统计(客户)', dataIndex: 'salesStatsDealer', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '开单统计(省份)', dataIndex: 'salesStatsProvince', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -229,6 +242,7 @@ export default {
       this.queryParam.dealerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.bizNo = ''
+      this.queryParam.bizType = undefined
 
       this.$refs.table.refresh(true)
     },

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.10/ocs-admin',
+        target: 'http://192.168.2.103/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {