Przeglądaj źródła

去除页面无连接状态、全选、批量处理功能等。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8468 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 lat temu
rodzic
commit
f3eceb6f71

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

@@ -215,8 +215,9 @@
 			<tr class="order-hd">
 				<td class="first">
 					<div class="order-main">
-						<span><input type="checkbox" class="selector"
-							ng-model="accept.$selected"></span> <span
+						<!--<span><input type="checkbox" class="selector"
+							ng-model="accept.$selected"></span>-->
+						<span
 							class="text-num text-bold"
 							title="{{accept.date | date:'yyyy年MM月dd日hh:mm'}}"
 							ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span

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

@@ -50,8 +50,8 @@
 			<div class="col-xs-3">
 				<span class="title">采购单号</span>
 				<div class="content">
-					<a ng-bind="::change.orderCode"
-						ui-sref="make.order_detail({id:change.orderId})" target="_blank"></a>
+					<span ng-bind="::change.orderCode"
+						ui-sref="make.order_detail({id:change.orderId})" target="_blank"></span>
 				</div>
 			</div>
 		</div>

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

@@ -228,8 +228,8 @@
 						<span><input type="checkbox" class="selector" ng-model="returns.$selected"></span>
 						<span class="text-num text-bold"
 							title="{{::returns.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-							class="text-num" ng-bind="::returns.code"></a></span>
+							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
+							class="text-num" ng-bind="::returns.code"></span></span>
 					</div>
 				</td>		
 				<td colspan="3"><a title="客户名称"

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

@@ -91,7 +91,7 @@
                         <span class="wid02"><a ng-click="edit(contact)" class="edit">编辑</a><a ng-click="deleteById(contact.id, $index)">删除</a></span>
                     </dd>
                     <dd ng-if="vendorContacts.length == 0">
-                        <span style="width: 100%; color: #999;">您还未添加供应商联系人!</span>
+                        <span style="width: 100% !important; color: #999;">您还未添加供应商联系人!</span>
                     </dd>
                 </dl>
             </div>

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

@@ -142,11 +142,11 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="5">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量处理</a>
-				</div> <!-- 分页 -->
+				</div>--> <!-- 分页 -->
 			</td>
 			<td clas="text-center">
 				<a href="sale/MRB/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -160,11 +160,11 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span> <input type="checkbox" class="selector"
 						ng-model="MRB.$selected">
-					</span> <span class="text-num text-bold" title="{{::MRB.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="::MRB.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="::MRB.code"></a></span>
+					</span> --><span class="text-num text-bold" title="{{::MRB.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::MRB.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
+						class="text-num" ng-bind="::MRB.code"></span></span>
 				</div>
 			</td>
 			<td colspan="2"><a title="客户名称"

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

@@ -144,11 +144,11 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="5">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量处理</a>
-				</div> <!-- 分页 -->
+				</div> --><!-- 分页 -->
 			</td>
 			<td class="text-center">
 				<a href="sale/badIn/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -162,11 +162,11 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span> <input type="checkbox" class="selector"
 						ng-model="badIn.$selected">
-					</span> <span class="text-num text-bold" title="{{::badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="::badIn.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="::badIn.code"></a></span>
+					</span> --><span class="text-num text-bold" title="{{::badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::badIn.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
+						class="text-num" ng-bind="::badIn.code"></span></span>
 				</div>
 			</td>
 			<td colspan="2"><a title="客户名称"

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

@@ -141,11 +141,11 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="5">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量处理</a>
-				</div> <!-- 分页 -->
+				</div> --><!-- 分页 -->
 			</td>
 			<td class="text-center">
 				<a href="sale/badOut/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -159,11 +159,11 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span> <input type="checkbox" class="selector"
 						ng-model="badOut.$selected">
-					</span> <span class="text-num text-bold" title="{{::badOut.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="::badOut.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="::badOut.code"></a></span>
+					</span> --><span class="text-num text-bold" title="{{::badOut.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::badOut.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
+						class="text-num" ng-bind="::badOut.code"></span></span>
 				</div>
 			</td>
 			<td colspan="2"><a title="客户名称"

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

@@ -191,11 +191,11 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="5">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量处理</a>
-				</div> <!-- 分页 -->
+				</div>--> <!-- 分页 -->
 			</td>
 			<td class="text-center">
 				<a href="sale/accept/xls?searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -209,9 +209,9 @@
 		<tr class="order-hd">
 			<td class="first" colspan="3">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span> <input type="checkbox" class="selector"
 						ng-model="accept.$selected">
-					</span> <span class="text-num text-bold" title="{{accept.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+					</span> --><span class="text-num text-bold" title="{{accept.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
 						class="text-num" ng-bind="accept.code"></span></span>
 					<span class="text-info" ng-if="accept.sendCode != null" title="送货单号:{{::accept.sendCode}}">

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

@@ -236,12 +236,12 @@
 			</tr>
 			<tr class="toolbar toolbar-top">
 				<td colspan="4">
-					<div>
+					<!--<div>
 						<label><input ng-disabled="true" type="checkbox"
 							class="selector select_all" ng-model="selectAll">全选</label> <a
 							ng-disabled="true" href="javascript:void(0)"
 							class="btn btn-default btn-xs">批量回复</a>
-					</div> <!-- 分页 -->
+					</div>--> <!-- 分页 -->
 				</td>
 				<td class="text-center"><a
 					href="sale/sample/approval/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"

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

@@ -46,8 +46,8 @@
 			<div class="col-xs-3">
 				<span class="title">采购单号</span>
 				<div class="content">
-					<a ng-bind="::change.orderCode"
-						ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a>
+					<span ng-bind="::change.orderCode"
+						ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></span>
 				</div>
 			</div>
 			<!-- <div class="col-xs-3">

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

@@ -204,11 +204,11 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="6">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 								  ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 																	 class="btn btn-default btn-xs">批量报价</a>
-				</div> <!-- 分页 -->
+				</div>--> <!-- 分页 -->
 			</td>
 			<td class="text-center">
 				<a href="sale/inquiry/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -257,9 +257,9 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-						<span> <input type="checkbox" class="selector"
+						<!--<span> <input type="checkbox" class="selector"
 									  ng-model="inquiryItem.$selected">
-						</span> <span class="text-num text-bold"
+						</span> --><span class="text-num text-bold"
 									  title="{{inquiryItem.inquiry.date}}"
 									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
 						class="text-num" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"></a></span>

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

@@ -200,12 +200,12 @@
 			</tr>
 			<tr class="toolbar toolbar-top">
 				<td colspan="5">
-					<div>
+					<!--<div>
 						<label><input ng-disabled="true" type="checkbox"
 							class="selector select_all" ng-model="selectAll">全选</label> <a
 							ng-disabled="true" href="javascript:void(0)"
 							class="btn btn-default btn-xs">批量处理</a>
-					</div> <!-- 分页 -->
+					</div> --><!-- 分页 -->
 				</td>
 				<td class="text-center"><a
 					href="sale/return/xls?keyword={{keywordXls}}" target="_self"
@@ -220,12 +220,12 @@
 			<tr class="order-hd">
 				<td class="first">
 					<div class="order-main">
-						<span> <input type="checkbox" class="selector"
+						<!--<span> <input type="checkbox" class="selector"
 							ng-model="returns.$selected">
-						</span> <span class="text-num text-bold"
+						</span> --><span class="text-num text-bold"
 							title="{{::returns.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-							class="text-num" ng-bind="::returns.code"></a></span>
+							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span> <span>流水号:<span
+							class="text-num" ng-bind="::returns.code"></span></span>
 					</div>
 				</td>
 				<td colspan="3" ng-if="returns.returnItems[0].orderItem"><a

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

@@ -246,11 +246,11 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="5">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量回复</a>
-				</div> <!-- 分页 -->
+				</div>--> <!-- 分页 -->
 			</td>
 			<td class="text-center">
 				<a href="sale/sample/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -264,9 +264,9 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span> <input type="checkbox" class="selector"
 						ng-model="sample.$selected">
-					</span> <span class="text-num text-bold" title="{{sample.proofing.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+					</span> --><span class="text-num text-bold" title="{{sample.proofing.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="sample.proofing.date | date:'yyyy-MM-dd'"></span>
 				</div>
 			</td>
@@ -289,10 +289,10 @@
 		<tr class="order-bd">
 			<td class="product">
 				<div class="text-num text-bold">
-					<a ng-bind="sample.proofing.product.code"></a>
+					<span ng-bind="sample.proofing.product.code"></span>
 				</div>
 				<div>
-					<a ng-bind="sample.proofing.product.title"></a>
+					<span ng-bind="sample.proofing.product.title"></span>
 				</div>
 				<div class="text-muted" title="{{sample.proofing.product.spec}}"
 					ng-bind="sample.proofing.product.spec"></div>

+ 11 - 10
src/main/webapp/resources/tpl/index/sale/sample_detail.html

@@ -1,10 +1,12 @@
-<div class="pane base-info">
-	<div class="pane-header">
-		客户打样申请单
+<div class="pane base-info"  id="order-detail-list">
+	<div class="pub-com_head">
+		<span>客户打样申请单</span>
+		<div class="p-right">
+		</div>
 	</div>
 	<div class="pane-body">
-		<div class="headerline">
-			<span class="index">1</span> <span class="content">单据信息</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">单据信息</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -31,8 +33,8 @@
 				<div class="content" ng-show="!sample.proofing.remark">无</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<span class="index">2</span> <span class="content">物料信息</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">物料信息</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
@@ -61,9 +63,8 @@
 				<div class="content" ng-show="!sample.proofing.envrequiry">无</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<div class="index">3</div>
-			<div class="content">送样信息</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">送样信息</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover">

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

@@ -229,11 +229,12 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="4">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量处理</a>
-				</div> <!-- 分页 -->
+				</div>-->
+				<!-- 分页 -->
 			</td>
 			<td class="text-center">
 				<a href="sale/notice/sends/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>
@@ -247,9 +248,10 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span><input type="checkbox" class="selector"
 						ng-model="send.$selected">
-					</span> <span class="text-num text-bold" title="{{::send.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+					</span> -->
+					<span class="text-num text-bold" title="{{::send.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="send.date | date:'yyyy-MM-dd'"></span> <span>发货单号:<a
 						class="text-num" ng-bind="::send.code" ui-sref="sale.send_detail({id:send.id})"></a></span>
 				</div>