应收对账单新增应付供应商名称和编号字段，增加应付供应商名称筛选功能，修改应付对账单列表界面筛选日期名称属性

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2174 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -117,11 +117,7 @@
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
 			  <div class="form-group ">
-<<<<<<< .mine
 			    <label>对账日期：</label>
-=======
-			    <label>对帐日期：</label>
->>>>>>> .r2166
 			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
 				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>