| 
					
				 | 
			
			
				@@ -7,17 +7,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <a-row :gutter="15"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-form-item label="合并时间"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <rangeDate ref="rangeSaleDate" @change="dateSaleChange" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <rangeDate ref="customerMergeDate" @change="dateSaleChange" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-form-item label="合并前客户名称"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入合并前客户名称"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerNameSource" allowClear placeholder="请输入合并前客户名称"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-form-item label="当前客户名称"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入当前客户名称"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerNameMain" allowClear placeholder="请输入当前客户名称"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24" style="margin-bottom: 10px;"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -46,44 +46,36 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { commonMixin } from '@/utils/mixin' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { getArea } from '@/api/data' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { custList, custDel, updateEnableStatus } from '@/api/customer' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import custType from '@/views/common/custType.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { STable, VSelect } from '@/components' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { custMergeLogList } from '@/api/customer' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { STable } from '@/components' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import rangeDate from '@/views/common/rangeDate.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'CustomerManagementList', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { STable, VSelect, rangeDate, custType }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { STable, rangeDate }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [commonMixin], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       spinning: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      advanced: false, // 高级搜索 展开/关闭 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       tableHeight: 0, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       queryParam: { //  查询条件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        saleBeginDate: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        saleEndDate: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        customerName: undefined, //  客户名称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        contactName: '', //  联系人 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        provinceSn: undefined, //  省 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        citySn: undefined, //  市 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        countySn: undefined, //  区 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        dealerFlag: undefined, //  是否卫星仓客户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        customerTypeSn: undefined //  客户类型 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        beginDate: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        endDate: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        customerNameSource: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        customerNameMain: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       disabled: false, //  查询、重置按钮是否可操作 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       columns: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '序号', dataIndex: 'no', width: '3%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '合并时间', dataIndex: 'customerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '合并前客户名称', dataIndex: 'contactName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '合并后客户名称', dataIndex: 'contactTel', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '当前客户名称', dataIndex: 'contactMobile', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '合并时间', dataIndex: 'mergeTime', width: '10%', align: 'left', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '合并前客户名称', dataIndex: 'customerNameSource', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '合并后客户名称', dataIndex: 'customerNameTarget', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '当前客户名称', dataIndex: 'customerNameMain', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 加载数据方法 必须为 Promise 对象 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       loadData: parameter => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.disabled = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.spinning = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return custList(Object.assign(parameter, this.queryParam)).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return custMergeLogList(Object.assign(parameter, this.queryParam)).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           let data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           if (res.status == 200) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             data = res.data 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -97,164 +89,29 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           return data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      addrProvinceList: [], //  省下拉 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      addrCityList: [], //  市下拉 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      addrDistrictList: [], //  区下拉 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      openModal: false, //  查看客户详情  弹框 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      itemId: '', //  当前客户id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      openMergeModal: false, // 合并用户名称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      customerTemp: {}// 临时客户数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  时间  change 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     dateSaleChange (date) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.saleBeginDate = date[0] ? date[0] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.saleEndDate = date[1] ? date[1] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.beginDate = date[0] ? date[0] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.endDate = date[1] ? date[1] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  重置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     resetSearchForm () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.$refs.rangeSaleDate.resetDate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.saleBeginDate = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.saleEndDate = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.customerName = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.contactName = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.provinceSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.citySn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.countySn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.dealerFlag = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.customerTypeSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.addrCityList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.addrDistrictList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.$refs.customerMergeDate.resetDate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.beginDate = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.endDate = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.customerNameSource = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.customerNameMain = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.table.refresh(true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //  新增/编辑 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    handleEdit (row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (row) { //  编辑 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.$router.push({ path: `/customerManagement/customerInfo/edit/${row.id}` }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } else { //  新增 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.$router.push({ path: '/customerManagement/customerInfo/add' }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //  删除 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    handleDel (row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.$confirm({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        title: '提示', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        content: '删除后不可恢复,确定要进行删除吗?', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        centered: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        onOk () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          _this.spinning = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          custDel({ id: row.id }).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (res.status == 200) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              _this.$message.success(res.message) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              _this.$refs.table.refresh() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              _this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              _this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 修改状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    changeFlagHandle (text, record) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const _data = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        id: record.id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        flag: record.enabledFlag ? '1' : '0' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.spinning = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      updateEnableStatus(_data).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (res.status == 200) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          this.$message.success(res.message) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          this.$refs.table.refresh() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          this.$refs.table.refresh() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          this.spinning = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //  客户信息详情 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    handleDetail (row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.itemId = row.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.openModal = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 合并客户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    mergeCustomer (row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.customerTemp = row 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.openMergeModal = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    closeMergeModal (flag) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.customerTemp = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.openMergeModal = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (flag) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.$refs.table.refresh() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //  关闭弹框 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    closeModal () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.itemId = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.openModal = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    filterOption (input, option) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      return ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 获取城市列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    getCityList (val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.addrCityList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.addrDistrictList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.citySn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.countySn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.getArea('city', val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 获取区县列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    getAreaList (val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.addrDistrictList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.countySn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.getArea('district', val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    //  省/市/区 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    getArea (leve, sn) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      let params 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (leve == 'province') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        params = { type: '2' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        params = { parentId: sn, type: leve == 'city' ? '3' : '4' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      getArea(params).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (res.status == 200) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (leve == 'province') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.addrProvinceList = res.data || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } else if (leve == 'city') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.addrCityList = res.data || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } else if (leve == 'district') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.addrDistrictList = res.data || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (leve == 'province') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.addrProvinceList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } else if (leve == 'city') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.addrCityList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } else if (leve == 'district') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.addrDistrictList = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     pageInit () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$nextTick(() => { // 页面渲染完成后的回调 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         _this.setTableH() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.getArea('province') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setTableH () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const tableSearchH = this.$refs.tableSearch.offsetHeight 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -262,12 +119,6 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   watch: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    advanced (newValue, oldValue) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.$nextTick(() => { // 页面渲染完成后的回调 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        _this.setTableH() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.setTableH() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |