Browse Source

处理bug,修改图标

Administrator 7 years ago
parent
commit
d81f3cc24b
48 changed files with 63 additions and 63 deletions
  1. 2 2
      src/main/webapp/resources/tpl/index/account/log.html
  2. 2 2
      src/main/webapp/resources/tpl/index/approvalFlow/log.html
  3. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/myClient.html
  4. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/mySupplier.html
  5. 1 1
      src/main/webapp/resources/tpl/index/fa/apBill.html
  6. 3 3
      src/main/webapp/resources/tpl/index/fa/apBillOut.html
  7. 1 1
      src/main/webapp/resources/tpl/index/fa/apBillOutList.html
  8. 3 3
      src/main/webapp/resources/tpl/index/fa/apCheck.html
  9. 1 1
      src/main/webapp/resources/tpl/index/fa/apCheckList.html
  10. 1 1
      src/main/webapp/resources/tpl/index/home/left.html
  11. 2 2
      src/main/webapp/resources/tpl/index/make/accept.html
  12. 1 1
      src/main/webapp/resources/tpl/index/make/change.html
  13. 1 1
      src/main/webapp/resources/tpl/index/make/notice.html
  14. 1 1
      src/main/webapp/resources/tpl/index/make/order.html
  15. 2 2
      src/main/webapp/resources/tpl/index/make/outorder.html
  16. 1 1
      src/main/webapp/resources/tpl/index/make/returns.html
  17. 1 1
      src/main/webapp/resources/tpl/index/purc/cart.html
  18. 1 1
      src/main/webapp/resources/tpl/index/purc/deputyOrder.html
  19. 3 3
      src/main/webapp/resources/tpl/index/purc/inquiry.html
  20. 1 1
      src/main/webapp/resources/tpl/index/purc/inquiry_new.html
  21. 3 3
      src/main/webapp/resources/tpl/index/purc/order.html
  22. 1 1
      src/main/webapp/resources/tpl/index/purc/pubInquiry.html
  23. 1 1
      src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html
  24. 1 1
      src/main/webapp/resources/tpl/index/purc/saved_tender.html
  25. 1 1
      src/main/webapp/resources/tpl/index/purc/tender.html
  26. 1 1
      src/main/webapp/resources/tpl/index/purc/tenderlist.html
  27. 1 1
      src/main/webapp/resources/tpl/index/qc/MRB.html
  28. 1 1
      src/main/webapp/resources/tpl/index/qc/badIn.html
  29. 1 1
      src/main/webapp/resources/tpl/index/qc/badOut.html
  30. 1 1
      src/main/webapp/resources/tpl/index/sale/accept.html
  31. 1 1
      src/main/webapp/resources/tpl/index/sale/approval.html
  32. 1 1
      src/main/webapp/resources/tpl/index/sale/change.html
  33. 2 2
      src/main/webapp/resources/tpl/index/sale/customer.html
  34. 1 1
      src/main/webapp/resources/tpl/index/sale/forecast.html
  35. 1 1
      src/main/webapp/resources/tpl/index/sale/inquiry.html
  36. 1 1
      src/main/webapp/resources/tpl/index/sale/inquiry_mould.html
  37. 1 1
      src/main/webapp/resources/tpl/index/sale/notice.html
  38. 1 1
      src/main/webapp/resources/tpl/index/sale/open_tender_list.html
  39. 1 1
      src/main/webapp/resources/tpl/index/sale/opentenderlist.html
  40. 1 1
      src/main/webapp/resources/tpl/index/sale/order.html
  41. 1 1
      src/main/webapp/resources/tpl/index/sale/pubinquiry.html
  42. 2 2
      src/main/webapp/resources/tpl/index/sale/quotation.html
  43. 2 2
      src/main/webapp/resources/tpl/index/sale/quotation_list.html
  44. 1 1
      src/main/webapp/resources/tpl/index/sale/quotation_new.html
  45. 1 1
      src/main/webapp/resources/tpl/index/sale/returns.html
  46. 1 1
      src/main/webapp/resources/tpl/index/sale/sample.html
  47. 1 1
      src/main/webapp/resources/tpl/index/sale/send.html
  48. 1 1
      src/main/webapp/resources/tpl/index/sale/vendorPerformanceAssess.html

+ 2 - 2
src/main/webapp/resources/tpl/index/account/log.html

@@ -5,7 +5,7 @@
 	<div class="pane-header">
 		数据传输日志
 		<div class="pull-right">
-			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">
@@ -38,7 +38,7 @@
 	<div class="pane-header">
 		平台使用日志
 		<div class="pull-right">
-			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">

+ 2 - 2
src/main/webapp/resources/tpl/index/approvalFlow/log.html

@@ -47,7 +47,7 @@
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 		<span class="f14">数据传输日志</span>
 		<div class="pull-right">
-			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body" id="order-detail-list" style="max-height: 500px;overflow: auto;">
@@ -80,7 +80,7 @@
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 		<span class="f14">平台使用日志</span>
 		<div class="pull-right">
-			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body" id="order-detail-list" style="max-height: 500px;overflow: auto;">

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/myClient.html

@@ -5,7 +5,7 @@
 	<div class="pane-header">
 		客户资料 (共{{::totalCount}}个)
 		<div class="pull-right">
-			<a href="vendor/customer/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="vendor/customer/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/mySupplier.html

@@ -5,7 +5,7 @@
 	<div class="pane-header">
 		客户资料 (共{{::totalCount}}个)
 		<div class="pull-right">
-			<a href="vendor/customer/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="vendor/customer/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -114,7 +114,7 @@
 	<div class="pub-com_head">
 		<span>发票</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">

+ 3 - 3
src/main/webapp/resources/tpl/index/fa/apBillOut.html

@@ -131,9 +131,9 @@
 				</div>
 			</div>
 			<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">
-				<a class="text-simple append" ui-sref="fa.apBillOutList" title="新增开票单"><big><img src="static/img/icon/add.png" style="margin-right: 3px;">新增开票单</big></a>&nbsp;&nbsp;&nbsp;
+				<a class="text-simple append" ui-sref="fa.apBillOutList" title="新增开票单"><big><i class="fa fa-plus-square fa-fw"></i>新增开票单</big></a>&nbsp;&nbsp;&nbsp;
 <!--target="_self"--><a href="sale/apBillOut/allxls?_state={{active}}&searchFilter={{searchFilterXls}}"
-					target="_blank" title="导出Excel表格" class="blue f14"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+					target="_blank" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
 			</div>
 		</div>
 	</div>
@@ -209,7 +209,7 @@
 			<h3 class="text-simple"><i class="fa fa-spinner"></i> &nbsp;您还未生成开票单,请立即新增开票</h3>
 		</div>
 		<div class="col-xs-12" style="margin-top:15px; text-align: center;">
-			<a class="text-simple append" ui-sref="fa.apBillOutList"><big><i class="fa fa-plus-square"></i> 新增开票单</big></a>
+			<a class="text-simple append" ui-sref="fa.apBillOutList"><big><i class="fa fa-plus-square fa-fw"></i> 新增开票单</big></a>
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/apBillOutList.html

@@ -140,7 +140,7 @@
 							href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
 							target="_self" title="导出Excel"
 							ng-disabled="!data || data.length==0"><i
-							class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
+							class="fa fa-file-text fa-fw btn-icon-left"></i>导出</a>
 					</div>
 				</div>
 			</div>

+ 3 - 3
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -132,9 +132,9 @@
 	<div class="pub-com_head">
 		<span>应收对账单</span>
 		<div class="p-right">
-			<a class="text-simple append" ui-sref="fa.apCheckList" title="新增对账单"><img src="static/img/icon/add.png">新增对账单</a>&nbsp;&nbsp;&nbsp;
+			<a class="text-simple append" ui-sref="fa.apCheckList" title="新增对账单"><i class="fa fa-plus-square fa-fw"></i>新增对账单</a>&nbsp;&nbsp;&nbsp;
 			<a href="#" ng-click="exportXls()"
-			   target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			   target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">
@@ -317,7 +317,7 @@
 					<div class="right_link">
 						<p ng-if="active != 'all'">暂无对账信息!</p>
 						<p ng-if="active == 'all'">您还未生成对账单,请立即新增对账!</p>
-						<a ng-if="active == 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square"></i> 新增对账单</a>
+						<a ng-if="active == 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square fa-fw"></i> 新增对账单</a>
 					</div>
 				</div>
 			</td>

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -142,7 +142,7 @@
 					<div class="btn-group btn-group-sm">
 						<a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
 						<a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a>
-						<a class="btn btn-default" href="sale/apCheck/xls?keyword={{exportKeywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
+						<a class="btn btn-default" href="sale/apCheck/xls?keyword={{exportKeywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-text fa-fw btn-icon-left"></i>导出</a>
 					</div>
 				</div>
 			</div>

+ 1 - 1
src/main/webapp/resources/tpl/index/home/left.html

@@ -139,7 +139,7 @@
 	}
 	/*非当日公共询价*/
 	.feed-wrap .pane .pane-body li.nonday a em{
-		max-width: 190px;
+		max-width: 140px;
 	}
 	/*当日公共询价已读、未读**/
 	.feed-wrap .pane .pane-body li.day-read a em{

+ 2 - 2
src/main/webapp/resources/tpl/index/make/accept.html

@@ -107,7 +107,7 @@
 	<div class="pub-com_head">
 		<span>客户委外验收单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">
@@ -201,7 +201,7 @@
 				<td class="text-center">
 					<a href="make/accept/xls?_state={{active}}&keyword={{keywordXls.keyword}}&fromDate={{keywordXls.fromDate}}&endDate={{keywordXls.endDate}}"
 					target="_self" class="text-simple" title="导出Excel表格"><i
-						class="fa fa-file-excel-o fa-fw"></i>导出</a></td>
+						class="fa fa-file-text fa-fw"></i>导出</a></td>
 			</tr>
 			<tr class="sep-row">
 				<td colspan="6"></td>

+ 1 - 1
src/main/webapp/resources/tpl/index/make/change.html

@@ -110,7 +110,7 @@
 <div class="pub-com_head">
 	<span>委外变更单</span>
 	<div class="p-right">
-		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 	</div>
 </div>
     <div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/make/notice.html

@@ -310,7 +310,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/notice/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/notice/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 			</td>
 		</tr>
 		<tr class="sep-row">

+ 1 - 1
src/main/webapp/resources/tpl/index/make/order.html

@@ -133,7 +133,7 @@
 	<div class="pub-com_head">
 		<span>客户委外单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 <div class="menu condition block">

+ 2 - 2
src/main/webapp/resources/tpl/index/make/outorder.html

@@ -103,7 +103,7 @@
 			<a
 				href="#" ng-click="exportXls()"
 				target="_self" class="text-simple" title="导出Excel表格"><i
-				class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">
@@ -193,7 +193,7 @@
 				</div> &lt;!&ndash; 分页 &ndash;&gt;
 			</td>
 			<td class="text-center">
-				<a href="make/outorders/xls?_state={{active}}&searchFilter={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="make/outorders/xls?_state={{active}}&searchFilter={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 			</td>
 		</tr>-->
 			<!--<tr class="sep-row">

+ 1 - 1
src/main/webapp/resources/tpl/index/make/returns.html

@@ -112,7 +112,7 @@
 	<div class="pub-com_head">
 		<span>客户委外验退单</span>
 		<div class="p-right">
-			<a href="#" target="_self" ng-click="exportXls()" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" target="_self" ng-click="exportXls()" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/cart.html

@@ -159,7 +159,7 @@
 	<span>购物车</span>
 	<div class="p-right">
 		<a ng-click="clearCart()" ng-disabled="hasClick"><i class="fa fa-trash"></i>清空</a>
-		<a ui-sref="purc.newOrder" title="新增采购单"><img src="static/img/icon/add.png"/>新增</a>
+		<a ui-sref="purc.newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
 	</div>
 </div>
 <div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -197,7 +197,7 @@
             <span>代采订单</span>
             <div class="p-right">
             	<span ng-if="!isUser" style="color: #fff;font-size: 14px;margin-right:20px;">总金额: {{odersAmount| number}} </span>
-                <a ui-sref="purc.newdeputy" type="button" title="新增代采订单"><img src="static/img/icon/add.png">新增</a>
+                <a ui-sref="purc.newdeputy" type="button" title="新增代采订单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
                 <a ui-sref="purc.deputylog" type="button" title="错误日志"><i class="fa fa-file-text"></i> 错误日志</a>
             </div>
         </div>

+ 3 - 3
src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -303,9 +303,9 @@ margin-left: 55px;
 	<div class="pub-com_head">
 		<span>采购询价</span>
 		<div class="p-right">
-			<a ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/>待发布</a>
-			<a ui-sref="purc.inquiry_new" title="新增询价单"><img src="static/img/icon/add.png"/>新增</a>
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a ui-sref="purc.inquiry_unapply" title="待提交"><i class="fa fa-external-link-square fa-fw"></i>待发布</a>
+			<a ui-sref="purc.inquiry_new" title="新增询价单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -1097,7 +1097,7 @@
                     <span>供应商信息</span>
                     <input  class="tender-input" name="ifOpen" style="display: none" ng-init="inquiry.isOpen = 0"/>
                     <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">
-                        <i class="fa fa-plus-square"></i>添加供应商&nbsp;
+                        <i class="fa fa-plus-square fa-fw"></i>添加供应商&nbsp;
                     </a>
                 </div>
                 <div class="row vend-info">

+ 3 - 3
src/main/webapp/resources/tpl/index/purc/order.html

@@ -192,9 +192,9 @@
 </div><div class="pub-com_head">
 	<span>采购订单</span>
 	<div class="p-right">
-		<a ui-sref="purc.newOrder" title="新增采购单"><img src="static/img/icon/add.png"/>新增</a>
-		<a ui-sref="purc.cart" title="购物车"><img src="static/img/icon/cart.png"/>购物车</a>
-		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		<a ui-sref="purc.newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
+		<a ui-sref="purc.cart" title="购物车"><i class="fa fa-shopping-cart fa-fw"></i>购物车</a>
+		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 	</div>
 </div>
 <div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/pubInquiry.html

@@ -303,7 +303,7 @@ margin-left: 55px;
 	<div class="pub-com_head">
 		<span>公共询价</span>
 		<div class="p-right">
-			<a ui-sref="purc.pubinquiry_new" title="新增公共询价单"><img src="static/img/icon/add.png"/>新增</a>
+			<a ui-sref="purc.pubinquiry_new" title="新增公共询价单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
 		</div>
 	</div>
 	<div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html

@@ -1085,7 +1085,7 @@ select.disabled {
                   	<span>供应商信息</span>
                     <input  class="tender-input" name="ifOpen" style="display: none" ng-init="inquiry.isOpen = 0"/>
                   	 <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)" ng-if="inquiry.isOpen == 0">
-                        <i class="fa fa-plus-square"></i>添加供应商&nbsp;
+                        <i class="fa fa-plus-square fa-fw"></i>添加供应商&nbsp;
                     </a>
                 </div>
                 <div class="row vend-info">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -938,7 +938,7 @@
                 <div class="com_title01" style="border-bottom: 1px dashed #327ebe;">
                     <span>供应商信息</span>
                     <a style="width: 110px; height:49px;" class="add-vendor pull-right" ng-click="dbfindVendor()" href="javascript:void(0)" ng-if="tender.ifOpen == 0">
-                        <i class="fa fa-plus-square"></i>添加供应商
+                        <i class="fa fa-plus-square fa-fw"></i>添加供应商
                     </a>
                 </div>
                 <div class="row vend-info">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/tender.html

@@ -955,7 +955,7 @@ input[type="radio"], input[type="checkbox"] {
                 <div class="com_title01" style="border-bottom: 1px dashed #327ebe;">
                     <span>供应商信息</span>
                     <a style="width: 110px; height:49px;" class="add-vendor pull-right" ng-click="dbfindVendor()" href="javascript:void(0)" ng-if="tender.ifOpen == 0">
-                        <i class="fa fa-plus-square"></i>添加供应商
+                        <i class="fa fa-plus-square fa-fw"></i>添加供应商
                     </a>
                 </div>
                 <div class="row vend-info">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -162,7 +162,7 @@
             <span>采购招标</span>
             <div class="p-right">
                 <a ui-sref="purc.tender" type="button" title="新增招标单" class="btn btn-tender">
-                    <img src="static/img/icon/add.png">新增
+                    <i class="fa fa-plus-square fa-fw"></i>新增
                 </a>
             </div>
             <div class="p-right">

+ 1 - 1
src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -112,7 +112,7 @@
 	<div class="pub-com_head">
 		<span>MRB单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -111,7 +111,7 @@
 	<div class="pub-com_head">
 		<span>不良品入库单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
     <div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -111,7 +111,7 @@
 	<div class="pub-com_head">
 		<span>不良品出库单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
     <div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/accept.html

@@ -113,7 +113,7 @@
 		<span>客户采购验收单</span>
 		<div class="p-right">
 			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i
-					class="fa fa-file-excel-o fa-fw"></i>导出</a>
+					class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/approval.html

@@ -139,7 +139,7 @@
 	<div class="pub-com_head">
 		<span>客户认定单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/change.html

@@ -110,7 +110,7 @@
 <div class="pub-com_head">
 	<span>客户采购变更单</span>
 	<div class="p-right">
-		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 	</div>
 </div>
 <div class="menu condition block">

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/customer.html

@@ -94,13 +94,13 @@
 	<!--<div class="pane-header">
 		客户资料 (共{{::totalCount}}个)
 		<div class="pull-right">
-			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>-->
 	<div class="pub-com_head">
 		<span>客户资料</span>
 		<div class="p-right">
-			<a ng-click="exportXls()" target="_self" class="text-simple bule"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a ng-click="exportXls()" target="_self" class="text-simple bule"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<form class="form-horizontal">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/forecast.html

@@ -200,7 +200,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/forecast/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/forecast/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 			</td>
 		</tr>
 		<tr class="sep-row">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -143,7 +143,7 @@
 	<div class="pub-com_head">
 		<span>客户采购询价</span>
 		<div class="p-right">
-			<a ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -190,7 +190,7 @@ tbody td div.text-mould {
 	<div class="pub-com_head">
 		<span>客户模具询价</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/notice.html

@@ -188,7 +188,7 @@
         <span>客户发货提醒</span>
         <div class="p-right">
             <a href="#" ng-click="exportXls()"
-               target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+               target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
         </div>
     </div>
     <div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/open_tender_list.html

@@ -435,7 +435,7 @@
                     </div>
                     <div class="col-xs-12" ng-show="tender.ifOpen == 0">
                         <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">
-                            <i class="fa fa-plus-square"></i>添加供应商&nbsp;
+                            <i class="fa fa-plus-square fa-fw"></i>添加供应商&nbsp;
                         </a>
                     </div>
                     <div class="col-xs-12" style="" ng-repeat="en in tenderProd.enterpriseBaseInfo" ng-show="tender.ifOpen == 0">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/opentenderlist.html

@@ -276,7 +276,7 @@
                  </td>
                  <td class="text-center">
                      <a href="sale/orders/xls?_state={{active}}&searchFilter={{searchFilterXls}}"
-                        target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+                        target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
                  </td>
              </tr>-->
             </thead>

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/order.html

@@ -179,7 +179,7 @@
 		<span>客户采购订单</span>
 		<div class="p-right">
 			<a href="#" ng-click="exportXls()"
-			   target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			   target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 <div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -188,7 +188,7 @@
 	<div class="pub-com_head">
 		<span>客户公共询价单</span>
 		<div class="p-right">
-			<!--<a ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>-->
+			<!--<a ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		</div>
 	</div>
 	<div class="menu condition block">

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/quotation.html

@@ -169,8 +169,8 @@
 			&lt;!&ndash;</a>&ndash;&gt;
 		<span class="time-per fr"  ng-if="enteryStatus"><em>录入人:{{::item.quotation.user.userName}}</em><time>日期:{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span>
 		<div class="p-right" ng-if="!enteryStatus">
-			<a ui-sref="sale.quotation.new" title="新增主动报价单"><img src="static/img/icon/add.png"/>新增</a>
-			<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a ui-sref="sale.quotation.new" title="新增主动报价单"><i class="fa fa-plus-square"></i>新增</a>
+			<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 		</div>
 	</div>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -198,8 +198,8 @@
 		<!--<i class="fa fa-list"></i> 列表-->
 		<!--</a>-->
 		<div class="p-right">
-			<a ui-sref="sale.quotation.new" title="新增主动报价单"><img src="static/img/icon/add.png"/>新增</a>
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a ui-sref="sale.quotation.new" title="新增主动报价单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 </div></div>

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -485,7 +485,7 @@
 			</div>
 			<label class="col-sm-3" style="line-height: 30px;" ng-hide = "isDisabled()">
 				<a ng-if="!$first && item.$editing" href="javascript:void(0)" ng-click="removePrice($index)" class="red"><i class="fa fa-trash-o"></i> 删除</a>&nbsp;&nbsp;&nbsp;
-				<a ng-if="$last && item.$editing" href="javascript:void(0)" ng-click="addPrice()" class="blue"><i class="fa fa-plus-square-o"></i> 增加</a>
+				<a ng-if="$last && item.$editing" href="javascript:void(0)" ng-click="addPrice()" class="blue"><i class="fa fa-plus-square fa-fw"></i> 增加</a>
 			</label>
 		</div>
 		<div class="form-group form-group-sm" style="margin-top: 50px;">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/returns.html

@@ -112,7 +112,7 @@
 	<div class="pub-com_head">
 		<span>客户采购验退单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/sample.html

@@ -141,7 +141,7 @@
 <div class="pub-com_head">
 	<span>客户打样申请</span>
 	<div class="p-right">
-		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 	</div>
 </div>
 <div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/send.html

@@ -136,7 +136,7 @@
 	<div class="pub-com_head">
 		<span>发货单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/vendorPerformanceAssess.html

@@ -94,7 +94,7 @@
 	<div class="pub-com_head">
 		<span>绩效考核</span>
 		<div class="p-right">
-			<a ng-click="exportXls()" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a ng-click="exportXls()" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<form class="form-horizontal">