| 
					
				 | 
			
			
				@@ -74,13 +74,18 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 操作按钮 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div class="table-operator"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <a-button v-if="$hasPermissions('B_customer_customerInfo_add')" id="customerManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <!-- <a-button id="customerManagementList-merge" @click="handleMerge" style="margin: 0 0 0 15px;">客户合并</a-button> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <!-- 合计 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <a-alert type="info" style="margin-bottom:10px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <div class="ftext" slot="message" style="color:#f30f30;"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          注意:客户合并功能中,将以当前客户合并被选客户。 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </a-alert> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 列表 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <s-table 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         class="sTable fixPagination" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ref="table" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        :style="{ height: tableHeight+84.5+'px' }" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        :style="{ height: tableHeight+68+'px' }" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         size="small" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :rowKey="(record) => record.id" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :columns="columns" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -341,7 +346,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setTableH () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const tableSearchH = this.$refs.tableSearch.offsetHeight 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.tableHeight = window.innerHeight - tableSearchH - 235 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.tableHeight = window.innerHeight - tableSearchH - 255 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 合并客户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     mergeCustomer (con) { 
			 |