去除列表无效单选按钮、委外订单详情链接修改及详情页面统一风格、处理企业圈客户分页不显示问题 和 微调页面样式等等。

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

src/main/webapp/resources/css/index.css

@@ -2747,7 +2747,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 .title-div {
 	font-size: 14px;
 	font-weight: 600;
-	padding-left: 30px;
+	padding-left: 24px;
 	height: 50px;
 	padding-top: 11px;
 }

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -349,7 +349,7 @@
 						<th width="90">UU</th>
 						<th width="120">姓名</th>
 						<th width="80">性别</th>
-						<th width="170">身份证号</th>
+						<!--<th width="170">身份证号</th>-->
 						<th width="170">电话</th>
 						<th width="200">邮箱</th>
 						<th width="100">客户分配</th>
@@ -369,9 +369,9 @@
 								<option value="F">女</option>
 								<option value="M">男</option>
 						</select></td>
-						<td class="text-center"><input ng-model="newUser.userIdcode"
+						<!--<td class="text-center"><input ng-model="newUser.userIdcode"
 							class="form-control input-sm" type="text" placeholder="身份证号">
-						</td>
+						</td>-->
 						<td class="text-center"
 							ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
 							<input ng-model="newUser.userTel"

src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -77,8 +77,14 @@
 	font-size: 16px;
 	line-height: 55px;
 }
-.ng-isolate-scope{
+/*.ng-isolate-scope{
 	display : none;
+}*/
+.pane{
+	background: none;
+}
+.table{
+	margin-bottom: 0;
 }
 #myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
 	margin-left: 0 !important;

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

@@ -225,9 +225,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="bill.$selected">
-					</span> <span class="text-num text-bold" title="{{::bill.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+					</span> --><span class="text-num text-bold" title="{{::bill.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="bill.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a style="color: #5078cb;" ui-sref="fa.apBill_detail({id:bill.id})"><span
 						class="text-num" ng-bind="::bill.code"></span></a></span>
 				</div>

src/main/webapp/resources/tpl/index/home/right.html

@@ -113,7 +113,7 @@
 					<ul class="list-unstyled list-inline">
 						<li class="start">
 							<ul class="list-unstyled">
-								<li><a ui-sref="fa.apCheck">未对账的应收对账单（<span
+								<li style="width: 50%;"><a ui-sref="fa.apCheck">未对账的应收对账单（<span
 										ng-class="{'text-inverse': todo.apCheckTodo>0}">{{todo.apCheckTodo ||
 											0}}</span>）
 									</a></li>

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -207,9 +207,9 @@
 				<th width="140">备注</th>
 				<th width="80">操作</th>
 			</tr>
-			<tr class="sep-row">
+		<!--	<tr class="sep-row">
 				<td colspan="6"></td>
-			</tr>
+			</tr>-->
 			<!--<tr class="toolbar toolbar-top">
 			<td colspan="5">
 				<div>
@@ -221,21 +221,21 @@
 				<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>
 			</td>
 		</tr>-->
-			<tr class="sep-row">
+			<!--<tr class="sep-row">
 				<td colspan="6"></td>
-			</tr>
+			</tr>-->
 		</thead>
 		<tbody ng-repeat="order in $data track by order.id">
 			<tr class="order-hd" ng-dbclick="order.$collapsed=!order.$collapsed"
 				ng-class="{'text-bold': order.display>0}">
 				<td class="first">
 					<div class="order-main">
-						<span> <input type="checkbox" class="selector"
+						<!--<span> <input type="checkbox" class="selector"
 							ng-model="order.$selected" ng-click="checkOne(order)">
-						</span> <span class="text-num text-bold"
+						</span> --><span class="text-num text-bold"
 							ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：
 							<a class="text-num" ng-bind="::order.code"
-							ui-sref="purc.makeoutorder_detail({id:order.id})" target="_self"></a>
+							   ui-sref="purc.outorder_detail({id:order.id})" target="_self"></a>
 						</span>
 					</div>
 				</td>

src/main/webapp/resources/tpl/index/make/outorder_detail.html

@@ -1,15 +1,17 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info">
-	<div class="pane-header f16">
-		委外加工单
-		<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>委外加工单</span>
+		<div class="p-right">
+			<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
 			class="fa fa-print fa-fw"></i>打印</a> -->
+		</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">
@@ -43,8 +45,8 @@
 				<div class="content" ng-bind="::order.user.userName"></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">
@@ -71,14 +73,14 @@
 				<div class="content" ng-if="!order.shipAddress ">无</div>
 			</div>
 		</div>
-		<div class="headerline">
-			<span class="index">3</span> <span class="content">商品清单</span>
+		<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">
 				<thead>
 					<tr class="header">
-						<th width="50" class="br-r">行号</th>
+						<th width="50">行号</th>
 						<th>商品</th>
 						<th width="80">单价</th>
 						<th width="100">数量</th>
@@ -89,7 +91,7 @@
 				</thead>
 				<tbody>
 					<tr>
-						<td class="text-center text-num text-bold f-16 text-success br-r">
+						<td class="text-center text-num text-bold f-16 text-success">
 							<span >{{$index+1}}</span>
 						</td>
 						<td>

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -137,6 +137,9 @@
 .purchase_form01 b {
 	color: red;
 }
+.com_title01 span{
+    margin-left: 37px;
+}
 </style>
 <div class="warp">
     <div class=" purchase">

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -145,6 +145,9 @@
 .purchase_form01 b {
 	color: red;
 }
+.com_title01 span{
+    margin-left: 37px;
+}
 </style>
 <div class="warp">
     <div class=" purchase">

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -407,9 +407,9 @@ margin-left: 55px;
 		<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" target="_self" href="#/purc/purcinquirydetail/{{inquiryItem.inquiry.id}}"></a></span>

src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -23,10 +23,10 @@
 }
 
 .purc-tender .row {
-	margin-left: 0px;
-	margin-right: 0px;
-	padding-left: 15px;
-	padding-right: 15px;
+    margin-left: 0;
+    margin-right: 0;
+    padding-left: 7px;
+    padding-right: 15px;
 }
 
 .tender-content {
@@ -384,7 +384,7 @@ input[type="radio"], input[type="checkbox"] {
 	line-height: 40px;
 	display: inline-block;
 	color: #323232;
-    width: 11.6%;
+    width: 13.45%;
     border-bottom: #e8e8e8 1px solid;
 }
 
@@ -406,14 +406,17 @@ input[type="radio"], input[type="checkbox"] {
 	height: 50px;
 	line-height: 50px;
 	display: inline-block;
-    width: 11.5%;
+    width: 13.45%;
     font-size: 14px;
     float: left;
     text-align: center;
 }
+.tender-list02 dl dd span:first-child,.tender-list02 dl dt span:first-child{
+    width: 6%;
+}
 
 .tender-list02 dl span.wid01 {
-	width: 15%;
+	width: 16.8%;
 }
 
 .tender-list02 dl span.wid02 {
@@ -430,7 +433,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-list02  .scroll-y dd input {
-	width: 100%;
+	width: 97%;
 	height: 34px;
 	border: none;
 	font-size: 14px;
@@ -889,7 +892,7 @@ input[type="radio"], input[type="checkbox"] {
     right: -7px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    left: 40%;
+    left: 39%;
 }
 .title-div a{
     float: right;
@@ -983,7 +986,7 @@ select.disabled {
                         </div>
                     </div>
                     <div class="col-xs-12" id="isOpenChoice">
-	                    <div class="tender-desc">询价类型：</div>
+	                    <div class="tender-desc" style="margin-left: 7px;">询价类型：</div>
 	                     <div class="input-select col-xs-1">
 	                        <input  class="tender-input" name="inquirytype" type="radio" value="询价" ng-model="inquiry.inquirytype"/>
 	                        <span>询价</span>
@@ -1060,7 +1063,7 @@ select.disabled {
                                         	<input type="text" name="code" ng-model="prod.prodCode" ng-change="getSimilarCodes(prod.prodCode)" ng-focus="onFocus('code')" placeholder="请输入标准原厂型号" typeahead="prod.code for prod in getSimilarCodes($viewValue)" autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prod)" spellcheck = "false" required>
                                         </span>
                                         <span class="com01 wid01">
-                                        	<input type="text" style="width: 165px; text-align: left;" class="input01" name="kindName" ng-model="prod.prodTitle"  required placeholder="请输入或选择分类" spellcheck = "false" autocomplete="off" />
+                                        	<input type="text" style="text-align: left;" class="input01" name="kindName" ng-model="prod.prodTitle"  required placeholder="请输入或选择分类" spellcheck = "false" autocomplete="off" />
                                         	<div class="input-group-addon" ng-click="selectKind(prod)">
                                                 <i class="fa fa-search" aria-hidden="true"></i>
                                             </div>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -321,10 +321,10 @@
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td class="first" colspan="3">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<!--<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
-					</span> 
-					&nbsp;<span class="text-num text-bold"
+					</span> -->
+					<span class="text-num text-bold"
 						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：<a
 						class="text-num" ng-bind="::order.code" ui-sref="purc.order_detail({id:order.id})" target="_self"></a></span>
 				</div>

src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html

@@ -23,9 +23,9 @@
 }
 
 .purc-tender .row {
-	margin-left: 0px;
-	margin-right: 0px;
-	padding-left: 15px;
+	margin-left: 0;
+	margin-right: 0;
+	padding-left: 7px;
 	padding-right: 15px;
 }
 

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -369,7 +369,7 @@ input[type="radio"], input[type="checkbox"] {
 	margin-top: -4px;
 } /*  这里修改过 margin-top*/
 .com_title01 span {
-	margin-left: 20px;
+	margin-left: 30px;
 	font-size: 14px;
 	line-height: 50px;
 	color: #555;

src/main/webapp/resources/tpl/index/sale/change.html

@@ -250,9 +250,7 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
-						ng-model="change.$selected">
-					</span> <span class="text-num text-bold"
+					<span class="text-num text-bold"
 						ng-bind="::change.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
 						class="text-num" ng-bind="::change.code" ui-sref="sale.change_detail({id:change.id})" target="_self"></a></span> <span>订单：<span
 						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></span></span>
@@ -356,7 +354,7 @@
 			</td>
 			<td class="text-center br-l" colspan="2">
 				<div ng-bind="::item.description"></div>
-				<div ng-if="change.agreed == 1 && !change.unNeedRely" class="block">
+				<div ng-if="change.agreed == 1 && !change.unNeedReply" class="block">
 					<span class="text-trans success">已同意</span>
 				</div>
 				<div ng-if="change.unNeedReply" class="block">

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -192,17 +192,17 @@
 									</div>
 								</div>
 							</div>
-							<div style="margin: 0 auto" ng-if="item.$editing">
-								<br> <br> <input type="text"
-									ng-model="item.reply.remark" class="form-control input-xs"
-									placeholder="回复备注" />
-							</div>
 							<div ng-if="item.acceptQty" class="text-success text-center text-bold f14">
 								客户验收：{{::item.acceptQty}}{{::item.product.unit}}
 							</div>
 							<div ng-if="item.returnQty" class="text-error text-center text-bold f14">
 								客户验退：{{::item.returnQty}}{{::item.product.unit}}
 							</div>
+							<div style="margin: 0 auto" ng-if="item.$editing">
+								<input type="text"
+									   ng-model="item.reply.remark" class="form-control input-xs"
+									   placeholder="回复备注" />
+							</div>
 						</td>
 						<td class="text-center" width="100">
 							<div ng-if="item.replyQty>=item.qty" class="block">