lilei 2 years ago
parent
commit
74ef2b857a

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

@@ -65,7 +65,7 @@
       :defaultLoadData="false"
       bordered>
       <template slot="areas" slot-scope="text, record">
-        <span v-if="record.subareaNameSet">{{ record.subareaNameSet[0] }}</span>
+        <span v-if="record.subareaArea">{{ record.subareaArea.subareaName }}>{{ record.subareaArea.subareaAreaName }}</span>
         <span v-else>--</span>
       </template>
       <template slot="action" slot-scope="text, record">
@@ -165,8 +165,8 @@ export default {
         arr.splice(5, 0, { title: '当前所属区域', scopedSlots: { customRender: 'areas' }, width: '30%', align: 'center' })
         arr.splice(6, 0, { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' })
       } else {
-        arr.splice(4, 0, { title: '所在区域', dataIndex: 'subareaNameSet', width: '20%', align: 'center', customRender: function (text) { return text&&text[0] || '--' }})
-        arr.splice(5, 0, { title: '所在分区', dataIndex: 'subareaNameSet', width: '20%', align: 'center', customRender: function (text) { return text&&text[1] || '--' }})
+        arr.splice(4, 0, { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text&&text[0] || '--' }})
+        arr.splice(5, 0, { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '20%', align: 'center', customRender: function (text) { return text&&text[1] || '--' }})
       }
       return arr
     },
@@ -231,7 +231,7 @@ export default {
       this.$emit('plAdd', dealerSnList)
     },
     handleAdd (row) {
-      if (row.subareaNameSet && row.subareaNameSet.length) {
+      if (row.subareaArea) {
         const _this = this
         this.$confirm({
           title: '提示',

+ 26 - 21
src/views/dealerManagement/marketingDivisionSetNew/viewDealers.vue

@@ -16,22 +16,22 @@
             <a-row :gutter="15">
               <a-col :md="8" :sm="24">
                 <a-form-item label="经销商名称/别名">
-                  <a-input id="viewDealers-nameLike" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入经销商名称/别名"/>
+                  <a-input id="viewDealers-nameLike" v-model.trim="queryParam.dealer.nameLike" allowClear placeholder="请输入经销商名称/别名"/>
                 </a-form-item>
               </a-col>
               <a-col :md="8" :sm="24">
                 <a-form-item label="商户类型">
-                  <v-select code="DEALER_TYPE" id="viewDealers-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
+                  <v-select code="DEALER_TYPE" id="viewDealers-dealerType" v-model="queryParam.dealer.dealerType" allowClear placeholder="请选择商户类型"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="8" :sm="24">
                 <a-form-model-item label="商户级别">
-                  <v-select code="DEALER_LEVEL" id="viewDealers-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
+                  <v-select code="DEALER_LEVEL" id="viewDealers-dealerLevel" v-model="queryParam.dealer.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="8" :sm="24">
                 <a-form-item label="审核状态">
-                  <v-select code="AUDIT_STATE" id="viewDealers-auditState" v-model="queryParam.auditState" allowClear placeholder="请选择审核状态"></v-select>
+                  <v-select code="AUDIT_STATE" id="viewDealers-auditState" v-model="queryParam.dealer.auditState" allowClear placeholder="请选择审核状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="8" :sm="24">
@@ -144,13 +144,15 @@ export default {
       openAddDealer: false,
       flag: true,
       queryParam: { //  查询条件
-        nameLike: '',
-        dealerType: null,
-        dealerLevel: null,
-        auditState: undefined,
-        provinceSn: undefined,
-        citySn: undefined,
-        districtSn: undefined
+        dealer:{
+          nameLike: '',
+          dealerType: null,
+          dealerLevel: null,
+          auditState: undefined,
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined
+        }
       },
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
@@ -238,21 +240,24 @@ export default {
         this.hasData()
       }else{
         this.queryParam = {
-          nameLike: '',
-          dealerType: null,
-          dealerLevel: null,
-          auditState: undefined,
-          provinceSn: undefined,
-          citySn: undefined,
-          districtSn: undefined
+          dealer:{
+            nameLike: '',
+            dealerType: null,
+            dealerLevel: null,
+            auditState: undefined,
+            provinceSn: undefined,
+            citySn: undefined,
+            districtSn: undefined
+          }
         }
+        this.$refs.areaList.clearData()
         this.$refs.table.refresh(true)
       }
     },
     areaChange(val){
-      this.queryParam.provinceSn = val[0] ? val[0] : ''
-      this.queryParam.citySn = val[1] ? val[1] : ''
-      this.queryParam.districtSn = val[2] ? val[2] : ''
+      this.queryParam.dealer.provinceSn = val[0] ? val[0] : ''
+      this.queryParam.dealer.citySn = val[1] ? val[1] : ''
+      this.queryParam.dealer.districtSn = val[2] ? val[2] : ''
     },
    async hasData(){
       const ret = await queryPageAreaDealer({pageNo:1,pageSize:10,subareaSn: this.parentData.subareaSn, subareaAreaSn: this.parentData.subareaAreaSn}).then(res => res.data)