Browse Source

商户类型修改

lilei 1 year ago
parent
commit
8095e63422

+ 11 - 0
src/api/dealer.js

@@ -11,6 +11,17 @@ export const dealerDetailBySn = (params) => {
     }
     }
   })
   })
 }
 }
+// 查询商户类型
+export const dealerTypeTreeList = (params) => {
+  return axios({
+    url: `/dealerType/queryTree`,
+    data: params,
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('查询商户类型')
+    }
+  })
+}
 // 根据sn查找修改过后的经销商信息
 // 根据sn查找修改过后的经销商信息
 export const dealerFindUpdateInfoBySn = (params) => {
 export const dealerFindUpdateInfoBySn = (params) => {
   return axios({
   return axios({

+ 15 - 4
src/views/common/chooseDealer.vue

@@ -11,7 +11,7 @@
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
             <a-form-item label="商户类型">
             <a-form-item label="商户类型">
-              <dealerType id="chooseDealer-dealerType" v-model="queryParam.dealerType" allowClear></dealerType>
+              <dealerType id="chooseDealer-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealerType>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
@@ -108,9 +108,11 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         auditState: undefined,
         auditState: undefined,
         provinceSn: undefined,
         provinceSn: undefined,
@@ -135,6 +137,9 @@ export default {
             const no = 0
             const no = 0
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
+              if (data.list[i].dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
+              }
             }
             }
           }
           }
           this.spinning = false
           this.spinning = false
@@ -150,7 +155,7 @@ export default {
       const arr = [
       const arr = [
         { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (_this.pageType == 'viewDealers') {
       if (_this.pageType == 'viewDealers') {
@@ -172,6 +177,10 @@ export default {
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     areaChange (val) {
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
@@ -188,9 +197,11 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         auditState: undefined,
         auditState: undefined,
         provinceSn: undefined,
         provinceSn: undefined,

+ 8 - 19
src/views/common/dealerType.js

@@ -1,4 +1,4 @@
-import { allocateTypeTreeList } from '@/api/allocateType'
+import { dealerTypeTreeList } from '@/api/dealer.js'
 const AllocateType = {
 const AllocateType = {
   template: `
   template: `
       <a-cascader
       <a-cascader
@@ -10,7 +10,7 @@ const AllocateType = {
         expand-trigger="hover"
         expand-trigger="hover"
         :placeholder="placeholder"
         :placeholder="placeholder"
         :id="id"
         :id="id"
-        :fieldNames="{ label: 'name', value: 'allocateTypeSn', children: 'sonList' }"/>
+        :fieldNames="{ label: 'name', value: 'code', children: 'childrenList' }"/>
     `,
     `,
   props: {
   props: {
     value: {
     value: {
@@ -47,7 +47,7 @@ const AllocateType = {
     };
     };
   },
   },
   mounted() {
   mounted() {
-    this.getProductBrand()
+    this.getTree()
   },
   },
   watch: {
   watch: {
     value(newValue, oldValue) {
     value(newValue, oldValue) {
@@ -66,8 +66,9 @@ const AllocateType = {
       this.$emit('change', value,opts);
       this.$emit('change', value,opts);
     },
     },
     //  价格类型
     //  价格类型
-    getProductBrand () {
-      allocateTypeTreeList({}).then(res => {
+    getTree () {
+      dealerTypeTreeList({}).then(res => {
+        console.log(res)
         if (res.status == 200) {
         if (res.status == 200) {
           if(this.level){
           if(this.level){
             this.list = this.getBylevel(res.data)
             this.list = this.getBylevel(res.data)
@@ -84,20 +85,8 @@ const AllocateType = {
       // 显示一级分类
       // 显示一级分类
       if(this.level == 1){
       if(this.level == 1){
         data.map(item => {
         data.map(item => {
-          if(item.sonList){
-            delete item.sonList
-          }
-        })
-      }
-      // 显示二级分类
-      if(this.level == 2){
-        data.map(item => {
-          if(item.sonList){
-            item.sonList.map(cd => {
-              if(cd.sonList){
-                 delete cd.sonList
-              }
-            })
+          if(item.childrenList){
+            delete item.childrenList
           }
           }
         })
         })
       }
       }

+ 15 - 4
src/views/dealerManagement/businessOwnerSettings/chooseDealer.vue

@@ -11,7 +11,7 @@
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
             <a-form-item label="商户类型">
             <a-form-item label="商户类型">
-              <dealerType id="chooseDealer-dealerType" v-model="queryParam.dealer.dealerType" allowClear></dealertype>
+              <dealerType id="chooseDealer-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
@@ -108,10 +108,12 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         dealer: {
         dealer: {
           nameLike: '',
           nameLike: '',
-          dealerType: null,
+          dealerType1: undefined, //  商户类型
+          dealerType2: undefined, //  商户类型
           dealerLevel: null
           dealerLevel: null
         },
         },
         auditState: undefined,
         auditState: undefined,
@@ -141,6 +143,9 @@ export default {
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
               data.list[i].dealerSn = data.list[i].dealer.dealerSn
               data.list[i].dealerSn = data.list[i].dealer.dealerSn
+              if (data.list[i].dealer.dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealer.dealerTypeName1 + '>' + data.list[i].dealer.dealerTypeName2
+              }
               if (!_this.pageType && _this.chooseInfo && _this.chooseInfo.length > 0) {
               if (!_this.pageType && _this.chooseInfo && _this.chooseInfo.length > 0) {
                 // 回显选中数据
                 // 回显选中数据
                 const flag = _this.chooseInfo.includes(data.list[i].dealer.dealerSn)
                 const flag = _this.chooseInfo.includes(data.list[i].dealer.dealerSn)
@@ -167,7 +172,7 @@ export default {
       const arr = [
       const arr = [
         { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealer.dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealer.dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealer.dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealer.dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '商户级别', dataIndex: 'dealer.dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (_this.pageType == 'viewDealers') {
       if (_this.pageType == 'viewDealers') {
@@ -189,6 +194,10 @@ export default {
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealer.dealerType1 = v[0]
+      this.queryParam.dealer.dealerType2 = v[1]
+    },
     areaChange (val) {
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
@@ -204,10 +213,12 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         dealer: {
         dealer: {
           nameLike: '',
           nameLike: '',
-          dealerType: null,
+          dealerType1: undefined, //  商户类型
+          dealerType2: undefined, //  商户类型
           dealerLevel: null
           dealerLevel: null
         },
         },
         auditState: undefined,
         auditState: undefined,

+ 15 - 4
src/views/dealerManagement/marketingDivisionSetNew/viewDealers.vue

@@ -21,7 +21,7 @@
               </a-col>
               </a-col>
               <a-col :md="8" :sm="24">
               <a-col :md="8" :sm="24">
                 <a-form-item label="商户类型">
                 <a-form-item label="商户类型">
-                  <dealerType id="viewDealers-dealerType" v-model="queryParam.dealer.dealerType" allowClear></dealertype>
+                  <dealerType id="viewDealers-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="8" :sm="24">
               <a-col :md="8" :sm="24">
@@ -151,10 +151,12 @@ export default {
       visible: this.showModal,
       visible: this.showModal,
       openAddDealer: false,
       openAddDealer: false,
       flag: true,
       flag: true,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         dealer: {
         dealer: {
           nameLike: '',
           nameLike: '',
-          dealerType: null,
+          dealerType1: undefined, //  商户类型
+          dealerType2: undefined, //  商户类型
           dealerLevel: null,
           dealerLevel: null,
           auditState: undefined,
           auditState: undefined,
           provinceSn: undefined,
           provinceSn: undefined,
@@ -170,7 +172,7 @@ export default {
       columns: [
       columns: [
         { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户别名', dataIndex: 'dealer.dealerAlias', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户别名', dataIndex: 'dealer.dealerAlias', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户类型', dataIndex: 'dealer.dealerTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealer.dealerLevelDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealer.dealerLevelDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'dealer.auditStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'dealer.auditStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
@@ -185,6 +187,9 @@ export default {
             const no = 0
             const no = 0
             for (var i = 0; i < data.length; i++) {
             for (var i = 0; i < data.length; i++) {
               data[i].no = no + i + 1
               data[i].no = no + i + 1
+              if (data.list[i].dealer.dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealer.dealerTypeName1 + '>' + data.list[i].dealer.dealerTypeName2
+              }
             }
             }
           }
           }
           this.disabled = false
           this.disabled = false
@@ -196,6 +201,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    getDealerType (v, o) {
+      this.queryParam.dealer.dealerType1 = v[0]
+      this.queryParam.dealer.dealerType2 = v[1]
+    },
     // 绑定
     // 绑定
     hanldAdd (row) {
     hanldAdd (row) {
       console.log(row)
       console.log(row)
@@ -244,10 +253,12 @@ export default {
       }
       }
     },
     },
     resetData () {
     resetData () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         dealer: {
         dealer: {
           nameLike: '',
           nameLike: '',
-          dealerType: null,
+          dealerType1: undefined, //  商户类型
+          dealerType2: undefined, //  商户类型
           dealerLevel: null,
           dealerLevel: null,
           auditState: undefined,
           auditState: undefined,
           provinceSn: undefined,
           provinceSn: undefined,

+ 15 - 5
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -30,10 +30,11 @@
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                 <a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
-                  <a-form-model-item label="商户类型" prop="dealerType">
+                  <a-form-model-item label="商户类型" prop="dealerType1">
                     <dealerType
                     <dealerType
                       id="merchantInfoManagementEdit-dealerType"
                       id="merchantInfoManagementEdit-dealerType"
-                      v-model="form.dealerType"
+                      v-model="dealerType"
+                      @change="getDealerType"
                       allowClear></dealertype>
                       allowClear></dealertype>
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
@@ -430,10 +431,12 @@ export default {
           span: 16
           span: 16
         }
         }
       },
       },
+      dealerType: [],
       form: {
       form: {
         dealerName: '',
         dealerName: '',
         dealerAlias: '',
         dealerAlias: '',
-        dealerType: undefined,
+        dealerType1: undefined,
+        dealerType2: undefined,
         contact: '',
         contact: '',
         contactMobile: '',
         contactMobile: '',
         provinceSn: undefined,
         provinceSn: undefined,
@@ -480,7 +483,7 @@ export default {
         dealerAlias: [
         dealerAlias: [
           { required: true, message: '请输入经销商别名', trigger: 'change' }
           { required: true, message: '请输入经销商别名', trigger: 'change' }
         ],
         ],
-        dealerType: [
+        dealerType1: [
           { required: true, message: '请选择商户类型', trigger: 'change' }
           { required: true, message: '请选择商户类型', trigger: 'change' }
         ],
         ],
         contact: [
         contact: [
@@ -543,13 +546,16 @@ export default {
   methods: {
   methods: {
     bankAccountChange (e) {
     bankAccountChange (e) {
       const { value } = e.target
       const { value } = e.target
-      console.log(value, value.replace(/\s*/g, ''))
       this.form.tradeBankAccount = value.replace(/\s*/g, '')
       this.form.tradeBankAccount = value.replace(/\s*/g, '')
     },
     },
     // 不可选日期
     // 不可选日期
     disabledDate (date, dateStrings) {
     disabledDate (date, dateStrings) {
       return date && date.valueOf() > Date.now()
       return date && date.valueOf() > Date.now()
     },
     },
+    getDealerType (v, o) {
+      this.form.dealerType1 = v[0]
+      this.form.dealerType2 = v[1]
+    },
     // 详情编辑
     // 详情编辑
     getDetail () {
     getDetail () {
       this.spinning = true
       this.spinning = true
@@ -557,7 +563,11 @@ export default {
         if (res.status == 200) {
         if (res.status == 200) {
           this.detailData = res.data
           this.detailData = res.data
           this.form = Object.assign(this.form, res.data)
           this.form = Object.assign(this.form, res.data)
+          delete this.form.dealerType
           this.form.isShowSpecialPrice = Number(this.form.isShowSpecialPrice)
           this.form.isShowSpecialPrice = Number(this.form.isShowSpecialPrice)
+          if (this.form.dealerType1) {
+            this.dealerType = [this.form.dealerType1, this.form.dealerType2]
+          }
           if (this.form.provinceSn) {
           if (this.form.provinceSn) {
             this.getArea('city', this.form.provinceSn, 0)
             this.getArea('city', this.form.provinceSn, 0)
           }
           }

+ 17 - 6
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -17,7 +17,7 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="商户类型">
               <a-form-item label="商户类型">
-                <dealerType id="merchantInfoManagementList-dealerType" v-model="queryParam.dealerType" allowClear></dealertype>
+                <dealerType id="merchantInfoManagementList-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
@@ -85,9 +85,9 @@
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
             <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
             <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
             <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
             <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
-            <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
-            <br>
+            <!-- <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button> -->
             <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
             <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
+            <br>
             <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT'" @click="handlePriceSpread(record)">差价</a-button>
             <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT'" @click="handlePriceSpread(record)">差价</a-button>
             <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
             <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
             <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
             <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
@@ -129,9 +129,11 @@ export default {
       spinning: false,
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       tableHeight: 0,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         nameLike: '', //  商户名称、别名
-        dealerType: undefined, //  商户类型
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: undefined, // 商户级别
         dealerLevel: undefined, // 商户级别
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域
@@ -151,7 +153,7 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '12%', align: 'left', ellipsis: true },
         { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '12%', align: 'left', ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系人', dataIndex: 'contact', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系人', dataIndex: 'contact', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系电话', dataIndex: 'dealerTelephone', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系电话', dataIndex: 'dealerTelephone', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -174,6 +176,9 @@ export default {
             this.total = data.count || 0
             this.total = data.count || 0
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
+              if (data.list[i].dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
+              }
             }
             }
             this.disabled = false
             this.disabled = false
           }
           }
@@ -193,11 +198,17 @@ export default {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     //  重置列表
     //  重置列表
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         nameLike: '', //  商户名称、别名
-        dealerType: undefined, //  商户类型
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: undefined, // 商户级别
         dealerLevel: undefined, // 商户级别
         subareaArea: {
         subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,

+ 15 - 4
src/views/dealerManagement/provincialWarehouseManagement/chooseDealer.vue

@@ -16,7 +16,7 @@
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
             <a-form-item label="商户类型">
             <a-form-item label="商户类型">
-              <dealerType id="chooseDealer-dealerType" v-model="queryParam.dealerType" allowClear></dealertype>
+              <dealerType id="chooseDealer-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
@@ -89,9 +89,11 @@ export default {
     return {
     return {
       tableHeight: 0,
       tableHeight: 0,
       spinning: false,
       spinning: false,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域
@@ -108,7 +110,7 @@ export default {
       columns: [
       columns: [
         { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '30%', align: 'center', ellipsis: true },
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '30%', align: 'center', ellipsis: true },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -127,6 +129,9 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
+              if (data.list[i].dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
+              }
             }
             }
             this.disabled = false
             this.disabled = false
           }
           }
@@ -146,6 +151,10 @@ export default {
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     areaChange (val) {
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
@@ -160,9 +169,11 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域

+ 15 - 4
src/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue

@@ -34,7 +34,7 @@
                   </a-col>
                   </a-col>
                   <a-col :md="4" :sm="24">
                   <a-col :md="4" :sm="24">
                     <a-form-item label="商户类型">
                     <a-form-item label="商户类型">
-                      <dealerType id="relatedDealersList-dealerType" v-model="queryParam.dealerType" allowClear></dealertype>
+                      <dealerType id="relatedDealersList-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
                     </a-form-item>
                     </a-form-item>
                   </a-col>
                   </a-col>
                   <a-col :md="4" :sm="24">
                   <a-col :md="4" :sm="24">
@@ -131,6 +131,7 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       disabled: false,
       exportLoading: false,
       exportLoading: false,
+      dealerType: [],
       queryParam: {
       queryParam: {
         subareaSn: undefined,
         subareaSn: undefined,
         subareaAreaSn: undefined,
         subareaAreaSn: undefined,
@@ -139,7 +140,8 @@ export default {
         districtSn: undefined,
         districtSn: undefined,
         nameLike: '',
         nameLike: '',
         relationType: 'purchase',
         relationType: 'purchase',
-        dealerType: undefined,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: undefined
         dealerLevel: undefined
       },
       },
       tableHeight: 0,
       tableHeight: 0,
@@ -156,6 +158,9 @@ export default {
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
               data.list[i].loginFlag = Number(data.list[i].loginFlag)
               data.list[i].loginFlag = Number(data.list[i].loginFlag)
+              if (data.list[i].dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
+              }
             }
             }
             this.disabled = false
             this.disabled = false
           }
           }
@@ -169,7 +174,7 @@ export default {
         { title: '地区', scopedSlots: { customRender: 'address' }, width: '20%', align: 'center', ellipsis: true },
         { title: '地区', scopedSlots: { customRender: 'address' }, width: '20%', align: 'center', ellipsis: true },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '添加时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '添加时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
@@ -190,6 +195,10 @@ export default {
       this.openDealerModal = false
       this.openDealerModal = false
       this.$refs.dealerChoose.clearSelect()
       this.$refs.dealerChoose.clearSelect()
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     // 关联经销商
     // 关联经销商
     handleAddDealer (list) {
     handleAddDealer (list) {
       const newList = list.map(item => {
       const newList = list.map(item => {
@@ -250,6 +259,7 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         subareaSn: undefined,
         subareaSn: undefined,
         subareaAreaSn: undefined,
         subareaAreaSn: undefined,
@@ -259,7 +269,8 @@ export default {
         nameLike: '',
         nameLike: '',
         serviceCenterSn: this.$route.params.sn,
         serviceCenterSn: this.$route.params.sn,
         relationType: 'purchase',
         relationType: 'purchase',
-        dealerType: undefined,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: undefined
         dealerLevel: undefined
       }
       }
       this.$refs.areaList.clearData()
       this.$refs.areaList.clearData()

+ 15 - 4
src/views/promotionRulesManagement/dealerPromotions/chooseDealer.vue

@@ -16,7 +16,7 @@
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
             <a-form-item label="商户类型">
             <a-form-item label="商户类型">
-              <dealerType id="chooseDealer-dealerType" v-model="queryParam.dealerType" allowClear></dealertype>
+              <dealerType id="chooseDealer-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
@@ -89,9 +89,11 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域
@@ -118,7 +120,7 @@ export default {
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '30%', align: 'center', ellipsis: true },
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '30%', align: 'center', ellipsis: true },
         { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
@@ -155,6 +157,9 @@ export default {
           const no = 0
           const no = 0
           for (var i = 0; i < data.list.length; i++) {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].no = no + i + 1
+            if (data.list[i].dealerTypeName1) {
+              data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
+            }
           }
           }
           this.dealerList = data.list
           this.dealerList = data.list
           this.pagination = pagination
           this.pagination = pagination
@@ -170,6 +175,10 @@ export default {
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     areaChange (val) {
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
@@ -185,9 +194,11 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域

+ 17 - 6
src/views/promotionRulesManagement/promotionManagement/chooseDealer.vue

@@ -16,7 +16,7 @@
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
             <a-form-item label="商户类型">
             <a-form-item label="商户类型">
-              <dealerType id="chooseDealer-dealerType" v-model="queryParam.dealerType" allowClear></dealertype>
+              <dealerType id="chooseDealer-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="8" :sm="24">
           <a-col :md="8" :sm="24">
@@ -103,9 +103,11 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域
@@ -136,9 +138,9 @@ export default {
     },
     },
     columns () {
     columns () {
       const arr = [
       const arr = [
-        { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '经销商名称', dataIndex: 'dealerName', width: '25%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '25%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户类型', dataIndex: 'dealerTypeName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
@@ -174,6 +176,9 @@ export default {
           const no = 0
           const no = 0
           for (var i = 0; i < data.list.length; i++) {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].no = no + i + 1
+            if (data.list[i].dealerTypeName1) {
+              data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
+            }
           }
           }
           this.dealerList = data.list
           this.dealerList = data.list
           this.pagination = pagination
           this.pagination = pagination
@@ -202,11 +207,17 @@ export default {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.queryParam = {
       this.queryParam = {
         nameLike: '',
         nameLike: '',
-        dealerType: null,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         dealerLevel: null,
         dealerLevel: null,
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域

+ 15 - 4
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -58,7 +58,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客户类型">
                 <a-form-item label="客户类型">
-                  <dealerType id="shortageStatisticsCList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择客户类型"></dealertype>
+                  <dealerType id="shortageStatisticsCList-dealerType" v-model="dealerType" @change="getDealerType" allowClear placeholder="请选择客户类型"></dealertype>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -170,6 +170,7 @@ export default {
       spinning: false,
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       tableHeight: 0, // 表格高度
+      dealerType: [],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         endDate: getDate.getCurrMonthDays().endtime,
@@ -185,7 +186,8 @@ export default {
         productTypeSn3: '', //  产品三级分类
         productTypeSn3: '', //  产品三级分类
         salesBillNo: '',
         salesBillNo: '',
         provinceSn: undefined,
         provinceSn: undefined,
-        dealerType: undefined,
+        dealerType1: undefined, //  商户类型
+        dealerType2: undefined, //  商户类型
         brandType: undefined,
         brandType: undefined,
         productBrandSn: undefined,
         productBrandSn: undefined,
         state: undefined,
         state: undefined,
@@ -211,6 +213,9 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
+              if (data.list[i].dealerEntity.dealerTypeName1) {
+                data.list[i].dealerTypeName = data.list[i].dealerEntity.dealerTypeName1 + '>' + data.list[i].dealerEntity.dealerTypeName2
+              }
             }
             }
             this.disabled = false
             this.disabled = false
             this.getCount(params)
             this.getCount(params)
@@ -234,7 +239,7 @@ export default {
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户类型', dataIndex: 'dealerEntity.dealerTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户类型', dataIndex: 'dealerTypeName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '二级分类', dataIndex: 'productEntity.productTypeName2', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '二级分类', dataIndex: 'productEntity.productTypeName2', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -294,8 +299,13 @@ export default {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
+    getDealerType (v, o) {
+      this.queryParam.dealerType1 = v[0]
+      this.queryParam.dealerType2 = v[1]
+    },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.dealerType = []
       this.$refs.rangeDate.resetDate(this.time)
       this.$refs.rangeDate.resetDate(this.time)
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
@@ -313,7 +323,8 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.salesBillNo = ''
       this.queryParam.salesBillNo = ''
       this.queryParam.provinceSn = undefined
       this.queryParam.provinceSn = undefined
-      this.queryParam.dealerType = undefined
+      this.queryParam.dealerType1 = undefined
+      this.queryParam.dealerType2 = undefined
       this.queryParam.brandType = undefined
       this.queryParam.brandType = undefined
       this.queryParam.productBrandSn = undefined
       this.queryParam.productBrandSn = undefined
       this.queryParam.state = undefined
       this.queryParam.state = undefined

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        // target: 'http://192.168.2.111/ocs-admin',
+        target: 'http://192.168.2.117/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/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,
         ws: false,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {